Binary files /tmp/c0zM1tEfDj/language-pack-sk-base-12.04+20111229/data/extra.tar and /tmp/7CZEnGNJTP/language-pack-sk-base-12.04+20120221/data/extra.tar differ
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/acl.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/acl.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/acl.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/acl.po	2012-02-23 06:55:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../chacl/chacl.c:46
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/adduser.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/adduser.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/adduser.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/adduser.po	2012-02-23 06:55:25.000000000 +0000
@@ -7,13 +7,13 @@
 "Report-Msgid-Bugs-To: adduser-devel@lists.alioth.debian.org\n"
 "POT-Creation-Date: 2011-10-19 12:50-0700\n"
 "PO-Revision-Date: 2008-09-28 15:06+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. everyone can issue "--help" and "--version", but only root can go on
 #: ../adduser:152
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/alsa-utils.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/alsa-utils.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/alsa-utils.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/alsa-utils.po	2012-02-23 06:55:25.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: alsa-utils\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-31 15:27+0100\n"
+"POT-Creation-Date: 2012-01-25 10:44+0100\n"
 "PO-Revision-Date: 2008-03-17 14:36+0000\n"
 "Last-Translator: salwator <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: alsamixer/card_select.c:126 alsamixer/device_name.c:126
 msgid "Sound Card"
@@ -216,131 +216,131 @@
 msgid "Side"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:84 alsamixer/mixer_widget.c:89
+#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:100
 msgid "cannot open mixer"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:95 alsamixer/mixer_widget.c:172
+#: alsamixer/mixer_widget.c:106 alsamixer/mixer_widget.c:183
 msgid "cannot load mixer controls"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:162
+#: alsamixer/mixer_widget.c:173
 #, c-format
 msgid "Cannot open mixer device '%s'."
 msgstr ""
 
-#: alsamixer/mixer_widget.c:183
+#: alsamixer/mixer_widget.c:194
 msgid "Esc     Exit"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:184
+#: alsamixer/mixer_widget.c:195
 msgid "F1 ? H  Help"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:185
+#: alsamixer/mixer_widget.c:196
 msgid "F2 /    System information"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:186
+#: alsamixer/mixer_widget.c:197
 msgid "F3      Show playback controls"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:187
+#: alsamixer/mixer_widget.c:198
 msgid "F4      Show capture controls"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:188
+#: alsamixer/mixer_widget.c:199
 msgid "F5      Show all controls"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:189
+#: alsamixer/mixer_widget.c:200
 msgid "Tab     Toggle view mode (F3/F4/F5)"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:190
+#: alsamixer/mixer_widget.c:201
 msgid "F6 S    Select sound card"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:191
+#: alsamixer/mixer_widget.c:202
 msgid "L       Redraw screen"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:193
+#: alsamixer/mixer_widget.c:204
 msgid "Left    Move to the previous control"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:194
+#: alsamixer/mixer_widget.c:205
 msgid "Right   Move to the next control"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:196
+#: alsamixer/mixer_widget.c:207
 msgid "Up/Down    Change volume"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:197
+#: alsamixer/mixer_widget.c:208
 msgid "+ -        Change volume"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:198
+#: alsamixer/mixer_widget.c:209
 msgid "Page Up/Dn Change volume in big steps"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:199
+#: alsamixer/mixer_widget.c:210
 msgid "End        Set volume to 0%"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:200
+#: alsamixer/mixer_widget.c:211
 msgid "0-9        Set volume to 0%-90%"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:201
+#: alsamixer/mixer_widget.c:212
 msgid "Q W E      Increase left/both/right volumes"
 msgstr ""
 
 #. TRANSLATORS: or Y instead of Z
-#: alsamixer/mixer_widget.c:203
+#: alsamixer/mixer_widget.c:214
 msgid "Z X C      Decrease left/both/right volumes"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:204
+#: alsamixer/mixer_widget.c:215
 msgid "B          Balance left and right volumes"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:206
+#: alsamixer/mixer_widget.c:217
 msgid "M          Toggle mute"
 msgstr ""
 
 #. TRANSLATORS: or , .
-#: alsamixer/mixer_widget.c:208
+#: alsamixer/mixer_widget.c:219
 msgid "< >        Toggle left/right mute"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:210
+#: alsamixer/mixer_widget.c:221
 msgid "Space      Toggle capture"
 msgstr ""
 
 #. TRANSLATORS: or Insert Delete
-#: alsamixer/mixer_widget.c:212
+#: alsamixer/mixer_widget.c:223
 msgid "; '        Toggle left/right capture"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:214
+#: alsamixer/mixer_widget.c:225
 msgid "Authors:"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:215
+#: alsamixer/mixer_widget.c:226
 msgid "  Tim Janik"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:216
+#: alsamixer/mixer_widget.c:227
 msgid "  Jaroslav Kysela <perex@perex.cz>"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:217
+#: alsamixer/mixer_widget.c:228
 msgid "  Clemens Ladisch <clemens@ladisch.de>"
 msgstr ""
 
-#: alsamixer/mixer_widget.c:219
+#: alsamixer/mixer_widget.c:230
 msgid "Help"
 msgstr ""
 
@@ -357,23 +357,23 @@
 msgid "Cannot open file \"%s\"."
 msgstr ""
 
-#: aplay/aplay.c:152
+#: aplay/aplay.c:163
 msgid "raw data"
 msgstr "prvotné dáta (raw)"
 
-#: aplay/aplay.c:153
+#: aplay/aplay.c:164
 msgid "VOC"
 msgstr "VOC"
 
-#: aplay/aplay.c:155
+#: aplay/aplay.c:166
 msgid "WAVE"
 msgstr "WAVE"
 
-#: aplay/aplay.c:156
+#: aplay/aplay.c:167
 msgid "Sparc Audio"
 msgstr "Zvuk Sparc"
 
-#: aplay/aplay.c:177
+#: aplay/aplay.c:188
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [FILE]...\n"
@@ -403,12 +403,14 @@
 "-v, --verbose           show PCM structure and setup (accumulative)\n"
 "-V, --vumeter=TYPE      enable VU meter (TYPE: mono or stereo)\n"
 "-I, --separate-channels one file for each channel\n"
+"-i, --interactive       allow interactive operation from stdin\n"
 "    --disable-resample  disable automatic rate resample\n"
 "    --disable-channels  disable automatic channel conversions\n"
 "    --disable-format    disable automatic format conversions\n"
 "    --disable-softvol   disable software volume control (softvol)\n"
 "    --test-position     test ring buffer position\n"
-"    --test-coef=#\t test coeficient for ring buffer position (default 8)\n"
+"    --test-coef=#       test coefficient for ring buffer position (default "
+"8)\n"
 "                        expression for validation is: coef * (buffer_size / "
 "2)\n"
 "    --test-nowait       do not wait for ring buffer - eats whole CPU\n"
@@ -419,12 +421,12 @@
 "    --use-strftime      apply the strftime facility to the output file name\n"
 msgstr ""
 
-#: aplay/aplay.c:216 speaker-test/speaker-test.c:819
+#: aplay/aplay.c:228 speaker-test/speaker-test.c:819
 #, c-format
 msgid "Recognized sample formats are:"
 msgstr "Rozoznané formáty vzoriek sú:"
 
-#: aplay/aplay.c:222
+#: aplay/aplay.c:234
 #, c-format
 msgid ""
 "\n"
@@ -433,452 +435,452 @@
 "\n"
 "Niektoré z týchto nemusia byť dostupné pre vybraný hardvér\n"
 
-#: aplay/aplay.c:223
+#: aplay/aplay.c:235
 #, c-format
 msgid "The availabled format shortcuts are:\n"
 msgstr "Dostupné skratky formátov sú:\n"
 
-#: aplay/aplay.c:224
+#: aplay/aplay.c:236
 #, c-format
 msgid "-f cd (16 bit little endian, 44100, stereo)\n"
 msgstr "-f cd (16 bit little endian, 44100, stereo)\n"
 
-#: aplay/aplay.c:225
+#: aplay/aplay.c:237
 #, c-format
 msgid "-f cdr (16 bit big endian, 44100, stereo)\n"
 msgstr "-f cdr (16 bit big endian, 44100, stereo)\n"
 
-#: aplay/aplay.c:226
+#: aplay/aplay.c:238
 #, c-format
 msgid "-f dat (16 bit little endian, 48000, stereo)\n"
 msgstr "-f dat (16 bitový malý endian, 48000, stereo)\n"
 
-#: aplay/aplay.c:240
+#: aplay/aplay.c:252
 msgid "no soundcards found..."
 msgstr "nenašla sa žiadna zvuková karta..."
 
-#: aplay/aplay.c:243
+#: aplay/aplay.c:255
 #, c-format
 msgid "**** List of %s Hardware Devices ****\n"
 msgstr "**** Zoznam %s Hardwarových Zariadení ****\n"
 
-#: aplay/aplay.c:272
+#: aplay/aplay.c:284
 #, c-format
 msgid "card %i: %s [%s], device %i: %s [%s]\n"
 msgstr "karta %i: %s [%s], zariadenie %i: %s [%s]\n"
 
-#: aplay/aplay.c:278
+#: aplay/aplay.c:290
 #, c-format
 msgid "  Subdevices: %i/%i\n"
 msgstr "  Podzariadenia: %i/%i\n"
 
-#: aplay/aplay.c:285
+#: aplay/aplay.c:297
 #, c-format
 msgid "  Subdevice #%i: %s\n"
 msgstr "  Subzariadenie #%i: %s\n"
 
-#: aplay/aplay.c:362
+#: aplay/aplay.c:380
 #, c-format
 msgid "Aborted by signal %s...\n"
 msgstr "Zrušené signálom %s...\n"
 
-#: aplay/aplay.c:473
+#: aplay/aplay.c:492
 msgid "command should be named either arecord or aplay"
 msgstr "príkaz by mal byť pomenovaný ako arecord alebo aplay"
 
-#: aplay/aplay.c:512
+#: aplay/aplay.c:531
 #, c-format
 msgid "unrecognized file format %s"
 msgstr "nerozoznaný formát súboru %s"
 
-#: aplay/aplay.c:519
+#: aplay/aplay.c:538
 #, c-format
 msgid "value %i for channels is invalid"
 msgstr "hodnota %i pre kanály je chybná"
 
-#: aplay/aplay.c:538
+#: aplay/aplay.c:557
 #, c-format
 msgid "wrong extended format '%s'"
 msgstr "nesprávny rozšírený formát '%s'"
 
-#: aplay/aplay.c:549
+#: aplay/aplay.c:568
 #, c-format
 msgid "bad speed value %i"
 msgstr "nesprávna hodnota rýchlosti %i"
 
-#: aplay/aplay.c:644
+#: aplay/aplay.c:666
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Skúste `%s --help' pre viac informácií\n"
 
-#: aplay/aplay.c:660
+#: aplay/aplay.c:682
 #, c-format
 msgid "audio open error: %s"
 msgstr "chyba počas otvárania zvuku: %s"
 
-#: aplay/aplay.c:665
+#: aplay/aplay.c:687
 #, c-format
 msgid "info error: %s"
 msgstr "info chyba: %s"
 
-#: aplay/aplay.c:672
+#: aplay/aplay.c:694
 #, c-format
 msgid "nonblock setting error: %s"
 msgstr "chyba nastavenia nonblocku: %s"
 
-#: aplay/aplay.c:682 aplay/aplay.c:806 aplay/aplay.c:1174
+#: aplay/aplay.c:704 aplay/aplay.c:828 aplay/aplay.c:1196
 msgid "not enough memory"
 msgstr "nedostatok pamäti"
 
-#: aplay/aplay.c:706
+#: aplay/aplay.c:728
 #, c-format
 msgid "Cannot create process ID file %s: %s"
 msgstr ""
 
-#: aplay/aplay.c:796
+#: aplay/aplay.c:818
 #, c-format
 msgid "read error (called from line %i)"
 msgstr "chyba pri čítaní (vyvolaná z riadku %i)"
 
-#: aplay/aplay.c:854
+#: aplay/aplay.c:876
 #, c-format
 msgid "unknown length of 'fmt ' chunk (read %u, should be %u at least)"
 msgstr "neznáma dĺžka časti 'fmt ' (načítaná %u, mala by byť najmenej %u)"
 
-#: aplay/aplay.c:864
+#: aplay/aplay.c:886
 #, c-format
 msgid ""
 "unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"
 msgstr ""
 
-#: aplay/aplay.c:869
+#: aplay/aplay.c:891
 msgid "wrong format tag in extensible 'fmt ' chunk"
 msgstr ""
 
-#: aplay/aplay.c:876
+#: aplay/aplay.c:898
 #, c-format
 msgid "can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"
 msgstr ""
 
-#: aplay/aplay.c:880
+#: aplay/aplay.c:902
 #, c-format
 msgid "can't play WAVE-files with %d tracks"
 msgstr ""
 
-#: aplay/aplay.c:888 aplay/aplay.c:988
+#: aplay/aplay.c:910 aplay/aplay.c:1010
 #, c-format
 msgid "Warning: format is changed to U8\n"
 msgstr ""
 
-#: aplay/aplay.c:894
+#: aplay/aplay.c:916
 #, c-format
 msgid "Warning: format is changed to S16_LE\n"
 msgstr ""
 
-#: aplay/aplay.c:902
+#: aplay/aplay.c:924
 #, c-format
 msgid "Warning: format is changed to S24_3LE\n"
 msgstr ""
 
-#: aplay/aplay.c:908
+#: aplay/aplay.c:930
 #, c-format
 msgid "Warning: format is changed to S24_LE\n"
 msgstr "Upozornenie: formát je zmenený na S24_LE\n"
 
-#: aplay/aplay.c:912
+#: aplay/aplay.c:934
 #, c-format
 msgid ""
 " can't play WAVE-files with sample %d bits in %d bytes wide (%d channels)"
 msgstr ""
 " nemôžem prehrať WAVE-súbory so vzorom %d bitov v šírke %d bytov (%d kanálov)"
 
-#: aplay/aplay.c:924
+#: aplay/aplay.c:946
 #, c-format
 msgid " can't play WAVE-files with sample %d bits wide"
 msgstr " nemôžem prehrať WAVE-súbory so vzorom %d bitov"
 
-#: aplay/aplay.c:982
+#: aplay/aplay.c:1004
 #, c-format
 msgid "Warning: format is changed to MU_LAW\n"
 msgstr "Upozornenie: formát zmenený na MU_LAW\n"
 
-#: aplay/aplay.c:994
+#: aplay/aplay.c:1016
 #, c-format
 msgid "Warning: format is changed to S16_BE\n"
 msgstr "Upozornenie: formát zmenený na S16_BE\n"
 
-#: aplay/aplay.c:1007 aplay/aplay.c:1925 aplay/aplay.c:1932 aplay/aplay.c:2455
-#: aplay/aplay.c:2467
+#: aplay/aplay.c:1029 aplay/aplay.c:1953 aplay/aplay.c:1960 aplay/aplay.c:2483
+#: aplay/aplay.c:2495
 msgid "read error"
 msgstr "chyba čítania"
 
-#: aplay/aplay.c:1037
+#: aplay/aplay.c:1059
 msgid "Broken configuration for this PCM: no configurations available"
 msgstr ""
 "Poškodená konfigurácia pre tento PCM: žiadne konfigurácie nie sú k dispozícií"
 
-#: aplay/aplay.c:1054
+#: aplay/aplay.c:1076
 msgid "Access type not available"
 msgstr "Typ prístupu nie je dostupný"
 
-#: aplay/aplay.c:1059
+#: aplay/aplay.c:1081
 msgid "Sample format non available"
 msgstr ""
 
-#: aplay/aplay.c:1065
+#: aplay/aplay.c:1087
 msgid "Channels count non available"
 msgstr "Počet kanálov nie je dostupný"
 
-#: aplay/aplay.c:1080
+#: aplay/aplay.c:1102
 #, c-format
 msgid "Warning: rate is not accurate (requested = %iHz, got = %iHz)\n"
 msgstr "Upozornenie: rate nie je presné (požadované = %iHz, je = %iHz)\n"
 
-#: aplay/aplay.c:1086
+#: aplay/aplay.c:1108
 #, c-format
 msgid "         please, try the plug plugin %s\n"
 msgstr "         prosím, skúste aktivovať modul %s\n"
 
-#: aplay/aplay.c:1123
+#: aplay/aplay.c:1145
 msgid "Unable to install hw params:"
 msgstr "Nieje možné nainštalovať hw premenné:"
 
-#: aplay/aplay.c:1130
+#: aplay/aplay.c:1152
 #, c-format
 msgid "Can't use period equal to buffer size (%lu == %lu)"
 msgstr "Nemôžem použiť interval rovný veľkosti bufferu (%lu == %lu)"
 
-#: aplay/aplay.c:1161
+#: aplay/aplay.c:1183
 msgid "unable to install sw params:"
 msgstr "nemôžem nainštalovať sw parametre:"
 
-#: aplay/aplay.c:1192
+#: aplay/aplay.c:1214
 #, c-format
 msgid "snd_pcm_mmap_begin problem: %s"
 msgstr ""
 
-#: aplay/aplay.c:1215
+#: aplay/aplay.c:1239
 #, c-format
 msgid "stdin O_NONBLOCK flag setup failed\n"
 msgstr ""
 
-#: aplay/aplay.c:1237
+#: aplay/aplay.c:1263
 #, c-format
 msgid "\rPAUSE command ignored (no hw support)\n"
 msgstr ""
 
-#: aplay/aplay.c:1242
+#: aplay/aplay.c:1268
 #, c-format
 msgid "pause push error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1251
+#: aplay/aplay.c:1277
 #, c-format
 msgid "pause release error: %s"
 msgstr ""
 
-#: aplay/aplay.c:1265
+#: aplay/aplay.c:1293
 #, c-format
 msgid ""
 "\r=== PAUSE ===                                                            "
 msgstr ""
 
-#: aplay/aplay.c:1307
+#: aplay/aplay.c:1335
 #, c-format
 msgid "status error: %s"
 msgstr "stavová chyba: %s"
 
-#: aplay/aplay.c:1317 aplay/aplay.c:1328
+#: aplay/aplay.c:1345 aplay/aplay.c:1356
 #, c-format
 msgid "%s!!! (at least %.3f ms long)\n"
 msgstr "%s!!! (aspoň %.3f ms dlhé)\n"
 
-#: aplay/aplay.c:1318 aplay/aplay.c:1321 aplay/aplay.c:1329
+#: aplay/aplay.c:1346 aplay/aplay.c:1349 aplay/aplay.c:1357
 msgid "underrun"
 msgstr "podtečenie"
 
-#: aplay/aplay.c:1318 aplay/aplay.c:1329
+#: aplay/aplay.c:1346 aplay/aplay.c:1357
 msgid "overrun"
 msgstr "pretečenie"
 
-#: aplay/aplay.c:1333
+#: aplay/aplay.c:1361
 #, c-format
 msgid "Status:\n"
 msgstr "Stav:\n"
 
-#: aplay/aplay.c:1337
+#: aplay/aplay.c:1365
 #, c-format
 msgid "xrun: prepare error: %s"
 msgstr "xrun: chyba prípravy: %s"
 
-#: aplay/aplay.c:1343
+#: aplay/aplay.c:1371
 #, c-format
 msgid "Status(DRAINING):\n"
 msgstr "Stav(DRAINING):\n"
 
-#: aplay/aplay.c:1347
+#: aplay/aplay.c:1375
 #, c-format
 msgid "capture stream format change? attempting recover...\n"
 msgstr "zmena ukladacieho formátu streamu? pokúšam sa o obnovu...\n"
 
-#: aplay/aplay.c:1349
+#: aplay/aplay.c:1377
 #, c-format
 msgid "xrun(DRAINING): prepare error: %s"
 msgstr "xrun(DRAINING): prepare error: %s"
 
-#: aplay/aplay.c:1356
+#: aplay/aplay.c:1384
 #, c-format
 msgid "Status(R/W):\n"
 msgstr "Stav(R/W):\n"
 
-#: aplay/aplay.c:1359
+#: aplay/aplay.c:1387
 #, c-format
 msgid "read/write error, state = %s"
 msgstr "chyba čítania/zápisu, stav = %s"
 
-#: aplay/aplay.c:1369
+#: aplay/aplay.c:1397
 #, c-format
 msgid "Suspended. Trying resume. "
 msgstr "Pozastavené. Skúša sa pokračovať. "
 
-#: aplay/aplay.c:1374
+#: aplay/aplay.c:1402
 #, c-format
 msgid "Failed. Restarting stream. "
 msgstr "Zlyhanie. Reštartujem stram. "
 
-#: aplay/aplay.c:1376
+#: aplay/aplay.c:1404
 #, c-format
 msgid "suspend: prepare error: %s"
 msgstr "pozastavenie: chyba prípravy: %s"
 
-#: aplay/aplay.c:1381
+#: aplay/aplay.c:1409
 #, c-format
 msgid "Done.\n"
 msgstr "Hotovo.\n"
 
-#: aplay/aplay.c:1403
+#: aplay/aplay.c:1431
 #, c-format
 msgid " !clip  "
 msgstr " !clip  "
 
-#: aplay/aplay.c:1550
+#: aplay/aplay.c:1578
 #, c-format
 msgid "Unsupported bit size %d.\n"
 msgstr "Nepodporovaná bitová veľkosť %d.\n"
 
-#: aplay/aplay.c:1584
+#: aplay/aplay.c:1612
 #, c-format
 msgid "Max peak (%li samples): 0x%08x "
 msgstr "Maximálny vrchol (%li vzorov): 0x%08x "
 
-#: aplay/aplay.c:1618
+#: aplay/aplay.c:1646
 #, c-format
 msgid ""
 "Suspicious buffer position (%li total): avail = %li, delay = %li, buffer = "
 "%li\n"
 msgstr ""
 
-#: aplay/aplay.c:1682
+#: aplay/aplay.c:1710
 #, c-format
 msgid "write error: %s"
 msgstr "chyba pri zápise: %s"
 
-#: aplay/aplay.c:1729
+#: aplay/aplay.c:1757
 #, c-format
 msgid "writev error: %s"
 msgstr "chyba pri čítaní: %s"
 
-#: aplay/aplay.c:1773
+#: aplay/aplay.c:1801
 #, c-format
 msgid "read error: %s"
 msgstr "chyba pri čítaní: %s"
 
-#: aplay/aplay.c:1817
+#: aplay/aplay.c:1845
 #, c-format
 msgid "readv error: %s"
 msgstr "readv chyba: %s"
 
-#: aplay/aplay.c:1865
+#: aplay/aplay.c:1893
 msgid "can't allocate buffer for silence"
 msgstr "nemôžem alokovať buffer pre ticho"
 
-#: aplay/aplay.c:1874 aplay/aplay.c:2100 aplay/aplay.c:2105 aplay/aplay.c:2152
-#: aplay/aplay.c:2161 aplay/aplay.c:2168 aplay/aplay.c:2178 aplay/aplay.c:2184
-#: aplay/aplay.c:2256 aplay/aplay.c:2286 aplay/aplay.c:2300
+#: aplay/aplay.c:1902 aplay/aplay.c:2128 aplay/aplay.c:2133 aplay/aplay.c:2180
+#: aplay/aplay.c:2189 aplay/aplay.c:2196 aplay/aplay.c:2206 aplay/aplay.c:2212
+#: aplay/aplay.c:2284 aplay/aplay.c:2314 aplay/aplay.c:2328
 msgid "write error"
 msgstr "chyba pri zápise"
 
-#: aplay/aplay.c:1887
+#: aplay/aplay.c:1915
 #, c-format
 msgid "voc_pcm_flush - silence error"
 msgstr ""
 
-#: aplay/aplay.c:1890
+#: aplay/aplay.c:1918
 msgid "voc_pcm_flush error"
 msgstr "voc_pcm_flush chyba"
 
-#: aplay/aplay.c:1916
+#: aplay/aplay.c:1944
 msgid "malloc error"
 msgstr "chyba pri alokovaní pamäte"
 
-#: aplay/aplay.c:1920
+#: aplay/aplay.c:1948
 #, c-format
 msgid "Playing Creative Labs Channel file '%s'...\n"
 msgstr "Prehráva sa Creative Labs Channel súbor '%s'...\n"
 
-#: aplay/aplay.c:1988 aplay/aplay.c:2080
+#: aplay/aplay.c:2016 aplay/aplay.c:2108
 msgid "can't play packed .voc files"
 msgstr "nedá sa prehrávať zbalené .voc súbory"
 
-#: aplay/aplay.c:2040
+#: aplay/aplay.c:2068
 #, c-format
 msgid "can't play loops; %s isn't seekable\n"
 msgstr "nemožno hrať v slučke; v %s nemožno vyhľadávať\n"
 
-#: aplay/aplay.c:2089
+#: aplay/aplay.c:2117
 #, c-format
 msgid "unknown blocktype %d. terminate."
 msgstr "neznámy typ bloku %d. ukončujem."
 
-#: aplay/aplay.c:2220
+#: aplay/aplay.c:2248
 #, c-format
 msgid "Wave doesn't support %s format..."
 msgstr "Wave nepodporuje formát %s..."
 
-#: aplay/aplay.c:2280
+#: aplay/aplay.c:2308
 #, c-format
 msgid "Sparc Audio doesn't support %s format..."
 msgstr "Sparc Audio nepodporuje formát %s..."
 
-#: aplay/aplay.c:2361
+#: aplay/aplay.c:2389
 msgid "Playing"
 msgstr "Prehrávanie"
 
-#: aplay/aplay.c:2361
+#: aplay/aplay.c:2389
 msgid "Recording"
 msgstr "Nahrávanie"
 
-#: aplay/aplay.c:2365
+#: aplay/aplay.c:2393
 #, c-format
 msgid "Rate %d Hz, "
 msgstr "Rate %d Hz, "
 
-#: aplay/aplay.c:2367
+#: aplay/aplay.c:2395
 #, c-format
 msgid "Mono"
 msgstr "Mono"
 
-#: aplay/aplay.c:2369
+#: aplay/aplay.c:2397
 #, c-format
 msgid "Stereo"
 msgstr "Stereo"
 
-#: aplay/aplay.c:2371
+#: aplay/aplay.c:2399
 #, c-format
 msgid "Channels %i"
 msgstr "Kanály %i"
 
-#: aplay/aplay.c:2882 aplay/aplay.c:2935
+#: aplay/aplay.c:2910 aplay/aplay.c:2963
 #, c-format
 msgid "You need to specify %d files"
 msgstr "Potrebujete špecifikovať %d súbory"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apparmorapplet.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apparmorapplet.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apparmorapplet.po	2012-01-02 17:51:07.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apparmorapplet.po	2012-02-23 06:55:53.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/apparmor-applet.c:244
 msgid ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/app-install-data.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/app-install-data.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/app-install-data.po	2012-01-02 17:51:08.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/app-install-data.po	2012-02-23 06:55:53.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: app-install-data-ubuntu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-28 20:33+0000\n"
+"POT-Creation-Date: 2012-01-31 17:33+0000\n"
 "PO-Revision-Date: 2011-01-08 13:08+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../menu-data-additional/7zip.desktop.in.h:1
 msgid "7zip"
@@ -53,31 +53,31 @@
 "ATI"
 
 #: ../menu-data-additional/flashplugin-installer.desktop.in.h:1
-msgid "Adobe Flash plugin"
-msgstr "Zásuvný modul Adobe Flash"
-
-#: ../menu-data-additional/flashplugin-installer.desktop.in.h:2
 msgid "Installer for the Adobe Flash plugin for Mozilla"
 msgstr "Inštalátor zásuvného modulu Adobe Flash pre prehliadače Mozilla"
 
+#: ../menu-data-additional/flashplugin-installer.desktop.in.h:2
+msgid "Adobe Flash plugin"
+msgstr "Zásuvný modul Adobe Flash"
+
 #: ../menu-data-additional/gnome-utils.desktop.in.h:1
+msgid "GNOME Desktop Utilities"
+msgstr "Nástroje pracovného prostredia GNOME"
+
+#: ../menu-data-additional/gnome-utils.desktop.in.h:2
 msgid "Dictionary, Disk Usage Analyzer, Log File Viewer, Search Tool"
 msgstr ""
 "Slovník, analyzátor využitia disku, zobrazovač súborov protokolu, "
 "vyhľadávací nástroj"
 
-#: ../menu-data-additional/gnome-utils.desktop.in.h:2
-msgid "GNOME Desktop Utilities"
-msgstr "Nástroje pracovného prostredia GNOME"
-
 #: ../menu-data-additional/icedtea-plugin.desktop.in.h:1
-msgid "Icedtea Java Browser Plugin"
-msgstr "Zásuvný modul prehliadača Icedtea Java"
-
-#: ../menu-data-additional/icedtea-plugin.desktop.in.h:2
 msgid "Icedtea Java Plugin"
 msgstr "Zásuvný modul Icedtea Java"
 
+#: ../menu-data-additional/icedtea-plugin.desktop.in.h:2
+msgid "Icedtea Java Browser Plugin"
+msgstr "Zásuvný modul prehliadača Icedtea Java"
+
 #: ../menu-data-additional/kernelpanic.desktop.in.h:1
 msgid "Kernel Panic"
 msgstr "Kernel Panic"
@@ -152,22 +152,22 @@
 msgstr "Toto je zbierka slobodných klipartov"
 
 #: ../menu-data-additional/pidgin-otr.desktop.in.h:1
-msgid "Off-the-Record Messaging plugin for pidgin"
-msgstr "Zásuvný modul Off-the-Record pre Pidgin"
-
-#: ../menu-data-additional/pidgin-otr.desktop.in.h:2
 msgid "Pidgin Internet Messenger Off-the-Record Plugin"
 msgstr ""
 "Zásuvný modul Off-the-Record pre internetový komunikačný program Pidgin"
 
-#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1
-msgid "30 useful plugins for pidgin"
-msgstr "30 užitočných zásuvných modulov pre Pidgin"
+#: ../menu-data-additional/pidgin-otr.desktop.in.h:2
+msgid "Off-the-Record Messaging plugin for pidgin"
+msgstr "Zásuvný modul Off-the-Record pre Pidgin"
 
-#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2
+#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:1
 msgid "Pidgin Internet Messenger Plugin Pack"
 msgstr "Balík zásuvných modulov pre Pidgin"
 
+#: ../menu-data-additional/pidgin-plugin-pack.desktop.in.h:2
+msgid "30 useful plugins for pidgin"
+msgstr "30 užitočných zásuvných modulov pre Pidgin"
+
 #: ../menu-data-additional/rar.desktop.in.h:1
 msgid "RAR"
 msgstr "RAR"
@@ -177,22 +177,22 @@
 msgstr "komprimačný/dekomprimačný nástroj RAR"
 
 #: ../menu-data-additional/spamassassin.desktop.in.h:1
+msgid "Spamassassin"
+msgstr "Spamassassin"
+
+#: ../menu-data-additional/spamassassin.desktop.in.h:2
 msgid "Spam filter using text analysis (works with Evolution Mail)"
 msgstr ""
 "Filtrovanie spamu nazáklade analýzy textu (funguje s klientom Evolution)"
 
-#: ../menu-data-additional/spamassassin.desktop.in.h:2
-msgid "Spamassassin"
-msgstr "Spamassassin"
-
 #: ../menu-data-additional/totem-plugin-arte.desktop.in.h:1
-msgid "A totem plugin to watch streams from arte.tv"
-msgstr "Zásuvný modul pre Totem na sledovanie tokov z arte.tv"
-
-#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2
 msgid "Arte plugin for totem"
 msgstr "Zásuvný modul Arte pre Totem"
 
+#: ../menu-data-additional/totem-plugin-arte.desktop.in.h:2
+msgid "A totem plugin to watch streams from arte.tv"
+msgstr "Zásuvný modul pre Totem na sledovanie tokov z arte.tv"
+
 #: ../menu-data-additional/ubuntu-restricted-extras.desktop.in.h:1
 msgid ""
 "Commonly used applications with restricted copyright (mp3, avi, mpeg, "
@@ -308,16 +308,16 @@
 msgstr "Podpora GPG pre Thunderbird"
 
 #: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:1
+msgid "Firefox Launchpad plugin"
+msgstr "Doplnok Firefox Launchpad"
+
+#: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2
 msgid ""
 "Firefox Launchpad integration adds quick search for Launchpad services"
 msgstr ""
 "Integrácia Launchpadu do programu Firefox pridá vyhľadávač pre služby "
 "Launchpadu"
 
-#: ../menu-data-xul-extensions/firefox-launchpad-plugin.desktop.in.h:2
-msgid "Firefox Launchpad plugin"
-msgstr "Doplnok Firefox Launchpad"
-
 #: ../menu-data-xul-extensions/xul-ext-ubufox.desktop.in.h:1
 msgid "Ubufox extension for Firefox"
 msgstr "Rozšírenie Ubufox pre Firefox"
@@ -335,11 +335,19 @@
 msgstr "3D šach pre X11"
 
 #: ../menu-data/3depict:3depict.desktop.in.h:1
-msgid "3depict"
+msgid "Valued point cloud visualisation and analysis"
 msgstr ""
 
 #: ../menu-data/3depict:3depict.desktop.in.h:2
-msgid "Valued point cloud visualisation and analysis"
+msgid "3depict"
+msgstr ""
+
+#: ../menu-data/4digits:4digits.desktop.in.h:1
+msgid "4digits"
+msgstr ""
+
+#: ../menu-data/4digits:4digits.desktop.in.h:2
+msgid "A guess-the-number game, aka Bulls and Cows"
 msgstr ""
 
 #: ../menu-data/7kaa:7kaa.desktop.in.h:1
@@ -383,21 +391,21 @@
 msgstr "Správca hudby"
 
 #: ../menu-data/abuse:abuse.desktop.in.h:1
-msgid "A side-scrolling shoot-em-up action game"
-msgstr "akčná plošinová strieľačka"
-
-#: ../menu-data/abuse:abuse.desktop.in.h:2
 msgid "Abuse"
 msgstr "Abuse"
 
-#: ../menu-data/accerciser:accerciser.desktop.in.h:1
-msgid "Accerciser Accessibility Explorer"
-msgstr ""
+#: ../menu-data/abuse:abuse.desktop.in.h:2
+msgid "A side-scrolling shoot-em-up action game"
+msgstr "akčná plošinová strieľačka"
 
-#: ../menu-data/accerciser:accerciser.desktop.in.h:2
+#: ../menu-data/accerciser:accerciser.desktop.in.h:1
 msgid "Give your application an accessibility workout"
 msgstr "Prehodnoťte prístupnosť svojej aplikácie"
 
+#: ../menu-data/accerciser:accerciser.desktop.in.h:2
+msgid "Accerciser Accessibility Explorer"
+msgstr ""
+
 #: ../menu-data/ace-of-penguins:penguin-canfield.desktop.in.h:1
 msgid "Penguin Canfield"
 msgstr ""
@@ -511,13 +519,13 @@
 msgstr "Leťte so svojou loďou v 4D prostredí"
 
 #: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:1
-msgid "A 2D graphical RPG"
-msgstr "RPG v 2D grafike"
-
-#: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2
 msgid "Waste's Edge"
 msgstr "Waste's Edge"
 
+#: ../menu-data/adonthell-data:adonthell-data.desktop.in.h:2
+msgid "A 2D graphical RPG"
+msgstr "RPG v 2D grafike"
+
 #: ../menu-data/adun.app:UL.desktop.in.h:1
 msgid "Adun"
 msgstr "Adun"
@@ -527,11 +535,11 @@
 msgstr "Biomolekulárny Simulátor"
 
 #: ../menu-data/aee:xae.desktop.in.h:1
-msgid "Small text editor"
+msgid "xae"
 msgstr ""
 
 #: ../menu-data/aee:xae.desktop.in.h:2
-msgid "xae"
+msgid "Small text editor"
 msgstr ""
 
 #: ../menu-data/aeolus:aeolus.desktop.in.h:1
@@ -559,13 +567,13 @@
 msgstr "Tvorba farebných schém"
 
 #: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:1
-msgid "Simple agenda and calendar application for GNUstep"
-msgstr "Jednoduchá agenda a kalendár pre GNUstep"
-
-#: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2
 msgid "SimpleAgenda"
 msgstr ""
 
+#: ../menu-data/agenda.app:SimpleAgenda.desktop.in.h:2
+msgid "Simple agenda and calendar application for GNUstep"
+msgstr "Jednoduchá agenda a kalendár pre GNUstep"
+
 #: ../menu-data/agtl:advancedcaching.desktop.in.h:1
 msgid "AGTL Geocaching Tool"
 msgstr ""
@@ -599,21 +607,21 @@
 msgstr "Množstvo hier pre jedného hráča"
 
 #: ../menu-data/akregator:kde4__akregator.desktop.in.h:1
-msgid "A KDE News Feed Reader"
-msgstr ""
-
-#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2
 msgid "Akregator"
 msgstr "Akregator"
 
-#: ../menu-data/alacarte:alacarte.desktop.in.h:1
-msgid "Change which applications are shown on the main menu"
-msgstr "Zmeňte, ktoré aplikácie sa zobrazujú v hlavnej ponuke systému"
+#: ../menu-data/akregator:kde4__akregator.desktop.in.h:2
+msgid "A KDE News Feed Reader"
+msgstr ""
 
-#: ../menu-data/alacarte:alacarte.desktop.in.h:2
+#: ../menu-data/alacarte:alacarte.desktop.in.h:1
 msgid "Main Menu"
 msgstr "Hlavná ponuka"
 
+#: ../menu-data/alacarte:alacarte.desktop.in.h:2
+msgid "Change which applications are shown on the main menu"
+msgstr "Zmeňte, ktoré aplikácie sa zobrazujú v hlavnej ponuke systému"
+
 #: ../menu-data/alarm-clock-applet:alarm-clock-applet.desktop.in.h:1
 #: ../menu-data/alarm-clock:alarm-clock.desktop.in.h:1
 msgid "Alarm Clock"
@@ -636,13 +644,13 @@
 msgstr "Retro plošinovka"
 
 #: ../menu-data/alien-arena:alien-arena.desktop.in.h:1
-msgid "A standalone 3D first person online deathmatch shooter"
-msgstr ""
-
-#: ../menu-data/alien-arena:alien-arena.desktop.in.h:2
 msgid "Alien Arena"
 msgstr "Alien Arena"
 
+#: ../menu-data/alien-arena:alien-arena.desktop.in.h:2
+msgid "A standalone 3D first person online deathmatch shooter"
+msgstr ""
+
 #: ../menu-data/aliki:aliki-alsa.desktop.in.h:1
 msgid "Aliki (with ALSA support)"
 msgstr ""
@@ -702,6 +710,14 @@
 msgid "OpenAL-Soft Configuration Utility"
 msgstr "Konfiguračný nástroj OpenAL-Soft"
 
+#: ../menu-data/altos:altos.desktop.in.h:1
+msgid "AltOS UI"
+msgstr ""
+
+#: ../menu-data/altos:altos.desktop.in.h:2
+msgid "View and log downlink data from Altus Metrum products"
+msgstr ""
+
 #: ../menu-data/amarok:kde4__amarok.desktop.in.h:1
 msgid "Amarok"
 msgstr "Amarok"
@@ -711,19 +727,19 @@
 msgstr "Amarok - Znovu objavte svoju hudbu!"
 
 #: ../menu-data/amide:amide.desktop.in.h:1
-msgid "A Medical Image Data Examiner"
-msgstr "Prehliadač medicínskych obrazov"
-
-#: ../menu-data/amide:amide.desktop.in.h:2
 msgid "Amide"
 msgstr "Amide"
 
+#: ../menu-data/amide:amide.desktop.in.h:2
+msgid "A Medical Image Data Examiner"
+msgstr "Prehliadač medicínskych obrazov"
+
 #: ../menu-data/amoebax:amoebax.desktop.in.h:1
-msgid "Amoebax"
+msgid "Defeat your opponent by filling up their grid up with garbage."
 msgstr ""
 
 #: ../menu-data/amoebax:amoebax.desktop.in.h:2
-msgid "Defeat your opponent by filling up their grid up with garbage."
+msgid "Amoebax"
 msgstr ""
 
 #: ../menu-data/amor:kde4__amor.desktop.in.h:1
@@ -759,37 +775,37 @@
 msgstr "Modulárny softvérový syntetizér"
 
 #: ../menu-data/amsn:amsn.desktop.in.h:1
-msgid "MSN Messenger for Linux"
-msgstr "MSN Messenger pre Linux"
-
-#: ../menu-data/amsn:amsn.desktop.in.h:2
 msgid "aMSN"
 msgstr "aMSN"
 
-#: ../menu-data/amsynth:amsynth.desktop.in.h:1
-msgid "Two oscillator software synthesizer"
-msgstr "Softvérový syntetizér s dvomi oscilátormi"
+#: ../menu-data/amsn:amsn.desktop.in.h:2
+msgid "MSN Messenger for Linux"
+msgstr "MSN Messenger pre Linux"
 
-#: ../menu-data/amsynth:amsynth.desktop.in.h:2
+#: ../menu-data/amsynth:amsynth.desktop.in.h:1
 msgid "amSynth"
 msgstr "amSynth"
 
-#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1
-msgid "aMule remote control"
-msgstr "diaľkové ovládanie aMule"
+#: ../menu-data/amsynth:amsynth.desktop.in.h:2
+msgid "Two oscillator software synthesizer"
+msgstr "Softvérový syntetizér s dvomi oscilátormi"
 
-#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2
+#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:1
 msgid "aMuleGUI"
 msgstr "aMuleGUI"
 
-#: ../menu-data/amule:amule.desktop.in.h:1
-msgid "A client for the eD2k network"
-msgstr "Klient siete ed2k"
+#: ../menu-data/amule-utils-gui:amulegui.desktop.in.h:2
+msgid "aMule remote control"
+msgstr "diaľkové ovládanie aMule"
 
-#: ../menu-data/amule:amule.desktop.in.h:2
+#: ../menu-data/amule:amule.desktop.in.h:1
 msgid "aMule"
 msgstr "aMule"
 
+#: ../menu-data/amule:amule.desktop.in.h:2
+msgid "A client for the eD2k network"
+msgstr "Klient siete ed2k"
+
 #: ../menu-data/anagramarama:anagramarama.desktop.in.h:1
 msgid "Anagramarama"
 msgstr "Anagramarama"
@@ -799,32 +815,32 @@
 msgstr "Anagram je rýchla logická hra využívajúca SDL"
 
 #: ../menu-data/angband:angband-gtk.desktop.in.h:1
-#: ../menu-data/angband:angband-sdl.desktop.in.h:1
-#: ../menu-data/angband:angband-x11.desktop.in.h:1
-msgid ""
-"A roguelike dungeon exploration game based on the books of J.R.R.Tolkien"
+msgid "Angband (GTK)"
 msgstr ""
 
 #: ../menu-data/angband:angband-gtk.desktop.in.h:2
-msgid "Angband (GTK)"
+#: ../menu-data/angband:angband-sdl.desktop.in.h:2
+#: ../menu-data/angband:angband-x11.desktop.in.h:2
+msgid ""
+"A roguelike dungeon exploration game based on the books of J.R.R.Tolkien"
 msgstr ""
 
-#: ../menu-data/angband:angband-sdl.desktop.in.h:2
+#: ../menu-data/angband:angband-sdl.desktop.in.h:1
 msgid "Angband (SDL)"
 msgstr ""
 
-#: ../menu-data/angband:angband-x11.desktop.in.h:2
+#: ../menu-data/angband:angband-x11.desktop.in.h:1
 msgid "Angband (X11)"
 msgstr ""
 
 #: ../menu-data/angrydd:angrydd.desktop.in.h:1
-msgid "\"Falling blocks puzzle game\""
-msgstr "Logická hra s padajúcimi kockami"
-
-#: ../menu-data/angrydd:angrydd.desktop.in.h:2
 msgid "Angry Drunken Dwarves"
 msgstr "Angry Drunken Dwarves"
 
+#: ../menu-data/angrydd:angrydd.desktop.in.h:2
+msgid "\"Falling blocks puzzle game\""
+msgstr "Logická hra s padajúcimi kockami"
+
 #: ../menu-data/anjuta:anjuta.desktop.in.h:1
 msgid "Anjuta IDE"
 msgstr "IDE Anjuta"
@@ -834,21 +850,21 @@
 msgstr "Vývoj softvéru v integrovanom vývojovom prostredí"
 
 #: ../menu-data/anki:anki.desktop.in.h:1
-msgid "An intelligent spaced-repetition memory training program"
-msgstr "Inteligentný program na trénovanie priestorovej pamäte"
-
-#: ../menu-data/anki:anki.desktop.in.h:2
 msgid "Anki"
 msgstr "Anki"
 
-#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1
-msgid "Translate as you type"
-msgstr "Prekladajte ako píšete"
+#: ../menu-data/anki:anki.desktop.in.h:2
+msgid "An intelligent spaced-repetition memory training program"
+msgstr "Inteligentný program na trénovanie priestorovej pamäte"
 
-#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2
+#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:1
 msgid "Translator"
 msgstr "Prekladač"
 
+#: ../menu-data/apertium-tolk:apertium-tolk.desktop.in.h:2
+msgid "Translate as you type"
+msgstr "Prekladajte ako píšete"
+
 #: ../menu-data/apper:kde4__apper.desktop.in.h:1
 msgid "Apper"
 msgstr ""
@@ -862,7 +878,7 @@
 msgstr "Správca balíkov Aptitude"
 
 #: ../menu-data/aptitude-gtk:aptitude-gtk.desktop.in.h:2
-#: ../menu-data/synaptic:synaptic.desktop.in.h:1
+#: ../menu-data/synaptic:synaptic.desktop.in.h:2
 msgid "Install, remove and upgrade software packages"
 msgstr "Inštalácia, odstraňovanie a aktualizácia balíkov softvéru"
 
@@ -879,13 +895,13 @@
 msgstr ""
 
 #: ../menu-data/apvlv:apvlv.desktop.in.h:1
-msgid "Alf's PDF Viewer Like Vim"
-msgstr ""
-
-#: ../menu-data/apvlv:apvlv.desktop.in.h:2
 msgid "apvlv"
 msgstr "apvlv"
 
+#: ../menu-data/apvlv:apvlv.desktop.in.h:2
+msgid "Alf's PDF Viewer Like Vim"
+msgstr ""
+
 #: ../menu-data/aqemu:aqemu.desktop.in.h:1
 msgid "AQEMU"
 msgstr "AQEMU"
@@ -946,11 +962,11 @@
 msgstr ""
 
 #: ../menu-data/ardesia:ardesia.desktop.in.h:1
-msgid "Annotate on the desktop screen."
+msgid "Ardesia desktop sketchpad "
 msgstr ""
 
 #: ../menu-data/ardesia:ardesia.desktop.in.h:2
-msgid "Ardesia desktop sketchpad "
+msgid "Annotate on the desktop screen."
 msgstr ""
 
 #: ../menu-data/ardour-i686:ardour.desktop.in.h:1
@@ -1004,21 +1020,21 @@
 msgstr ""
 
 #: ../menu-data/armagetronad:armagetronad.desktop.in.h:1
-msgid "3d light cycle game"
-msgstr "Hra s 3D svetelnými motorkami"
-
-#: ../menu-data/armagetronad:armagetronad.desktop.in.h:2
 msgid "Armagetron Advanced"
 msgstr "Armagetron Advanced"
 
+#: ../menu-data/armagetronad:armagetronad.desktop.in.h:2
+msgid "3d light cycle game"
+msgstr "Hra s 3D svetelnými motorkami"
+
 #: ../menu-data/arora:arora.desktop.in.h:1
 msgid "Arora"
 msgstr "Arora"
 
 #: ../menu-data/arora:arora.desktop.in.h:2
-#: ../menu-data/dooble:dooble.desktop.in.h:1
-#: ../menu-data/firefox:firefox.desktop.in.h:1
-#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1
+#: ../menu-data/dooble:dooble.desktop.in.h:2
+#: ../menu-data/firefox:firefox.desktop.in.h:2
+#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2
 msgid "Browse the World Wide Web"
 msgstr "Prehliadanie world wide webu"
 
@@ -1039,23 +1055,23 @@
 msgstr "Bráňte svoju základňu"
 
 #: ../menu-data/asciijump:asciijump.desktop.in.h:1
-msgid "A clone of the dsj game"
+msgid "asciijump"
 msgstr ""
 
 #: ../menu-data/asciijump:asciijump.desktop.in.h:2
-msgid "asciijump"
+msgid "A clone of the dsj game"
 msgstr ""
 
 #: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:1
-msgid "Allows you to select the default ALSA sound card"
-msgstr "Umožňuje vám vybrať predvolenú zvukovú kartu v ALSA"
-
-#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2
 msgid "Default Sound Card"
 msgstr "Predvolená zvuková karta"
 
-#: ../menu-data/assaultcube:assaultcube.desktop.in.h:1
-msgid "AssaultCube"
+#: ../menu-data/asoundconf-gtk:asoundconf-gtk.desktop.in.h:2
+msgid "Allows you to select the default ALSA sound card"
+msgstr "Umožňuje vám vybrať predvolenú zvukovú kartu v ALSA"
+
+#: ../menu-data/assaultcube:assaultcube.desktop.in.h:1
+msgid "AssaultCube"
 msgstr "AssaultCube"
 
 #: ../menu-data/assaultcube:assaultcube.desktop.in.h:2
@@ -1071,15 +1087,15 @@
 msgstr "Zmeniť detekciu a zobrazovanie typov súborov"
 
 #: ../menu-data/asunder:asunder.desktop.in.h:1
+msgid "Asunder CD Ripper"
+msgstr "Extraktor CD Asunder"
+
+#: ../menu-data/asunder:asunder.desktop.in.h:2
 msgid ""
 "An application to save tracks from an Audio CD as WAV, MP3, OGG, FLAC, "
 "and/or Wavpack"
 msgstr ""
 
-#: ../menu-data/asunder:asunder.desktop.in.h:2
-msgid "Asunder CD Ripper"
-msgstr "Extraktor CD Asunder"
-
 #: ../menu-data/asylum:asylum.desktop.in.h:1
 msgid "Asylum"
 msgstr "Asylum"
@@ -1117,14 +1133,15 @@
 msgstr "Attal"
 
 #: ../menu-data/attal:attal.desktop.in.h:2
+#: ../menu-data/triplea:triplea.desktop.in.h:2
 msgid "Turn based strategy game"
 msgstr "Ťahová strategická hra"
 
-#: ../menu-data/audacious:audacious2.desktop.in.h:1
+#: ../menu-data/audacious:audacious.desktop.in.h:1
 msgid "Audacious"
 msgstr "Audacious"
 
-#: ../menu-data/audacious:audacious2.desktop.in.h:2
+#: ../menu-data/audacious:audacious.desktop.in.h:2
 msgid "Listen to music"
 msgstr "Počúvajte hudbu"
 
@@ -1167,6 +1184,14 @@
 msgid "AutoKey (QT)"
 msgstr "AutoKey (QT)"
 
+#: ../menu-data/autorenamer:autorenamer.desktop.in.h:1
+msgid "AutoRenamer"
+msgstr ""
+
+#: ../menu-data/autorenamer:autorenamer.desktop.in.h:2
+msgid "Automatically rename files have them sort in given order"
+msgstr ""
+
 #: ../menu-data/avahi-discover:avahi-discover.desktop.in.h:1
 msgid "Avahi Zeroconf Browser"
 msgstr "Prehliadač Avahi Zeroconf"
@@ -1192,13 +1217,13 @@
 msgstr "Prehliadanie VNC serverou pomocou Zeroconf"
 
 #: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:1
-msgid "A dock-like window navigator."
-msgstr "Dokovací prepínač okien"
-
-#: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2
 msgid "Avant Window Navigator"
 msgstr "Správca okien Avant"
 
+#: ../menu-data/avant-window-navigator:avant-window-navigator.desktop.in.h:2
+msgid "A dock-like window navigator."
+msgstr "Dokovací prepínač okien"
+
 #: ../menu-data/avidemux-qt:avidemux-qt.desktop.in.h:1
 msgid "Avidemux (Qt)"
 msgstr "Avidemux (Qt)"
@@ -1213,13 +1238,13 @@
 msgstr "Avidemux (GTK+)"
 
 #: ../menu-data/avogadro:avogadro.desktop.in.h:1
-msgid "Advanced molecular editor"
-msgstr "Pokročilý editor molekúl"
-
-#: ../menu-data/avogadro:avogadro.desktop.in.h:2
 msgid "Avogadro"
 msgstr "Avogadro"
 
+#: ../menu-data/avogadro:avogadro.desktop.in.h:2
+msgid "Advanced molecular editor"
+msgstr "Pokročilý editor molekúl"
+
 #: ../menu-data/aweather:aweather.desktop.in.h:1
 msgid "AWeather"
 msgstr ""
@@ -1245,13 +1270,13 @@
 msgstr "Rozhranie k Axel - odľahčenému urýchľovaču sťahovania"
 
 #: ../menu-data/ayttm:ayttm.desktop.in.h:1
-msgid "\"The GTK Unified Messaging Client\""
-msgstr "Zjednotený klient na posielanie správ pre GTK"
-
-#: ../menu-data/ayttm:ayttm.desktop.in.h:2
 msgid "ayttm"
 msgstr "ayttm"
 
+#: ../menu-data/ayttm:ayttm.desktop.in.h:2
+msgid "\"The GTK Unified Messaging Client\""
+msgstr "Zjednotený klient na posielanie správ pre GTK"
+
 #: ../menu-data/azureus:azureus.desktop.in.h:1
 msgid "Download and share files using the BitTorrent P2P network"
 msgstr "Sťahovanie a zdieľanie súborov pomocou P2P siete BitTorrent"
@@ -1261,13 +1286,13 @@
 msgstr "Vuze"
 
 #: ../menu-data/babiloo:babiloo.desktop.in.h:1
-msgid "Application to view dictionaries"
-msgstr "Aplikácia na prehliadanie slovníkov"
-
-#: ../menu-data/babiloo:babiloo.desktop.in.h:2
 msgid "Babiloo"
 msgstr "Babiloo"
 
+#: ../menu-data/babiloo:babiloo.desktop.in.h:2
+msgid "Application to view dictionaries"
+msgstr "Aplikácia na prehliadanie slovníkov"
+
 #: ../menu-data/backintime-gnome:backintime-gnome.desktop.in.h:1
 #: ../menu-data/backintime-kde:kde4__backintime-kde4.desktop.in.h:1
 msgid "Back In Time"
@@ -1287,20 +1312,28 @@
 msgstr "Zahrajte si 3D adventúru a RPG"
 
 #: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:1
-msgid "3D adventure and roleplaying game"
-msgstr "3D adventúra a RPG"
-
-#: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2
 msgid "Balazar Brothers"
 msgstr "Balazar Brothers"
 
+#: ../menu-data/balazarbrothers:balazarbrothers.desktop.in.h:2
+msgid "3D adventure and roleplaying game"
+msgstr "3D adventúra a RPG"
+
 #: ../menu-data/balder2d:Balder2D.desktop.in.h:1
+msgid "Balder2D"
+msgstr "Balder2D"
+
+#: ../menu-data/balder2d:Balder2D.desktop.in.h:2
 msgid "2D overhead shooter in Zero G"
 msgstr "2D strieľačka v nulovej gravitácii, v pohľade zhora"
 
-#: ../menu-data/balder2d:Balder2D.desktop.in.h:2
-msgid "Balder2D"
-msgstr "Balder2D"
+#: ../menu-data/ballview:ballview.desktop.in.h:1
+msgid "BALLView"
+msgstr "BALLView"
+
+#: ../menu-data/ballview:ballview.desktop.in.h:2
+msgid "Molecular modeling and visualization tool"
+msgstr "Nástroj na modelovanie a vizualizáciu molekúl"
 
 #: ../menu-data/ballz:ballz.desktop.in.h:1
 msgid "B.A.L.L.Z."
@@ -1312,13 +1345,13 @@
 
 #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:1
 #: ../menu-data/balsa:balsa.desktop.in.h:1
-msgid "Balsa Mail Client"
-msgstr ""
+msgid "E-Mail utility"
+msgstr "Nástroj na e-mail"
 
 #: ../menu-data/balsa:balsa-mailto-handler.desktop.in.h:2
 #: ../menu-data/balsa:balsa.desktop.in.h:2
-msgid "E-Mail utility"
-msgstr "Nástroj na e-mail"
+msgid "Balsa Mail Client"
+msgstr ""
 
 #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:1
 msgid "Bangarang"
@@ -1326,7 +1359,7 @@
 
 #: ../menu-data/bangarang:kde4__bangarang.desktop.in.h:2
 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:2
-#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2
+#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1
 msgid "Media Player"
 msgstr ""
 
@@ -1339,20 +1372,28 @@
 msgstr "Hranie a organizácia zbierky multimédií"
 
 #: ../menu-data/bareftp:bareftp.desktop.in.h:1
-msgid "Transfer files using the FTP, FTPS or SFTP protocol"
-msgstr "Prenos súborov pomocou protokolov FTP, FTPS alebo SFTP"
-
-#: ../menu-data/bareftp:bareftp.desktop.in.h:2
 msgid "bareFTP"
 msgstr "bareFTP"
 
+#: ../menu-data/bareftp:bareftp.desktop.in.h:2
+msgid "Transfer files using the FTP, FTPS or SFTP protocol"
+msgstr "Prenos súborov pomocou protokolov FTP, FTPS alebo SFTP"
+
 #: ../menu-data/barrage:barrage.desktop.in.h:1
+msgid "Barrage"
+msgstr "Barrage"
+
+#: ../menu-data/barrage:barrage.desktop.in.h:2
 msgid "A rather destructive action game."
 msgstr ""
 
-#: ../menu-data/barrage:barrage.desktop.in.h:2
-msgid "Barrage"
-msgstr "Barrage"
+#: ../menu-data/basenji:basenji.desktop.in.h:1
+msgid "Basenji"
+msgstr ""
+
+#: ../menu-data/basenji:basenji.desktop.in.h:2
+msgid "A portable volume indexer."
+msgstr ""
 
 #: ../menu-data/basex:basexgui.desktop.in.h:1
 msgid "BaseX XML Database"
@@ -1407,13 +1448,13 @@
 msgstr "Hranie futbalu s tankami"
 
 #: ../menu-data/bauble:bauble.desktop.in.h:1
-msgid "An application for managing botanical collections"
-msgstr "Aplikácie pre správu botanickej zbierky"
-
-#: ../menu-data/bauble:bauble.desktop.in.h:2
 msgid "Bauble"
 msgstr "Bauble"
 
+#: ../menu-data/bauble:bauble.desktop.in.h:2
+msgid "An application for managing botanical collections"
+msgstr "Aplikácie pre správu botanickej zbierky"
+
 #: ../menu-data/beidgui:beidgui35.desktop.in.h:1
 msgid "Belgian eID"
 msgstr "Belgické eID"
@@ -1423,16 +1464,16 @@
 msgstr "Zobrazte a spravujte svoju kartu eID"
 
 #: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:1
+msgid "Beneath A Steel Sky"
+msgstr ""
+
+#: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2
 msgid ""
 "A science-fiction adventure game set in a bleak post-apocalyptic vision of "
 "the future"
 msgstr ""
 "Sci-fi adventúra v prostredí bezútešnej post-apokalyptickej vízie budúcnosti"
 
-#: ../menu-data/beneath-a-steel-sky:beneath-a-steel-sky.desktop.in.h:2
-msgid "Beneath A Steel Sky"
-msgstr ""
-
 #: ../menu-data/berusky:berusky.desktop.in.h:1
 msgid "Berusky"
 msgstr ""
@@ -1442,11 +1483,11 @@
 msgstr "Logická hra založená na Sokoban(TM)"
 
 #: ../menu-data/betaradio:betaradio.desktop.in.h:1
-msgid "An easy way to listen to internet radio of Taiwan."
+msgid "BetaRadio Tuner"
 msgstr ""
 
 #: ../menu-data/betaradio:betaradio.desktop.in.h:2
-msgid "BetaRadio Tuner"
+msgid "An easy way to listen to internet radio of Taiwan."
 msgstr ""
 
 #: ../menu-data/between:between.desktop.in.h:1
@@ -1457,22 +1498,38 @@
 msgid "game about consciousness and isolation"
 msgstr ""
 
-#: ../menu-data/bibledit:bibledit.desktop.in.h:1
+#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:1
+msgid "Bibledit-BibleTime"
+msgstr ""
+
+#: ../menu-data/bibledit-bibletime:bibledit-bibletime.desktop.in.h:2
+msgid "Bibledit BibleTime Interface"
+msgstr ""
+
+#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:1
+msgid "Bibledit-Gtk"
+msgstr ""
+
+#: ../menu-data/bibledit-gtk:bibledit-gtk.desktop.in.h:2
 msgid "Bible Editor"
 msgstr "Editor biblie"
 
-#: ../menu-data/bibledit:bibledit.desktop.in.h:2
-msgid "Bibledit"
+#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:1
+msgid "Bibledit-Xiphos"
 msgstr ""
 
-#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1
-msgid "A simple KDE Application"
-msgstr "Jednoduchá aplikácia pre prostredie KDE"
+#: ../menu-data/bibledit-xiphos:bibledit-xiphos.desktop.in.h:2
+msgid "Bibledit Xiphos Interface"
+msgstr ""
 
-#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2
+#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:1
 msgid "BibleMemorizer"
 msgstr ""
 
+#: ../menu-data/biblememorizer:biblememorizer.desktop.in.h:2
+msgid "A simple KDE Application"
+msgstr "Jednoduchá aplikácia pre prostredie KDE"
+
 #: ../menu-data/bibletime:bibletime.desktop.in.h:1
 msgid "An easy to use bible study tool"
 msgstr "Ľahko použiteľný nástroj na štúdium biblie"
@@ -1522,21 +1579,13 @@
 msgstr "Farebná logická hra s arkádovým a taktickým režimom"
 
 #: ../menu-data/bino:bino.desktop.in.h:1
-msgid "3D video player"
+msgid "Bino"
 msgstr ""
 
 #: ../menu-data/bino:bino.desktop.in.h:2
-msgid "Bino"
+msgid "3D video player"
 msgstr ""
 
-#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:1
-msgid "BioCocoa"
-msgstr "BioCocoa"
-
-#: ../menu-data/biococoa.app:BioCocoa.desktop.in.h:2
-msgid "GNUstep BioCocoa"
-msgstr "GNUstep BioCocoa"
-
 #: ../menu-data/biogenesis:biogenesis.desktop.in.h:1
 msgid "Biogenesis"
 msgstr ""
@@ -1548,13 +1597,13 @@
 msgstr ""
 
 #: ../menu-data/bist:bist.desktop.in.h:1
-msgid "Bist stands for bidimensional structures"
-msgstr "Bist znamená bidimensional structures (dvojrozmerné štruktúry)"
-
-#: ../menu-data/bist:bist.desktop.in.h:2
 msgid "bist"
 msgstr "bist"
 
+#: ../menu-data/bist:bist.desktop.in.h:2
+msgid "Bist stands for bidimensional structures"
+msgstr "Bist znamená bidimensional structures (dvojrozmerné štruktúry)"
+
 #: ../menu-data/bitmeter:bitmeter.desktop.in.h:1
 msgid "Bitmeter"
 msgstr "Bitmeter"
@@ -1572,13 +1621,13 @@
 msgstr "Nástroje CDMA mobilných telefónov"
 
 #: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:1
-msgid "A small and fast BitTorrent client"
-msgstr "Malý a rýchly klient siete BitTorrent"
-
-#: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2
 msgid "BitStormLite"
 msgstr "BitStormLite"
 
+#: ../menu-data/bitstormlite:bitstormlite.desktop.in.h:2
+msgid "A small and fast BitTorrent client"
+msgstr "Malý a rýchly klient siete BitTorrent"
+
 #: ../menu-data/bittornado-gui:bittornado.desktop.in.h:1
 msgid "Bittornado Client"
 msgstr "Klient Bittornado"
@@ -1620,11 +1669,11 @@
 msgstr "Uvoľnite miesto a zachovajte súkromie"
 
 #: ../menu-data/blender:blender.desktop.in.h:1
-msgid "3D modeling, animation, rendering and post-production"
+msgid "Blender"
 msgstr ""
 
 #: ../menu-data/blender:blender.desktop.in.h:2
-msgid "Blender"
+msgid "3D modeling, animation, rendering and post-production"
 msgstr ""
 
 #: ../menu-data/bless:bless.desktop.in.h:1
@@ -1636,11 +1685,11 @@
 msgstr "Upravovanie binárnych súborov"
 
 #: ../menu-data/blinken:kde4__blinken.desktop.in.h:1
-msgid "A memory enhancement game"
+msgid "Blinken"
 msgstr ""
 
 #: ../menu-data/blinken:kde4__blinken.desktop.in.h:2
-msgid "Blinken"
+msgid "A memory enhancement game"
 msgstr ""
 
 #: ../menu-data/blobandconquer:blobAndConquer.desktop.in.h:1
@@ -1656,17 +1705,17 @@
 msgstr "Blobby Volley 2"
 
 #: ../menu-data/blobby:blobby.desktop.in.h:2
-msgid "Volley-Ball Game"
-msgstr "Volejbal"
+msgid "Volleyball Game"
+msgstr ""
 
 #: ../menu-data/bloboats:bloboats.desktop.in.h:1
-msgid "An arcade-like boat racing game"
-msgstr "Pretekárska arkádová hra na člne"
-
-#: ../menu-data/bloboats:bloboats.desktop.in.h:2
 msgid "Bloboats"
 msgstr "Bloboats"
 
+#: ../menu-data/bloboats:bloboats.desktop.in.h:2
+msgid "An arcade-like boat racing game"
+msgstr "Pretekárska arkádová hra na člne"
+
 #: ../menu-data/blobwars:blobwars.desktop.in.h:1
 msgid "Blob Wars : Metal Blob Solid"
 msgstr ""
@@ -1700,11 +1749,11 @@
 msgstr "Klon Tetris Attack s temným podtónom"
 
 #: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:1
-msgid "A KDE Blogging Client"
+msgid "Blogilo"
 msgstr ""
 
 #: ../menu-data/blogilo:kde4__blogilo.desktop.in.h:2
-msgid "Blogilo"
+msgid "A KDE Blogging Client"
 msgstr ""
 
 #: ../menu-data/bluefish:bluefish.desktop.in.h:1
@@ -1716,24 +1765,24 @@
 msgstr "Editor na vývoj webu"
 
 #: ../menu-data/blueman:blueman-manager.desktop.in.h:1
-msgid "Blueman Bluetooth Manager"
-msgstr "Správca zariadení Bluetooth Blueman"
-
-#: ../menu-data/blueman:blueman-manager.desktop.in.h:2
 msgid "Bluetooth Manager"
 msgstr "Správca Bluetooth"
 
+#: ../menu-data/blueman:blueman-manager.desktop.in.h:2
+msgid "Blueman Bluetooth Manager"
+msgstr "Správca zariadení Bluetooth Blueman"
+
 #: ../menu-data/bluemindo:Bluemindo.desktop.in.h:1
+msgid "Bluemindo"
+msgstr "Bluemindo"
+
+#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2
 msgid ""
 "A really simple but powerful audio player in Python/PyGTK, using Gstreamer."
 msgstr ""
 "Veľmi jednoduchý ale mocný prehrávač hudby naprogramovaný Python/PyGTK, "
 "používajúci Gstreamer."
 
-#: ../menu-data/bluemindo:Bluemindo.desktop.in.h:2
-msgid "Bluemindo"
-msgstr "Bluemindo"
-
 #: ../menu-data/blueproximity:blueproximity.desktop.in.h:1
 msgid "BlueProximity"
 msgstr "BlueProximity"
@@ -1751,13 +1800,13 @@
 msgstr "Informácie a oznámenia o novo objavených zariadeniach Bluetooth"
 
 #: ../menu-data/bmon:bmon.desktop.in.h:1
-msgid "Bandwidth monitor"
-msgstr "Monitor šírky pásma"
-
-#: ../menu-data/bmon:bmon.desktop.in.h:2
 msgid "bmon"
 msgstr "bmon"
 
+#: ../menu-data/bmon:bmon.desktop.in.h:2
+msgid "Bandwidth monitor"
+msgstr "Monitor šírky pásma"
+
 #: ../menu-data/boa-constructor:boa-constructor.desktop.in.h:1
 msgid "Boa Constructor"
 msgstr "Konštruktér Boa"
@@ -1782,12 +1831,20 @@
 msgid "Configure or monitor a BOINC core client"
 msgstr "Konfigurácia a monitorovanie klienta BOINC"
 
+#: ../menu-data/bokken:bokken.desktop.in.h:1
+msgid "Bokken"
+msgstr ""
+
+#: ../menu-data/bokken:bokken.desktop.in.h:2
+msgid "Reverse engineering suite"
+msgstr ""
+
 #: ../menu-data/bomber:kde4__bomber.desktop.in.h:1
-msgid "Arcade Bombing Game"
+msgid "Bomber"
 msgstr ""
 
 #: ../menu-data/bomber:kde4__bomber.desktop.in.h:2
-msgid "Bomber"
+msgid "Arcade Bombing Game"
 msgstr ""
 
 #: ../menu-data/bomberclone:bomberclone.desktop.in.h:1
@@ -1807,13 +1864,13 @@
 msgstr "Nástroj na tvorbu DVD"
 
 #: ../menu-data/boswars:boswars.desktop.in.h:1
-msgid "Battle for survival"
-msgstr "Boj o prežitie"
-
-#: ../menu-data/boswars:boswars.desktop.in.h:2
 msgid "Bos Wars"
 msgstr "Bos Wars"
 
+#: ../menu-data/boswars:boswars.desktop.in.h:2
+msgid "Battle for survival"
+msgstr "Boj o prežitie"
+
 #: ../menu-data/bouml:bouml.desktop.in.h:1
 msgid "BOUML"
 msgstr "BOUML"
@@ -1839,37 +1896,41 @@
 msgstr ""
 
 #: ../menu-data/bpython:bpython.desktop.in.h:1
-msgid "A fancy interface to the python interpreter!"
-msgstr "Pekné rozhranie pre interpreter Pythonu"
-
-#: ../menu-data/bpython:bpython.desktop.in.h:2
 msgid "bpython"
 msgstr "bpython"
 
-#: ../menu-data/brasero:brasero.desktop.in.h:1
-msgid "Brasero Disc Burner"
+#: ../menu-data/bpython:bpython.desktop.in.h:2
+msgid "A fancy interface to the python interpreter!"
+msgstr "Pekné rozhranie pre interpreter Pythonu"
+
+#: ../menu-data/braindump:kde4__braindump.desktop.in.h:1
+msgid "Braindump"
 msgstr ""
 
-#: ../menu-data/brasero:brasero.desktop.in.h:2
+#: ../menu-data/brasero:brasero.desktop.in.h:1
 msgid "Create and copy CDs and DVDs"
 msgstr "Vytváranie a kopírovanie CD a DVD"
 
+#: ../menu-data/brasero:brasero.desktop.in.h:2
+msgid "Brasero Disc Burner"
+msgstr ""
+
 #: ../menu-data/brewtarget:brewtarget.desktop.in.h:1
-msgid "Beer calculator"
+msgid "Brewtarget"
 msgstr ""
 
 #: ../menu-data/brewtarget:brewtarget.desktop.in.h:2
-msgid "Brewtarget"
+msgid "Beer calculator"
 msgstr ""
 
 #: ../menu-data/briquolo:briquolo.desktop.in.h:1
-msgid "An OpenGL breakout"
-msgstr "Breakout v OpenGL"
-
-#: ../menu-data/briquolo:briquolo.desktop.in.h:2
 msgid "Briquolo"
 msgstr "Briquolo"
 
+#: ../menu-data/briquolo:briquolo.desktop.in.h:2
+msgid "An OpenGL breakout"
+msgstr "Breakout v OpenGL"
+
 #: ../menu-data/brp-pacu:brp-pacu.desktop.in.h:1
 msgid "Brp-pacu"
 msgstr ""
@@ -1887,19 +1948,19 @@
 msgstr "3D šach s odrazmi šachistov"
 
 #: ../menu-data/bsnes:bsnes.desktop.in.h:1
-msgid "SNES emulator"
+msgid "bsnes"
 msgstr ""
 
 #: ../menu-data/bsnes:bsnes.desktop.in.h:2
-msgid "bsnes"
+msgid "SNES emulator"
 msgstr ""
 
 #: ../menu-data/bsnes:snespurify.desktop.in.h:1
-msgid "Tool for resolving problems with SNES ROMs"
+msgid "snespurify"
 msgstr ""
 
 #: ../menu-data/bsnes:snespurify.desktop.in.h:2
-msgid "snespurify"
+msgid "Tool for resolving problems with SNES ROMs"
 msgstr ""
 
 #: ../menu-data/btanks:btanks.desktop.in.h:1
@@ -1911,27 +1972,15 @@
 msgstr ""
 "Rýchla 2D tanková hra pre viacerých hráčov (sieť a rozdelená obrazovka)"
 
-#: ../menu-data/btnx-config:btnx-config.desktop.in.h:1
-msgid "btnx"
-msgstr "btnx"
-
 #: ../menu-data/bubbros:bubbros.desktop.in.h:1
+msgid "The Bub's Brothers"
+msgstr "Bratia Bubovci"
+
+#: ../menu-data/bubbros:bubbros.desktop.in.h:2
 msgid "Kill evil enemies by catching them into bubbles and smashing those"
 msgstr ""
 "Zabi zlých nepriateľov - chyť ich do bubliny a potom tieto bubliny rozbi"
 
-#: ../menu-data/bubbros:bubbros.desktop.in.h:2
-msgid "The Bub's Brothers"
-msgstr "Bratia Bubovci"
-
-#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:1
-msgid "Bug Report Tool"
-msgstr "Nástroj na hlásenie chýb"
-
-#: ../menu-data/bug-buddy:bug-buddy.desktop.in.h:2
-msgid "Report a bug in GNOME-based applications"
-msgstr "Hlásenie chýb v aplikáciách založených na GNOME"
-
 #: ../menu-data/bugsquish:bugsquish.desktop.in.h:1
 msgid "Bug Squish"
 msgstr "Drvenie chrobákov"
@@ -1957,11 +2006,11 @@
 msgstr "Grafický nástroj na nastavenie úrovne behu"
 
 #: ../menu-data/burgerspace:burgerspace.desktop.in.h:1
-msgid "A hamburger-smashing video game"
+msgid "BurgerSpace"
 msgstr ""
 
 #: ../menu-data/burgerspace:burgerspace.desktop.in.h:2
-msgid "BurgerSpace"
+msgid "A hamburger-smashing video game"
 msgstr ""
 
 #: ../menu-data/buxon:buxon.desktop.in.h:1
@@ -1981,19 +2030,19 @@
 msgstr ""
 
 #: ../menu-data/bygfoot:bygfoot.desktop.in.h:1
-msgid " A soccer manager game"
-msgstr " Hra na manažéra futbalového tímu"
-
-#: ../menu-data/bygfoot:bygfoot.desktop.in.h:2
 msgid "bygfoot"
 msgstr "bygfoot"
 
+#: ../menu-data/bygfoot:bygfoot.desktop.in.h:2
+msgid " A soccer manager game"
+msgstr " Hra na manažéra futbalového tímu"
+
 #: ../menu-data/byobu:byobu.desktop.in.h:1
-msgid "Advanced Command Line and Text Window Manager"
+msgid "Byobu Terminal"
 msgstr ""
 
 #: ../menu-data/byobu:byobu.desktop.in.h:2
-msgid "Byobu Terminal"
+msgid "Advanced Command Line and Text Window Manager"
 msgstr ""
 
 #: ../menu-data/bzflag-data:bzflag.desktop.in.h:1
@@ -2013,11 +2062,11 @@
 msgstr "Používateľské rozhranie k Bazaar"
 
 #: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:1
-msgid "Apply Bazaar Bundle"
+msgid "Bazaar"
 msgstr ""
 
 #: ../menu-data/bzr-gtk:bzr-handle-patch.desktop.in.h:2
-msgid "Bazaar"
+msgid "Apply Bazaar Bundle"
 msgstr ""
 
 #: ../menu-data/cadabra:cadabra.desktop.in.h:1
@@ -2053,12 +2102,73 @@
 msgstr "GLX-Dock (Cairo-Dock s OpenGL)"
 
 #: ../menu-data/calibre:calibre.desktop.in.h:1
+msgid "calibre"
+msgstr "calibre"
+
+#: ../menu-data/calibre:calibre.desktop.in.h:2
 msgid "E-book library management"
 msgstr "Správa knižnice s e-knihami"
 
-#: ../menu-data/calibre:calibre.desktop.in.h:2
-msgid "calibre"
-msgstr "calibre"
+#: ../menu-data/calligra-data:kde4__calligra.desktop.in.h:1
+msgid "Calligra"
+msgstr ""
+
+#: ../menu-data/calligraactive:calligraactive.desktop.in.h:1
+msgid "Calligra Active"
+msgstr ""
+
+#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:1
+msgid "Calligra Flow"
+msgstr ""
+
+#: ../menu-data/calligraflow:kde4__flow.desktop.in.h:2
+msgid "Flowchart & Diagram Editing"
+msgstr ""
+
+#: ../menu-data/calligramobile:hildon__calligramobile.desktop.in.h:1
+msgid "Calligra Mobile"
+msgstr ""
+
+#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:1
+msgid "Plan"
+msgstr ""
+
+#: ../menu-data/calligraplan:kde4__plan.desktop.in.h:2
+#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:2
+#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2
+#: ../menu-data/planner:planner.desktop.in.h:1
+msgid "Project Management"
+msgstr ""
+
+#: ../menu-data/calligraplan:kde4__planwork.desktop.in.h:1
+msgid "Plan WorkPackage Handler"
+msgstr ""
+
+#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:1
+msgid "Calligra Stage"
+msgstr ""
+
+#: ../menu-data/calligrastage:kde4__stage.desktop.in.h:2
+#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2
+msgid "Write presentation documents"
+msgstr ""
+
+#: ../menu-data/calligratables:kde4__tables.desktop.in.h:1
+msgid "Calligra Tables"
+msgstr ""
+
+#: ../menu-data/calligratables:kde4__tables.desktop.in.h:2
+#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2
+msgid "Write spreadsheet documents"
+msgstr ""
+
+#: ../menu-data/calligrawords:kde4__words.desktop.in.h:1
+msgid "Calligra Words"
+msgstr ""
+
+#: ../menu-data/calligrawords:kde4__words.desktop.in.h:2
+msgid "Write documents"
+msgstr ""
 
 #: ../menu-data/cameleon:cameleon.desktop.in.h:1
 msgid "Cameleon"
@@ -2089,13 +2199,13 @@
 msgstr "Zobrazovanie, modifikácia a ukladanie obrázky z webovej kamery"
 
 #: ../menu-data/canorus:canorus.desktop.in.h:1
-msgid "A free next-generation cross-platform music score editor!"
-msgstr "Slobodný multiplatformný editor nôt novej generácie"
-
-#: ../menu-data/canorus:canorus.desktop.in.h:2
 msgid "Canorus"
 msgstr ""
 
+#: ../menu-data/canorus:canorus.desktop.in.h:2
+msgid "A free next-generation cross-platform music score editor!"
+msgstr "Slobodný multiplatformný editor nôt novej generácie"
+
 #: ../menu-data/cantor:kde4__cantor.desktop.in.h:1
 msgid "Cantor"
 msgstr ""
@@ -2105,13 +2215,13 @@
 msgstr ""
 
 #: ../menu-data/caret:caret.desktop.in.h:1
-msgid "Caret"
-msgstr ""
-
-#: ../menu-data/caret:caret.desktop.in.h:2
 msgid "Cortical Surface Reconstruction and Visualization"
 msgstr "Kortikálna rekonštrukcia a vizualizácia povrchu"
 
+#: ../menu-data/caret:caret.desktop.in.h:2
+msgid "Caret"
+msgstr ""
+
 #: ../menu-data/caribou:caribou.desktop.in.h:1
 msgid "Caribou"
 msgstr ""
@@ -2129,11 +2239,11 @@
 msgstr "Interaktívna geometria CaRMetal"
 
 #: ../menu-data/catdoc:wordview.desktop.in.h:1
-msgid "Microsoft doc document file viewer"
+msgid "Wordview Microsoft doc Viewer"
 msgstr ""
 
 #: ../menu-data/catdoc:wordview.desktop.in.h:2
-msgid "Wordview Microsoft doc Viewer"
+msgid "Microsoft doc document file viewer"
 msgstr ""
 
 #: ../menu-data/catfish:catfish.desktop.in.h:1
@@ -2153,14 +2263,14 @@
 msgstr ""
 
 #: ../menu-data/cbrpager:cbrpager.desktop.in.h:1
-#: ../menu-data/comix:comix.desktop.in.h:1
-msgid "A viewer for comic book archives"
-msgstr "Prehliadač archívov komiksov"
-
-#: ../menu-data/cbrpager:cbrpager.desktop.in.h:2
 msgid "Cbrpager"
 msgstr "Cbrpager"
 
+#: ../menu-data/cbrpager:cbrpager.desktop.in.h:2
+#: ../menu-data/comix:comix.desktop.in.h:2
+msgid "A viewer for comic book archives"
+msgstr "Prehliadač archívov komiksov"
+
 #: ../menu-data/cdcat:cdcat.desktop.in.h:1
 msgid "CdCat"
 msgstr ""
@@ -2227,13 +2337,13 @@
 msgstr "Hrajte Go proti ľudským alebo počítačovým súperom"
 
 #: ../menu-data/charmap.app:Charmap.desktop.in.h:1
-msgid "Character map for GNUstep"
-msgstr ""
-
-#: ../menu-data/charmap.app:Charmap.desktop.in.h:2
 msgid "Charmap"
 msgstr "Mapa znakov"
 
+#: ../menu-data/charmap.app:Charmap.desktop.in.h:2
+msgid "Character map for GNUstep"
+msgstr ""
+
 #: ../menu-data/checkbox-gtk:checkbox-gtk.desktop.in.h:1
 msgid "System Testing"
 msgstr "Testovanie systému"
@@ -2247,7 +2357,7 @@
 msgstr "CheckGMail"
 
 #: ../menu-data/checkgmail:checkgmail.desktop.in.h:2
-#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2
+#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1
 msgid "Gmail Notifier"
 msgstr "Upozornenie na novú poštu Gmail"
 
@@ -2268,6 +2378,14 @@
 msgid "Draw and make calculations on chemical structures"
 msgstr "Kreslenie a výpočty chemických štruktúr"
 
+#: ../menu-data/cherrytree:cherrytree.desktop.in.h:1
+msgid "CherryTree"
+msgstr ""
+
+#: ../menu-data/cherrytree:cherrytree.desktop.in.h:2
+msgid "Hierarchical Note Taking"
+msgstr ""
+
 #: ../menu-data/childsplay:childsplay.desktop.in.h:1
 msgid "Childsplay"
 msgstr "Detská hra"
@@ -2315,7 +2433,7 @@
 msgstr ""
 
 #: ../menu-data/choqok:kde4__choqok.desktop.in.h:2
-msgid "KDE Micro-blogging Client"
+msgid "Micro-blogging Client"
 msgstr ""
 
 #: ../menu-data/chromium-bsu:chromium-bsu.desktop.in.h:1
@@ -2335,24 +2453,24 @@
 msgstr "Hoďte klaunov predtým, než spadnú a trafte nimi balóny"
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:1
-msgid "Analize chords (Chordata)"
+msgid "CLAM Chordata"
 msgstr ""
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:2
-msgid "CLAM Chordata"
+msgid "MP3/OGG/Wav songs chord analyser"
 msgstr ""
 
 #: ../menu-data/clam-chordata:Chordata.desktop.in.h:3
-msgid "MP3/OGG/Wav songs chord analyser"
+msgid "Analize chords (Chordata)"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:1
-msgid ""
-"An audio tool to build processing networks by connecting functional boxes"
+msgid "CLAM Network Editor"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:2
-msgid "CLAM Network Editor"
+msgid ""
+"An audio tool to build processing networks by connecting functional boxes"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:NetworkEditor.desktop.in.h:3
@@ -2364,11 +2482,11 @@
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:2
-msgid "Run with Prototyper"
+msgid "Runs an audio processing core under a QT designer interface"
 msgstr ""
 
 #: ../menu-data/clam-networkeditor:Prototyper.desktop.in.h:3
-msgid "Runs an audio processing core under a QT designer interface"
+msgid "Run with Prototyper"
 msgstr ""
 
 #: ../menu-data/clamtk:clamtk.desktop.in.h:1
@@ -2408,7 +2526,7 @@
 msgstr ""
 
 #: ../menu-data/clipit:clipit.desktop.in.h:2
-#: ../menu-data/parcellite:parcellite.desktop.in.h:1
+#: ../menu-data/parcellite:parcellite.desktop.in.h:2
 msgid "Clipboard Manager"
 msgstr ""
 
@@ -2441,12 +2559,12 @@
 msgstr "Ovládajte viacero relácií ssh alebo rsh z jedného vstupného okna"
 
 #: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:1
-#: ../menu-data/eficas:eficas.desktop.in.h:2
-msgid "Graphical command editor for Code_Aster."
+msgid "code-aster-gui"
 msgstr ""
 
 #: ../menu-data/code-aster-gui:code-aster-gui.desktop.in.h:2
-msgid "code-aster-gui"
+#: ../menu-data/eficas:eficas.desktop.in.h:2
+msgid "Graphical command editor for Code_Aster."
 msgstr ""
 
 #: ../menu-data/codeblocks:codeblocks.desktop.in.h:1
@@ -2470,25 +2588,21 @@
 msgstr ""
 
 #: ../menu-data/colorcode:colorcode.desktop.in.h:1
-msgid "Advanced clone of the MasterMind code-breaking game"
+msgid "ColorCode"
 msgstr ""
 
 #: ../menu-data/colorcode:colorcode.desktop.in.h:2
-msgid "ColorCode"
+msgid "Advanced clone of the MasterMind code-breaking game"
 msgstr ""
 
 #: ../menu-data/colorname:colorname.desktop.in.h:1
 msgid "colorname"
 msgstr ""
 
-#: ../menu-data/comix:comix.desktop.in.h:2
+#: ../menu-data/comix:comix.desktop.in.h:1
 msgid "Comix"
 msgstr "Comix"
 
-#: ../menu-data/compiz-core:compiz.desktop.in.h:1
-msgid "Compiz"
-msgstr "Compiz"
-
 #: ../menu-data/compizconfig-settings-manager:ccsm.desktop.in.h:1
 msgid "CompizConfig Settings Manager"
 msgstr "CompizConfig - správca nastavení"
@@ -2497,22 +2611,22 @@
 msgid "Configure Compiz with CompizConfig"
 msgstr "Nastavovanie Compiz pomocou CompizConfig"
 
-#: ../menu-data/composite-data:composite.desktop.in.h:1
+#: ../menu-data/composite:composite.desktop.in.h:1
 msgid "Composite"
 msgstr ""
 
-#: ../menu-data/composite-data:composite.desktop.in.h:2
-msgid "Live performance sequencer, sampler, looper"
-msgstr "Sekvencér, vzorkovač a slučka pre live predstavenia"
+#: ../menu-data/composite:composite.desktop.in.h:2
+msgid "Live performance sequencer"
+msgstr ""
 
 #: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:1
-msgid "Clean up a system so it's more like a freshly installed one"
-msgstr "Vyčistenie systému, aby bol takmer ako čerstvo nainštalovaný"
-
-#: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2
 msgid "Computer Janitor"
 msgstr "Údržba počítača"
 
+#: ../menu-data/computer-janitor-gtk:computer-janitor-gtk.desktop.in.h:2
+msgid "Clean up a system so it's more like a freshly installed one"
+msgstr "Vyčistenie systému, aby bol takmer ako čerstvo nainštalovaný"
+
 #: ../menu-data/conduit:conduit.desktop.in.h:1
 msgid "Conduit Synchronizer"
 msgstr "Synchronizátor vedení"
@@ -2554,15 +2668,16 @@
 msgstr "Connectagram"
 
 #: ../menu-data/contacts:contacts.desktop.in.h:1
-msgid "Address book"
-msgstr "Adresár"
-
-#: ../menu-data/contacts:contacts.desktop.in.h:2
 #: ../menu-data/gnome-contacts:gnome-contacts.desktop.in.h:1
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2
+#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
 msgid "Contacts"
 msgstr ""
 
+#: ../menu-data/contacts:contacts.desktop.in.h:2
+msgid "Address book"
+msgstr "Adresár"
+
 #: ../menu-data/controlaula:controlaula.desktop.in.h:1
 msgid " Classrooom control"
 msgstr ""
@@ -2572,13 +2687,13 @@
 msgstr "Nástroj na ovládanie počítačov v učebni"
 
 #: ../menu-data/convertall:convertall.desktop.in.h:1
-msgid "Convert between many different units"
-msgstr "Konverzia medzi mnohými rôznymi jednotkami"
-
-#: ../menu-data/convertall:convertall.desktop.in.h:2
 msgid "ConvertAll"
 msgstr "ConvertAll"
 
+#: ../menu-data/convertall:convertall.desktop.in.h:2
+msgid "Convert between many different units"
+msgstr "Konverzia medzi mnohými rôznymi jednotkami"
+
 #: ../menu-data/coqide:coqide.desktop.in.h:1
 msgid "CoqIDE Proof Assistant"
 msgstr "Asstent dôkazov CoqIDE"
@@ -2596,19 +2711,19 @@
 msgstr "Spravovanie vašich pozadí na plochu"
 
 #: ../menu-data/cowbell:cowbell.desktop.in.h:1
-msgid "An elegant music organizer"
-msgstr "Elegantný organizátor hudby"
-
-#: ../menu-data/cowbell:cowbell.desktop.in.h:2
 msgid "Cowbell Music Organizer"
 msgstr "Organizátor hudby Cowbell"
 
+#: ../menu-data/cowbell:cowbell.desktop.in.h:2
+msgid "An elegant music organizer"
+msgstr "Elegantný organizátor hudby"
+
 #: ../menu-data/cqrlog:cqrlog.desktop.in.h:1
-msgid "Advanced logging program for hamradio operators"
+msgid "CQRLOG"
 msgstr ""
 
 #: ../menu-data/cqrlog:cqrlog.desktop.in.h:2
-msgid "CQRLOG"
+msgid "Advanced logging program for hamradio operators"
 msgstr ""
 
 #: ../menu-data/crack-attack:crack-attack.desktop.in.h:1
@@ -2640,11 +2755,11 @@
 msgstr ""
 
 #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:1
-msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game"
+msgid "Crossfire GTK Client V2"
 msgstr ""
 
 #: ../menu-data/crossfire-client:crossfire-client.desktop.in.h:2
-msgid "Crossfire GTK Client V2"
+msgid "Client for Crossfire, a multiplayer graphical RPG and adventure game"
 msgstr ""
 
 #: ../menu-data/cryptkeeper:cryptkeeper.desktop.in.h:1
@@ -2652,21 +2767,21 @@
 msgstr "Cryptkeeper"
 
 #: ../menu-data/csmash:csmash.desktop.in.h:1
-msgid "3D tabletennis game"
-msgstr "3D stolný tenis"
-
-#: ../menu-data/csmash:csmash.desktop.in.h:2
 msgid "Cannon Smash"
 msgstr "Cannon Smash"
 
-#: ../menu-data/cssed:cssed.desktop.in.h:1
-msgid "Css and Web Development Editor"
-msgstr "Editor CSS a webových stránok"
+#: ../menu-data/csmash:csmash.desktop.in.h:2
+msgid "3D tabletennis game"
+msgstr "3D stolný tenis"
 
-#: ../menu-data/cssed:cssed.desktop.in.h:2
+#: ../menu-data/cssed:cssed.desktop.in.h:1
 msgid "Cssed Editor"
 msgstr "Editor Cssed"
 
+#: ../menu-data/cssed:cssed.desktop.in.h:2
+msgid "Css and Web Development Editor"
+msgstr "Editor CSS a webových stránok"
+
 #: ../menu-data/ctsim:ctsim.desktop.in.h:1
 msgid "CTSim Computed Tomography Simulator"
 msgstr "Simulátor počítačovej tomografie CTSim"
@@ -2699,14 +2814,18 @@
 msgid "Serial Terminal"
 msgstr ""
 
-#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1
-msgid "A free and romantic music player"
-msgstr "Slobodný a romantický prehrávač hudby"
+#: ../menu-data/cycle:cycle.desktop.in.h:1
+msgid "Cycle"
+msgstr ""
 
-#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2
+#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:1
 msgid "Cynthiune"
 msgstr "Cynthiune"
 
+#: ../menu-data/cynthiune.app:Cynthiune.desktop.in.h:2
+msgid "A free and romantic music player"
+msgstr "Slobodný a romantický prehrávač hudby"
+
 #: ../menu-data/cytadela:cytadela.desktop.in.h:1
 msgid "Cytadela"
 msgstr ""
@@ -2740,11 +2859,11 @@
 msgstr ""
 
 #: ../menu-data/daemonfs:daemonfs.desktop.in.h:1
-msgid "DaemonFS"
+msgid "Real time monitoring software"
 msgstr ""
 
 #: ../menu-data/daemonfs:daemonfs.desktop.in.h:2
-msgid "Real time monitoring software"
+msgid "DaemonFS"
 msgstr ""
 
 #: ../menu-data/daisy-player:daisy-player.desktop.in.h:1
@@ -2764,11 +2883,11 @@
 msgstr ""
 
 #: ../menu-data/darktable:darktable.desktop.in.h:1
-msgid "Darktable Photo Workflow Software"
+msgid "Organize and develop images from digital cameras"
 msgstr ""
 
 #: ../menu-data/darktable:darktable.desktop.in.h:2
-msgid "Organize and develop images from digital cameras"
+msgid "Darktable Photo Workflow Software"
 msgstr ""
 
 #: ../menu-data/dasher:dasher.desktop.in.h:1
@@ -2790,22 +2909,22 @@
 msgstr "Vaše schôdzky"
 
 #: ../menu-data/dc-qt:dc-qt.desktop.in.h:1
-msgid "GUI for Direct Connect Protocol"
-msgstr "RozhranieI pre protocol Direct Connect"
-
-#: ../menu-data/dc-qt:dc-qt.desktop.in.h:2
 msgid "dc-qt"
 msgstr "dc-qt"
 
+#: ../menu-data/dc-qt:dc-qt.desktop.in.h:2
+msgid "GUI for Direct Connect Protocol"
+msgstr "RozhranieI pre protocol Direct Connect"
+
 #: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:1
+msgid "dconf Editor"
+msgstr ""
+
+#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2
 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:2
 msgid "Directly edit your entire configuration database"
 msgstr "Umožňuje priamo upravovať celú vašu konfiguračnú databázu"
 
-#: ../menu-data/dconf-tools:dconf-editor.desktop.in.h:2
-msgid "dconf Editor"
-msgstr ""
-
 #: ../menu-data/ddd:ddd.desktop.in.h:1
 msgid "Data Display Debugger"
 msgstr "Ladenie zobrazovania dát"
@@ -2839,13 +2958,13 @@
 msgstr "Referenčná príručka Debianu"
 
 #: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:1
-msgid "A simple audio player"
-msgstr "Jednoduchý prehrávač zvuku"
-
-#: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2
 msgid "Decibel Audio Player"
 msgstr "Prehrávač zvuku Decibel"
 
+#: ../menu-data/decibel-audio-player:decibel-audio-player.desktop.in.h:2
+msgid "A simple audio player"
+msgstr "Jednoduchý prehrávač zvuku"
+
 #: ../menu-data/defendguin:defendguin.desktop.in.h:1
 msgid "Defendguin"
 msgstr ""
@@ -2855,16 +2974,16 @@
 msgstr "Zachráňte tučniakov"
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:1
-msgid "Back Up Now"
+#: ../menu-data/deja-dup:deja-dup.desktop.in.h:1
+msgid "Backup"
 msgstr ""
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:2
-#: ../menu-data/deja-dup:deja-dup.desktop.in.h:1
-msgid "Backup"
+msgid "Change your backup settings"
 msgstr ""
 
 #: ../menu-data/deja-dup:deja-dup-ccpanel.desktop.in.h:3
-msgid "Change your backup settings"
+msgid "Back Up Now"
 msgstr ""
 
 #: ../menu-data/dell-recovery:dell-recovery-media.desktop.in.h:1
@@ -2877,20 +2996,20 @@
 
 #: ../menu-data/deluge-gtk:deluge.desktop.in.h:2
 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:1
-#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1
-#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1
+#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2
+#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2
 msgid "Download and share files over BitTorrent"
 msgstr ""
 
 #: ../menu-data/denemo:denemo.desktop.in.h:1
-#: ../menu-data/nted:nted.desktop.in.h:1
-msgid "Edit musical scores"
-msgstr "Upravovanie nôt"
-
-#: ../menu-data/denemo:denemo.desktop.in.h:2
 msgid "GNU Denemo"
 msgstr "GNU Denemo"
 
+#: ../menu-data/denemo:denemo.desktop.in.h:2
+#: ../menu-data/nted:nted.desktop.in.h:2
+msgid "Edit musical scores"
+msgstr "Upravovanie nôt"
+
 #: ../menu-data/deskscribe:deskscribe.desktop.in.h:1
 msgid "DeskScribe"
 msgstr ""
@@ -2900,12 +3019,17 @@
 msgstr ""
 
 #: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:1
+msgid "Desktop Webmail"
+msgstr ""
+
+#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2
 msgid "Compose email in browser"
 msgstr "Písanie emailov v prehliadači"
 
-#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:2
-msgid "Desktop Webmail"
-msgstr ""
+#: ../menu-data/desktop-webmail:desktop-webmail.desktop.in.h:3
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3
+msgid "Compose New Message"
+msgstr "Napísať novú správu"
 
 #: ../menu-data/desktopcouch-tools:desktopcouch-pair.desktop.in.h:1
 msgid "CouchDB Pairing Tool"
@@ -2916,21 +3040,21 @@
 msgstr "Nástroj na párovanie Desktop CouchDB"
 
 #: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:1
-msgid "A Tray-Icon for DesktopNova"
-msgstr "Ikona do oznamovacej oblasti pre DesktopNova"
-
-#: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2
 msgid "DesktopNova-Tray"
 msgstr "DesktopNova-Tray"
 
-#: ../menu-data/desktopnova:desktopnova.desktop.in.h:1
-msgid "Changes your background image automatically"
-msgstr "Automatická zmena obrázku pozadia plochy"
+#: ../menu-data/desktopnova-tray:desktopnova-tray.desktop.in.h:2
+msgid "A Tray-Icon for DesktopNova"
+msgstr "Ikona do oznamovacej oblasti pre DesktopNova"
 
-#: ../menu-data/desktopnova:desktopnova.desktop.in.h:2
+#: ../menu-data/desktopnova:desktopnova.desktop.in.h:1
 msgid "DesktopNova"
 msgstr "DesktopNova"
 
+#: ../menu-data/desktopnova:desktopnova.desktop.in.h:2
+msgid "Changes your background image automatically"
+msgstr "Automatická zmena obrázku pozadia plochy"
+
 #: ../menu-data/desmume:desmume.desktop.in.h:1
 msgid "DeSmuME (Gtk)"
 msgstr "DeSmuME (Gtk)"
@@ -2940,6 +3064,10 @@
 msgstr "Emulátor Nintendo DS"
 
 #: ../menu-data/devede:devede.desktop.in.h:1
+msgid "DeVeDe DVD/CD Video Creator"
+msgstr ""
+
+#: ../menu-data/devede:devede.desktop.in.h:2
 msgid ""
 "Allows to create video CDs and DVDs, suitable to be reproduced in home DVD "
 "players"
@@ -2947,18 +3075,14 @@
 "Umožňuje vytvárať video CD a DVD vhodné na reprodukciu v domácich "
 "prehrávačoch DVD"
 
-#: ../menu-data/devede:devede.desktop.in.h:2
-msgid "DeVeDe DVD/CD Video Creator"
-msgstr ""
-
 #: ../menu-data/devhelp:devhelp.desktop.in.h:1
-msgid "Developer's Help program"
-msgstr "Program pomocníka pre vývojárov"
-
-#: ../menu-data/devhelp:devhelp.desktop.in.h:2
 msgid "Devhelp"
 msgstr "Devhelp"
 
+#: ../menu-data/devhelp:devhelp.desktop.in.h:2
+msgid "Developer's Help program"
+msgstr "Program pomocníka pre vývojárov"
+
 #: ../menu-data/dff:dff.desktop.in.h:1
 msgid "DFF"
 msgstr ""
@@ -2975,11 +3099,11 @@
 msgid "Desktop Flickr Organizer for Gnome"
 msgstr "Organizátor Flickr pre Gnome"
 
-#: ../menu-data/dia-common:dia-common.desktop.in.h:1
-msgid "Dia Diagram Editor"
-msgstr "Editor diagramov Dia"
+#: ../menu-data/dia-common:dia.desktop.in.h:1
+msgid "Dia"
+msgstr ""
 
-#: ../menu-data/dia-common:dia-common.desktop.in.h:2
+#: ../menu-data/dia-common:dia.desktop.in.h:2
 msgid "Edit your Diagrams"
 msgstr "Úprava diagramov"
 
@@ -2992,21 +3116,21 @@
 msgstr ""
 
 #: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:1
-msgid "A Dict client for GNUstep"
-msgstr "Dict klient pre GNUstep"
-
-#: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2
 msgid "Dictionary Reader"
 msgstr "Čítačka slovníkov"
 
-#: ../menu-data/diffpdf:diffpdf.desktop.in.h:1
-msgid "Compare two PDF files"
-msgstr "Porovnanie dvoch súborov PDF"
+#: ../menu-data/dictionaryreader.app:DictionaryReader.desktop.in.h:2
+msgid "A Dict client for GNUstep"
+msgstr "Dict klient pre GNUstep"
 
-#: ../menu-data/diffpdf:diffpdf.desktop.in.h:2
+#: ../menu-data/diffpdf:diffpdf.desktop.in.h:1
 msgid "DiffPDF"
 msgstr "DiffPDF"
 
+#: ../menu-data/diffpdf:diffpdf.desktop.in.h:2
+msgid "Compare two PDF files"
+msgstr "Porovnanie dvoch súborov PDF"
+
 #: ../menu-data/diffuse:diffuse.desktop.in.h:1
 msgid "Diffuse Merge Tool"
 msgstr "Nástroj na zlučovanie Diffuse"
@@ -3016,15 +3140,15 @@
 msgstr "Grafický nástroj na zlučovanie a porovnávanie textových súborov"
 
 #: ../menu-data/digikam:kde4__digikam.desktop.in.h:1
-#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1
+msgid "digiKam"
+msgstr "digiKam"
+
+#: ../menu-data/digikam:kde4__digikam.desktop.in.h:2
+#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2
 msgid ""
 "Manage your photographs like a professional with the power of open source"
 msgstr "Profesionálna správa fotografií silou open source"
 
-#: ../menu-data/digikam:kde4__digikam.desktop.in.h:2
-msgid "digiKam"
-msgstr "digiKam"
-
 #: ../menu-data/digikam:kde4__panoramagui.desktop.in.h:1
 msgid "A tool to assemble images as a panorama"
 msgstr ""
@@ -3041,6 +3165,14 @@
 msgid "Lightweight browser"
 msgstr ""
 
+#: ../menu-data/dino:dino.desktop.in.h:1
+msgid "Dino"
+msgstr ""
+
+#: ../menu-data/dino:dino.desktop.in.h:2
+msgid "Integrated MIDI piano roll editor and sequencer engine"
+msgstr ""
+
 #: ../menu-data/djplay:djplay.desktop.in.h:1
 msgid "DJPlay"
 msgstr "DJPlay"
@@ -3058,19 +3190,19 @@
 msgstr ""
 
 #: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:1
-msgid "Graphical editor for DjVu"
-msgstr "Grafický editor DjVu"
-
-#: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2
 msgid "djvusmooth"
 msgstr "djvusmooth"
 
+#: ../menu-data/djvusmooth:djvusmooth.desktop.in.h:2
+msgid "Graphical editor for DjVu"
+msgstr "Grafický editor DjVu"
+
 #: ../menu-data/dkopp:dkopp.desktop.in.h:1
-msgid "Full and incremental backup to DVD with verify"
+msgid "dkopp"
 msgstr ""
 
 #: ../menu-data/dkopp:dkopp.desktop.in.h:2
-msgid "dkopp"
+msgid "Full and incremental backup to DVD with verify"
 msgstr ""
 
 #: ../menu-data/dlume:dlume.desktop.in.h:1
@@ -3090,20 +3222,12 @@
 msgstr ""
 
 #: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:1
-msgid "Convert to OpenDocument"
-msgstr "Konvertovanie do OpenDocument"
-
-#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2
 msgid "docbook2odf"
 msgstr "docbook2odf"
 
-#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:1
-msgid "DockbarX Preference"
-msgstr ""
-
-#: ../menu-data/dockbarx:dbx_preference.desktop.in.h:2
-msgid "Preference dialog for DockbarX"
-msgstr ""
+#: ../menu-data/docbook2odf:docbook2odf.desktop.in.h:2
+msgid "Convert to OpenDocument"
+msgstr "Konvertovanie do OpenDocument"
 
 #: ../menu-data/docky:docky.desktop.in.h:1
 msgid "Docky"
@@ -3126,12 +3250,12 @@
 msgstr "Dolphin"
 
 #: ../menu-data/dolphin:kde4__dolphin.desktop.in.h:2
-#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
-#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2
+#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1
+#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1
 msgid "File Manager"
 msgstr "Správca súborov"
 
-#: ../menu-data/dooble:dooble.desktop.in.h:2
+#: ../menu-data/dooble:dooble.desktop.in.h:1
 msgid "Dooble"
 msgstr "Dooble"
 
@@ -3172,7 +3296,7 @@
 msgstr ""
 
 #: ../menu-data/dragonplayer:kde4__dragonplayer.desktop.in.h:2
-#: ../menu-data/xine-ui:xine.desktop.in.h:1
+#: ../menu-data/xine-ui:xine.desktop.in.h:2
 msgid "Video Player"
 msgstr ""
 
@@ -3193,11 +3317,11 @@
 msgstr "Hra 3D šach"
 
 #: ../menu-data/dreampie:dreampie.desktop.in.h:1
-msgid "An interactive Python shell"
+msgid "DreamPie"
 msgstr ""
 
 #: ../menu-data/dreampie:dreampie.desktop.in.h:2
-msgid "DreamPie"
+msgid "An interactive Python shell"
 msgstr ""
 
 #: ../menu-data/drgeo:drgeo.desktop.in.h:1
@@ -3259,37 +3383,37 @@
 msgstr ""
 
 #: ../menu-data/dvd95:dvd95.desktop.in.h:1
-msgid "Convert a DVD9 into a DVD5"
-msgstr "Prevod DVD9 na DVD5"
-
-#: ../menu-data/dvd95:dvd95.desktop.in.h:2
 msgid "Dvd95 Converter"
 msgstr "Konvertor Dvd95"
 
-#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:1
-msgid "Additional error protection for CD/DVD media"
-msgstr "Ďalšia ochrana proti chybám pre nosičov CD/DVD"
+#: ../menu-data/dvd95:dvd95.desktop.in.h:2
+msgid "Convert a DVD9 into a DVD5"
+msgstr "Prevod DVD9 na DVD5"
 
-#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2
+#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:1
 msgid "dvdisaster"
 msgstr "dvdisaster"
 
-#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:1
-msgid "Queue dvd::rip projects"
-msgstr "Zoraďovanie projektov dvd::rip do frontu"
+#: ../menu-data/dvdisaster:dvdisaster.desktop.in.h:2
+msgid "Additional error protection for CD/DVD media"
+msgstr "Ďalšia ochrana proti chybám pre nosičov CD/DVD"
 
-#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2
+#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:1
 msgid "dvd::rip queue"
 msgstr "Front dvd::rip"
 
-#: ../menu-data/dvdrip:dvdrip.desktop.in.h:1
-msgid "Rip DVDs"
-msgstr "Extrakcia DVD"
+#: ../menu-data/dvdrip-queue:dvdrip-queue.desktop.in.h:2
+msgid "Queue dvd::rip projects"
+msgstr "Zoraďovanie projektov dvd::rip do frontu"
 
-#: ../menu-data/dvdrip:dvdrip.desktop.in.h:2
+#: ../menu-data/dvdrip:dvdrip.desktop.in.h:1
 msgid "dvd::rip"
 msgstr "dvd::rip"
 
+#: ../menu-data/dvdrip:dvdrip.desktop.in.h:2
+msgid "Rip DVDs"
+msgstr "Extrakcia DVD"
+
 #: ../menu-data/dvdstyler-data:dvdstyler.desktop.in.h:1
 msgid "DVD Styler"
 msgstr ""
@@ -3335,45 +3459,45 @@
 msgstr ""
 
 #: ../menu-data/earth3d:kde__earth3d.desktop.in.h:1
-msgid "earth3d"
+msgid "earth3d - 3D Model of the earth"
 msgstr ""
 
 #: ../menu-data/earth3d:kde__earth3d.desktop.in.h:2
-msgid "earth3d - 3D Model of the earth"
+msgid "earth3d"
 msgstr ""
 
 #: ../menu-data/easychem:easychem.desktop.in.h:1
-msgid "Create high-quality chemical formulas"
-msgstr "Tvorba veľmi kvalitných chemických vzorcov"
-
-#: ../menu-data/easychem:easychem.desktop.in.h:2
 msgid "EasyChem Chemical Structures Editor"
 msgstr "Editor chemických štruktúr EasyChem"
 
-#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1
-msgid "A graphical GNUstep diff utility"
-msgstr "Grafické nástroje diff pre GNUstep"
+#: ../menu-data/easychem:easychem.desktop.in.h:2
+msgid "Create high-quality chemical formulas"
+msgstr "Tvorba veľmi kvalitných chemických vzorcov"
 
-#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2
+#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:1
 msgid "EasyDiff"
 msgstr "EasyDiff"
 
-#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1
-msgid "A GUI for mp3gain, vorbisgain and aacgain"
-msgstr "Rozhranie k mp3gain, vorbisgain a aacgain"
+#: ../menu-data/easydiff.app:EasyDiff.desktop.in.h:2
+msgid "A graphical GNUstep diff utility"
+msgstr "Grafické nástroje diff pre GNUstep"
 
-#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2
+#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:1
 msgid "easyMP3Gain"
 msgstr "easyMP3Gain"
 
-#: ../menu-data/easystroke:easystroke.desktop.in.h:1
-msgid "Control your desktop using mouse gestures"
-msgstr "Ovládanie počítača gestami myše"
+#: ../menu-data/easymp3gain-gtk:easymp3gain.desktop.in.h:2
+msgid "A GUI for mp3gain, vorbisgain and aacgain"
+msgstr "Rozhranie k mp3gain, vorbisgain a aacgain"
 
-#: ../menu-data/easystroke:easystroke.desktop.in.h:2
+#: ../menu-data/easystroke:easystroke.desktop.in.h:1
 msgid "Easystroke Gesture Recognition"
 msgstr "Rozpoznávanie gest Easystroke"
 
+#: ../menu-data/easystroke:easystroke.desktop.in.h:2
+msgid "Control your desktop using mouse gestures"
+msgstr "Ovládanie počítača gestami myše"
+
 #: ../menu-data/easytag:easytag.desktop.in.h:1
 msgid "EasyTAG Audio File Tag Viewer/Editor"
 msgstr ""
@@ -3385,20 +3509,12 @@
 msgstr ""
 
 #: ../menu-data/eboard:eboard.desktop.in.h:1
-msgid "A graphical chessboard program"
-msgstr "Grafický šachovnicový program"
-
-#: ../menu-data/eboard:eboard.desktop.in.h:2
 msgid "eboard"
 msgstr "eboard"
 
-#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:1
-msgid "Speaking e-reader"
-msgstr ""
-
-#: ../menu-data/ebook-speaker:eBook-speaker.desktop.in.h:2
-msgid "eBook speaker"
-msgstr ""
+#: ../menu-data/eboard:eboard.desktop.in.h:2
+msgid "A graphical chessboard program"
+msgstr "Grafický šachovnicový program"
 
 #: ../menu-data/ebumeter:ebumeter.desktop.in.h:1
 msgid "Ebumeter"
@@ -3425,25 +3541,25 @@
 msgstr "IDE Eclipse"
 
 #: ../menu-data/edenmath.app:EdenMath.desktop.in.h:1
-msgid "A Scientific Calculator"
-msgstr "Vedecká kalkulačka"
-
-#: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2
 msgid "EdenMath"
 msgstr "EdenMath"
 
+#: ../menu-data/edenmath.app:EdenMath.desktop.in.h:2
+msgid "A Scientific Calculator"
+msgstr "Vedecká kalkulačka"
+
 #: ../menu-data/edubuntu-menueditor:menueditor.desktop.in.h:1
 msgid "Edubuntu menu editor"
 msgstr ""
 
 #: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:1
-msgid "Bookkeeping program for small to medium sized companies"
-msgstr ""
-
-#: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2
 msgid "EekBoek"
 msgstr "EekBoek"
 
+#: ../menu-data/eekboek-gui:ebwxshell.desktop.in.h:2
+msgid "Bookkeeping program for small to medium sized companies"
+msgstr ""
+
 #: ../menu-data/efax-gtk:efax-gtk.desktop.in.h:1
 msgid "Efax-gtk"
 msgstr "Efax-gtk"
@@ -3457,21 +3573,21 @@
 msgstr ""
 
 #: ../menu-data/efte:efte.desktop.in.h:1
-msgid "Fast, extendable programmers' text editor"
-msgstr "Rýchly, rozšítriteľný programátorský editor textu"
-
-#: ../menu-data/efte:efte.desktop.in.h:2
 msgid "eFTE"
 msgstr "eFTE"
 
-#: ../menu-data/egoboo:egoboo.desktop.in.h:1
-msgid "3D dungeon crawling game"
-msgstr "3D hra o lození po temniciach"
+#: ../menu-data/efte:efte.desktop.in.h:2
+msgid "Fast, extendable programmers' text editor"
+msgstr "Rýchly, rozšítriteľný programátorský editor textu"
 
-#: ../menu-data/egoboo:egoboo.desktop.in.h:2
+#: ../menu-data/egoboo:egoboo.desktop.in.h:1
 msgid "Egoboo"
 msgstr "Egoboo"
 
+#: ../menu-data/egoboo:egoboo.desktop.in.h:2
+msgid "3D dungeon crawling game"
+msgstr "3D hra o lození po temniciach"
+
 #: ../menu-data/eiciel:eiciel.desktop.in.h:1
 msgid "Eiciel"
 msgstr "Eiciel"
@@ -3484,13 +3600,13 @@
 "a adresárov"
 
 #: ../menu-data/einstein:einstein.desktop.in.h:1
-msgid "\"Puzzle game inspired on Einstein's puzzle\""
-msgstr "Logická hra inšpirovaná hrou Einstein's puzzle"
-
-#: ../menu-data/einstein:einstein.desktop.in.h:2
 msgid "Einstein"
 msgstr "Einstein"
 
+#: ../menu-data/einstein:einstein.desktop.in.h:2
+msgid "\"Puzzle game inspired on Einstein's puzzle\""
+msgstr "Logická hra inšpirovaná hrou Einstein's puzzle"
+
 #: ../menu-data/eiskaltdcpp-gtk:eiskaltdcpp-gtk.desktop.in.h:1
 msgid "EiskaltDC++ Gtk"
 msgstr ""
@@ -3513,22 +3629,30 @@
 msgstr ""
 
 #: ../menu-data/electric:electric.desktop.in.h:1
-msgid "Electrical CAD System"
-msgstr "Systém CAD na návrh elektrických obvodov"
-
-#: ../menu-data/electric:electric.desktop.in.h:2
 msgid "electric"
 msgstr "electric"
 
+#: ../menu-data/electric:electric.desktop.in.h:2
+msgid "Electrical CAD System"
+msgstr "Systém CAD na návrh elektrických obvodov"
+
 #: ../menu-data/elinks-lite:elinks.desktop.in.h:1
 #: ../menu-data/elinks:elinks.desktop.in.h:1
-msgid "Browse the web in text mode"
-msgstr "Prehliadania webu v textovom režime"
+msgid "ELinks Web Browser"
+msgstr "Webový prehliadač ELinks"
 
 #: ../menu-data/elinks-lite:elinks.desktop.in.h:2
 #: ../menu-data/elinks:elinks.desktop.in.h:2
-msgid "ELinks Web Browser"
-msgstr "Webový prehliadač ELinks"
+msgid "Browse the web in text mode"
+msgstr "Prehliadania webu v textovom režime"
+
+#: ../menu-data/elki:elki.desktop.in.h:1
+msgid "ELKI"
+msgstr ""
+
+#: ../menu-data/elki:elki.desktop.in.h:2
+msgid "Data mining algorithm development framework"
+msgstr ""
 
 #: ../menu-data/elmer:ElmerGUI.desktop.in.h:1
 msgid "Elmer"
@@ -3564,43 +3688,43 @@
 "Spúšťa predvolený webový prehliadač na lokálnej webstránke EMBOSS Explorer."
 
 #: ../menu-data/emelfm2:emelfm2.desktop.in.h:1
-msgid "2-pane Gtk+2 file manager"
-msgstr "Dvojpanelový správca súborov pre Gtk+2"
-
-#: ../menu-data/emelfm2:emelfm2.desktop.in.h:2
 msgid "emelFM2"
 msgstr "emelFM2"
 
-#: ../menu-data/emerillon:emerillon.desktop.in.h:1
-msgid "Browse maps"
-msgstr "Prehliadač máp"
+#: ../menu-data/emelfm2:emelfm2.desktop.in.h:2
+msgid "2-pane Gtk+2 file manager"
+msgstr "Dvojpanelový správca súborov pre Gtk+2"
 
-#: ../menu-data/emerillon:emerillon.desktop.in.h:2
+#: ../menu-data/emerillon:emerillon.desktop.in.h:1
 msgid "Emerillon Map Viewer"
 msgstr ""
 
+#: ../menu-data/emerillon:emerillon.desktop.in.h:2
+msgid "Browse maps"
+msgstr "Prehliadač máp"
+
 #: ../menu-data/emesene:emesene.desktop.in.h:1
-msgid "Instant messaging client for MSN, Gtalk and Facebook"
+msgid "emesene"
 msgstr ""
 
 #: ../menu-data/emesene:emesene.desktop.in.h:2
-msgid "emesene"
+msgid "Instant messaging client for MSN, Gtalk and Facebook"
 msgstr ""
 
 #: ../menu-data/emma:emma.desktop.in.h:1
-msgid "MySQL managing assistant"
-msgstr "Asistent správcu MySQL"
-
-#: ../menu-data/emma:emma.desktop.in.h:2
 msgid "emma"
 msgstr "emma"
 
+#: ../menu-data/emma:emma.desktop.in.h:2
+msgid "MySQL managing assistant"
+msgstr "Asistent správcu MySQL"
+
 #: ../menu-data/empathy:empathy.desktop.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgid "Empathy Internet Messaging"
 msgstr ""
 
 #: ../menu-data/empathy:empathy.desktop.in.h:2
-msgid "Empathy Internet Messaging"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 
 #: ../menu-data/empcommand:empcommand.desktop.in.h:1
@@ -3646,13 +3770,13 @@
 msgstr ""
 
 #: ../menu-data/enna:enna.desktop.in.h:1
-msgid "EFL Multimedia Center"
-msgstr "Centrum multimédií EFL"
-
-#: ../menu-data/enna:enna.desktop.in.h:2
 msgid "Enna"
 msgstr "Enna"
 
+#: ../menu-data/enna:enna.desktop.in.h:2
+msgid "EFL Multimedia Center"
+msgstr "Centrum multimédií EFL"
+
 #: ../menu-data/entagged:entagged.desktop.in.h:1
 msgid "Entagged"
 msgstr "Entagged"
@@ -3662,14 +3786,14 @@
 msgstr "Editor značiek"
 
 #: ../menu-data/eog:eog.desktop.in.h:1
-msgid "Browse and rotate images"
-msgstr "Prehliadanie a otáčanie obrázkov"
-
-#: ../menu-data/eog:eog.desktop.in.h:2
 #: ../menu-data/gpicview:gpicview.desktop.in.h:1
 msgid "Image Viewer"
 msgstr "Prehliadač obrázkov"
 
+#: ../menu-data/eog:eog.desktop.in.h:2
+msgid "Browse and rotate images"
+msgstr "Prehliadanie a otáčanie obrázkov"
+
 #: ../menu-data/epdfview:epdfview.desktop.in.h:1
 msgid "Lightweight PDF document viewer"
 msgstr "Odľahčený prehliadač PDF dokumentov"
@@ -3679,23 +3803,27 @@
 msgstr "ePDFViewer"
 
 #: ../menu-data/epigrass:epigrass.desktop.in.h:1
-msgid "Epidemics Simulator"
-msgstr "Simulátor epidémie"
-
-#: ../menu-data/epigrass:epigrass.desktop.in.h:2
 msgid "Epigrass"
 msgstr "Epigrass"
 
-#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1
-#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1
-msgid "Browse the web"
-msgstr "Webový prehliadač"
+#: ../menu-data/epigrass:epigrass.desktop.in.h:2
+msgid "Epidemics Simulator"
+msgstr "Simulátor epidémie"
 
-#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2
+#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:1
 msgid "Epiphany Web Browser"
 msgstr ""
 
+#: ../menu-data/epiphany-browser-data:epiphany.desktop.in.h:2
+#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
+msgid "Browse the web"
+msgstr "Webový prehliadač"
+
 #: ../menu-data/epiphany:epiphany-game.desktop.in.h:1
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../menu-data/epiphany:epiphany-game.desktop.in.h:2
 msgid ""
 "Collect valuable minerals, while avoiding being hit by a falling boulder or "
 "a bomb"
@@ -3703,10 +3831,6 @@
 "Zbierajte cenné minerály bez toho aby vás zasiahol padajúci balvan alebo "
 "bomba"
 
-#: ../menu-data/epiphany:epiphany-game.desktop.in.h:2
-msgid "Epiphany"
-msgstr "Epiphany"
-
 #: ../menu-data/epoptes:epoptes.desktop.in.h:1
 msgid "Epoptes"
 msgstr ""
@@ -3732,13 +3856,13 @@
 msgstr "Plnohodnotné IDE pre Python"
 
 #: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:1
-msgid "Let the computer read out text for you"
-msgstr "Nechajte počítač prečítať text nahlas za vás"
-
-#: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2
 msgid "eSpeak speech synthesizer"
 msgstr "Syntetizátor reči eSpeak"
 
+#: ../menu-data/espeak-gui:espeak-gui.desktop.in.h:2
+msgid "Let the computer read out text for you"
+msgstr "Nechajte počítač prečítať text nahlas za vás"
+
 #: ../menu-data/esperanza:esperanza.desktop.in.h:1
 msgid "Esperanza"
 msgstr "Esperanza"
@@ -3750,14 +3874,6 @@
 "Klient XMMS2, ktorý má za cieľ mať čo najviac vlastností a byť čo "
 "najpoužiteľnejší"
 
-#: ../menu-data/esteidutil:esteidutil.desktop.in.h:1
-msgid "EstEID smartcard management tool"
-msgstr ""
-
-#: ../menu-data/esteidutil:esteidutil.desktop.in.h:2
-msgid "esteidutil"
-msgstr ""
-
 #: ../menu-data/etherape:etherape.desktop.in.h:1
 msgid "EtherApe"
 msgstr ""
@@ -3767,50 +3883,51 @@
 msgstr ""
 
 #: ../menu-data/etoys:etoys.desktop.in.h:1
-msgid " A media-rich model, simulation construction kit and authoring tool"
-msgstr ""
-
-#: ../menu-data/etoys:etoys.desktop.in.h:2
 msgid "eToys"
 msgstr "eToys"
 
-#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:1
-msgid "Multipurpose sniffer/interceptor/logger"
-msgstr "Viacúčelový program na záznam sieťovej premávky"
+#: ../menu-data/etoys:etoys.desktop.in.h:2
+msgid " A media-rich model, simulation construction kit and authoring tool"
+msgstr ""
 
-#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2
+#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:1
 msgid "ettercap"
 msgstr "ettercap"
 
-#: ../menu-data/etw:etw.desktop.in.h:1
-msgid "Arcade Soccer Game"
-msgstr "Arkádová futbalová hra"
+#: ../menu-data/ettercap-graphical:ettercap.desktop.in.h:2
+msgid "Multipurpose sniffer/interceptor/logger"
+msgstr "Viacúčelový program na záznam sieťovej premávky"
 
-#: ../menu-data/etw:etw.desktop.in.h:2
+#: ../menu-data/etw:etw.desktop.in.h:1
 msgid "Eat The Whistle"
 msgstr "Zjedz píšťaľku"
 
-#: ../menu-data/euler:euler.desktop.in.h:1
-msgid "An interactive mathematical program"
-msgstr "Interaktívny matematický program"
+#: ../menu-data/etw:etw.desktop.in.h:2
+msgid "Arcade Soccer Game"
+msgstr "Arkádová futbalová hra"
 
-#: ../menu-data/euler:euler.desktop.in.h:2
+#: ../menu-data/euler:euler.desktop.in.h:1
 msgid "Euler"
 msgstr "Euler"
 
+#: ../menu-data/euler:euler.desktop.in.h:2
+msgid "An interactive mathematical program"
+msgstr "Interaktívny matematický program"
+
 #: ../menu-data/evilvte:evilvte.desktop.in.h:1
+msgid "evilvte"
+msgstr "evilvte"
+
+#: ../menu-data/evilvte:evilvte.desktop.in.h:2
 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:1
 msgid "Terminal Emulator"
 msgstr "Emulátor terminálu"
 
-#: ../menu-data/evilvte:evilvte.desktop.in.h:2
-msgid "evilvte"
-msgstr "evilvte"
-
 #: ../menu-data/evince-common:evince.desktop.in.h:1
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
-#: ../menu-data/okular:kde4__okular.desktop.in.h:1
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
+#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
+#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:2
+#: ../menu-data/okular:kde4__okular.desktop.in.h:2
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
 msgid "Document Viewer"
 msgstr "Prehliadač dokumentov"
 
@@ -3818,14 +3935,6 @@
 msgid "View multi-page documents"
 msgstr "Zobrazovanie viacstranových dokumentov"
 
-#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:1
-msgid "Evolution RSS"
-msgstr ""
-
-#: ../menu-data/evolution-rss:evolution-rss.desktop.in.h:2
-msgid "Evolution plugin that enables Evolution Mail to display rss feeds."
-msgstr ""
-
 #: ../menu-data/evolution:evolution.desktop.in.h:1
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution - pošta a kalendár"
@@ -3851,14 +3960,14 @@
 msgstr "Vypočujte si, preskúmajte alebo spravujte vaše hudobnú zbierku"
 
 #: ../menu-data/exfalso:exfalso.desktop.in.h:1
-msgid "Edit tags in your audio files"
-msgstr "Upravovanie značiek zvukových súborov"
-
-#: ../menu-data/exfalso:exfalso.desktop.in.h:2
 msgid "Ex Falso"
 msgstr "Ex Falso"
 
-#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:1
+#: ../menu-data/exfalso:exfalso.desktop.in.h:2
+msgid "Edit tags in your audio files"
+msgstr "Upravovanie značiek zvukových súborov"
+
+#: ../menu-data/exo-utils:exo-file-manager.desktop.in.h:2
 msgid "Browse the file system"
 msgstr ""
 
@@ -3871,14 +3980,14 @@
 msgstr ""
 
 #: ../menu-data/exo-utils:exo-terminal-emulator.desktop.in.h:2
-#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3
+#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/roxterm:roxterm.desktop.in.h:2
 #: ../menu-data/sakura:sakura.desktop.in.h:2
 msgid "Use the command line"
 msgstr "Príkazový riadok"
 
-#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:2
-#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1
+#: ../menu-data/exo-utils:exo-web-browser.desktop.in.h:1
+#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2
 msgid "Web Browser"
 msgstr ""
 
@@ -3891,13 +4000,13 @@
 msgstr ""
 
 #: ../menu-data/extace:extace.desktop.in.h:1
-msgid "Audio Waveform Monitor"
-msgstr "Monitor tvaru zvukových vĺn"
-
-#: ../menu-data/extace:extace.desktop.in.h:2
 msgid "Extace Waveform Display"
 msgstr "Zobrazenie zvukových vĺn Extace"
 
+#: ../menu-data/extace:extace.desktop.in.h:2
+msgid "Audio Waveform Monitor"
+msgstr "Monitor tvaru zvukových vĺn"
+
 #: ../menu-data/extcalc:extcalc.desktop.in.h:1
 msgid "Extcalc"
 msgstr "Extcalc"
@@ -3934,22 +4043,14 @@
 msgid "No name"
 msgstr ""
 
-#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:1
-msgid "Tool for construction of phylogenetic trees of DNA sequences"
-msgstr "Nástroj na konštrukciu fylogenetických stromov sekvencií DNA"
-
-#: ../menu-data/fastdnaml:fastdnaml.desktop.in.h:2
-msgid "fastDNAml"
-msgstr "fastDNAml"
-
 #: ../menu-data/fatrat:fatrat.desktop.in.h:1
-msgid "FatRat"
-msgstr "FatRat"
-
-#: ../menu-data/fatrat:fatrat.desktop.in.h:2
 msgid "Qt-based download/upload manager"
 msgstr "Správca sťahovania/nahrávania založený na Qt"
 
+#: ../menu-data/fatrat:fatrat.desktop.in.h:2
+msgid "FatRat"
+msgstr "FatRat"
+
 #: ../menu-data/faumachine:faum.desktop.in.h:1
 msgid "FAUmachine"
 msgstr "FAUmachine"
@@ -3992,27 +4093,27 @@
 msgstr ""
 
 #: ../menu-data/fcitx-data:fcitx.desktop.in.h:1
-msgid "Chinese Input Method"
+msgid "Fcitx"
 msgstr ""
 
 #: ../menu-data/fcitx-data:fcitx.desktop.in.h:2
-msgid "Fcitx"
+msgid "Chinese Input Method"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:1
-msgid "Chinese Input Method (Use Kimpanel)"
+msgid "Fcitx Kimpanel"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-kimpanel:fcitx-kimpanel.desktop.in.h:2
-msgid "Fcitx Kimpanel"
+msgid "Chinese Input Method (Use Kimpanel)"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:1
-msgid "Chinese Input Method (Use Light weight UI)"
+msgid "Fcitx Light UI"
 msgstr ""
 
 #: ../menu-data/fcitx-ui-light:fcitx-light.desktop.in.h:2
-msgid "Fcitx Light UI"
+msgid "Chinese Input Method (Use Light weight UI)"
 msgstr ""
 
 #: ../menu-data/feh:feh.desktop.in.h:1
@@ -4020,40 +4121,40 @@
 msgstr "Feh"
 
 #: ../menu-data/feh:feh.desktop.in.h:2
-#: ../menu-data/preview.app:Preview.desktop.in.h:1
+#: ../menu-data/preview.app:Preview.desktop.in.h:2
 msgid "Image viewer"
 msgstr "Prehliadač obrázkov"
 
 #: ../menu-data/felix-latin:felix.desktop.in.h:1
-msgid "Gaffiot's dictionary is a reference book"
+msgid "Latin-French dictionary"
 msgstr ""
 
 #: ../menu-data/felix-latin:felix.desktop.in.h:2
-msgid "Latin-French dictionary"
+msgid "Gaffiot's dictionary is a reference book"
 msgstr ""
 
 #: ../menu-data/ferret:ferret.desktop.in.h:1
-msgid "Design E-R databases"
-msgstr "Návrh E-R diagramov databáz"
-
-#: ../menu-data/ferret:ferret.desktop.in.h:2
 msgid "ferret"
 msgstr "ferret"
 
-#: ../menu-data/fet:fet.desktop.in.h:1
-msgid "Generate timetables for educational institutions"
-msgstr "Tvorba rozvrhov pre vzdelávacie inštitúcie"
+#: ../menu-data/ferret:ferret.desktop.in.h:2
+msgid "Design E-R databases"
+msgstr "Návrh E-R diagramov databáz"
 
-#: ../menu-data/fet:fet.desktop.in.h:2
+#: ../menu-data/fet:fet.desktop.in.h:1
 msgid "Timetable Generator"
 msgstr "Tvorba rozvrhov"
 
+#: ../menu-data/fet:fet.desktop.in.h:2
+msgid "Generate timetables for educational institutions"
+msgstr "Tvorba rozvrhov pre vzdelávacie inštitúcie"
+
 #: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:1
-msgid "Audio mixer for Firewire devices"
+msgid "FFADO Mixer"
 msgstr ""
 
 #: ../menu-data/ffado-mixer-qt4:ffado.org-ffadomixer.desktop.in.h:2
-msgid "FFADO Mixer"
+msgid "Audio mixer for Firewire devices"
 msgstr ""
 
 #: ../menu-data/fgo:fgo.desktop.in.h:1
@@ -4089,13 +4190,13 @@
 msgstr ""
 
 #: ../menu-data/filezilla:filezilla.desktop.in.h:1
-msgid "Download and upload files via FTP, FTPS and SFTP"
-msgstr "Sťahovanie a nahrávanie súborov pomocou FTP, FTPS a SFTP"
-
-#: ../menu-data/filezilla:filezilla.desktop.in.h:2
 msgid "FileZilla"
 msgstr "FileZilla"
 
+#: ../menu-data/filezilla:filezilla.desktop.in.h:2
+msgid "Download and upload files via FTP, FTPS and SFTP"
+msgstr "Sťahovanie a nahrávanie súborov pomocou FTP, FTPS a SFTP"
+
 #: ../menu-data/filler:filler.desktop.in.h:1
 msgid "Filler"
 msgstr "Filler"
@@ -4120,7 +4221,7 @@
 msgid "Record and edit multitrack audio"
 msgstr ""
 
-#: ../menu-data/firefox:firefox.desktop.in.h:2
+#: ../menu-data/firefox:firefox.desktop.in.h:1
 msgid "Firefox Web Browser"
 msgstr "Firefox - webový prehliadač"
 
@@ -4129,52 +4230,60 @@
 msgstr ""
 
 #: ../menu-data/firestarter:firestarter.desktop.in.h:1
-msgid "Desktop Firewall Tool"
-msgstr "Firewall pre pracovné stanice"
-
-#: ../menu-data/firestarter:firestarter.desktop.in.h:2
 msgid "Firestarter"
 msgstr "Firestarter"
 
+#: ../menu-data/firestarter:firestarter.desktop.in.h:2
+msgid "Desktop Firewall Tool"
+msgstr "Firewall pre pracovné stanice"
+
 #: ../menu-data/fityk:fityk.desktop.in.h:1
+msgid "fityk"
+msgstr ""
+
+#: ../menu-data/fityk:fityk.desktop.in.h:2
 msgid "Peak fitting and data analysis"
 msgstr "Hľadanie zhodných vrcholov a analýza dát"
 
-#: ../menu-data/fityk:fityk.desktop.in.h:2
-msgid "fityk"
+#: ../menu-data/flamerobin:flamerobin.desktop.in.h:1
+msgid "FlameRobin"
 msgstr ""
 
-#: ../menu-data/flamerobin:flamerobin.desktop.in.h:1
+#: ../menu-data/flamerobin:flamerobin.desktop.in.h:2
 msgid "Administration Tool for Firebird DBMS"
 msgstr "Nástroj na správu SRBD Firebird"
 
-#: ../menu-data/flamerobin:flamerobin.desktop.in.h:2
-msgid "FlameRobin"
+#: ../menu-data/flare:flare.desktop.in.h:1
+msgid "Flare"
+msgstr ""
+
+#: ../menu-data/flare:flare.desktop.in.h:2
+msgid "A single player, 2D-isometric, action Role-Playing Game"
 msgstr ""
 
 #: ../menu-data/fldiff:fldiff.desktop.in.h:1
-msgid "A graphical diff program"
+msgid "fldiff"
 msgstr ""
 
 #: ../menu-data/fldiff:fldiff.desktop.in.h:2
-msgid "fldiff"
+msgid "A graphical diff program"
 msgstr ""
 
 #: ../menu-data/fldigi:flarq.desktop.in.h:1
-msgid "Amateur Radio Data Transfer with ARQ"
-msgstr "Amatérsky rádiový prenos dát s ARQ"
-
-#: ../menu-data/fldigi:flarq.desktop.in.h:2
 msgid "Flarq"
 msgstr ""
 
+#: ../menu-data/fldigi:flarq.desktop.in.h:2
+msgid "Amateur Radio Data Transfer with ARQ"
+msgstr "Amatérsky rádiový prenos dát s ARQ"
+
 #: ../menu-data/fldigi:fldigi.desktop.in.h:1
-#: ../menu-data/linpsk:linpsk.desktop.in.h:1
-msgid "Amateur Radio Sound Card Communications"
+msgid "Fldigi"
 msgstr ""
 
 #: ../menu-data/fldigi:fldigi.desktop.in.h:2
-msgid "Fldigi"
+#: ../menu-data/linpsk:linpsk.desktop.in.h:2
+msgid "Amateur Radio Sound Card Communications"
 msgstr ""
 
 #: ../menu-data/flegita:flegita.desktop.in.h:1
@@ -4186,66 +4295,66 @@
 msgstr "Jednoduché skenovanie obrázkov"
 
 #: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:1
+msgid "Flight of the Amazon Queen"
+msgstr ""
+
+#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2
 msgid ""
 "Embark on a quest to rescue a kidnapped princess and in the process, "
 "discover the true sinister intentions of a suspiciously located Lederhosen "
 "company"
 msgstr ""
 
-#: ../menu-data/flight-of-the-amazon-queen:flight-of-the-amazon-queen.desktop.in.h:2
-msgid "Flight of the Amazon Queen"
-msgstr ""
-
 #: ../menu-data/flightgear:flightgear.desktop.in.h:1
-msgid "A flight simulator"
-msgstr "Letecký simulátor"
-
-#: ../menu-data/flightgear:flightgear.desktop.in.h:2
 msgid "FlightGear"
 msgstr "FlightGear"
 
-#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1
-msgid "A tetris-like game"
-msgstr "Hra podobná Tetrisu"
+#: ../menu-data/flightgear:flightgear.desktop.in.h:2
+msgid "A flight simulator"
+msgstr "Letecký simulátor"
 
-#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2
+#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:1
 msgid "FloboPuyo"
 msgstr ""
 
-#: ../menu-data/flphoto:flphoto.desktop.in.h:1
-msgid "FLTK Photo Software"
-msgstr "Fotografický softvér FLTK"
+#: ../menu-data/flobopuyo:flobopuyo.desktop.in.h:2
+msgid "A tetris-like game"
+msgstr "Hra podobná Tetrisu"
 
-#: ../menu-data/flphoto:flphoto.desktop.in.h:2
+#: ../menu-data/flphoto:flphoto.desktop.in.h:1
 msgid "flPhoto"
 msgstr "flPhoto"
 
+#: ../menu-data/flphoto:flphoto.desktop.in.h:2
+msgid "FLTK Photo Software"
+msgstr "Fotografický softvér FLTK"
+
 #: ../menu-data/flpsed:flpsed.desktop.in.h:1
-msgid "Add text and annotations to PDF and PostScript documents"
+msgid "flpsed PDF Annotator"
 msgstr ""
 
 #: ../menu-data/flpsed:flpsed.desktop.in.h:2
-msgid "flpsed PDF Annotator"
+msgid "Add text and annotations to PDF and PostScript documents"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:1
-msgid "Block Attack! Game"
+msgid "FLTK Block Attack!"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flblocks.desktop.in.h:2
 #: ../menu-data/fltk1.3-games:flblocks.desktop.in.h:2
-msgid "FLTK Block Attack!"
+msgid "Block Attack! Game"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:1
 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:1
-msgid "Checkers Game"
+msgid "FLTK Checkers"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flcheckers.desktop.in.h:2
 #: ../menu-data/fltk1.3-games:flcheckers.desktop.in.h:2
-msgid "FLTK Checkers"
+msgid "Checkers Game"
 msgstr ""
 
 #: ../menu-data/fltk1.1-games:flsudoku.desktop.in.h:1
@@ -4259,11 +4368,11 @@
 msgstr "Hra s číslami Suduku"
 
 #: ../menu-data/fluid:fluid.desktop.in.h:1
-msgid "FLTK GUI Designer"
+msgid "FLUID"
 msgstr ""
 
 #: ../menu-data/fluid:fluid.desktop.in.h:2
-msgid "FLUID"
+msgid "FLTK GUI Designer"
 msgstr ""
 
 #: ../menu-data/flumotion:flumotion-admin.desktop.in.h:1
@@ -4275,19 +4384,19 @@
 msgstr ""
 
 #: ../menu-data/flush:flush.desktop.in.h:1
-msgid "Downloading files by BitTorrent protocol"
+msgid "Flush"
 msgstr ""
 
 #: ../menu-data/flush:flush.desktop.in.h:2
-msgid "Flush"
+msgid "Downloading files by BitTorrent protocol"
 msgstr ""
 
 #: ../menu-data/fmit:fmit.desktop.in.h:1
-msgid "Music instrument tuner"
+msgid "FMIT"
 msgstr ""
 
 #: ../menu-data/fmit:fmit.desktop.in.h:2
-msgid "fmit"
+msgid "Tune musical instruments"
 msgstr ""
 
 #: ../menu-data/focuswriter:focuswriter.desktop.in.h:1
@@ -4311,27 +4420,27 @@
 msgstr ""
 
 #: ../menu-data/font-manager:font-sampler.desktop.in.h:1
-msgid "Create a PDF sample sheet from a directory of fonts"
+msgid "Font Sampler"
 msgstr ""
 
 #: ../menu-data/font-manager:font-sampler.desktop.in.h:2
-msgid "Font Sampler"
+msgid "Create a PDF sample sheet from a directory of fonts"
 msgstr ""
 
 #: ../menu-data/fontforge:fontforge.desktop.in.h:1
-msgid "An outline font editor"
+msgid "FontForge"
 msgstr ""
 
 #: ../menu-data/fontforge:fontforge.desktop.in.h:2
-msgid "FontForge"
+msgid "An outline font editor"
 msgstr ""
 
 #: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:1
-msgid "A font manager"
+msgid "Fontmatrix"
 msgstr ""
 
 #: ../menu-data/fontmatrix:fontmatrix.desktop.in.h:2
-msgid "Fontmatrix"
+msgid "A font manager"
 msgstr ""
 
 #: ../menu-data/fontypython:fontypython.desktop.in.h:1
@@ -4351,21 +4460,21 @@
 msgstr ""
 
 #: ../menu-data/foobillard:foobillard.desktop.in.h:1
+msgid "Foobillard"
+msgstr ""
+
+#: ../menu-data/foobillard:foobillard.desktop.in.h:2
 msgid "3D billiards game using OpenGL"
 msgstr "3D billiard používajúci OpenGL"
 
-#: ../menu-data/foobillard:foobillard.desktop.in.h:2
-msgid "Foobillard"
+#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1
+msgid "Printers"
 msgstr ""
 
-#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:1
+#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2
 msgid "Foomatic-GUI printer configuration tool"
 msgstr "Nástroj na konfiguáciu tlačiarní Foomatic-GUI"
 
-#: ../menu-data/foomatic-gui:foomatic-gui.desktop.in.h:2
-msgid "Printers"
-msgstr ""
-
 #: ../menu-data/fotowall:fotowall.desktop.in.h:1
 msgid "Fotowall"
 msgstr ""
@@ -4374,20 +4483,20 @@
 msgid "Photo collection creativity tool"
 msgstr "Nástroj na správu zbierky fotografií"
 
-#: ../menu-data/fotoxx:fotoxx.desktop.in.h:1
-msgid "Digital Photo Editor"
-msgstr "Editor digitálnych fotografií"
-
-#: ../menu-data/fotoxx:fotoxx.desktop.in.h:2
+#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:1
 msgid "fotoxx"
 msgstr ""
 
+#: ../menu-data/fotoxx:kornelix-fotoxx.desktop.in.h:2
+msgid "Edit photos and manage collections"
+msgstr ""
+
 #: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:1
-msgid "Display map and GPS position"
+msgid "FoxtrotGPS"
 msgstr ""
 
 #: ../menu-data/foxtrotgps:foxtrotgps.desktop.in.h:2
-msgid "FoxtrotGPS"
+msgid "Display map and GPS position"
 msgstr ""
 
 #: ../menu-data/fpm2:fpm2.desktop.in.h:1
@@ -4395,26 +4504,27 @@
 msgstr ""
 
 #: ../menu-data/fpm2:fpm2.desktop.in.h:2
+#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:2
 msgid "Manage passwords"
 msgstr ""
 
 #: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:1
-msgid "Fingerprint scanning demonstration"
-msgstr ""
-
-#: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2
 msgid "fprint-demo"
 msgstr "fprint-demo"
 
-#: ../menu-data/fqterm:fqterm.desktop.in.h:1
-#: ../menu-data/qterm:qterm.desktop.in.h:1
-msgid "BBS client based on Qt library in linux"
-msgstr "Klient BBS založený na knižnici Qt v Linuxe"
+#: ../menu-data/fprint-demo:fprint-demo.desktop.in.h:2
+msgid "Fingerprint scanning demonstration"
+msgstr ""
 
-#: ../menu-data/fqterm:fqterm.desktop.in.h:2
+#: ../menu-data/fqterm:fqterm.desktop.in.h:1
 msgid "FQTerm"
 msgstr ""
 
+#: ../menu-data/fqterm:fqterm.desktop.in.h:2
+#: ../menu-data/qterm:qterm.desktop.in.h:2
+msgid "BBS client based on Qt library in linux"
+msgstr "Klient BBS založený na knižnici Qt v Linuxe"
+
 #: ../menu-data/fracplanet:fracplanet.desktop.in.h:1
 msgid "Fracplanet"
 msgstr ""
@@ -4440,38 +4550,51 @@
 msgstr ""
 
 #: ../menu-data/freealchemist:freealchemist.desktop.in.h:1
-msgid "A simpler figure block game"
-msgstr ""
-
-#: ../menu-data/freealchemist:freealchemist.desktop.in.h:2
 msgid "FreeAlchemist"
 msgstr "FreeAlchemist"
 
+#: ../menu-data/freealchemist:freealchemist.desktop.in.h:2
+msgid "A simpler figure block game"
+msgstr ""
+
 #: ../menu-data/freebirth:freebirth.desktop.in.h:1
-msgid "Bass synthesizer/sample player/sequencer"
+msgid "Freebirth"
 msgstr ""
 
 #: ../menu-data/freebirth:freebirth.desktop.in.h:2
-msgid "Freebirth"
+msgid "Bass synthesizer/sample player/sequencer"
 msgstr ""
 
 #: ../menu-data/freecad:freecad.desktop.in.h:1
+msgid "FreeCAD"
+msgstr "FreeCAD"
+
+#: ../menu-data/freecad:freecad.desktop.in.h:2
 msgid "Feature based Parametric Modeler"
 msgstr ""
 
-#: ../menu-data/freecad:freecad.desktop.in.h:2
-msgid "FreeCAD"
-msgstr "FreeCAD"
+#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:1
+msgid "Freeciv modpack installer"
+msgstr ""
+
+#: ../menu-data/freeciv-client-extras:freeciv-modpack.desktop.in.h:2
+msgid "Download and install add-ons for Freeciv"
+msgstr ""
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:1
 msgid "Freeciv"
 msgstr ""
 
 #: ../menu-data/freeciv-client-gtk:freeciv-gtk.desktop.in.h:2
+#: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:2
 msgid ""
 "Turn-based strategy game inspired by the history of human civilization"
 msgstr "Ťahová strategická hra inšpirovaná dejinami ľudskej civilizácie"
 
+#: ../menu-data/freeciv-server:freeciv-server.desktop.in.h:1
+msgid "Freeciv server"
+msgstr ""
+
 #: ../menu-data/freecol:freecol.desktop.in.h:1
 msgid "FreeCol"
 msgstr ""
@@ -4501,24 +4624,24 @@
 msgstr ""
 
 #: ../menu-data/freedm:freedm.desktop.in.h:1
-#: ../menu-data/freedoom:freedoom.desktop.in.h:1
-msgid "First Person Shooter Game"
-msgstr "Strieľačka z pohľadu prvej osoby"
-
-#: ../menu-data/freedm:freedm.desktop.in.h:2
 msgid "Free DM"
 msgstr ""
 
+#: ../menu-data/freedm:freedm.desktop.in.h:2
 #: ../menu-data/freedoom:freedoom.desktop.in.h:2
+msgid "First Person Shooter Game"
+msgstr "Strieľačka z pohľadu prvej osoby"
+
+#: ../menu-data/freedoom:freedoom.desktop.in.h:1
 msgid "Freedoom"
 msgstr ""
 
 #: ../menu-data/freedroid:freedroid.desktop.in.h:1
-msgid "Clear a spaceship from all droids"
+msgid "Freedroid"
 msgstr ""
 
 #: ../menu-data/freedroid:freedroid.desktop.in.h:2
-msgid "Freedroid"
+msgid "Clear a spaceship from all droids"
 msgstr ""
 
 #: ../menu-data/freedroidrpg:freedroidrpg.desktop.in.h:1
@@ -4530,26 +4653,22 @@
 msgstr ""
 
 #: ../menu-data/freegish:freegish.desktop.in.h:1
-msgid "A physics based arcade game"
+msgid "FreeGish"
 msgstr ""
 
 #: ../menu-data/freegish:freegish.desktop.in.h:2
-msgid "FreeGish"
+msgid "A physics based arcade game"
 msgstr ""
 
 #: ../menu-data/freeguide:freeguide.desktop.in.h:1
-msgid "Download a TV guide from the Internet and view it"
-msgstr "Stiahnite si TV sprievodcu z internetu a prezrite si ho"
-
-#: ../menu-data/freeguide:freeguide.desktop.in.h:2
 msgid "FreeGuide"
 msgstr ""
 
-#: ../menu-data/freemat:freemat.desktop.in.h:1
-msgid "FreeMat"
-msgstr "FreeMat"
+#: ../menu-data/freeguide:freeguide.desktop.in.h:2
+msgid "Download a TV guide from the Internet and view it"
+msgstr "Stiahnite si TV sprievodcu z internetu a prezrite si ho"
 
-#: ../menu-data/freemat:freemat.desktop.in.h:2
+#: ../menu-data/freemat:freemat.desktop.in.h:1
 msgid ""
 "a free environment for rapid engineering and scientific prototyping and data "
 "processing."
@@ -4557,53 +4676,57 @@
 "Prostredie zadarmo na rýchle inžinierske a vedecké prototypy a spracovanie "
 "dát."
 
+#: ../menu-data/freemat:freemat.desktop.in.h:2
+msgid "FreeMat"
+msgstr "FreeMat"
+
 #: ../menu-data/freemind:freemind.desktop.in.h:1
-msgid "A free mind mapping tool"
+msgid "FreeMind"
 msgstr ""
 
 #: ../menu-data/freemind:freemind.desktop.in.h:2
-msgid "FreeMind"
+msgid "A free mind mapping tool"
 msgstr ""
 
 #: ../menu-data/freemix:freemix.desktop.in.h:1
-msgid "Live video performance tool"
+msgid "freemix"
 msgstr ""
 
 #: ../menu-data/freemix:freemix.desktop.in.h:2
-msgid "freemix"
+msgid "Live video performance tool"
 msgstr ""
 
 #: ../menu-data/freeplane:freeplane.desktop.in.h:1
-msgid ""
-"A free tool to structure and organise your information with mind mapping"
+msgid "Freeplane"
 msgstr ""
 
 #: ../menu-data/freeplane:freeplane.desktop.in.h:2
-msgid "Freeplane"
+msgid ""
+"A free tool to structure and organise your information with mind mapping"
 msgstr ""
 
 #: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:1
-msgid "Download updated version of FreePOPs plugins"
-msgstr "Stiahnite si aktualizovanú verziu zásuvných modulov FreePOPs"
-
-#: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2
 msgid "FreePOPs updater"
 msgstr ""
 
+#: ../menu-data/freepops-updater-gnome:freepops-updater-gnome.desktop.in.h:2
+msgid "Download updated version of FreePOPs plugins"
+msgstr "Stiahnite si aktualizovanú verziu zásuvných modulov FreePOPs"
+
 #: ../menu-data/freespeak:freespeak.desktop.in.h:1
-msgid "A free frontend to online translator engines"
+msgid "FreeSpeak"
 msgstr ""
 
 #: ../menu-data/freespeak:freespeak.desktop.in.h:2
-msgid "FreeSpeak"
+msgid "A free frontend to online translator engines"
 msgstr ""
 
 #: ../menu-data/freetennis:freetennis.desktop.in.h:1
-msgid "Free Tennis - a free tennis simulation"
+msgid "FreeTennis"
 msgstr ""
 
 #: ../menu-data/freetennis:freetennis.desktop.in.h:2
-msgid "FreeTennis"
+msgid "Free Tennis - a free tennis simulation"
 msgstr ""
 
 #: ../menu-data/freevial:freevial.desktop.in.h:1
@@ -4619,7 +4742,7 @@
 msgstr ""
 
 #: ../menu-data/freevo:freevo.desktop.in.h:2
-msgid "Playing various multimedia formats, like pictures, audio or video. "
+msgid "Playing various multimedia formats, like pictures, audio or video"
 msgstr ""
 
 #: ../menu-data/freewheeling:freewheeling.desktop.in.h:1
@@ -4638,12 +4761,12 @@
 msgid "Realtime audio processor based on frequency spectral manipulation"
 msgstr ""
 
-#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:1
-msgid "Frescobaldi"
+#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:1
+msgid "LilyPond Music Editor"
 msgstr ""
 
-#: ../menu-data/frescobaldi:kde4__frescobaldi.desktop.in.h:2
-msgid "LilyPond Music Editor"
+#: ../menu-data/frescobaldi:frescobaldi.desktop.in.h:2
+msgid "Frescobaldi"
 msgstr ""
 
 #: ../menu-data/fretsonfire-game:fretsonfire-game.desktop.in.h:1
@@ -4688,11 +4811,11 @@
 msgstr ""
 
 #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:1
-msgid "FSL 4.1"
+msgid "Software Collection for (f)MRI Data Analysis"
 msgstr ""
 
 #: ../menu-data/fsl-4.1:fsl-4.1.desktop.in.h:2
-msgid "Software Collection for (f)MRI Data Analysis"
+msgid "FSL 4.1"
 msgstr ""
 
 #: ../menu-data/fslint:fslint.desktop.in.h:1
@@ -4763,6 +4886,14 @@
 msgid "Render Peter de Jong maps"
 msgstr ""
 
+#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:1
+msgid "GNOME2 IP Messenger"
+msgstr ""
+
+#: ../menu-data/g2ipmsg:g2ipmsg.desktop.in.h:2
+msgid "IP Messenger for the GNOME2"
+msgstr ""
+
 #: ../menu-data/g3data:g3data.desktop.in.h:1
 msgid "G3Data Graph Analyzer"
 msgstr ""
@@ -4772,11 +4903,11 @@
 msgstr ""
 
 #: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:1
-msgid "3D model viewer"
+msgid "G3DViewer"
 msgstr ""
 
 #: ../menu-data/g3dviewer:g3dviewer.desktop.in.h:2
-msgid "G3DViewer"
+msgid "3D model viewer"
 msgstr ""
 
 #: ../menu-data/gabedit:gabedit.desktop.in.h:1
@@ -4788,11 +4919,11 @@
 msgstr ""
 
 #: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:1
-msgid "BIND DNS server administration"
+msgid "GADMIN-BIND"
 msgstr ""
 
 #: ../menu-data/gadmin-bind:gadmin-bind.desktop.in.h:2
-msgid "GADMIN-BIND"
+msgid "BIND DNS server administration"
 msgstr ""
 
 #: ../menu-data/gadmin-openvpn-client:gadmin-openvpn-client.desktop.in.h:1
@@ -4832,19 +4963,19 @@
 msgstr ""
 
 #: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:1
-msgid "Find Synonyms and Homonyms"
+msgid "GTK Aiksaurus"
 msgstr ""
 
 #: ../menu-data/gaiksaurus:gaiksaurus.desktop.in.h:2
-msgid "GTK Aiksaurus"
+msgid "Find Synonyms and Homonyms"
 msgstr ""
 
 #: ../menu-data/gajim:gajim.desktop.in.h:1
-msgid "A GTK+ Jabber client"
+msgid "Gajim Instant Messenger"
 msgstr ""
 
 #: ../menu-data/gajim:gajim.desktop.in.h:2
-msgid "Gajim Instant Messenger"
+msgid "A GTK+ Jabber client"
 msgstr ""
 
 #: ../menu-data/galan:galan.desktop.in.h:1
@@ -4860,11 +4991,11 @@
 msgstr ""
 
 #: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:1
-msgid "Gallery Uploader"
+msgid "Upload pictures and videos to Gallery"
 msgstr ""
 
 #: ../menu-data/gallery-uploader:gallery-uploader.desktop.in.h:2
-msgid "Upload pictures and videos to Gallery"
+msgid "Gallery Uploader"
 msgstr ""
 
 #: ../menu-data/gally:kde4__gally.desktop.in.h:1
@@ -4892,43 +5023,43 @@
 msgstr ""
 
 #: ../menu-data/gambas2-ide:gambas2.desktop.in.h:1
-msgid "Gambas Almost Means Basic"
+msgid "Gambas2"
 msgstr ""
 
 #: ../menu-data/gambas2-ide:gambas2.desktop.in.h:2
-msgid "Gambas2"
+msgid "Gambas Almost Means Basic"
 msgstr ""
 
 #: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:1
-msgid "A game hacking tool. A GUI front-end for scanmem."
+msgid "Game Conqueror"
 msgstr ""
 
 #: ../menu-data/gameconqueror:GameConqueror.desktop.in.h:2
-msgid "Game Conqueror"
+msgid "A game hacking tool. A GUI front-end for scanmem."
 msgstr ""
 
 #: ../menu-data/gamgi:gamgi.desktop.in.h:1
-msgid "Construct, view and analyse atomic structures"
+msgid "gamgi"
 msgstr ""
 
 #: ../menu-data/gamgi:gamgi.desktop.in.h:2
-msgid "gamgi"
+msgid "Construct, view and analyse atomic structures"
 msgstr ""
 
 #: ../menu-data/gamt:gamt.desktop.in.h:1
-msgid "Intel AMT serial-over-lan client."
+msgid "gamt"
 msgstr ""
 
 #: ../menu-data/gamt:gamt.desktop.in.h:2
-msgid "gamt"
+msgid "Intel AMT serial-over-lan client."
 msgstr ""
 
 #: ../menu-data/ganyremote:ganyremote.desktop.in.h:1
-msgid "Bluetooth remote control"
+msgid "ganyremote"
 msgstr ""
 
 #: ../menu-data/ganyremote:ganyremote.desktop.in.h:2
-msgid "ganyremote"
+msgid "Bluetooth remote control"
 msgstr ""
 
 #: ../menu-data/gaphor:gaphor.desktop.in.h:1
@@ -4940,11 +5071,11 @@
 msgstr ""
 
 #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:1
-msgid "Abstract vertical shooter with music elements"
+msgid "Garden of Coloured Lights"
 msgstr ""
 
 #: ../menu-data/garden-of-coloured-lights:garden.desktop.in.h:2
-msgid "Garden of Coloured Lights"
+msgid "Abstract vertical shooter with music elements"
 msgstr ""
 
 #: ../menu-data/gargoyle-free:gargoyle.desktop.in.h:1
@@ -4973,11 +5104,11 @@
 msgstr ""
 
 #: ../menu-data/gatos:gatos-conf.desktop.in.h:1
-msgid "Gatos Configuration Editor"
+msgid "gatos-conf"
 msgstr ""
 
 #: ../menu-data/gatos:gatos-conf.desktop.in.h:2
-msgid "gatos-conf"
+msgid "Gatos Configuration Editor"
 msgstr ""
 
 #: ../menu-data/gatos:xatitv.desktop.in.h:1
@@ -5013,27 +5144,27 @@
 msgstr ""
 
 #: ../menu-data/gbemol:gbemol.desktop.in.h:1
-msgid "MPD client"
+msgid "gbemol"
 msgstr ""
 
 #: ../menu-data/gbemol:gbemol.desktop.in.h:2
-msgid "gbemol"
+msgid "MPD client"
 msgstr ""
 
 #: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:1
-msgid "GTK2 Bulgarian-English Dictionary"
+msgid "GbgOffice"
 msgstr ""
 
 #: ../menu-data/gbgoffice:gbgoffice.desktop.in.h:2
-msgid "GbgOffice"
+msgid "GTK2 Bulgarian-English Dictionary"
 msgstr ""
 
 #: ../menu-data/gbirthday:gbirthday.desktop.in.h:1
-msgid "Birthday reminder for E-Mail contacts"
+msgid "GBirthday"
 msgstr ""
 
 #: ../menu-data/gbirthday:gbirthday.desktop.in.h:2
-msgid "GBirthday"
+msgid "Birthday reminder for E-Mail contacts"
 msgstr ""
 
 #: ../menu-data/gbonds:gbonds.desktop.in.h:1
@@ -5045,13 +5176,13 @@
 msgstr ""
 
 #: ../menu-data/gbrainy:gbrainy.desktop.in.h:1
-msgid ""
-"Play games that challenge your logic, verbal, calculation and memory "
-"abilities"
+msgid "gbrainy"
 msgstr ""
 
 #: ../menu-data/gbrainy:gbrainy.desktop.in.h:2
-msgid "gbrainy"
+msgid ""
+"Play games that challenge your logic, verbal, calculation and memory "
+"abilities"
 msgstr ""
 
 #: ../menu-data/gcalctool:gcalctool.desktop.in.h:1
@@ -5063,35 +5194,27 @@
 msgstr "Vykonávanie aritmetických, vedeckých alebo finančných výpočtov"
 
 #: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:1
-msgid "Edit chemical 2D structures"
-msgstr ""
-
-#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2
 msgid "GChemPaint Chemical Structures Editor"
 msgstr ""
 
-#: ../menu-data/gcin:gcin-setup.desktop.in.h:1
-msgid "Setup utility for gcin input method"
-msgstr ""
-
-#: ../menu-data/gcin:gcin-setup.desktop.in.h:2
-msgid "gcin Setup"
+#: ../menu-data/gchempaint:gchempaint-0.12.desktop.in.h:2
+msgid "Edit chemical 2D structures"
 msgstr ""
 
 #: ../menu-data/gcipher:gcipher.desktop.in.h:1
-msgid "A simple encryption tool"
+msgid "GCipher"
 msgstr ""
 
 #: ../menu-data/gcipher:gcipher.desktop.in.h:2
-msgid "GCipher"
+msgid "A simple encryption tool"
 msgstr ""
 
 #: ../menu-data/gco:gco.desktop.in.h:1
-msgid "A GNOME interface for managing your comic book collection"
+msgid "GNOME Comics Organizer"
 msgstr ""
 
 #: ../menu-data/gco:gco.desktop.in.h:2
-msgid "GNOME Comics Organizer"
+msgid "A GNOME interface for managing your comic book collection"
 msgstr ""
 
 #: ../menu-data/gcolor2:gcolor2.desktop.in.h:1
@@ -5103,19 +5226,19 @@
 msgstr ""
 
 #: ../menu-data/gcompris:gcompris.desktop.in.h:1
-msgid "Educational game for ages 2 to 10"
+msgid "Educational suite GCompris"
 msgstr ""
 
 #: ../menu-data/gcompris:gcompris.desktop.in.h:2
-msgid "Educational suite GCompris"
+msgid "Educational game for ages 2 to 10"
 msgstr ""
 
 #: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:1
-msgid "A Cleaning tool for GConf"
+msgid "GConf Cleaner"
 msgstr ""
 
 #: ../menu-data/gconf-cleaner:gconf-cleaner.desktop.in.h:2
-msgid "GConf Cleaner"
+msgid "A Cleaning tool for GConf"
 msgstr ""
 
 #: ../menu-data/gconf-editor:gconf-editor.desktop.in.h:1
@@ -5123,19 +5246,19 @@
 msgstr "Editor konfigurácie"
 
 #: ../menu-data/gconjugue:gconjugue.desktop.in.h:1
-msgid "Conjugates Portuguese verbs"
+msgid "GConjugue"
 msgstr ""
 
 #: ../menu-data/gconjugue:gconjugue.desktop.in.h:2
-msgid "GConjugue"
+msgid "Conjugates Portuguese verbs"
 msgstr ""
 
 #: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:1
-msgid "Edit and display crystalline structures"
+msgid "Gnome Crystal Crystalline Structures Viewer"
 msgstr ""
 
 #: ../menu-data/gcrystal:gcrystal-0.12.desktop.in.h:2
-msgid "Gnome Crystal Crystalline Structures Viewer"
+msgid "Edit and display crystalline structures"
 msgstr ""
 
 #: ../menu-data/gcstar:gcstar.desktop.in.h:1
@@ -5147,35 +5270,35 @@
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:1
-msgid "Display chemical 3D structures"
+msgid "Molecules Viewer"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchem3d-0.12.desktop.in.h:2
-msgid "Molecules Viewer"
+msgid "Display chemical 3D structures"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:1
-msgid "A simple calculator for chemistry"
+msgid "Chemical calculator"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemcalc-0.12.desktop.in.h:2
-msgid "Chemical calculator"
+msgid "A simple calculator for chemistry"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:1
-msgid "A Mendeleiev table of the chemical elements"
+msgid "Periodic table of the elements"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gchemtable-0.12.desktop.in.h:2
-msgid "Periodic table of the elements"
+msgid "A Mendeleiev table of the chemical elements"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:1
-msgid "A spectrum viewer for the GNOME desktop"
+msgid "Spectrum viewer"
 msgstr ""
 
 #: ../menu-data/gcu-bin:gspectrum-0.12.desktop.in.h:2
-msgid "Spectrum viewer"
+msgid "A spectrum viewer for the GNOME desktop"
 msgstr ""
 
 #: ../menu-data/gcursor:gcursor.desktop.in.h:1
@@ -5201,7 +5324,7 @@
 
 #: ../menu-data/gdebi-kde:kde4__gdebi-kde.desktop.in.h:2
 #: ../menu-data/gdebi:gdebi.desktop.in.h:2
-#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1
+#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2
 msgid "Install and view software packages"
 msgstr "Inštalácia a zobrazovanie softvérových balíkov"
 
@@ -5214,19 +5337,19 @@
 msgstr ""
 
 #: ../menu-data/gdesklets:gdesklets.desktop.in.h:1
-msgid "A desktop applet system for GNOME"
+msgid "gDesklets"
 msgstr ""
 
 #: ../menu-data/gdesklets:gdesklets.desktop.in.h:2
-msgid "gDesklets"
+msgid "A desktop applet system for GNOME"
 msgstr ""
 
 #: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:1
-msgid "GUI for devilspie matching daemon"
+msgid "gDevilspie"
 msgstr ""
 
 #: ../menu-data/gdevilspie:gdevilspie.desktop.in.h:2
-msgid "gDevilspie"
+msgid "GUI for devilspie matching daemon"
 msgstr ""
 
 #: ../menu-data/gdigi:gdigi.desktop.in.h:1
@@ -5243,11 +5366,11 @@
 msgstr ""
 
 #: ../menu-data/gdmap:gdmap.desktop.in.h:1
-msgid "Display disk space using tree maps"
+msgid "Graphical Disk Map"
 msgstr ""
 
 #: ../menu-data/gdmap:gdmap.desktop.in.h:2
-msgid "Graphical Disk Map"
+msgid "Display disk space using tree maps"
 msgstr ""
 
 #: ../menu-data/gdpc:gdpc.desktop.in.h:1
@@ -5259,78 +5382,74 @@
 msgstr ""
 
 #: ../menu-data/geany:geany.desktop.in.h:1
-msgid "A fast and lightweight IDE using GTK2"
+msgid "Geany"
 msgstr ""
 
 #: ../menu-data/geany:geany.desktop.in.h:2
-msgid "Geany"
+msgid "A fast and lightweight IDE using GTK2"
 msgstr ""
 
 #: ../menu-data/gebabbel:gebabbel.desktop.in.h:1
-msgid "Convert GPS data and exchange it with a GPS unit"
+msgid "Gebabbel"
 msgstr ""
 
 #: ../menu-data/gebabbel:gebabbel.desktop.in.h:2
-msgid "Gebabbel"
+msgid "Convert GPS data and exchange it with a GPS unit"
 msgstr ""
 
 #: ../menu-data/gecrit:gecrit.desktop.in.h:1
-msgid "A python text editor."
+msgid "gEcrit"
 msgstr ""
 
 #: ../menu-data/gecrit:gecrit.desktop.in.h:2
-msgid "gEcrit"
+msgid "A python text editor."
 msgstr ""
 
 #: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:1
-msgid "Manipulate component attributes with gattrib"
+msgid "gEDA Attribute Editor"
 msgstr ""
 
 #: ../menu-data/geda-gattrib:geda-gattrib.desktop.in.h:2
-msgid "gEDA Attribute Editor"
+msgid "Manipulate component attributes with gattrib"
 msgstr ""
 
 #: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:1
-msgid "Create and edit electrical schematics and symbols with gschem"
+msgid "gEDA Schematic Editor"
 msgstr ""
 
 #: ../menu-data/geda-gschem:geda-gschem.desktop.in.h:2
-msgid "gEDA Schematic Editor"
+msgid "Create and edit electrical schematics and symbols with gschem"
 msgstr ""
 
 #: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:1
-msgid "Create and edit electronics projects with xgsch2pcb"
+msgid "gEDA Schematic -> PCB Project"
 msgstr ""
 
 #: ../menu-data/geda-xgsch2pcb:geda-xgsch2pcb.desktop.in.h:2
-msgid "gEDA Schematic -> PCB Project"
+msgid "Create and edit electronics projects with xgsch2pcb"
 msgstr ""
 
 #: ../menu-data/gedit:gedit.desktop.in.h:1
-#: ../menu-data/jedit:jedit.desktop.in.h:1
-#: ../menu-data/scribes:scribes.desktop.in.h:1
-#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1
+#: ../menu-data/jedit:jedit.desktop.in.h:2
+#: ../menu-data/scribes:scribes.desktop.in.h:2
+#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2
 msgid "Edit text files"
 msgstr "Úprava textových súborov"
 
 #: ../menu-data/gedit:gedit.desktop.in.h:2
-#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2
+#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1
+#: ../menu-data/mined:mined.desktop.in.h:2
 msgid "Text Editor"
 msgstr "Textový editor"
 
-#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:1
-msgid "Geeqie (GPS support)"
+#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1
+msgid "Geeqie"
 msgstr ""
 
-#: ../menu-data/geeqie-gps:geeqie-gps.desktop.in.h:2
 #: ../menu-data/geeqie:geeqie-standard.desktop.in.h:2
 msgid "View and manage images"
 msgstr ""
 
-#: ../menu-data/geeqie:geeqie-standard.desktop.in.h:1
-msgid "Geeqie"
-msgstr ""
-
 #: ../menu-data/gelemental:gelemental.desktop.in.h:1
 msgid "Periodic Table"
 msgstr ""
@@ -5360,27 +5479,27 @@
 msgstr ""
 
 #: ../menu-data/genpo:genpo.desktop.in.h:1
-msgid "GENPO is the GENeral Purpose Organ."
+msgid "Genpo"
 msgstr ""
 
 #: ../menu-data/genpo:genpo.desktop.in.h:2
-msgid "Genpo"
+msgid "GENPO is the GENeral Purpose Organ."
 msgstr ""
 
 #: ../menu-data/gentoo:gentoo.desktop.in.h:1
-msgid "Fully GUI-configurable, two-pane X file manager"
+msgid "Gentoo"
 msgstr ""
 
 #: ../menu-data/gentoo:gentoo.desktop.in.h:2
-msgid "Gentoo"
+msgid "Fully GUI-configurable, two-pane X file manager"
 msgstr ""
 
 #: ../menu-data/geogebra:geogebra.desktop.in.h:1
-msgid "Create interactive mathematical constructions and applets. "
+msgid "GeoGebra"
 msgstr ""
 
 #: ../menu-data/geogebra:geogebra.desktop.in.h:2
-msgid "GeoGebra"
+msgid "Create interactive mathematical constructions and applets. "
 msgstr ""
 
 #: ../menu-data/geomview:geomview.desktop.in.h:1
@@ -5392,19 +5511,19 @@
 msgstr ""
 
 #: ../menu-data/geotranz:geotranz.desktop.in.h:1
-msgid "Geographic coordinates translator"
+msgid "Geotranz"
 msgstr ""
 
 #: ../menu-data/geotranz:geotranz.desktop.in.h:2
-msgid "Geotranz"
+msgid "Geographic coordinates translator"
 msgstr ""
 
 #: ../menu-data/gerbv:gerbv.desktop.in.h:1
-msgid "Gerber file viewer for PCB design"
+msgid "Gerbv Gerber File Viewer"
 msgstr ""
 
 #: ../menu-data/gerbv:gerbv.desktop.in.h:2
-msgid "Gerbv Gerber File Viewer"
+msgid "Gerber file viewer for PCB design"
 msgstr ""
 
 #: ../menu-data/gerstensaft:gerstensaft.desktop.in.h:1
@@ -5412,27 +5531,27 @@
 msgstr ""
 
 #: ../menu-data/gespeaker:gespeaker.desktop.in.h:1
-msgid "A frontend for espeak"
+msgid "Gespeaker"
 msgstr ""
 
 #: ../menu-data/gespeaker:gespeaker.desktop.in.h:2
-msgid "Gespeaker"
+msgid "A frontend for espeak"
 msgstr ""
 
 #: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:1
-msgid "Extract cursors and icons from MS Windows compatible resource files"
+msgid "gExtractWinIcons"
 msgstr ""
 
 #: ../menu-data/gextractwinicons:gextractwinicons.desktop.in.h:2
-msgid "gExtractWinIcons"
+msgid "Extract cursors and icons from MS Windows compatible resource files"
 msgstr ""
 
 #: ../menu-data/gfaim:gfaim.desktop.in.h:1
-msgid "Find any recipe you want"
+msgid "Gfaim"
 msgstr ""
 
 #: ../menu-data/gfaim:gfaim.desktop.in.h:2
-msgid "Gfaim"
+msgid "Find any recipe you want"
 msgstr ""
 
 #: ../menu-data/gfax:gfax.desktop.in.h:1
@@ -5456,11 +5575,11 @@
 msgstr ""
 
 #: ../menu-data/gftp-gtk:gftp.desktop.in.h:1
-msgid "Download and upload files using multiple file transfer protocols"
+msgid "gFTP"
 msgstr ""
 
 #: ../menu-data/gftp-gtk:gftp.desktop.in.h:2
-msgid "gFTP"
+msgid "Download and upload files using multiple file transfer protocols"
 msgstr ""
 
 #: ../menu-data/ggcov:Development__ggcov.desktop.in.h:1
@@ -5480,29 +5599,29 @@
 msgstr ""
 
 #: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:1
-#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1
-#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1
-msgid "GGZ Core Client"
+msgid "GGZ-Gnome"
 msgstr ""
 
 #: ../menu-data/ggz-gnome-client:ggz-gnome.desktop.in.h:2
-msgid "GGZ-Gnome"
+#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:2
+#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2
+msgid "GGZ Core Client"
 msgstr ""
 
-#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:2
+#: ../menu-data/ggz-gtk-client:ggz-gtk.desktop.in.h:1
 msgid "ggz-gtk"
 msgstr ""
 
-#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:2
+#: ../menu-data/ggz-txt-client:ggz-txt.desktop.in.h:1
 msgid "ggz-txt"
 msgstr ""
 
 #: ../menu-data/ghemical:ghemical.desktop.in.h:1
-msgid "Draw models of molecules"
+msgid "ghemical"
 msgstr ""
 
 #: ../menu-data/ghemical:ghemical.desktop.in.h:2
-msgid "ghemical"
+msgid "Draw models of molecules"
 msgstr ""
 
 #: ../menu-data/ghex:ghex.desktop.in.h:1
@@ -5514,11 +5633,11 @@
 msgstr ""
 
 #: ../menu-data/ghextris:ghextris.desktop.in.h:1
-msgid "Fit falling blocks together on a hexagonal grid"
+msgid "Ghextris"
 msgstr ""
 
 #: ../menu-data/ghextris:ghextris.desktop.in.h:2
-msgid "Ghextris"
+msgid "Fit falling blocks together on a hexagonal grid"
 msgstr ""
 
 #: ../menu-data/ghkl:ghkl.desktop.in.h:1
@@ -5538,11 +5657,11 @@
 msgstr ""
 
 #: ../menu-data/gigolo:gigolo.desktop.in.h:1
-msgid "A simple frontend to easily connect to remote filesystems"
+msgid "Gigolo"
 msgstr ""
 
 #: ../menu-data/gigolo:gigolo.desktop.in.h:2
-msgid "Gigolo"
+msgid "A simple frontend to easily connect to remote filesystems"
 msgstr ""
 
 #: ../menu-data/gimmix:gimmix.desktop.in.h:1
@@ -5554,13 +5673,13 @@
 msgstr ""
 
 #: ../menu-data/gimp:gimp.desktop.in.h:1
-msgid "Create images and edit photographs"
-msgstr "Vytváranie a úprava obrázkov a fotografií"
-
-#: ../menu-data/gimp:gimp.desktop.in.h:2
 msgid "GIMP Image Editor"
 msgstr "GIMP - editor obrázkov"
 
+#: ../menu-data/gimp:gimp.desktop.in.h:2
+msgid "Create images and edit photographs"
+msgstr "Vytváranie a úprava obrázkov a fotografií"
+
 #: ../menu-data/ginkgocadx:ginkgocadx.desktop.in.h:1
 msgid "Ginkgo CADx"
 msgstr ""
@@ -5570,11 +5689,11 @@
 msgstr ""
 
 #: ../menu-data/gip:gip.desktop.in.h:1
-msgid "Calculate IP addresses and networks"
+msgid "Gip IP Address Calculator"
 msgstr ""
 
 #: ../menu-data/gip:gip.desktop.in.h:2
-msgid "Gip IP Address Calculator"
+msgid "Calculate IP addresses and networks"
 msgstr ""
 
 #: ../menu-data/gisomount:gisomount.desktop.in.h:1
@@ -5582,35 +5701,35 @@
 msgstr ""
 
 #: ../menu-data/git-cola:cola.desktop.in.h:1
-msgid "A highly caffeinated git GUI"
+msgid "Cola Git GUI"
 msgstr ""
 
 #: ../menu-data/git-cola:cola.desktop.in.h:2
-msgid "Cola Git GUI"
+msgid "A highly caffeinated git GUI"
 msgstr ""
 
 #: ../menu-data/gitg:gitg.desktop.in.h:1
-msgid "Git repository browser"
+msgid "gitg"
 msgstr ""
 
 #: ../menu-data/gitg:gitg.desktop.in.h:2
-msgid "gitg"
+msgid "Git repository browser"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:1
-msgid "Display JACK transport timecode"
+msgid "G. JACK Clock"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjackclock.desktop.in.h:2
-msgid "G. JACK Clock"
+msgid "Display JACK transport timecode"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:1
-msgid "Access JACK transport mechanism via a dynamic graphical slider. "
+msgid "G. JACK Transport"
 msgstr ""
 
 #: ../menu-data/gjacktransport:gjacktransport.desktop.in.h:2
-msgid "G. JACK Transport"
+msgid "Access JACK transport mechanism via a dynamic graphical slider. "
 msgstr ""
 
 #: ../menu-data/gjiten:gjiten.desktop.in.h:1
@@ -5630,19 +5749,19 @@
 msgstr ""
 
 #: ../menu-data/gkamus:gkamus.desktop.in.h:1
-msgid "English - Indonesian dictionary"
+msgid "gKamus"
 msgstr ""
 
 #: ../menu-data/gkamus:gkamus.desktop.in.h:2
-msgid "gKamus"
+msgid "English - Indonesian dictionary"
 msgstr ""
 
 #: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:1
-msgid "Enable/disable installed plugins"
+msgid "Keyboard Indicator plugins"
 msgstr ""
 
 #: ../menu-data/gkbd-capplet:gkbd-indicator-plugins-capplet.desktop.in.h:2
-msgid "Keyboard Indicator plugins"
+msgid "Enable/disable installed plugins"
 msgstr ""
 
 #: ../menu-data/gkbd-capplet:gkbd-keyboard-display.desktop.in.h:1
@@ -5670,37 +5789,37 @@
 msgstr ""
 
 #: ../menu-data/gl-117:gl-117.desktop.in.h:1
-msgid "Play a flight simulator"
+msgid "gl-117"
 msgstr ""
 
 #: ../menu-data/gl-117:gl-117.desktop.in.h:2
-msgid "gl-117"
+msgid "Play a flight simulator"
 msgstr ""
 
 #: ../menu-data/glabels:glabels.desktop.in.h:1
-msgid "Create labels, business cards and media covers"
+msgid "gLabels Label Designer"
 msgstr ""
 
 #: ../menu-data/glabels:glabels.desktop.in.h:2
-msgid "gLabels Label Designer"
+msgid "Create labels, business cards and media covers"
 msgstr ""
 
 #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:1
 #: ../menu-data/glade:glade.desktop.in.h:1
-msgid "Create or open user interface designs for GTK+ applications"
+msgid "Glade Interface Designer"
 msgstr ""
 
 #: ../menu-data/glade-gtk2:glade-3.desktop.in.h:2
 #: ../menu-data/glade:glade.desktop.in.h:2
-msgid "Glade Interface Designer"
+msgid "Create or open user interface designs for GTK+ applications"
 msgstr ""
 
 #: ../menu-data/gladish:gladish.desktop.in.h:1
-msgid "LADI Session Handler"
+msgid "gladish"
 msgstr ""
 
 #: ../menu-data/gladish:gladish.desktop.in.h:2
-msgid "gladish"
+msgid "LADI Session Handler"
 msgstr ""
 
 #: ../menu-data/glame:Multimedia__glame.desktop.in.h:1
@@ -5719,14 +5838,6 @@
 msgid "Play the classic two-player boardgame of chess"
 msgstr "Klasická stolná hra šach pre dvoch hráčov"
 
-#: ../menu-data/glest:glest.desktop.in.h:1
-msgid "Glest"
-msgstr ""
-
-#: ../menu-data/glest:glest.desktop.in.h:2
-msgid "Play a real-time strategy game with 3D graphics"
-msgstr ""
-
 #: ../menu-data/glfer:glfer.desktop.in.h:1
 msgid "glfer"
 msgstr ""
@@ -5753,59 +5864,51 @@
 msgstr ""
 
 #: ../menu-data/glob2:glob2.desktop.in.h:1
-msgid "An innovative new strategy game"
+msgid "Globulation 2"
 msgstr ""
 
 #: ../menu-data/glob2:glob2.desktop.in.h:2
-msgid "Globulation 2"
+msgid "An innovative new strategy game"
 msgstr ""
 
 #: ../menu-data/globs:globs.desktop.in.h:1
-msgid "GL Open Benchmark Suite"
+msgid "Globs"
 msgstr ""
 
 #: ../menu-data/globs:globs.desktop.in.h:2
-msgid "Globs"
+msgid "GL Open Benchmark Suite"
 msgstr ""
 
 #: ../menu-data/glogg:glogg.desktop.in.h:1
-msgid "A smart interactive log explorer."
-msgstr ""
-
-#: ../menu-data/glogg:glogg.desktop.in.h:2
 msgid "glogg"
 msgstr ""
 
-#: ../menu-data/glom:glom.desktop.in.h:1
-msgid "A user-friendly database environment."
-msgstr ""
-
-#: ../menu-data/glom:glom.desktop.in.h:2
-msgid "Glom"
+#: ../menu-data/glogg:glogg.desktop.in.h:2
+msgid "A smart interactive log explorer."
 msgstr ""
 
 #: ../menu-data/glpeces:glpeces.desktop.in.h:1
-msgid "GLPeces"
+msgid "Play with 33 tangram and more 4600 figures"
 msgstr ""
 
 #: ../menu-data/glpeces:glpeces.desktop.in.h:2
-msgid "Play with 33 tangram and more 4600 figures"
+msgid "GLPeces"
 msgstr ""
 
 #: ../menu-data/gltron:gltron.desktop.in.h:1
-msgid "Play a Tron-like light cycle game"
+msgid "glTron"
 msgstr ""
 
 #: ../menu-data/gltron:gltron.desktop.in.h:2
-msgid "glTron"
+msgid "Play a Tron-like light cycle game"
 msgstr ""
 
 #: ../menu-data/glurp:glurp.desktop.in.h:1
-msgid "A Client for the MPD daemon"
+msgid "Glurp"
 msgstr ""
 
 #: ../menu-data/glurp:glurp.desktop.in.h:2
-msgid "Glurp"
+msgid "A Client for the MPD daemon"
 msgstr ""
 
 #: ../menu-data/gmail-notify:gmail-notify.desktop.in.h:1
@@ -5825,19 +5928,19 @@
 msgstr ""
 
 #: ../menu-data/gmanedit:gmanedit.desktop.in.h:1
-msgid "GNOME Manpages Editor"
+msgid "gmanedit"
 msgstr ""
 
 #: ../menu-data/gmanedit:gmanedit.desktop.in.h:2
-msgid "gmanedit"
+msgid "GNOME Manpages Editor"
 msgstr ""
 
 #: ../menu-data/gmbox:gmbox.desktop.in.h:1
-msgid "Google Music Box"
+msgid "gmbox"
 msgstr ""
 
 #: ../menu-data/gmbox:gmbox.desktop.in.h:2
-msgid "gmbox"
+msgid "Google Music Box"
 msgstr ""
 
 #: ../menu-data/gmchess:gmchess.desktop.in.h:1
@@ -5849,19 +5952,19 @@
 msgstr "Populárna čínska šachová hra"
 
 #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:1
-msgid "Alsa mixer"
+msgid "Gmerlin mixer"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-alsamixer.desktop.in.h:2
-msgid "Gmerlin mixer"
+msgid "Alsa mixer"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:1
-msgid "Configure the Gmerlin keyboard daemon"
+msgid "Gmerlin KBD"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-kbd.desktop.in.h:2
-msgid "Gmerlin KBD"
+msgid "Configure the Gmerlin keyboard daemon"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-player.desktop.in.h:1
@@ -5873,27 +5976,27 @@
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:1
-msgid "Configure gmerlin plugins"
+msgid "Gmerlin plugin configurator"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-plugincfg.desktop.in.h:2
-msgid "Gmerlin plugin configurator"
+msgid "Configure gmerlin plugins"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:1
-msgid "Audio/video recorder"
+msgid "Gmerlin recorder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-recorder.desktop.in.h:2
-msgid "Gmerlin recorder"
+msgid "Audio/video recorder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:1
-msgid "Gmerlin multimedia transcoder"
+msgid "Gmerlin transcoder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-transcoder.desktop.in.h:2
-msgid "Gmerlin transcoder"
+msgid "Gmerlin multimedia transcoder"
 msgstr ""
 
 #: ../menu-data/gmerlin:gmerlin-visualizer.desktop.in.h:1
@@ -5905,27 +6008,27 @@
 msgstr ""
 
 #: ../menu-data/gmfsk:gmfsk.desktop.in.h:1
-msgid "HF digital mode terminal"
+msgid "gMFSK"
 msgstr ""
 
 #: ../menu-data/gmfsk:gmfsk.desktop.in.h:2
-msgid "gMFSK"
+msgid "HF digital mode terminal"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:1
-msgid "Analyse MIDI messages through ALSA"
+msgid "Gmidimonitor (with ALSA support)"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-alsa.desktop.in.h:2
-msgid "Gmidimonitor (with ALSA support)"
+msgid "Analyse MIDI messages through ALSA"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:1
-msgid "Analyse MIDI messages through JACK"
+msgid "Gmidimonitor (with JACK support)"
 msgstr ""
 
 #: ../menu-data/gmidimonitor:gmidimonitor-jack.desktop.in.h:2
-msgid "Gmidimonitor (with JACK support)"
+msgid "Analyse MIDI messages through JACK"
 msgstr ""
 
 #: ../menu-data/gmlive:gmlive.desktop.in.h:1
@@ -5941,11 +6044,11 @@
 msgstr ""
 
 #: ../menu-data/gmorgan:gmorgan.desktop.in.h:1
-msgid "MIDI rhythm station for ALSA"
+msgid "gmorgan"
 msgstr ""
 
 #: ../menu-data/gmorgan:gmorgan.desktop.in.h:2
-msgid "gmorgan"
+msgid "MIDI rhythm station for ALSA"
 msgstr ""
 
 #: ../menu-data/gmountiso:gmount-iso.desktop.in.h:1
@@ -5957,44 +6060,44 @@
 msgstr ""
 
 #: ../menu-data/gmpc:gmpc.desktop.in.h:1
-msgid "A gnome frontend for the mpd daemon"
+msgid "Gnome Music Player Client"
 msgstr ""
 
 #: ../menu-data/gmpc:gmpc.desktop.in.h:2
-msgid "Gnome Music Player Client"
+msgid "A gnome frontend for the mpd daemon"
 msgstr ""
 
 #: ../menu-data/gmsh:gmsh.desktop.in.h:1
-#: ../menu-data/netgen:netgen.desktop.in.h:1
-msgid "3-D finite element mesh generator"
+msgid "Gmsh Mesh Generator"
 msgstr ""
 
 #: ../menu-data/gmsh:gmsh.desktop.in.h:2
-msgid "Gmsh Mesh Generator"
+#: ../menu-data/netgen:netgen.desktop.in.h:2
+msgid "3-D finite element mesh generator"
 msgstr ""
 
 #: ../menu-data/gmtp:gMTP.desktop.in.h:1
-msgid "A simple MTP Client for MP3 Players"
+msgid "gMTP"
 msgstr ""
 
 #: ../menu-data/gmtp:gMTP.desktop.in.h:2
-msgid "gMTP"
+msgid "A simple MTP Client for MP3 Players"
 msgstr ""
 
 #: ../menu-data/gmult:gmult.desktop.in.h:1
-msgid "Figure out which letters are which numbers"
+msgid "Multiplication Puzzle"
 msgstr ""
 
 #: ../menu-data/gmult:gmult.desktop.in.h:2
-msgid "Multiplication Puzzle"
+msgid "Figure out which letters are which numbers"
 msgstr ""
 
 #: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:1
-msgid "Jukebox for large collections of mp3/ogg/flac/mpc"
+msgid "gmusicbrowser"
 msgstr ""
 
 #: ../menu-data/gmusicbrowser:gmusicbrowser.desktop.in.h:2
-msgid "gmusicbrowser"
+msgid "Jukebox for large collections of mp3/ogg/flac/mpc"
 msgstr ""
 
 #: ../menu-data/gmysqlcc:gmysqlcc.desktop.in.h:1
@@ -6018,21 +6121,21 @@
 msgstr "Vyhrajte tvorením riadkov rovnakej farby"
 
 #: ../menu-data/gnibbles:gnibbles.desktop.in.h:1
-msgid "Guide a worm around a maze"
-msgstr "Ovládanie červíka v bludisku"
-
-#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2
 msgid "Nibbles"
 msgstr "Nibbles"
 
-#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1
-msgid "Avoid the robots and make them crash into each other"
-msgstr "Vyhnite sa robotom a navigujte ich aby do seba narazili"
+#: ../menu-data/gnibbles:gnibbles.desktop.in.h:2
+msgid "Guide a worm around a maze"
+msgstr "Ovládanie červíka v bludisku"
 
-#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2
+#: ../menu-data/gnobots2:gnobots2.desktop.in.h:1
 msgid "Robots"
 msgstr "Roboti"
 
+#: ../menu-data/gnobots2:gnobots2.desktop.in.h:2
+msgid "Avoid the robots and make them crash into each other"
+msgstr "Vyhnite sa robotom a navigujte ich aby do seba narazili"
+
 #: ../menu-data/gnoemoe:gnoemoe.desktop.in.h:1
 msgid "GnoeMoe"
 msgstr ""
@@ -6042,11 +6145,11 @@
 msgstr ""
 
 #: ../menu-data/gnomad2:gnomad2.desktop.in.h:1
-msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs"
+msgid "Gnomad 2"
 msgstr ""
 
 #: ../menu-data/gnomad2:gnomad2.desktop.in.h:2
-msgid "Gnomad 2"
+msgid "A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs"
 msgstr ""
 
 #: ../menu-data/gnome-activity-journal:gnome-activity-journal.desktop.in.h:1
@@ -6060,11 +6163,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:1
-msgid "ALSA sound mixer for GNOME"
+msgid "GNOME ALSA Mixer"
 msgstr ""
 
 #: ../menu-data/gnome-alsamixer:gnome-alsamixer.desktop.in.h:2
-msgid "GNOME ALSA Mixer"
+msgid "ALSA sound mixer for GNOME"
 msgstr ""
 
 #: ../menu-data/gnome-blog:gnome-blog.desktop.in.h:1
@@ -6116,11 +6219,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:1
-msgid "Customize your GNOME desktop"
+msgid "GNOME Color Chooser"
 msgstr ""
 
 #: ../menu-data/gnome-color-chooser:gnome-color-chooser.desktop.in.h:2
-msgid "GNOME Color Chooser"
+msgid "Customize your GNOME desktop"
 msgstr ""
 
 #: ../menu-data/gnome-color-manager:gcm-calibrate.desktop.in.h:1
@@ -6156,11 +6259,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:1
-msgid "A two paned file manager"
+msgid "GNOME Commander"
 msgstr ""
 
 #: ../menu-data/gnome-commander-data:gnome-commander.desktop.in.h:2
-msgid "GNOME Commander"
+msgid "A two paned file manager"
 msgstr ""
 
 #: ../menu-data/gnome-disk-utility:palimpsest.desktop.in.h:1
@@ -6172,21 +6275,21 @@
 msgstr "Spravuje diskové jednotky a nosiče"
 
 #: ../menu-data/gnome-do:gnome-do.desktop.in.h:1
-msgid ""
-"Do things as quickly as possible (but no quicker) with your files, "
-"bookmarks, applications, music, contacts, and more!"
+msgid "GNOME Do"
 msgstr ""
 
 #: ../menu-data/gnome-do:gnome-do.desktop.in.h:2
-msgid "GNOME Do"
+msgid ""
+"Do things as quickly as possible (but no quicker) with your files, "
+"bookmarks, applications, music, contacts, and more!"
 msgstr ""
 
 #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:1
-msgid "Access, manage and share documents"
+msgid "Documents"
 msgstr ""
 
 #: ../menu-data/gnome-documents:gnome-documents.desktop.in.h:2
-msgid "Documents"
+msgid "Access, manage and share documents"
 msgstr ""
 
 #: ../menu-data/gnome-dvb-client:gnome-dvb-control.desktop.in.h:1
@@ -6198,7 +6301,7 @@
 msgstr ""
 
 #: ../menu-data/gnome-font-viewer:gnome-font-viewer.desktop.in.h:1
-#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1
+#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2
 msgid "Font Viewer"
 msgstr ""
 
@@ -6207,11 +6310,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-format:gnome-format.desktop.in.h:1
-msgid "Format external storage devices"
+msgid "Gnome Format"
 msgstr ""
 
 #: ../menu-data/gnome-format:gnome-format.desktop.in.h:2
-msgid "Gnome Format"
+msgid "Format external storage devices"
 msgstr ""
 
 #: ../menu-data/gnome-genius:gnome-genius.desktop.in.h:1
@@ -6222,7 +6325,7 @@
 msgid "Genius Mathematical Tool and Calculator"
 msgstr ""
 
-#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:1
+#: ../menu-data/gnome-gmail-notifier:gnome-gmail-notifier.desktop.in.h:2
 msgid "Gmail Inbox Monitor"
 msgstr ""
 
@@ -6251,59 +6354,51 @@
 msgstr ""
 
 #: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:1
-msgid "Configure your remote control"
+msgid "Infrared Remote Control"
 msgstr ""
 
 #: ../menu-data/gnome-lirc-properties:gnome-lirc-properties.desktop.in.h:2
-msgid "Infrared Remote Control"
+msgid "Configure your remote control"
 msgstr ""
 
-#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:1
-msgid "Disassemble a pile of tiles by removing matching pairs"
-msgstr "Rozložte hromady tehličiek po zodpovedajúcich si dvojiciach"
-
-#: ../menu-data/gnome-mahjongg:mahjongg.desktop.in.h:2
-msgid "Mahjongg"
-msgstr "Mahjongg"
-
 #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:1
-msgid "Break the hidden code!"
+msgid "Mastermind"
 msgstr ""
 
 #: ../menu-data/gnome-mastermind:gnome-mastermind.desktop.in.h:2
-msgid "Mastermind"
+msgid "Break the hidden code!"
 msgstr ""
 
 #: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:1
-msgid "A simple media player for GNOME"
+msgid "GNOME Media Player"
 msgstr ""
 
 #: ../menu-data/gnome-media-player:gnome-media-player.desktop.in.h:2
-msgid "GNOME Media Player"
+msgid "A simple media player for GNOME"
 msgstr ""
 
 #: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:1
-msgid "Record sound clips"
-msgstr "Záznam zvukových nahrávok"
-
-#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2
 msgid "Sound Recorder"
 msgstr "Záznam zvuku"
 
-#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1
-msgid "Configure defaults for GStreamer applications"
-msgstr "Nastavenie predvolieb aplikácií GStreamer"
+#: ../menu-data/gnome-media:gnome-sound-recorder.desktop.in.h:2
+msgid "Record sound clips"
+msgstr "Záznam zvukových nahrávok"
 
-#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2
+#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:1
 msgid "Multimedia Systems Selector"
 msgstr "Výber multimediálnych systémov"
 
+#: ../menu-data/gnome-media:gstreamer-properties.desktop.in.h:2
+msgid "Configure defaults for GStreamer applications"
+msgstr "Nastavenie predvolieb aplikácií GStreamer"
+
 #: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:1
-msgid "Controls the mouse via Webcam."
+msgid "MouseTrap"
 msgstr ""
 
 #: ../menu-data/gnome-mousetrap:mousetrap.desktop.in.h:2
-msgid "MouseTrap"
+msgid "Controls the mouse via Webcam."
 msgstr ""
 
 #: ../menu-data/gnome-mplayer:gnome-mplayer.desktop.in.h:1
@@ -6331,14 +6426,14 @@
 msgstr "Zobrazovanie informácií o sieti"
 
 #: ../menu-data/gnome-network-admin:network.desktop.in.h:1
-msgid "Configure network devices and connections"
-msgstr "Konfigurácia sieťových zariadení a spojení"
-
-#: ../menu-data/gnome-network-admin:network.desktop.in.h:2
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
 msgid "Network"
 msgstr "Sieť"
 
+#: ../menu-data/gnome-network-admin:network.desktop.in.h:2
+msgid "Configure network devices and connections"
+msgstr "Konfigurácia sieťových zariadení a spojení"
+
 #: ../menu-data/gnome-orca:orca.desktop.in.h:1
 msgid "Orca Screen Reader"
 msgstr ""
@@ -6350,11 +6445,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:1
-msgid "Create and Edit Drawings or Images"
+msgid "Gnome Paint Drawing Editor"
 msgstr ""
 
 #: ../menu-data/gnome-paint:gnome-paint.desktop.in.h:2
-msgid "Gnome Paint Drawing Editor"
+msgid "Create and Edit Drawings or Images"
 msgstr ""
 
 #: ../menu-data/gnome-phone-manager:gnome-phone-manager.desktop.in.h:1
@@ -6374,35 +6469,35 @@
 msgstr ""
 
 #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:1
-msgid "Cakes don't lie."
+msgid "Gnome-Pie"
 msgstr ""
 
 #: ../menu-data/gnome-pie:gnome-pie.desktop.in.h:2
-msgid "Gnome-Pie"
+msgid "Cakes don't lie."
 msgstr ""
 
 #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:1
-msgid "Observe power management"
+msgid "Power Statistics"
 msgstr ""
 
 #: ../menu-data/gnome-power-manager:gnome-power-statistics.desktop.in.h:2
-msgid "Power Statistics"
+msgid "Observe power management"
 msgstr ""
 
 #: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:1
-msgid "GNOME Dialup Tool"
+msgid "GNOME PPP"
 msgstr ""
 
 #: ../menu-data/gnome-ppp:gnome-ppp.desktop.in.h:2
-msgid "GNOME PPP"
+msgid "GNOME Dialup Tool"
 msgstr ""
 
 #: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:1
-msgid "Manage your system tasks"
+msgid "Scheduled tasks"
 msgstr ""
 
 #: ../menu-data/gnome-schedule:gnome-schedule.desktop.in.h:2
-msgid "Scheduled tasks"
+msgid "Manage your system tasks"
 msgstr ""
 
 #: ../menu-data/gnome-shell:gnome-shell.desktop.in.h:1
@@ -6414,11 +6509,11 @@
 msgstr ""
 
 #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:1
-msgid "Preview and compare fonts"
+msgid "Specimen Font Previewer"
 msgstr ""
 
 #: ../menu-data/gnome-specimen:gnome-specimen.desktop.in.h:2
-msgid "Specimen Font Previewer"
+msgid "Preview and compare fonts"
 msgstr ""
 
 #: ../menu-data/gnome-split:gnome-split.desktop.in.h:1
@@ -6446,22 +6541,22 @@
 msgstr "Logická hra s číslami v mriežke"
 
 #: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:1
-msgid "New Terminal"
-msgstr ""
-
-#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:2
 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:2
-#: ../menu-data/terminal.app:Terminal.desktop.in.h:2
-#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2
+#: ../menu-data/terminal.app:Terminal.desktop.in.h:1
+#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1
 msgid "Terminal"
 msgstr "Terminál"
 
+#: ../menu-data/gnome-terminal:gnome-terminal.desktop.in.h:3
+msgid "New Terminal"
+msgstr ""
+
 #: ../menu-data/gnome-time-admin:time.desktop.in.h:1
-msgid "Change system time, date, and timezone"
+msgid "Time and Date"
 msgstr ""
 
 #: ../menu-data/gnome-time-admin:time.desktop.in.h:2
-msgid "Time and Date"
+msgid "Change system time, date, and timezone"
 msgstr ""
 
 #: ../menu-data/gnome-translate:gnome-translate.desktop.in.h:1
@@ -6505,30 +6600,30 @@
 msgstr ""
 
 #: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:1
-msgid "Gnome's KiSSeake dolls viewer"
+msgid "GnomeKiSS"
 msgstr ""
 
 #: ../menu-data/gnomekiss:gnomekiss.desktop.in.h:2
-msgid "GnomeKiSS"
+msgid "Gnome's KiSSeake dolls viewer"
 msgstr ""
 
 #: ../menu-data/gnomine:gnomine.desktop.in.h:1
+#: ../menu-data/mines.app:Mines.desktop.in.h:1
 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:1
-msgid "Clear hidden mines from a minefield"
-msgstr "Nájdite skryté míny na mínovom poli"
+msgid "Mines"
+msgstr "Míny"
 
 #: ../menu-data/gnomine:gnomine.desktop.in.h:2
-#: ../menu-data/mines.app:Mines.desktop.in.h:2
 #: ../menu-data/sgt-puzzles:mines.desktop.in.h:2
-msgid "Mines"
-msgstr "Míny"
+msgid "Clear hidden mines from a minefield"
+msgstr "Nájdite skryté míny na mínovom poli"
 
 #: ../menu-data/gnomint:gnomint.desktop.in.h:1
-msgid "Manage X.509 certificates and CAs, easily and graphically"
+msgid "gnoMint X.509 CA Manager"
 msgstr ""
 
 #: ../menu-data/gnomint:gnomint.desktop.in.h:2
-msgid "gnoMint X.509 CA Manager"
+msgid "Manage X.509 certificates and CAs, easily and graphically"
 msgstr ""
 
 #: ../menu-data/gnote:gnote.desktop.in.h:1
@@ -6536,7 +6631,7 @@
 msgstr ""
 
 #: ../menu-data/gnote:gnote.desktop.in.h:2
-#: ../menu-data/tomboy:tomboy.desktop.in.h:1
+#: ../menu-data/tomboy:tomboy.desktop.in.h:2
 msgid "Take notes, link ideas, and stay organized"
 msgstr "Zapisovanie poznámok, spájanie nápadov a organizácia"
 
@@ -6549,13 +6644,13 @@
 msgstr ""
 
 #: ../menu-data/gnotravex:gnotravex.desktop.in.h:1
-msgid "Complete the puzzle by matching numbered tiles"
-msgstr "Logická hra s hľadaním zodpovedajúcich očíslovaných dlaždíc"
-
-#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2
 msgid "Tetravex"
 msgstr "Tetravex"
 
+#: ../menu-data/gnotravex:gnotravex.desktop.in.h:2
+msgid "Complete the puzzle by matching numbered tiles"
+msgstr "Logická hra s hľadaním zodpovedajúcich očíslovaných dlaždíc"
+
 #: ../menu-data/gnotski:gnotski.desktop.in.h:1
 msgid "Klotski"
 msgstr "Klotski"
@@ -6581,11 +6676,11 @@
 msgstr ""
 
 #: ../menu-data/gnubik:gnubik.desktop.in.h:1
-msgid "3D Rubik's cube game"
+msgid "GNUbik"
 msgstr ""
 
 #: ../menu-data/gnubik:gnubik.desktop.in.h:2
-msgid "GNUbik"
+msgid "3D Rubik's cube game"
 msgstr ""
 
 #: ../menu-data/gnucash:gnucash.desktop.in.h:1
@@ -6629,11 +6724,11 @@
 msgstr ""
 
 #: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:1
-msgid "Calculation, Analysis, and Visualization of Information"
+msgid "Gnumeric Spreadsheet"
 msgstr ""
 
 #: ../menu-data/gnumeric-common:gnumeric.desktop.in.h:2
-msgid "Gnumeric Spreadsheet"
+msgid "Calculation, Analysis, and Visualization of Information"
 msgstr ""
 
 #: ../menu-data/gnunet-gtk:gnunet-gtk.desktop.in.h:1
@@ -6653,11 +6748,11 @@
 msgstr ""
 
 #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:1
-msgid "A clone of Robbo"
+msgid "GNU Robbo"
 msgstr ""
 
 #: ../menu-data/gnurobbo:gnurobbo.desktop.in.h:2
-msgid "GNU Robbo"
+msgid "A clone of Robbo"
 msgstr ""
 
 #: ../menu-data/gnusim8085:GNUSim8085.desktop.in.h:1
@@ -6681,13 +6776,13 @@
 msgstr ""
 
 #: ../menu-data/gobby:gobby.desktop.in.h:1
-msgid "Edit text files collaboratively"
-msgstr "Kolaboratívny editor textových súborov"
-
-#: ../menu-data/gobby:gobby.desktop.in.h:2
 msgid "Gobby Collaborative Editor (0.4)"
 msgstr ""
 
+#: ../menu-data/gobby:gobby.desktop.in.h:2
+msgid "Edit text files collaboratively"
+msgstr "Kolaboratívny editor textových súborov"
+
 #: ../menu-data/gofigure2:gofigure2.desktop.in.h:1
 msgid "GoFigure2"
 msgstr ""
@@ -6701,16 +6796,16 @@
 msgstr ""
 
 #: ../menu-data/gogglesmm:gogglesmm.desktop.in.h:2
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
 msgid "Play and organize your music collection"
 msgstr "Prehrávanie a organizácia vašej hudobnej zbierky"
 
 #: ../menu-data/gok:gok.desktop.in.h:1
-msgid "Navigate applications and type using alternative input devices"
+msgid "On-Screen Keyboard"
 msgstr ""
 
 #: ../menu-data/gok:gok.desktop.in.h:2
-msgid "On-Screen Keyboard"
+msgid "Navigate applications and type using alternative input devices"
 msgstr ""
 
 #: ../menu-data/goldendict:goldendict.desktop.in.h:1
@@ -6718,21 +6813,21 @@
 msgstr ""
 
 #: ../menu-data/golly:golly.desktop.in.h:1
-msgid "A Conway's Game of Life simulator"
+msgid "Golly"
 msgstr ""
 
 #: ../menu-data/golly:golly.desktop.in.h:2
-msgid "Golly"
+msgid "A Conway's Game of Life simulator"
 msgstr ""
 
 #: ../menu-data/gomoku.app:Gomoku.desktop.in.h:1
-msgid "GNUstep Gomoku Game"
-msgstr "Hra Gomoku pre GNUstep"
-
-#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2
 msgid "Gomoku.app"
 msgstr "Gomoku.app"
 
+#: ../menu-data/gomoku.app:Gomoku.desktop.in.h:2
+msgid "GNUstep Gomoku Game"
+msgstr "Hra Gomoku pre GNUstep"
+
 #: ../menu-data/goobox:goobox.desktop.in.h:1
 #: ../menu-data/kscd:kde4__kscd.desktop.in.h:1
 msgid "CD Player"
@@ -6759,19 +6854,19 @@
 msgstr ""
 
 #: ../menu-data/goplay:goplay.desktop.in.h:1
-msgid "Gaming packages browser"
+msgid "GoPlay!"
 msgstr ""
 
 #: ../menu-data/goplay:goplay.desktop.in.h:2
-msgid "GoPlay!"
+msgid "Gaming packages browser"
 msgstr ""
 
 #: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:1
-msgid "GOsa"
+msgid "GOsa²"
 msgstr ""
 
 #: ../menu-data/gosa-desktop:gosa-desktop.desktop.in.h:2
-msgid "GOsa²"
+msgid "GOsa"
 msgstr ""
 
 #: ../menu-data/gosmore:gosmore.desktop.in.h:1
@@ -6793,51 +6888,51 @@
 msgstr ""
 
 #: ../menu-data/gpaco:gpaco.desktop.in.h:1
-msgid "Manages software installed from source code"
+msgid "Package Organizer"
 msgstr ""
 
 #: ../menu-data/gpaco:gpaco.desktop.in.h:2
-msgid "Package Organizer"
+msgid "Manages software installed from source code"
 msgstr ""
 
 #: ../menu-data/gpaint:gpaint.desktop.in.h:1
-msgid "A small-scale painting program for GNOME, the GNU Desktop"
+msgid "GNU Paint"
 msgstr ""
 
 #: ../menu-data/gpaint:gpaint.desktop.in.h:2
-msgid "GNU Paint"
+msgid "A small-scale painting program for GNOME, the GNU Desktop"
 msgstr ""
 
 #: ../menu-data/gparted:gparted.desktop.in.h:1
-msgid "Create, reorganize, and delete partitions"
+msgid "GParted Partition Editor"
 msgstr ""
 
 #: ../menu-data/gparted:gparted.desktop.in.h:2
-msgid "GParted Partition Editor"
+msgid "Create, reorganize, and delete partitions"
 msgstr ""
 
 #: ../menu-data/gpdftext:gpdftext.desktop.in.h:1
-msgid "Edit text from ebook PDF files"
+msgid "gPDFText ebook editor"
 msgstr ""
 
 #: ../menu-data/gpdftext:gpdftext.desktop.in.h:2
-msgid "gPDFText ebook editor"
+msgid "Edit text from ebook PDF files"
 msgstr ""
 
 #: ../menu-data/gphpedit:gphpedit.desktop.in.h:1
-msgid "Edit PHP source files"
+msgid "gPHPEdit"
 msgstr ""
 
 #: ../menu-data/gphpedit:gphpedit.desktop.in.h:2
-msgid "gPHPEdit"
+msgid "Edit PHP source files"
 msgstr ""
 
 #: ../menu-data/gpick:gpick.desktop.in.h:1
-msgid "Color picker"
+msgid "Gpick"
 msgstr ""
 
 #: ../menu-data/gpick:gpick.desktop.in.h:2
-msgid "Gpick"
+msgid "Color picker"
 msgstr ""
 
 #: ../menu-data/gpicview:gpicview.desktop.in.h:2
@@ -6853,19 +6948,19 @@
 msgstr "Slobodne organizujte fotky vo svojom iPode!"
 
 #: ../menu-data/gplanarity:gplanarity.desktop.in.h:1
-msgid "Puzzle game involving untangling planar graphs"
+msgid "gPlanarity"
 msgstr ""
 
 #: ../menu-data/gplanarity:gplanarity.desktop.in.h:2
-msgid "gPlanarity"
+msgid "Puzzle game involving untangling planar graphs"
 msgstr ""
 
 #: ../menu-data/gpodder:gpodder.desktop.in.h:1
-msgid "Download audio and video content from podcasts"
+msgid "gPodder Podcast Client"
 msgstr ""
 
 #: ../menu-data/gpodder:gpodder.desktop.in.h:2
-msgid "gPodder Podcast Client"
+msgid "Download audio and video content from podcasts"
 msgstr ""
 
 #: ../menu-data/gpointing-device-settings:gpointing-device-settings.desktop.in.h:1
@@ -6877,11 +6972,11 @@
 msgstr ""
 
 #: ../menu-data/gpomme:gpomme.desktop.in.h:1
-msgid "A graphical client for pommed"
+msgid "pommed GTK client"
 msgstr ""
 
 #: ../menu-data/gpomme:gpomme.desktop.in.h:2
-msgid "pommed GTK client"
+msgid "A graphical client for pommed"
 msgstr ""
 
 #: ../menu-data/gpppon:gpppon.desktop.in.h:1
@@ -6909,28 +7004,28 @@
 msgstr ""
 
 #: ../menu-data/gprompter:gprompter.desktop.in.h:1
-#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1
-msgid "Predictive text editor powered by presage"
+msgid "gprompter"
 msgstr ""
 
 #: ../menu-data/gprompter:gprompter.desktop.in.h:2
-msgid "gprompter"
+#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2
+msgid "Predictive text editor powered by presage"
 msgstr ""
 
 #: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:1
-msgid "Add coordinates to jpeg images using gpx files"
+msgid "GPSCorrelate"
 msgstr ""
 
 #: ../menu-data/gpscorrelate-gui:gpscorrelate.desktop.in.h:2
-msgid "GPSCorrelate"
+msgid "Add coordinates to jpeg images using gpx files"
 msgstr ""
 
 #: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:1
-msgid "GPS Navigation"
+msgid "GpsDrive"
 msgstr ""
 
 #: ../menu-data/gpsdrive:gpsdrive.desktop.in.h:2
-msgid "GpsDrive"
+msgid "GPS Navigation"
 msgstr ""
 
 #: ../menu-data/gpsk31:gpsk31.desktop.in.h:1
@@ -6950,27 +7045,27 @@
 msgstr ""
 
 #: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:1
-msgid "GPS Trace Viewer"
+msgid "GPX Viewer"
 msgstr ""
 
 #: ../menu-data/gpxviewer:gpxviewer.desktop.in.h:2
-msgid "GPX Viewer"
+msgid "GPS Trace Viewer"
 msgstr ""
 
 #: ../menu-data/grace:grace.desktop.in.h:1
-msgid "An XY plotting tool"
+msgid "Grace"
 msgstr ""
 
 #: ../menu-data/grace:grace.desktop.in.h:2
-msgid "Grace"
+msgid "An XY plotting tool"
 msgstr ""
 
 #: ../menu-data/grafx2:grafx2.desktop.in.h:1
-msgid "Deluxe Paint Clone"
+msgid "GrafX2"
 msgstr ""
 
 #: ../menu-data/grafx2:grafx2.desktop.in.h:2
-msgid "GrafX2"
+msgid "Deluxe Paint Clone"
 msgstr ""
 
 #: ../menu-data/gramps:gramps.desktop.in.h:1
@@ -6982,36 +7077,28 @@
 "Manage genealogical information, perform genealogical research and analysis"
 msgstr ""
 
-#: ../menu-data/grandr:grandr.desktop.in.h:1
-msgid "Configure multiple screens"
-msgstr ""
-
-#: ../menu-data/grandr:grandr.desktop.in.h:2
-msgid "Multiple Screens"
-msgstr ""
-
 #: ../menu-data/granule:granule.desktop.in.h:1
-msgid "Flashcards Program"
+msgid "Granule"
 msgstr ""
 
 #: ../menu-data/granule:granule.desktop.in.h:2
-msgid "Granule"
+msgid "Flashcards Program"
 msgstr ""
 
 #: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:1
-msgid "Draw mathematical graphs/curves"
+msgid "Graphmonkey"
 msgstr ""
 
 #: ../menu-data/graphmonkey:graphmonkey.desktop.in.h:2
-msgid "Graphmonkey"
+msgid "Draw mathematical graphs/curves"
 msgstr ""
 
 #: ../menu-data/graphthing:graphthing.desktop.in.h:1
-msgid "Create, manipulate and study graphs."
+msgid "GraphThing"
 msgstr ""
 
 #: ../menu-data/graphthing:graphthing.desktop.in.h:2
-msgid "GraphThing"
+msgid "Create, manipulate and study graphs."
 msgstr ""
 
 #: ../menu-data/gravitation:gravitation.desktop.in.h:1
@@ -7039,11 +7126,11 @@
 msgstr ""
 
 #: ../menu-data/grdesktop:grdesktop.desktop.in.h:1
-msgid "Connect to a remote Windows Terminal-Server"
+msgid "Remotedesktop Client"
 msgstr ""
 
 #: ../menu-data/grdesktop:grdesktop.desktop.in.h:2
-msgid "Remotedesktop Client"
+msgid "Connect to a remote Windows Terminal-Server"
 msgstr ""
 
 #: ../menu-data/greenwich:greenwich.desktop.in.h:1
@@ -7051,11 +7138,11 @@
 msgstr ""
 
 #: ../menu-data/gresistor:gresistor.desktop.in.h:1
-msgid "Resistor color code calculator"
+msgid "gResistor"
 msgstr ""
 
 #: ../menu-data/gresistor:gresistor.desktop.in.h:2
-msgid "gResistor"
+msgid "Resistor color code calculator"
 msgstr ""
 
 #: ../menu-data/gresolver:gresolver.desktop.in.h:1
@@ -7067,11 +7154,11 @@
 msgstr ""
 
 #: ../menu-data/gretl-common:gretl.desktop.in.h:1
-msgid "Econometrics program"
+msgid "gretl"
 msgstr ""
 
 #: ../menu-data/gretl-common:gretl.desktop.in.h:2
-msgid "gretl"
+msgid "Econometrics program"
 msgstr ""
 
 #: ../menu-data/grhino:grhino.desktop.in.h:1
@@ -7095,11 +7182,11 @@
 msgstr ""
 
 #: ../menu-data/gringotts:gringotts.desktop.in.h:1
-msgid "An electronic strongbox"
+msgid "Gringotts"
 msgstr ""
 
 #: ../menu-data/gringotts:gringotts.desktop.in.h:2
-msgid "Gringotts"
+msgid "An electronic strongbox"
 msgstr ""
 
 #: ../menu-data/grinvin:grinvin.desktop.in.h:1
@@ -7115,11 +7202,11 @@
 msgstr ""
 
 #: ../menu-data/gromit:gromit.desktop.in.h:1
-msgid "draw freehand screen annotations"
+msgid "gromit"
 msgstr ""
 
 #: ../menu-data/gromit:gromit.desktop.in.h:2
-msgid "gromit"
+msgid "draw freehand screen annotations"
 msgstr ""
 
 #: ../menu-data/groundcontrol:groundcontrol.desktop.in.h:1
@@ -7131,11 +7218,11 @@
 msgstr ""
 
 #: ../menu-data/grpn:grpn.desktop.in.h:1
-msgid "A reverse polish notation calculator"
+msgid "Grpn Calculator"
 msgstr ""
 
 #: ../menu-data/grpn:grpn.desktop.in.h:2
-msgid "Grpn Calculator"
+msgid "A reverse polish notation calculator"
 msgstr ""
 
 #: ../menu-data/grr.app:Grr.desktop.in.h:1
@@ -7155,29 +7242,29 @@
 msgstr ""
 
 #: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:1
-msgid "A GUI to aid the scan-to-PDF process"
+msgid "gscan2pdf"
 msgstr ""
 
 #: ../menu-data/gscan2pdf:gscan2pdf.desktop.in.h:2
-msgid "gscan2pdf"
+msgid "A GUI to aid the scan-to-PDF process"
 msgstr ""
 
 #: ../menu-data/gshare:gshare-manager.desktop.in.h:1
-msgid "Configure the file sharing service"
+msgid "File Sharing"
 msgstr ""
 
 #: ../menu-data/gshare:gshare-manager.desktop.in.h:2
-msgid "File Sharing"
+msgid "Configure the file sharing service"
 msgstr ""
 
 #: ../menu-data/gshutdown:gshutdown.desktop.in.h:1
-msgid ""
-"An advanced shutdown utility which allows you to schedule the shutdown or "
-"the restart of your computer"
+msgid "GShutdown"
 msgstr ""
 
 #: ../menu-data/gshutdown:gshutdown.desktop.in.h:2
-msgid "GShutdown"
+msgid ""
+"An advanced shutdown utility which allows you to schedule the shutdown or "
+"the restart of your computer"
 msgstr ""
 
 #: ../menu-data/gsmartcontrol:gsmartcontrol.desktop.in.h:1
@@ -7198,45 +7285,45 @@
 msgstr ""
 
 #: ../menu-data/gsoko:gsoko.desktop.in.h:1
-msgid "Clone of the Sokoban game"
+msgid "Sokoban"
 msgstr ""
 
 #: ../menu-data/gsoko:gsoko.desktop.in.h:2
-msgid "Sokoban"
+msgid "Clone of the Sokoban game"
 msgstr ""
 
 #: ../menu-data/gsql:gsql.desktop.in.h:1
-msgid "Integrated Database Development Environment for GNOME"
+msgid "gsql"
 msgstr ""
 
 #: ../menu-data/gsql:gsql.desktop.in.h:2
-msgid "gsql"
+msgid "Integrated Database Development Environment for GNOME"
 msgstr ""
 
 #: ../menu-data/gstm:gstm.desktop.in.h:1
-msgid "Manage SSH tunnel connections"
+msgid "gSTM"
 msgstr ""
 
 #: ../menu-data/gstm:gstm.desktop.in.h:2
-msgid "gSTM"
+msgid "Manage SSH tunnel connections"
 msgstr ""
 
 #: ../menu-data/gtablix:gtablix.desktop.in.h:1
-msgid "Generate highschool timetables using a GUI for Tablix."
+msgid "Gtablix Timetable Generator"
 msgstr ""
 
 #: ../menu-data/gtablix:gtablix.desktop.in.h:2
-msgid "Gtablix Timetable Generator"
+msgid "Generate highschool timetables using a GUI for Tablix."
 msgstr ""
 
 #: ../menu-data/gtali:gtali.desktop.in.h:1
-msgid "Beat the odds in a poker-style dice game"
-msgstr "Bojujte proti prevahe v kockovej hre v štýle pokru"
-
-#: ../menu-data/gtali:gtali.desktop.in.h:2
 msgid "Tali"
 msgstr "Tali"
 
+#: ../menu-data/gtali:gtali.desktop.in.h:2
+msgid "Beat the odds in a poker-style dice game"
+msgstr "Bojujte proti prevahe v kockovej hre v štýle pokru"
+
 #: ../menu-data/gtamsanalyzer.app:GTAMSAnalyzer.desktop.in.h:1
 msgid "GTAMSAnalyzer"
 msgstr "GTAMSAnalyzer"
@@ -7270,11 +7357,11 @@
 msgstr ""
 
 #: ../menu-data/gthumb:gthumb.desktop.in.h:1
-msgid "View and organize your images"
+msgid "gThumb Image Viewer"
 msgstr ""
 
 #: ../menu-data/gthumb:gthumb.desktop.in.h:2
-msgid "gThumb Image Viewer"
+msgid "View and organize your images"
 msgstr ""
 
 #: ../menu-data/gtick:gtick.desktop.in.h:1
@@ -7294,27 +7381,27 @@
 msgstr ""
 
 #: ../menu-data/gtimer:gtimer.desktop.in.h:1
-msgid "GTK-based X11 task timer"
+msgid "GTimer"
 msgstr ""
 
 #: ../menu-data/gtimer:gtimer.desktop.in.h:2
-msgid "GTimer"
+msgid "GTK-based X11 task timer"
 msgstr ""
 
 #: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:1
-msgid "GTK+2.0 Theme Changer"
+msgid "Gtk-ChTheme"
 msgstr ""
 
 #: ../menu-data/gtk-chtheme:gtk-chtheme.desktop.in.h:2
-msgid "Gtk-ChTheme"
+msgid "GTK+2.0 Theme Changer"
 msgstr ""
 
 #: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:1
-msgid "A GUI based Gnutella Servent"
+msgid "gtk-gnutella"
 msgstr ""
 
 #: ../menu-data/gtk-gnutella:gtk-gnutella.desktop.in.h:2
-msgid "gtk-gnutella"
+msgid "A GUI based Gnutella Servent"
 msgstr ""
 
 #: ../menu-data/gtk-recordmydesktop:gtk-recordmydesktop.desktop.in.h:1
@@ -7327,35 +7414,35 @@
 msgstr ""
 
 #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:1
-msgid "Color temperature adjustment tool"
+msgid "Redshift"
 msgstr ""
 
 #: ../menu-data/gtk-redshift:gtk-redshift.desktop.in.h:2
-msgid "Redshift"
+msgid "Color temperature adjustment tool"
 msgstr ""
 
 #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:1
-msgid "Save vector images of application windows"
+msgid "Take Vector Screenshot"
 msgstr ""
 
 #: ../menu-data/gtk-vector-screenshot:take-vector-screenshot.desktop.in.h:2
-msgid "Take Vector Screenshot"
+msgid "Save vector images of application windows"
 msgstr ""
 
 #: ../menu-data/gtkam:gtkam.desktop.in.h:1
-msgid "Browse and download images from an attached digital camera"
+msgid "Gtkam Digital Camera Browser"
 msgstr ""
 
 #: ../menu-data/gtkam:gtkam.desktop.in.h:2
-msgid "Gtkam Digital Camera Browser"
+msgid "Browse and download images from an attached digital camera"
 msgstr ""
 
 #: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:1
-msgid "Connect to a Monopd server"
+msgid "GtkAtlantic"
 msgstr ""
 
 #: ../menu-data/gtkatlantic:gtkatlantic.desktop.in.h:2
-msgid "GtkAtlantic"
+msgid "Connect to a Monopd server"
 msgstr ""
 
 #: ../menu-data/gtkballs:gtkballs.desktop.in.h:1
@@ -7375,35 +7462,35 @@
 msgstr ""
 
 #: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:1
-msgid "Tune your Guitar"
+msgid "gtkGuitune"
 msgstr ""
 
 #: ../menu-data/gtkguitune:gtkguitune.desktop.in.h:2
-msgid "gtkGuitune"
+msgid "Tune your Guitar"
 msgstr ""
 
 #: ../menu-data/gtkhash:gtkhash.desktop.in.h:1
-msgid "Compute message digests and checksums"
+msgid "GtkHash"
 msgstr ""
 
 #: ../menu-data/gtkhash:gtkhash.desktop.in.h:2
-msgid "GtkHash"
+msgid "Compute message digests and checksums"
 msgstr ""
 
 #: ../menu-data/gtklick:gtklick.desktop.in.h:1
-msgid "A Simple Metronome"
+msgid "gtklick"
 msgstr ""
 
 #: ../menu-data/gtklick:gtklick.desktop.in.h:2
-msgid "gtklick"
+msgid "A Simple Metronome"
 msgstr ""
 
 #: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:1
-msgid "A graphical tool to find and remove orphaned libraries"
+msgid "Remove orphaned packages"
 msgstr ""
 
 #: ../menu-data/gtkorphan:gtkorphan.desktop.in.h:2
-msgid "Remove orphaned packages"
+msgid "A graphical tool to find and remove orphaned libraries"
 msgstr ""
 
 #: ../menu-data/gtkperf:gtkperf.desktop.in.h:1
@@ -7423,27 +7510,27 @@
 msgstr ""
 
 #: ../menu-data/gtkterm:gtkterm.desktop.in.h:1
-msgid "Communicate with the serial port"
+msgid "Serial port terminal"
 msgstr ""
 
 #: ../menu-data/gtkterm:gtkterm.desktop.in.h:2
-msgid "Serial port terminal"
+msgid "Communicate with the serial port"
 msgstr ""
 
 #: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:1
-msgid "Connect to your VNC servers"
-msgstr "Pripojenie k serveru VNC"
-
-#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2
 msgid "Gtk VNC Viewer"
 msgstr "Gtk prehliadač VNC"
 
+#: ../menu-data/gtkvncviewer:data__gtkvncviewer.desktop.in.h:2
+msgid "Connect to your VNC servers"
+msgstr "Pripojenie k serveru VNC"
+
 #: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:1
-msgid "A whiteboard written in GTK using the wiimote"
+msgid "GTK Wiimote Whiteboard"
 msgstr ""
 
 #: ../menu-data/gtkwhiteboard:gtkwhiteboard.desktop.in.h:2
-msgid "GTK Wiimote Whiteboard"
+msgid "A whiteboard written in GTK using the wiimote"
 msgstr ""
 
 #: ../menu-data/gtodo:gtodo.desktop.in.h:1
@@ -7487,11 +7574,11 @@
 msgstr "Vkladanie špeciálnych znakov do dokumentov"
 
 #: ../menu-data/gufw:gufw.desktop.in.h:1
-msgid "Allows you to configure ufw firewall"
+msgid "Firewall Configuration"
 msgstr ""
 
 #: ../menu-data/gufw:gufw.desktop.in.h:2
-msgid "Firewall Configuration"
+msgid "Allows you to configure ufw firewall"
 msgstr ""
 
 #: ../menu-data/gui-apt-key:gui-apt-key.desktop.in.h:1
@@ -7503,11 +7590,11 @@
 msgstr ""
 
 #: ../menu-data/guitarix:guitarix.desktop.in.h:1
-msgid "Simple mono amplifier simulation"
+msgid "guitarix"
 msgstr ""
 
 #: ../menu-data/guitarix:guitarix.desktop.in.h:2
-msgid "guitarix"
+msgid "Simple mono amplifier simulation"
 msgstr ""
 
 #: ../menu-data/gummi:gummi.desktop.in.h:1
@@ -7531,84 +7618,84 @@
 msgstr ""
 
 #: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:1
-msgid "Graphical Web Links checker"
+msgid "gurlchecker"
 msgstr ""
 
 #: ../menu-data/gurlchecker:gurlchecker.desktop.in.h:2
-msgid "gurlchecker"
+msgid "Graphical Web Links checker"
 msgstr ""
 
 #: ../menu-data/guvcview:guvcview.desktop.in.h:1
-msgid "A video viewer and capturer for the linux uvc driver"
+msgid "guvcview"
 msgstr ""
 
 #: ../menu-data/guvcview:guvcview.desktop.in.h:2
-msgid "guvcview"
+msgid "A video viewer and capturer for the linux uvc driver"
 msgstr ""
 
 #: ../menu-data/guymager:guymager.desktop.in.h:1
-msgid "Fast forensic imager"
+msgid "Guymager"
 msgstr ""
 
 #: ../menu-data/guymager:guymager.desktop.in.h:2
-msgid "Guymager"
+msgid "Fast forensic imager"
 msgstr ""
 
 #: ../menu-data/gv:gv.desktop.in.h:1
-msgid "View PS and/or PDF files"
+msgid "gv"
 msgstr ""
 
 #: ../menu-data/gv:gv.desktop.in.h:2
-msgid "gv"
+msgid "View PS and/or PDF files"
 msgstr ""
 
 #: ../menu-data/gvb:gvb.desktop.in.h:1
-msgid "Gvb"
+msgid "Play with waves and vibrations"
 msgstr ""
 
 #: ../menu-data/gvb:gvb.desktop.in.h:2
-msgid "Play with waves and vibrations"
+msgid "Gvb"
 msgstr ""
 
 #: ../menu-data/gvrng:gvrng.desktop.in.h:1
-msgid "Guido van Robot NG"
+msgid "GvRng"
 msgstr ""
 
 #: ../menu-data/gvrng:gvrng.desktop.in.h:2
-msgid "GvRng"
+msgid "Guido van Robot NG"
 msgstr ""
 
 #: ../menu-data/gwaei:gwaei.desktop.in.h:1
-msgid "Enter a Japanese or English word to easily get translations."
+msgid "gWaei Japanese-English Dictionary"
 msgstr ""
 
 #: ../menu-data/gwaei:gwaei.desktop.in.h:2
-msgid "gWaei Japanese-English Dictionary"
+msgid "Enter a Japanese or English word to easily get translations."
 msgstr ""
 
 #: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:1
-msgid ""
-"A GTK+ utility to awake turned off machine using the Wake On LAN feature."
+msgid "gWakeOnLan"
 msgstr ""
 
 #: ../menu-data/gwakeonlan:gwakeonlan.desktop.in.h:2
-msgid "gWakeOnLan"
+msgid ""
+"A GTK+ utility to awake turned off machine using the Wake On LAN feature."
 msgstr ""
 
 #: ../menu-data/gwaterfall:waterfall.desktop.in.h:1
-msgid "View all characters of a font in all sizes."
+msgid "Waterfall"
 msgstr ""
 
 #: ../menu-data/gwaterfall:waterfall.desktop.in.h:2
-msgid "Waterfall"
+msgid "View all characters of a font in all sizes."
 msgstr ""
 
 #: ../menu-data/gwave:gwave.desktop.in.h:1
-msgid "A waveform viewer eg for spice simulators "
+msgid "gwave"
 msgstr ""
 
 #: ../menu-data/gwave:gwave.desktop.in.h:2
-msgid "gwave"
+msgid "A waveform viewer eg for spice simulators "
 msgstr ""
 
 #: ../menu-data/gwc:gwc.desktop.in.h:1
@@ -7628,22 +7715,26 @@
 msgstr ""
 
 #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:1
-msgid "A batch renaming tool for KDE"
+msgid "GwenRename"
 msgstr ""
 
 #: ../menu-data/gwenrename:kde4__gwenrename.desktop.in.h:2
-msgid "GwenRename"
+msgid "A batch renaming tool for KDE"
 msgstr ""
 
 #: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:1
-msgid "A simple image viewer"
+msgid "Gwenview"
 msgstr ""
 
 #: ../menu-data/gwenview:kde4__gwenview.desktop.in.h:2
-msgid "Gwenview"
+msgid "A simple image viewer"
 msgstr ""
 
 #: ../menu-data/gwhere:gwhere.desktop.in.h:1
+msgid "Removable media catalog managment"
+msgstr ""
+
+#: ../menu-data/gwhere:gwhere.desktop.in.h:2
 msgid ""
 "GWhere allows to manage a database of yours CDs and others removable media "
 "(hard disks, floppy drive, Zip drive, CD-ROM, etc...). With GWhere it's easy "
@@ -7651,10 +7742,6 @@
 "in the drive at each once."
 msgstr ""
 
-#: ../menu-data/gwhere:gwhere.desktop.in.h:2
-msgid "Removable media catalog managment"
-msgstr ""
-
 #: ../menu-data/gwibber:gwibber.desktop.in.h:1
 msgid "Gwibber Social Client"
 msgstr ""
@@ -7664,13 +7751,13 @@
 msgstr ""
 
 #: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:1
-msgid "GNUstep Workspace Manager"
-msgstr "Správca pracovného priestoru GNUstep"
-
-#: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2
 msgid "GWorkspace"
 msgstr "GWorkspace"
 
+#: ../menu-data/gworkspace.app:GWorkspace.desktop.in.h:2
+msgid "GNUstep Workspace Manager"
+msgstr "Správca pracovného priestoru GNUstep"
+
 #: ../menu-data/gworldclock:gworldclock.desktop.in.h:1
 msgid "See the time in other timezones"
 msgstr ""
@@ -7686,7 +7773,7 @@
 #: ../menu-data/gwrite:gwrite.desktop.in.h:2
 #: ../menu-data/leafpad:leafpad.desktop.in.h:2
 #: ../menu-data/mousepad:mousepad.desktop.in.h:2
-#: ../menu-data/x2:x2.desktop.in.h:1
+#: ../menu-data/x2:x2.desktop.in.h:2
 msgid "Simple text editor"
 msgstr "Jednoduchý textový editor"
 
@@ -7699,19 +7786,19 @@
 msgstr ""
 
 #: ../menu-data/gxmms2:gxmms2.desktop.in.h:1
-msgid "Play music"
+msgid "gxmms2"
 msgstr ""
 
 #: ../menu-data/gxmms2:gxmms2.desktop.in.h:2
-msgid "gxmms2"
+msgid "Play music"
 msgstr ""
 
 #: ../menu-data/gxneur:gxneur.desktop.in.h:1
-msgid "Automatic keyboard layout switcher"
+msgid "gXNeur"
 msgstr ""
 
 #: ../menu-data/gxneur:gxneur.desktop.in.h:2
-msgid "gXNeur"
+msgid "Automatic keyboard layout switcher"
 msgstr ""
 
 #: ../menu-data/gxtuner:gxtuner.desktop.in.h:1
@@ -7723,63 +7810,55 @@
 msgstr ""
 
 #: ../menu-data/gyrus:gyrus.desktop.in.h:1
-msgid "Administer the mailboxes of your IMAP Cyrus servers"
+msgid "Gyrus IMAP Cyrus Administrator"
 msgstr ""
 
 #: ../menu-data/gyrus:gyrus.desktop.in.h:2
-msgid "Gyrus IMAP Cyrus Administrator"
+msgid "Administer the mailboxes of your IMAP Cyrus servers"
 msgstr ""
 
 #: ../menu-data/hamfax:hamfax.desktop.in.h:1
-msgid "Send and receive radio facsimiles"
+msgid "hamfax"
 msgstr ""
 
 #: ../menu-data/hamfax:hamfax.desktop.in.h:2
-msgid "hamfax"
+msgid "Send and receive radio facsimiles"
 msgstr ""
 
 #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:1
-msgid "Project Hamster - track your time"
+msgid "Time Tracker"
 msgstr ""
 
 #: ../menu-data/hamster-applet:hamster-time-tracker.desktop.in.h:2
-msgid "Time Tracker"
+msgid "Project Hamster - track your time"
 msgstr ""
 
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:1
-msgid "Foo2ZJS Firmware Downloader and Installer"
+msgid "Foo2ZJS Firmware Installer (Hannah)"
 msgstr ""
 
 #: ../menu-data/hannah-foo2zjs:hannah-foo2zjs.desktop.in.h:2
-msgid "Foo2ZJS Firmware Installer (Hannah)"
+msgid "Foo2ZJS Firmware Downloader and Installer"
 msgstr ""
 
 #: ../menu-data/hannah:hannah.desktop.in.h:1
-msgid "A pacman-like game"
+msgid "Help Hannah's Horse"
 msgstr ""
 
 #: ../menu-data/hannah:hannah.desktop.in.h:2
-msgid "Help Hannah's Horse"
+msgid "A pacman-like game"
 msgstr ""
 
 #: ../menu-data/hardinfo:hardinfo.desktop.in.h:1
 msgid "System Profiler and Benchmark"
 msgstr ""
 
-#: ../menu-data/harpia:harpia.desktop.in.h:1
-msgid "Harpia"
-msgstr ""
-
-#: ../menu-data/harpia:harpia.desktop.in.h:2
-msgid "Image Processing and Computer Vision Automatic Programming Tool"
-msgstr ""
-
 #: ../menu-data/hasciicam:hasciicam.desktop.in.h:1
-msgid "(h)ascii for the masses!"
+msgid "HasciiCam"
 msgstr ""
 
 #: ../menu-data/hasciicam:hasciicam.desktop.in.h:2
-msgid "HasciiCam"
+msgid "(h)ascii for the masses!"
 msgstr ""
 
 #: ../menu-data/hatari:hatariui.desktop.in.h:1
@@ -7787,51 +7866,51 @@
 msgstr ""
 
 #: ../menu-data/hdfview:hdfview.desktop.in.h:1
-msgid "HDF4/5 Data Browser"
+msgid "hdfview"
 msgstr ""
 
 #: ../menu-data/hdfview:hdfview.desktop.in.h:2
-msgid "hdfview"
+msgid "HDF4/5 Data Browser"
 msgstr ""
 
 #: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:1
-msgid "A GUI for configuration of HDHomeRun devices"
+msgid "HDHomeRun Config GUI"
 msgstr ""
 
 #: ../menu-data/hdhomerun-config-gui:hdhr.desktop.in.h:2
-msgid "HDHomeRun Config GUI"
+msgid "A GUI for configuration of HDHomeRun devices"
 msgstr ""
 
 #: ../menu-data/hedgewars:hedgewars.desktop.in.h:1
-msgid "Fighting Hedgehogs"
+msgid "Hedgewars"
 msgstr ""
 
 #: ../menu-data/hedgewars:hedgewars.desktop.in.h:2
-msgid "Hedgewars"
+msgid "Fighting Hedgehogs"
 msgstr ""
 
 #: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:1
-msgid "GNUstep Help Viewer"
-msgstr "Prehliadač pomocníka GNUstep"
-
-#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2
 msgid "HelpViewer"
 msgstr "HelpViewer"
 
+#: ../menu-data/helpviewer.app:HelpViewer.desktop.in.h:2
+msgid "GNUstep Help Viewer"
+msgstr "Prehliadač pomocníka GNUstep"
+
 #: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:1
-msgid "GUI front-end of hercules emulator"
+msgid "HerculesStudio"
 msgstr ""
 
 #: ../menu-data/herculesstudio:herculesstudio.desktop.in.h:2
-msgid "HerculesStudio"
+msgid "GUI front-end of hercules emulator"
 msgstr ""
 
 #: ../menu-data/heroes-common:heroes.desktop.in.h:1
-msgid "Collect powerups and avoid your opponents' trails"
+msgid "Heroes"
 msgstr ""
 
 #: ../menu-data/heroes-common:heroes.desktop.in.h:2
-msgid "Heroes"
+msgid "Collect powerups and avoid your opponents' trails"
 msgstr ""
 
 #: ../menu-data/hex-a-hop:hex-a-hop.desktop.in.h:1
@@ -7875,11 +7954,11 @@
 msgstr ""
 
 #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:1
-msgid "A minimal program to work with scanner."
+msgid "sane-pygtk"
 msgstr ""
 
 #: ../menu-data/hocr-gtk:sane-pygtk.desktop.in.h:2
-msgid "sane-pygtk"
+msgid "A minimal program to work with scanner."
 msgstr ""
 
 #: ../menu-data/holdingnuts:holdingnuts.desktop.in.h:1
@@ -7899,11 +7978,11 @@
 msgstr ""
 
 #: ../menu-data/homebank:homebank.desktop.in.h:1
-msgid "Free, easy, personal accounting for everyone."
+msgid "HomeBank"
 msgstr ""
 
 #: ../menu-data/homebank:homebank.desktop.in.h:2
-msgid "HomeBank"
+msgid "Free, easy, personal accounting for everyone."
 msgstr ""
 
 #: ../menu-data/horae:artemis.desktop.in.h:1
@@ -7947,27 +8026,27 @@
 msgstr ""
 
 #: ../menu-data/hotssh:hotssh.desktop.in.h:1
-msgid "Connect to a remote computer using Secure Shell"
+msgid "Secure Shell"
 msgstr ""
 
 #: ../menu-data/hotssh:hotssh.desktop.in.h:2
-msgid "Secure Shell"
+msgid "Connect to a remote computer using Secure Shell"
 msgstr ""
 
 #: ../menu-data/hotwire:hotwire.desktop.in.h:1
-msgid "Execute text commands"
+msgid "Hotwire Shell"
 msgstr ""
 
 #: ../menu-data/hotwire:hotwire.desktop.in.h:2
-msgid "Hotwire Shell"
+msgid "Execute text commands"
 msgstr ""
 
 #: ../menu-data/hplip-gui:hplip.desktop.in.h:1
-msgid "HP Printing System Control Center"
+msgid "HPLIP Toolbox"
 msgstr ""
 
 #: ../menu-data/hplip-gui:hplip.desktop.in.h:2
-msgid "HPLIP Toolbox"
+msgid "HP Printing System Control Center"
 msgstr ""
 
 #: ../menu-data/htop:htop.desktop.in.h:1
@@ -7978,49 +8057,36 @@
 msgid "Show System Processes"
 msgstr ""
 
-#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:1
-msgid "Hugin Calibrate Lens"
-msgstr ""
-
-#: ../menu-data/hugin:calibrate_lens_gui.desktop.in.h:2
-#: ../menu-data/hugin:hugin.desktop.in.h:2
-msgid "Stitch photographs together"
-msgstr ""
-
-#: ../menu-data/hugin:hugin.desktop.in.h:1
-msgid "Hugin Panorama Creator"
-msgstr ""
-
 #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:1
-msgid "A fast network logon cracker"
+msgid "XHydra"
 msgstr ""
 
 #: ../menu-data/hydra-gtk:hydra-gtk.desktop.in.h:2
-msgid "XHydra"
+msgid "A fast network logon cracker"
 msgstr ""
 
 #: ../menu-data/hydrogen:hydrogen.desktop.in.h:1
-msgid "Create drum sequences"
+msgid "Hydrogen"
 msgstr ""
 
 #: ../menu-data/hydrogen:hydrogen.desktop.in.h:2
-msgid "Hydrogen Drum Machine"
+msgid "Create drum sequences"
 msgstr ""
 
 #: ../menu-data/iagno:iagno.desktop.in.h:1
-msgid "Dominate the board in a classic version of Reversi"
-msgstr "Ovládnite hraciu plochu v klasickej verzii Reversi"
-
-#: ../menu-data/iagno:iagno.desktop.in.h:2
 msgid "Iagno"
 msgstr "Iagno"
 
+#: ../menu-data/iagno:iagno.desktop.in.h:2
+msgid "Dominate the board in a classic version of Reversi"
+msgstr "Ovládnite hraciu plochu v klasickej verzii Reversi"
+
 #: ../menu-data/ibus:ibus-setup.desktop.in.h:1
-msgid "Adjust methods for keyboard input."
+msgid "Keyboard Input Methods"
 msgstr ""
 
 #: ../menu-data/ibus:ibus-setup.desktop.in.h:2
-msgid "Keyboard Input Methods"
+msgid "Adjust methods for keyboard input."
 msgstr ""
 
 #: ../menu-data/ibus:ibus.desktop.in.h:1
@@ -8040,11 +8106,11 @@
 msgstr ""
 
 #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:1
-msgid "A monitor for an Icecream compilation network"
+msgid "Icemon"
 msgstr ""
 
 #: ../menu-data/icecc-monitor:kde4__icemon.desktop.in.h:2
-msgid "Icemon"
+msgid "A monitor for an Icecream compilation network"
 msgstr ""
 
 #: ../menu-data/icedtea-netx-common:icedtea-netx-javaws.desktop.in.h:1
@@ -8100,11 +8166,11 @@
 msgstr ""
 
 #: ../menu-data/ifpgui:ifpgui.desktop.in.h:1
-msgid "KDE-style GUI for iRiver iFP flash players "
+msgid "ifpgui"
 msgstr ""
 
 #: ../menu-data/ifpgui:ifpgui.desktop.in.h:2
-msgid "ifpgui"
+msgid "KDE-style GUI for iRiver iFP flash players "
 msgstr ""
 
 #: ../menu-data/ifrit:ifrit.desktop.in.h:1
@@ -8116,23 +8182,23 @@
 msgstr ""
 
 #: ../menu-data/ii-esu:ii-esu.desktop.in.h:1
-msgid "HIZ's ES"
+msgid "ii-esu"
 msgstr ""
 
 #: ../menu-data/ii-esu:ii-esu.desktop.in.h:2
-msgid "ii-esu"
+msgid "HIZ's ES"
 msgstr ""
 
 #: ../menu-data/ike-qtgui:ike.desktop.in.h:1
-msgid "Application to manage remote site configurations"
+msgid "Shrew Soft VPN Access Manager"
 msgstr ""
 
 #: ../menu-data/ike-qtgui:ike.desktop.in.h:2
-msgid "Shrew Soft VPN Access Manager"
+msgid "Application to manage remote site configurations"
 msgstr ""
 
 #: ../menu-data/im-config:im-config.desktop.in.h:1
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
 msgid "Input Method"
 msgstr ""
 
@@ -8146,11 +8212,11 @@
 msgstr ""
 
 #: ../menu-data/imagej:imagej.desktop.in.h:1
-msgid "Image processing and analysis"
+msgid "ImageJ"
 msgstr ""
 
 #: ../menu-data/imagej:imagej.desktop.in.h:2
-msgid "ImageJ"
+msgid "Image processing and analysis"
 msgstr ""
 
 #: ../menu-data/imageshack-uploader:imageshackuploader.desktop.in.h:1
@@ -8161,12 +8227,20 @@
 msgid "Upload your images and videos to ImageShack"
 msgstr ""
 
+#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:1
+msgid "ImageVis3D"
+msgstr ""
+
+#: ../menu-data/imagevis3d:imagevis3d.desktop.in.h:2
+msgid "Desktop volume rendering application for large data"
+msgstr ""
+
 #: ../menu-data/imagination:imagination.desktop.in.h:1
-msgid "A lightweight DVD slideshow maker using GTK+2"
+msgid "Imagination"
 msgstr ""
 
 #: ../menu-data/imagination:imagination.desktop.in.h:2
-msgid "Imagination"
+msgid "A lightweight DVD slideshow maker using GTK+2"
 msgstr ""
 
 #: ../menu-data/imview:imview.desktop.in.h:1
@@ -8178,33 +8252,33 @@
 msgstr ""
 
 #: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:1
+msgid "System Load Indicator"
+msgstr ""
+
+#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2
 msgid ""
 "A system load monitor capable of displaying graphs for CPU, ram, and swap "
 "space use, plus network traffic."
 msgstr ""
 
-#: ../menu-data/indicator-multiload:indicator-multiload.desktop.in.h:2
-msgid "System Load Indicator"
+#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1
+msgid "Weather Indicator"
 msgstr ""
 
-#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:1
+#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2
 msgid ""
 "A weather indicator that displays information for one or multiple places in "
 "the world"
 msgstr ""
 
-#: ../menu-data/indicator-weather:indicator-weather.desktop.in.h:2
-msgid "Weather Indicator"
-msgstr ""
-
 #: ../menu-data/inkscape:inkscape.desktop.in.h:1
-msgid "Create and edit Scalable Vector Graphics images"
-msgstr "Tvorba a úprava obrázkov SVG"
-
-#: ../menu-data/inkscape:inkscape.desktop.in.h:2
 msgid "Inkscape Vector Graphics Editor"
 msgstr "Inkscape - vektorový grafický editor"
 
+#: ../menu-data/inkscape:inkscape.desktop.in.h:2
+msgid "Create and edit Scalable Vector Graphics images"
+msgstr "Tvorba a úprava obrázkov SVG"
+
 #: ../menu-data/insanity-tools:insanity-gtk.desktop.in.h:1
 msgid "Insanity testing system"
 msgstr ""
@@ -8222,43 +8296,67 @@
 msgstr ""
 
 #: ../menu-data/iok:iok.desktop.in.h:1
-msgid "Enter Indic characters with a virtual keyboard"
+msgid "Indic Onscreen Keyboard"
 msgstr ""
 
 #: ../menu-data/iok:iok.desktop.in.h:2
-msgid "Indic Onscreen Keyboard"
+msgid "Enter Indic characters with a virtual keyboard"
 msgstr ""
 
 #: ../menu-data/iptux:iptux.desktop.in.h:1
-msgid "Lan communication software"
+msgid "iptux"
 msgstr ""
 
 #: ../menu-data/iptux:iptux.desktop.in.h:2
-msgid "iptux"
+msgid "Lan communication software"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:1
+msgid "Enhanced interactive Python qtconsole"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:2
+msgid "IPython Qt console"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:3
+msgid "Pylab"
+msgstr ""
+
+#: ../menu-data/ipython-qtconsole:ipython-qtconsole.desktop.in.h:4
+msgid "Pylab (inline plots)"
+msgstr ""
+
+#: ../menu-data/ipython:ipython.desktop.in.h:1
+msgid "Enhanced interactive Python shell"
+msgstr ""
+
+#: ../menu-data/ipython:ipython.desktop.in.h:2
+msgid "ipython"
 msgstr ""
 
 #: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:1
-msgid "A simple OBEX file transfer applet"
+msgid "Ircp Tray"
 msgstr ""
 
 #: ../menu-data/ircp-tray:ircp-tray.desktop.in.h:2
-msgid "Ircp Tray"
+msgid "A simple OBEX file transfer applet"
 msgstr ""
 
 #: ../menu-data/iriverter:iriverter.desktop.in.h:1
-msgid "Convert videos for your handheld device"
+msgid "iriverter"
 msgstr ""
 
 #: ../menu-data/iriverter:iriverter.desktop.in.h:2
-msgid "iriverter"
+msgid "Convert videos for your handheld device"
 msgstr ""
 
 #: ../menu-data/isag:isag.desktop.in.h:1
-msgid "Interactive System Activity Grapher for sysstat"
+msgid "Isag System Activity Grapher"
 msgstr ""
 
 #: ../menu-data/isag:isag.desktop.in.h:2
-msgid "Isag System Activity Grapher"
+msgid "Interactive System Activity Grapher for sysstat"
 msgstr ""
 
 #: ../menu-data/isomaster:isomaster.desktop.in.h:1
@@ -8278,11 +8376,11 @@
 msgstr ""
 
 #: ../menu-data/italc-master:italc.desktop.in.h:1
-msgid "Computer room overview"
+msgid "iTalc master interface"
 msgstr ""
 
 #: ../menu-data/italc-master:italc.desktop.in.h:2
-msgid "iTalc master interface"
+msgid "Computer room overview"
 msgstr ""
 
 #: ../menu-data/itksnap:itksnap.desktop.in.h:1
@@ -8294,19 +8392,19 @@
 msgstr ""
 
 #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:1
-msgid "Analyse or generate an Audio signal through ALSA"
+msgid "Jaaa (with ALSA support)"
 msgstr ""
 
 #: ../menu-data/jaaa:jaaa-alsa.desktop.in.h:2
-msgid "Jaaa (with ALSA support)"
+msgid "Analyse or generate an Audio signal through ALSA"
 msgstr ""
 
 #: ../menu-data/jabref:jabref.desktop.in.h:1
-msgid "Graphical editor for BibTex bibliographies"
+msgid "JabRef"
 msgstr ""
 
 #: ../menu-data/jabref:jabref.desktop.in.h:2
-msgid "JabRef"
+msgid "Graphical editor for BibTex bibliographies"
 msgstr ""
 
 #: ../menu-data/jack-keyboard:jack-keyboard.desktop.in.h:1
@@ -8354,11 +8452,11 @@
 msgstr ""
 
 #: ../menu-data/jamin:jamin.desktop.in.h:1
-msgid "JACK Audio Mastering interface"
+msgid "JAMin"
 msgstr ""
 
 #: ../menu-data/jamin:jamin.desktop.in.h:2
-msgid "JAMin"
+msgid "JACK Audio Mastering interface"
 msgstr ""
 
 #: ../menu-data/jampal:jampal.desktop.in.h:1
@@ -8370,27 +8468,27 @@
 msgstr ""
 
 #: ../menu-data/japa:japa-alsa.desktop.in.h:1
-msgid "Analyse an Audio signal through ALSA"
+msgid "Japa (with ALSA support)"
 msgstr ""
 
 #: ../menu-data/japa:japa-alsa.desktop.in.h:2
-msgid "Japa (with ALSA support)"
+msgid "Analyse an Audio signal through ALSA"
 msgstr ""
 
 #: ../menu-data/japa:japa-jack.desktop.in.h:1
-msgid "Analyse an Audio signal through JACK"
+msgid "Japa (with JACK support)"
 msgstr ""
 
 #: ../menu-data/japa:japa-jack.desktop.in.h:2
-msgid "Japa (with JACK support)"
+msgid "Analyse an Audio signal through JACK"
 msgstr ""
 
 #: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:1
-msgid "French computering dictionary"
+msgid "Jargon Informatique"
 msgstr ""
 
 #: ../menu-data/jargoninformatique:jargoninformatique.desktop.in.h:2
-msgid "Jargon Informatique"
+msgid "French computering dictionary"
 msgstr ""
 
 #: ../menu-data/javamorph:javamorph.desktop.in.h:1
@@ -8410,13 +8508,13 @@
 msgstr ""
 
 #: ../menu-data/jcgui:Jc_Gui.desktop.in.h:1
-msgid "Host for jconvolver"
-msgstr "Hostiteľ pre jconvolver"
-
-#: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2
 msgid "Jc_Gui"
 msgstr "Jc_Gui"
 
+#: ../menu-data/jcgui:Jc_Gui.desktop.in.h:2
+msgid "Host for jconvolver"
+msgstr "Hostiteľ pre jconvolver"
+
 #: ../menu-data/jclic:jclic.desktop.in.h:1
 msgid "JClic"
 msgstr ""
@@ -8435,36 +8533,36 @@
 msgid "JD is a 2ch browser based on gtkmm2."
 msgstr ""
 
-#: ../menu-data/jedit:jedit.desktop.in.h:2
+#: ../menu-data/jedit:jedit.desktop.in.h:1
 msgid "jEdit"
 msgstr ""
 
 #: ../menu-data/jeex:jeex.desktop.in.h:1
-msgid "Hexadecimal Editor for Linux"
+msgid "Jeex"
 msgstr ""
 
 #: ../menu-data/jeex:jeex.desktop.in.h:2
-msgid "Jeex"
+msgid "Hexadecimal Editor for Linux"
 msgstr ""
 
 #: ../menu-data/jemboss:jemboss.desktop.in.h:1
-msgid ""
-"Graphical user interface for the European Molecular Biology Open Software "
-"Suite."
+msgid "Jemboss"
 msgstr ""
 
 #: ../menu-data/jemboss:jemboss.desktop.in.h:2
-msgid "Jemboss"
+msgid ""
+"Graphical user interface for the European Molecular Biology Open Software "
+"Suite."
 msgstr ""
 
 #: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:1
-msgid "Calculate Fractions is fun!"
-msgstr "Počítanie zlomkov je zábava!"
-
-#: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2
 msgid "JFractionLab"
 msgstr "JFractionLab"
 
+#: ../menu-data/jfractionlab:JFractionLab.desktop.in.h:2
+msgid "Calculate Fractions is fun!"
+msgstr "Počítanie zlomkov je zábava!"
+
 #: ../menu-data/jftp:jftp.desktop.in.h:1
 msgid "JFTP"
 msgstr ""
@@ -8474,36 +8572,36 @@
 msgstr ""
 
 #: ../menu-data/jhbuild:jhbuild.desktop.in.h:1
-msgid "Build GNOME modules"
+msgid "GNOME Build Tool"
 msgstr ""
 
 #: ../menu-data/jhbuild:jhbuild.desktop.in.h:2
-msgid "GNOME Build Tool"
+msgid "Build GNOME modules"
 msgstr ""
 
 #: ../menu-data/jigzo:jigzo.desktop.in.h:1
-msgid "Photo puzzle game for children"
+msgid "jigzo"
 msgstr ""
 
 #: ../menu-data/jigzo:jigzo.desktop.in.h:2
-msgid "jigzo"
+msgid "Photo puzzle game for children"
 msgstr ""
 
 #: ../menu-data/jkmeter:jkmeter.desktop.in.h:1
-#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1
-msgid "Audio level meter for JACK"
+msgid "Jkmeter"
 msgstr ""
 
 #: ../menu-data/jkmeter:jkmeter.desktop.in.h:2
-msgid "Jkmeter"
+#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2
+msgid "Audio level meter for JACK"
 msgstr ""
 
 #: ../menu-data/jlgui:jlgui.desktop.in.h:1
-msgid "graphical music player"
+msgid "jlGui"
 msgstr ""
 
 #: ../menu-data/jlgui:jlgui.desktop.in.h:2
-msgid "jlGui"
+msgid "graphical music player"
 msgstr ""
 
 #: ../menu-data/jmeter:jmeter.desktop.in.h:1
@@ -8531,19 +8629,19 @@
 msgstr ""
 
 #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:1
-msgid "Audio test signals meter for JACK"
+msgid "Jnoisemeter"
 msgstr ""
 
 #: ../menu-data/jnoisemeter:jnoisemeter.desktop.in.h:2
-msgid "Jnoisemeter"
+msgid "Audio test signals meter for JACK"
 msgstr ""
 
 #: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:1
-msgid "Manage system jobs present on your computer"
+msgid "System Jobs"
 msgstr ""
 
 #: ../menu-data/jobs-admin:jobs-admin.desktop.in.h:2
-msgid "System Jobs"
+msgid "Manage system jobs present on your computer"
 msgstr ""
 
 #: ../menu-data/jockey-gtk:jockey-gtk.desktop.in.h:1
@@ -8565,11 +8663,11 @@
 msgstr ""
 
 #: ../menu-data/josm:josm.desktop.in.h:1
-msgid "Editor for OpenStreetMap.org"
+msgid "Josm"
 msgstr ""
 
 #: ../menu-data/josm:josm.desktop.in.h:2
-msgid "Josm"
+msgid "Editor for OpenStreetMap.org"
 msgstr ""
 
 #: ../menu-data/jovie:kde4__jovieapp.desktop.in.h:1
@@ -8581,43 +8679,43 @@
 msgstr ""
 
 #: ../menu-data/jpilot:jpilot.desktop.in.h:1
-msgid "Desktop organizer application for the Palm Pilot"
+msgid "J-Pilot"
 msgstr ""
 
 #: ../menu-data/jpilot:jpilot.desktop.in.h:2
-msgid "J-Pilot"
+msgid "Desktop organizer application for the Palm Pilot"
 msgstr ""
 
 #: ../menu-data/jscribble:jscribble.desktop.in.h:1
-msgid "Infinite Notepad"
+msgid "jscribble"
 msgstr ""
 
 #: ../menu-data/jscribble:jscribble.desktop.in.h:2
-msgid "jscribble"
+msgid "Infinite Notepad"
 msgstr ""
 
 #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:1
-msgid "Joystick testing and configuration tool"
+msgid "jstest-gtk"
 msgstr ""
 
 #: ../menu-data/jstest-gtk:jstest-gtk.desktop.in.h:2
-msgid "jstest-gtk"
+msgid "Joystick testing and configuration tool"
 msgstr ""
 
 #: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:1
-msgid "File manager for Sony MP3 players"
+msgid "JSymphonic"
 msgstr ""
 
 #: ../menu-data/jsymphonic:jsymphonic.desktop.in.h:2
-msgid "JSymphonic"
+msgid "File manager for Sony MP3 players"
 msgstr ""
 
 #: ../menu-data/juffed:juffed.desktop.in.h:1
-msgid "Advanced text editor"
+msgid "JuffEd text editor"
 msgstr ""
 
 #: ../menu-data/juffed:juffed.desktop.in.h:2
-msgid "JuffEd text editor"
+msgid "Advanced text editor"
 msgstr ""
 
 #: ../menu-data/juk:kde4__juk.desktop.in.h:1
@@ -8633,11 +8731,11 @@
 msgstr ""
 
 #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:1
-msgid "Jump on your opponents to make them explode"
+msgid "Jump'n'Bump"
 msgstr ""
 
 #: ../menu-data/jumpnbump:jumpnbump.desktop.in.h:2
-msgid "Jump'n'Bump"
+msgid "Jump on your opponents to make them explode"
 msgstr ""
 
 #: ../menu-data/jxplorer:jxplorer.desktop.in.h:1
@@ -8657,11 +8755,11 @@
 msgstr ""
 
 #: ../menu-data/k3d:k3d.desktop.in.h:1
-msgid "Free-as-in-freedom 3D modeling and animation software"
+msgid "K-3D"
 msgstr ""
 
 #: ../menu-data/k3d:k3d.desktop.in.h:2
-msgid "K-3D"
+msgid "Free-as-in-freedom 3D modeling and animation software"
 msgstr ""
 
 #: ../menu-data/k3dsurf:k3dsurf.desktop.in.h:1
@@ -8673,19 +8771,19 @@
 msgstr ""
 
 #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:1
-msgid "Directory statistics and disk usage"
+msgid "K4DirStat"
 msgstr ""
 
 #: ../menu-data/k4dirstat:kde4__k4dirstat.desktop.in.h:2
-msgid "K4DirStat"
+msgid "Directory statistics and disk usage"
 msgstr ""
 
 #: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:1
-msgid "DVD9 to DVD5 backup tool"
+msgid "k9copy"
 msgstr ""
 
 #: ../menu-data/k9copy:kde4__k9copy.desktop.in.h:2
-msgid "k9copy"
+msgid "DVD9 to DVD5 backup tool"
 msgstr ""
 
 #: ../menu-data/kabikaboo:kabikaboo.desktop.in.h:1
@@ -8696,24 +8794,20 @@
 msgid "Manage large collections of notes"
 msgstr ""
 
-#: ../menu-data/kaddressbook-mobile:kde4__kaddressbook-mobile.desktop.in.h:1
-msgid "Kontact Touch Contacts"
-msgstr ""
-
 #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:1
-msgid "Contact Manager"
+msgid "KAddressBook"
 msgstr ""
 
 #: ../menu-data/kaddressbook:kde4__kaddressbook.desktop.in.h:2
-msgid "KAddressBook"
+msgid "Contact Manager"
 msgstr ""
 
 #: ../menu-data/kadu:kadu.desktop.in.h:1
-msgid "Gadu-Gadu/XMPP protocol client"
+msgid "Kadu"
 msgstr ""
 
 #: ../menu-data/kadu:kadu.desktop.in.h:2
-msgid "Kadu"
+msgid "Gadu-Gadu/XMPP protocol client"
 msgstr ""
 
 #: ../menu-data/kaffeine:kde4__kaffeine.desktop.in.h:1
@@ -8761,11 +8855,11 @@
 msgstr ""
 
 #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:1
-msgid "Fancy-looking animated application for taking photos from webcam"
+msgid "Kamerka"
 msgstr ""
 
 #: ../menu-data/kamerka:kde4__kamerka.desktop.in.h:2
-msgid "Kamerka"
+msgid "Fancy-looking animated application for taking photos from webcam"
 msgstr ""
 
 #: ../menu-data/kamoso:kde4__kamoso.desktop.in.h:1
@@ -8781,43 +8875,43 @@
 msgstr ""
 
 #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:1
-msgid "KDE Letter Order Game"
+msgid "Kanagram"
 msgstr ""
 
 #: ../menu-data/kanagram:kde4__kanagram.desktop.in.h:2
-msgid "Kanagram"
+msgid "KDE Letter Order Game"
 msgstr ""
 
 #: ../menu-data/kanatest:kanatest.desktop.in.h:1
-msgid "Drill game to learn Japanese kana characters"
+msgid "Kana test"
 msgstr ""
 
 #: ../menu-data/kanatest:kanatest.desktop.in.h:2
-msgid "Kana test"
+msgid "Drill game to learn Japanese kana characters"
 msgstr ""
 
 #: ../menu-data/kanyremote:kanyremote.desktop.in.h:1
-msgid "Bluetooth remote control for KDE"
+msgid "kanyremote"
 msgstr ""
 
 #: ../menu-data/kanyremote:kanyremote.desktop.in.h:2
-msgid "kanyremote"
+msgid "Bluetooth remote control for KDE"
 msgstr ""
 
 #: ../menu-data/kapman:kde4__kapman.desktop.in.h:1
-msgid "Eat pills escaping ghosts"
+msgid "Kapman"
 msgstr ""
 
 #: ../menu-data/kapman:kde4__kapman.desktop.in.h:2
-msgid "Kapman"
+msgid "Eat pills escaping ghosts"
 msgstr ""
 
 #: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:1
-msgid "KAppTemplate"
+msgid "KDE Template Generator"
 msgstr ""
 
 #: ../menu-data/kapptemplate:kde4__kapptemplate.desktop.in.h:2
-msgid "KDE Template Generator"
+msgid "KAppTemplate"
 msgstr ""
 
 #: ../menu-data/kasumi:kasumi.desktop.in.h:1
@@ -8853,27 +8947,27 @@
 msgstr ""
 
 #: ../menu-data/kayali:kayali.desktop.in.h:1
-msgid "A Computer Algebra System"
+msgid "Kayali"
 msgstr ""
 
 #: ../menu-data/kayali:kayali.desktop.in.h:2
-msgid "Kayali"
+msgid "A Computer Algebra System"
 msgstr ""
 
 #: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:1
-msgid "Backup your data with an easy to use user interface"
+msgid "KBackup"
 msgstr ""
 
 #: ../menu-data/kbackup:kde4__kbackup.desktop.in.h:2
-msgid "KBackup"
+msgid "Backup your data with an easy to use user interface"
 msgstr ""
 
 #: ../menu-data/kball:kball.desktop.in.h:1
-msgid "Find the exit"
+msgid "KBall"
 msgstr ""
 
 #: ../menu-data/kball:kball.desktop.in.h:2
-msgid "KBall"
+msgid "Find the exit"
 msgstr ""
 
 #: ../menu-data/kbattleship:kde4__kbattleship.desktop.in.h:1
@@ -8885,11 +8979,11 @@
 msgstr ""
 
 #: ../menu-data/kbedic:kbedic.desktop.in.h:1
-msgid "Bulgarian English dictionary"
+msgid "kbe Dictionary"
 msgstr ""
 
 #: ../menu-data/kbedic:kbedic.desktop.in.h:2
-msgid "kbe Dictionary"
+msgid "Bulgarian English dictionary"
 msgstr ""
 
 #: ../menu-data/kbibtex:kde4__kbibtex.desktop.in.h:1
@@ -8909,35 +9003,35 @@
 msgstr ""
 
 #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:1
-msgid "Falling Blocks Game"
+msgid "KBlocks"
 msgstr ""
 
 #: ../menu-data/kblocks:kde4__kblocks.desktop.in.h:2
-msgid "KBlocks"
+msgid "Falling Blocks Game"
 msgstr ""
 
 #: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:1
-msgid "Ball Bouncing Game"
+msgid "KBounce"
 msgstr ""
 
 #: ../menu-data/kbounce:kde4__kbounce.desktop.in.h:2
-msgid "KBounce"
+msgid "Ball Bouncing Game"
 msgstr ""
 
 #: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:1
-msgid "Breakout-like Game"
+msgid "KBreakOut"
 msgstr ""
 
 #: ../menu-data/kbreakout:kde4__kbreakout.desktop.in.h:2
-msgid "KBreakOut"
+msgid "Breakout-like Game"
 msgstr ""
 
 #: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:1
-msgid "KBruch"
+msgid "Practice exercises with fractions"
 msgstr ""
 
 #: ../menu-data/kbruch:kde4__kbruch.desktop.in.h:2
-msgid "Practice exercises with fractions"
+msgid "KBruch"
 msgstr ""
 
 #: ../menu-data/kcachegrind:kde4__kcachegrind.desktop.in.h:1
@@ -8957,11 +9051,11 @@
 msgstr ""
 
 #: ../menu-data/kcemu:kcemu.desktop.in.h:1
-msgid "Emulator for KC85 and compatible computer"
+msgid "KCemu"
 msgstr ""
 
 #: ../menu-data/kcemu:kcemu.desktop.in.h:2
-msgid "KCemu"
+msgid "Emulator for KC85 and compatible computer"
 msgstr ""
 
 #: ../menu-data/kcharselect:kde4__KCharSelect.desktop.in.h:1
@@ -8973,21 +9067,21 @@
 msgstr ""
 
 #: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:1
-msgid ""
-"A Kicker applet to display how many email messages you have in your Gmail "
-"account."
+msgid "KCheckGMail"
 msgstr ""
 
 #: ../menu-data/kcheckgmail:kde4__kcheckgmail.desktop.in.h:2
-msgid "KCheckGMail"
+msgid ""
+"A Kicker applet to display how many email messages you have in your Gmail "
+"account."
 msgstr ""
 
 #: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:1
-msgid "A viewer of CHM (MS-Help) files"
+msgid "KchmViewer"
 msgstr ""
 
 #: ../menu-data/kchmviewer:kde4__kchmviewer.desktop.in.h:2
-msgid "KchmViewer"
+msgid "A viewer of CHM (MS-Help) files"
 msgstr ""
 
 #: ../menu-data/kcollectd:kde4__kcollectd.desktop.in.h:1
@@ -9015,19 +9109,19 @@
 msgstr ""
 
 #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:1
-msgid "Debug programs"
+msgid "KDbg"
 msgstr ""
 
 #: ../menu-data/kdbg:kde4__kdbg.desktop.in.h:2
-msgid "KDbg"
+msgid "Debug programs"
 msgstr ""
 
 #: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:1
-msgid "Touchpad management"
+msgid "synaptiks"
 msgstr ""
 
 #: ../menu-data/kde-config-touchpad:kde4__synaptiks.desktop.in.h:2
-msgid "synaptiks"
+msgid "Touchpad management"
 msgstr ""
 
 #: ../menu-data/kde-runtime-data:kde4__nepomukbackup.desktop.in.h:1
@@ -9050,21 +9144,21 @@
 msgid "Network Folder Wizard"
 msgstr ""
 
-#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:2
+#: ../menu-data/kde-workspace-bin:kde4__kfontview.desktop.in.h:1
 msgid "KFontView"
 msgstr ""
 
 #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:1
-msgid "A panel applet for resizing and reorientating X screens."
+msgid "KRandRTray"
 msgstr ""
 
 #: ../menu-data/kde-workspace-bin:kde4__krandrtray.desktop.in.h:2
-msgid "KRandRTray"
+msgid "A panel applet for resizing and reorientating X screens."
 msgstr ""
 
-#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:2
-#: ../menu-data/okular:kde4__okular.desktop.in.h:2
-#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:2
+#: ../menu-data/kdegraphics-mobipocket:kde4__okularApplication_mobi.desktop.in.h:1
+#: ../menu-data/okular:kde4__okular.desktop.in.h:1
+#: ../menu-data/okular:kde4__okularApplication_plucker.desktop.in.h:1
 msgid "Okular"
 msgstr "Okular"
 
@@ -9095,41 +9189,46 @@
 msgstr ""
 
 #: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:1
-msgid "Akonadi Tray Utility"
-msgstr "Nástroj pre oznamovaciu oblasť Akonadi"
-
-#: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2
 msgid "Akonaditray"
 msgstr "Akonaditray"
 
-#: ../menu-data/kdepim-wizards:kde4__groupwarewizard.desktop.in.h:1
-msgid "KDE Groupware Wizard"
-msgstr ""
+#: ../menu-data/kdepim-runtime:kde4__akonaditray.desktop.in.h:2
+msgid "Akonadi Tray Utility"
+msgstr "Nástroj pre oznamovaciu oblasť Akonadi"
 
 #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:1
-msgid ""
-"Builds the KDE Platform and associated software from its source code. A "
-"command-line only program."
+msgid "KDE Source Builder"
 msgstr ""
 
 #: ../menu-data/kdesrc-build:kde4__kdesrc-build.desktop.in.h:2
-msgid "KDE Source Builder"
+msgid ""
+"Builds the KDE Platform and associated software from its source code. A "
+"command-line only program."
 msgstr ""
 
 #: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:1
-msgid "A Subversion client for KDE"
+msgid "kdesvn"
 msgstr ""
 
 #: ../menu-data/kdesvn:kde4__kdesvn.desktop.in.h:2
-msgid "kdesvn"
+msgid "A Subversion client for KDE"
 msgstr ""
 
 #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:1
-msgid "Integrated Development Environment"
+msgid "KDevelop 4"
 msgstr ""
 
 #: ../menu-data/kdevelop:kde4__kdevelop.desktop.in.h:2
-msgid "KDevelop 4"
+#: ../menu-data/netbeans:netbeans.desktop.in.h:2
+msgid "Integrated Development Environment"
+msgstr ""
+
+#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:1
+msgid "KDevelop 4 (Pick Session)"
+msgstr ""
+
+#: ../menu-data/kdevelop:kde4__kdevelop_ps.desktop.in.h:2
+msgid "Integrated Development Environment (Pick Session to start with)"
 msgstr ""
 
 #: ../menu-data/kdf:kde4__kdf.desktop.in.h:1
@@ -9149,25 +9248,29 @@
 msgstr ""
 
 #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:1
-msgid "A File And Directory Comparison And Merge Tool"
+msgid "KDiff3"
 msgstr ""
 
 #: ../menu-data/kdiff3:kde4__kdiff3.desktop.in.h:2
-msgid "KDiff3"
+msgid "A File And Directory Comparison And Merge Tool"
 msgstr ""
 
 #: ../menu-data/kdocker:kdocker.desktop.in.h:1
-msgid "Docks any application into system tray"
+msgid "KDocker"
 msgstr ""
 
 #: ../menu-data/kdocker:kdocker.desktop.in.h:2
-msgid "KDocker"
+msgid "Docks any application into system tray"
 msgstr ""
 
 #: ../menu-data/kdrill:kdrill.desktop.in.h:1
 msgid "KDrill"
 msgstr ""
 
+#: ../menu-data/kedpm-gtk:kedpm-gtk.desktop.in.h:1
+msgid "Ked Password Manager"
+msgstr ""
+
 #: ../menu-data/keepass2:keepass2.desktop.in.h:1
 msgid "KeePass2"
 msgstr ""
@@ -9177,11 +9280,11 @@
 msgstr ""
 
 #: ../menu-data/keepassx:keepassx.desktop.in.h:1
-msgid "Cross Platform Password Manager"
+msgid "KeePassX"
 msgstr ""
 
 #: ../menu-data/keepassx:keepassx.desktop.in.h:2
-msgid "KeePassX"
+msgid "Cross Platform Password Manager"
 msgstr ""
 
 #: ../menu-data/kepas:kde4__kepas.desktop.in.h:1
@@ -9201,19 +9304,19 @@
 msgstr ""
 
 #: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:1
-msgid "A currency converter and calculator"
+msgid "KEuroCalc"
 msgstr ""
 
 #: ../menu-data/keurocalc:kde4__keurocalc.desktop.in.h:2
-msgid "KEuroCalc"
+msgid "A currency converter and calculator"
 msgstr ""
 
 #: ../menu-data/kexi:kde4__kexi.desktop.in.h:1
-msgid "Develop desktop database applications"
+msgid "Kexi"
 msgstr ""
 
 #: ../menu-data/kexi:kde4__kexi.desktop.in.h:2
-msgid "Kexi"
+msgid "Develop desktop database applications"
 msgstr ""
 
 #: ../menu-data/keyboardcast:keyboardcast.desktop.in.h:1
@@ -9233,19 +9336,19 @@
 msgstr ""
 
 #: ../menu-data/keysafe:keysafe.desktop.in.h:1
-msgid "A password safe"
+msgid "KeySafe"
 msgstr ""
 
 #: ../menu-data/keysafe:keysafe.desktop.in.h:2
-msgid "KeySafe"
+msgid "A password safe"
 msgstr ""
 
 #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:1
-msgid "Edit keyboard maps for keytouch"
+msgid "KeyTouch Editor"
 msgstr ""
 
 #: ../menu-data/keytouch-editor:keytouch-editor.desktop.in.h:2
-msgid "KeyTouch Editor"
+msgid "Edit keyboard maps for keytouch"
 msgstr ""
 
 #: ../menu-data/kfilereplace:kde4__kfilereplace.desktop.in.h:1
@@ -9269,62 +9372,62 @@
 msgstr ""
 
 #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:1
-msgid "Four-in-a-row Board Game"
+msgid "KFourInLine"
 msgstr ""
 
 #: ../menu-data/kfourinline:kde4__kfourinline.desktop.in.h:2
-msgid "KFourInLine"
+msgid "Four-in-a-row Board Game"
 msgstr ""
 
 #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:1
-msgid ""
-"Access call history and phone book of your Fritz!Box and get notifications "
-"on incoming and outgoing calls."
+msgid "KFritz"
 msgstr ""
 
 #: ../menu-data/kfritz:kde4__kfritz.desktop.in.h:2
-msgid "KFritz"
+msgid ""
+"Access call history and phone book of your Fritz!Box and get notifications "
+"on incoming and outgoing calls."
 msgstr ""
 
 #: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:1
-msgid "A graphical FTP client"
+msgid "KFTPGrabber"
 msgstr ""
 
 #: ../menu-data/kftpgrabber:kde4__kftpgrabber.desktop.in.h:2
-msgid "KFTPGrabber"
+msgid "A graphical FTP client"
 msgstr ""
 
 #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:1
-msgid "A Geography Learning Program"
+msgid "KGeography"
 msgstr ""
 
 #: ../menu-data/kgeography:kde4__kgeography.desktop.in.h:2
-msgid "KGeography"
+msgid "A Geography Learning Program"
 msgstr ""
 
 #: ../menu-data/kget:kde4__kget.desktop.in.h:1
-#: ../menu-data/steadyflow:steadyflow.desktop.in.h:1
-msgid "Download Manager"
+msgid "KGet"
 msgstr ""
 
 #: ../menu-data/kget:kde4__kget.desktop.in.h:2
-msgid "KGet"
+#: ../menu-data/steadyflow:steadyflow.desktop.in.h:1
+msgid "Download Manager"
 msgstr ""
 
 #: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:1
-msgid "A Gmail notifier applet for KDE"
+msgid "KGmailNotifier"
 msgstr ""
 
 #: ../menu-data/kgmailnotifier:kde4__kgmailnotifier.desktop.in.h:2
-msgid "KGmailNotifier"
+msgid "A Gmail notifier applet for KDE"
 msgstr ""
 
 #: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:1
-msgid "A game of action and puzzle-solving"
+msgid "KGoldrunner"
 msgstr ""
 
 #: ../menu-data/kgoldrunner:kde4__KGoldrunner.desktop.in.h:2
-msgid "KGoldrunner"
+msgid "A game of action and puzzle-solving"
 msgstr ""
 
 #: ../menu-data/kgpg:kde4__kgpg.desktop.in.h:1
@@ -9336,27 +9439,27 @@
 msgstr ""
 
 #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:1
-msgid "KGrab"
+msgid "Screen Grabbing Program"
 msgstr ""
 
 #: ../menu-data/kgrab:kde4__kgrab.desktop.in.h:2
-msgid "Screen Grabbing Program"
+msgid "KGrab"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:1
-msgid "A Graphviz dot graph editor for KDE"
+msgid "kgrapheditor"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgrapheditor.desktop.in.h:2
-msgid "kgrapheditor"
+msgid "A Graphviz dot graph editor for KDE"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:1
-msgid "A Graphviz dot graph viewer for KDE"
+msgid "kgraphviewer"
 msgstr ""
 
 #: ../menu-data/kgraphviewer:kde4__kgraphviewer.desktop.in.h:2
-msgid "kgraphviewer"
+msgid "A Graphviz dot graph viewer for KDE"
 msgstr ""
 
 #: ../menu-data/khangman:kde4__khangman.desktop.in.h:1
@@ -9368,11 +9471,11 @@
 msgstr ""
 
 #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:1
-msgid "Convert Khmer between Unicode and legacy Khmer encodings."
+msgid "Khmer Converter"
 msgstr ""
 
 #: ../menu-data/khmerconverter:khmerconverter.desktop.in.h:2
-msgid "Khmer Converter"
+msgid "Convert Khmer between Unicode and legacy Khmer encodings."
 msgstr ""
 
 #: ../menu-data/kicad:kicad.desktop.in.h:1
@@ -9388,32 +9491,32 @@
 msgstr ""
 
 #: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:1
-#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1
-msgid "Audio Tagger"
+msgid "Kid3-qt"
 msgstr ""
 
 #: ../menu-data/kid3-qt:kid3-qt.desktop.in.h:2
-msgid "Kid3-qt"
+#: ../menu-data/kid3:kde4__kid3.desktop.in.h:2
+msgid "Audio Tagger"
 msgstr ""
 
-#: ../menu-data/kid3:kde4__kid3.desktop.in.h:2
+#: ../menu-data/kid3:kde4__kid3.desktop.in.h:1
 msgid "Kid3"
 msgstr ""
 
 #: ../menu-data/kig:kde4__kig.desktop.in.h:1
-msgid "Explore Geometric Constructions"
+msgid "Kig"
 msgstr ""
 
 #: ../menu-data/kig:kde4__kig.desktop.in.h:2
-msgid "Kig"
+msgid "Explore Geometric Constructions"
 msgstr ""
 
 #: ../menu-data/kigo:kde4__kigo.desktop.in.h:1
-msgid "Go Board Game"
+msgid "Kigo"
 msgstr ""
 
 #: ../menu-data/kigo:kde4__kigo.desktop.in.h:2
-msgid "Kigo"
+msgid "Go Board Game"
 msgstr ""
 
 #: ../menu-data/kiki-the-nano-bot:kiki-the-nano-bot.desktop.in.h:1
@@ -9429,11 +9532,11 @@
 msgstr ""
 
 #: ../menu-data/kildclient:kildclient.desktop.in.h:1
-msgid "Connect to MUDs (Multi User Dungeons)"
+msgid "KildClient"
 msgstr ""
 
 #: ../menu-data/kildclient:kildclient.desktop.in.h:2
-msgid "KildClient"
+msgid "Connect to MUDs (Multi User Dungeons)"
 msgstr ""
 
 #: ../menu-data/kile:kde4__kile.desktop.in.h:1
@@ -9449,35 +9552,44 @@
 msgstr ""
 
 #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:1
-msgid "HTML Image Map Editor"
+msgid "KImageMapEditor"
 msgstr ""
 
 #: ../menu-data/kimagemapeditor:kde4__kimagemapeditor.desktop.in.h:2
-msgid "KImageMapEditor"
+msgid "HTML Image Map Editor"
 msgstr ""
 
 #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:1
-msgid "Info Center"
+msgid "KInfoCenter"
 msgstr ""
 
 #: ../menu-data/kinfocenter:kde4__kinfocenter.desktop.in.h:2
-msgid "KInfoCenter"
+msgid "Info Center"
 msgstr ""
 
 #: ../menu-data/kino:Kino.desktop.in.h:1
-msgid "Edit DV video"
-msgstr "Úprava DV videa"
-
-#: ../menu-data/kino:Kino.desktop.in.h:2
 msgid "Kino"
 msgstr "Kino"
 
+#: ../menu-data/kino:Kino.desktop.in.h:2
+msgid "Edit DV video"
+msgstr "Úprava DV videa"
+
 #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:1
-msgid "KDE Image Plugins Interface"
+msgid "KIPI Plugins"
 msgstr ""
 
 #: ../menu-data/kipi-plugins:kde4__kipiplugins.desktop.in.h:2
-msgid "KIPI Plugins"
+msgid "KDE Image Plugins Interface"
+msgstr ""
+
+#. X-DocPath=photolayoutseditor/index.html
+#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:2
+msgid "Photo Layouts Editor"
+msgstr ""
+
+#: ../menu-data/kipi-plugins:kde4__photolayoutseditor.desktop.in.h:3
+msgid "Create beautiful and professional photo layouts from your photos"
 msgstr ""
 
 #: ../menu-data/kiriki:kde4__kiriki.desktop.in.h:1
@@ -9489,11 +9601,11 @@
 msgstr ""
 
 #: ../menu-data/kita2:kde__kita2.desktop.in.h:1
-msgid "2ch client for KDE"
+msgid "Kita2"
 msgstr ""
 
 #: ../menu-data/kita2:kde__kita2.desktop.in.h:2
-msgid "Kita2"
+msgid "2ch client for KDE"
 msgstr ""
 
 #: ../menu-data/kiten:kde4__kiten.desktop.in.h:1
@@ -9505,11 +9617,11 @@
 msgstr ""
 
 #: ../menu-data/kitsune:kitsune.desktop.in.h:1
-msgid "Countdown"
+msgid "Kitsune"
 msgstr ""
 
 #: ../menu-data/kitsune:kitsune.desktop.in.h:2
-msgid "Kitsune"
+msgid "Countdown"
 msgstr ""
 
 #: ../menu-data/kjots:kde4__Kjots.desktop.in.h:1
@@ -9533,11 +9645,11 @@
 msgstr ""
 
 #: ../menu-data/klatexformula:klatexformula.desktop.in.h:1
-msgid "Generate images from LaTeX equations"
+msgid "KLatexFormula"
 msgstr ""
 
 #: ../menu-data/klatexformula:klatexformula.desktop.in.h:2
-msgid "KLatexFormula"
+msgid "Generate images from LaTeX equations"
 msgstr ""
 
 #: ../menu-data/klavaro:klavaro.desktop.in.h:1
@@ -9550,20 +9662,20 @@
 
 #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:1
 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:1
-msgid "Certificate Manager and Unified Crypto GUI"
+msgid "Kleopatra"
 msgstr ""
 
 #: ../menu-data/kleopatra:kde4__kleopatra.desktop.in.h:2
 #: ../menu-data/kleopatra:kde4__kleopatra_import.desktop.in.h:2
-msgid "Kleopatra"
+msgid "Certificate Manager and Unified Crypto GUI"
 msgstr ""
 
 #: ../menu-data/klettres:kde4__klettres.desktop.in.h:1
-msgid "KLettres"
+msgid "a KDE program to learn the alphabet"
 msgstr ""
 
 #: ../menu-data/klettres:kde4__klettres.desktop.in.h:2
-msgid "a KDE program to learn the alphabet"
+msgid "KLettres"
 msgstr ""
 
 #: ../menu-data/klickety:kde4__klickety.desktop.in.h:1
@@ -9571,19 +9683,19 @@
 msgstr ""
 
 #: ../menu-data/klickety:kde4__ksame.desktop.in.h:1
-msgid "Board Game"
-msgstr "Stolná hra"
-
-#: ../menu-data/klickety:kde4__ksame.desktop.in.h:2
 msgid "SameGame"
 msgstr "SameGame"
 
+#: ../menu-data/klickety:kde4__ksame.desktop.in.h:2
+msgid "Board Game"
+msgstr "Stolná hra"
+
 #: ../menu-data/klines:kde4__klines.desktop.in.h:1
-msgid "Kolor Lines"
+msgid "Tactical Game"
 msgstr ""
 
 #: ../menu-data/klines:kde4__klines.desktop.in.h:2
-msgid "Tactical Game"
+msgid "Kolor Lines"
 msgstr ""
 
 #: ../menu-data/klinkstatus:kde4__klinkstatus.desktop.in.h:1
@@ -9595,19 +9707,19 @@
 msgstr ""
 
 #: ../menu-data/klipper:kde4__klipper.desktop.in.h:1
-msgid "A cut & paste history utility"
+msgid "Klipper"
 msgstr ""
 
 #: ../menu-data/klipper:kde4__klipper.desktop.in.h:2
-msgid "Klipper"
+msgid "A cut & paste history utility"
 msgstr ""
 
 #: ../menu-data/klog:kde4__klog.desktop.in.h:1
-msgid "KDE Ham Radio logging program"
+msgid "KLog"
 msgstr ""
 
 #: ../menu-data/klog:kde4__klog.desktop.in.h:2
-msgid "KLog"
+msgid "KDE Ham Radio logging program"
 msgstr ""
 
 #: ../menu-data/kluppe:kluppe.desktop.in.h:1
@@ -9635,7 +9747,7 @@
 msgstr "Hra Mahjongg pre jedného hráča"
 
 #: ../menu-data/kmail-mobile:kde4__kmail-mobile.desktop.in.h:1
-msgid "Kontact Touch Mail"
+msgid "Mail"
 msgstr ""
 
 #: ../menu-data/kmail:kde4__KMail2.desktop.in.h:1
@@ -9667,19 +9779,19 @@
 msgstr ""
 
 #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:1
-msgid "KDE MIDI Metronome Using ALSA Sequencer"
+msgid "KMetronome"
 msgstr ""
 
 #: ../menu-data/kmetronome:kde4__kmetronome.desktop.in.h:2
-msgid "KMetronome"
+msgid "KDE MIDI Metronome Using ALSA Sequencer"
 msgstr ""
 
 #: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:1
-msgid "ALSA Sequencer MIDI monitor"
+msgid "KMidimon"
 msgstr ""
 
 #: ../menu-data/kmidimon:kde4__kmidimon.desktop.in.h:2
-msgid "KMidimon"
+msgid "ALSA Sequencer MIDI monitor"
 msgstr ""
 
 #: ../menu-data/kmines:kde4__kmines.desktop.in.h:1
@@ -9691,19 +9803,19 @@
 msgstr ""
 
 #: ../menu-data/kmix:kde4__kmix.desktop.in.h:1
-msgid "KMix"
+msgid "Sound Mixer"
 msgstr ""
 
 #: ../menu-data/kmix:kde4__kmix.desktop.in.h:2
-msgid "Sound Mixer"
+msgid "KMix"
 msgstr ""
 
 #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:1
-msgid "An MLDonkey frontend for KDE"
+msgid "KMLDonkey"
 msgstr ""
 
 #: ../menu-data/kmldonkey:kde4__kmldonkey.desktop.in.h:2
-msgid "KMLDonkey"
+msgid "An MLDonkey frontend for KDE"
 msgstr ""
 
 #: ../menu-data/kmousetool:kde4__kmousetool.desktop.in.h:1
@@ -9763,11 +9875,11 @@
 msgstr ""
 
 #: ../menu-data/knights:kde4__knights.desktop.in.h:1
-msgid "Chess game"
+msgid "Knights"
 msgstr ""
 
 #: ../menu-data/knights:kde4__knights.desktop.in.h:2
-msgid "Knights"
+msgid "Chess game"
 msgstr ""
 
 #: ../menu-data/knode:kde4__KNode.desktop.in.h:1
@@ -9779,23 +9891,23 @@
 msgstr ""
 
 #: ../menu-data/knotes-mobile:kde4__notes-mobile.desktop.in.h:1
-msgid "Kontact Touch Notes"
+msgid "Notes"
 msgstr ""
 
 #: ../menu-data/knotes:kde4__knotes.desktop.in.h:1
-msgid "KNotes"
+msgid "Popup Notes"
 msgstr ""
 
 #: ../menu-data/knotes:kde4__knotes.desktop.in.h:2
-msgid "Popup Notes"
+msgid "KNotes"
 msgstr ""
 
 #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:1
-msgid "Destroy enemy bases in space"
+msgid "Kobo Deluxe"
 msgstr ""
 
 #: ../menu-data/kobodeluxe:kobodeluxe.desktop.in.h:2
-msgid "Kobo Deluxe"
+msgid "Destroy enemy bases in space"
 msgstr ""
 
 #: ../menu-data/kodos:kodos.desktop.in.h:1
@@ -9819,11 +9931,11 @@
 msgstr ""
 
 #: ../menu-data/kollision:kde4__kollision.desktop.in.h:1
-msgid "A simple ball dodging game"
+msgid "Kollision"
 msgstr ""
 
 #: ../menu-data/kollision:kde4__kollision.desktop.in.h:2
-msgid "Kollision"
+msgid "A simple ball dodging game"
 msgstr ""
 
 #: ../menu-data/kolourpaint4:kde4__kolourpaint.desktop.in.h:1
@@ -9835,35 +9947,35 @@
 msgstr ""
 
 #: ../menu-data/komparator:kde4__komparator4.desktop.in.h:1
-msgid "A KDE Directory Synchronization Application"
+msgid "Komparator4"
 msgstr ""
 
 #: ../menu-data/komparator:kde4__komparator4.desktop.in.h:2
-msgid "Komparator4"
+msgid "A KDE Directory Synchronization Application"
 msgstr ""
 
 #: ../menu-data/kompare:kde4__kompare.desktop.in.h:1
-msgid "Diff/Patch Frontend"
+msgid "Kompare"
 msgstr ""
 
 #: ../menu-data/kompare:kde4__kompare.desktop.in.h:2
-msgid "Kompare"
+msgid "Diff/Patch Frontend"
 msgstr ""
 
 #: ../menu-data/kompozer:kompozer.desktop.in.h:1
-msgid "Create Web Pages"
+msgid "KompoZer"
 msgstr ""
 
 #: ../menu-data/kompozer:kompozer.desktop.in.h:2
-msgid "KompoZer"
+msgid "Create Web Pages"
 msgstr ""
 
 #: ../menu-data/konquest:kde4__konquest.desktop.in.h:1
-msgid "Galactic Strategy Game"
+msgid "Konquest"
 msgstr ""
 
 #: ../menu-data/konquest:kde4__konquest.desktop.in.h:2
-msgid "Konquest"
+msgid "Galactic Strategy Game"
 msgstr ""
 
 #: ../menu-data/konsole:kde4__konsole.desktop.in.h:1
@@ -9899,17 +10011,17 @@
 msgstr ""
 
 #: ../menu-data/kopete:kde4__kopete.desktop.in.h:1
-#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1
-#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1
-msgid "Instant Messenger"
+msgid "Kopete"
 msgstr ""
 
 #: ../menu-data/kopete:kde4__kopete.desktop.in.h:2
-msgid "Kopete"
+#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2
+#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2
+msgid "Instant Messenger"
 msgstr ""
 
 #: ../menu-data/korganizer-mobile:kde4__korganizer-mobile.desktop.in.h:1
-msgid "Kontact Touch Calendar"
+msgid "Calendar"
 msgstr ""
 
 #: ../menu-data/korganizer:kde4__korganizer-import.desktop.in.h:1
@@ -9923,11 +10035,11 @@
 msgstr ""
 
 #: ../menu-data/koules:koules.desktop.in.h:1
-msgid "Push your enemies away, but stay away from obstacles"
+msgid "koules"
 msgstr ""
 
 #: ../menu-data/koules:koules.desktop.in.h:2
-msgid "koules"
+msgid "Push your enemies away, but stay away from obstacles"
 msgstr ""
 
 #: ../menu-data/kover:kde4__kover.desktop.in.h:1
@@ -9946,14 +10058,6 @@
 msgid "Patience Card Game"
 msgstr ""
 
-#: ../menu-data/kphone:kphone.desktop.in.h:1
-msgid "Kphone"
-msgstr ""
-
-#: ../menu-data/kphone:kphone.desktop.in.h:2
-msgid "Voice over IP (VoIP) phone application"
-msgstr ""
-
 #: ../menu-data/kphotoalbum:kde4__kphotoalbum.desktop.in.h:1
 msgid "KPhotoAlbum"
 msgstr ""
@@ -9966,12 +10070,7 @@
 msgid "KPlato"
 msgstr ""
 
-#: ../menu-data/kplato:kde4__kplato.desktop.in.h:2
-#: ../menu-data/planner:planner.desktop.in.h:2
-msgid "Project Management"
-msgstr ""
-
-#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:1
+#: ../menu-data/kplayer:kde4__kplayer.desktop.in.h:2
 msgid "KPlayer"
 msgstr ""
 
@@ -9987,16 +10086,12 @@
 msgid "KPresenter"
 msgstr ""
 
-#: ../menu-data/kpresenter:kde4__kpresenter.desktop.in.h:2
-msgid "Write presentation documents"
-msgstr ""
-
 #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:1
-msgid "V4L/V4L2-Radio Application for KDE4"
+msgid "kradio4"
 msgstr ""
 
 #: ../menu-data/kradio4:kde4__kradio4.desktop.in.h:2
-msgid "kradio4"
+msgid "V4L/V4L2-Radio Application for KDE4"
 msgstr ""
 
 #: ../menu-data/kradioripper:kde4__kradioripper.desktop.in.h:1
@@ -10064,30 +10159,33 @@
 msgstr "Stolná hra Reversi"
 
 #: ../menu-data/krfb:kde4__krfb.desktop.in.h:1
-#: ../menu-data/vino:vino-preferences.desktop.in.h:2
-msgid "Desktop Sharing"
-msgstr "Zdieľanie plochy"
-
-#: ../menu-data/krfb:kde4__krfb.desktop.in.h:2
 msgid "Krfb"
 msgstr "Krfb"
 
-#: ../menu-data/krita:kde4__krita.desktop.in.h:1
-msgid "Edit and paint images"
-msgstr "Úprava a kreslenie obrázkov"
+#: ../menu-data/krfb:kde4__krfb.desktop.in.h:2
+#: ../menu-data/vino:vino-preferences.desktop.in.h:1
+msgid "Desktop Sharing"
+msgstr "Zdieľanie plochy"
 
-#: ../menu-data/krita:kde4__krita.desktop.in.h:2
+#: ../menu-data/krita:kde4__krita.desktop.in.h:1
+#: ../menu-data/krita:kde4__krita_odg.desktop.in.h:1
+#: ../menu-data/krita:kde4__krita_psd.desktop.in.h:1
 msgid "Krita"
 msgstr "Krita"
 
-#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1
-msgid "KRuler"
-msgstr "KRuler"
+#: ../menu-data/krita:kde4__krita.desktop.in.h:2
+msgid "Edit and paint images"
+msgstr "Úprava a kreslenie obrázkov"
 
-#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2
+#: ../menu-data/kruler:kde4__kruler.desktop.in.h:1
+#: ../menu-data/screenruler:screenruler.desktop.in.h:1
 msgid "Screen Ruler"
 msgstr "Pravítko na obrazovke"
 
+#: ../menu-data/kruler:kde4__kruler.desktop.in.h:2
+msgid "KRuler"
+msgstr "KRuler"
+
 #: ../menu-data/krusader:kde4__krusader.desktop.in.h:1
 msgid "Krusader"
 msgstr "Krusader"
@@ -10100,6 +10198,14 @@
 msgid "KsCD"
 msgstr "KsCD"
 
+#: ../menu-data/kscope:kscope.desktop.in.h:1
+msgid "KScope"
+msgstr ""
+
+#: ../menu-data/kscope:kscope.desktop.in.h:2
+msgid "Source editing environment"
+msgstr ""
+
 #: ../menu-data/kseg:kseg.desktop.in.h:1
 msgid "KSeg Geometry Sketchpad"
 msgstr ""
@@ -10117,13 +10223,13 @@
 msgstr "Hra Shisen-Sho s tehličkami podobná Mahjongg"
 
 #: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:1
-msgid "An advanced shut down utility"
-msgstr "Pokročilý nástroj na vypínanie"
-
-#: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2
 msgid "KShutdown"
 msgstr "KShutdown"
 
+#: ../menu-data/kshutdown:kde4__kshutdown.desktop.in.h:2
+msgid "An advanced shut down utility"
+msgstr "Pokročilý nástroj na vypínanie"
+
 #: ../menu-data/ksirk:kde4__ksirk.desktop.in.h:1
 msgid "KsirK"
 msgstr "KsirK"
@@ -10133,13 +10239,13 @@
 msgstr "Strategická hra o ovládnutí sveta"
 
 #: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:1
-msgid "KSnapshot"
-msgstr "KSnapshot"
-
-#: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2
 msgid "Screen Capture Program"
 msgstr "Nástroj na zachytávanie snímok obrazovky"
 
+#: ../menu-data/ksnapshot:kde4__ksnapshot.desktop.in.h:2
+msgid "KSnapshot"
+msgstr "KSnapshot"
+
 #: ../menu-data/kspaceduel:kde4__kspaceduel.desktop.in.h:1
 msgid "KSpaceDuel"
 msgstr "KSpaceDuel"
@@ -10152,32 +10258,28 @@
 msgid "KSpread"
 msgstr "KSpread"
 
-#: ../menu-data/kspread:kde4__kspread.desktop.in.h:2
-msgid "Write spreadsheet documents"
-msgstr ""
-
 #: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:1
-msgid "Connect the dots to create squares"
-msgstr "Hra o vytváraní štvorčekov spájaním bodiek"
-
-#: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2
 msgid "KSquares"
 msgstr "KSquares"
 
-#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:1
-msgid "Enter passphrase to authenticate to the ssh agent"
-msgstr "Autentifikácia u ssh agenta zadaním hesla"
+#: ../menu-data/ksquares:kde4__ksquares.desktop.in.h:2
+msgid "Connect the dots to create squares"
+msgstr "Hra o vytváraní štvorčekov spájaním bodiek"
 
-#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2
+#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:1
 msgid "SSH AskPass"
 msgstr "SSH AskPass"
 
+#: ../menu-data/ksshaskpass:kde4__ksshaskpass.desktop.in.h:2
+msgid "Enter passphrase to authenticate to the ssh agent"
+msgstr "Autentifikácia u ssh agenta zadaním hesla"
+
 #: ../menu-data/kst:kst.desktop.in.h:1
-msgid "Data Viewer"
+msgid "Kst"
 msgstr ""
 
 #: ../menu-data/kst:kst.desktop.in.h:2
-msgid "Kst"
+msgid "Data Viewer"
 msgstr ""
 
 #: ../menu-data/kstars:kde4__kstars.desktop.in.h:1
@@ -10229,7 +10331,7 @@
 msgstr ""
 
 #: ../menu-data/ktikz:kde4__ktikz.desktop.in.h:2
-#: ../menu-data/qtikz:qtikz.desktop.in.h:1
+#: ../menu-data/qtikz:qtikz.desktop.in.h:2
 msgid "Program for creating TikZ (from the LaTeX pgf package) diagrams"
 msgstr ""
 
@@ -10250,35 +10352,35 @@
 msgstr "Osobný sledovač času"
 
 #: ../menu-data/ktoon:ktoon.desktop.in.h:1
-msgid "Animation"
+msgid "KToon"
 msgstr ""
 
 #: ../menu-data/ktoon:ktoon.desktop.in.h:2
-msgid "KToon"
+msgid "Animation"
 msgstr ""
 
 #: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:1
-msgid "A BitTorrent program for KDE"
-msgstr "Program pre sieť BitTorrent pre KDE"
-
-#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2
 msgid "KTorrent"
 msgstr "KTorrent"
 
-#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:1
-msgid "KTouch"
-msgstr "KTouch"
+#: ../menu-data/ktorrent:kde4__ktorrent.desktop.in.h:2
+msgid "A BitTorrent program for KDE"
+msgstr "Program pre sieť BitTorrent pre KDE"
 
-#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:2
+#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:1
 msgid "Touch Typing Tutor"
 msgstr "Výuka písania na klávesnici"
 
+#: ../menu-data/ktouch:kde4__ktouch.desktop.in.h:2
+msgid "KTouch"
+msgstr "KTouch"
+
 #: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:1
-msgid "KSnake"
+msgid "Snake-like Game"
 msgstr ""
 
 #: ../menu-data/ktron:kde4__kdesnake.desktop.in.h:2
-msgid "Snake-like Game"
+msgid "KSnake"
 msgstr ""
 
 #: ../menu-data/ktron:kde4__ktron.desktop.in.h:1
@@ -10286,29 +10388,29 @@
 msgstr ""
 
 #: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:1
-msgid "Picture Game for Children"
-msgstr "Obbrázková hra pre deti"
-
-#: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:2
 msgid "Potato Guy"
 msgstr "Zemiakový chlapík"
 
-#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1
-msgid "Educational Programming Environment"
-msgstr "Prostredie na výuku programovania"
+#: ../menu-data/ktuberling:kde4__ktuberling.desktop.in.h:2
+msgid "Picture Game for Children"
+msgstr "Obbrázková hra pre deti"
 
-#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2
+#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:1
 msgid "KTurtle"
 msgstr "KTurtle"
 
-#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:1
-msgid "A 3-D game based on Rubik's Cube"
-msgstr "3-D hra na základe rubikovej kocky"
+#: ../menu-data/kturtle:kde4__kturtle.desktop.in.h:2
+msgid "Educational Programming Environment"
+msgstr "Prostredie na výuku programovania"
 
-#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:2
+#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:1
 msgid "Kubrick"
 msgstr "Kubrick"
 
+#: ../menu-data/kubrick:kde4__kubrick.desktop.in.h:2
+msgid "A 3-D game based on Rubik's Cube"
+msgstr "3-D hra na základe rubikovej kocky"
+
 #: ../menu-data/kuiviewer:kde4__kuiviewer.desktop.in.h:1
 msgid "KUIViewer"
 msgstr "KUIViewer"
@@ -10318,11 +10420,11 @@
 msgstr "Qt Designer - prehliadač súborov s používateľským rozhraním"
 
 #: ../menu-data/kupfer:kupfer.desktop.in.h:1
-msgid "Convenient command and access tool for applications and documents"
+msgid "Kupfer"
 msgstr ""
 
 #: ../menu-data/kupfer:kupfer.desktop.in.h:2
-msgid "Kupfer"
+msgid "Convenient command and access tool for applications and documents"
 msgstr ""
 
 #: ../menu-data/kuser:kde4__kuser.desktop.in.h:1
@@ -10334,27 +10436,27 @@
 msgstr "Správca používateľov"
 
 #: ../menu-data/kvirc:kvirc.desktop.in.h:1
-msgid "Connect to Internet Relay Chat"
+msgid "KVIrc"
 msgstr ""
 
 #: ../menu-data/kvirc:kvirc.desktop.in.h:2
-msgid "KVIrc"
+msgid "Connect to Internet Relay Chat"
 msgstr ""
 
 #: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:1
-msgid "A virtual keyboard for KDE"
-msgstr "Virtuálna klávesnica pre KDE"
-
-#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2
 msgid "Kvkbd"
 msgstr "Kvkbd"
 
+#: ../menu-data/kvkbd:kde4__kvkbd.desktop.in.h:2
+msgid "A virtual keyboard for KDE"
+msgstr "Virtuálna klávesnica pre KDE"
+
 #: ../menu-data/kvpm:kvpm.desktop.in.h:1
-msgid "KDE Volume Partition Manager"
+msgid "KVPM"
 msgstr ""
 
 #: ../menu-data/kvpm:kvpm.desktop.in.h:2
-msgid "KVPM"
+msgid "KDE Volume Partition Manager"
 msgstr ""
 
 #: ../menu-data/kvpnc:kde4__kvpnc.desktop.in.h:1
@@ -10374,13 +10476,13 @@
 msgstr "Nástroj na správu peňaženky"
 
 #: ../menu-data/kwave:kde4__kwave.desktop.in.h:1
-msgid "A sound editor for KDE"
-msgstr "Editor zvuku pre KDE"
-
-#: ../menu-data/kwave:kde4__kwave.desktop.in.h:2
 msgid "Kwave Sound Editor"
 msgstr "Kwave - editor zvuku"
 
+#: ../menu-data/kwave:kde4__kwave.desktop.in.h:2
+msgid "A sound editor for KDE"
+msgstr "Editor zvuku pre KDE"
+
 #: ../menu-data/kword:kde4__kword.desktop.in.h:1
 msgid "KWord"
 msgstr "KWord"
@@ -10397,16 +10499,16 @@
 msgid "KWordQuiz"
 msgstr "KWordQuiz"
 
-#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:1
+#: ../menu-data/kwrite:kde4__kwrite.desktop.in.h:2
 msgid "KWrite"
 msgstr "KWrite"
 
 #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:1
-msgid "Application for recording x11 windows"
+msgid "kx11grab"
 msgstr ""
 
 #: ../menu-data/kx11grab:kde4__kx11grab.desktop.in.h:2
-msgid "kx11grab"
+msgid "Application for recording x11 windows"
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2TP-Ipsec-VPN-Manager.desktop.in.h:1
@@ -10418,11 +10520,11 @@
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:1
-msgid "Control your L2TP IPsec VPN connections"
+msgid "L2TP Ipsec VPN Applet"
 msgstr ""
 
 #: ../menu-data/l2tp-ipsec-vpn:L2tpIPsecVpn-Applet.desktop.in.h:2
-msgid "L2TP Ipsec VPN Applet"
+msgid "Control your L2TP IPsec VPN connections"
 msgstr ""
 
 #: ../menu-data/laby:laby.desktop.in.h:1
@@ -10442,38 +10544,38 @@
 msgstr ""
 
 #: ../menu-data/laditools:ladiconf.desktop.in.h:1
-msgid "JACK and LASH control application configuration"
+msgid "Linux Audio Configuration"
 msgstr ""
 
 #: ../menu-data/laditools:ladiconf.desktop.in.h:2
-msgid "Linux Audio Configuration"
+msgid "JACK and LASH control application configuration"
 msgstr ""
 
 #: ../menu-data/laditools:laditray.desktop.in.h:1
-msgid "JACK and LASH control tray application"
+msgid "LADITray"
 msgstr ""
 
 #: ../menu-data/laditools:laditray.desktop.in.h:2
-msgid "LADITray"
+msgid "JACK and LASH control tray application"
 msgstr ""
 
 #: ../menu-data/landell:landell.desktop.in.h:1
-msgid "Audio and video streams manager"
+msgid "Landell"
 msgstr ""
 
 #: ../menu-data/landell:landell.desktop.in.h:2
-msgid "Landell"
+msgid "Audio and video streams manager"
 msgstr ""
 
 #: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:1
+msgid "Language Support"
+msgstr "Jazyková podpora"
+
+#: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2
 msgid "Configure multiple and native language support on your system"
 msgstr ""
 "Nastavte na svojom systéme podporu svojho jazyka alebo viacerých jazykov"
 
-#: ../menu-data/language-selector-gnome:language-selector.desktop.in.h:2
-msgid "Language Support"
-msgstr "Jazyková podpora"
-
 #: ../menu-data/lastfm:lastfm.desktop.in.h:1
 msgid "Last.fm"
 msgstr ""
@@ -10491,35 +10593,35 @@
 msgstr ""
 
 #: ../menu-data/latexdraw:latexdraw.desktop.in.h:1
-msgid "Graphical editor for PSTricks"
+msgid "LaTeXDraw"
 msgstr ""
 
 #: ../menu-data/latexdraw:latexdraw.desktop.in.h:2
-msgid "LaTeXDraw"
+msgid "Graphical editor for PSTricks"
 msgstr ""
 
 #: ../menu-data/latexila-data:latexila.desktop.in.h:1
-msgid "Edit LaTeX documents"
+msgid "LaTeXila"
 msgstr ""
 
 #: ../menu-data/latexila-data:latexila.desktop.in.h:2
-msgid "LaTeXila"
+msgid "Edit LaTeX documents"
 msgstr ""
 
-#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:1
-msgid "Lazarus (0.9.30)"
+#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:1
+msgid "Lazarus (0.9.30.2)"
 msgstr ""
 
-#: ../menu-data/lazarus-ide-0.9.30:lazarus-0.9.30.desktop.in.h:2
-msgid "Lazarus IDE (0.9.30)"
+#: ../menu-data/lazarus-ide-0.9.30.2:lazarus-0.9.30.2.desktop.in.h:2
+msgid "Lazarus IDE (0.9.30.2)"
 msgstr ""
 
 #: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:1
-msgid "A ball-and-paddle game with nice graphics."
+msgid "LBreakout2"
 msgstr ""
 
 #: ../menu-data/lbreakout2:lbreakout2.desktop.in.h:2
-msgid "LBreakout2"
+msgid "A ball-and-paddle game with nice graphics."
 msgstr ""
 
 #: ../menu-data/lcrt:lcrt.desktop.in.h:1
@@ -10531,32 +10633,32 @@
 msgstr "Leafpad"
 
 #: ../menu-data/lebiniou:lebiniou.desktop.in.h:1
-msgid "Displays images that evolve with sound"
+msgid "Le Biniou"
 msgstr ""
 
 #: ../menu-data/lebiniou:lebiniou.desktop.in.h:2
-msgid "Le Biniou"
+msgid "Displays images that evolve with sound"
 msgstr ""
 
 #: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:1
-#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1
-msgid "A Wordpress blog client"
+msgid "Lekhonee Gnome"
 msgstr ""
 
 #: ../menu-data/lekhonee-gnome:lekhonee-gnome.desktop.in.h:2
-msgid "Lekhonee Gnome"
+#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:2
+msgid "A Wordpress blog client"
 msgstr ""
 
-#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:2
+#: ../menu-data/lekhonee-kde:lekhonee.desktop.in.h:1
 msgid "Lekhonee"
 msgstr ""
 
 #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:1
-msgid "Lemon Point of sale"
+msgid "lemon"
 msgstr ""
 
 #: ../menu-data/lemonpos:kde4__lemon.desktop.in.h:2
-msgid "lemon"
+msgid "Lemon Point of sale"
 msgstr ""
 
 #: ../menu-data/lernid:lernid.desktop.in.h:1
@@ -10588,11 +10690,11 @@
 msgstr ""
 
 #: ../menu-data/librecad:librecad.desktop.in.h:1
-msgid "A professional CAD System"
+msgid "LibreCAD"
 msgstr ""
 
 #: ../menu-data/librecad:librecad.desktop.in.h:2
-msgid "LibreCAD"
+msgid "A professional CAD System"
 msgstr ""
 
 #: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:1
@@ -10605,22 +10707,14 @@
 "information by using Base."
 msgstr ""
 
-#: ../menu-data/libreoffice-base:libreoffice-base.desktop.in.h:3
-msgid "New Database"
-msgstr ""
-
 #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:1
 msgid "LibreOffice Calc"
 msgstr ""
 
 #: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:2
-msgid "New Spreadsheet"
-msgstr ""
-
-#: ../menu-data/libreoffice-calc:libreoffice-calc.desktop.in.h:3
 msgid ""
-"Perform calculation, analyze information and manage lists in spreadsheets by "
-"using Calc."
+"Perform calculations, analyze information and manage lists in spreadsheets "
+"by using Calc."
 msgstr ""
 
 #: ../menu-data/libreoffice-common:libreoffice-startcenter.desktop.in.h:1
@@ -10634,84 +10728,76 @@
 msgstr ""
 
 #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:1
-msgid "Create and edit drawings, flow charts, and logos by using Draw."
+msgid "LibreOffice Draw"
 msgstr ""
 
 #: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:2
-msgid "LibreOffice Draw"
+msgid "Create and edit drawings, flow charts, and logos by using Draw."
 msgstr ""
 
-#: ../menu-data/libreoffice-draw:libreoffice-draw.desktop.in.h:3
-msgid "New Drawing"
+#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:1
+msgid "LibreOffice Impress"
 msgstr ""
 
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:1
+#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2
 msgid ""
 "Create and edit presentations for slideshows, meeting and Web pages by using "
 "Impress."
 msgstr ""
 
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:2
-msgid "LibreOffice Impress"
-msgstr ""
-
-#: ../menu-data/libreoffice-impress:libreoffice-impress.desktop.in.h:3
-msgid "New Presentation"
-msgstr ""
-
 #: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:1
-msgid "Create and edit scientific formulas and equations by using Math."
+msgid "LibreOffice Math"
 msgstr ""
 
 #: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:2
-msgid "LibreOffice Math"
+msgid "Create and edit scientific formulas and equations by using Math."
 msgstr ""
 
-#: ../menu-data/libreoffice-math:libreoffice-math.desktop.in.h:3
-msgid "New Formula"
+#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:1
+msgid "LibreOffice Writer"
 msgstr ""
 
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:1
+#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages by using Writer."
 msgstr ""
 
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:2
-msgid "LibreOffice Writer"
-msgstr ""
-
-#: ../menu-data/libreoffice-writer:libreoffice-writer.desktop.in.h:3
-msgid "New Document"
-msgstr ""
-
-#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:2
-#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:2
+#: ../menu-data/licq-plugin-kde4:kde4__licq.desktop.in.h:1
+#: ../menu-data/licq-plugin-qt4:licq.desktop.in.h:1
 msgid "Licq"
 msgstr ""
 
 #: ../menu-data/lifeograph:lifeograph.desktop.in.h:1
-msgid "Keep a private journal of your life"
+msgid "Lifeograph"
 msgstr ""
 
 #: ../menu-data/lifeograph:lifeograph.desktop.in.h:2
-msgid "Lifeograph"
+msgid "Keep a private journal of your life"
 msgstr ""
 
 #: ../menu-data/liferea:liferea.desktop.in.h:1
-msgid "Download and view feeds"
+msgid "Liferea Feed Reader"
 msgstr ""
 
 #: ../menu-data/liferea:liferea.desktop.in.h:2
-msgid "Liferea Feed Reader"
+msgid "Download and view feeds"
+msgstr ""
+
+#: ../menu-data/lightsoff:lightsoff.desktop.in.h:1
+msgid "Lights Off"
+msgstr ""
+
+#: ../menu-data/lightsoff:lightsoff.desktop.in.h:2
+msgid "Turn off all the lights"
 msgstr ""
 
 #: ../menu-data/lightspark:lightspark.desktop.in.h:1
-msgid "An alternative flash player"
+msgid "Lightspark"
 msgstr ""
 
 #: ../menu-data/lightspark:lightspark.desktop.in.h:2
-msgid "Lightspark"
+msgid "An alternative flash player"
 msgstr ""
 
 #: ../menu-data/lightyears:lightyears.desktop.in.h:1
@@ -10743,11 +10829,11 @@
 msgstr ""
 
 #: ../menu-data/lingot:lingot.desktop.in.h:1
-msgid "LINGOT Is Not a Guitar-Only Tuner"
+msgid "Lingot"
 msgstr ""
 
 #: ../menu-data/lingot:lingot.desktop.in.h:2
-msgid "Lingot"
+msgid "LINGOT Is Not a Guitar-Only Tuner"
 msgstr ""
 
 #: ../menu-data/links2:links2.desktop.in.h:1
@@ -10766,7 +10852,7 @@
 msgid "Linphone is a web-phone"
 msgstr ""
 
-#: ../menu-data/linpsk:linpsk.desktop.in.h:2
+#: ../menu-data/linpsk:linpsk.desktop.in.h:1
 msgid "Linpsk"
 msgstr ""
 
@@ -10787,19 +10873,19 @@
 msgstr ""
 
 #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:1
-msgid "A file-sharing client for the Direct Connect network"
+msgid "LinuxDC++"
 msgstr ""
 
 #: ../menu-data/linuxdcpp:linuxdcpp.desktop.in.h:2
-msgid "LinuxDC++"
+msgid "A file-sharing client for the Direct Connect network"
 msgstr ""
 
 #: ../menu-data/liquidwar:liquidwar.desktop.in.h:1
-msgid "A unique multiplayer wargame"
+msgid "Liquid War"
 msgstr ""
 
 #: ../menu-data/liquidwar:liquidwar.desktop.in.h:2
-msgid "Liquid War"
+msgid "A unique multiplayer wargame"
 msgstr ""
 
 #: ../menu-data/listen:listen.desktop.in.h:1
@@ -10811,27 +10897,27 @@
 msgstr ""
 
 #: ../menu-data/literki:literki.desktop.in.h:1
-msgid "Hacker's keyboard"
+msgid "Literki"
 msgstr ""
 
 #: ../menu-data/literki:literki.desktop.in.h:2
-msgid "Literki"
+msgid "Hacker's keyboard"
 msgstr ""
 
 #: ../menu-data/littlewizard:littlewizard.desktop.in.h:1
-msgid "Development environment for children"
+msgid "Little Wizard"
 msgstr ""
 
 #: ../menu-data/littlewizard:littlewizard.desktop.in.h:2
-msgid "Little Wizard"
+msgid "Development environment for children"
 msgstr ""
 
 #: ../menu-data/live-magic:live-magic.desktop.in.h:1
-msgid "Create Debian Live systems (LiveCDs, etc.)"
+msgid "Live Magic"
 msgstr ""
 
 #: ../menu-data/live-magic:live-magic.desktop.in.h:2
-msgid "Live Magic"
+msgid "Create Debian Live systems (LiveCDs, etc.)"
 msgstr ""
 
 #: ../menu-data/livemix:livemix.desktop.in.h:1
@@ -10851,35 +10937,35 @@
 msgstr "Video editor a nástroj pre VJ-ov"
 
 #: ../menu-data/ll-scope:ll-scope.desktop.in.h:1
-msgid "An oscilloscope DSSI plugin"
+msgid "Oscilloscope"
 msgstr ""
 
 #: ../menu-data/ll-scope:ll-scope.desktop.in.h:2
-msgid "Oscilloscope"
+msgid "An oscilloscope DSSI plugin"
 msgstr ""
 
 #: ../menu-data/lletters:lletters.desktop.in.h:1
-msgid "GTK letters-learning game for small children"
+msgid "Linux Letters and Numbers"
 msgstr ""
 
 #: ../menu-data/lletters:lletters.desktop.in.h:2
-msgid "Linux Letters and Numbers"
+msgid "GTK letters-learning game for small children"
 msgstr ""
 
 #: ../menu-data/llk-linux:llk_linux.desktop.in.h:1
-msgid "Gtk based LianLianKan Game."
+msgid "llk_linux"
 msgstr ""
 
 #: ../menu-data/llk-linux:llk_linux.desktop.in.h:2
-msgid "llk_linux"
+msgid "Gtk based LianLianKan Game."
 msgstr ""
 
 #: ../menu-data/lmarbles:lmarbles.desktop.in.h:1
-msgid "Build figures out of colored marbles"
+msgid "LMarbles"
 msgstr ""
 
 #: ../menu-data/lmarbles:lmarbles.desktop.in.h:2
-msgid "LMarbles"
+msgid "Build figures out of colored marbles"
 msgstr ""
 
 #: ../menu-data/lmemory:lmemory.desktop.in.h:1
@@ -10899,19 +10985,19 @@
 msgstr ""
 
 #: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:1
-msgid "Computer-Aided Translation System"
-msgstr "CAT systém (preklad za pomoci počítača)"
-
-#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2
 msgid "Lokalize"
 msgstr "Lokalize"
 
+#: ../menu-data/lokalize:kde4__lokalize.desktop.in.h:2
+msgid "Computer-Aided Translation System"
+msgstr "CAT systém (preklad za pomoci počítača)"
+
 #: ../menu-data/lombard:lombard.desktop.in.h:1
-msgid "Create and edit movies"
+msgid "Lombard Video Editor"
 msgstr ""
 
 #: ../menu-data/lombard:lombard.desktop.in.h:2
-msgid "Lombard Video Editor"
+msgid "Create and edit movies"
 msgstr ""
 
 #: ../menu-data/londonlaw:londonlaw.desktop.in.h:1
@@ -10931,43 +11017,43 @@
 msgstr ""
 
 #: ../menu-data/loqui:loqui.desktop.in.h:1
-msgid "IRC client"
+msgid "Loqui"
 msgstr ""
 
 #: ../menu-data/loqui:loqui.desktop.in.h:2
-msgid "Loqui"
+msgid "IRC client"
 msgstr ""
 
 #: ../menu-data/lostirc:lostirc.desktop.in.h:1
-msgid "Chat on IRC-networks"
+msgid "LostIRC"
 msgstr ""
 
 #: ../menu-data/lostirc:lostirc.desktop.in.h:2
-msgid "LostIRC"
+msgid "Chat on IRC-networks"
 msgstr ""
 
 #: ../menu-data/lottanzb:lottanzb.desktop.in.h:1
-msgid "Download from the Usenet with the help of NZB files"
+msgid "LottaNZB Usenet Downloader"
 msgstr ""
 
 #: ../menu-data/lottanzb:lottanzb.desktop.in.h:2
-msgid "LottaNZB Usenet Downloader"
+msgid "Download from the Usenet with the help of NZB files"
 msgstr ""
 
 #: ../menu-data/love:love.desktop.in.h:1
-msgid "Games development framework in lua"
+msgid "LÖVE"
 msgstr ""
 
 #: ../menu-data/love:love.desktop.in.h:2
-msgid "LÖVE"
+msgid "Games development framework in lua"
 msgstr ""
 
 #: ../menu-data/lprof:lprof.desktop.in.h:1
-msgid "Hardware ICC Profiler"
+msgid "LProf"
 msgstr ""
 
 #: ../menu-data/lprof:lprof.desktop.in.h:2
-msgid "LProf"
+msgid "Hardware ICC Profiler"
 msgstr ""
 
 #: ../menu-data/lshw-gtk:lshw-gtk.desktop.in.h:1
@@ -10979,13 +11065,13 @@
 msgstr ""
 
 #: ../menu-data/lskat:kde4__lskat.desktop.in.h:1
-msgid "Card Game"
-msgstr "Kartová hra"
-
-#: ../menu-data/lskat:kde4__lskat.desktop.in.h:2
 msgid "LSkat"
 msgstr "LSkat"
 
+#: ../menu-data/lskat:kde4__lskat.desktop.in.h:2
+msgid "Card Game"
+msgstr "Kartová hra"
+
 #: ../menu-data/ltris:ltris.desktop.in.h:1
 msgid "LTris"
 msgstr ""
@@ -11003,27 +11089,36 @@
 msgstr ""
 
 #: ../menu-data/luakit:luakit.desktop.in.h:1
-msgid "Fast, small, webkit based micro-browser extensible by Lua"
+msgid "Luakit"
 msgstr ""
 
 #: ../menu-data/luakit:luakit.desktop.in.h:2
-msgid "Luakit"
+msgid "Fast, small, webkit based micro-browser extensible by Lua"
+msgstr ""
+
+#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:1
+msgid "Lubuntu Software Center"
+msgstr ""
+
+#: ../menu-data/lubuntu-software-center:lubuntu-software-center.desktop.in.h:2
+#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2
+msgid "Lets you choose from thousands of applications available for Ubuntu"
 msgstr ""
 
 #: ../menu-data/luciole:luciole.desktop.in.h:1
-msgid "Image Per Image capture tool for making animation movies."
+msgid "Luciole"
 msgstr ""
 
 #: ../menu-data/luciole:luciole.desktop.in.h:2
-msgid "Luciole"
+msgid "Image Per Image capture tool for making animation movies."
 msgstr ""
 
 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:1
-msgid "Backup & sync your data with the power of rsync"
+msgid "luckyBackup"
 msgstr ""
 
 #: ../menu-data/luckybackup:luckybackup.desktop.in.h:2
-msgid "luckyBackup"
+msgid "Backup & sync your data with the power of rsync"
 msgstr ""
 
 #: ../menu-data/lugaru:lugaru.desktop.in.h:1
@@ -11053,11 +11148,11 @@
 msgstr "Webová stránka na zmenu hesla v inštalácii ldap-users"
 
 #: ../menu-data/lxinput:lxinput.desktop.in.h:1
-msgid "Configure keyboard, mouse, and other input devices"
+msgid "Keyboard and Mouse"
 msgstr ""
 
 #: ../menu-data/lxinput:lxinput.desktop.in.h:2
-msgid "Keyboard and Mouse"
+msgid "Configure keyboard, mouse, and other input devices"
 msgstr ""
 
 #: ../menu-data/lxkeymap:lxkeymap.desktop.in.h:1
@@ -11069,11 +11164,11 @@
 msgstr ""
 
 #: ../menu-data/lxtask:lxtask.desktop.in.h:1
-msgid "Manage running processes"
+msgid "Task Manager"
 msgstr ""
 
 #: ../menu-data/lxtask:lxtask.desktop.in.h:2
-msgid "Task Manager"
+msgid "Manage running processes"
 msgstr ""
 
 #: ../menu-data/lybniz:lybniz.desktop.in.h:1
@@ -11093,13 +11188,13 @@
 msgstr ""
 
 #: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:1
-msgid "Filtering of astronomical images"
-msgstr "Filtrovanie astronomických obrázkov"
-
-#: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2
 msgid "Lynkeos Image Processor"
 msgstr "Nástroj na spracovanie obrazu Lynkeos"
 
+#: ../menu-data/lynkeos.app:Lynkeos.desktop.in.h:2
+msgid "Filtering of astronomical images"
+msgstr "Filtrovanie astronomických obrázkov"
+
 #: ../menu-data/lyricue:lyricue.desktop.in.h:1
 msgid "Lyricue"
 msgstr ""
@@ -11117,11 +11212,11 @@
 msgstr ""
 
 #: ../menu-data/madbomber:madbomber.desktop.in.h:1
-msgid "Catch the Bombs"
+msgid "Mad Bomber"
 msgstr ""
 
 #: ../menu-data/madbomber:madbomber.desktop.in.h:2
-msgid "Mad Bomber"
+msgid "Catch the Bombs"
 msgstr ""
 
 #: ../menu-data/maelstrom:maelstrom.desktop.in.h:1
@@ -11156,28 +11251,36 @@
 msgid "Play classic Mahjong puzzle game"
 msgstr "Klasická logická hra Mahjong"
 
+#: ../menu-data/mahjongg:mahjongg.desktop.in.h:1
+msgid "Mahjongg"
+msgstr "Mahjongg"
+
+#: ../menu-data/mahjongg:mahjongg.desktop.in.h:2
+msgid "Disassemble a pile of tiles by removing matching pairs"
+msgstr "Rozložte hromady tehličiek po zodpovedajúcich si dvojiciach"
+
 #: ../menu-data/mail-notification:mail-notification.desktop.in.h:1
-msgid "Get notified when new mail arrives"
+msgid "Mail Notification"
 msgstr ""
 
 #: ../menu-data/mail-notification:mail-notification.desktop.in.h:2
-msgid "Mail Notification"
+msgid "Get notified when new mail arrives"
 msgstr ""
 
 #: ../menu-data/mana:mana.desktop.in.h:1
-msgid "A 2D MMORPG client"
+msgid "Mana"
 msgstr ""
 
 #: ../menu-data/mana:mana.desktop.in.h:2
-msgid "Mana"
+msgid "A 2D MMORPG client"
 msgstr ""
 
 #: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:1
-msgid "Mandebulber"
+msgid "Visit 3D Fractal World"
 msgstr ""
 
 #: ../menu-data/mandelbulber:mandelbulber.desktop.in.h:2
-msgid "Visit 3D Fractal World"
+msgid "Mandebulber"
 msgstr ""
 
 #: ../menu-data/mangler:mangler.desktop.in.h:1
@@ -11197,19 +11300,27 @@
 msgstr ""
 
 #: ../menu-data/marble:kde4__marble.desktop.in.h:1
+msgid "Marble"
+msgstr "Marble"
+
+#: ../menu-data/marble:kde4__marble.desktop.in.h:2
 msgid "Desktop Globe"
 msgstr "Glóbus pracovného prostredia"
 
-#: ../menu-data/marble:kde4__marble.desktop.in.h:2
-msgid "Marble"
-msgstr "Marble"
+#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:1
+msgid "Massif-Visualizer"
+msgstr ""
+
+#: ../menu-data/massif-visualizer:kde4__massif-visualizer.desktop.in.h:2
+msgid "Visualization of Memory Profiling Data"
+msgstr ""
 
 #: ../menu-data/massxpert:massxpert.desktop.in.h:1
-msgid "Bio-polymer mass spectrometry software"
+msgid "massXpert"
 msgstr ""
 
 #: ../menu-data/massxpert:massxpert.desktop.in.h:2
-msgid "massXpert"
+msgid "Bio-polymer mass spectrometry software"
 msgstr ""
 
 #: ../menu-data/matchbox-keyboard:inputmethods__matchbox-keyboard.desktop.in.h:1
@@ -11221,21 +11332,21 @@
 msgstr ""
 
 #: ../menu-data/mathomatic:mathomatic.desktop.in.h:1
-msgid "Do symbolic mathematics and quick calculations"
+msgid "Mathomatic"
 msgstr ""
 
 #: ../menu-data/mathomatic:mathomatic.desktop.in.h:2
-msgid "Mathomatic"
+msgid "Do symbolic mathematics and quick calculations"
 msgstr ""
 
 #: ../menu-data/mathwar:MathWar.desktop.in.h:1
-msgid "A simple math game for kids"
-msgstr "Jednoduchá matematická hra pre deti"
-
-#: ../menu-data/mathwar:MathWar.desktop.in.h:2
 msgid "MathWar"
 msgstr "MathWar"
 
+#: ../menu-data/mathwar:MathWar.desktop.in.h:2
+msgid "A simple math game for kids"
+msgstr "Jednoduchá matematická hra pre deti"
+
 #: ../menu-data/matlab-support:matlab.desktop.in.h:1
 msgid "MATLAB"
 msgstr ""
@@ -11245,19 +11356,19 @@
 msgstr ""
 
 #: ../menu-data/mc:mc.desktop.in.h:1
-msgid "File manager"
+msgid "Midnight Commander"
 msgstr ""
 
 #: ../menu-data/mc:mc.desktop.in.h:2
-msgid "Midnight Commander"
+msgid "File manager"
 msgstr ""
 
 #: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:1
-msgid "Graphical front end for mCRL2 toolset"
+msgid "mCRL2"
 msgstr ""
 
 #: ../menu-data/mcrl2:mcrl2-gui.desktop.in.h:2
-msgid "mCRL2"
+msgid "Graphical front end for mCRL2 toolset"
 msgstr ""
 
 #: ../menu-data/mcu8051ide:mcu8051ide.desktop.in.h:1
@@ -11277,12 +11388,20 @@
 msgstr "Zobrazovanie a export databáz Microsoft Access"
 
 #: ../menu-data/me-tv:me-tv.desktop.in.h:1
+msgid "Me TV"
+msgstr "Me TV"
+
+#: ../menu-data/me-tv:me-tv.desktop.in.h:2
 msgid "A digital television (DVB) viewer for GNOME"
 msgstr "prehliadač digitálnej televízie (DVB) pre GNOME"
 
-#: ../menu-data/me-tv:me-tv.desktop.in.h:2
-msgid "Me TV"
-msgstr "Me TV"
+#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:1
+msgid "MediaInfo"
+msgstr ""
+
+#: ../menu-data/mediainfo-gui:mediainfo-gui.desktop.in.h:2
+msgid "Supplies technical and tag information about a video or audio file"
+msgstr ""
 
 #: ../menu-data/mediathekview:mediathekview.desktop.in.h:1
 msgid "MediathekView"
@@ -11301,14 +11420,14 @@
 msgstr ""
 
 #: ../menu-data/medit:medit.desktop.in.h:1
+msgid "medit"
+msgstr "medit"
+
+#: ../menu-data/medit:medit.desktop.in.h:2
 #: ../menu-data/nedit:nedit.desktop.in.h:2
 msgid "Text editor"
 msgstr "Textový editor"
 
-#: ../menu-data/medit:medit.desktop.in.h:2
-msgid "medit"
-msgstr "medit"
-
 #: ../menu-data/mednafen:mednafen.desktop.in.h:1
 msgid "Mednafen"
 msgstr ""
@@ -11317,28 +11436,36 @@
 msgid "Multi-system video game emulator"
 msgstr ""
 
-#: ../menu-data/meld:meld.desktop.in.h:1
-msgid "Compare and merge your files"
-msgstr "Porovnávanie a zlučovanie súborov"
+#: ../menu-data/megaglest:megaglest.desktop.in.h:1
+msgid "A real time strategy game."
+msgstr ""
 
-#: ../menu-data/meld:meld.desktop.in.h:2
+#: ../menu-data/megaglest:megaglest.desktop.in.h:2
+msgid "MegaGlest"
+msgstr ""
+
+#: ../menu-data/meld:meld.desktop.in.h:1
 msgid "Meld Diff Viewer"
 msgstr "Meld Diff Viewer"
 
+#: ../menu-data/meld:meld.desktop.in.h:2
+msgid "Compare and merge your files"
+msgstr "Porovnávanie a zlučovanie súborov"
+
 #: ../menu-data/melting-gui:melting-gui.desktop.in.h:1
-msgid "\"Computes the melting temperature for a nucleic acid duplex.\""
+msgid "Melting"
 msgstr ""
 
 #: ../menu-data/melting-gui:melting-gui.desktop.in.h:2
-msgid "Melting"
+msgid "\"Computes the melting temperature for a nucleic acid duplex.\""
 msgstr ""
 
 #: ../menu-data/memaker:memaker.desktop.in.h:1
-msgid "Builds avatars for all your applications."
+msgid "MeMaker"
 msgstr ""
 
 #: ../menu-data/memaker:memaker.desktop.in.h:2
-msgid "MeMaker"
+msgid "Builds avatars for all your applications."
 msgstr ""
 
 #: ../menu-data/meritous:meritous.desktop.in.h:1
@@ -11369,86 +11496,98 @@
 msgid "Metacity"
 msgstr "Metacity"
 
-#: ../menu-data/meterbridge:meterbridge.desktop.in.h:2
+#: ../menu-data/meterbridge:meterbridge.desktop.in.h:1
 msgid "Meterbridge"
 msgstr ""
 
 #: ../menu-data/mgm:mgm.desktop.in.h:1
-msgid "A highly configurable, very gaudy system load meter"
+msgid "MGM System Monitor"
 msgstr ""
 
 #: ../menu-data/mgm:mgm.desktop.in.h:2
-msgid "MGM System Monitor"
+msgid "A highly configurable, very gaudy system load meter"
 msgstr ""
 
 #: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:1
-msgid "Record, play, edit and convert sound files"
+msgid "mhWaveEdit"
 msgstr ""
 
 #: ../menu-data/mhwaveedit:mhwaveedit.desktop.in.h:2
-msgid "mhWaveEdit"
+msgid "Record, play, edit and convert sound files"
 msgstr ""
 
 #: ../menu-data/micropolis:micropolis.desktop.in.h:1
-msgid "A real-time city management simulator"
+msgid "Micropolis"
 msgstr ""
 
 #: ../menu-data/micropolis:micropolis.desktop.in.h:2
-msgid "Micropolis"
+msgid "A real-time city management simulator"
 msgstr ""
 
 #: ../menu-data/midori:midori-private.desktop.in.h:1
-msgid "Open a new private browsing window"
+msgid "Midori Private Browsing"
 msgstr ""
 
 #: ../menu-data/midori:midori-private.desktop.in.h:2
-msgid "Private Browsing"
+msgid "Open a new private browsing window"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:1
-msgid "Lightweight web browser"
-msgstr "Odľahčený webový prehliadač"
-
-#: ../menu-data/midori:midori.desktop.in.h:2
 msgid "Midori"
 msgstr "Midori"
 
+#: ../menu-data/midori:midori.desktop.in.h:2
+msgid "Lightweight web browser"
+msgstr "Odľahčený webový prehliadač"
+
 #: ../menu-data/midori:midori.desktop.in.h:3
-msgid "New P_rivate Browsing Window"
+msgid "New _Tab"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:4
-msgid "New _Tab"
+msgid "New _Window"
 msgstr ""
 
 #: ../menu-data/midori:midori.desktop.in.h:5
-msgid "New _Window"
+msgid "New P_rivate Browsing Window"
 msgstr ""
 
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:1
-msgid "Fasttracker 2 Clone"
-msgstr "Klon Fasttracker 2"
-
-#: ../menu-data/milkytracker:milkytracker.desktop.in.h:2
 msgid "MilkyTracker"
 msgstr "MilkyTracker"
 
+#: ../menu-data/milkytracker:milkytracker.desktop.in.h:2
+msgid "Fasttracker 2 Clone"
+msgstr "Klon Fasttracker 2"
+
 #: ../menu-data/milkytracker:milkytracker.desktop.in.h:3
 msgid "MilkyTracker (play song)"
 msgstr "MilkyTracker (prehrať pieseň)"
 
 #: ../menu-data/minbar:minbar.desktop.in.h:1
+msgid "Minbar Prayer Times"
+msgstr "Minbar - časy modlitieb"
+
+#: ../menu-data/minbar:minbar.desktop.in.h:2
 msgid "Islamic prayer times"
 msgstr "Časy islámskych modlitieb"
 
-#: ../menu-data/minbar:minbar.desktop.in.h:2
-msgid "Minbar Prayer Times"
-msgstr "Minbar - časy modlitieb"
+#: ../menu-data/mined:mined.desktop.in.h:1
+msgid "MinEd"
+msgstr ""
 
-#: ../menu-data/mines.app:Mines.desktop.in.h:1
+#: ../menu-data/mines.app:Mines.desktop.in.h:2
 msgid "GNUstep minesweeper game"
 msgstr "Hľadanie mín GNUstep"
 
+#: ../menu-data/minetest:minetest.desktop.in.h:1
+msgid "Minetest"
+msgstr ""
+
+#: ../menu-data/minetest:minetest.desktop.in.h:2
+msgid "InfiniMiner/Minecraft-inspired open game world"
+msgstr ""
+
 #: ../menu-data/minirok:kde4__minirok.desktop.in.h:1
 msgid "Minirok"
 msgstr "Minirok"
@@ -11461,73 +11600,65 @@
 msgid "Watch YouTube videos"
 msgstr ""
 
-#: ../menu-data/minitunes:minitunes.desktop.in.h:1
-msgid "Minitunes"
-msgstr ""
-
-#: ../menu-data/minitunes:minitunes.desktop.in.h:2
-msgid "Play your music collection"
-msgstr ""
-
 #: ../menu-data/mirage:mirage.desktop.in.h:1
-msgid "A fast GTK+ Image Viewer"
-msgstr "Rýchly prehliadač obrázkov pre GTK+"
-
-#: ../menu-data/mirage:mirage.desktop.in.h:2
 msgid "Mirage"
 msgstr "Mirage"
 
+#: ../menu-data/mirage:mirage.desktop.in.h:2
+msgid "A fast GTK+ Image Viewer"
+msgstr "Rýchly prehliadač obrázkov pre GTK+"
+
 #: ../menu-data/miro:miro.desktop.in.h:1
+msgid "Miro music and video player"
+msgstr ""
+
+#: ../menu-data/miro:miro.desktop.in.h:2
 msgid ""
 "Fully featured video and music player, podcast client, and bittorrent client"
 msgstr ""
 
-#: ../menu-data/miro:miro.desktop.in.h:2
-msgid "Miro music and video player"
-msgstr ""
-
 #: ../menu-data/mirrormagic:mirrormagic.desktop.in.h:1
 msgid "MirrorMagic"
 msgstr "MirrorMagic"
 
 #: ../menu-data/mistelix:mistelix.desktop.in.h:1
-msgid "Author DVDs and slideshows"
-msgstr "Tvorba DVD a prezentácií"
-
-#: ../menu-data/mistelix:mistelix.desktop.in.h:2
 msgid "Mistelix"
 msgstr "Mistelix"
 
+#: ../menu-data/mistelix:mistelix.desktop.in.h:2
+msgid "Author DVDs and slideshows"
+msgstr "Tvorba DVD a prezentácií"
+
 #: ../menu-data/mixxx:mixxx.desktop.in.h:1
-msgid "A digital DJ interface"
+msgid "Mixxx"
 msgstr ""
 
 #: ../menu-data/mixxx:mixxx.desktop.in.h:2
-msgid "Mixxx"
+msgid "A digital DJ interface"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:1
-msgid "Show information about MKV files"
+msgid "mkvinfo"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvinfo.desktop.in.h:2
-msgid "mkvinfo"
+msgid "Show information about MKV files"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:1
-msgid "MKV files creator"
+msgid "mkvmerge GUI"
 msgstr ""
 
 #: ../menu-data/mkvtoolnix-gui:mkvmergeGUI.desktop.in.h:2
-msgid "mkvmerge GUI"
+msgid "MKV files creator"
 msgstr ""
 
 #: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:1
-msgid "Graphical frontend for MLDonkey"
+msgid "MLDonkey"
 msgstr ""
 
 #: ../menu-data/mldonkey-gui:mldonkey-gui.desktop.in.h:2
-msgid "MLDonkey"
+msgid "Graphical frontend for MLDonkey"
 msgstr ""
 
 #: ../menu-data/mlterm-common:mlterm.desktop.in.h:1
@@ -11539,51 +11670,51 @@
 msgstr ""
 
 #: ../menu-data/mm3d:mm3d.desktop.in.h:1
-msgid "Create and edit 3D models and animations"
-msgstr "Tvorba a úprava 3D modelov a animácií"
-
-#: ../menu-data/mm3d:mm3d.desktop.in.h:2
 msgid "Misfit Model 3D"
 msgstr "Misfit Model 3D"
 
+#: ../menu-data/mm3d:mm3d.desktop.in.h:2
+msgid "Create and edit 3D models and animations"
+msgstr "Tvorba a úprava 3D modelov a animácií"
+
 #: ../menu-data/mmass:mmass.desktop.in.h:1
-msgid "Mass spectrum viewer and data analysis proteomics tool"
+msgid "mMass"
 msgstr ""
 
 #: ../menu-data/mmass:mmass.desktop.in.h:2
-msgid "mMass"
+msgid "Mass spectrum viewer and data analysis proteomics tool"
 msgstr ""
 
 #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:1
-msgid "massively multiplayer pong game"
+msgid "mmpong-gl"
 msgstr ""
 
 #: ../menu-data/mmpong-gl:mmpong-gl.desktop.in.h:2
-msgid "mmpong-gl"
+msgid "massively multiplayer pong game"
 msgstr ""
 
 #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:1
-msgid "A flash card program to make your review process more efficient"
+msgid "Mnemosyne"
 msgstr ""
 
 #: ../menu-data/mnemosyne:mnemosyne.desktop.in.h:2
-msgid "Mnemosyne"
+msgid "A flash card program to make your review process more efficient"
 msgstr ""
 
 #: ../menu-data/model-builder:model-builder.desktop.in.h:1
-msgid "Graphical ODE simulator"
+msgid "Model Builder"
 msgstr ""
 
 #: ../menu-data/model-builder:model-builder.desktop.in.h:2
-msgid "Model Builder"
+msgid "Graphical ODE simulator"
 msgstr ""
 
 #: ../menu-data/mokomaze:mokomaze.desktop.in.h:1
-msgid "Ball-in-the-labyrinth game"
+msgid "Mokomaze"
 msgstr ""
 
 #: ../menu-data/mokomaze:mokomaze.desktop.in.h:2
-msgid "Mokomaze"
+msgid "Ball-in-the-labyrinth game"
 msgstr ""
 
 #: ../menu-data/monajat-applet:monajat.desktop.in.h:1
@@ -11603,11 +11734,11 @@
 msgstr ""
 
 #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:1
-msgid "MkS IDE"
+msgid "Monkey Studio IDE"
 msgstr ""
 
 #: ../menu-data/monkeystudio:monkeystudio.desktop.in.h:2
-msgid "Monkey Studio IDE"
+msgid "MkS IDE"
 msgstr ""
 
 #: ../menu-data/mono-runtime:mono-runtime-terminal.desktop.in.h:1
@@ -11619,29 +11750,29 @@
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:1
-msgid ""
-"Write C# in an interactive shell, and inject your code into running Mono "
-"processes"
+msgid "gsharp"
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:gsharp.desktop.in.h:2
-msgid "gsharp"
+msgid ""
+"Write C# in an interactive shell, and inject your code into running Mono "
+"processes"
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:1
-msgid "Identify differences in the API exposed by mono library assemblies."
+msgid "Mono IL Contrast"
 msgstr ""
 
 #: ../menu-data/mono-tools-gui:ilcontrast.desktop.in.h:2
-msgid "Mono IL Contrast"
+msgid "Identify differences in the API exposed by mono library assemblies."
 msgstr ""
 
 #: ../menu-data/monodevelop:monodevelop.desktop.in.h:1
-msgid "Develop .NET applications in an Integrated Development Environment"
+msgid "MonoDevelop"
 msgstr ""
 
 #: ../menu-data/monodevelop:monodevelop.desktop.in.h:2
-msgid "MonoDevelop"
+msgid "Develop .NET applications in an Integrated Development Environment"
 msgstr ""
 
 #: ../menu-data/monodoc-browser:monodoc.desktop.in.h:1
@@ -11661,27 +11792,27 @@
 msgstr ""
 
 #: ../menu-data/monster-masher:monster-masher.desktop.in.h:1
-msgid "Mash monsters and save the gnomes"
+msgid "Monster Masher"
 msgstr ""
 
 #: ../menu-data/monster-masher:monster-masher.desktop.in.h:2
-msgid "Monster Masher"
+msgid "Mash monsters and save the gnomes"
 msgstr ""
 
 #: ../menu-data/monsterz:monsterz.desktop.in.h:1
-msgid "Little arcade puzzle game, similar to the famous Bejeweled"
+msgid "Monsterz"
 msgstr ""
 
 #: ../menu-data/monsterz:monsterz.desktop.in.h:2
-msgid "Monsterz"
+msgid "Little arcade puzzle game, similar to the famous Bejeweled"
 msgstr ""
 
 #: ../menu-data/moon-lander:moon-lander.desktop.in.h:1
-msgid "Fun game based on the classic moon lander"
+msgid "Moonlander"
 msgstr ""
 
 #: ../menu-data/moon-lander:moon-lander.desktop.in.h:2
-msgid "Moonlander"
+msgid "Fun game based on the classic moon lander"
 msgstr ""
 
 #: ../menu-data/moovida:moovida.desktop.in.h:1
@@ -11693,11 +11824,11 @@
 msgstr ""
 
 #: ../menu-data/moserial:moserial.desktop.in.h:1
-msgid "A serial terminal optimized for logging and file capture"
+msgid "moserial Terminal"
 msgstr ""
 
 #: ../menu-data/moserial:moserial.desktop.in.h:2
-msgid "moserial Terminal"
+msgid "A serial terminal optimized for logging and file capture"
 msgstr ""
 
 #: ../menu-data/mountmanager:mountmanager-gtk.desktop.in.h:1
@@ -11716,15 +11847,15 @@
 msgid "Mousepad"
 msgstr ""
 
-#: ../menu-data/mp3diags:mp3diags.desktop.in.h:1
-msgid "MP3 Diags"
-msgstr "MP3 Diags"
-
 #. DocPath=
-#: ../menu-data/mp3diags:mp3diags.desktop.in.h:3
+#: ../menu-data/mp3diags:mp3diags.desktop.in.h:2
 msgid "MP3 Diags - diagnosis and repair tool"
 msgstr "nástroj na diagnostiku a opravu MP3"
 
+#: ../menu-data/mp3diags:mp3diags.desktop.in.h:3
+msgid "MP3 Diags"
+msgstr "MP3 Diags"
+
 #: ../menu-data/mp3splt-gtk:mp3splt-gtk.desktop.in.h:1
 msgid "Mp3splt-gtk audio splitter"
 msgstr "Mp3splt-gtk rozdeľovač zvukových stôp"
@@ -11734,19 +11865,28 @@
 msgstr "Rozdeľujte mp3 a ogg súbory na časti bez dekódovania"
 
 #: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:1
+msgid "MPDCon"
+msgstr "MPDCon"
+
+#: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2
 msgid "GNUstep client for MPD"
 msgstr "GNUstep klient pre MPD"
 
-#: ../menu-data/mpdcon.app:MPDCon.desktop.in.h:2
-msgid "MPDCon"
-msgstr "MPDCon"
+#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:1
+msgid "MPlayer Media Player"
+msgstr ""
+
+#: ../menu-data/mplayer-gui:mplayer.desktop.in.h:2
+#: ../menu-data/totem:totem.desktop.in.h:2
+msgid "Play movies and songs"
+msgstr "Prehrávanie filmov a piesní"
 
 #: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:1
-msgid "Manage your MPMan portable mp3 player"
+msgid "Mplinuxman"
 msgstr ""
 
 #: ../menu-data/mplinuxman:mplinuxman.desktop.in.h:2
-msgid "Mplinuxman"
+msgid "Manage your MPMan portable mp3 player"
 msgstr ""
 
 #: ../menu-data/mricron:dcm2niigui.desktop.in.h:1
@@ -11758,11 +11898,11 @@
 msgstr ""
 
 #: ../menu-data/mricron:mricron-npm.desktop.in.h:1
-msgid "NPM"
+msgid "Non-parametric MRI Analysis"
 msgstr ""
 
 #: ../menu-data/mricron:mricron-npm.desktop.in.h:2
-msgid "Non-parametric MRI Analysis"
+msgid "NPM"
 msgstr ""
 
 #: ../menu-data/mricron:mricron.desktop.in.h:1
@@ -11798,11 +11938,11 @@
 msgstr ""
 
 #: ../menu-data/mu-cade:mu-cade.desktop.in.h:1
-msgid "Kenta Cho's Mu-cade"
+msgid "Mu-cade"
 msgstr ""
 
 #: ../menu-data/mu-cade:mu-cade.desktop.in.h:2
-msgid "Mu-cade"
+msgid "Kenta Cho's Mu-cade"
 msgstr ""
 
 #: ../menu-data/mudlet:mudlet.desktop.in.h:1
@@ -11822,14 +11962,14 @@
 msgstr "Sťahovací nástroj MultiGet"
 
 #: ../menu-data/mumble:mumble.desktop.in.h:1
+msgid "Mumble"
+msgstr "Mumble"
+
+#: ../menu-data/mumble:mumble.desktop.in.h:2
 msgid "A low-latency, high quality voice chat program for gaming"
 msgstr ""
 "Program pre hráčov na zvukový rozhovor vo vysokej kvalite s nízkou latenciou"
 
-#: ../menu-data/mumble:mumble.desktop.in.h:2
-msgid "Mumble"
-msgstr "Mumble"
-
 #: ../menu-data/muon-installer:kde4__muon-installer.desktop.in.h:1
 msgid "Muon Software Center"
 msgstr ""
@@ -11843,7 +11983,7 @@
 msgstr ""
 
 #: ../menu-data/muon-updater:kde4__muon-updater.desktop.in.h:2
-#: ../menu-data/update-manager:update-manager.desktop.in.h:2
+#: ../menu-data/update-manager:update-manager.desktop.in.h:1
 msgid "Update Manager"
 msgstr ""
 
@@ -11872,36 +12012,44 @@
 msgstr ""
 
 #: ../menu-data/muse:muse.desktop.in.h:1
-msgid "Midi Music Editor"
-msgstr ""
-
-#: ../menu-data/muse:muse.desktop.in.h:2
 msgid "MusE"
 msgstr "MusE"
 
-#: ../menu-data/museeq:museeq.desktop.in.h:1
-msgid "C++/QT3 Museek client"
-msgstr "Klient C++/QT3 Museek"
+#: ../menu-data/muse:muse.desktop.in.h:2
+msgid "Midi Music Editor"
+msgstr ""
 
-#: ../menu-data/museeq:museeq.desktop.in.h:2
+#: ../menu-data/museeq:museeq.desktop.in.h:1
 msgid "Museeq"
 msgstr "Museeq"
 
+#: ../menu-data/museeq:museeq.desktop.in.h:2
+msgid "C++/QT3 Museek client"
+msgstr "Klient C++/QT3 Museek"
+
 #: ../menu-data/musescore:mscore.desktop.in.h:1
-msgid "MuseScore"
+msgid "WYSIWYG Music score typesetter"
 msgstr ""
 
 #: ../menu-data/musescore:mscore.desktop.in.h:2
-msgid "WYSIWYG Music score typesetter"
+msgid "MuseScore"
 msgstr ""
 
 #: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:1
+msgid "Musetup-gtk"
+msgstr "Musetup-gtk"
+
+#: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2
 msgid "Museek daemon configuration tool"
 msgstr "Nástroj na konfiguráciu démona Museek"
 
-#: ../menu-data/musetup-gtk:musetup-gtk.desktop.in.h:2
-msgid "Musetup-gtk"
-msgstr "Musetup-gtk"
+#: ../menu-data/musique:musique.desktop.in.h:1
+msgid "Musique"
+msgstr ""
+
+#: ../menu-data/musique:musique.desktop.in.h:2
+msgid "Play your music collection"
+msgstr ""
 
 #: ../menu-data/mutt:mutt.desktop.in.h:1
 msgid "Simple text-based Mail User Agent"
@@ -11916,13 +12064,13 @@
 msgstr "Mutter"
 
 #: ../menu-data/mx44:mx44.desktop.in.h:1
-msgid "Polyphonic, multichannel midi realtime software synthesizer"
-msgstr "Polyfonický viackanálový syntetizér MIDI v reálnom čase"
-
-#: ../menu-data/mx44:mx44.desktop.in.h:2
 msgid "mx44"
 msgstr "mx44"
 
+#: ../menu-data/mx44:mx44.desktop.in.h:2
+msgid "Polyphonic, multichannel midi realtime software synthesizer"
+msgstr "Polyfonický viackanálový syntetizér MIDI v reálnom čase"
+
 #: ../menu-data/mypaint:mypaint.desktop.in.h:1
 msgid "MyPaint"
 msgstr ""
@@ -11931,36 +12079,20 @@
 msgid "Painting program for digital artists"
 msgstr ""
 
-#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:1
-msgid "MySQL Administration Tool"
-msgstr "Nástroj na správu MySQL"
-
-#: ../menu-data/mysql-admin:MySQLAdministrator.desktop.in.h:2
-msgid "MySQL Administrator"
-msgstr "MySQL Administrator"
-
 #: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:1
-msgid "GUI client for MySQL"
-msgstr "Grafické používateľské rozhranie klienta MySQL"
-
-#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2
 msgid "MySQL Navigator"
 msgstr "MySQL Navigator"
 
-#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:1
-msgid "MySQL Query Browser"
-msgstr "Prehliadač dopytov MySQL"
-
-#: ../menu-data/mysql-query-browser:MySQLQueryBrowser.desktop.in.h:2
-msgid "MySQL Query Tool"
-msgstr "MySQL Query Tool"
+#: ../menu-data/mysql-navigator:mysql-navigator.desktop.in.h:2
+msgid "GUI client for MySQL"
+msgstr "Grafické používateľské rozhranie klienta MySQL"
 
 #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:1
-msgid "A video RSS grabber"
+msgid "MythNetTV"
 msgstr ""
 
 #: ../menu-data/mythnettv-gui:mythnettv.desktop.in.h:2
-msgid "MythNetTV"
+msgid "A video RSS grabber"
 msgstr ""
 
 #: ../menu-data/mythtv-backend:mythtv-setup.desktop.in.h:1
@@ -11972,35 +12104,43 @@
 msgstr ""
 
 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:1
-msgid "A frontend for all content on a mythtv-backend"
+msgid "MythTV Frontend"
 msgstr ""
 
 #: ../menu-data/mythtv-frontend:mythtv.desktop.in.h:2
-msgid "MythTV Frontend"
+msgid "A frontend for all content on a mythtv-backend"
+msgstr ""
+
+#: ../menu-data/myunity:myunity.desktop.in.h:1
+msgid "MyUnity"
+msgstr ""
+
+#: ../menu-data/myunity:myunity.desktop.in.h:2
+msgid "Configuratore per Unity"
 msgstr ""
 
 #: ../menu-data/nagstamon:nagstamon.desktop.in.h:1
-msgid "Nagios status monitor "
+msgid "nagstamon"
 msgstr ""
 
 #: ../menu-data/nagstamon:nagstamon.desktop.in.h:2
-msgid "nagstamon"
+msgid "Nagios status monitor "
 msgstr ""
 
 #: ../menu-data/nanny:nanny-admin-console.desktop.in.h:1
-msgid "Nanny parental control admin console"
+msgid "Parental Control"
 msgstr ""
 
 #: ../menu-data/nanny:nanny-admin-console.desktop.in.h:2
-msgid "Parental Control"
+msgid "Nanny parental control admin console"
 msgstr ""
 
 #: ../menu-data/nautilus-actions:nact.desktop.in.h:1
-msgid "Configure items to be added to the Nautilus context menus"
+msgid "Nautilus-Actions Configuration Tool"
 msgstr ""
 
 #: ../menu-data/nautilus-actions:nact.desktop.in.h:2
-msgid "Nautilus-Actions Configuration Tool"
+msgid "Configure items to be added to the Nautilus context menus"
 msgstr ""
 
 #: ../menu-data/nautilus-compare:nautilus-compare-preferences.desktop.in.h:1
@@ -12028,11 +12168,11 @@
 msgstr ""
 
 #: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:1
-msgid "Enable or disable Nautilus scripts"
+msgid "Nautilus scripts manager"
 msgstr ""
 
 #: ../menu-data/nautilus-scripts-manager:nautilus-scripts-manager.desktop.in.h:2
-msgid "Nautilus scripts manager"
+msgid "Enable or disable Nautilus scripts"
 msgstr ""
 
 #: ../menu-data/navit:navit.desktop.in.h:1
@@ -12084,21 +12224,21 @@
 msgstr ""
 
 #: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:1
-msgid "NCurses Music Player Client"
+msgid "Ncmpcpp"
 msgstr ""
 
 #: ../menu-data/ncmpcpp:ncmpcpp.desktop.in.h:2
-msgid "Ncmpcpp"
+msgid "NCurses Music Player Client"
 msgstr ""
 
 #: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:1
-msgid "Ndiswrapper driver installation tool"
-msgstr "Nástroj na inštaláciu ovládača Ndiswrapper"
-
-#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2
 msgid "Windows Wireless Drivers"
 msgstr "Bezdrôtové ovládače Windows"
 
+#: ../menu-data/ndisgtk:ndisgtk.desktop.in.h:2
+msgid "Ndiswrapper driver installation tool"
+msgstr "Nástroj na inštaláciu ovládača Ndiswrapper"
+
 #: ../menu-data/nedit:nedit.desktop.in.h:1
 msgid "NEdit"
 msgstr "NEdit"
@@ -12112,11 +12252,11 @@
 msgstr ""
 
 #: ../menu-data/nemiver:nemiver.desktop.in.h:1
-msgid "Debug Applications"
+msgid "Nemiver C/C++ Debugger"
 msgstr ""
 
 #: ../menu-data/nemiver:nemiver.desktop.in.h:2
-msgid "Nemiver C/C++ Debugger"
+msgid "Debug Applications"
 msgstr ""
 
 #: ../menu-data/netapplet:netapplet.desktop.in.h:1
@@ -12127,6 +12267,10 @@
 msgid "Network Selector Panel Applet"
 msgstr "Applet panelu na výber siete"
 
+#: ../menu-data/netbeans:netbeans.desktop.in.h:1
+msgid "NetBeans IDE 7.0.1"
+msgstr ""
+
 #: ../menu-data/netemul:netemul.desktop.in.h:1
 msgid "NetEmul"
 msgstr ""
@@ -12135,7 +12279,7 @@
 msgid "The LAN network simulator"
 msgstr ""
 
-#: ../menu-data/netgen:netgen.desktop.in.h:2
+#: ../menu-data/netgen:netgen.desktop.in.h:1
 msgid "Netgen Mesh Generator"
 msgstr ""
 
@@ -12159,37 +12303,37 @@
 msgid "Netrek"
 msgstr ""
 
-#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:2
+#: ../menu-data/netsurf-gtk:netsurf-gtk.desktop.in.h:1
 msgid "NetSurf Web Browser"
 msgstr "NetSurf - webový prehliadač"
 
-#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:1
+#: ../menu-data/network-manager-gnome:nm-applet.desktop.in.h:2
 msgid "Manage your network connections"
 msgstr ""
 
 #: ../menu-data/neverball:neverball.desktop.in.h:1
-msgid "A 3D arcade game with a ball"
+msgid "Neverball"
 msgstr ""
 
 #: ../menu-data/neverball:neverball.desktop.in.h:2
-msgid "Neverball"
+msgid "A 3D arcade game with a ball"
 msgstr ""
 
 #: ../menu-data/neverputt:neverputt.desktop.in.h:1
-msgid "A 3D mini golf game"
+msgid "Neverputt"
 msgstr ""
 
 #: ../menu-data/neverputt:neverputt.desktop.in.h:2
-msgid "Neverputt"
+msgid "A 3D mini golf game"
 msgstr ""
 
 #: ../menu-data/nexuiz:nexuiz.desktop.in.h:1
-msgid ""
-"A networked 3D first person shooter game with high-quality graphic effects"
+msgid "Nexuiz"
 msgstr ""
 
 #: ../menu-data/nexuiz:nexuiz.desktop.in.h:2
-msgid "Nexuiz"
+msgid ""
+"A networked 3D first person shooter game with high-quality graphic effects"
 msgstr ""
 
 #: ../menu-data/nfoview:nfoview.desktop.in.h:1
@@ -12217,11 +12361,11 @@
 msgstr ""
 
 #: ../menu-data/nip2:nip2.desktop.in.h:1
-msgid "Image manipulation program based on VIPS"
+msgid "nip2"
 msgstr ""
 
 #: ../menu-data/nip2:nip2.desktop.in.h:2
-msgid "nip2"
+msgid "Image manipulation program based on VIPS"
 msgstr ""
 
 #: ../menu-data/njam:njam.desktop.in.h:1
@@ -12233,50 +12377,50 @@
 msgstr ""
 
 #: ../menu-data/njplot:njplot.desktop.in.h:1
-msgid ""
-"Displays, modifies and exports in PostScript format phylogenetic trees"
+msgid "NJplot"
 msgstr ""
 
 #: ../menu-data/njplot:njplot.desktop.in.h:2
-msgid "NJplot"
+msgid ""
+"Displays, modifies and exports in PostScript format phylogenetic trees"
 msgstr ""
 
 #: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:1
-msgid "Is a Qt4 interface for nmap scanner"
+msgid "NmapSI4 - User mode"
 msgstr ""
 
 #: ../menu-data/nmapsi4:kde__nmapsi4.desktop.in.h:2
-msgid "NmapSI4 - User mode"
+msgid "Is a Qt4 interface for nmap scanner"
 msgstr ""
 
 #: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:1
-msgid "An Abstract Shooter by Kenta Cho"
+msgid "Noiz2sa"
 msgstr ""
 
 #: ../menu-data/noiz2sa:noiz2sa.desktop.in.h:2
-msgid "Noiz2sa"
+msgid "An Abstract Shooter by Kenta Cho"
 msgstr ""
 
 #: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:1
-msgid "Display notifications"
+msgid "Notification Daemon"
 msgstr ""
 
 #: ../menu-data/notification-daemon:notification-daemon.desktop.in.h:2
-msgid "Notification Daemon"
+msgid "Display notifications"
 msgstr ""
 
-#: ../menu-data/nted:nted.desktop.in.h:2
+#: ../menu-data/nted:nted.desktop.in.h:1
 msgid "NtEd"
 msgstr "NtEd"
 
 #: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:1
-msgid "Enable/disable write support for NTFS with a simple click."
-msgstr "Zapnutie/vypnutie podpory zápisu na NTFS jedným kliknutím"
-
-#: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2
 msgid "NTFS Configuration Tool"
 msgstr "Nástoj na konfiguráciu NTFS"
 
+#: ../menu-data/ntfs-config:ntfs-config.desktop.in.h:2
+msgid "Enable/disable write support for NTFS with a simple click."
+msgstr "Zapnutie/vypnutie podpory zápisu na NTFS jedným kliknutím"
+
 #: ../menu-data/nuapplet:nuapplet2.desktop.in.h:1
 msgid "NuApplet"
 msgstr "NuApplet"
@@ -12301,44 +12445,62 @@
 msgid "Network UPS Tools GUI client"
 msgstr ""
 
+#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:1
+msgid "NVCLOCK"
+msgstr ""
+
+#: ../menu-data/nvclock-gtk:nvclock.desktop.in.h:2
+msgid "Overclock and Monitor NVIDIA cards"
+msgstr ""
+
 #: ../menu-data/nvtv:nvtv.desktop.in.h:1
-msgid "Control the TV output of NVidia video cards"
+msgid "Nvtv TV Out"
 msgstr ""
 
 #: ../menu-data/nvtv:nvtv.desktop.in.h:2
-msgid "Nvtv TV Out"
+msgid "Control the TV output of NVidia video cards"
 msgstr ""
 
 #: ../menu-data/nzb:nzb.desktop.in.h:1
-msgid "Grab nzb files"
+msgid "Nzb"
 msgstr ""
 
 #: ../menu-data/nzb:nzb.desktop.in.h:2
-msgid "Nzb"
+msgid "Grab nzb files"
 msgstr ""
 
 #: ../menu-data/obconf:obconf.desktop.in.h:1
-msgid "Configure and personalize the Openbox window manager"
+msgid "Openbox Configuration Manager"
 msgstr ""
 
 #: ../menu-data/obconf:obconf.desktop.in.h:2
-msgid "Openbox Configuration Manager"
+msgid "Configure and personalize the Openbox window manager"
 msgstr ""
 
 #: ../menu-data/obextool:obextool.desktop.in.h:1
-msgid "A GUI for bluetooth transfers"
+msgid "ObexTool"
 msgstr ""
 
 #: ../menu-data/obextool:obextool.desktop.in.h:2
-msgid "ObexTool"
+msgid "A GUI for bluetooth transfers"
 msgstr ""
 
 #: ../menu-data/objcryst-fox:fox.desktop.in.h:1
-msgid "Crystal structure determination"
+msgid "Fox"
 msgstr ""
 
 #: ../menu-data/objcryst-fox:fox.desktop.in.h:2
-msgid "Fox"
+msgid "Crystal structure determination"
+msgstr ""
+
+#: ../menu-data/oce-draw:oce-draw.desktop.in.h:1
+#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
+msgid "OpenCASCADE"
+msgstr ""
+
+#: ../menu-data/oce-draw:oce-draw.desktop.in.h:2
+#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
+msgid "OpenCASCADE DRAWEXE test harness"
 msgstr ""
 
 #: ../menu-data/ocrfeeder:ocrfeeder.desktop.in.h:1
@@ -12358,79 +12520,83 @@
 msgstr ""
 
 #: ../menu-data/oggconvert:oggconvert.desktop.in.h:1
-msgid "Convert media files to Free formats"
+msgid "OggConvert"
 msgstr ""
 
 #: ../menu-data/oggconvert:oggconvert.desktop.in.h:2
-msgid "OggConvert"
+msgid "Convert media files to Free formats"
 msgstr ""
 
 #: ../menu-data/ogmrip:ogmrip.desktop.in.h:1
-msgid "A DVD encoder"
+msgid "DVD Encoder OGMRip"
 msgstr ""
 
 #: ../menu-data/ogmrip:ogmrip.desktop.in.h:2
-msgid "DVD Encoder OGMRip"
+msgid "A DVD encoder"
 msgstr ""
 
 #: ../menu-data/okteta:kde4__okteta.desktop.in.h:1
+msgid "Okteta"
+msgstr "Okteta"
+
+#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2
 msgid "Hex Editor"
 msgstr ""
 
-#: ../menu-data/okteta:kde4__okteta.desktop.in.h:2
-msgid "Okteta"
-msgstr "Okteta"
+#: ../menu-data/okular-backend-odp:kde4__okularApplication_odp.desktop.in.h:1
+msgid "okular"
+msgstr ""
 
 #: ../menu-data/omaque:kde4__omaque.desktop.in.h:1
 msgid "Omaque"
 msgstr ""
 
 #: ../menu-data/omegat:omegat.desktop.in.h:1
-msgid "Computer-Assisted Translation tool"
-msgstr "CAT nástroj (preklad za pomoci počítača)"
-
-#: ../menu-data/omegat:omegat.desktop.in.h:2
 msgid "OmegaT"
 msgstr "OmegaT"
 
+#: ../menu-data/omegat:omegat.desktop.in.h:2
+msgid "Computer-Assisted Translation tool"
+msgstr "CAT nástroj (preklad za pomoci počítača)"
+
 #: ../menu-data/onboard:onboard.desktop.in.h:1
-msgid "Flexible onscreen keyboard for GNOME"
+msgid "Onboard"
 msgstr ""
 
 #: ../menu-data/onboard:onboard.desktop.in.h:2
-msgid "Onboard"
+msgid "Flexible onscreen keyboard for GNOME"
 msgstr ""
 
 #: ../menu-data/oneisenough:oneisenough.desktop.in.h:1
-msgid "2D platform game about communist and capitalist balls"
+msgid "One Is Enough"
 msgstr ""
 
 #: ../menu-data/oneisenough:oneisenough.desktop.in.h:2
-msgid "One Is Enough"
+msgid "2D platform game about communist and capitalist balls"
 msgstr ""
 
 #: ../menu-data/ontv:ontv.desktop.in.h:1
-msgid "Monitor TV programs"
+msgid "OnTV"
 msgstr ""
 
 #: ../menu-data/ontv:ontv.desktop.in.h:2
-msgid "OnTV"
+msgid "Monitor TV programs"
 msgstr ""
 
 #: ../menu-data/oolite:oolite.desktop.in.h:1
-msgid "An OpenGL Elite-like space game"
+msgid "Oolite"
 msgstr ""
 
 #: ../menu-data/oolite:oolite.desktop.in.h:2
-msgid "Oolite"
+msgid "An OpenGL Elite-like space game"
 msgstr ""
 
 #: ../menu-data/open-axiom:open-axiom.desktop.in.h:1
-msgid "Open scientific computation platform"
+msgid "OpenAxiom"
 msgstr ""
 
 #: ../menu-data/open-axiom:open-axiom.desktop.in.h:2
-msgid "OpenAxiom"
+msgid "Open scientific computation platform"
 msgstr ""
 
 #: ../menu-data/open-invaders:open-invaders.desktop.in.h:1
@@ -12442,29 +12608,29 @@
 msgstr ""
 
 #: ../menu-data/openarena:openarena.desktop.in.h:1
+msgid "OpenArena"
+msgstr "OpenArena"
+
+#: ../menu-data/openarena:openarena.desktop.in.h:2
 msgid ""
 "A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake "
 "III Arena"
 msgstr "Rýchla 3D strieľačka podobná Quake III Arena od id Software"
 
-#: ../menu-data/openarena:openarena.desktop.in.h:2
-msgid "OpenArena"
-msgstr "OpenArena"
-
 #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:1
-msgid "Logs GSM and GPS and uploads to openBmap."
+msgid "OBM"
 msgstr ""
 
 #: ../menu-data/openbmap-logger:openBmap.desktop.in.h:2
-msgid "OBM"
+msgid "Logs GSM and GPS and uploads to openBmap."
 msgstr ""
 
 #: ../menu-data/openbox:openbox.desktop.in.h:1
-msgid "Log in using the Openbox window manager (without a session manager)"
+msgid "Openbox"
 msgstr ""
 
 #: ../menu-data/openbox:openbox.desktop.in.h:2
-msgid "Openbox"
+msgid "Log in using the Openbox window manager (without a session manager)"
 msgstr ""
 
 #: ../menu-data/openbve:openbve.desktop.in.h:1
@@ -12475,14 +12641,6 @@
 msgid "Train/railway simulator compatible with 'BVE Trainsim' routes"
 msgstr ""
 
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:1
-msgid "OpenCASCADE"
-msgstr ""
-
-#: ../menu-data/opencascade-draw:opencascade-draw.desktop.in.h:2
-msgid "OpenCASCADE DRAWEXE test harness"
-msgstr ""
-
 #: ../menu-data/opencity:opencity.desktop.in.h:1
 msgid "OpenCity"
 msgstr ""
@@ -12508,11 +12666,11 @@
 msgstr "Vyhľadávanie slov v lokálnom alebo internetovom slovníku "
 
 #: ../menu-data/openfetion:openfetion.desktop.in.h:1
-msgid "Fetion For Linux"
+msgid "OpenFetion"
 msgstr ""
 
 #: ../menu-data/openfetion:openfetion.desktop.in.h:2
-msgid "OpenFetion"
+msgid "Fetion For Linux"
 msgstr ""
 
 #: ../menu-data/openjdk-6-jre:openjdk-6-java.desktop.in.h:1
@@ -12524,61 +12682,61 @@
 msgstr ""
 
 #: ../menu-data/openrocket:openrocket.desktop.in.h:1
-msgid "Design and simulate model rockets"
+msgid "OpenRocket"
 msgstr ""
 
 #: ../menu-data/openrocket:openrocket.desktop.in.h:2
-msgid "OpenRocket"
+msgid "Design and simulate model rockets"
 msgstr ""
 
 #: ../menu-data/openshot:openshot.desktop.in.h:1
-msgid "Create and edit videos and movies"
+msgid "OpenShot Video Editor"
 msgstr ""
 
 #: ../menu-data/openshot:openshot.desktop.in.h:2
-msgid "OpenShot Video Editor"
+msgid "Create and edit videos and movies"
 msgstr ""
 
 #: ../menu-data/openstv:openstv.desktop.in.h:1
-msgid "Conduct a Single Transferable Vote election"
+msgid "OpenSTV Voting Software"
 msgstr ""
 
 #: ../menu-data/openstv:openstv.desktop.in.h:2
-msgid "OpenSTV Voting Software"
+msgid "Conduct a Single Transferable Vote election"
 msgstr ""
 
 #: ../menu-data/openteacher:openteacher.desktop.in.h:1
-msgid "Learn words in a foreign language."
+msgid "OpenTeacher"
 msgstr ""
 
 #: ../menu-data/openteacher:openteacher.desktop.in.h:2
-msgid "OpenTeacher"
+msgid "Learn words in a foreign language."
 msgstr ""
 
 #: ../menu-data/openttd:openttd.desktop.in.h:1
-msgid "A clone of Transport Tycoon Deluxe"
-msgstr "Klon hry Transport Tycoon Deluxe"
-
-#: ../menu-data/openttd:openttd.desktop.in.h:2
 msgid "OpenTTD"
 msgstr "OpenTTD"
 
-#: ../menu-data/openuniverse:openuniverse.desktop.in.h:1
-msgid "Explore the solar system in this accurate simulation"
-msgstr "Objavovanie slnečnej sústavy v presnej simulácii"
+#: ../menu-data/openttd:openttd.desktop.in.h:2
+msgid "A clone of Transport Tycoon Deluxe"
+msgstr "Klon hry Transport Tycoon Deluxe"
 
-#: ../menu-data/openuniverse:openuniverse.desktop.in.h:2
+#: ../menu-data/openuniverse:openuniverse.desktop.in.h:1
 msgid "OpenUniverse Space Simulator"
 msgstr "OpenUniverse - simulátor vesmíru"
 
-#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1
-msgid "GTK+-2 Client for OpenVAS Security Scanner"
-msgstr "GTK+-2 klient pre skener bezpečnosti OpenVAS"
+#: ../menu-data/openuniverse:openuniverse.desktop.in.h:2
+msgid "Explore the solar system in this accurate simulation"
+msgstr "Objavovanie slnečnej sústavy v presnej simulácii"
 
-#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2
+#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:1
 msgid "OpenVAS-Client"
 msgstr "OpenVAS-Client"
 
+#: ../menu-data/openvas-client:OpenVAS-Client.desktop.in.h:2
+msgid "GTK+-2 Client for OpenVAS Security Scanner"
+msgstr "GTK+-2 klient pre skener bezpečnosti OpenVAS"
+
 #: ../menu-data/openwalnut-qt4:openwalnut.desktop.in.h:1
 msgid "OpenWalnut"
 msgstr ""
@@ -12592,11 +12750,11 @@
 msgstr ""
 
 #: ../menu-data/optgeo:optgeo.desktop.in.h:1
-msgid "Interactive tool to study and simulate optic assemblies"
+msgid "OptGeo"
 msgstr ""
 
 #: ../menu-data/optgeo:optgeo.desktop.in.h:2
-msgid "OptGeo"
+msgid "Interactive tool to study and simulate optic assemblies"
 msgstr ""
 
 #: ../menu-data/orage:globaltime.desktop.in.h:1
@@ -12608,11 +12766,11 @@
 msgstr ""
 
 #: ../menu-data/orage:xfcalendar.desktop.in.h:1
-msgid "Desktop calendar"
+msgid "Orage Calendar"
 msgstr ""
 
 #: ../menu-data/orage:xfcalendar.desktop.in.h:2
-msgid "Orage Calendar"
+msgid "Desktop calendar"
 msgstr ""
 
 #: ../menu-data/orage:xfce-xfcalendar-settings.desktop.in.h:1
@@ -12624,11 +12782,11 @@
 msgstr ""
 
 #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:1
-msgid "Anti-terrorist Satellite Sniping Game"
+msgid "Orbital Eunuchs Sniper"
 msgstr ""
 
 #: ../menu-data/orbital-eunuchs-sniper:orbital-eunuchs-sniper.desktop.in.h:2
-msgid "Orbital Eunuchs Sniper"
+msgid "Anti-terrorist Satellite Sniping Game"
 msgstr ""
 
 #: ../menu-data/oregano:oregano.desktop.in.h:1
@@ -12648,19 +12806,19 @@
 msgstr ""
 
 #: ../menu-data/othman:Othman.desktop.in.h:1
-msgid "Electronic Mus-haf"
-msgstr "Electronický Mus-haf"
-
-#: ../menu-data/othman:Othman.desktop.in.h:2
 msgid "Othman Quran Browser"
 msgstr "Prehliadač koránu Othman"
 
+#: ../menu-data/othman:Othman.desktop.in.h:2
+msgid "Electronic Mus-haf"
+msgstr "Electronický Mus-haf"
+
 #: ../menu-data/out-of-order:out-of-order.desktop.in.h:1
-msgid "Adventure Game"
+msgid "Out Of Order"
 msgstr ""
 
 #: ../menu-data/out-of-order:out-of-order.desktop.in.h:2
-msgid "Out Of Order"
+msgid "Adventure Game"
 msgstr ""
 
 #: ../menu-data/overgod:overgod.desktop.in.h:1
@@ -12681,11 +12839,11 @@
 msgstr ""
 
 #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:1
-msgid "Pacemaker CRM GUI"
+msgid "Pacemaker GUI"
 msgstr ""
 
 #: ../menu-data/pacemaker-mgmt-client:crm_gui.desktop.in.h:2
-msgid "Pacemaker GUI"
+msgid "Pacemaker CRM GUI"
 msgstr ""
 
 #: ../menu-data/packagesearch:packagesearch.desktop.in.h:1
@@ -12705,11 +12863,11 @@
 msgstr "Generátor sieťových paketov"
 
 #: ../menu-data/pacman:pacman.desktop.in.h:1
-msgid "A simple clone of the classic arcade game"
+msgid "Pacman"
 msgstr ""
 
 #: ../menu-data/pacman:pacman.desktop.in.h:2
-msgid "Pacman"
+msgid "A simple clone of the classic arcade game"
 msgstr ""
 
 #: ../menu-data/padre:padre.desktop.in.h:1
@@ -12729,26 +12887,26 @@
 msgstr ""
 
 #: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:1
-msgid "Jigsaw puzzle game"
-msgstr "Hra puzzle"
-
-#: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2
 msgid "Palapeli"
 msgstr "Palapeli"
 
+#: ../menu-data/palapeli:kde4__palapeli.desktop.in.h:2
+msgid "Jigsaw puzzle game"
+msgstr "Hra puzzle"
+
 #: ../menu-data/paman:paman.desktop.in.h:1
-msgid "Manage your PulseAudio sound server"
+msgid "PulseAudio Manager"
 msgstr ""
 
 #: ../menu-data/paman:paman.desktop.in.h:2
-msgid "PulseAudio Manager"
+msgid "Manage your PulseAudio sound server"
 msgstr ""
 
 #: ../menu-data/pan:pan.desktop.in.h:1
 msgid "Pan Newsreader"
 msgstr ""
 
-#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:1
+#: ../menu-data/pan:pan.desktop.in.h:2 ../menu-data/xpn:xpn.desktop.in.h:2
 msgid "Read News from Usenet"
 msgstr ""
 
@@ -12776,7 +12934,7 @@
 msgid "ParaView allows viewing of large data sets"
 msgstr ""
 
-#: ../menu-data/parcellite:parcellite.desktop.in.h:2
+#: ../menu-data/parcellite:parcellite.desktop.in.h:1
 msgid "Parcellite"
 msgstr ""
 
@@ -12793,11 +12951,11 @@
 msgstr ""
 
 #: ../menu-data/parsec47:parsec47.desktop.in.h:1
-msgid "Kenta Cho's PARSEC47"
+msgid "PARSEC47"
 msgstr ""
 
 #: ../menu-data/parsec47:parsec47.desktop.in.h:2
-msgid "PARSEC47"
+msgid "Kenta Cho's PARSEC47"
 msgstr ""
 
 #: ../menu-data/partitionmanager:kde4__partitionmanager.desktop.in.h:1
@@ -12808,6 +12966,14 @@
 msgid "Manage disks, partitions and file systems"
 msgstr "Správa diskov, oblastí a súborových systémov"
 
+#: ../menu-data/pasaffe:pasaffe.desktop.in.h:1
+msgid "Pasaffe"
+msgstr ""
+
+#: ../menu-data/pasaffe:pasaffe.desktop.in.h:2
+msgid "Pasaffe password manager"
+msgstr ""
+
 #: ../menu-data/passage:passage.desktop.in.h:1
 msgid "Passage"
 msgstr ""
@@ -12825,20 +12991,20 @@
 msgstr ""
 
 #: ../menu-data/patchage:patchage.desktop.in.h:1
-msgid ""
-"Connect audio and MIDI applications together and manage audio sessions"
+msgid "Patchage"
 msgstr ""
 
 #: ../menu-data/patchage:patchage.desktop.in.h:2
-msgid "Patchage"
+msgid ""
+"Connect audio and MIDI applications together and manage audio sessions"
 msgstr ""
 
 #: ../menu-data/pathogen:pathogen.desktop.in.h:1
-msgid "Destroy the pathogens"
+msgid "Pathogen"
 msgstr ""
 
 #: ../menu-data/pathogen:pathogen.desktop.in.h:2
-msgid "Pathogen"
+msgid "Destroy the pathogens"
 msgstr ""
 
 #: ../menu-data/pathological:pathological.desktop.in.h:1
@@ -12850,35 +13016,35 @@
 msgstr ""
 
 #: ../menu-data/pauker:pauker.desktop.in.h:1
-msgid "Generic card based learning program"
+msgid "Pauker"
 msgstr ""
 
 #: ../menu-data/pauker:pauker.desktop.in.h:2
-msgid "Pauker"
+msgid "Generic card based learning program"
 msgstr ""
 
 #: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:1
-msgid "Adjust the volume level"
-msgstr "Ovládanie hlasitosti zvuku"
-
-#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2
 msgid "PulseAudio Volume Control"
 msgstr "PulseAudio - ovládanie hlasitosti"
 
-#: ../menu-data/pavumeter:pavumeter.desktop.in.h:1
-msgid "Monitor the output volume"
-msgstr "Monitorovanie hlasitosti výstupu"
+#: ../menu-data/pavucontrol:pavucontrol.desktop.in.h:2
+msgid "Adjust the volume level"
+msgstr "Ovládanie hlasitosti zvuku"
 
-#: ../menu-data/pavumeter:pavumeter.desktop.in.h:2
+#: ../menu-data/pavumeter:pavumeter.desktop.in.h:1
 msgid "PulseAudio Volume Meter (Playback)"
 msgstr "PulseAudio - meranie hlasitosti (pri prehrávaní)"
 
+#: ../menu-data/pavumeter:pavumeter.desktop.in.h:2
+msgid "Monitor the output volume"
+msgstr "Monitorovanie hlasitosti výstupu"
+
 #: ../menu-data/paw++:paw++.desktop.in.h:1
-msgid "Analyze and graphically present experimental data"
+msgid "Paw++ (Physics Analysis Workstation)"
 msgstr ""
 
 #: ../menu-data/paw++:paw++.desktop.in.h:2
-msgid "Paw++ (Physics Analysis Workstation)"
+msgid "Analyze and graphically present experimental data"
 msgstr ""
 
 #: ../menu-data/pcalendar:pcalendar.desktop.in.h:1
@@ -12891,14 +13057,14 @@
 msgstr ""
 
 #: ../menu-data/pcb-common:pcb.desktop.in.h:1
-msgid "Create and edit printed circuit board designs"
+msgid "PCB Designer"
 msgstr ""
 
 #: ../menu-data/pcb-common:pcb.desktop.in.h:2
-msgid "PCB Designer"
+msgid "Create and edit printed circuit board designs"
 msgstr ""
 
-#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:1
+#: ../menu-data/pcmanfm:pcmanfm.desktop.in.h:2
 msgid "Browse the file system and manage the files"
 msgstr "Prehliadanie súborového systému a správa súborov"
 
@@ -12926,12 +13092,20 @@
 msgid "Sony PlayStation emulator"
 msgstr ""
 
+#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:1
+msgid "PDF Presenter Console"
+msgstr ""
+
+#: ../menu-data/pdf-presenter-console:pdf-presenter-console.desktop.in.h:2
+msgid "Presentation program for PDF files"
+msgstr ""
+
 #: ../menu-data/pdfchain:pdfchain.desktop.in.h:1
-msgid "GUI for PDFTK - A graphical tool for manipulating PDF"
+msgid "PDF Chain"
 msgstr ""
 
 #: ../menu-data/pdfchain:pdfchain.desktop.in.h:2
-msgid "PDF Chain"
+msgid "GUI for the PDFTK - A graphical tool for manipulating PDF"
 msgstr ""
 
 #: ../menu-data/pdfedit:pdfedit.desktop.in.h:1
@@ -12947,27 +13121,27 @@
 msgstr ""
 
 #: ../menu-data/pdfsam:pdfsam.desktop.in.h:1
-msgid "A tool to split and merge pdf documents"
-msgstr "Nástroj na rozdeľovanie a spájanie dokumentov PDF"
-
-#: ../menu-data/pdfsam:pdfsam.desktop.in.h:2
 msgid "pdfsam"
 msgstr "pdfsam"
 
-#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:1
-msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping"
-msgstr ""
+#: ../menu-data/pdfsam:pdfsam.desktop.in.h:2
+msgid "A tool to split and merge pdf documents"
+msgstr "Nástroj na rozdeľovanie a spájanie dokumentov PDF"
 
-#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2
+#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:1
 msgid "PDF-Shuffler"
 msgstr "PDF-Shuffler"
 
+#: ../menu-data/pdfshuffler:pdfshuffler.desktop.in.h:2
+msgid "PDF Merging, Rearranging, Splitting, Rotating and Cropping"
+msgstr ""
+
 #: ../menu-data/peg-e:peg-e.desktop.in.h:1
-msgid "Peg elimination game"
+msgid "Peg-E"
 msgstr ""
 
 #: ../menu-data/peg-e:peg-e.desktop.in.h:2
-msgid "Peg-E"
+msgid "Peg elimination game"
 msgstr ""
 
 #: ../menu-data/peg-solitaire:peg-solitaire.desktop.in.h:1
@@ -12983,67 +13157,67 @@
 msgstr ""
 
 #: ../menu-data/pencil:pencil.desktop.in.h:1
-msgid "Draw cartoons"
+msgid "Pencil"
 msgstr ""
 
 #: ../menu-data/pencil:pencil.desktop.in.h:2
-msgid "Pencil"
+msgid "Draw cartoons"
 msgstr ""
 
 #: ../menu-data/penguin-command:penguin-command.desktop.in.h:1
-msgid "A Missile Command clone"
+msgid "Penguin Command"
 msgstr ""
 
 #: ../menu-data/penguin-command:penguin-command.desktop.in.h:2
-msgid "Penguin Command"
+msgid "A Missile Command clone"
 msgstr ""
 
 #: ../menu-data/penguintv:penguintv.desktop.in.h:1
-msgid "Aggregates rss feeds, podcasts, and video blogs"
+msgid "PenguinTV Media Aggregator"
 msgstr ""
 
 #: ../menu-data/penguintv:penguintv.desktop.in.h:2
-msgid "PenguinTV Media Aggregator"
+msgid "Aggregates rss feeds, podcasts, and video blogs"
 msgstr ""
 
 #: ../menu-data/pente:pente.desktop.in.h:1
-msgid "Five in a row game for X"
+msgid "Pente"
 msgstr ""
 
 #: ../menu-data/pente:pente.desktop.in.h:2
-msgid "Pente"
+msgid "Five in a row game for X"
+msgstr ""
+
+#: ../menu-data/pentobi:pentobi.desktop.in.h:1
+msgid "Pentobi"
+msgstr ""
+
+#: ../menu-data/pentobi:pentobi.desktop.in.h:2
+msgid "Computer program that plays the board game Blokus"
 msgstr ""
 
 #: ../menu-data/performous:performous.desktop.in.h:1
-msgid "A karaoke game"
+msgid "Performous"
 msgstr ""
 
 #: ../menu-data/performous:performous.desktop.in.h:2
-msgid "Performous"
+msgid "A karaoke game"
 msgstr ""
 
 #: ../menu-data/perlprimer:perlprimer.desktop.in.h:1
-msgid "Graphical design of primers for PCR and sequencing"
+msgid "PerlPrimer"
 msgstr ""
 
 #: ../menu-data/perlprimer:perlprimer.desktop.in.h:2
-msgid "PerlPrimer"
+msgid "Graphical design of primers for PCR and sequencing"
 msgstr ""
 
 #: ../menu-data/perroquet:perroquet.desktop.in.h:1
-msgid "Oral comprehension teacher"
-msgstr ""
-
-#: ../menu-data/perroquet:perroquet.desktop.in.h:2
 msgid "Perroquet"
 msgstr ""
 
-#: ../menu-data/pessulus:pessulus.desktop.in.h:1
-msgid "Configure the lockdown policy"
-msgstr ""
-
-#: ../menu-data/pessulus:pessulus.desktop.in.h:2
-msgid "Lockdown Editor"
+#: ../menu-data/perroquet:perroquet.desktop.in.h:2
+msgid "Oral comprehension teacher"
 msgstr ""
 
 #: ../menu-data/petri-foo:petri-foo.desktop.in.h:1
@@ -13051,16 +13225,16 @@
 msgstr ""
 
 #: ../menu-data/petri-foo:petri-foo.desktop.in.h:2
-#: ../menu-data/specimen:specimen.desktop.in.h:1
+#: ../menu-data/specimen:specimen.desktop.in.h:2
 msgid "Sound Sampler"
 msgstr ""
 
 #: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:1
-msgid "PostgreSQL Administration Tool"
+msgid "pgAdmin III"
 msgstr ""
 
 #: ../menu-data/pgadmin3:pgadmin3.desktop.in.h:2
-msgid "pgAdmin III"
+msgid "PostgreSQL Administration Tool"
 msgstr ""
 
 #: ../menu-data/phasex:phasex.desktop.in.h:1
@@ -13072,11 +13246,19 @@
 msgstr ""
 
 #: ../menu-data/phatch:phatch.desktop.in.h:1
-msgid "Easily batch process images and edit metadata"
+msgid "Phatch PHoto bATCH Processor"
 msgstr ""
 
 #: ../menu-data/phatch:phatch.desktop.in.h:2
-msgid "Phatch PHoto bATCH Processor"
+msgid "Easily batch process images and edit metadata"
+msgstr ""
+
+#: ../menu-data/phlipple:phlipple.desktop.in.h:1
+msgid "Phlipple"
+msgstr ""
+
+#: ../menu-data/phlipple:phlipple.desktop.in.h:2
+msgid "Phlipping squares will never be the same again"
 msgstr ""
 
 #: ../menu-data/phoronix-test-suite:phoronix-test-suite.desktop.in.h:1
@@ -13088,20 +13270,28 @@
 msgstr ""
 
 #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:1
-msgid "Create animated slideshows"
+msgid "PhotoFilmStrip"
 msgstr ""
 
 #: ../menu-data/photofilmstrip:photofilmstrip.desktop.in.h:2
-msgid "PhotoFilmStrip"
+msgid "Create animated slideshows"
 msgstr ""
 
-#: ../menu-data/photoprint:fotoprint.desktop.in.h:1
-msgid "Color managed printing of multiple photos on single page"
+#. Encoding=UTF-8
+#: ../menu-data/photoprint:fotoprint.desktop.in.h:2
+msgid "PhotoPrint"
 msgstr ""
 
-#. Encoding=UTF-8
 #: ../menu-data/photoprint:fotoprint.desktop.in.h:3
-msgid "PhotoPrint"
+msgid "Color managed printing of multiple photos on single page"
+msgstr ""
+
+#: ../menu-data/pianobooster:pianobooster.desktop.in.h:1
+msgid "Piano Booster"
+msgstr ""
+
+#: ../menu-data/pianobooster:pianobooster.desktop.in.h:2
+msgid "Learn the piano just by playing a game"
 msgstr ""
 
 #: ../menu-data/picard:picard.desktop.in.h:1
@@ -13121,12 +13311,12 @@
 msgstr ""
 
 #: ../menu-data/pidgin:pidgin.desktop.in.h:1
-msgid ""
-"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgid "Pidgin Internet Messenger"
 msgstr ""
 
 #: ../menu-data/pidgin:pidgin.desktop.in.h:2
-msgid "Pidgin Internet Messenger"
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 
 #: ../menu-data/pinball:pinball.desktop.in.h:1
@@ -13138,19 +13328,19 @@
 msgstr ""
 
 #: ../menu-data/pingus:pingus.desktop.in.h:1
-msgid "Guide a horde of penguins through various obstacles"
-msgstr "Preveďte hordu tučniakov rozličnými prekážkami"
-
-#: ../menu-data/pingus:pingus.desktop.in.h:2
 msgid "Pingus"
 msgstr "Pingus"
 
+#: ../menu-data/pingus:pingus.desktop.in.h:2
+msgid "Guide a horde of penguins through various obstacles"
+msgstr "Preveďte hordu tučniakov rozličnými prekážkami"
+
 #: ../menu-data/pino:pino.desktop.in.h:1
-msgid "Fast, easy, and free Twitter and Identi.ca client"
+msgid "Pino - Twitter and Identi.ca client"
 msgstr ""
 
 #: ../menu-data/pino:pino.desktop.in.h:2
-msgid "Pino - Twitter and Identi.ca client"
+msgid "Fast, easy, and free Twitter and Identi.ca client"
 msgstr ""
 
 #: ../menu-data/pinot:pinot.desktop.in.h:1
@@ -13178,11 +13368,11 @@
 msgstr ""
 
 #: ../menu-data/pipewalker:pipewalker.desktop.in.h:1
-msgid "Connect all hosts to network!"
+msgid "PipeWalker"
 msgstr ""
 
 #: ../menu-data/pipewalker:pipewalker.desktop.in.h:2
-msgid "PipeWalker"
+msgid "Connect all hosts to network!"
 msgstr ""
 
 #: ../menu-data/pithos:pithos.desktop.in.h:1
@@ -13194,65 +13384,65 @@
 msgstr ""
 
 #: ../menu-data/pitivi:pitivi.desktop.in.h:1
-msgid "Create and edit your own movies"
+msgid "Pitivi Video Editor"
 msgstr ""
 
 #: ../menu-data/pitivi:pitivi.desktop.in.h:2
-msgid "Pitivi Video Editor"
+msgid "Create and edit your own movies"
 msgstr ""
 
 #: ../menu-data/pixbros:pixbros.desktop.in.h:1
-msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop"
+msgid "PIX Bros"
 msgstr ""
 
 #: ../menu-data/pixbros:pixbros.desktop.in.h:2
-msgid "PIX Bros"
+msgid "2D game inspired in Bubble Bobble, Snow Bros and Tumble Pop"
 msgstr ""
 
 #: ../menu-data/pixelize:pixelize.desktop.in.h:1
-msgid "Create an image consisting of many small images"
+msgid "Pixelize"
 msgstr ""
 
 #: ../menu-data/pixelize:pixelize.desktop.in.h:2
-msgid "Pixelize"
+msgid "Create an image consisting of many small images"
 msgstr ""
 
 #: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:1
-msgid "Help the frog cross the street"
+msgid "PIX Frogger"
 msgstr ""
 
 #: ../menu-data/pixfrogger:pixfrogger.desktop.in.h:2
-msgid "PIX Frogger"
+msgid "Help the frog cross the street"
 msgstr ""
 
 #: ../menu-data/planets:planets.desktop.in.h:1
-msgid ""
-"A simple interactive program for playing with simulations of planetary "
-"systems"
+msgid "Planets"
 msgstr ""
 
 #: ../menu-data/planets:planets.desktop.in.h:2
-msgid "Planets"
+msgid ""
+"A simple interactive program for playing with simulations of planetary "
+"systems"
 msgstr ""
 
-#: ../menu-data/planner:planner.desktop.in.h:1
+#: ../menu-data/planner:planner.desktop.in.h:2
 msgid "Planner Project Management"
 msgstr ""
 
 #: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:1
-msgid "An engine for cool desktop eyecandy."
-msgstr "Jadro skvelých efektov na vylepšenie vzhľadu pracovného prostredia"
-
-#: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2
 msgid "SuperKaramba"
 msgstr "SuperKaramba"
 
+#: ../menu-data/plasma-scriptengine-superkaramba:kde4__superkaramba.desktop.in.h:2
+msgid "An engine for cool desktop eyecandy."
+msgstr "Jadro skvelých efektov na vylepšenie vzhľadu pracovného prostredia"
+
 #: ../menu-data/playitslowly:playitslowly.desktop.in.h:1
-msgid "A tool to play back a piece of music at a different speed or pitch"
+msgid "Play it Slowly"
 msgstr ""
 
 #: ../menu-data/playitslowly:playitslowly.desktop.in.h:2
-msgid "Play it Slowly"
+msgid "A tool to play back a piece of music at a different speed or pitch"
 msgstr ""
 
 #: ../menu-data/playonlinux:PlayOnLinux.desktop.in.h:1
@@ -13260,43 +13450,43 @@
 msgstr ""
 
 #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:1
-msgid "Catch your son, he ate all the honey then ran away"
+msgid "Plee the Bear"
 msgstr ""
 
 #: ../menu-data/plee-the-bear:plee-the-bear.desktop.in.h:2
-msgid "Plee the Bear"
+msgid "Catch your son, he ate all the honey then ran away"
 msgstr ""
 
 #: ../menu-data/ploader:ploader.desktop.in.h:1
-msgid "application to upload your pictures to your Piwigo gallery"
+msgid "pLoader"
 msgstr ""
 
 #: ../menu-data/ploader:ploader.desktop.in.h:2
-msgid "pLoader"
+msgid "application to upload your pictures to your Piwigo gallery"
 msgstr ""
 
 #: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:1
-msgid "Personal dashboard for GNUstep"
-msgstr "Osobný riadiaci panel pre GNUstep"
-
-#: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2
 msgid "PlopFolio"
 msgstr ""
 
+#: ../menu-data/plopfolio.app:PlopFolio.desktop.in.h:2
+msgid "Personal dashboard for GNUstep"
+msgstr "Osobný riadiaci panel pre GNUstep"
+
 #: ../menu-data/plotdrop:plotdrop.desktop.in.h:1
-msgid "Drag and Drop graph plotting"
+msgid "PlotDrop"
 msgstr ""
 
 #: ../menu-data/plotdrop:plotdrop.desktop.in.h:2
-msgid "PlotDrop"
+msgid "Drag and Drop graph plotting"
 msgstr ""
 
 #: ../menu-data/podbrowser:podbrowser.desktop.in.h:1
-msgid "Browse Perl Documentation"
+msgid "Pod Browser"
 msgstr ""
 
 #: ../menu-data/podbrowser:podbrowser.desktop.in.h:2
-msgid "Pod Browser"
+msgid "Browse Perl Documentation"
 msgstr ""
 
 #: ../menu-data/poe.app:Poe.desktop.in.h:1
@@ -13308,13 +13498,13 @@
 msgstr "Editor komentárov Vorbis"
 
 #: ../menu-data/poedit:poedit.desktop.in.h:1
-msgid "Gettext catalogs editor"
-msgstr "Editor katalógov Gettext"
-
-#: ../menu-data/poedit:poedit.desktop.in.h:2
 msgid "Poedit"
 msgstr "Poedit"
 
+#: ../menu-data/poedit:poedit.desktop.in.h:2
+msgid "Gettext catalogs editor"
+msgstr "Editor katalógov Gettext"
+
 #: ../menu-data/pokerth:pokerth.desktop.in.h:1
 msgid "PokerTH"
 msgstr "PokerTH"
@@ -13324,35 +13514,35 @@
 msgstr "Pokrová hra Texas hold'em"
 
 #: ../menu-data/pondus:pondus.desktop.in.h:1
-msgid "Keep track of your weight"
+msgid "Pondus"
 msgstr ""
 
 #: ../menu-data/pondus:pondus.desktop.in.h:2
-msgid "Pondus"
+msgid "Keep track of your weight"
 msgstr ""
 
 #: ../menu-data/pornview:Graphics__pornview.desktop.in.h:1
-msgid "Photo/Movie collection manager"
-msgstr "Správca kolekcie obrázkov a videí"
-
-#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2
 msgid "PornView"
 msgstr "PornView"
 
+#: ../menu-data/pornview:Graphics__pornview.desktop.in.h:2
+msgid "Photo/Movie collection manager"
+msgstr "Správca kolekcie obrázkov a videí"
+
 #: ../menu-data/posterazor:posterazor.desktop.in.h:1
-msgid "Cuts a raster image into multipage PDF documents"
+msgid "PosteRazor"
 msgstr ""
 
 #: ../menu-data/posterazor:posterazor.desktop.in.h:2
-msgid "PosteRazor"
+msgid "Cuts a raster image into multipage PDF documents"
 msgstr ""
 
 #: ../menu-data/postler:postler.desktop.in.h:1
-msgid "Lean mail interface"
+msgid "Postler"
 msgstr ""
 
 #: ../menu-data/postler:postler.desktop.in.h:2
-msgid "Postler"
+msgid "Lean mail interface"
 msgstr ""
 
 #: ../menu-data/postr:postr.desktop.in.h:1
@@ -13364,37 +13554,37 @@
 msgstr "Nahrávanie fotografií na Flickr"
 
 #: ../menu-data/pouetchess:pouetChess.desktop.in.h:1
-msgid "Play a game of chess, either against another player or against the AI"
-msgstr "Hra šach, buď proti inému hráčovi alebo proti umelej inteligencii"
-
-#: ../menu-data/pouetchess:pouetChess.desktop.in.h:2
 msgid "pouetChess"
 msgstr "pouetChess"
 
+#: ../menu-data/pouetchess:pouetChess.desktop.in.h:2
+msgid "Play a game of chess, either against another player or against the AI"
+msgstr "Hra šach, buď proti inému hráčovi alebo proti umelej inteligencii"
+
 #: ../menu-data/powder:powder.desktop.in.h:1
-msgid "Graphical dungeon crawling game"
+msgid "Powder"
 msgstr ""
 
 #: ../menu-data/powder:powder.desktop.in.h:2
-msgid "Powder"
+msgid "Graphical dungeon crawling game"
 msgstr ""
 
 #: ../menu-data/powermanga:powermanga.desktop.in.h:1
-msgid "Play a vertical shoot 'em up game"
+msgid "Powermanga"
 msgstr ""
 
 #: ../menu-data/powermanga:powermanga.desktop.in.h:2
-msgid "Powermanga"
+msgid "Play a vertical shoot 'em up game"
 msgstr ""
 
 #: ../menu-data/pptview:pptview.desktop.in.h:1
-msgid "PowerPoint Viewer"
-msgstr "Prehliadač PowerPoint"
-
-#: ../menu-data/pptview:pptview.desktop.in.h:2
 msgid "View PowerPoint presentations"
 msgstr "Zobrazovanie prezentácií PowerPoint"
 
+#: ../menu-data/pptview:pptview.desktop.in.h:2
+msgid "PowerPoint Viewer"
+msgstr "Prehliadač PowerPoint"
+
 #: ../menu-data/pq:pq.desktop.in.h:1
 msgid "Progress Quest"
 msgstr ""
@@ -13404,30 +13594,39 @@
 msgstr ""
 
 #: ../menu-data/praat:praat.desktop.in.h:1
-msgid "Analyze, synthesize and manipulate speech"
+msgid "Praat Speech Analyzer"
 msgstr ""
 
 #: ../menu-data/praat:praat.desktop.in.h:2
-msgid "Praat Speech Analyzer"
+msgid "Analyze, synthesize and manipulate speech"
 msgstr ""
 
 #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:1
-msgid "Batch renaming of files."
+msgid "PrefixSuffix"
 msgstr ""
 
 #: ../menu-data/prefixsuffix:prefixsuffix.desktop.in.h:2
-msgid "PrefixSuffix"
+msgid "Batch renaming of files."
 msgstr ""
 
 #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:1
-msgid "Graphical notification applet for prelude"
+msgid "prelude-notify"
 msgstr ""
 
 #: ../menu-data/prelude-notify:prelude-notify.desktop.in.h:2
-msgid "prelude-notify"
+msgid "Graphical notification applet for prelude"
 msgstr ""
 
-#: ../menu-data/preview.app:Preview.desktop.in.h:2
+#: ../menu-data/prerex:prerex.desktop.in.h:1
+msgid "prerex"
+msgstr ""
+
+#: ../menu-data/prerex:prerex.desktop.in.h:2
+#: ../menu-data/vprerex:vprerex.desktop.in.h:2
+msgid "Edit course prerequisite charts"
+msgstr ""
+
+#: ../menu-data/preview.app:Preview.desktop.in.h:1
 msgid "Preview"
 msgstr "Preview"
 
@@ -13440,11 +13639,11 @@
 msgstr ""
 
 #: ../menu-data/primrose:primrose.desktop.in.h:1
-msgid "Captivating tile-clearing puzzle game"
+msgid "Primrose"
 msgstr ""
 
 #: ../menu-data/primrose:primrose.desktop.in.h:2
-msgid "Primrose"
+msgid "Captivating tile-clearing puzzle game"
 msgstr ""
 
 #: ../menu-data/project-x:projectx.desktop.in.h:1
@@ -13464,38 +13663,38 @@
 msgstr "Oficiálne IDE pre GNUstep"
 
 #: ../menu-data/projectl:projectl.desktop.in.h:1
-msgid "HIZ's ProjectL"
+msgid "ProjectL"
 msgstr ""
 
 #: ../menu-data/projectl:projectl.desktop.in.h:2
-msgid "ProjectL"
+msgid "HIZ's ProjectL"
 msgstr ""
 
 #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:1
-msgid ""
-"A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI"
+msgid "projectM Jack Audio Visualization"
 msgstr ""
 
 #: ../menu-data/projectm-jack:projectM-jack.desktop.in.h:2
-msgid "projectM Jack Audio Visualization"
+msgid ""
+"A milkdrop based music visualizer visualizing JackAudio streams on a Qt4 GUI"
 msgstr ""
 
 #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:1
-msgid "Visualization of PulseAudio streams with projectM"
+msgid "projectM PulseAudio Visualization"
 msgstr ""
 
 #: ../menu-data/projectm-pulseaudio:projectM-pulseaudio.desktop.in.h:2
-msgid "projectM PulseAudio Visualization"
+msgid "Visualization of PulseAudio streams with projectM"
 msgstr ""
 
 #: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:1
-msgid "IDE for GNUstep"
-msgstr "IDE pre GNUstep"
-
-#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2
 msgid "Project Manager IDE"
 msgstr "IDE Riadenia projektov"
 
+#: ../menu-data/projectmanager.app:ProjectManager.desktop.in.h:2
+msgid "IDE for GNUstep"
+msgstr "IDE pre GNUstep"
+
 #: ../menu-data/promoe:promoe.desktop.in.h:1
 msgid "Promoe"
 msgstr ""
@@ -13513,37 +13712,37 @@
 msgstr ""
 
 #: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:1
-#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
-#: ../menu-data/psi:psi.desktop.in.h:1
-msgid "Communicate over the Jabber network"
-msgstr "Komunikátor pre sieť Jabber"
-
-#: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2
 msgid "Psi Plus Webkit"
 msgstr ""
 
+#: ../menu-data/psi-plus-webkit:psi-plus-webkit.desktop.in.h:2
 #: ../menu-data/psi-plus:psi-plus.desktop.in.h:2
+#: ../menu-data/psi:psi.desktop.in.h:2
+msgid "Communicate over the Jabber network"
+msgstr "Komunikátor pre sieť Jabber"
+
+#: ../menu-data/psi-plus:psi-plus.desktop.in.h:1
 msgid "Psi+"
 msgstr ""
 
-#: ../menu-data/psi:psi.desktop.in.h:2
+#: ../menu-data/psi:psi.desktop.in.h:1
 msgid "Psi"
 msgstr "Psi"
 
 #: ../menu-data/pspp:pspp.desktop.in.h:1
-msgid "Analyze statistical data with a free alternative to SPSS"
+msgid "GNU PSPP"
 msgstr ""
 
 #: ../menu-data/pspp:pspp.desktop.in.h:2
-msgid "GNU PSPP"
+msgid "Analyze statistical data with a free alternative to SPSS"
 msgstr ""
 
 #: ../menu-data/psychopy:psychopy.desktop.in.h:1
-msgid "PsychoPy"
+msgid "Psychology Stimuli IDE"
 msgstr ""
 
 #: ../menu-data/psychopy:psychopy.desktop.in.h:2
-msgid "Psychology Stimuli IDE"
+msgid "PsychoPy"
 msgstr ""
 
 #: ../menu-data/pterm:pterm.desktop.in.h:1
@@ -13555,19 +13754,19 @@
 msgstr ""
 
 #: ../menu-data/puddletag:puddletag.desktop.in.h:1
-msgid "Audio Tag Editor"
+msgid "puddletag"
 msgstr ""
 
 #: ../menu-data/puddletag:puddletag.desktop.in.h:2
-msgid "puddletag"
+msgid "Audio Tag Editor"
 msgstr ""
 
 #: ../menu-data/pureadmin:pureadmin.desktop.in.h:1
-msgid "Administer and monitor your FTP server"
+msgid "PureAdmin"
 msgstr ""
 
 #: ../menu-data/pureadmin:pureadmin.desktop.in.h:2
-msgid "PureAdmin"
+msgid "Administer and monitor your FTP server"
 msgstr ""
 
 #: ../menu-data/puredata-core:puredata.desktop.in.h:1
@@ -13579,35 +13778,43 @@
 msgstr ""
 
 #: ../menu-data/purrr:purrr.desktop.in.h:1
-msgid "A Mass-renamer for files"
+msgid "Purrr"
 msgstr ""
 
 #: ../menu-data/purrr:purrr.desktop.in.h:2
-msgid "Purrr"
+msgid "A Mass-renamer for files"
 msgstr ""
 
 #: ../menu-data/putty:putty.desktop.in.h:1
-msgid "Connect to an SSH server with PuTTY"
+msgid "PuTTY SSH Client"
 msgstr ""
 
 #: ../menu-data/putty:putty.desktop.in.h:2
-msgid "PuTTY SSH Client"
+msgid "Connect to an SSH server with PuTTY"
 msgstr ""
 
 #: ../menu-data/pybackpack:pybackpack.desktop.in.h:1
+msgid "File Backup Manager"
+msgstr "Správca zálohovania"
+
+#: ../menu-data/pybackpack:pybackpack.desktop.in.h:2
 msgid "Back up important files"
 msgstr "Zálohovanie dôležitých súborov"
 
-#: ../menu-data/pybackpack:pybackpack.desktop.in.h:2
-msgid "File Backup Manager"
-msgstr "Správca zálohovania"
+#: ../menu-data/pybik:pybik.desktop.in.h:1
+msgid "Pybik"
+msgstr ""
+
+#: ../menu-data/pybik:pybik.desktop.in.h:2
+msgid "The magic cube"
+msgstr ""
 
 #: ../menu-data/pybliographer:pybliographic.desktop.in.h:1
-msgid "Manage bibliographic databases"
+msgid "Pybliographic Bibliography Manager"
 msgstr ""
 
 #: ../menu-data/pybliographer:pybliographic.desktop.in.h:2
-msgid "Pybliographic Bibliography Manager"
+msgid "Manage bibliographic databases"
 msgstr ""
 
 #: ../menu-data/pybridge:pybridge.desktop.in.h:1
@@ -13627,19 +13834,19 @@
 "klient pre pracovné prostredie Gnome"
 
 #: ../menu-data/pygmy:pygmy.desktop.in.h:1
-msgid "GTK+ MPD client"
+msgid "Pygmy"
 msgstr ""
 
 #: ../menu-data/pygmy:pygmy.desktop.in.h:2
-msgid "Pygmy"
+msgid "GTK+ MPD client"
 msgstr ""
 
 #: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:1
-msgid "Minimum-interface PyKaraoke"
+msgid "PyKaraoke Mini"
 msgstr ""
 
 #: ../menu-data/pykaraoke-bin:pykaraoke_mini.desktop.in.h:2
-msgid "PyKaraoke Mini"
+msgid "Minimum-interface PyKaraoke"
 msgstr ""
 
 #: ../menu-data/pykaraoke:pykaraoke.desktop.in.h:1
@@ -13651,35 +13858,35 @@
 msgstr ""
 
 #: ../menu-data/pymca:edfviewer.desktop.in.h:1
-msgid "Display files in ESRF Data Format"
+msgid "EDFviewer"
 msgstr ""
 
 #: ../menu-data/pymca:edfviewer.desktop.in.h:2
-msgid "EDFviewer"
+msgid "Display files in ESRF Data Format"
 msgstr ""
 
 #: ../menu-data/pymca:elementsinfo.desktop.in.h:1
-msgid "Display X-ray information on elements"
+msgid "Elementsinfo"
 msgstr ""
 
 #: ../menu-data/pymca:elementsinfo.desktop.in.h:2
-msgid "Elementsinfo"
+msgid "Display X-ray information on elements"
 msgstr ""
 
 #: ../menu-data/pymca:peakidentifier.desktop.in.h:1
-msgid "Find the energy of X-ray spectral lines"
+msgid "Peakidentifier"
 msgstr ""
 
 #: ../menu-data/pymca:peakidentifier.desktop.in.h:2
-msgid "Peakidentifier"
+msgid "Find the energy of X-ray spectral lines"
 msgstr ""
 
 #: ../menu-data/pymca:pymca.desktop.in.h:1
-msgid "Analyse X-ray Fluorescence data"
+msgid "PyMCA"
 msgstr ""
 
 #: ../menu-data/pymca:pymca.desktop.in.h:2
-msgid "PyMCA"
+msgid "Analyse X-ray Fluorescence data"
 msgstr ""
 
 #: ../menu-data/pymca:pymcaroitool.desktop.in.h:1
@@ -13691,11 +13898,11 @@
 msgstr ""
 
 #: ../menu-data/pymol:pymol.desktop.in.h:1
-msgid "Model molecular structures and produce high-quality images of them"
+msgid "PyMOL Molecular Graphics System"
 msgstr ""
 
 #: ../menu-data/pymol:pymol.desktop.in.h:2
-msgid "PyMOL Molecular Graphics System"
+msgid "Model molecular structures and produce high-quality images of them"
 msgstr ""
 
 #: ../menu-data/pynagram:pynagram.desktop.in.h:1
@@ -13711,11 +13918,11 @@
 msgstr ""
 
 #: ../menu-data/pypar2:pypar2.desktop.in.h:1
-msgid "A graphical frontend for the par2 utility"
+msgid "PyPar2"
 msgstr ""
 
 #: ../menu-data/pypar2:pypar2.desktop.in.h:2
-msgid "PyPar2"
+msgid "A graphical frontend for the par2 utility"
 msgstr ""
 
 #: ../menu-data/pype:pype.desktop.in.h:1
@@ -13730,32 +13937,32 @@
 msgid "PyPI Browser"
 msgstr ""
 
-#: ../menu-data/pyprompter:pyprompter.desktop.in.h:2
+#: ../menu-data/pyprompter:pyprompter.desktop.in.h:1
 msgid "pyprompter"
 msgstr ""
 
 #: ../menu-data/pyracerz:pyracerz.desktop.in.h:1
-msgid "2D racing game"
+msgid "pyRacerz"
 msgstr ""
 
 #: ../menu-data/pyracerz:pyracerz.desktop.in.h:2
-msgid "pyRacerz"
+msgid "2D racing game"
 msgstr ""
 
 #: ../menu-data/pyragua:pyragua.desktop.in.h:1
-msgid "A fast and lightweight IDE using wxPython"
+msgid "Pyragua"
 msgstr ""
 
 #: ../menu-data/pyragua:pyragua.desktop.in.h:2
-msgid "Pyragua"
+msgid "A fast and lightweight IDE using wxPython"
 msgstr ""
 
 #: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:1
-msgid "Mass rename files"
+msgid "pyRenamer"
 msgstr ""
 
 #: ../menu-data/pyrenamer:pyrenamer.desktop.in.h:2
-msgid "pyRenamer"
+msgid "Mass rename files"
 msgstr ""
 
 #: ../menu-data/pyrocket:pyrocket.desktop.in.h:1
@@ -13766,28 +13973,36 @@
 msgid "Enabling Cubicle Warfare on Linux"
 msgstr ""
 
+#: ../menu-data/pyromaths:pyromaths.desktop.in.h:1
+msgid "Pyromaths"
+msgstr ""
+
+#: ../menu-data/pyromaths:pyromaths.desktop.in.h:2
+msgid "Générateur d'exercices de maths"
+msgstr ""
+
 #: ../menu-data/pyroom:pyroom.desktop.in.h:1
-msgid "Distraction free full-screen text editor"
+msgid "PyRoom"
 msgstr ""
 
 #: ../menu-data/pyroom:pyroom.desktop.in.h:2
-msgid "PyRoom"
+msgid "Distraction free full-screen text editor"
 msgstr ""
 
 #: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:1
-msgid "A classical game of words"
+msgid "PyScrabble"
 msgstr ""
 
 #: ../menu-data/pyscrabble:pyscrabble.desktop.in.h:2
-msgid "PyScrabble"
+msgid "A classical game of words"
 msgstr ""
 
 #: ../menu-data/pysdm:pysdm.desktop.in.h:1
-msgid "Management of Storage Devices"
+msgid "Storage Device Manager"
 msgstr ""
 
 #: ../menu-data/pysdm:pysdm.desktop.in.h:2
-msgid "Storage Device Manager"
+msgid "Management of Storage Devices"
 msgstr ""
 
 #: ../menu-data/pysolfc:pysol.desktop.in.h:1
@@ -13795,11 +14010,11 @@
 msgstr ""
 
 #: ../menu-data/pysycache:pysycache-admin.desktop.in.h:1
-msgid "Configuration of PySyCache"
+msgid "Pysycache Admin"
 msgstr ""
 
 #: ../menu-data/pysycache:pysycache-admin.desktop.in.h:2
-msgid "Pysycache Admin"
+msgid "Configuration of PySyCache"
 msgstr ""
 
 #: ../menu-data/pysycache:pysycache.desktop.in.h:1
@@ -13811,21 +14026,21 @@
 msgstr ""
 
 #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:1
-msgid "Interactive tool to simulate acido-basic titrations"
+msgid "pyAcidoBasic"
 msgstr ""
 
 #: ../menu-data/python-acidobasic:pyacidobasic.desktop.in.h:2
-msgid "pyAcidoBasic"
+msgid "Interactive tool to simulate acido-basic titrations"
 msgstr ""
 
 #: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:1
-msgid "Automate your desktop using Dogtail"
-msgstr "Automatizácia vašej plochy pomocou Dogtail"
-
-#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2
 msgid "Dogtail Script Recorder"
 msgstr "Záznam skriptov Dogtail"
 
+#: ../menu-data/python-dogtail:dogtail-recorder.desktop.in.h:2
+msgid "Automate your desktop using Dogtail"
+msgstr "Automatizácia vašej plochy pomocou Dogtail"
+
 #: ../menu-data/python-dogtail:sniff.desktop.in.h:1
 msgid "AT-SPI Browser"
 msgstr "Prehliadač AT-SPI"
@@ -13868,35 +14083,35 @@
 msgstr ""
 
 #: ../menu-data/python-lunch:lunch.desktop.in.h:1
-msgid "Distributed Process Launcher"
+msgid "Lunch"
 msgstr ""
 
 #: ../menu-data/python-lunch:lunch.desktop.in.h:2
-msgid "Lunch"
+msgid "Distributed Process Launcher"
 msgstr ""
 
 #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:1
-msgid "Interactive tool to track moving points in video framesets"
+msgid "pyMecaVideo"
 msgstr ""
 
 #: ../menu-data/python-mecavideo:pymecavideo.desktop.in.h:2
-msgid "pyMecaVideo"
+msgid "Interactive tool to track moving points in video framesets"
 msgstr ""
 
 #: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:1
-msgid "Multiplayer online poker"
+msgid "poker2D"
 msgstr ""
 
 #: ../menu-data/python-poker2d:python-poker2d.desktop.in.h:2
-msgid "poker2D"
+msgid "Multiplayer online poker"
 msgstr ""
 
 #: ../menu-data/python-web2py:web2py.desktop.in.h:1
-msgid "Enterprise web development framework using Python"
+msgid "web2py"
 msgstr ""
 
 #: ../menu-data/python-web2py:web2py.desktop.in.h:2
-msgid "web2py"
+msgid "Enterprise web development framework using Python"
 msgstr ""
 
 #: ../menu-data/python-whiteboard:python-whiteboard.desktop.in.h:1
@@ -13904,11 +14119,11 @@
 msgstr ""
 
 #: ../menu-data/python-wxglade:wxglade.desktop.in.h:1
-msgid "GUI designer written in Python with wxPython"
+msgid "wxGlade"
 msgstr ""
 
 #: ../menu-data/python-wxglade:wxglade.desktop.in.h:2
-msgid "wxGlade"
+msgid "GUI designer written in Python with wxPython"
 msgstr ""
 
 #: ../menu-data/pythoncad:pythoncad.desktop.in.h:1
@@ -13920,30 +14135,30 @@
 msgstr "PythonCAD"
 
 #: ../menu-data/pytrainer:pytrainer.desktop.in.h:1
-msgid "The Free Sport Training Center"
+msgid "pytrainer"
 msgstr ""
 
 #: ../menu-data/pytrainer:pytrainer.desktop.in.h:2
-msgid "pyTrainer"
+msgid "The Free Sport Training Center"
 msgstr ""
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:1
-msgid "Q4Wine"
+msgid "Qt4 utility for Wine applications and prefixes management."
 msgstr ""
 
 #: ../menu-data/q4wine:q4wine.desktop.in.h:2
-msgid "Qt4 utility for Wine applications and prefixes management."
+msgid "Q4Wine"
 msgstr ""
 
 #: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:1
-msgid "Powerful and easy to use calculator"
+msgid "Qalculate!"
 msgstr ""
 
 #: ../menu-data/qalculate-gtk:qalculate-gtk.desktop.in.h:2
-msgid "Qalculate!"
+msgid "Powerful and easy to use calculator"
 msgstr ""
 
-#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:2
+#: ../menu-data/qapt-deb-installer:kde4__qapt-deb-installer.desktop.in.h:1
 msgid "QApt Package Installer"
 msgstr ""
 
@@ -13956,19 +14171,19 @@
 msgstr ""
 
 #: ../menu-data/qasconfig:qasconfig.desktop.in.h:1
-msgid "ALSA configuration browser"
+msgid "QasConfig"
 msgstr ""
 
 #: ../menu-data/qasconfig:qasconfig.desktop.in.h:2
-msgid "QasConfig"
+msgid "ALSA configuration browser"
 msgstr ""
 
 #: ../menu-data/qasmixer:qasmixer.desktop.in.h:1
-msgid "Graphical mixer application for the ALSA"
+msgid "QasMixer"
 msgstr ""
 
 #: ../menu-data/qasmixer:qasmixer.desktop.in.h:2
-msgid "QasMixer"
+msgid "Graphical mixer application for the ALSA"
 msgstr ""
 
 #: ../menu-data/qbittorrent:qBittorrent.desktop.in.h:2
@@ -13976,16 +14191,16 @@
 msgstr ""
 
 #: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:1
+msgid "qcomicbook"
+msgstr ""
+
+#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2
 msgid ""
 "QComicBook is a viewer for comic book archives (cbz, cbr, cbt). QComicBook "
 "has specific features like page preview, thumbnails view, bookmarks, manga "
 "mode for easing comicbook reading."
 msgstr ""
 
-#: ../menu-data/qcomicbook:qcomicbook.desktop.in.h:2
-msgid "qcomicbook"
-msgstr ""
-
 #: ../menu-data/qdacco:qdacco.desktop.in.h:1
 msgid "Qdacco dictionary"
 msgstr ""
@@ -13995,28 +14210,36 @@
 msgstr ""
 
 #: ../menu-data/qdevelop:qdevelop.desktop.in.h:1
-msgid "Development environment for Qt4"
+msgid "QDevelop"
 msgstr ""
 
 #: ../menu-data/qdevelop:qdevelop.desktop.in.h:2
-msgid "QDevelop"
+msgid "Development environment for Qt4"
 msgstr ""
 
-#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:1
-msgid "An electric diagrams editor."
+#: ../menu-data/qdigidoc:qdigidoc-client.desktop.in.h:1
+msgid "DigiDoc3 Client"
+msgstr ""
+
+#: ../menu-data/qdigidoc:qdigidoc-crypto.desktop.in.h:1
+msgid "DigiDoc3 Crypto"
 msgstr ""
 
 #. Encoding=UTF-8
-#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3
+#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:2
 msgid "QElectroTech"
 msgstr ""
 
+#: ../menu-data/qelectrotech:qelectrotech.desktop.in.h:3
+msgid "An electric diagrams editor."
+msgstr ""
+
 #: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:1
-msgid "Manage virtual machine configurations"
+msgid "Qemu Launcher"
 msgstr ""
 
 #: ../menu-data/qemu-launcher:qemu-launcher.desktop.in.h:2
-msgid "Qemu Launcher"
+msgid "Manage virtual machine configurations"
 msgstr ""
 
 #: ../menu-data/qemulator:qemulator.desktop.in.h:1
@@ -14027,28 +14250,32 @@
 msgid "Qemulator"
 msgstr ""
 
+#: ../menu-data/qesteidutil:qesteidutil.desktop.in.h:1
+msgid "ID-card Utility"
+msgstr ""
+
 #: ../menu-data/qfreefax:qfreefax.desktop.in.h:1
-msgid "GUI for fax fonctionality provided by French ISP \"Free\""
+msgid "qFreeFax"
 msgstr ""
 
 #: ../menu-data/qfreefax:qfreefax.desktop.in.h:2
-msgid "qFreeFax"
+msgid "GUI for fax fonctionality provided by French ISP \"Free\""
 msgstr ""
 
 #: ../menu-data/qgis:qgis.desktop.in.h:1
-msgid "Geographical Information System"
+msgid "Quantum GIS"
 msgstr ""
 
 #: ../menu-data/qgis:qgis.desktop.in.h:2
-msgid "Quantum GIS"
+msgid "Geographical Information System"
 msgstr ""
 
 #: ../menu-data/qgit:qgit.desktop.in.h:1
-msgid "git GUI viewer"
+msgid "qgit"
 msgstr ""
 
 #: ../menu-data/qgit:qgit.desktop.in.h:2
-msgid "qgit"
+msgid "git GUI viewer"
 msgstr ""
 
 #: ../menu-data/qgo:kde__qgo.desktop.in.h:1
@@ -14064,11 +14291,11 @@
 msgstr ""
 
 #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:1
-msgid "GPS device mapping utility"
+msgid "QLandkarteGT"
 msgstr ""
 
 #: ../menu-data/qlandkartegt:qlandkartegt.desktop.in.h:2
-msgid "QLandkarteGT"
+msgid "GPS device mapping utility"
 msgstr ""
 
 #: ../menu-data/qliss3d:qliss3d.desktop.in.h:1
@@ -14080,20 +14307,20 @@
 msgstr ""
 
 #: ../menu-data/qlix:qlix.desktop.in.h:1
-msgid ""
-"Manage tracks, files, and playlists between a host computer and an MTP device"
+msgid "Qlix"
 msgstr ""
 
 #: ../menu-data/qlix:qlix.desktop.in.h:2
-msgid "Qlix"
+msgid ""
+"Manage tracks, files, and playlists between a host computer and an MTP device"
 msgstr ""
 
 #: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:1
-msgid "Arpeggiator-Sequencer-LFO"
+msgid "QMidiArp"
 msgstr ""
 
 #: ../menu-data/qmidiarp:qmidiarp.desktop.in.h:2
-msgid "QMidiArp"
+msgid "Arpeggiator-Sequencer-LFO"
 msgstr ""
 
 #: ../menu-data/qmidinet:qmidinet.desktop.in.h:1
@@ -14104,21 +14331,21 @@
 msgid "QmidiNet is a MIDI Network Gateway via UDP/IP Multicast"
 msgstr ""
 
-#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:1
-msgid "MIDI router and filter utility"
+#. Icon=qmidiroute
+#: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:2
+msgid "QMidiRoute"
 msgstr ""
 
-#. Icon=qmidiroute
 #: ../menu-data/qmidiroute:qmidiroute.desktop.in.h:3
-msgid "QMidiRoute"
+msgid "MIDI router and filter utility"
 msgstr ""
 
 #: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:1
-msgid "A tool to configure a Mikrokopter "
+msgid "QMK-Groundstation"
 msgstr ""
 
 #: ../menu-data/qmk-groundstation:qmk-groundstation.desktop.in.h:2
-msgid "QMK-Groundstation"
+msgid "A tool to configure a Mikrokopter "
 msgstr ""
 
 #: ../menu-data/qmmp:qmmp.desktop.in.h:1
@@ -14130,11 +14357,11 @@
 msgstr ""
 
 #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:1
-msgid "A nicer MPD client"
+msgid "QMPDClient"
 msgstr ""
 
 #: ../menu-data/qmpdclient:qmpdclient.desktop.in.h:2
-msgid "QMPDClient"
+msgid "A nicer MPD client"
 msgstr ""
 
 #: ../menu-data/qprogram-starter:qprogram-starter.desktop.in.h:1
@@ -14142,19 +14369,19 @@
 msgstr ""
 
 #: ../menu-data/qpxtool:qpxtool.desktop.in.h:1
-msgid "CD/DVD media quality checker"
+msgid "QPxTool"
 msgstr ""
 
 #: ../menu-data/qpxtool:qpxtool.desktop.in.h:2
-msgid "QPxTool"
+msgid "CD/DVD media quality checker"
 msgstr ""
 
 #: ../menu-data/qrfcview:qrfcview.desktop.in.h:1
-msgid "Downloads and displays RFC"
+msgid "qRFCView"
 msgstr ""
 
 #: ../menu-data/qrfcview:qrfcview.desktop.in.h:2
-msgid "qRFCView"
+msgid "Downloads and displays RFC"
 msgstr ""
 
 #: ../menu-data/qsampler:qsampler.desktop.in.h:1
@@ -14178,19 +14405,19 @@
 msgstr ""
 
 #: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:1
-msgid "Highlight your sources"
+msgid "QSource-Highlight"
 msgstr ""
 
 #: ../menu-data/qsource-highlight:qsource-highlight.desktop.in.h:2
-msgid "QSource-Highlight"
+msgid "Highlight your sources"
 msgstr ""
 
 #: ../menu-data/qstardict:qstardict.desktop.in.h:1
-msgid "QStarDict"
+msgid "QStarDict is Qt version of StarDict"
 msgstr ""
 
 #: ../menu-data/qstardict:qstardict.desktop.in.h:2
-msgid "QStarDict is Qt version of StarDict"
+msgid "QStarDict"
 msgstr ""
 
 #: ../menu-data/qsynth:qsynth.desktop.in.h:1
@@ -14226,29 +14453,29 @@
 msgstr ""
 
 #: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:1
-msgid "A graphical configuration tool for programs using Qt 3"
+msgid "Qt3 Configuration"
 msgstr ""
 
 #: ../menu-data/qt3-qtconfig:qt3config.desktop.in.h:2
-msgid "Qt3 Configuration"
+msgid "A graphical configuration tool for programs using Qt 3"
 msgstr ""
 
 #: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:1
-msgid "Interface Designer"
-msgstr "Návrh rozhrania"
-
-#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2
 msgid "Qt 4 Designer"
 msgstr "Návrhár Qt4"
 
-#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1
-msgid "Document Browser"
-msgstr "Prehliadač dokumentov"
+#: ../menu-data/qt4-designer:designer-qt4.desktop.in.h:2
+msgid "Interface Designer"
+msgstr "Návrh rozhrania"
 
-#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2
+#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:1
 msgid "Qt 4 Assistant"
 msgstr "Qt 4 Asistent"
 
+#: ../menu-data/qt4-dev-tools:assistant-qt4.desktop.in.h:2
+msgid "Document Browser"
+msgstr "Prehliadač dokumentov"
+
 #: ../menu-data/qt4-dev-tools:linguist-qt4.desktop.in.h:1
 msgid "Qt 4 Linguist"
 msgstr ""
@@ -14270,35 +14497,35 @@
 msgstr "Digitálny multimeter"
 
 #: ../menu-data/qtemu:qtemu.desktop.in.h:1
-msgid "Frontend to QEMU virtual machine monitor"
+msgid "QtEmu"
 msgstr ""
 
 #: ../menu-data/qtemu:qtemu.desktop.in.h:2
-msgid "QtEmu"
+msgid "Frontend to QEMU virtual machine monitor"
 msgstr ""
 
-#: ../menu-data/qterm:qterm.desktop.in.h:2
+#: ../menu-data/qterm:qterm.desktop.in.h:1
 msgid "QTerm"
 msgstr ""
 
 #: ../menu-data/qtgain:QtGain.desktop.in.h:1
-msgid "Add \"gain\" tags to your audio files"
+msgid "QtGain"
 msgstr ""
 
 #: ../menu-data/qtgain:QtGain.desktop.in.h:2
-msgid "QtGain"
+msgid "Add \"gain\" tags to your audio files"
 msgstr ""
 
-#: ../menu-data/qtikz:qtikz.desktop.in.h:2
+#: ../menu-data/qtikz:qtikz.desktop.in.h:1
 msgid "QTikZ"
 msgstr ""
 
 #: ../menu-data/qtiplot:qtiplot.desktop.in.h:1
-msgid "Analyze and plot scientific data"
+msgid "QtiPlot"
 msgstr ""
 
 #: ../menu-data/qtiplot:qtiplot.desktop.in.h:2
-msgid "QtiPlot"
+msgid "Analyze and plot scientific data"
 msgstr ""
 
 #: ../menu-data/qtm:qtm.desktop.in.h:1
@@ -14310,19 +14537,19 @@
 msgstr ""
 
 #: ../menu-data/qtnx:qtnx.desktop.in.h:1
-msgid "Client for NX remote desktop"
+msgid "QTNX"
 msgstr ""
 
 #: ../menu-data/qtnx:qtnx.desktop.in.h:2
-msgid "QTNX"
+msgid "Client for NX remote desktop"
 msgstr ""
 
 #: ../menu-data/qtoctave:qtoctave.desktop.in.h:1
-msgid "Graphical Qt frontend for GNU Octave"
+msgid "QtOctave"
 msgstr ""
 
 #: ../menu-data/qtoctave:qtoctave.desktop.in.h:2
-msgid "QtOctave"
+msgid "Graphical Qt frontend for GNU Octave"
 msgstr ""
 
 #: ../menu-data/qtodo:qtodo.desktop.in.h:1
@@ -14372,60 +14599,84 @@
 msgstr ""
 
 #: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:1
+msgid "Quadrapassel"
+msgstr ""
+
+#: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2
 msgid "Fit falling blocks together"
 msgstr "Skladajte padajúce bloky"
 
-#: ../menu-data/quadrapassel:quadrapassel.desktop.in.h:2
-msgid "Quadrapassel"
+#: ../menu-data/quake3:quake3.desktop.in.h:1
+msgid "Quake III Arena"
 msgstr ""
 
-#: ../menu-data/quake3:quake3.desktop.in.h:1
+#: ../menu-data/quake3:quake3.desktop.in.h:2
 msgid "Play the original Quake III Arena"
 msgstr ""
 
-#: ../menu-data/quake3:quake3.desktop.in.h:2
-msgid "Quake III Arena"
+#: ../menu-data/quake:quake-armagon.desktop.in.h:1
+msgid "Quake: Scourge of Armagon"
+msgstr ""
+
+#: ../menu-data/quake:quake-armagon.desktop.in.h:2
+msgid "Mission Pack 1 for the classic first person shooter"
+msgstr ""
+
+#: ../menu-data/quake:quake-dissolution.desktop.in.h:1
+msgid "Quake: Dissolution of Eternity"
+msgstr ""
+
+#: ../menu-data/quake:quake-dissolution.desktop.in.h:2
+msgid "Mission Pack 2 for the classic first person shooter"
+msgstr ""
+
+#: ../menu-data/quake:quake.desktop.in.h:1
+msgid "Quake"
+msgstr ""
+
+#: ../menu-data/quake:quake.desktop.in.h:2
+msgid "Classic first person shooter"
 msgstr ""
 
 #: ../menu-data/quarry:quarry.desktop.in.h:1
-msgid "A multi-purpose board game GUI for Go, Amazons and Reversi"
+msgid "Quarry"
 msgstr ""
 
 #: ../menu-data/quarry:quarry.desktop.in.h:2
-msgid "Quarry"
+msgid "A multi-purpose board game GUI for Go, Amazons and Reversi"
 msgstr ""
 
 #: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:1
 #: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:1
-#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1
-#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1
-msgid "Distributed IRC client with central core component"
-msgstr "Distribuovaný IRC klient s centrálnym základným komponentom"
-
-#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2
-#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2
 msgid "Quassel IRC (Client only)"
 msgstr "Quassel IRC (iba klient)"
 
+#: ../menu-data/quassel-client-qt4:quasselclient.desktop.in.h:2
+#: ../menu-data/quassel-client:kde4__quasselclient.desktop.in.h:2
 #: ../menu-data/quassel-qt4:quassel.desktop.in.h:2
 #: ../menu-data/quassel:kde4__quassel.desktop.in.h:2
+msgid "Distributed IRC client with central core component"
+msgstr "Distribuovaný IRC klient s centrálnym základným komponentom"
+
+#: ../menu-data/quassel-qt4:quassel.desktop.in.h:1
+#: ../menu-data/quassel:kde4__quassel.desktop.in.h:1
 msgid "Quassel IRC"
 msgstr "Quassel IRC"
 
 #: ../menu-data/qucs:qucs.desktop.in.h:1
-msgid "A Universal Circuit Simulator"
+msgid "Qucs"
 msgstr ""
 
 #: ../menu-data/qucs:qucs.desktop.in.h:2
-msgid "Qucs"
+msgid "A Universal Circuit Simulator"
 msgstr ""
 
 #: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:1
-msgid "A graphical interface for easily configuring Synergy"
+msgid "QuickSynergy"
 msgstr ""
 
 #: ../menu-data/quicksynergy:quicksynergy.desktop.in.h:2
-msgid "QuickSynergy"
+msgid "A graphical interface for easily configuring Synergy"
 msgstr ""
 
 #: ../menu-data/quitcount:quitcount.desktop.in.h:1
@@ -14437,11 +14688,11 @@
 msgstr ""
 
 #: ../menu-data/quodlibet:quodlibet.desktop.in.h:1
-msgid "Listen to, browse, or edit your audio collection"
+msgid "Quod Libet"
 msgstr ""
 
 #: ../menu-data/quodlibet:quodlibet.desktop.in.h:2
-msgid "Quod Libet"
+msgid "Listen to, browse, or edit your audio collection"
 msgstr ""
 
 #: ../menu-data/qutecom:qutecom.desktop.in.h:1
@@ -14455,27 +14706,27 @@
 msgstr ""
 
 #: ../menu-data/qutim:qutim.desktop.in.h:1
-msgid "Communicate over IM"
+msgid "qutIM"
 msgstr ""
 
 #: ../menu-data/qutim:qutim.desktop.in.h:2
-msgid "qutIM"
+msgid "Communicate over IM"
 msgstr ""
 
 #: ../menu-data/qv4l2:qv4l2.desktop.in.h:1
-msgid "Allow testing Video4Linux devices"
+msgid "QT V4L2 test Utility"
 msgstr ""
 
 #: ../menu-data/qv4l2:qv4l2.desktop.in.h:2
-msgid "QT V4L2 test Utility"
+msgid "Allow testing Video4Linux devices"
 msgstr ""
 
 #: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:1
-msgid "Interfaccia grafica per ViaggiaTreno"
+msgid "QViaggiaTreno"
 msgstr ""
 
 #: ../menu-data/qviaggiatreno:qviaggiatreno.desktop.in.h:2
-msgid "QViaggiaTreno"
+msgid "Interfaccia grafica per ViaggiaTreno"
 msgstr ""
 
 #: ../menu-data/qwbfsmanager:QWBFSManager.desktop.in.h:1
@@ -14489,35 +14740,27 @@
 msgstr ""
 
 #: ../menu-data/qweborf:qweborf.desktop.in.h:1
-msgid "Shares files using the HTTP protocol"
-msgstr ""
-
-#: ../menu-data/qweborf:qweborf.desktop.in.h:2
 msgid "qweborf"
 msgstr ""
 
-#: ../menu-data/qwit:qwit.desktop.in.h:1
-msgid "Qt4 Twitter Client"
-msgstr ""
-
-#: ../menu-data/qwit:qwit.desktop.in.h:2
-msgid "Qwit"
+#: ../menu-data/qweborf:qweborf.desktop.in.h:2
+msgid "Shares files using the HTTP protocol"
 msgstr ""
 
 #: ../menu-data/qwo:qwo.desktop.in.h:1
-msgid "An input method for touchscreens"
+msgid "qwo"
 msgstr ""
 
 #: ../menu-data/qwo:qwo.desktop.in.h:2
-msgid "qwo"
+msgid "An input method for touchscreens"
 msgstr ""
 
 #: ../menu-data/qxw:qxw.desktop.in.h:1
-msgid "Construct crossword puzzles"
+msgid "Qxw"
 msgstr ""
 
 #: ../menu-data/qxw:qxw.desktop.in.h:2
-msgid "Qxw"
+msgid "Construct crossword puzzles"
 msgstr ""
 
 #: ../menu-data/r-cran-rcmdr:Rcmdr.desktop.in.h:1
@@ -14541,38 +14784,38 @@
 msgstr ""
 
 #: ../menu-data/raincat:raincat.desktop.in.h:1
-msgid "2D puzzle game featuring a fuzzy little cat"
+msgid "Raincat"
 msgstr ""
 
 #: ../menu-data/raincat:raincat.desktop.in.h:2
-msgid "Raincat"
+msgid "2D puzzle game featuring a fuzzy little cat"
 msgstr ""
 
 #: ../menu-data/rakarrack:rakarrack.desktop.in.h:1
-msgid "Guitar Effects Processor"
+msgid "Rakarrack"
 msgstr ""
 
 #: ../menu-data/rakarrack:rakarrack.desktop.in.h:2
-msgid "Rakarrack"
+msgid "Guitar Effects Processor"
 msgstr ""
 
 #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:1
-msgid ""
-"Download photos and videos from cameras, memory cards and Portable Storage "
-"Devices"
+msgid "Rapid Photo Downloader"
 msgstr ""
 
 #: ../menu-data/rapid-photo-downloader:rapid-photo-downloader.desktop.in.h:2
-msgid "Rapid Photo Downloader"
+msgid ""
+"Download photos and videos from cameras, memory cards and Portable Storage "
+"Devices"
 msgstr ""
 
 #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:1
-#: ../menu-data/subcommander:subcommander.desktop.in.h:1
-msgid "A GUI Client for Subversion"
+msgid "RapidSVN"
 msgstr ""
 
 #: ../menu-data/rapidsvn:rapidsvn.desktop.in.h:2
-msgid "RapidSVN"
+#: ../menu-data/subcommander:subcommander.desktop.in.h:2
+msgid "A GUI Client for Subversion"
 msgstr ""
 
 #: ../menu-data/rasmol:rasmol-gtk.desktop.in.h:1
@@ -14600,11 +14843,11 @@
 msgstr ""
 
 #: ../menu-data/rbbr:rbbr.desktop.in.h:1
-msgid "Browse Ruby Classes and Modules"
+msgid "Ruby Browser"
 msgstr ""
 
 #: ../menu-data/rbbr:rbbr.desktop.in.h:2
-msgid "Ruby Browser"
+msgid "Browse Ruby Classes and Modules"
 msgstr ""
 
 #: ../menu-data/recoll:recoll-searchgui.desktop.in.h:1
@@ -14619,73 +14862,73 @@
 msgid "RecordItNow"
 msgstr ""
 
-#: ../menu-data/rednotebook:rednotebook.desktop.in.h:1
-msgid "Daily journal with calendar, templates and keyword searching "
+#. Encoding=UTF-­8 #Encoding causes problems
+#: ../menu-data/rednotebook:rednotebook.desktop.in.h:2
+msgid "RedNotebook"
 msgstr ""
 
-#. Encoding=UTF-­8 #Encoding causes problems
 #: ../menu-data/rednotebook:rednotebook.desktop.in.h:3
-msgid "RedNotebook"
+msgid "Daily journal with calendar, templates and keyword searching "
 msgstr ""
 
 #: ../menu-data/referencer:referencer.desktop.in.h:1
-msgid "Document organiser"
+msgid "Referencer"
 msgstr ""
 
 #: ../menu-data/referencer:referencer.desktop.in.h:2
-msgid "Referencer"
+msgid "Document organiser"
 msgstr ""
 
 #: ../menu-data/regexxer:regexxer.desktop.in.h:1
-msgid "Search and replace using regular expressions"
+msgid "regexxer Search Tool"
 msgstr ""
 
 #: ../menu-data/regexxer:regexxer.desktop.in.h:2
-msgid "regexxer Search Tool"
+msgid "Search and replace using regular expressions"
 msgstr ""
 
 #: ../menu-data/regina-normal:kde4__regina.desktop.in.h:1
-msgid "A Normal Surface Theory Calculator"
+msgid "Regina"
 msgstr ""
 
 #: ../menu-data/regina-normal:kde4__regina.desktop.in.h:2
-msgid "Regina"
+msgid "A Normal Surface Theory Calculator"
 msgstr ""
 
 #: ../menu-data/reinteract:reinteract.desktop.in.h:1
-msgid "Interactive Python shell"
+msgid "Reinteract"
 msgstr ""
 
 #: ../menu-data/reinteract:reinteract.desktop.in.h:2
-msgid "Reinteract"
+msgid "Interactive Python shell"
 msgstr ""
 
-#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:2
+#: ../menu-data/rekonq:kde4__rekonq.desktop.in.h:1
 msgid "rekonq"
 msgstr "rekonq"
 
 #: ../menu-data/relational:relational.desktop.in.h:1
-msgid "Learn and experiment relational algebra"
+msgid "Relational"
 msgstr ""
 
 #: ../menu-data/relational:relational.desktop.in.h:2
-msgid "Relational"
+msgid "Learn and experiment relational algebra"
 msgstr ""
 
 #: ../menu-data/reminiscence:reminiscence.desktop.in.h:1
-msgid "A port of FlashBack game engine"
+msgid "REminiscence"
 msgstr ""
 
 #: ../menu-data/reminiscence:reminiscence.desktop.in.h:2
-msgid "REminiscence"
+msgid "A port of FlashBack game engine"
 msgstr ""
 
 #: ../menu-data/remmina:remmina.desktop.in.h:1
-msgid "Connect to remote desktops"
+msgid "Remmina Remote Desktop Client"
 msgstr ""
 
 #: ../menu-data/remmina:remmina.desktop.in.h:2
-msgid "Remmina Remote Desktop Client"
+msgid "Connect to remote desktops"
 msgstr ""
 
 #: ../menu-data/renpy-demo:renpy-demo.desktop.in.h:1
@@ -14713,11 +14956,11 @@
 msgstr ""
 
 #: ../menu-data/resapplet:resapplet.desktop.in.h:1
-msgid "Change your screen resolution"
+msgid "Resolution Switcher"
 msgstr ""
 
 #: ../menu-data/resapplet:resapplet.desktop.in.h:2
-msgid "Resolution Switcher"
+msgid "Change your screen resolution"
 msgstr ""
 
 #: ../menu-data/retext:retext.desktop.in.h:1
@@ -14729,11 +14972,11 @@
 msgstr ""
 
 #: ../menu-data/revelation:revelation.desktop.in.h:1
-msgid "Organize and secure your passwords"
+msgid "Revelation Password Manager"
 msgstr ""
 
 #: ../menu-data/revelation:revelation.desktop.in.h:2
-msgid "Revelation Password Manager"
+msgid "Organize and secure your passwords"
 msgstr ""
 
 #: ../menu-data/rfdump:rfdump.desktop.in.h:1
@@ -14745,11 +14988,11 @@
 msgstr ""
 
 #: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:1
-msgid "Very basic painting program"
+msgid "rgbPaint"
 msgstr ""
 
 #: ../menu-data/rgbpaint:rgbpaint.desktop.in.h:2
-msgid "rgbPaint"
+msgid "Very basic painting program"
 msgstr ""
 
 #: ../menu-data/rhinote:rhinote.desktop.in.h:1
@@ -14760,7 +15003,7 @@
 msgid "Virtual sticky-notes"
 msgstr ""
 
-#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:2
+#: ../menu-data/rhythmbox:rhythmbox.desktop.in.h:1
 msgid "Rhythmbox Music Player"
 msgstr ""
 
@@ -14773,60 +15016,60 @@
 msgstr ""
 
 #: ../menu-data/ripoff:ripoff.desktop.in.h:1
-msgid "Rip audio from your CDs"
+msgid "RipOff"
 msgstr ""
 
 #: ../menu-data/ripoff:ripoff.desktop.in.h:2
-msgid "RipOff"
+msgid "Rip audio from your CDs"
 msgstr ""
 
 #: ../menu-data/ripperx:ripperx.desktop.in.h:1
-msgid "Rip Cds"
+msgid "Ripper X"
 msgstr ""
 
 #: ../menu-data/ripperx:ripperx.desktop.in.h:2
-msgid "Ripper X"
+msgid "Rip Cds"
 msgstr ""
 
 #: ../menu-data/ristretto:ristretto.desktop.in.h:1
-msgid "Look at your images's easily"
+msgid "Ristretto Image Viewer"
 msgstr ""
 
 #: ../menu-data/ristretto:ristretto.desktop.in.h:2
-msgid "Ristretto Image Viewer"
+msgid "Look at your images easily"
 msgstr ""
 
 #: ../menu-data/rkward:kde4__rkward.desktop.in.h:1
-msgid "GUI for the R-project"
-msgstr "Grafické používateľské rozhranie pre R-project"
-
-#: ../menu-data/rkward:kde4__rkward.desktop.in.h:2
 msgid "RKWard"
 msgstr "RKWard"
 
+#: ../menu-data/rkward:kde4__rkward.desktop.in.h:2
+msgid "GUI for the R-project"
+msgstr "Grafické používateľské rozhranie pre R-project"
+
 #: ../menu-data/rlplot:rlplot.desktop.in.h:1
-msgid "Generate publication quality graphs"
+msgid "Rlplot Graph Generator"
 msgstr ""
 
 #: ../menu-data/rlplot:rlplot.desktop.in.h:2
-msgid "Rlplot Graph Generator"
+msgid "Generate publication quality graphs"
 msgstr ""
 
-#. GNOME and KDE 3 uses Comment.
-#: ../menu-data/rlvm:rlvm.desktop.in.h:2
-msgid "RealLive Emulator"
+#: ../menu-data/rlvm:rlvm.desktop.in.h:1
+msgid "rlvm"
 msgstr ""
 
+#. GNOME and KDE 3 uses Comment.
 #: ../menu-data/rlvm:rlvm.desktop.in.h:3
-msgid "rlvm"
+msgid "RealLive Emulator"
 msgstr ""
 
 #: ../menu-data/robocode:robocode.desktop.in.h:1
-msgid "Java programming game based on battle tanks"
+msgid "Robocode"
 msgstr ""
 
 #: ../menu-data/robocode:robocode.desktop.in.h:2
-msgid "Robocode"
+msgid "Java programming game based on battle tanks"
 msgstr ""
 
 #: ../menu-data/robocut:robocut.desktop.in.h:1
@@ -14838,11 +15081,11 @@
 msgstr ""
 
 #: ../menu-data/rocs:kde4__rocs.desktop.in.h:1
-msgid "Graph Theory Tool for Professors and Students."
+msgid "Rocs"
 msgstr ""
 
 #: ../menu-data/rocs:kde4__rocs.desktop.in.h:2
-msgid "Rocs"
+msgid "Graph Theory Tool for Professors and Students."
 msgstr ""
 
 #: ../menu-data/rootstock-gtk:rootstock.desktop.in.h:1
@@ -14858,12 +15101,12 @@
 msgstr ""
 
 #: ../menu-data/rott:rott.desktop.in.h:1
-msgid ""
-"A high quality, fast scrolling first-person perspective 3D action game"
+msgid "Rise of the Triad"
 msgstr ""
 
 #: ../menu-data/rott:rott.desktop.in.h:2
-msgid "Rise of the Triad"
+msgid ""
+"A high quality, fast scrolling first-person perspective 3D action game"
 msgstr ""
 
 #: ../menu-data/roxterm:roxterm.desktop.in.h:1
@@ -14871,35 +15114,35 @@
 msgstr ""
 
 #: ../menu-data/rrootage:rrootage.desktop.in.h:1
-msgid "Destroy autocreated battleships"
+msgid "rRootage"
 msgstr ""
 
 #: ../menu-data/rrootage:rrootage.desktop.in.h:2
-msgid "rRootage"
+msgid "Destroy autocreated battleships"
 msgstr ""
 
 #: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:1
-msgid "Makes sure you rest now and then"
-msgstr "Zabezpečuje, aby ste si občas odpočinuli"
-
-#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2
 msgid "RSIBreak"
 msgstr "RSIBreak"
 
+#: ../menu-data/rsibreak:kde4__rsibreak.desktop.in.h:2
+msgid "Makes sure you rest now and then"
+msgstr "Zabezpečuje, aby ste si občas odpočinuli"
+
 #: ../menu-data/rubrica:rubrica2.desktop.in.h:1
-msgid "Manage contacts and addresses"
+msgid "Rubrica Addressbook"
 msgstr ""
 
 #: ../menu-data/rubrica:rubrica2.desktop.in.h:2
-msgid "Rubrica Addressbook"
+msgid "Manage contacts and addresses"
 msgstr ""
 
 #: ../menu-data/rutilt:rutilt.desktop.in.h:1
-msgid "Manage your wireless network interfaces"
+msgid "RutilT WLAN Manager"
 msgstr ""
 
 #: ../menu-data/rutilt:rutilt.desktop.in.h:2
-msgid "RutilT WLAN Manager"
+msgid "Manage your wireless network interfaces"
 msgstr ""
 
 #: ../menu-data/rygel:rygel.desktop.in.h:1
@@ -14910,20 +15153,12 @@
 msgid "UPnP/DLNA Services"
 msgstr ""
 
-#: ../menu-data/sabayon:sabayon.desktop.in.h:1
-msgid "Establish and Edit Profiles for Users"
-msgstr ""
-
-#: ../menu-data/sabayon:sabayon.desktop.in.h:2
-msgid "User Profile Editor"
-msgstr ""
-
 #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:1
-msgid "Download from usenet"
+msgid "SABnzbd+"
 msgstr ""
 
 #: ../menu-data/sabnzbdplus:sabnzbdplus.desktop.in.h:2
-msgid "SABnzbd+"
+msgid "Download from usenet"
 msgstr ""
 
 #: ../menu-data/sadms:sadms.desktop.in.h:1
@@ -14939,55 +15174,47 @@
 msgstr ""
 
 #: ../menu-data/sagasu:sagasu.desktop.in.h:1
-msgid "GNOME tool to find strings in a set of files"
+msgid "Sagasu"
 msgstr ""
 
 #: ../menu-data/sagasu:sagasu.desktop.in.h:2
-msgid "Sagasu"
+msgid "GNOME tool to find strings in a set of files"
 msgstr ""
 
 #: ../menu-data/sagcad:sagcad.desktop.in.h:1
-msgid "Draw and create"
+msgid "SagCAD"
 msgstr ""
 
 #: ../menu-data/sagcad:sagcad.desktop.in.h:2
-msgid "SagCAD"
+msgid "Draw and create"
 msgstr ""
 
 #: ../menu-data/sailcut:sailcut.desktop.in.h:1
-msgid "Sail Design Application"
+msgid "Sailcut CAD"
 msgstr ""
 
 #: ../menu-data/sailcut:sailcut.desktop.in.h:2
-msgid "Sailcut CAD"
+msgid "Sail Design Application"
 msgstr ""
 
 #: ../menu-data/sakura:sakura.desktop.in.h:1
 msgid "Sakura"
 msgstr ""
 
-#: ../menu-data/salasaga:salasaga.desktop.in.h:1
-msgid "Create eLearning for desktop applications"
-msgstr ""
-
-#: ../menu-data/salasaga:salasaga.desktop.in.h:2
-msgid "Salasaga"
-msgstr ""
-
 #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:1
-msgid "Create 3D games and worlds"
+msgid "Platinum Arts Sandbox Gamemaker"
 msgstr ""
 
 #: ../menu-data/sandboxgamemaker:sandboxgamemaker.desktop.in.h:2
-msgid "Platinum Arts Sandbox Gamemaker"
+msgid "Create 3D games and worlds"
 msgstr ""
 
 #: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:1
-msgid "A networked, fast-paced 3D first-person shooter"
+msgid "Sauerbraten"
 msgstr ""
 
 #: ../menu-data/sauerbraten:sauerbraten.desktop.in.h:2
-msgid "Sauerbraten"
+msgid "A networked, fast-paced 3D first-person shooter"
 msgstr ""
 
 #: ../menu-data/sawfish:sawfish.desktop.in.h:1
@@ -14995,11 +15222,11 @@
 msgstr ""
 
 #: ../menu-data/scantailor:scantailor.desktop.in.h:1
-msgid "Interactive post-processing tool for scanned pages"
+msgid "Scan Tailor"
 msgstr ""
 
 #: ../menu-data/scantailor:scantailor.desktop.in.h:2
-msgid "Scan Tailor"
+msgid "Interactive post-processing tool for scanned pages"
 msgstr ""
 
 #: ../menu-data/scenic:scenic.desktop.in.h:1
@@ -15011,11 +15238,11 @@
 msgstr ""
 
 #: ../menu-data/scidavis:scidavis.desktop.in.h:1
-msgid "Application for scientific data analysis and visualization"
+msgid "SciDAVis"
 msgstr ""
 
 #: ../menu-data/scidavis:scidavis.desktop.in.h:2
-msgid "SciDAVis"
+msgid "Application for scientific data analysis and visualization"
 msgstr ""
 
 #: ../menu-data/scilab-cli:scilab-cli.desktop.in.h:1
@@ -15044,36 +15271,33 @@
 msgid "Setup utility for Smart Common Input Method platform"
 msgstr ""
 
+#: ../menu-data/scite:SciTE.desktop.in.h:1
 #: ../menu-data/scite:scite.desktop.in.h:1
-msgid "Programming editor"
+msgid "SciTE Text Editor"
+msgstr ""
+
+#: ../menu-data/scite:SciTE.desktop.in.h:2
+msgid "Edit your source files"
 msgstr ""
 
 #: ../menu-data/scite:scite.desktop.in.h:2
-msgid "SciTE Text Editor"
+msgid "Programming editor"
 msgstr ""
 
 #: ../menu-data/scolasync:scolasync.desktop.in.h:1
-msgid "Interactive tool to copy files to or from USB storage media"
+msgid "ScolaSync"
 msgstr ""
 
 #: ../menu-data/scolasync:scolasync.desktop.in.h:2
-msgid "ScolaSync"
+msgid "Interactive tool to copy files to or from USB storage media"
 msgstr ""
 
 #: ../menu-data/scolily:scolily.desktop.in.h:1
-msgid "Create scores on-the-fly by recording from mic"
-msgstr ""
-
-#: ../menu-data/scolily:scolily.desktop.in.h:2
 msgid "Scolily Score Recorder"
 msgstr ""
 
-#: ../menu-data/scorched3d:scorched3d.desktop.in.h:1
-msgid "3D artillery game similar to Scorched Earth"
-msgstr ""
-
-#: ../menu-data/scorched3d:scorched3d.desktop.in.h:2
-msgid "Scorched 3D"
+#: ../menu-data/scolily:scolily.desktop.in.h:2
+msgid "Create scores on-the-fly by recording from mic"
 msgstr ""
 
 #: ../menu-data/screenie-qt:screenie-qt.desktop.in.h:1
@@ -15085,70 +15309,74 @@
 msgstr ""
 
 #: ../menu-data/screenkey:screenkey.desktop.in.h:1
-msgid "Screencast your keys"
+msgid "Screenkey"
 msgstr ""
 
 #: ../menu-data/screenkey:screenkey.desktop.in.h:2
-msgid "Screenkey"
+msgid "Screencast your keys"
 msgstr ""
 
 #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:1
-msgid "A graphical tool to manage your Screenlets."
+msgid "Screenlets"
 msgstr ""
 
 #: ../menu-data/screenlets:screenlets-manager.desktop.in.h:2
-msgid "Screenlets"
+msgid "A graphical tool to manage your Screenlets."
 msgstr ""
 
-#: ../menu-data/scribes:scribes.desktop.in.h:2
+#: ../menu-data/screenruler:screenruler.desktop.in.h:2
+msgid "Measure objects on your screen"
+msgstr ""
+
+#: ../menu-data/scribes:scribes.desktop.in.h:1
 msgid "Scribes Text Editor"
 msgstr ""
 
 #: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:1
-#: ../menu-data/scribus:scribus.desktop.in.h:1
-msgid "Page Layout and Publication"
+msgid "ScribusNG"
 msgstr ""
 
 #: ../menu-data/scribus-ng:scribus-ng.desktop.in.h:2
-msgid "ScribusNG"
+#: ../menu-data/scribus:scribus.desktop.in.h:2
+msgid "Page Layout and Publication"
 msgstr ""
 
-#: ../menu-data/scribus:scribus.desktop.in.h:2
+#: ../menu-data/scribus:scribus.desktop.in.h:1
 msgid "Scribus"
 msgstr ""
 
 #: ../menu-data/scummvm-data:scummvm.desktop.in.h:1
-msgid "Interpreter for several adventure games"
+msgid "ScummVM"
 msgstr ""
 
 #: ../menu-data/scummvm-data:scummvm.desktop.in.h:2
-msgid "ScummVM"
+msgid "Interpreter for several adventure games"
 msgstr ""
 
 #: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:1
-msgid "Breakout Game"
+msgid "SDL-Ball"
 msgstr ""
 
 #: ../menu-data/sdl-ball:sdl-ball.desktop.in.h:2
-msgid "SDL-Ball"
+msgid "Breakout Game"
 msgstr ""
 
 #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:1
-msgid "Multiplatform basic interpreter for the development of videogames"
+msgid "sdlBasic"
 msgstr ""
 
 #: ../menu-data/sdlbasic:sdlbasic.desktop.in.h:2
-msgid "sdlBasic"
+msgid "Multiplatform basic interpreter for the development of videogames"
 msgstr ""
 
 #: ../menu-data/seahorse:seahorse.desktop.in.h:1
-msgid "Manage your passwords and encryption keys"
-msgstr "Správa hesiel a šifrovacích kľúčov"
-
-#: ../menu-data/seahorse:seahorse.desktop.in.h:2
 msgid "Passwords and Keys"
 msgstr ""
 
+#: ../menu-data/seahorse:seahorse.desktop.in.h:2
+msgid "Manage your passwords and encryption keys"
+msgstr "Správa hesiel a šifrovacích kľúčov"
+
 #: ../menu-data/seamonkey:seamonkey.desktop.in.h:1
 msgid "SeaMonkey"
 msgstr ""
@@ -15162,60 +15390,68 @@
 msgstr "Hľadaj a zachráň"
 
 #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:1
-msgid "Regular expression power search utilty"
+msgid "Searchmonkey"
 msgstr ""
 
 #: ../menu-data/searchmonkey:searchmonkey.desktop.in.h:2
-msgid "Searchmonkey"
+msgid "Regular expression power search utilty"
 msgstr ""
 
 #: ../menu-data/seaview:seaview.desktop.in.h:1
-msgid ""
-"Edits multiple sequence alignments and prints them in PostScript format."
+msgid "SeaView"
 msgstr ""
 
 #: ../menu-data/seaview:seaview.desktop.in.h:2
-msgid "SeaView"
+msgid ""
+"Edits multiple sequence alignments and prints them in PostScript format."
 msgstr ""
 
 #: ../menu-data/secpanel:secpanel.desktop.in.h:1
-msgid "A graphical user interface for SSH and SCP"
+msgid "SecPanel"
 msgstr ""
 
 #: ../menu-data/secpanel:secpanel.desktop.in.h:2
-msgid "SecPanel"
+msgid "A graphical user interface for SSH and SCP"
 msgstr ""
 
 #: ../menu-data/semantik:kde4__semantik.desktop.in.h:1
-msgid "Mind mapping software"
-msgstr "Softvér na mapovanie mysle"
-
-#: ../menu-data/semantik:kde4__semantik.desktop.in.h:2
 msgid "Semantik"
 msgstr "Semantik"
 
+#: ../menu-data/semantik:kde4__semantik.desktop.in.h:2
+msgid "Mind mapping software"
+msgstr "Softvér na mapovanie mysle"
+
 #: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:1
-msgid "Action launcher based on system activity"
+msgid "Sentinella"
 msgstr ""
 
 #: ../menu-data/sentinella:kde4__sentinella.desktop.in.h:2
-msgid "Sentinella"
+msgid "Action launcher based on system activity"
 msgstr ""
 
 #: ../menu-data/seq24:seq24.desktop.in.h:1
-msgid "MIDI Sequencer"
+msgid "Seq24"
 msgstr ""
 
 #: ../menu-data/seq24:seq24.desktop.in.h:2
-msgid "Seq24"
+msgid "MIDI Sequencer"
 msgstr ""
 
 #: ../menu-data/series60-remote:series60-remote.desktop.in.h:1
-msgid "Application to manage your S60 mobile phone"
+msgid "Series60-Remote"
 msgstr ""
 
 #: ../menu-data/series60-remote:series60-remote.desktop.in.h:2
-msgid "Series60-Remote"
+msgid "Application to manage your S60 mobile phone"
+msgstr ""
+
+#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:1
+msgid "SFLphone VoIP Client"
+msgstr ""
+
+#: ../menu-data/sflphone-gnome:sflphone.desktop.in.h:2
+msgid "Call and receive calls with SIP or IAX protocols"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:blackboxgame.desktop.in.h:1
@@ -15267,6 +15503,10 @@
 "Pokúste sa dokončiť dlaždice v číselnom poradí, aby bola medzera vpravo dolu"
 
 #: ../menu-data/sgt-puzzles:filling.desktop.in.h:1
+msgid "Filling"
+msgstr "Filling"
+
+#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2
 msgid ""
 "Fill in digits so that each connected region of squares containing the same "
 "digit has an area equal to that digit"
@@ -15274,10 +15514,6 @@
 "Doplňte číslice tak, aby každá spojená oblasť štvorčekov obsahovala rovnaké "
 "číslice ako oblasť s danou číslicou"
 
-#: ../menu-data/sgt-puzzles:filling.desktop.in.h:2
-msgid "Filling"
-msgstr "Filling"
-
 #: ../menu-data/sgt-puzzles:flipgame.desktop.in.h:1
 msgid "Flip"
 msgstr ""
@@ -15287,37 +15523,37 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:1
-msgid ""
-"Draw edges along the grid lines which divide the rectangle under certain "
-"rules"
+msgid "Galaxies"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:galaxies.desktop.in.h:2
-msgid "Galaxies"
+msgid ""
+"Draw edges along the grid lines which divide the rectangle under certain "
+"rules"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:guess.desktop.in.h:1
-msgid "Game similar to the famous 'Mastermind'"
+msgid "Guess"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:guess.desktop.in.h:2
-msgid "Guess"
+msgid "Game similar to the famous 'Mastermind'"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:inertia.desktop.in.h:1
-msgid "Collect all the gems without running into any mines"
+msgid "Inertia"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:inertia.desktop.in.h:2
-msgid "Inertia"
+msgid "Collect all the gems without running into any mines"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:keen.desktop.in.h:1
-msgid "Game based on KenKen"
+msgid "Keen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:keen.desktop.in.h:2
-msgid "Keen"
+msgid "Game based on KenKen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:lightup.desktop.in.h:1
@@ -15329,11 +15565,11 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:1
-msgid "Draw lines around a digit according to the number in it"
+msgid "Loopy"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:loopy.desktop.in.h:2
-msgid "Loopy"
+msgid "Draw lines around a digit according to the number in it"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:magnets.desktop.in.h:1
@@ -15345,13 +15581,13 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:map.desktop.in.h:1
-msgid ""
-"Colour each region with one of four colours so that no two regions sharing a "
-"boundary have the same colour"
+msgid "Map"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:map.desktop.in.h:2
-msgid "Map"
+msgid ""
+"Colour each region with one of four colours so that no two regions sharing a "
+"boundary have the same colour"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:netgame.desktop.in.h:1
@@ -15363,20 +15599,20 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:netslide.desktop.in.h:1
-msgid ""
-"Game combining the grid generation of Net with the movement of Sixteen"
+msgid "Netslide"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:netslide.desktop.in.h:2
-msgid "Netslide"
+msgid ""
+"Game combining the grid generation of Net with the movement of Sixteen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:pattern.desktop.in.h:1
-msgid "Fill in the entire grid black or white"
+msgid "Pattern"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:pattern.desktop.in.h:2
-msgid "Pattern"
+msgid "Fill in the entire grid black or white"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:pegs.desktop.in.h:1
@@ -15388,11 +15624,11 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:range.desktop.in.h:1
-msgid "Fill the grid so the range of each numbered square matches the number"
+msgid "Range"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:range.desktop.in.h:2
-msgid "Range"
+msgid "Fill the grid so the range of each numbered square matches the number"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:rect.desktop.in.h:1
@@ -15405,45 +15641,45 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:1
-msgid ""
-"Clear the grid of coloured squares by highlighting contiguous regions of "
-"more than one coloured square"
+msgid "Same Game"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:samegame.desktop.in.h:2
-msgid "Same Game"
+msgid ""
+"Clear the grid of coloured squares by highlighting contiguous regions of "
+"more than one coloured square"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:1
-msgid "Link the squares of a grid according to the arrows on them"
+msgid "Signpost"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:signpost.desktop.in.h:2
-msgid "Signpost"
+msgid "Link the squares of a grid according to the arrows on them"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:singles.desktop.in.h:1
-msgid "Puzzle game based on Hitori"
+msgid "Singles"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:singles.desktop.in.h:2
-msgid "Singles"
+msgid "Puzzle game based on Hitori"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:1
-msgid "Game similar to Fifteen, but with a different type of move"
+msgid "Sixteen"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:sixteen.desktop.in.h:2
-msgid "Sixteen"
+msgid "Game similar to Fifteen, but with a different type of move"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:slant.desktop.in.h:1
-msgid "Draw a diagonal line and choose which way each line slants"
+msgid "Slant"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:slant.desktop.in.h:2
-msgid "Slant"
+msgid "Draw a diagonal line and choose which way each line slants"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:solo.desktop.in.h:1
@@ -15455,43 +15691,43 @@
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:tents.desktop.in.h:1
-msgid "Place tents in some of the remaining squares, under some conditions"
+msgid "Tents"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:tents.desktop.in.h:2
-msgid "Tents"
+msgid "Place tents in some of the remaining squares, under some conditions"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:towers.desktop.in.h:1
-msgid "Puzzle game based on Skyscrapers"
+msgid "Towers"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:towers.desktop.in.h:2
-msgid "Towers"
+msgid "Puzzle game based on Skyscrapers"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:1
-msgid "Arrange the numbers into ascending order "
+msgid "Twiddle"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:twiddle.desktop.in.h:2
-msgid "Twiddle"
+msgid "Arrange the numbers into ascending order "
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:unequal.desktop.in.h:1
-msgid "Fully populate the grid with numbers under some conditions"
+msgid "Unequal"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:unequal.desktop.in.h:2
-msgid "Unequal"
+msgid "Fully populate the grid with numbers under some conditions"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:1
-msgid "Position the points so that no line crosses another"
+msgid "Untangle"
 msgstr ""
 
 #: ../menu-data/sgt-puzzles:untangle.desktop.in.h:2
-msgid "Untangle"
+msgid "Position the points so that no line crosses another"
 msgstr ""
 
 #: ../menu-data/shisen.app:Shisen.desktop.in.h:1
@@ -15499,11 +15735,11 @@
 msgstr ""
 
 #: ../menu-data/shoes:shoes.desktop.in.h:1
-msgid "Interpreter for Shoes programs"
+msgid "Shoes"
 msgstr ""
 
 #: ../menu-data/shoes:shoes.desktop.in.h:2
-msgid "Shoes"
+msgid "Interpreter for Shoes programs"
 msgstr ""
 
 #: ../menu-data/shotwell:shotwell.desktop.in.h:1
@@ -15514,32 +15750,32 @@
 msgid "Shotwell Photo Manager"
 msgstr "Shotwell - správca fotografií"
 
-#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:2
+#: ../menu-data/showfoto:kde4__showfoto.desktop.in.h:1
 msgid "showFoto"
 msgstr "showFoto"
 
 #: ../menu-data/showq:showq.desktop.in.h:1
-msgid "MIDI controllable audio player"
+msgid "ShowQ"
 msgstr ""
 
 #: ../menu-data/showq:showq.desktop.in.h:2
-msgid "ShowQ"
+msgid "MIDI controllable audio player"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:1
-msgid "Capture an area of the screen"
+msgid "Shutter"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:2
-msgid "Capture the current active window"
+msgid "Capture, edit and share screenshots"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:3
-msgid "Capture the entire screen"
+msgid "Capture an area of the screen"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:4
-msgid "Capture, edit and share screenshots"
+msgid "Capture the entire screen"
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:5
@@ -15547,7 +15783,7 @@
 msgstr ""
 
 #: ../menu-data/shutter:shutter.desktop.in.h:6
-msgid "Shutter"
+msgid "Capture the current active window"
 msgstr ""
 
 #: ../menu-data/sigviewer:sigviewer.desktop.in.h:1
@@ -15559,86 +15795,78 @@
 "Viewer for biosignals such as EEG, EMG, and ECG. http://sigviewer.sf.net"
 msgstr ""
 
-#: ../menu-data/sim-qt:kde__sim.desktop.in.h:1
-msgid "SIM Instant Messenger"
-msgstr ""
-
-#: ../menu-data/sim-qt:kde__sim.desktop.in.h:2
-msgid "Sim-IM"
-msgstr ""
-
 #: ../menu-data/simdock:simdock.desktop.in.h:1
-msgid "A dockbar for GNOME"
+msgid "SimDock"
 msgstr ""
 
 #: ../menu-data/simdock:simdock.desktop.in.h:2
-msgid "SimDock"
+msgid "A dockbar for GNOME"
 msgstr ""
 
 #: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:1
-msgid "Reduce and rotate images in three-four clicks."
+msgid "Simple Image Reducer"
 msgstr ""
 
 #: ../menu-data/simple-image-reducer:simple-image-reducer.desktop.in.h:2
-msgid "Simple Image Reducer"
+msgid "Reduce and rotate images in three-four clicks."
 msgstr ""
 
 #: ../menu-data/simple-scan:simple-scan.desktop.in.h:1
-msgid "Scan Documents"
+msgid "Simple Scan"
 msgstr ""
 
 #: ../menu-data/simple-scan:simple-scan.desktop.in.h:2
-msgid "Simple Scan"
+msgid "Scan Documents"
 msgstr ""
 
 #: ../menu-data/sineshaper:sineshaper.desktop.in.h:1
-msgid "Monophonic synth plugin with two oscillators and waveshapers"
+msgid "Sineshaper"
 msgstr ""
 
 #: ../menu-data/sineshaper:sineshaper.desktop.in.h:2
-msgid "Sineshaper"
+msgid "Monophonic synth plugin with two oscillators and waveshapers"
 msgstr ""
 
 #: ../menu-data/singularity:singularity.desktop.in.h:1
-msgid "Become the singularity"
+msgid "Singularity"
 msgstr ""
 
 #: ../menu-data/singularity:singularity.desktop.in.h:2
-msgid "Singularity"
+msgid "Become the singularity"
 msgstr ""
 
 #: ../menu-data/sitplus:sitplus.desktop.in.h:1
-msgid "Framework for ludic-therapeutic activities"
+msgid "Sitplus"
 msgstr ""
 
 #: ../menu-data/sitplus:sitplus.desktop.in.h:2
-msgid "Sitplus"
+msgid "Framework for ludic-therapeutic activities"
 msgstr ""
 
 #: ../menu-data/sixpack:SIXpack.desktop.in.h:1
-msgid "EXAFS data analysis"
-msgstr "Analýza dát EXAFS"
-
-#: ../menu-data/sixpack:SIXpack.desktop.in.h:2
 msgid "SIXpack"
 msgstr "SIXpack"
 
-#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1
-msgid "Scan and save images"
-msgstr "Skenovanie a ukladanie obrázkov"
+#: ../menu-data/sixpack:SIXpack.desktop.in.h:2
+msgid "EXAFS data analysis"
+msgstr "Analýza dát EXAFS"
 
-#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2
+#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:1
 msgid "Skanlite"
 msgstr "Skanlite"
 
-#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1
-msgid "Manage your money"
-msgstr ""
+#: ../menu-data/skanlite:kde4__skanlite.desktop.in.h:2
+msgid "Scan and save images"
+msgstr "Skenovanie a ukladanie obrázkov"
 
-#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2
+#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:1
 msgid "skrooge"
 msgstr "skrooge"
 
+#: ../menu-data/skrooge:kde4__skrooge.desktop.in.h:2
+msgid "Manage your money"
+msgstr ""
+
 #: ../menu-data/slashem-gtk:slashem-gtk.desktop.in.h:1
 msgid "GTK Slash'EM"
 msgstr ""
@@ -15656,19 +15884,11 @@
 msgstr ""
 
 #: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:1
-msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
-msgstr ""
-
-#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2
 msgid "X Slash'EM"
 msgstr ""
 
-#: ../menu-data/slicer:slicer.desktop.in.h:1
-msgid "3D Slicer"
-msgstr ""
-
-#: ../menu-data/slicer:slicer.desktop.in.h:2
-msgid "Start 3D Slicer"
+#: ../menu-data/slashem-x11:slashem-x11.desktop.in.h:2
+msgid "Super Lotsa Added Stuff Hack - Extended Magic (X11)"
 msgstr ""
 
 #: ../menu-data/slimevolley:slimevolley.desktop.in.h:1
@@ -15688,67 +15908,67 @@
 msgstr ""
 
 #: ../menu-data/slingshot:slingshot.desktop.in.h:1
-msgid "2D space shooting game with gravity"
+msgid "Slingshot"
 msgstr ""
 
 #: ../menu-data/slingshot:slingshot.desktop.in.h:2
-msgid "Slingshot"
+msgid "2D space shooting game with gravity"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:1
-msgid "Edit SLUDGE floor plans"
+msgid "SLUDGE Floor Maker"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-floormaker.desktop.in.h:2
-msgid "SLUDGE Floor Maker"
+msgid "Edit SLUDGE floor plans"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:1
-msgid "Manage and compile SLUDGE projects"
+msgid "SLUDGE Project Manager"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-projectmanager.desktop.in.h:2
-msgid "SLUDGE Project Manager"
+msgid "Manage and compile SLUDGE projects"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:1
-msgid "Edit SLUDGE sprite banks"
+msgid "SLUDGE Sprite Bank Editor"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-spritebankeditor.desktop.in.h:2
-msgid "SLUDGE Sprite Bank Editor"
+msgid "Edit SLUDGE sprite banks"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:1
-msgid "Edit SLUDGE translation files"
+msgid "SLUDGE Translation Editor"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-translationeditor.desktop.in.h:2
-msgid "SLUDGE Translation Editor"
+msgid "Edit SLUDGE translation files"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:1
-msgid "Edit SLUDGE z-buffer files"
+msgid "SLUDGE Z-Buffer Maker"
 msgstr ""
 
 #: ../menu-data/sludge-devkit:sludge-zbuffermaker.desktop.in.h:2
-msgid "SLUDGE Z-Buffer Maker"
+msgid "Edit SLUDGE z-buffer files"
 msgstr ""
 
 #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:1
-msgid "Play SLUDGE games"
+msgid "SLUDGE Engine"
 msgstr ""
 
 #: ../menu-data/sludge-engine:sludge-engine.desktop.in.h:2
-msgid "SLUDGE Engine"
+msgid "Play SLUDGE games"
 msgstr ""
 
 #: ../menu-data/sm:sm.desktop.in.h:1
-msgid "Displays a short text fullscreen"
+msgid "Screen-Message"
 msgstr ""
 
 #: ../menu-data/sm:sm.desktop.in.h:2
-msgid "Screen-Message"
+msgid "Displays a short text fullscreen"
 msgstr ""
 
 #: ../menu-data/smartpm:smart.desktop.in.h:1
@@ -15764,11 +15984,11 @@
 msgstr "Prehliadač zdieľaných priečinkov SMB/CIFS"
 
 #: ../menu-data/smc:smc.desktop.in.h:1
-msgid "A 2D platform game with style similar to classic sidescroller games"
+msgid "Secret Maryo Chronicles"
 msgstr ""
 
 #: ../menu-data/smc:smc.desktop.in.h:2
-msgid "Secret Maryo Chronicles"
+msgid "A 2D platform game with style similar to classic sidescroller games"
 msgstr ""
 
 #: ../menu-data/smplayer:smplayer.desktop.in.h:1
@@ -15780,35 +16000,35 @@
 msgstr ""
 
 #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:1
-msgid "Chat with other people on IRC"
+msgid "Smuxi IRC Client"
 msgstr ""
 
 #: ../menu-data/smuxi-frontend-gnome:smuxi-frontend-gnome.desktop.in.h:2
-msgid "Smuxi IRC Client"
+msgid "Chat with other people on IRC"
 msgstr ""
 
 #: ../menu-data/snake4:snake4.desktop.in.h:1
-msgid "Fruit-eating snake game"
+msgid "Snake4"
 msgstr ""
 
 #: ../menu-data/snake4:snake4.desktop.in.h:2
-msgid "Snake4"
+msgid "Fruit-eating snake game"
 msgstr ""
 
 #: ../menu-data/snappea:snappea.desktop.in.h:1
-msgid "Create and study hyperbolic 3-manifolds"
+msgid "Snappea 3-Manifold Creator"
 msgstr ""
 
 #: ../menu-data/snappea:snappea.desktop.in.h:2
-msgid "Snappea 3-Manifold Creator"
+msgid "Create and study hyperbolic 3-manifolds"
 msgstr ""
 
 #: ../menu-data/snowballz:snowball.desktop.in.h:1
-msgid "Command your army of penguins"
+msgid "SnowballZ"
 msgstr ""
 
 #: ../menu-data/snowballz:snowball.desktop.in.h:2
-msgid "SnowballZ"
+msgid "Command your army of penguins"
 msgstr ""
 
 #: ../menu-data/socnetv:socnetv.desktop.in.h:1
@@ -15820,29 +16040,25 @@
 msgstr ""
 
 #: ../menu-data/sofa-apps:sofa.desktop.in.h:1
-msgid "Open Source Framework for Medical Simulation"
+msgid "SOFA"
 msgstr ""
 
 #: ../menu-data/sofa-apps:sofa.desktop.in.h:2
-msgid "SOFA"
+msgid "Open Source Framework for Medical Simulation"
 msgstr ""
 
 #: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:1
-msgid "Lets you choose from thousands of applications available for Ubuntu"
-msgstr ""
-
-#: ../menu-data/software-center:ubuntu-software-center.desktop.in.h:2
 msgid "Ubuntu Software Center"
 msgstr "Centrum softvéru Ubuntu"
 
 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:1
 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
+msgid "Software Sources"
 msgstr ""
 
 #: ../menu-data/software-properties-gtk:software-properties-gtk.desktop.in.h:2
 #: ../menu-data/software-properties-kde:software-properties-kde.desktop.in.h:2
-msgid "Software Sources"
+msgid "Configure the sources for installable software and updates"
 msgstr ""
 
 #: ../menu-data/solarwolf:solarwolf.desktop.in.h:1
@@ -15850,19 +16066,19 @@
 msgstr ""
 
 #: ../menu-data/solfege:solfege.desktop.in.h:1
-msgid "Ear training"
+msgid "GNU Solfege"
 msgstr ""
 
 #: ../menu-data/solfege:solfege.desktop.in.h:2
-msgid "GNU Solfege"
+msgid "Ear training"
 msgstr ""
 
 #: ../menu-data/sonata:sonata.desktop.in.h:1
-msgid "An elegant GTK+ MPD client"
+msgid "Sonata"
 msgstr ""
 
 #: ../menu-data/sonata:sonata.desktop.in.h:2
-msgid "Sonata"
+msgid "An elegant GTK+ MPD client"
 msgstr ""
 
 #: ../menu-data/songwrite:songwrite.desktop.in.h:1
@@ -15886,43 +16102,43 @@
 msgstr ""
 
 #: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:1
-msgid "Copy music from your CDs"
+msgid "Sound Juicer Audio CD Extractor"
 msgstr ""
 
 #: ../menu-data/sound-juicer:sound-juicer.desktop.in.h:2
-msgid "Sound Juicer Audio CD Extractor"
+msgid "Copy music from your CDs"
 msgstr ""
 
 #: ../menu-data/soundconverter:soundconverter.desktop.in.h:1
-msgid "Convert audio files into other formats"
+msgid "Sound Converter"
 msgstr ""
 
 #: ../menu-data/soundconverter:soundconverter.desktop.in.h:2
-msgid "Sound Converter"
+msgid "Convert audio files into other formats"
 msgstr ""
 
 #: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:1
-msgid "An audio file converter"
+msgid "soundKonverter"
 msgstr ""
 
 #: ../menu-data/soundkonverter:kde4__soundkonverter.desktop.in.h:2
-msgid "soundKonverter"
+msgid "An audio file converter"
 msgstr ""
 
 #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:1
-msgid "Develop, modify or debug a source-highlight definition file"
+msgid "Source-Highlight-IDE"
 msgstr ""
 
 #: ../menu-data/source-highlight-ide:source-highlight-ide.desktop.in.h:2
-msgid "Source-Highlight-IDE"
+msgid "Develop, modify or debug a source-highlight definition file"
 msgstr ""
 
 #: ../menu-data/spacezero:spacezero.desktop.in.h:1
-msgid "Real Time Strategy 2D space combat multiplayer net game."
+msgid "Spacezero"
 msgstr ""
 
 #: ../menu-data/spacezero:spacezero.desktop.in.h:2
-msgid "Spacezero"
+msgid "Real Time Strategy 2D space combat multiplayer net game."
 msgstr ""
 
 #: ../menu-data/sparkleshare:sparkleshare.desktop.in.h:1
@@ -15934,23 +16150,23 @@
 msgstr ""
 
 #: ../menu-data/spe:spe.desktop.in.h:1
-msgid "Integrated Python Development Environment"
+msgid "SPE (Stani's Python Editor)"
 msgstr ""
 
 #: ../menu-data/spe:spe.desktop.in.h:2
-msgid "SPE (Stani's Python Editor)"
+msgid "Integrated Python Development Environment"
 msgstr ""
 
-#: ../menu-data/specimen:specimen.desktop.in.h:2
+#: ../menu-data/specimen:specimen.desktop.in.h:1
 msgid "Specimen"
 msgstr ""
 
 #: ../menu-data/specto:specto.desktop.in.h:1
-msgid "Be notified of everything"
+msgid "Specto"
 msgstr ""
 
 #: ../menu-data/specto:specto.desktop.in.h:2
-msgid "Specto"
+msgid "Be notified of everything"
 msgstr ""
 
 #: ../menu-data/spectools:spectool_gtk.desktop.in.h:1
@@ -15962,35 +16178,35 @@
 msgstr ""
 
 #: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:1
-msgid "High precision calculator"
+msgid "SpeedCrunch"
 msgstr ""
 
 #: ../menu-data/speedcrunch:speedcrunch.desktop.in.h:2
-msgid "SpeedCrunch"
+msgid "High precision calculator"
 msgstr ""
 
 #: ../menu-data/spek:spek.desktop.in.h:1
-msgid "Spek Spectrum Analyser"
+msgid "View spectrograms of your audio files"
 msgstr ""
 
 #: ../menu-data/spek:spek.desktop.in.h:2
-msgid "View spectrograms of your audio files"
+msgid "Spek Spectrum Analyser"
 msgstr ""
 
 #: ../menu-data/spim:xspim.desktop.in.h:1
-msgid "Graphical MIPS32 Assembly language emulator"
+msgid "xSPIM"
 msgstr ""
 
 #: ../menu-data/spim:xspim.desktop.in.h:2
-msgid "xSPIM"
+msgid "Graphical MIPS32 Assembly language emulator"
 msgstr ""
 
 #: ../menu-data/spotlighter:spotlighter.desktop.in.h:1
-msgid "Show and move a spotlight on the desktop"
+msgid "Spotlighter"
 msgstr ""
 
 #: ../menu-data/spotlighter:spotlighter.desktop.in.h:2
-msgid "Spotlighter"
+msgid "Show and move a spotlight on the desktop"
 msgstr ""
 
 #: ../menu-data/spout:spout.desktop.in.h:1
@@ -15998,51 +16214,51 @@
 msgstr ""
 
 #: ../menu-data/spring:spring.desktop.in.h:1
-msgid "An open source RTS with similar gameplay to TA"
+msgid "Spring"
 msgstr ""
 
 #: ../menu-data/spring:spring.desktop.in.h:2
-msgid "Spring"
+msgid "An open source RTS with similar gameplay to TA"
 msgstr ""
 
 #: ../menu-data/springlobby:springlobby.desktop.in.h:1
-msgid "Play real-time strategy games using the Spring engine"
+msgid "SpringLobby"
 msgstr ""
 
 #: ../menu-data/springlobby:springlobby.desktop.in.h:2
-msgid "SpringLobby"
+msgid "Play real-time strategy games using the Spring engine"
 msgstr ""
 
 #: ../menu-data/spyder:spyder.desktop.in.h:1
-msgid "Python IDE for scientists"
+msgid "spyder"
 msgstr ""
 
 #: ../menu-data/spyder:spyder.desktop.in.h:2
-msgid "spyder"
+msgid "Python IDE for scientists"
 msgstr ""
 
 #: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:1
-msgid "GUI editor for SQLite databases"
+msgid "SQLite database browser"
 msgstr ""
 
 #: ../menu-data/sqlitebrowser:sqlitebrowser.desktop.in.h:2
-msgid "SQLite database browser"
+msgid "GUI editor for SQLite databases"
 msgstr ""
 
 #: ../menu-data/sqliteman:sqliteman.desktop.in.h:1
-msgid "Administer and develop your Sqlite3 databases"
+msgid "Sqliteman"
 msgstr ""
 
 #: ../menu-data/sqliteman:sqliteman.desktop.in.h:2
-msgid "Sqliteman"
+msgid "Administer and develop your Sqlite3 databases"
 msgstr ""
 
 #: ../menu-data/squeak-vm:squeak.desktop.in.h:1
-msgid " Programming system and content development tool"
+msgid "Squeak"
 msgstr ""
 
 #: ../menu-data/squeak-vm:squeak.desktop.in.h:2
-msgid "Squeak"
+msgid " Programming system and content development tool"
 msgstr ""
 
 #: ../menu-data/squeeze:squeeze.desktop.in.h:1
@@ -16063,19 +16279,19 @@
 msgstr ""
 
 #: ../menu-data/stackapplet:stackapplet.desktop.in.h:1
-msgid "Launch the StackApplet indicator"
+msgid "StackApplet"
 msgstr ""
 
 #: ../menu-data/stackapplet:stackapplet.desktop.in.h:2
-msgid "StackApplet"
+msgid "Launch the StackApplet indicator"
 msgstr ""
 
 #: ../menu-data/stardict-common:stardict.desktop.in.h:1
-msgid "Lookup words"
+msgid "StarDict"
 msgstr ""
 
 #: ../menu-data/stardict-common:stardict.desktop.in.h:2
-msgid "StarDict"
+msgid "Lookup words"
 msgstr ""
 
 #: ../menu-data/starplot:starplot.desktop.in.h:1
@@ -16087,11 +16303,11 @@
 msgstr ""
 
 #: ../menu-data/startupmanager:startupmanager.desktop.in.h:1
-msgid "Change settings for the bootloader and splash screen"
+msgid "StartUp-Manager"
 msgstr ""
 
 #: ../menu-data/startupmanager:startupmanager.desktop.in.h:2
-msgid "StartUp-Manager"
+msgid "Change settings for the bootloader and splash screen"
 msgstr ""
 
 #: ../menu-data/starvoyager:starvoyager.desktop.in.h:1
@@ -16103,29 +16319,29 @@
 msgstr ""
 
 #: ../menu-data/stella:stella.desktop.in.h:1
-msgid "A multi-platform Atari 2600 emulator"
+msgid "Stella"
 msgstr ""
 
 #: ../menu-data/stella:stella.desktop.in.h:2
-msgid "Stella"
+msgid "A multi-platform Atari 2600 emulator"
 msgstr ""
 
 #: ../menu-data/stellarium:stellarium.desktop.in.h:1
-msgid "Planetarium"
+msgid "Stellarium"
 msgstr ""
 
 #: ../menu-data/stellarium:stellarium.desktop.in.h:2
-msgid "Stellarium"
+msgid "Planetarium"
 msgstr ""
 
 #: ../menu-data/step:kde4__step.desktop.in.h:1
-msgid "Simulate physics experiments"
-msgstr "Simulácia fyzikálnych experimentov"
-
-#: ../menu-data/step:kde4__step.desktop.in.h:2
 msgid "Step"
 msgstr "Step"
 
+#: ../menu-data/step:kde4__step.desktop.in.h:2
+msgid "Simulate physics experiments"
+msgstr "Simulácia fyzikálnych experimentov"
+
 #: ../menu-data/stepbill.app:StepBill.desktop.in.h:1
 msgid "StepBill"
 msgstr ""
@@ -16135,19 +16351,19 @@
 msgstr "StepBill - XBill pre GNUstep (založený na MacBill)"
 
 #: ../menu-data/stopmotion:stopmotion.desktop.in.h:1
-msgid "Program to create stop-motion animations"
+msgid "Stopmotion"
 msgstr ""
 
 #: ../menu-data/stopmotion:stopmotion.desktop.in.h:2
-msgid "Stopmotion"
+msgid "Program to create stop-motion animations"
 msgstr ""
 
 #: ../menu-data/stopwatch:stopwatch.desktop.in.h:1
-msgid "A virtual stopwatch"
+msgid "Stopwatch"
 msgstr ""
 
 #: ../menu-data/stopwatch:stopwatch.desktop.in.h:2
-msgid "Stopwatch"
+msgid "A virtual stopwatch"
 msgstr ""
 
 #: ../menu-data/stormbaancoureur:stormbaancoureur.desktop.in.h:1
@@ -16159,27 +16375,27 @@
 msgstr ""
 
 #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:1
-msgid "Listen to shoutcast/xiph/live365 music stations"
+msgid "streamtuner2"
 msgstr ""
 
 #: ../menu-data/streamtuner2:streamtuner2.desktop.in.h:2
-msgid "streamtuner2"
+msgid "Listen to shoutcast/xiph/live365 music stations"
 msgstr ""
 
 #: ../menu-data/streamtuner:streamtuner.desktop.in.h:1
-msgid "Browse Internet stream directories"
+msgid "streamtuner"
 msgstr ""
 
 #: ../menu-data/streamtuner:streamtuner.desktop.in.h:2
-msgid "streamtuner"
+msgid "Browse Internet stream directories"
 msgstr ""
 
 #: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:1
-msgid "Audio file player with time stretch"
+msgid "StretchPlayer"
 msgstr ""
 
 #: ../menu-data/stretchplayer:stretchplayer.desktop.in.h:2
-msgid "StretchPlayer"
+msgid "Audio file player with time stretch"
 msgstr ""
 
 #: ../menu-data/stroq:stroq.desktop.in.h:1
@@ -16191,39 +16407,39 @@
 msgstr ""
 
 #: ../menu-data/structure-synth:structure-synth.desktop.in.h:1
-msgid "Application for creating 3D structures"
+msgid "Structure Synth"
 msgstr ""
 
 #: ../menu-data/structure-synth:structure-synth.desktop.in.h:2
-msgid "Structure Synth"
+msgid "Application for creating 3D structures"
 msgstr ""
 
-#: ../menu-data/subcommander:subcommander.desktop.in.h:2
+#: ../menu-data/subcommander:subcommander.desktop.in.h:1
 msgid "Subcommander"
 msgstr ""
 
 #: ../menu-data/subdownloader:subdownloader.desktop.in.h:1
-msgid "Application to download/upload subtitles of your movies."
+msgid "SubDownloader"
 msgstr ""
 
 #: ../menu-data/subdownloader:subdownloader.desktop.in.h:2
-msgid "SubDownloader"
+msgid "Application to download/upload subtitles of your movies."
 msgstr ""
 
 #: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:1
-msgid "KDE subtitle editor"
+msgid "Subtitle Composer"
 msgstr ""
 
 #: ../menu-data/subtitlecomposer:kde4__subtitlecomposer.desktop.in.h:2
-msgid "Subtitle Composer"
+msgid "KDE subtitle editor"
 msgstr ""
 
 #: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:1
-msgid "A subtitle editor based on GStreamer and Gtk+"
+msgid "Subtitle Editor"
 msgstr ""
 
 #: ../menu-data/subtitleeditor:subtitleeditor.desktop.in.h:2
-msgid "Subtitle Editor"
+msgid "A subtitle editor based on GStreamer and Gtk+"
 msgstr ""
 
 #: ../menu-data/sugar-emulator-0.84:sugar-emulator.desktop.in.h:1
@@ -16241,19 +16457,19 @@
 msgstr ""
 
 #: ../menu-data/sunflow:sunflow.desktop.in.h:1
-msgid "Photorealistic Rendering Engine"
+msgid "Sunflow"
 msgstr ""
 
 #: ../menu-data/sunflow:sunflow.desktop.in.h:2
-msgid "Sunflow"
+msgid "Photorealistic Rendering Engine"
 msgstr ""
 
 #: ../menu-data/supercollider-emacs:scel.desktop.in.h:1
-msgid "Emacs environment for SuperCollider"
+msgid "SuperCollider Emacs (scel)"
 msgstr ""
 
 #: ../menu-data/supercollider-emacs:scel.desktop.in.h:2
-msgid "SuperCollider Emacs (scel)"
+msgid "Emacs environment for SuperCollider"
 msgstr ""
 
 #: ../menu-data/supercollider-vim:scvim.desktop.in.h:1
@@ -16265,19 +16481,19 @@
 msgstr ""
 
 #: ../menu-data/supertux-stable:supertux.desktop.in.h:1
-msgid "A Super Mario inspired penguin platform game"
+msgid "SuperTux"
 msgstr ""
 
 #: ../menu-data/supertux-stable:supertux.desktop.in.h:2
-msgid "SuperTux"
+msgid "A Super Mario inspired penguin platform game"
 msgstr ""
 
 #: ../menu-data/supertux:supertux2.desktop.in.h:1
-msgid "Play a classic 2D platform game"
+msgid "SuperTux 2"
 msgstr ""
 
 #: ../menu-data/supertux:supertux2.desktop.in.h:2
-msgid "SuperTux 2"
+msgid "Play a classic 2D platform game"
 msgstr ""
 
 #: ../menu-data/supertuxkart:supertuxkart.desktop.in.h:1
@@ -16297,27 +16513,27 @@
 msgstr ""
 
 #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:1
-msgid "Enter cave survey data for Survex"
+msgid "SvxEdit Cave Survey Data Editor"
 msgstr ""
 
 #: ../menu-data/survex-svxedit:survex-svxedit.desktop.in.h:2
-msgid "SvxEdit Cave Survey Data Editor"
+msgid "Enter cave survey data for Survex"
 msgstr ""
 
 #: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:1
-msgid "A Workbench for Subversion"
+msgid "SVN Workbench"
 msgstr ""
 
 #: ../menu-data/svn-workbench:svn-workbench.desktop.in.h:2
-msgid "SVN Workbench"
+msgid "A Workbench for Subversion"
 msgstr ""
 
 #: ../menu-data/swami:swami.desktop.in.h:1
-msgid "Create, play and organize MIDI instruments and sounds"
+msgid "Swami Instrument Editor"
 msgstr ""
 
 #: ../menu-data/swami:swami.desktop.in.h:2
-msgid "Swami Instrument Editor"
+msgid "Create, play and organize MIDI instruments and sounds"
 msgstr ""
 
 #: ../menu-data/sweep:sweep.desktop.in.h:1
@@ -16337,38 +16553,46 @@
 msgstr "Čistič systému"
 
 #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:1
-msgid "Interior 2D design application with 3D preview"
+msgid "Sweet Home 3D"
 msgstr ""
 
 #: ../menu-data/sweethome3d:sweethome3d.desktop.in.h:2
-msgid "Sweet Home 3D"
+msgid "Interior 2D design application with 3D preview"
+msgstr ""
+
+#: ../menu-data/swell-foop:swell-foop.desktop.in.h:1
+msgid "Swell Foop"
+msgstr ""
+
+#: ../menu-data/swell-foop:swell-foop.desktop.in.h:2
+msgid "Clear the screen by removing groups of colored and shaped tiles"
 msgstr ""
 
 #: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:1
-msgid "Full-text search program for Sylpheed"
+msgid "Sylph-Searcher"
 msgstr ""
 
 #: ../menu-data/sylph-searcher:sylph-searcher.desktop.in.h:2
-msgid "Sylph-Searcher"
+msgid "Full-text search program for Sylpheed"
 msgstr ""
 
 #: ../menu-data/sylpheed:sylpheed.desktop.in.h:1
-msgid "E-Mail client"
-msgstr "Emailový klient"
-
-#: ../menu-data/sylpheed:sylpheed.desktop.in.h:2
 msgid "Sylpheed"
 msgstr ""
 
+#: ../menu-data/sylpheed:sylpheed.desktop.in.h:2
+msgid "E-Mail client"
+msgstr "Emailový klient"
+
 #: ../menu-data/synapse:synapse.desktop.in.h:1
-msgid "Search everything you do."
+msgid "Synapse"
 msgstr ""
 
 #: ../menu-data/synapse:synapse.desktop.in.h:2
-msgid "Synapse"
+msgid "Search everything you do."
 msgstr ""
 
-#: ../menu-data/synaptic:synaptic.desktop.in.h:2
+#: ../menu-data/synaptic:synaptic.desktop.in.h:1
 msgid "Synaptic Package Manager"
 msgstr "Synaptic - správca balíkov"
 
@@ -16381,43 +16605,43 @@
 msgstr ""
 
 #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:1
-msgid "SynCE PDA control for GNOME"
+msgid "SynCE Tray Icon"
 msgstr ""
 
 #: ../menu-data/synce-trayicon:synce-trayicon.desktop.in.h:2
-msgid "SynCE Tray Icon"
+msgid "SynCE PDA control for GNOME"
 msgstr ""
 
 #: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:1
-msgid "Configure Sync Mail Dir"
+msgid "Sync Mail Dir"
 msgstr ""
 
 #: ../menu-data/syncmaildir-applet:smd-applet-configure.desktop.in.h:2
-msgid "Sync Mail Dir"
+msgid "Configure Sync Mail Dir"
 msgstr ""
 
 #: ../menu-data/syncropated:syncropated.desktop.in.h:1
-msgid "Media Syncronizer"
+msgid "Syncropated!"
 msgstr ""
 
 #: ../menu-data/syncropated:syncropated.desktop.in.h:2
-msgid "Syncropated!"
+msgid "Media Syncronizer"
 msgstr ""
 
 #: ../menu-data/sysinfo:sysinfo.desktop.in.h:1
-msgid "Display detailed computer/system information"
+msgid "Sysinfo"
 msgstr ""
 
 #: ../menu-data/sysinfo:sysinfo.desktop.in.h:2
-msgid "Sysinfo"
+msgid "Display detailed computer/system information"
 msgstr ""
 
 #: ../menu-data/sysprof:sysprof.desktop.in.h:1
-msgid "A system-wide linux profiler"
+msgid "Sysprof Profiler"
 msgstr ""
 
 #: ../menu-data/sysprof:sysprof.desktop.in.h:2
-msgid "Sysprof Profiler"
+msgid "A system-wide linux profiler"
 msgstr ""
 
 #: ../menu-data/system-config-audit:system-config-audit.desktop.in.h:1
@@ -16437,49 +16661,61 @@
 msgstr ""
 
 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:1
-msgid "Change system date and time"
+msgid "Date & Time"
 msgstr ""
 
 #: ../menu-data/system-config-date:system-config-date.desktop.in.h:2
-msgid "Date & Time"
+msgid "Change system date and time"
 msgstr ""
 
 #: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:1
-msgid "Create a kickstart file"
+msgid "Kickstart"
 msgstr ""
 
 #: ../menu-data/system-config-kickstart:system-config-kickstart.desktop.in.h:2
-msgid "Kickstart"
+msgid "Create a kickstart file"
 msgstr ""
 
 #: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:1
-msgid "Configure LVM in a graphical setting"
+msgid "Logical Volume Management"
 msgstr ""
 
 #: ../menu-data/system-config-lvm:system-config-lvm.desktop.in.h:2
-msgid "Logical Volume Management"
+msgid "Configure LVM in a graphical setting"
 msgstr ""
 
 #: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:1
-msgid "Configure printers"
-msgstr "Nastavenie tlačiarní"
-
-#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2
 msgid "Printing"
 msgstr "Tlačenie"
 
+#: ../menu-data/system-config-printer-gnome:system-config-printer.desktop.in.h:2
+msgid "Configure printers"
+msgstr "Nastavenie tlačiarní"
+
 #: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:1
-msgid "Create, modify, and delete samba shares"
+msgid "Samba"
 msgstr ""
 
 #: ../menu-data/system-config-samba:system-config-samba.desktop.in.h:2
-msgid "Samba"
+msgid "Create, modify, and delete samba shares"
+msgstr ""
+
+#: ../menu-data/systemsettings:kde4__kdesystemsettings.desktop.in.h:1
+msgid "KDE System Settings"
 msgstr ""
 
 #: ../menu-data/systemsettings:kde4__systemsettings.desktop.in.h:1
 msgid "System Settings"
 msgstr "Nastavenia systému"
 
+#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:1
+msgid "Tagaini Jisho"
+msgstr ""
+
+#: ../menu-data/tagainijisho:tagainijisho.desktop.in.h:2
+msgid "A free Japanese dictionary and study assistant"
+msgstr ""
+
 #: ../menu-data/tagtool:tagtool.desktop.in.h:1
 msgid "Audio Tag Tool"
 msgstr ""
@@ -16489,55 +16725,55 @@
 msgstr ""
 
 #: ../menu-data/tagua:kde4__tagua.desktop.in.h:1
-msgid "A generic board game application."
+msgid "Tagua"
 msgstr ""
 
 #: ../menu-data/tagua:kde4__tagua.desktop.in.h:2
-msgid "Tagua"
+msgid "A generic board game application."
 msgstr ""
 
 #: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:1
-msgid "An IRC Client for GNUstep and Mac OS X"
-msgstr "IRC klient pre GNUstep a Mac OS X"
-
-#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2
 msgid "TalkSoup"
 msgstr "TalkSoup"
 
+#: ../menu-data/talksoup.app:TalkSoup.desktop.in.h:2
+msgid "An IRC Client for GNUstep and Mac OS X"
+msgstr "IRC klient pre GNUstep a Mac OS X"
+
 #: ../menu-data/tangerine:tangerine.desktop.in.h:1
-msgid "Share your music with close friends"
+msgid "Tangerine Media Sharing"
 msgstr ""
 
 #: ../menu-data/tangerine:tangerine.desktop.in.h:2
-msgid "Tangerine Media Sharing"
+msgid "Share your music with close friends"
 msgstr ""
 
 #: ../menu-data/tanglet:tanglet.desktop.in.h:1
-msgid "Single player variant of Boggle"
+msgid "Tanglet"
 msgstr ""
 
 #: ../menu-data/tanglet:tanglet.desktop.in.h:2
-msgid "Tanglet"
+msgid "Single player variant of Boggle"
 msgstr ""
 
 #: ../menu-data/tasks-mobile:kde4__tasks-mobile.desktop.in.h:1
-msgid "Kontact Touch Tasks"
+msgid "Tasks"
 msgstr ""
 
 #: ../menu-data/tasque:tasque.desktop.in.h:1
-msgid "Easy quick task management"
+msgid "Tasque"
 msgstr ""
 
 #: ../menu-data/tasque:tasque.desktop.in.h:2
-msgid "Tasque"
+msgid "Easy quick task management"
 msgstr ""
 
 #: ../menu-data/tatan:tatan.desktop.in.h:1
-msgid "HIZ's Tatan"
+msgid "Tatan"
 msgstr ""
 
 #: ../menu-data/tatan:tatan.desktop.in.h:2
-msgid "Tatan"
+msgid "HIZ's Tatan"
 msgstr ""
 
 #: ../menu-data/taxbird:taxbird.desktop.in.h:1
@@ -16548,6 +16784,46 @@
 msgid "freier Elster-Client für Linux"
 msgstr ""
 
+#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:1
+msgid "TCOS Server Configurator"
+msgstr ""
+
+#: ../menu-data/tcos-configurator:tcos-configurator.desktop.in.h:2
+msgid "Configure TCOS server daemons and users"
+msgstr ""
+
+#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:1
+msgid "TCOS Standalone"
+msgstr ""
+
+#: ../menu-data/tcos-standalone:tcos-standalone.desktop.in.h:2
+msgid "Configure standalone mode of TCOS"
+msgstr ""
+
+#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:1
+msgid "TCOS-config"
+msgstr ""
+
+#: ../menu-data/tcosconfig:tcosconfig.desktop.in.h:2
+msgid "Configure and make bootable initramfs images for thin client networks"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:1
+msgid "TcosMonitor"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcosmonitor.desktop.in.h:2
+msgid "Thin client network monitor"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:1
+msgid "TcosPersonalize"
+msgstr ""
+
+#: ../menu-data/tcosmonitor:tcospersonalize.desktop.in.h:2
+msgid "Configure a simple TCOS thin client"
+msgstr ""
+
 #: ../menu-data/tea:tea.desktop.in.h:1
 msgid "TEA Text Editor"
 msgstr ""
@@ -16565,11 +16841,11 @@
 msgstr ""
 
 #: ../menu-data/teeworlds:teeworlds.desktop.in.h:1
-msgid "An online multi-player platform 2D shooter"
+msgid "Teeworlds"
 msgstr ""
 
 #: ../menu-data/teeworlds:teeworlds.desktop.in.h:2
-msgid "Teeworlds"
+msgid "An online multi-player platform 2D shooter"
 msgstr ""
 
 #: ../menu-data/teg:teg.desktop.in.h:1
@@ -16581,19 +16857,19 @@
 msgstr ""
 
 #: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:1
-msgid "Handwriting Recognition"
+msgid "Tegaki Recognize"
 msgstr ""
 
 #: ../menu-data/tegaki-recognize:tegaki-recognize.desktop.in.h:2
-msgid "Tegaki Recognize"
+msgid "Handwriting Recognition"
 msgstr ""
 
 #: ../menu-data/tekka:tekka.desktop.in.h:1
-msgid "Chat on IRC"
+msgid "tekka IRC Client"
 msgstr ""
 
 #: ../menu-data/tekka:tekka.desktop.in.h:2
-msgid "tekka IRC Client"
+msgid "Chat on IRC"
 msgstr ""
 
 #: ../menu-data/telegnome:telegnome.desktop.in.h:1
@@ -16605,11 +16881,11 @@
 msgstr ""
 
 #: ../menu-data/teleport:teleport.desktop.in.h:1
-msgid "Move applications between displays"
+msgid "Teleport"
 msgstr ""
 
 #: ../menu-data/teleport:teleport.desktop.in.h:2
-msgid "Teleport"
+msgid "Move applications between displays"
 msgstr ""
 
 #: ../menu-data/tellico:kde4__tellico.desktop.in.h:1
@@ -16621,63 +16897,63 @@
 msgstr ""
 
 #: ../menu-data/tennix:tennix.desktop.in.h:1
-msgid "Play tennis against the computer or a friend"
+msgid "Tennix!"
 msgstr ""
 
 #: ../menu-data/tennix:tennix.desktop.in.h:2
-msgid "Tennix!"
+msgid "Play tennis against the computer or a friend"
 msgstr ""
 
-#: ../menu-data/terminal.app:Terminal.desktop.in.h:1
+#: ../menu-data/terminal.app:Terminal.desktop.in.h:2
 msgid "A terminal emulator"
 msgstr "Emulátor terminálu"
 
 #: ../menu-data/terminator:terminator.desktop.in.h:1
-msgid "Multiple terminals in one window"
+msgid "Terminator"
 msgstr ""
 
 #: ../menu-data/terminator:terminator.desktop.in.h:2
-msgid "Terminator"
+msgid "Multiple terminals in one window"
 msgstr ""
 
 #: ../menu-data/termit:termit.desktop.in.h:1
-msgid "Lightweight terminal emulator"
+msgid "Termit"
 msgstr ""
 
 #: ../menu-data/termit:termit.desktop.in.h:2
-msgid "Termit"
+msgid "Lightweight terminal emulator"
 msgstr ""
 
 #: ../menu-data/terraintool:terraintool.desktop.in.h:1
-msgid "Generate surface mesh in survex format"
+msgid "Terraintool surface mesh generator"
 msgstr ""
 
 #: ../menu-data/terraintool:terraintool.desktop.in.h:2
-msgid "Terraintool surface mesh generator"
+msgid "Generate surface mesh in survex format"
 msgstr ""
 
 #: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:1
-msgid "Download and run an Ubuntu ISO in a Virtual Machine"
+msgid "Test Drive an Ubuntu ISO"
 msgstr ""
 
 #: ../menu-data/testdrive-gtk:testdrive-gtk.desktop.in.h:2
-msgid "Test Drive an Ubuntu ISO"
+msgid "Download and run an Ubuntu ISO in a Virtual Machine"
 msgstr ""
 
 #: ../menu-data/tetraproc:tetraproc.desktop.in.h:1
-msgid "Tetrahedral Microphone Processor for Ambisonic Recording"
+msgid "Tetraproc"
 msgstr ""
 
 #: ../menu-data/tetraproc:tetraproc.desktop.in.h:2
-msgid "Tetraproc"
+msgid "Tetrahedral Microphone Processor for Ambisonic Recording"
 msgstr ""
 
 #: ../menu-data/tetzle:tetzle.desktop.in.h:1
-msgid "Jigsaw puzzle with tetromino pieces"
+msgid "Tetzle"
 msgstr ""
 
 #: ../menu-data/tetzle:tetzle.desktop.in.h:2
-msgid "Tetzle"
+msgid "Jigsaw puzzle with tetromino pieces"
 msgstr ""
 
 #: ../menu-data/tex-guy:tex-guy.desktop.in.h:1
@@ -16689,11 +16965,11 @@
 msgstr ""
 
 #: ../menu-data/texmacs-common:texmacs.desktop.in.h:1
-msgid "A structured wysiwyg scientific text editor"
+msgid "GNU TeXmacs Editor"
 msgstr ""
 
 #: ../menu-data/texmacs-common:texmacs.desktop.in.h:2
-msgid "GNU TeXmacs Editor"
+msgid "A structured wysiwyg scientific text editor"
 msgstr ""
 
 #: ../menu-data/texmaker:texmaker.desktop.in.h:1
@@ -16713,44 +16989,44 @@
 msgstr "Textový editor pre OpenStep"
 
 #: ../menu-data/texworks:texworks.desktop.in.h:1
-msgid ""
-"A simple environment for editing, typesetting, and previewing TeX documents"
+msgid "TeXworks"
 msgstr ""
 
 #: ../menu-data/texworks:texworks.desktop.in.h:2
-msgid "TeXworks"
+msgid ""
+"A simple environment for editing, typesetting, and previewing TeX documents"
 msgstr ""
 
 #: ../menu-data/tgif:tgif.desktop.in.h:1
-msgid "Interactive 2-D vector drawing program for X11"
+msgid "Tgif"
 msgstr ""
 
 #: ../menu-data/tgif:tgif.desktop.in.h:2
-msgid "Tgif"
+msgid "Interactive 2-D vector drawing program for X11"
 msgstr ""
 
 #: ../menu-data/thawab:thawab.desktop.in.h:1
-msgid "Electronic Arabic/Islamic Encyclopedia"
+msgid "Thawab"
 msgstr ""
 
 #: ../menu-data/thawab:thawab.desktop.in.h:2
-msgid "Thawab"
+msgid "Electronic Arabic/Islamic Encyclopedia"
 msgstr ""
 
 #: ../menu-data/themonospot:themonospot.desktop.in.h:1
-msgid "themonospot"
+msgid "themonospot - extract information from avi or mkv files"
 msgstr ""
 
 #: ../menu-data/themonospot:themonospot.desktop.in.h:2
-msgid "themonospot - extract information from avi or mkv files"
+msgid "themonospot"
 msgstr ""
 
 #: ../menu-data/theorur:theorur.desktop.in.h:1
-msgid "Broadcast multimedia streams over an Icecast system"
+msgid "Theorur"
 msgstr ""
 
 #: ../menu-data/theorur:theorur.desktop.in.h:2
-msgid "Theorur"
+msgid "Broadcast multimedia streams over an Icecast system"
 msgstr ""
 
 #: ../menu-data/therion-viewer:therion-viewer.desktop.in.h:1
@@ -16762,71 +17038,67 @@
 msgstr ""
 
 #: ../menu-data/therion:therion.desktop.in.h:1
-msgid "Draw up surveys in Therion format"
+msgid "Therion"
 msgstr ""
 
 #: ../menu-data/therion:therion.desktop.in.h:2
-msgid "Therion"
+msgid "Draw up surveys in Therion format"
 msgstr ""
 
 #: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:1
-msgid "Control Thin Client connections"
+msgid "Thin Client Manager"
 msgstr ""
 
 #: ../menu-data/thin-client-manager-gnome:student-control-panel.desktop.in.h:2
-msgid "Thin Client Manager"
+msgid "Control Thin Client connections"
 msgstr ""
 
 #: ../menu-data/thoggen:thoggen.desktop.in.h:1
-msgid "Extracts Video from your DVDs"
+msgid "Thoggen DVD Ripper"
 msgstr ""
 
 #: ../menu-data/thoggen:thoggen.desktop.in.h:2
-msgid "Thoggen DVD Ripper"
+msgid "Extracts Video from your DVDs"
 msgstr ""
 
 #: ../menu-data/threadscope:threadscope.desktop.in.h:1
-msgid "Haskell GHC thread profiler"
+msgid "threadscope"
 msgstr ""
 
 #: ../menu-data/threadscope:threadscope.desktop.in.h:2
-msgid "threadscope"
+msgid "Haskell GHC thread profiler"
 msgstr ""
 
 #: ../menu-data/thunar:Thunar.desktop.in.h:1
-msgid "Browse the filesystem with the file manager"
-msgstr "Prehliadanie súborového systému správcom súborov"
-
-#: ../menu-data/thunar:Thunar.desktop.in.h:2
 msgid "Thunar File Manager"
 msgstr "Thunar - správca súborov"
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:1
-msgid "Compose New Message"
-msgstr "Napísať novú správu"
+#: ../menu-data/thunar:Thunar.desktop.in.h:2
+msgid "Browse the filesystem with the file manager"
+msgstr "Prehliadanie súborového systému správcom súborov"
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:3
-msgid "Send and receive mail with Thunderbird"
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:1
+msgid "Thunderbird Mail"
 msgstr ""
 
-#: ../menu-data/thunderbird:thunderbird.desktop.in.h:4
-msgid "Thunderbird Mail"
+#: ../menu-data/thunderbird:thunderbird.desktop.in.h:2
+msgid "Send and receive mail with Thunderbird"
 msgstr ""
 
 #: ../menu-data/tickr:tickr.desktop.in.h:1
-msgid "GTK-based highly graphically-customizable RSS Ticker"
+msgid "Tickr - RSS Feed Reader"
 msgstr ""
 
 #: ../menu-data/tickr:tickr.desktop.in.h:2
-msgid "Tickr - RSS Feed Reader"
+msgid "GTK-based highly graphically-customizable RSS Ticker"
 msgstr ""
 
 #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:1
-msgid "Simple, fun tic tac toe game for GNOME"
+msgid "Tic Tac Toe"
 msgstr ""
 
 #: ../menu-data/tictactoe-ng:tictactoe-ng.desktop.in.h:2
-msgid "Tic Tac Toe"
+msgid "Simple, fun tic tac toe game for GNOME"
 msgstr ""
 
 #: ../menu-data/tiger:tiger.desktop.in.h:1
@@ -16858,86 +17130,70 @@
 msgstr ""
 
 #: ../menu-data/tint2:tint2conf.desktop.in.h:1
-msgid "Customize the panel settings"
+msgid "Panel tint2"
 msgstr ""
 
 #: ../menu-data/tint2:tint2conf.desktop.in.h:2
-msgid "Panel tint2"
+msgid "Customize the panel settings"
 msgstr ""
 
 #: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:1
-msgid "A tool to train your ears to hear relative pitch"
-msgstr ""
-
-#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2
 msgid "Tiny Ear Trainer"
 msgstr ""
 
-#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:1
-msgid "A program to learn touch typing"
-msgstr ""
-
-#: ../menu-data/tipptrainer:tipptrainer.desktop.in.h:2
-msgid "Tipptrainer Typing Tutor"
+#: ../menu-data/tinyeartrainer:tinyeartrainer.desktop.in.h:2
+msgid "A tool to train your ears to hear relative pitch"
 msgstr ""
 
 #: ../menu-data/titanion:titanion.desktop.in.h:1
-msgid "Kenta Cho's Titanion"
+msgid "Titanion"
 msgstr ""
 
 #: ../menu-data/titanion:titanion.desktop.in.h:2
-msgid "Titanion"
+msgid "Kenta Cho's Titanion"
 msgstr ""
 
 #: ../menu-data/tkabber:tkabber.desktop.in.h:1
-msgid "Communicate via XMPP (Jabber) protocol"
+msgid "Tkabber"
 msgstr ""
 
 #: ../menu-data/tkabber:tkabber.desktop.in.h:2
-msgid "Tkabber"
+msgid "Communicate via XMPP (Jabber) protocol"
 msgstr ""
 
 #: ../menu-data/tkcvs:tkcvs.desktop.in.h:1
-msgid "A graphical frontend to CVS and Subversion."
-msgstr ""
-
-#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2
 msgid "tkcvs"
 msgstr ""
 
-#: ../menu-data/tkdiff:tkdiff.desktop.in.h:1
-msgid "TkDiff File Comparison"
-msgstr ""
-
-#: ../menu-data/tkdiff:tkdiff.desktop.in.h:2
-msgid "TkDiff is a graphical front-end for the standard Unix 'diff' utility."
+#: ../menu-data/tkcvs:tkcvs.desktop.in.h:2
+msgid "A graphical frontend to CVS and Subversion."
 msgstr ""
 
 #: ../menu-data/tkgate:tkgate.desktop.in.h:1
-msgid "Event driven digital circuit simulator with Tcl/Tk"
+msgid "tkgate Circuit Simulator"
 msgstr ""
 
 #: ../menu-data/tkgate:tkgate.desktop.in.h:2
-msgid "tkgate Circuit Simulator"
+msgid "Event driven digital circuit simulator with Tcl/Tk"
 msgstr ""
 
 #: ../menu-data/tmw:tmw.desktop.in.h:1
-msgid "The Mana World 2D MMORPG client"
+msgid "The Mana world"
 msgstr ""
 
 #: ../menu-data/tmw:tmw.desktop.in.h:2
-msgid "The Mana world"
+msgid "The Mana World 2D MMORPG client"
 msgstr ""
 
 #: ../menu-data/tomatoes:tomatoes.desktop.in.h:1
-msgid "How many tomatoes can you smash in ten short minutes?"
+msgid "I Have No Tomatoes"
 msgstr ""
 
 #: ../menu-data/tomatoes:tomatoes.desktop.in.h:2
-msgid "I Have No Tomatoes"
+msgid "How many tomatoes can you smash in ten short minutes?"
 msgstr ""
 
-#: ../menu-data/tomboy:tomboy.desktop.in.h:2
+#: ../menu-data/tomboy:tomboy.desktop.in.h:1
 msgid "Tomboy Notes"
 msgstr "Tomboy - poznámky"
 
@@ -16950,35 +17206,35 @@
 msgstr ""
 
 #: ../menu-data/toppler:toppler.desktop.in.h:1
-msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines."
+msgid "Tower Toppler"
 msgstr ""
 
 #: ../menu-data/toppler:toppler.desktop.in.h:2
-msgid "Tower Toppler"
+msgid "A clone of the 'Nebulus' game on old 8 and 16 bit machines."
 msgstr ""
 
 #: ../menu-data/tora:tora.desktop.in.h:1
-msgid "A graphical toolkit for database administration and development"
+msgid "TOra"
 msgstr ""
 
 #: ../menu-data/tora:tora.desktop.in.h:2
-msgid "TOra"
+msgid "A graphical toolkit for database administration and development"
 msgstr ""
 
 #: ../menu-data/torchat:torchat.desktop.in.h:1
-msgid "Decentralized instant messenger built on top of the Tor Network"
+msgid "TorChat"
 msgstr ""
 
 #: ../menu-data/torchat:torchat.desktop.in.h:2
-msgid "TorChat"
+msgid "Decentralized instant messenger built on top of the Tor Network"
 msgstr ""
 
 #: ../menu-data/torcs:torcs.desktop.in.h:1
-msgid "3D racing cars simulator game"
+msgid "TORCS"
 msgstr ""
 
 #: ../menu-data/torcs:torcs.desktop.in.h:2
-msgid "TORCS"
+msgid "3D racing cars simulator game"
 msgstr ""
 
 #: ../menu-data/tortoisehg:tortoisehg.desktop.in.h:1
@@ -16986,35 +17242,31 @@
 msgstr ""
 
 #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:1
-msgid "HIZ's version of Torus Trooper"
+msgid "Torus Trooper Pure"
 msgstr ""
 
 #: ../menu-data/torus-trooper-pure:torus-trooper-pure.desktop.in.h:2
-msgid "Torus Trooper Pure"
+msgid "HIZ's version of Torus Trooper"
 msgstr ""
 
 #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:1
-msgid "Kenta Cho's Torus Trooper"
+msgid "Torus Trooper"
 msgstr ""
 
 #: ../menu-data/torus-trooper:torus-trooper.desktop.in.h:2
-msgid "Torus Trooper"
+msgid "Kenta Cho's Torus Trooper"
 msgstr ""
 
 #: ../menu-data/totem:totem.desktop.in.h:1
 msgid "Movie Player"
 msgstr "Prehrávač filmov"
 
-#: ../menu-data/totem:totem.desktop.in.h:2
-msgid "Play movies and songs"
-msgstr "Prehrávanie filmov a piesní"
-
 #: ../menu-data/tovidgui:tovidgui.desktop.in.h:1
-msgid "Author videos to DVD with menus"
+msgid "tovid GUI"
 msgstr ""
 
 #: ../menu-data/tovidgui:tovidgui.desktop.in.h:2
-msgid "tovid GUI"
+msgid "Author videos to DVD with menus"
 msgstr ""
 
 #: ../menu-data/trackballs:trackballs.desktop.in.h:1
@@ -17044,19 +17296,19 @@
 msgstr ""
 
 #: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:1
-msgid "Transfer miis from a wiimote"
+msgid "Transfermii"
 msgstr ""
 
 #: ../menu-data/transfermii-gui:transfermii-gui.desktop.in.h:2
-msgid "Transfermii"
+msgid "Transfer miis from a wiimote"
 msgstr ""
 
 #: ../menu-data/transgui:transgui.desktop.in.h:1
-msgid "GUI to remotely control a Transmission daemon"
+msgid "Transmission remote GUI"
 msgstr ""
 
 #: ../menu-data/transgui:transgui.desktop.in.h:2
-msgid "Transmission remote GUI"
+msgid "GUI to remotely control a Transmission daemon"
 msgstr ""
 
 #: ../menu-data/transmageddon:transmageddon.desktop.in.h:1
@@ -17067,11 +17319,11 @@
 msgid "Video format conversion tool"
 msgstr ""
 
-#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:2
+#: ../menu-data/transmission-gtk:transmission-gtk.desktop.in.h:1
 msgid "Transmission BitTorrent Client"
 msgstr "Klient siete BitTorrent Transmission"
 
-#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:2
+#: ../menu-data/transmission-qt:transmission-qt.desktop.in.h:1
 msgid "Qtransmission Bittorrent Client"
 msgstr ""
 
@@ -17087,65 +17339,47 @@
 msgid "Office Document Reader"
 msgstr ""
 
-#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:1
-msgid ""
-"Reconstruction of phylogenetic trees by maximum likelihood (parallelized "
-"version)"
-msgstr ""
-
-#: ../menu-data/tree-ppuzzle:tree-ppuzzle.desktop.in.h:2
-msgid "tree-ppuzzle"
-msgstr ""
-
-#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:1
-msgid "Reconstruction of phylogenetic trees by maximum likelihood"
-msgstr ""
-
-#: ../menu-data/tree-puzzle:tree-puzzle.desktop.in.h:2
-msgid "tree-puzzle"
-msgstr ""
-
 #: ../menu-data/treeline:treeline.desktop.in.h:1
-msgid "Tree-like structured custom data manager"
+msgid "TreeLine"
 msgstr ""
 
 #: ../menu-data/treeline:treeline.desktop.in.h:2
-msgid "TreeLine"
+msgid "Tree-like structured custom data manager"
 msgstr ""
 
 #: ../menu-data/treeviewx:treeviewx.desktop.in.h:1
-msgid ""
-"Displays, modifies, prints and exports in SVG format phylogenetic trees"
+msgid "TreeView X"
 msgstr ""
 
 #: ../menu-data/treeviewx:treeviewx.desktop.in.h:2
-msgid "TreeView X"
+msgid ""
+"Displays, modifies, prints and exports in SVG format phylogenetic trees"
 msgstr ""
 
 #: ../menu-data/tremulous:tremulous.desktop.in.h:1
-msgid ""
-"Aliens vs Humans, First Person Shooter game with elements of Real Time "
-"Strategy"
+msgid "Tremulous"
 msgstr ""
 
 #: ../menu-data/tremulous:tremulous.desktop.in.h:2
-msgid "Tremulous"
+msgid ""
+"Aliens vs Humans, First Person Shooter game with elements of Real Time "
+"Strategy"
 msgstr ""
 
 #: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:1
-msgid "3D rally racing car game"
+msgid "Trigger"
 msgstr ""
 
 #: ../menu-data/trigger-rally:trigger-rally.desktop.in.h:2
-msgid "Trigger"
+msgid "3D rally racing car game"
 msgstr ""
 
 #: ../menu-data/trimage:trimage.desktop.in.h:1
-msgid "A cross-platform tool for optimizing PNG and JPG files."
+msgid "Trimage image compressor"
 msgstr ""
 
 #: ../menu-data/trimage:trimage.desktop.in.h:2
-msgid "Trimage image compressor"
+msgid "A cross-platform tool for optimizing PNG and JPG files."
 msgstr ""
 
 #: ../menu-data/triplane:triplane.desktop.in.h:1
@@ -17156,6 +17390,10 @@
 msgid "side-scrolling dogfighting game"
 msgstr ""
 
+#: ../menu-data/triplea:triplea.desktop.in.h:1
+msgid "TripleA"
+msgstr ""
+
 #: ../menu-data/tritium:tritium.desktop.in.h:1
 msgid "Tritium"
 msgstr ""
@@ -17165,27 +17403,27 @@
 msgstr ""
 
 #: ../menu-data/trovacap:trovacap.desktop.in.h:1
-msgid "Computes Italian ZIP codes"
+msgid "TrovaCAP"
 msgstr ""
 
 #: ../menu-data/trovacap:trovacap.desktop.in.h:2
-msgid "TrovaCAP"
+msgid "Computes Italian ZIP codes"
 msgstr ""
 
 #: ../menu-data/trustedqsl:tqsl.desktop.in.h:1
-msgid "Sign QSO data for upload to LoTW"
+msgid "TrustedQSL"
 msgstr ""
 
 #: ../menu-data/trustedqsl:tqsl.desktop.in.h:2
-msgid "TrustedQSL"
+msgid "Sign QSO data for upload to LoTW"
 msgstr ""
 
 #: ../menu-data/tryton-client:tryton-client.desktop.in.h:1
-msgid "Access Tryton server"
+msgid "Tryton"
 msgstr ""
 
 #: ../menu-data/tryton-client:tryton-client.desktop.in.h:2
-msgid "Tryton"
+msgid "Access Tryton server"
 msgstr ""
 
 #: ../menu-data/tryton-neso:neso.desktop.in.h:1
@@ -17205,11 +17443,11 @@
 msgstr ""
 
 #: ../menu-data/tucan:tucan.desktop.in.h:1
-msgid "Download and upload manager for hosting sites."
+msgid "Tucan Manager"
 msgstr ""
 
 #: ../menu-data/tucan:tucan.desktop.in.h:2
-msgid "Tucan Manager"
+msgid "Download and upload manager for hosting sites."
 msgstr ""
 
 #: ../menu-data/tucnak2:tucnak2.desktop.in.h:1
@@ -17221,27 +17459,27 @@
 msgstr ""
 
 #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:1
-msgid "Kenta Cho's Tumiki Fighters"
+msgid "Tumiki Fighters"
 msgstr ""
 
 #: ../menu-data/tumiki-fighters:tumiki-fighters.desktop.in.h:2
-msgid "Tumiki Fighters"
+msgid "Kenta Cho's Tumiki Fighters"
 msgstr ""
 
 #: ../menu-data/tunapie:tunapie.desktop.in.h:1
-msgid "Lists audio and video streams from shoutcast and icecast"
+msgid "Tunapie"
 msgstr ""
 
 #: ../menu-data/tunapie:tunapie.desktop.in.h:2
-msgid "Tunapie"
+msgid "Lists audio and video streams from shoutcast and icecast"
 msgstr ""
 
 #: ../menu-data/tunnelx:tunnelx.desktop.in.h:1
-msgid "Draw cave surveys"
+msgid "Tunnel Cave Drawing Software"
 msgstr ""
 
 #: ../menu-data/tunnelx:tunnelx.desktop.in.h:2
-msgid "Tunnel Cave Drawing Software"
+msgid "Draw cave surveys"
 msgstr ""
 
 #: ../menu-data/turpial:turpial.desktop.in.h:1
@@ -17253,11 +17491,11 @@
 msgstr ""
 
 #: ../menu-data/turtleart:turtleart.desktop.in.h:1
-msgid "A Logo programming environment"
+msgid "TurtleArt"
 msgstr ""
 
 #: ../menu-data/turtleart:turtleart.desktop.in.h:2
-msgid "TurtleArt"
+msgid "A Logo programming environment"
 msgstr ""
 
 #: ../menu-data/tuxcards:tuxcards.desktop.in.h:1
@@ -17269,27 +17507,27 @@
 msgstr ""
 
 #: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:1
-msgid "A two panel file manager"
+msgid "Tux Commander"
 msgstr ""
 
 #: ../menu-data/tuxcmd:tuxcmd.desktop.in.h:2
-msgid "Tux Commander"
+msgid "A two panel file manager"
 msgstr ""
 
 #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:1
-msgid "2D Football Game"
+msgid "Tuxfootball"
 msgstr ""
 
 #: ../menu-data/tuxfootball:tuxfootball.desktop.in.h:2
-msgid "Tuxfootball"
+msgid "2D Football Game"
 msgstr ""
 
 #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:1
-msgid "Edit, playback guitar tablatures"
+msgid "tuxguitar"
 msgstr ""
 
 #: ../menu-data/tuxguitar:tuxguitar.desktop.in.h:2
-msgid "tuxguitar"
+msgid "Edit, playback guitar tablatures"
 msgstr ""
 
 #: ../menu-data/tuxmath:tuxmath.desktop.in.h:1
@@ -17301,27 +17539,27 @@
 msgstr ""
 
 #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:1
-msgid "A drawing program for children."
+msgid "Tux Paint"
 msgstr ""
 
 #: ../menu-data/tuxpaint:tuxpaint.desktop.in.h:2
-msgid "Tux Paint"
+msgid "A drawing program for children."
 msgstr ""
 
 #: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:1
-msgid "Play Shufflepuck with Tux"
+msgid "Tuxpuck"
 msgstr ""
 
 #: ../menu-data/tuxpuck:tuxpuck.desktop.in.h:2
-msgid "Tuxpuck"
+msgid "Play Shufflepuck with Tux"
 msgstr ""
 
 #: ../menu-data/tuxtype:tuxtype.desktop.in.h:1
-msgid "Educational typing tutor game starring Tux"
+msgid "Tux Typing"
 msgstr ""
 
 #: ../menu-data/tuxtype:tuxtype.desktop.in.h:2
-msgid "Tux Typing"
+msgid "Educational typing tutor game starring Tux"
 msgstr ""
 
 #: ../menu-data/tvtime:net-tvtime.desktop.in.h:1
@@ -17333,11 +17571,11 @@
 msgstr ""
 
 #: ../menu-data/twinkle:twinkle.desktop.in.h:1
-msgid "A SIP softphone"
+msgid "Twinkle"
 msgstr ""
 
 #: ../menu-data/twinkle:twinkle.desktop.in.h:2
-msgid "Twinkle"
+msgid "A SIP softphone"
 msgstr ""
 
 #: ../menu-data/tworld:tworld.desktop.in.h:1
@@ -17345,11 +17583,11 @@
 msgstr ""
 
 #: ../menu-data/txtreader:txtreader.desktop.in.h:1
-msgid "Read text novels and more"
+msgid "Txt Reader"
 msgstr ""
 
 #: ../menu-data/txtreader:txtreader.desktop.in.h:2
-msgid "Txt Reader"
+msgid "Read text novels and more"
 msgstr ""
 
 #: ../menu-data/uae:uae.desktop.in.h:1
@@ -17361,27 +17599,27 @@
 msgstr ""
 
 #: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:1
-msgid "Configure and manage your Ubuntu One account"
-msgstr ""
-
-#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2
 msgid "Ubuntu One"
 msgstr "Ubuntu One"
 
+#: ../menu-data/ubuntuone-installer:ubuntuone-installer.desktop.in.h:2
+msgid "Configure and manage your Ubuntu One account"
+msgstr ""
+
 #: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:1
-msgid "Change settings for multimedia production"
+msgid "Ubuntu Studio Controls"
 msgstr ""
 
 #: ../menu-data/ubuntustudio-controls:ubuntustudio-controls.desktop.in.h:2
-msgid "Ubuntu Studio Controls"
+msgid "Change settings for multimedia production"
 msgstr ""
 
 #: ../menu-data/uck:uck.desktop.in.h:1
-msgid "Customize your Ubuntu Desktop CDs easily"
+msgid "Ubuntu Customization Kit"
 msgstr ""
 
 #: ../menu-data/uck:uck.desktop.in.h:2
-msgid "Ubuntu Customization Kit"
+msgid "Customize your Ubuntu Desktop CDs easily"
 msgstr ""
 
 #: ../menu-data/udav:udav.desktop.in.h:1
@@ -17393,30 +17631,30 @@
 msgstr ""
 
 #: ../menu-data/ufraw:ufraw.desktop.in.h:1
-msgid "A utility to read and manipulate raw images from digital cameras"
+msgid "UFRaw"
 msgstr ""
 
 #: ../menu-data/ufraw:ufraw.desktop.in.h:2
-msgid "UFRaw"
+msgid "A utility to read and manipulate raw images from digital cameras"
 msgstr ""
 
 #: ../menu-data/ugene:ugene.desktop.in.h:1
-msgid "Integrated Bioinformatics Suite"
+msgid "Unipro UGENE"
 msgstr ""
 
 #: ../menu-data/ugene:ugene.desktop.in.h:2
-msgid "Unipro UGENE"
+msgid "Integrated Bioinformatics Suite"
 msgstr ""
 
 #: ../menu-data/uget:uget-gtk.desktop.in.h:1
-msgid "Download multiple URLs and apply it to one of setting/queue."
+msgid "uGet"
 msgstr ""
 
 #: ../menu-data/uget:uget-gtk.desktop.in.h:2
-msgid "uGet"
+msgid "Download multiple URLs and apply it to one of setting/queue."
 msgstr ""
 
-#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:1
+#: ../menu-data/uim-gtk2.0:uim.desktop.in.h:2
 msgid "Customize uim input method environment"
 msgstr ""
 
@@ -17429,27 +17667,27 @@
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:1
-msgid "Graphical interface to build UIMA CPE"
+msgid "UIMA CPE Gui"
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-cpegui.desktop.in.h:2
-msgid "UIMA CPE Gui"
+msgid "Graphical interface to build UIMA CPE"
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:1
-msgid "Simple UIMA analysis engine runner"
+msgid "UIMA Document Analyzer"
 msgstr ""
 
 #: ../menu-data/uima-utils:uima-documentanalyzer.desktop.in.h:2
-msgid "UIMA Document Analyzer"
+msgid "Simple UIMA analysis engine runner"
 msgstr ""
 
 #: ../menu-data/ukopp:ukopp.desktop.in.h:1
-msgid "Full and incremental backup with media verification"
+msgid "ukopp"
 msgstr ""
 
 #: ../menu-data/ukopp:ukopp.desktop.in.h:2
-msgid "ukopp"
+msgid "Full and incremental backup with media verification"
 msgstr ""
 
 #: ../menu-data/ultracopier:ultracopier.desktop.in.h:1
@@ -17461,102 +17699,102 @@
 msgstr ""
 
 #: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:1
-msgid "UML Modeller"
-msgstr "UML modelovací nástroj"
-
-#: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2
 msgid "Umbrello"
 msgstr "Umbrello"
 
+#: ../menu-data/umbrello:kde4__umbrello.desktop.in.h:2
+msgid "UML Modeller"
+msgstr "UML modelovací nástroj"
+
 #: ../menu-data/umit:umit.desktop.in.h:1
-msgid "Explore the network and scan ports"
+msgid "Umit Network Scanner"
 msgstr ""
 
 #: ../menu-data/umit:umit.desktop.in.h:2
-msgid "Umit Network Scanner"
+msgid "Explore the network and scan ports"
 msgstr ""
 
 #: ../menu-data/unetbootin:unetbootin.desktop.in.h:1
-msgid "Tool for creating Live USB drives"
+msgid "UNetbootin"
 msgstr ""
 
 #: ../menu-data/unetbootin:unetbootin.desktop.in.h:2
-msgid "UNetbootin"
+msgid "Tool for creating Live USB drives"
 msgstr ""
 
 #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:1
-msgid "GTK interface for the unison file synchronization tool 2.32.52"
+#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1
+msgid "Unison"
 msgstr ""
 
 #: ../menu-data/unison-gtk:unison-gtk.desktop.in.h:2
-#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2
-msgid "Unison"
+msgid "GTK interface for the unison file synchronization tool 2.32.52"
 msgstr ""
 
-#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:1
+#: ../menu-data/unison2.27.57-gtk:unison2.27.57-gtk.desktop.in.h:2
 msgid "GTK interface for the unison file synchronization tool 2.27.57"
 msgstr ""
 
 #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:1
-msgid "A Qt-based applications launcher"
+msgid "Unity 2d Launcher"
 msgstr ""
 
 #: ../menu-data/unity-2d-launcher:unity-2d-launcher.desktop.in.h:2
-msgid "Unity 2d Launcher"
+msgid "A Qt-based applications launcher"
 msgstr ""
 
 #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:1
-msgid "A Qt-based panel"
+msgid "Unity 2D Panel"
 msgstr ""
 
 #: ../menu-data/unity-2d-panel:unity-2d-panel.desktop.in.h:2
-msgid "Unity 2D Panel"
+msgid "A Qt-based panel"
 msgstr ""
 
 #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:1
-msgid "A Qt-based implementation of Unity Places"
+msgid "Unity 2D Places"
 msgstr ""
 
 #: ../menu-data/unity-2d-places:unity-2d-places.desktop.in.h:2
-msgid "Unity 2D Places"
+msgid "A Qt-based implementation of Unity Places"
 msgstr ""
 
-#: ../menu-data/update-manager:update-manager.desktop.in.h:1
+#: ../menu-data/update-manager:update-manager.desktop.in.h:2
 msgid "Show and install available updates"
 msgstr ""
 
 #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:1
-msgid " DLNA/UPnP device and service analyzer,control-point and test-tool"
+msgid "UPnP Inspector"
 msgstr ""
 
 #: ../menu-data/upnp-inspector:upnp-inspector.desktop.in.h:2
-msgid "UPnP Inspector"
+msgid " DLNA/UPnP device and service analyzer,control-point and test-tool"
 msgstr ""
 
 #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:1
-msgid "A simple program to manage UPnP IGD compliant routers"
+msgid "UPnP Router Control"
 msgstr ""
 
 #: ../menu-data/upnp-router-control:upnp-router-control.desktop.in.h:2
-msgid "UPnP Router Control"
+msgid "A simple program to manage UPnP IGD compliant routers"
 msgstr ""
 
 #: ../menu-data/uqm:uqm.desktop.in.h:1
-msgid "An interstellar adventure game"
+msgid "The Ur-Quan Masters"
 msgstr ""
 
 #: ../menu-data/uqm:uqm.desktop.in.h:2
-msgid "The Ur-Quan Masters"
+msgid "An interstellar adventure game"
 msgstr ""
 
 #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:1
 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:1
-msgid "Create a startup disk using a CD or disc image"
+msgid "Startup Disk Creator"
 msgstr ""
 
 #: ../menu-data/usb-creator-gtk:usb-creator-gtk.desktop.in.h:2
 #: ../menu-data/usb-creator-kde:usb-creator-kde.desktop.in.h:2
-msgid "Startup Disk Creator"
+msgid "Create a startup disk using a CD or disc image"
 msgstr ""
 
 #: ../menu-data/usb-imagewriter:imagewriter.desktop.in.h:1
@@ -17588,11 +17826,11 @@
 msgstr ""
 
 #: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:1
-msgid "Change your login password"
+msgid "Password"
 msgstr ""
 
 #: ../menu-data/usermode:redhat-userpasswd.desktop.in.h:2
-msgid "Password"
+msgid "Change your login password"
 msgstr ""
 
 #: ../menu-data/utf8-migration-tool:utf8migrationtool.desktop.in.h:1
@@ -17608,43 +17846,47 @@
 msgstr ""
 
 #: ../menu-data/v-sim-common:v-sim.desktop.in.h:1
-msgid "Atomic visualisation"
+msgid "V_Sim"
 msgstr ""
 
 #: ../menu-data/v-sim-common:v-sim.desktop.in.h:2
-msgid "V_Sim"
+msgid "Atomic visualisation"
 msgstr ""
 
 #: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:1
-msgid "A universal control panel for V4L2 devices"
+msgid "Video4Linux Control Panel"
 msgstr ""
 
 #: ../menu-data/v4l2ucp:v4l2ucp.desktop.in.h:2
-msgid "Video4Linux Control Panel"
+msgid "A universal control panel for V4L2 devices"
 msgstr ""
 
 #: ../menu-data/vagalume:vagalume.desktop.in.h:1
+msgid "Last.fm Client"
+msgstr ""
+
+#: ../menu-data/vagalume:vagalume.desktop.in.h:2
 msgid "Vagalume Last.fm Client"
 msgstr ""
 
 #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:1
-msgid "Kenta Cho's Val & Rick"
+msgid "Val & Rick"
 msgstr ""
 
 #: ../menu-data/val-and-rick:val-and-rick.desktop.in.h:2
-msgid "Val & Rick"
+msgid "Kenta Cho's Val & Rick"
 msgstr ""
 
-#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:1
+#: ../menu-data/vala-terminal:vala-terminal.desktop.in.h:2
 msgid "Command Line Interface"
 msgstr ""
 
 #: ../menu-data/valknut:valknut.desktop.in.h:1
-msgid "Share files over the Direct Connect network"
+msgid "Valknut"
 msgstr ""
 
 #: ../menu-data/valknut:valknut.desktop.in.h:2
-msgid "Valknut"
+msgid "Share files over the Direct Connect network"
 msgstr ""
 
 #: ../menu-data/vbaexpress:vbaexpress.desktop.in.h:1
@@ -17656,27 +17898,27 @@
 msgstr ""
 
 #: ../menu-data/vectoroids:vectoroids.desktop.in.h:1
-msgid "A clone of the classic arcade game \"Asteroids\""
+msgid "Vectoroids"
 msgstr ""
 
 #: ../menu-data/vectoroids:vectoroids.desktop.in.h:2
-msgid "Vectoroids"
+msgid "A clone of the classic arcade game \"Asteroids\""
 msgstr ""
 
 #: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:1
-msgid "French conjugation system"
+msgid "Verbiste"
 msgstr ""
 
 #: ../menu-data/verbiste-gnome:verbiste.desktop.in.h:2
-msgid "Verbiste"
+msgid "French conjugation system"
 msgstr ""
 
 #: ../menu-data/veusz:veusz.desktop.in.h:1
-msgid "For graphing and manipulation of scientific data"
+msgid "Veusz"
 msgstr ""
 
 #: ../menu-data/veusz:veusz.desktop.in.h:2
-msgid "Veusz"
+msgid "For graphing and manipulation of scientific data"
 msgstr ""
 
 #: ../menu-data/vice:x128.desktop.in.h:1
@@ -17704,11 +17946,11 @@
 msgstr ""
 
 #: ../menu-data/vidalia:vidalia.desktop.in.h:1
-msgid "Tor GUI"
+msgid "Vidalia"
 msgstr ""
 
 #: ../menu-data/vidalia:vidalia.desktop.in.h:2
-msgid "Vidalia"
+msgid "Tor GUI"
 msgstr ""
 
 #: ../menu-data/videocut:videocut.desktop.in.h:1
@@ -17720,11 +17962,11 @@
 msgstr ""
 
 #: ../menu-data/videoporama:videoporama.desktop.in.h:1
-msgid "Make and export image slideshows"
+msgid "Videoporama"
 msgstr ""
 
 #: ../menu-data/videoporama:videoporama.desktop.in.h:2
-msgid "Videoporama"
+msgid "Make and export image slideshows"
 msgstr ""
 
 #: ../menu-data/viewmol:viewmol.desktop.in.h:1
@@ -17732,82 +17974,78 @@
 msgstr ""
 
 #: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:1
-msgid "A spicy PDF Reader."
-msgstr "Pikantná čítačka PDF"
-
-#: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2
 msgid "ViewPDF"
 msgstr "ViewPDF"
 
+#: ../menu-data/viewpdf.app:ViewPDF.desktop.in.h:2
+msgid "A spicy PDF Reader."
+msgstr "Pikantná čítačka PDF"
+
 #: ../menu-data/viking:viking.desktop.in.h:1
-msgid "Map Based GPS Data Manager (live data capable)."
+msgid "Viking"
 msgstr ""
 
 #: ../menu-data/viking:viking.desktop.in.h:2
-msgid "Viking"
+msgid "Map Based GPS Data Manager (live data capable)."
 msgstr ""
 
-#: ../menu-data/vim-gui-common:gvim.desktop.in.h:2
+#: ../menu-data/vim-gui-common:gvim.desktop.in.h:1
 msgid "GVim"
 msgstr ""
 
 #: ../menu-data/vinagre:vinagre.desktop.in.h:1
-msgid "Access remote desktops"
-msgstr "Prístup k vzdialenej ploche"
-
-#: ../menu-data/vinagre:vinagre.desktop.in.h:2
 msgid "Remote Desktop Viewer"
 msgstr "Zobrazovač vzdialenej plochy"
 
-#: ../menu-data/vino:vino-preferences.desktop.in.h:1
+#: ../menu-data/vinagre:vinagre.desktop.in.h:2
+msgid "Access remote desktops"
+msgstr "Prístup k vzdialenej ploche"
+
+#: ../menu-data/vino:vino-preferences.desktop.in.h:2
 msgid "Choose how other users can remotely view your desktop"
 msgstr ""
 "Zvoľte si akým spôsobom môžu používatelia na diaľku zobrazovať vašu plochu"
 
 #: ../menu-data/viridian:viridian.desktop.in.h:1
-msgid "Stand alone front end for Ampache."
+msgid "viridian"
 msgstr ""
 
 #: ../menu-data/viridian:viridian.desktop.in.h:2
-msgid "viridian"
+msgid "Stand alone front end for Ampache."
 msgstr ""
 
 #: ../menu-data/virt-manager:virt-manager.desktop.in.h:1
-msgid "Manage virtual machines"
+msgid "Virtual Machine Manager"
 msgstr ""
 
 #: ../menu-data/virt-manager:virt-manager.desktop.in.h:2
-msgid "Virtual Machine Manager"
+msgid "Manage virtual machines"
 msgstr ""
 
 #: ../menu-data/virtaal:virtaal.desktop.in.h:1
-msgid ""
-"A translation tool to help a human translator translate files into other "
-"languages"
+msgid "Virtaal"
 msgstr ""
 
 #: ../menu-data/virtaal:virtaal.desktop.in.h:2
-msgid "Virtaal"
+msgid ""
+"A translation tool to help a human translator translate files into other "
+"languages"
 msgstr ""
 
 #: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:1
-msgid "Run several virtual systems on a single host computer"
-msgstr ""
-
-#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2
 msgid "VirtualBox"
 msgstr ""
 
-#: ../menu-data/viruskiller:viruskiller.desktop.in.h:1
-msgid "Virus Killer"
+#: ../menu-data/virtualbox-qt:virtualbox.desktop.in.h:2
+msgid "Run several virtual systems on a single host computer"
 msgstr ""
 
 #: ../menu-data/visolate:visolate.desktop.in.h:1
-msgid "PCB CNC converter"
+msgid "Visolate"
 msgstr ""
 
 #: ../menu-data/visolate:visolate.desktop.in.h:2
-msgid "Visolate"
+msgid "PCB CNC converter"
 msgstr ""
 
 #: ../menu-data/visualboyadvance-gtk:VisualBoyAdvance.desktop.in.h:1
@@ -17819,43 +18057,43 @@
 msgstr "Emulátor Game Boy Advance"
 
 #: ../menu-data/visualvm:visualvm.desktop.in.h:1
-msgid "All-in-One Java Troubleshooting Tool"
+msgid "VisualVM"
 msgstr ""
 
 #: ../menu-data/visualvm:visualvm.desktop.in.h:2
-msgid "VisualVM"
+msgid "All-in-One Java Troubleshooting Tool"
 msgstr ""
 
 #: ../menu-data/vitables:vitables.desktop.in.h:1
-msgid "PyTables & HDF5 Files Visualizer"
+msgid "ViTables"
 msgstr ""
 
 #: ../menu-data/vitables:vitables.desktop.in.h:2
-msgid "ViTables"
+msgid "PyTables & HDF5 Files Visualizer"
 msgstr ""
 
 #: ../menu-data/vite:vite.desktop.in.h:1
-msgid "A visual trace explorer"
+msgid "ViTE"
 msgstr ""
 
 #: ../menu-data/vite:vite.desktop.in.h:2
-msgid "ViTE"
+msgid "A visual trace explorer"
 msgstr ""
 
 #: ../menu-data/vkeybd:vkeybd.desktop.in.h:1
-msgid "MIDI Virtual Keyboard"
+msgid "Virtual MIDI Keyboard"
 msgstr ""
 
 #: ../menu-data/vkeybd:vkeybd.desktop.in.h:2
-msgid "Virtual MIDI Keyboard"
+msgid "MIDI Virtual Keyboard"
 msgstr ""
 
 #: ../menu-data/vlc:vlc.desktop.in.h:1
-msgid "Read, capture, broadcast your multimedia streams"
+msgid "VLC media player"
 msgstr ""
 
 #: ../menu-data/vlc:vlc.desktop.in.h:2
-msgid "VLC media player"
+msgid "Read, capture, broadcast your multimedia streams"
 msgstr ""
 
 #: ../menu-data/vmpk:vmpk.desktop.in.h:1
@@ -17876,27 +18114,31 @@
 msgstr ""
 
 #: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:1
-msgid "Control your volume settings"
-msgstr "Ovládanie nastavenia hlasitosti"
-
-#: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2
 msgid "VolumeControl"
 msgstr "Ovládanie hlasitosti"
 
+#: ../menu-data/volumecontrol.app:VolumeControl.desktop.in.h:2
+msgid "Control your volume settings"
+msgstr "Ovládanie nastavenia hlasitosti"
+
 #: ../menu-data/vor:vor.desktop.in.h:1
-msgid "Variations on Rockdodger"
+msgid "VoR"
 msgstr ""
 
 #: ../menu-data/vor:vor.desktop.in.h:2
-msgid "VoR"
+msgid "Variations on Rockdodger"
 msgstr ""
 
 #: ../menu-data/voxbo:vbview2.desktop.in.h:1
-msgid "VBView2"
+msgid "VoxBo Image Viewer"
 msgstr ""
 
 #: ../menu-data/voxbo:vbview2.desktop.in.h:2
-msgid "VoxBo Image Viewer"
+msgid "VBView2"
+msgstr ""
+
+#: ../menu-data/vprerex:vprerex.desktop.in.h:1
+msgid "vprerex"
 msgstr ""
 
 #: ../menu-data/vusb-analyzer:vusb-analyzer.desktop.in.h:1
@@ -17908,32 +18150,32 @@
 msgstr ""
 
 #: ../menu-data/vym:vym.desktop.in.h:1
-msgid "Create mind maps"
+msgid "VYM - View Your Mind"
 msgstr ""
 
 #: ../menu-data/vym:vym.desktop.in.h:2
-msgid "VYM - View Your Mind"
+msgid "Create mind maps"
 msgstr ""
 
 #: ../menu-data/w3af:w3af.desktop.in.h:1
-msgid "Web Application Attack and Audit Framework"
+msgid "w3af"
 msgstr ""
 
 #: ../menu-data/w3af:w3af.desktop.in.h:2
-msgid "w3af"
+msgid "Web Application Attack and Audit Framework"
 msgstr ""
 
 #: ../menu-data/wakeup:wakeup.desktop.in.h:1
-msgid ""
-"A talking and fully customizable alarm clock that will operate from poweroff"
+msgid "Wakeup"
 msgstr ""
 
 #: ../menu-data/wakeup:wakeup.desktop.in.h:2
-msgid "Wakeup"
+msgid ""
+"A talking and fully customizable alarm clock that will operate from poweroff"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:1
-msgid "Change Wallpaper"
+msgid "Wallch"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:2
@@ -17941,195 +18183,198 @@
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:3
-msgid "Live Earth Wallpaper"
+msgid "Start"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:4
-msgid "Next"
+msgid "Pause"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:5
-msgid "Pause"
+msgid "Stop"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:6
-msgid "Previous"
+msgid "Next"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:7
-msgid "Start"
+msgid "Previous"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:8
-msgid "Start Changing Wallpapers"
+msgid "Change Wallpaper"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:9
-msgid "Stop"
+msgid "Start Changing Wallpapers"
 msgstr ""
 
 #: ../menu-data/wallch:wallch.desktop.in.h:10
-msgid "Wallch"
+msgid "Live Earth Wallpaper"
 msgstr ""
 
 #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:1
-msgid "KDE4 Wallpaper changer"
+msgid "Wally"
 msgstr ""
 
 #: ../menu-data/wally:wally.desktop__wally.desktop.in.h:2
-msgid "Wally"
+msgid "KDE4 Wallpaper changer"
 msgstr ""
 
 #: ../menu-data/wammu:wammu.desktop.in.h:1
-msgid "Application for mobile phones - frontend for Gammu"
+msgid "Wammu"
 msgstr ""
 
 #: ../menu-data/wammu:wammu.desktop.in.h:2
-msgid "Wammu"
+msgid "Application for mobile phones - frontend for Gammu"
 msgstr ""
 
 #: ../menu-data/warmux:warmux.desktop.in.h:1
-msgid "A 2D game where funny characters launch funny weapons"
+msgid "Warmux"
 msgstr ""
 
 #: ../menu-data/warmux:warmux.desktop.in.h:2
-msgid "Warmux"
+msgid "A 2D game where funny characters launch funny weapons"
 msgstr ""
 
 #: ../menu-data/warsow:warsow.desktop.in.h:1
-msgid "A fast paced, networked 3D first person shooter"
+msgid "Warsow"
 msgstr ""
 
 #: ../menu-data/warsow:warsow.desktop.in.h:2
-msgid "Warsow"
+msgid "A fast paced, networked 3D first person shooter"
 msgstr ""
 
 #: ../menu-data/warzone2100:warzone2100.desktop.in.h:1
-msgid "Postnuclear realtime strategy"
+msgid "Warzone 2100"
 msgstr ""
 
 #: ../menu-data/warzone2100:warzone2100.desktop.in.h:2
-msgid "Warzone 2100"
+msgid "Postnuclear realtime strategy"
 msgstr ""
 
 #: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:1
-msgid "Split wave files into multiple chunks"
+msgid "Wavbreaker File Splitter"
 msgstr ""
 
 #: ../menu-data/wavbreaker:wavbreaker.desktop.in.h:2
-msgid "Wavbreaker File Splitter"
+msgid "Split wave files into multiple chunks"
 msgstr ""
 
 #: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:1
-msgid "Manipulate sound files"
-msgstr ""
-
-#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2
 msgid "wavesurfer"
 msgstr ""
 
-#: ../menu-data/webboard:webboard.desktop.in.h:1
-msgid ""
-"Publish text notes and source code on a pastebin server for collaborative "
-"debugging"
-msgstr ""
-
-#: ../menu-data/webboard:webboard.desktop.in.h:2
-msgid "WebBoard"
+#: ../menu-data/wavesurfer:wavesurfer.desktop.in.h:2
+msgid "Manipulate sound files"
 msgstr ""
 
 #: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:1
-msgid "Copy websites to your computer"
-msgstr "Skopírujte si web stránky do svojho počítača"
-
-#: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2
 msgid "WebHTTrack Website Copier"
 msgstr "Kopírovanie webstránok WebHTTrack"
 
+#: ../menu-data/webhttrack:WebHTTrack.desktop.in.h:2
+msgid "Copy websites to your computer"
+msgstr "Skopírujte si web stránky do svojho počítača"
+
 #: ../menu-data/webissues:webissues.desktop.in.h:1
-msgid "Desktop Client for the WebIssues team collaboration system"
+msgid "WebIssues"
 msgstr ""
 
 #: ../menu-data/webissues:webissues.desktop.in.h:2
-msgid "WebIssues"
+msgid "Desktop Client for the WebIssues team collaboration system"
 msgstr ""
 
 #: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:1
+msgid "Zoho Webservice Spreadsheet"
+msgstr ""
+
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2
 msgid ""
 "Perform calculation, analyze information and manage lists in spreadsheets "
 "using Zoho web services."
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-sheet.desktop.in.h:2
-msgid "Zoho Webservice Spreadsheet"
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:1
+msgid "Zoho Webservice Presentation"
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:1
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2
 msgid ""
 "Create and edit presentations for slideshows, meeting and Web pages using "
 "Zoho web services."
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-show.desktop.in.h:2
-msgid "Zoho Webservice Presentation"
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:1
+msgid "Zoho Webservice Word Processor"
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:1
+#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2
 msgid ""
 "Create and edit text and graphics in letters, reports, documents and Web "
 "pages using Zoho web services."
 msgstr ""
 
-#: ../menu-data/webservice-office-zoho:webservice-office-zoho-writer.desktop.in.h:2
-msgid "Zoho Webservice Word Processor"
+#: ../menu-data/weka:weka.desktop.in.h:1
+msgid "weka"
 msgstr ""
 
-#: ../menu-data/weka:weka.desktop.in.h:1
+#: ../menu-data/weka:weka.desktop.in.h:2
 msgid "Machine learning algorithms for data mining tasks"
 msgstr ""
 
-#: ../menu-data/weka:weka.desktop.in.h:2
-msgid "weka"
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:1
+msgid "Battle for Wesnoth (1.10)"
 msgstr ""
 
-#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10.desktop.in.h:2
+#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2
 msgid "A fantasy turn-based strategy game"
 msgstr ""
 
-#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:2
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:1
+msgid "Battle for Wesnoth Map Editor (1.10)"
+msgstr ""
+
+#: ../menu-data/wesnoth-1.10-core:wesnoth-1.10_editor.desktop.in.h:2
+msgid "A map editor for Battle for Wesnoth maps"
+msgstr ""
+
+#: ../menu-data/wesnoth-1.8-core:wesnoth-1.8.desktop.in.h:1
 msgid "Battle for Wesnoth (1.8)"
 msgstr ""
 
 #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:1
-msgid "2D platform game with a slight rotational twist"
+msgid "Which Way is Up"
 msgstr ""
 
 #: ../menu-data/whichwayisup:whichwayisup.desktop.in.h:2
-msgid "Which Way is Up"
+msgid "2D platform game with a slight rotational twist"
 msgstr ""
 
 #: ../menu-data/wicd-gtk:wicd.desktop.in.h:1
-msgid "Start the Wicd client without system tray icon"
+msgid "Wicd Network Manager"
 msgstr ""
 
 #: ../menu-data/wicd-gtk:wicd.desktop.in.h:2
-msgid "Wicd Network Manager"
+msgid "Start the Wicd client without system tray icon"
 msgstr ""
 
 #: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:1
-msgid "Wicd Client KDE"
+msgid "Wicd client"
 msgstr ""
 
 #: ../menu-data/wicd-kde:kde4__wicd-kde.desktop.in.h:2
-msgid "Wicd client"
+msgid "Wicd Client KDE"
 msgstr ""
 
 #: ../menu-data/widelands:widelands.desktop.in.h:1
-msgid "A a real-time build-up strategy game"
+msgid "Widelands"
 msgstr ""
 
 #: ../menu-data/widelands:widelands.desktop.in.h:2
-msgid "Widelands"
+msgid "A a real-time build-up strategy game"
 msgstr ""
 
 #: ../menu-data/widemargin:widemargin.desktop.in.h:1
@@ -18141,19 +18386,11 @@
 msgstr ""
 
 #: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:1
-msgid "Tool for connecting to wireless networks"
-msgstr ""
-
-#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2
 msgid "WiFi Radar"
 msgstr ""
 
-#: ../menu-data/wiican:wiican.desktop.in.h:1
-msgid "Wiican"
-msgstr ""
-
-#: ../menu-data/wiican:wiican.desktop.in.h:2
-msgid "Wiimote manager usage assistant and mapping manager"
+#: ../menu-data/wifi-radar:wifi-radar.desktop.in.h:2
+msgid "Tool for connecting to wireless networks"
 msgstr ""
 
 #: ../menu-data/willowng-config-gnome:willowng.desktop.in.h:1
@@ -18172,27 +18409,27 @@
 msgstr ""
 
 #: ../menu-data/winefish:winefish.desktop.in.h:1
-msgid "LaTeX Editor based on Bluefish"
+msgid "Winefish LaTeX Editor"
 msgstr ""
 
 #: ../menu-data/winefish:winefish.desktop.in.h:2
-msgid "Winefish LaTeX Editor"
+msgid "LaTeX Editor based on Bluefish"
 msgstr ""
 
 #: ../menu-data/winff:winff.desktop.in.h:1
-msgid "GUI for FFMPEG"
+msgid "WinFF"
 msgstr ""
 
 #: ../menu-data/winff:winff.desktop.in.h:2
-msgid "WinFF"
+msgid "GUI for FFMPEG"
 msgstr ""
 
 #: ../menu-data/wings3d:wings3d.desktop.in.h:1
-msgid "Create and edit 3D models of objects"
+msgid "Wings3D polygon mesh modeller"
 msgstr ""
 
 #: ../menu-data/wings3d:wings3d.desktop.in.h:2
-msgid "Wings3D polygon mesh modeller"
+msgid "Create and edit 3D models of objects"
 msgstr ""
 
 #: ../menu-data/wininfo:xdg-wininfo.desktop.in.h:1
@@ -18204,47 +18441,55 @@
 msgstr ""
 
 #: ../menu-data/winpdb:winpdb.desktop.in.h:1
-msgid "Platform independent Python debugger"
+msgid "Winpdb"
 msgstr ""
 
 #: ../menu-data/winpdb:winpdb.desktop.in.h:2
-msgid "Winpdb"
+msgid "Platform independent Python debugger"
 msgstr ""
 
 #: ../menu-data/wireshark:wireshark.desktop.in.h:1
-msgid "Network traffic analyzer"
-msgstr "Analyzátor sieťovej premávky"
-
-#: ../menu-data/wireshark:wireshark.desktop.in.h:2
 msgid "Wireshark"
 msgstr "Wireshark"
 
+#: ../menu-data/wireshark:wireshark.desktop.in.h:2
+msgid "Network traffic analyzer"
+msgstr "Analyzátor sieťovej premávky"
+
 #: ../menu-data/wizznic:wizznic.desktop.in.h:1
-msgid "A puzzle-block falling game."
+msgid "Wizznic"
 msgstr ""
 
 #: ../menu-data/wizznic:wizznic.desktop.in.h:2
-msgid "Wizznic"
+msgid "A puzzle-block falling game."
 msgstr ""
 
 #: ../menu-data/wmgui:wmgui.desktop.in.h:1
-msgid "Simple GTK gui to the wiimote to test and display the wiimote data."
+msgid "Wmgui"
 msgstr ""
 
 #: ../menu-data/wmgui:wmgui.desktop.in.h:2
-msgid "Wmgui"
+msgid "Simple GTK gui to the wiimote to test and display the wiimote data."
 msgstr ""
 
 #: ../menu-data/wmitime:wmitime.desktop.in.h:1
 msgid "Wmitime"
 msgstr ""
 
+#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:1
+msgid "Wolf4SDL"
+msgstr ""
+
+#: ../menu-data/wolf4sdl:wolf4sdl.desktop.in.h:2
+msgid "SDL-Port of Wolfenstein 3-D and Spear of Destiny"
+msgstr ""
+
 #: ../menu-data/worker:worker.desktop.in.h:1
-msgid "File manager for X."
+msgid "Worker"
 msgstr ""
 
 #: ../menu-data/worker:worker.desktop.in.h:2
-msgid "Worker"
+msgid "File manager for X."
 msgstr ""
 
 #: ../menu-data/workrave:workrave.desktop.in.h:1
@@ -18257,35 +18502,43 @@
 msgstr ""
 
 #: ../menu-data/wpagui:wpa_gui.desktop.in.h:1
-msgid "Graphical user interface for wpa_supplicant"
+msgid "wpa_gui"
 msgstr ""
 
 #: ../menu-data/wpagui:wpa_gui.desktop.in.h:2
-msgid "wpa_gui"
+msgid "Graphical user interface for wpa_supplicant"
 msgstr ""
 
 #: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:1
+msgid "WrapperFactory"
+msgstr "WrapperFactory"
+
+#: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2
 msgid "Graphically create Unix application wrappers for GNUstep"
 msgstr "Grafická tvorba wrapperov unixových aplikácií pre GNUstep"
 
-#: ../menu-data/wrapperfactory.app:WrapperFactory.desktop.in.h:2
-msgid "WrapperFactory"
-msgstr "WrapperFactory"
+#: ../menu-data/writetype:writetype.desktop.in.h:1
+msgid "Writetype"
+msgstr ""
+
+#: ../menu-data/writetype:writetype.desktop.in.h:2
+msgid "A word processor to make typing easier"
+msgstr ""
 
 #: ../menu-data/wsjt:wsjt.desktop.in.h:1
-msgid "Amateur radio weak signal communications"
+msgid "WSJT"
 msgstr ""
 
 #: ../menu-data/wsjt:wsjt.desktop.in.h:2
-msgid "WSJT"
+msgid "Amateur radio weak signal communications"
 msgstr ""
 
 #: ../menu-data/wxbanker:wxbanker.desktop.in.h:1
-msgid "A lightweight personal finance manager"
+msgid "wxBanker Finance Manager"
 msgstr ""
 
 #: ../menu-data/wxbanker:wxbanker.desktop.in.h:2
-msgid "wxBanker Finance Manager"
+msgid "A lightweight personal finance manager"
 msgstr ""
 
 #: ../menu-data/wxformbuilder:wxformbuilder.desktop.in.h:1
@@ -18297,22 +18550,22 @@
 msgstr ""
 
 #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:1
-msgid "Perform symbolic and numeric calculations using Maxima"
+msgid "wxMaxima"
 msgstr ""
 
 #: ../menu-data/wxmaxima:wxmaxima.desktop.in.h:2
-msgid "wxMaxima"
+msgid "Perform symbolic and numeric calculations using Maxima"
 msgstr ""
 
 #: ../menu-data/x11vnc:x11vnc.desktop.in.h:1
-msgid "Share this desktop by VNC"
+msgid "X11VNC Server"
 msgstr ""
 
 #: ../menu-data/x11vnc:x11vnc.desktop.in.h:2
-msgid "X11VNC Server"
+msgid "Share this desktop by VNC"
 msgstr ""
 
-#: ../menu-data/x2:x2.desktop.in.h:2
+#: ../menu-data/x2:x2.desktop.in.h:1
 msgid "X2"
 msgstr ""
 
@@ -18326,35 +18579,35 @@
 msgstr ""
 
 #: ../menu-data/xacobeo:xacobeo.desktop.in.h:1
-msgid "Build and execute XPath queries"
+msgid "Xacobeo"
 msgstr ""
 
 #: ../menu-data/xacobeo:xacobeo.desktop.in.h:2
-msgid "Xacobeo"
+msgid "Build and execute XPath queries"
 msgstr ""
 
 #: ../menu-data/xaos:xaos.desktop.in.h:1
-msgid "Fractal Generator"
+msgid "Xaos - Fractal Zoomer"
 msgstr ""
 
 #: ../menu-data/xaos:xaos.desktop.in.h:2
-msgid "Xaos - Fractal Zoomer"
+msgid "Fractal Generator"
 msgstr ""
 
 #: ../menu-data/xaralx:xaralx.desktop.in.h:1
-msgid "Versatile vector graphics program"
+msgid "Xara Xtreme"
 msgstr ""
 
 #: ../menu-data/xaralx:xaralx.desktop.in.h:2
-msgid "Xara Xtreme"
+msgid "Versatile vector graphics program"
 msgstr ""
 
 #: ../menu-data/xarchiver:xarchiver.desktop.in.h:1
-msgid "A GTK+2 only archive manager"
+msgid "Xarchiver"
 msgstr ""
 
 #: ../menu-data/xarchiver:xarchiver.desktop.in.h:2
-msgid "Xarchiver"
+msgid "A GTK+2 only archive manager"
 msgstr ""
 
 #: ../menu-data/xawtv:xawtv.desktop.in.h:1
@@ -18366,77 +18619,77 @@
 msgstr ""
 
 #: ../menu-data/xbill:xbill.desktop.in.h:1
-msgid "Get rid of those Wingdows Viruses!"
+msgid "XBill"
 msgstr ""
 
 #: ../menu-data/xbill:xbill.desktop.in.h:2
-msgid "XBill"
+msgid "Get rid of those Wingdows Viruses!"
 msgstr ""
 
 #: ../menu-data/xboard:xboard.desktop.in.h:1
-msgid "Use an X Windows Chess Board"
-msgstr "Šachovnica X Windows"
-
-#: ../menu-data/xboard:xboard.desktop.in.h:2
 msgid "XBoard"
 msgstr ""
 
+#: ../menu-data/xboard:xboard.desktop.in.h:2
+msgid "Use an X Windows Chess Board"
+msgstr "Šachovnica X Windows"
+
 #: ../menu-data/xboing:xboing.desktop.in.h:1
-msgid "Destroy some blocks"
+msgid "XBoing II"
 msgstr ""
 
 #: ../menu-data/xboing:xboing.desktop.in.h:2
-msgid "XBoing II"
+msgid "Destroy some blocks"
 msgstr ""
 
 #: ../menu-data/xca:xca.desktop.in.h:1
-msgid ""
-"A graphical user interface for handling and issuing X.509 compliant "
-"Certificates"
+msgid "XCA"
 msgstr ""
 
 #: ../menu-data/xca:xca.desktop.in.h:2
-msgid "XCA"
+msgid ""
+"A graphical user interface for handling and issuing X.509 compliant "
+"Certificates"
 msgstr ""
 
 #: ../menu-data/xcdroast:xcdroast.desktop.in.h:1
-msgid "Create a CD"
+msgid "X-CD-Roast"
 msgstr ""
 
 #: ../menu-data/xcdroast:xcdroast.desktop.in.h:2
-msgid "X-CD-Roast"
+msgid "Create a CD"
 msgstr ""
 
 #: ../menu-data/xcfa:xcfa.desktop.in.h:1
-msgid "X Convert File Audio. Programme pour convertir les fichiers audio."
+msgid "XCFA"
 msgstr ""
 
 #: ../menu-data/xcfa:xcfa.desktop.in.h:2
-msgid "XCFA"
+msgid "X Convert File Audio. Programme pour convertir les fichiers audio."
 msgstr ""
 
 #: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:1
-msgid "Chat with people using IRC"
+msgid "XChat-GNOME IRC Chat"
 msgstr ""
 
 #: ../menu-data/xchat-gnome:xchat-gnome.desktop.in.h:2
-msgid "XChat-GNOME IRC Chat"
+msgid "Chat with people using IRC"
 msgstr ""
 
 #: ../menu-data/xchat:xchat.desktop.in.h:1
-msgid "Chat with other people using Internet Relay Chat"
+msgid "XChat IRC"
 msgstr ""
 
 #: ../menu-data/xchat:xchat.desktop.in.h:2
-msgid "XChat IRC"
+msgid "Chat with other people using Internet Relay Chat"
 msgstr ""
 
 #: ../menu-data/xchm:xchm.desktop.in.h:1
-msgid "Compiled HTML Help (CHM) file viewer"
+msgid "xCHM"
 msgstr ""
 
 #: ../menu-data/xchm:xchm.desktop.in.h:2
-msgid "xCHM"
+msgid "Compiled HTML Help (CHM) file viewer"
 msgstr ""
 
 #: ../menu-data/xdemineur:xdemineur.desktop.in.h:1
@@ -18448,39 +18701,39 @@
 msgstr ""
 
 #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:1
-msgid "X.org Diagnostic and Repair Utility"
+msgid "xdiagnose"
 msgstr ""
 
 #: ../menu-data/xdiagnose:xdiagnose.desktop.in.h:2
-msgid "xdiagnose"
+msgid "X.org Diagnostic and Repair Utility"
 msgstr ""
 
 #: ../menu-data/xdot:xdot.desktop.in.h:1
-msgid "Interactive viewer for Graphviz dot files"
+msgid "XDot"
 msgstr ""
 
 #: ../menu-data/xdot:xdot.desktop.in.h:2
-msgid "XDot"
+msgid "Interactive viewer for Graphviz dot files"
 msgstr ""
 
 #: ../menu-data/xdx:Xdx.desktop.in.h:1
-msgid "DX-cluster client for amateur radio"
-msgstr "Klient DX-cluster pre amatérske rádio"
-
-#: ../menu-data/xdx:Xdx.desktop.in.h:2
 msgid "Xdx"
 msgstr "Xdx"
 
+#: ../menu-data/xdx:Xdx.desktop.in.h:2
+msgid "DX-cluster client for amateur radio"
+msgstr "Klient DX-cluster pre amatérske rádio"
+
 #: ../menu-data/xenwatch:xenwatch.desktop.in.h:1
-msgid "watch xen domains"
+msgid "xenwatch"
 msgstr ""
 
 #: ../menu-data/xenwatch:xenwatch.desktop.in.h:2
-msgid "xenwatch"
+msgid "watch xen domains"
 msgstr ""
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:1
-msgid "Burn Image (xfburn)"
+msgid "Xfburn"
 msgstr ""
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:2
@@ -18488,7 +18741,7 @@
 msgstr ""
 
 #: ../menu-data/xfburn:xfburn.desktop.in.h:3
-msgid "Xfburn"
+msgid "Burn Image (xfburn)"
 msgstr ""
 
 #: ../menu-data/xfdesktop4:xfce-backdrop-settings.desktop.in.h:1
@@ -18500,19 +18753,19 @@
 msgstr ""
 
 #: ../menu-data/xfe:xfe.desktop.in.h:1
-msgid "A lightweight file manager for X Window"
+msgid "Xfe"
 msgstr ""
 
 #: ../menu-data/xfe:xfe.desktop.in.h:2
-msgid "Xfe"
+msgid "A lightweight file manager for X Window"
 msgstr ""
 
 #: ../menu-data/xfig:xfig.desktop.in.h:1
-msgid "Diagram editor"
+msgid "Xfig"
 msgstr ""
 
 #: ../menu-data/xfig:xfig.desktop.in.h:2
-msgid "Xfig"
+msgid "Diagram editor"
 msgstr ""
 
 #: ../menu-data/xflr5:xflr5.desktop.in.h:1
@@ -18524,35 +18777,35 @@
 msgstr ""
 
 #: ../menu-data/xfmpc:xfmpc.desktop.in.h:1
-msgid "MPD client written in GTK+ for Xfce"
+msgid "Xfmpc"
 msgstr ""
 
 #: ../menu-data/xfmpc:xfmpc.desktop.in.h:2
-msgid "Xfmpc"
+msgid "MPD client written in GTK+ for Xfce"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:1
-msgid "Configure window behavior and shortcuts"
+msgid "Window Manager"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wm-settings.desktop.in.h:2
-msgid "Window Manager"
+msgid "Configure window behavior and shortcuts"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:1
-msgid "Fine-tune window behaviour and effects"
+msgid "Window Manager Tweaks"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-wmtweaks-settings.desktop.in.h:2
-msgid "Window Manager Tweaks"
+msgid "Fine-tune window behaviour and effects"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:1
-msgid "Set number and names of workspaces"
+msgid "Workspaces"
 msgstr ""
 
 #: ../menu-data/xfwm4:xfce-workspaces-settings.desktop.in.h:2
-msgid "Workspaces"
+msgid "Set number and names of workspaces"
 msgstr ""
 
 #: ../menu-data/xgalaga:xgalaga.desktop.in.h:1
@@ -18564,18 +18817,18 @@
 msgstr ""
 
 #: ../menu-data/xgnokii:xgnokii.desktop.in.h:1
-msgid "Manage your mobile phone"
+msgid "Xgnokii"
 msgstr ""
 
 #: ../menu-data/xgnokii:xgnokii.desktop.in.h:2
-msgid "Xgnokii"
+msgid "Manage your mobile phone"
 msgstr ""
 
 #: ../menu-data/xhtml2ps:xhtml2ps.desktop.in.h:1
 msgid "xhtml2ps"
 msgstr ""
 
-#: ../menu-data/xine-ui:xine.desktop.in.h:2
+#: ../menu-data/xine-ui:xine.desktop.in.h:1
 msgid "xine"
 msgstr ""
 
@@ -18604,11 +18857,11 @@
 msgstr ""
 
 #: ../menu-data/xiphos:xiphos.desktop.in.h:1
-msgid "Study the Bible"
+msgid "Xiphos Bible Guide"
 msgstr ""
 
 #: ../menu-data/xiphos:xiphos.desktop.in.h:2
-msgid "Xiphos Bible Guide"
+msgid "Study the Bible"
 msgstr ""
 
 #: ../menu-data/xiterm+thai:xiterm+thai.desktop.in.h:1
@@ -18616,27 +18869,27 @@
 msgstr ""
 
 #: ../menu-data/xjadeo:xjadeo.desktop.in.h:1
-msgid "A simple video player that gets sync from jack transport."
+msgid "Xjadeo"
 msgstr ""
 
 #: ../menu-data/xjadeo:xjadeo.desktop.in.h:2
-msgid "Xjadeo"
+msgid "A simple video player that gets sync from jack transport."
 msgstr ""
 
 #: ../menu-data/xjump:xjump.desktop.in.h:1
-msgid "A jumping game"
+msgid "XJump"
 msgstr ""
 
 #: ../menu-data/xjump:xjump.desktop.in.h:2
-msgid "XJump"
+msgid "A jumping game"
 msgstr ""
 
 #: ../menu-data/xlog:xlog.desktop.in.h:1
-msgid "Amateur Radio logging program"
+msgid "Xlog"
 msgstr ""
 
 #: ../menu-data/xlog:xlog.desktop.in.h:2
-msgid "Xlog"
+msgid "Amateur Radio logging program"
 msgstr ""
 
 #: ../menu-data/xmabacus:xmabacus.desktop.in.h:2
@@ -18644,27 +18897,27 @@
 msgstr ""
 
 #: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:1
-msgid "A colorful solitaire Mah Jongg game"
-msgstr "Farbistá hra Mah Jongg pre jedného hráča"
-
-#: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2
 msgid "xmahjongg"
 msgstr "xmahjongg"
 
+#: ../menu-data/xmahjongg:xmahjongg.desktop.in.h:2
+msgid "A colorful solitaire Mah Jongg game"
+msgstr "Farbistá hra Mah Jongg pre jedného hráča"
+
 #: ../menu-data/xmakemol:xmakemol.desktop.in.h:1
-msgid "View and manipulate atomic and other chemical systems"
+msgid "XMakemol"
 msgstr ""
 
 #: ../menu-data/xmakemol:xmakemol.desktop.in.h:2
-msgid "XMakemol"
+msgid "View and manipulate atomic and other chemical systems"
 msgstr ""
 
 #: ../menu-data/xmaxima:xmaxima.desktop.in.h:1
-msgid "An interface to the Maxima Computer Algebra System"
+msgid "Maxima Algebra System"
 msgstr ""
 
 #: ../menu-data/xmaxima:xmaxima.desktop.in.h:2
-msgid "Maxima Algebra System"
+msgid "An interface to the Maxima Computer Algebra System"
 msgstr ""
 
 #: ../menu-data/xmille:xmille.desktop.in.h:1
@@ -18672,19 +18925,19 @@
 msgstr ""
 
 #: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:1
-msgid "Edit XML documents"
+msgid "XML Copy Editor"
 msgstr ""
 
 #: ../menu-data/xmlcopyeditor:xmlcopyeditor.desktop.in.h:2
-msgid "XML Copy Editor"
+msgid "Edit XML documents"
 msgstr ""
 
 #: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:1
-msgid "XMMS2 tray icon"
+msgid "XMMS2tray"
 msgstr ""
 
 #: ../menu-data/xmms2tray:xmms2tray.desktop.in.h:2
-msgid "XMMS2tray"
+msgid "XMMS2 tray icon"
 msgstr ""
 
 #: ../menu-data/xmonad:xmonad.desktop.in.h:1
@@ -18692,151 +18945,143 @@
 msgstr ""
 
 #: ../menu-data/xmotd:xmotd.desktop.in.h:1
-msgid "A message of the day browser for X"
+msgid "Message of the day"
 msgstr ""
 
 #: ../menu-data/xmotd:xmotd.desktop.in.h:2
-msgid "Message of the day"
+msgid "A message of the day browser for X"
 msgstr ""
 
 #: ../menu-data/xmoto:xmoto.desktop.in.h:1
-msgid "Motocross game"
+msgid "Xmoto"
 msgstr ""
 
 #: ../menu-data/xmoto:xmoto.desktop.in.h:2
-msgid "Xmoto"
+msgid "Motocross game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:1
-#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
-msgid "barrel game"
+msgid "xmbarrel"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmbarrel.desktop.in.h:2
-msgid "xmbarrel"
+#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2
+msgid "barrel game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:1
-#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1
-msgid "cubes game"
+msgid "xmcubes"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmcubes.desktop.in.h:2
-msgid "xmcubes"
+#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2
+msgid "cubes game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmdino.desktop.in.h:1
-#: ../menu-data/xpuzzles:xdino.desktop.in.h:1
-msgid "dino game"
+msgid "xmdino"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmdino.desktop.in.h:2
-msgid "xmdino"
+#: ../menu-data/xpuzzles:xdino.desktop.in.h:2
+msgid "dino game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:1
-#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1
-msgid "hexagons game"
+msgid "xmhexagons"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmhexagons.desktop.in.h:2
-msgid "xmhexagons"
+#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2
+msgid "hexagons game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmball.desktop.in.h:1
-#: ../menu-data/xpuzzles:xmball.desktop.in.h:1
-msgid "mball game"
+msgid "xmmball"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmball.desktop.in.h:2
-msgid "xmmball"
+#: ../menu-data/xpuzzles:xmball.desktop.in.h:2
+msgid "mball game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:1
-#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1
-msgid "mlink game"
+msgid "xmmlink"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmmlink.desktop.in.h:2
-msgid "xmmlink"
+#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2
+msgid "mlink game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmoct.desktop.in.h:1
-#: ../menu-data/xpuzzles:xoct.desktop.in.h:1
-msgid "oct game"
+msgid "xmoct"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmoct.desktop.in.h:2
-msgid "xmoct"
+#: ../menu-data/xpuzzles:xoct.desktop.in.h:2
+msgid "oct game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:1
-#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1
-msgid "panex game"
+msgid "xmpanex"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpanex.desktop.in.h:2
-msgid "xmpanex"
+#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2
+msgid "panex game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:1
-#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1
-msgid "pyraminx game"
+msgid "xmpyraminx"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmpyraminx.desktop.in.h:2
-msgid "xmpyraminx"
+#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2
+msgid "pyraminx game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:1
-#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1
-msgid "rubik game"
+msgid "xmrubik"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmrubik.desktop.in.h:2
-msgid "xmrubik"
+#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2
+msgid "rubik game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:1
-#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1
-msgid "skewb game"
+msgid "xmskewb"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmskewb.desktop.in.h:2
-msgid "xmskewb"
+#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2
+msgid "skewb game"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:1
-#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1
-msgid "triangles game"
+msgid "xmtriangles"
 msgstr ""
 
 #: ../menu-data/xmpuzzles:xmtriangles.desktop.in.h:2
-msgid "xmtriangles"
+#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2
+msgid "triangles game"
 msgstr ""
 
 #: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:1
-msgid "Configure network card"
-msgstr ""
-
-#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2
 msgid "xnetcardconfig"
 msgstr ""
 
-#: ../menu-data/xoids:xoids.desktop.in.h:1
-msgid "Pilot a spaceship and destroy asteroids and UFOs"
-msgstr ""
-
-#: ../menu-data/xoids:xoids.desktop.in.h:2
-msgid "Xoids"
+#: ../menu-data/xnetcardconfig:xfld-xnetcardconfig.desktop.in.h:2
+msgid "Configure network card"
 msgstr ""
 
 #: ../menu-data/xoo:xoo.desktop.in.h:1
-msgid "Handheld Device Simulator"
+msgid "Xoo"
 msgstr ""
 
 #: ../menu-data/xoo:xoo.desktop.in.h:2
-msgid "Xoo"
+msgid "Handheld Device Simulator"
 msgstr ""
 
 #: ../menu-data/xoscope:xoscope.desktop.in.h:1
@@ -18848,27 +19093,27 @@
 msgstr ""
 
 #: ../menu-data/xosview:xosview.desktop.in.h:1
-msgid "X based system monitor"
+msgid "Xosview"
 msgstr ""
 
 #: ../menu-data/xosview:xosview.desktop.in.h:2
-msgid "Xosview"
+msgid "X based system monitor"
 msgstr ""
 
 #: ../menu-data/xournal:xournal.desktop.in.h:1
-msgid "Take handwritten notes"
+msgid "Xournal"
 msgstr ""
 
 #: ../menu-data/xournal:xournal.desktop.in.h:2
-msgid "Xournal"
+msgid "Take handwritten notes"
 msgstr ""
 
 #: ../menu-data/xpad:xpad.desktop.in.h:1
-msgid "Jot down notes for later"
+msgid "Xpad"
 msgstr ""
 
 #: ../menu-data/xpad:xpad.desktop.in.h:2
-msgid "Xpad"
+msgid "Jot down notes for later"
 msgstr ""
 
 #: ../menu-data/xpaint:xpaint.desktop.in.h:1
@@ -18880,121 +19125,121 @@
 msgstr ""
 
 #: ../menu-data/xpdf:xpdf.desktop.in.h:1
-msgid "View PDF files"
+msgid "xpdf"
 msgstr ""
 
 #: ../menu-data/xpdf:xpdf.desktop.in.h:2
-msgid "xpdf"
+msgid "View PDF files"
 msgstr ""
 
-#: ../menu-data/xpn:xpn.desktop.in.h:2
+#: ../menu-data/xpn:xpn.desktop.in.h:1
 msgid "Xpn Newsreader"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:2
+#: ../menu-data/xpuzzles:xbarrel.desktop.in.h:1
 msgid "xbarrel"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xcubes.desktop.in.h:2
+#: ../menu-data/xpuzzles:xcubes.desktop.in.h:1
 msgid "xcubes"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xdino.desktop.in.h:2
+#: ../menu-data/xpuzzles:xdino.desktop.in.h:1
 msgid "xdino"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:2
+#: ../menu-data/xpuzzles:xhexagons.desktop.in.h:1
 msgid "xhexagons"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xmball.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmball.desktop.in.h:1
 msgid "xmball"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xmlink.desktop.in.h:2
+#: ../menu-data/xpuzzles:xmlink.desktop.in.h:1
 msgid "xmlink"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xoct.desktop.in.h:2
+#: ../menu-data/xpuzzles:xoct.desktop.in.h:1
 msgid "xoct"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xpanex.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpanex.desktop.in.h:1
 msgid "xpanex"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:2
+#: ../menu-data/xpuzzles:xpyraminx.desktop.in.h:1
 msgid "xpyraminx"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xrubik.desktop.in.h:2
+#: ../menu-data/xpuzzles:xrubik.desktop.in.h:1
 msgid "xrubik"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xskewb.desktop.in.h:2
+#: ../menu-data/xpuzzles:xskewb.desktop.in.h:1
 msgid "xskewb"
 msgstr ""
 
-#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:2
+#: ../menu-data/xpuzzles:xtriangles.desktop.in.h:1
 msgid "xtriangles"
 msgstr ""
 
 #: ../menu-data/xqf:xqf.desktop.in.h:1
-msgid "Locate and connect to game servers"
+msgid "XQF Game Server Browser"
 msgstr ""
 
 #: ../menu-data/xqf:xqf.desktop.in.h:2
-msgid "XQF Game Server Browser"
+msgid "Locate and connect to game servers"
 msgstr ""
 
 #: ../menu-data/xsane:xsane.desktop.in.h:1
+msgid "XSane Image scanning program"
+msgstr "XSane - skenovanie obrázkov"
+
+#: ../menu-data/xsane:xsane.desktop.in.h:2
 msgid ""
 "A program to work with scanner. Can be used as a scanning, copier, OCR, fax "
 "tools."
 msgstr ""
 
-#: ../menu-data/xsane:xsane.desktop.in.h:2
-msgid "XSane Image scanning program"
-msgstr "XSane - skenovanie obrázkov"
-
 #: ../menu-data/xscavenger:xscavenger.desktop.in.h:1
-msgid "X11 clone of Lode Runner"
+msgid "XScavenger"
 msgstr ""
 
 #: ../menu-data/xscavenger:xscavenger.desktop.in.h:2
-msgid "XScavenger"
+msgid "X11 clone of Lode Runner"
 msgstr ""
 
 #: ../menu-data/xscorch:xscorch.desktop.in.h:1
-msgid "Clone of Scorched Earth"
+msgid "Xscorch"
 msgstr ""
 
 #: ../menu-data/xscorch:xscorch.desktop.in.h:2
-msgid "Xscorch"
+msgid "Clone of Scorched Earth"
 msgstr ""
 
 #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:1
-msgid "XML Schema Definition (XSD) diagram viewer"
+msgid "XSD Diagram"
 msgstr ""
 
 #: ../menu-data/xsddiagram:xsddiagram.desktop.in.h:2
-msgid "XSD Diagram"
+msgid "XML Schema Definition (XSD) diagram viewer"
 msgstr ""
 
 #: ../menu-data/xsensors:xsensors.desktop.in.h:1
-msgid "View hardware health"
+msgid "XSensors"
 msgstr ""
 
 #: ../menu-data/xsensors:xsensors.desktop.in.h:2
-msgid "XSensors"
+msgid "View hardware health"
 msgstr ""
 
 #: ../menu-data/xshogi:xshogi.desktop.in.h:1
-msgid "Play Shogi Game"
+msgid "Xshogi"
 msgstr ""
 
 #: ../menu-data/xshogi:xshogi.desktop.in.h:2
-msgid "Xshogi"
+msgid "Play Shogi Game"
 msgstr ""
 
 #: ../menu-data/xsol:xsol.desktop.in.h:1
@@ -19014,27 +19259,19 @@
 msgstr ""
 
 #: ../menu-data/xtide:xtide.desktop.in.h:1
-msgid "View tide and current predictions"
+msgid "XTide Tide Predictor"
 msgstr ""
 
 #: ../menu-data/xtide:xtide.desktop.in.h:2
-msgid "XTide Tide Predictor"
+msgid "View tide and current predictions"
 msgstr ""
 
 #: ../menu-data/xvattr:xvattr.desktop.in.h:1
-msgid "XVideo Settings Utility"
-msgstr ""
-
-#: ../menu-data/xvattr:xvattr.desktop.in.h:2
 msgid "gxvattr"
 msgstr ""
 
-#: ../menu-data/xvidcap:xvidcap.desktop.in.h:1
-msgid "X11 Screencam"
-msgstr ""
-
-#: ../menu-data/xvidcap:xvidcap.desktop.in.h:2
-msgid "XVidCap Screen Capture"
+#: ../menu-data/xvattr:xvattr.desktop.in.h:2
+msgid "XVideo Settings Utility"
 msgstr ""
 
 #: ../menu-data/xvile:uxvile.desktop.in.h:1
@@ -19042,36 +19279,36 @@
 msgstr ""
 
 #: ../menu-data/xvile:uxvile.desktop.in.h:2
-#: ../menu-data/xvile:xvile.desktop.in.h:1
+#: ../menu-data/xvile:xvile.desktop.in.h:2
 msgid "VI Like Emacs"
 msgstr ""
 
-#: ../menu-data/xvile:xvile.desktop.in.h:2
+#: ../menu-data/xvile:xvile.desktop.in.h:1
 msgid "XVile"
 msgstr ""
 
 #: ../menu-data/xwelltris:xwelltris.desktop.in.h:1
-msgid "Play a 3D Tetris like game"
+msgid "XWelltris"
 msgstr ""
 
 #: ../menu-data/xwelltris:xwelltris.desktop.in.h:2
-msgid "XWelltris"
+msgid "Play a 3D Tetris like game"
 msgstr ""
 
 #: ../menu-data/xword:xword.desktop.in.h:1
-msgid "Do crossword puzzles"
+msgid "Xword"
 msgstr ""
 
 #: ../menu-data/xword:xword.desktop.in.h:2
-msgid "Xword"
+msgid "Do crossword puzzles"
 msgstr ""
 
 #: ../menu-data/xxxterm:xxxterm.desktop.in.h:1
-msgid "Minimalist's Web Browser"
+msgid "xxxterm Browser"
 msgstr ""
 
 #: ../menu-data/xxxterm:xxxterm.desktop.in.h:2
-msgid "xxxterm Browser"
+msgid "Minimalist's Web Browser"
 msgstr ""
 
 #: ../menu-data/xyscan:xyscan.desktop.in.h:1
@@ -19083,15 +19320,15 @@
 msgstr ""
 
 #: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:1
-#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1
-msgid "Sega Saturn emulator"
+msgid "Yabause (Gtk port)"
 msgstr ""
 
 #: ../menu-data/yabause-gtk:yabause-gtk.desktop.in.h:2
-msgid "Yabause (Gtk port)"
+#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:2
+msgid "Sega Saturn emulator"
 msgstr ""
 
-#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:2
+#: ../menu-data/yabause-qt:yabause-qt.desktop.in.h:1
 msgid "Yabause (Qt port)"
 msgstr ""
 
@@ -19100,19 +19337,19 @@
 msgstr ""
 
 #: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:1
-msgid "An open source Yahtzee like game written in C#"
-msgstr "open source hra Yahtzee napísaná v C#"
-
-#: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2
 msgid "YahtzeeSharp"
 msgstr "YahtzeeSharp"
 
+#: ../menu-data/yahtzeesharp:YahtzeeSharp.desktop.in.h:2
+msgid "An open source Yahtzee like game written in C#"
+msgstr "open source hra Yahtzee napísaná v C#"
+
 #: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:1
-msgid "A drop-down terminal emulator based on KDE Konsole technology."
+msgid "Yakuake"
 msgstr ""
 
 #: ../menu-data/yakuake:kde4__yakuake.desktop.in.h:2
-msgid "Yakuake"
+msgid "A drop-down terminal emulator based on KDE Konsole technology."
 msgstr ""
 
 #: ../menu-data/yapet:yapet.desktop.in.h:1
@@ -19124,43 +19361,43 @@
 msgstr ""
 
 #: ../menu-data/yarssr:yarssr.desktop.in.h:1
-msgid "RSS reader for the notification area"
+msgid "Yarssr"
 msgstr ""
 
 #: ../menu-data/yarssr:yarssr.desktop.in.h:2
-msgid "Yarssr"
+msgid "RSS reader for the notification area"
 msgstr ""
 
 #: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:1
-msgid "Place phone calls over the Internet"
+msgid "Yate VoIP Client"
 msgstr ""
 
 #: ../menu-data/yate-qt4:yate-qt4.desktop.in.h:2
-msgid "Yate VoIP Client"
+msgid "Place phone calls over the Internet"
 msgstr ""
 
 #: ../menu-data/yelp:yelp.desktop.in.h:1
-msgid "Get help with Unity"
-msgstr ""
-
-#: ../menu-data/yelp:yelp.desktop.in.h:2
 msgid "Help"
 msgstr "Pomocník"
 
-#: ../menu-data/ygraph:ygraph.desktop.in.h:1
-msgid "Produce simple xy-plots of scientific data"
-msgstr "Vytvára jednoduché súradnicové grafy vedeckých údajov"
+#: ../menu-data/yelp:yelp.desktop.in.h:2
+msgid "Get help with Unity"
+msgstr ""
 
-#: ../menu-data/ygraph:ygraph.desktop.in.h:2
+#: ../menu-data/ygraph:ygraph.desktop.in.h:1
 msgid "ygraph Scientific Data Plotter"
 msgstr ""
 
+#: ../menu-data/ygraph:ygraph.desktop.in.h:2
+msgid "Produce simple xy-plots of scientific data"
+msgstr "Vytvára jednoduché súradnicové grafy vedeckých údajov"
+
 #: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:1
-msgid "A 3D platform game"
+msgid "Yo Frankie!"
 msgstr ""
 
 #: ../menu-data/yofrankie:yofrankie-bge.desktop.in.h:2
-msgid "Yo Frankie!"
+msgid "A 3D platform game"
 msgstr ""
 
 #: ../menu-data/yorick-cubeview:cubeview.desktop.in.h:1
@@ -19180,11 +19417,11 @@
 msgstr ""
 
 #: ../menu-data/yoshimi:yoshimi.desktop.in.h:1
-msgid "Software Synthesizer based on ZynAddSubFX"
+msgid "Yoshimi"
 msgstr ""
 
 #: ../menu-data/yoshimi:yoshimi.desktop.in.h:2
-msgid "Yoshimi"
+msgid "Software Synthesizer based on ZynAddSubFX"
 msgstr ""
 
 #: ../menu-data/youtranslate:youtranslate.desktop.in.h:1
@@ -19196,43 +19433,43 @@
 msgstr "Prekladá slová alebo vety pomocou online služby"
 
 #: ../menu-data/z88:z88.desktop.in.h:1
-msgid " Finite Element Analysis Program"
+msgid "Z88"
 msgstr ""
 
 #: ../menu-data/z88:z88.desktop.in.h:2
-msgid "Z88"
+msgid " Finite Element Analysis Program"
 msgstr ""
 
 #: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:1
-msgid "TODO Management Application"
+msgid "Zanshin"
 msgstr ""
 
 #: ../menu-data/zanshin:kde4__zanshin.desktop.in.h:2
-msgid "Zanshin"
+msgid "TODO Management Application"
 msgstr ""
 
 #: ../menu-data/zapping:zapping.desktop.in.h:1
+msgid "Zapping TV Viewer"
+msgstr ""
+
+#: ../menu-data/zapping:zapping.desktop.in.h:2
 msgid "Lets you watch TV in a window"
 msgstr "Umožňuje pozerať televíziu v okne"
 
-#: ../menu-data/zapping:zapping.desktop.in.h:2
-msgid "Zapping TV Viewer"
+#: ../menu-data/zatacka:zatacka.desktop.in.h:1
+msgid "Zatacka"
 msgstr ""
 
-#: ../menu-data/zatacka:zatacka.desktop.in.h:1
+#: ../menu-data/zatacka:zatacka.desktop.in.h:2
 msgid "Arcade multiplayer game for 2-6 players"
 msgstr "Arkádová hra pre 2-6 hráčov"
 
-#: ../menu-data/zatacka:zatacka.desktop.in.h:2
-msgid "Zatacka"
-msgstr ""
-
 #: ../menu-data/zathura:zathura.desktop.in.h:1
-msgid "A minimalistic PDF viewer"
+msgid "Zathura"
 msgstr ""
 
 #: ../menu-data/zathura:zathura.desktop.in.h:2
-msgid "Zathura"
+msgid "A minimalistic PDF viewer"
 msgstr ""
 
 #: ../menu-data/zaz:zaz.desktop.in.h:1
@@ -19244,45 +19481,53 @@
 msgstr ""
 
 #: ../menu-data/zekr:zekr.desktop.in.h:1
-msgid "Study The Quran"
-msgstr "Študujte Korán"
-
-#: ../menu-data/zekr:zekr.desktop.in.h:2
 msgid "Zekr "
 msgstr ""
 
+#: ../menu-data/zekr:zekr.desktop.in.h:2
+msgid "Study The Quran"
+msgstr "Študujte Korán"
+
 #: ../menu-data/zenmap:zenmap.desktop.in.h:1
-msgid "A cross-platform GUI for the Nmap Security Scanner."
+msgid "Zenmap"
 msgstr ""
 
 #: ../menu-data/zenmap:zenmap.desktop.in.h:2
-msgid "Zenmap"
+msgid "A cross-platform GUI for the Nmap Security Scanner."
 msgstr ""
 
 #: ../menu-data/zhone:zhone.desktop.in.h:1
-msgid "Feature Phone UI"
+msgid "Zhone"
 msgstr ""
 
 #: ../menu-data/zhone:zhone.desktop.in.h:2
-msgid "Zhone"
+msgid "Feature Phone UI"
 msgstr ""
 
 #: ../menu-data/zim:zim.desktop.in.h:1
+msgid "Zim Desktop Wiki"
+msgstr ""
+
+#: ../menu-data/zim:zim.desktop.in.h:2
 msgid "Edit text files \"wiki style\""
 msgstr "Editor textových súborov v štýle wiki"
 
-#: ../menu-data/zim:zim.desktop.in.h:2
-msgid "Zim Desktop Wiki"
+#: ../menu-data/zim:zim.desktop.in.h:3
+msgid "Quick Note"
 msgstr ""
 
-#: ../menu-data/zipper.app:Zipper.desktop.in.h:1
-msgid "GUI for various compressed file formats"
-msgstr "GUI pre rôzne komprimované formáty súborov"
+#: ../menu-data/zim:zim.desktop.in.h:4
+msgid "Quick Note from Clipboard"
+msgstr ""
 
-#: ../menu-data/zipper.app:Zipper.desktop.in.h:2
+#: ../menu-data/zipper.app:Zipper.desktop.in.h:1
 msgid "Zipper"
 msgstr "Zipper"
 
+#: ../menu-data/zipper.app:Zipper.desktop.in.h:2
+msgid "GUI for various compressed file formats"
+msgstr "GUI pre rôzne komprimované formáty súborov"
+
 #: ../menu-data/zita-at1:zita-at1.desktop.in.h:1
 msgid "AT1"
 msgstr ""
@@ -19300,19 +19545,19 @@
 msgstr ""
 
 #: ../menu-data/zsnes:zsnes.desktop.in.h:1
-msgid "Play Super Nintendo (SNES) games"
-msgstr "Hrajte hry určené pre hernú konzolu Super Nintendo (SNES)"
-
-#: ../menu-data/zsnes:zsnes.desktop.in.h:2
 msgid "ZSNES Emulator"
 msgstr ""
 
+#: ../menu-data/zsnes:zsnes.desktop.in.h:2
+msgid "Play Super Nintendo (SNES) games"
+msgstr "Hrajte hry určené pre hernú konzolu Super Nintendo (SNES)"
+
 #: ../menu-data/zygrib:zygrib.desktop.in.h:1
-msgid "Multi-protocol Messaging Client"
+msgid "zyGrib GRIB file viewer"
 msgstr ""
 
 #: ../menu-data/zygrib:zygrib.desktop.in.h:2
-msgid "zyGrib GRIB file viewer"
+msgid "Multi-protocol Messaging Client"
 msgstr ""
 
 #: ../menu-data/zynaddsubfx:zynaddsubfx.desktop.in.h:1
@@ -19320,17 +19565,17 @@
 msgstr ""
 
 #: ../menu-data/zynjacku:lv2rack.desktop.in.h:1
-msgid "LV2 plugins host for JACK"
+msgid "Lv2rack"
 msgstr ""
 
 #: ../menu-data/zynjacku:lv2rack.desktop.in.h:2
-msgid "Lv2rack"
+msgid "LV2 plugins host for JACK"
 msgstr ""
 
 #: ../menu-data/zynjacku:zynjacku.desktop.in.h:1
-msgid "LV2 synths host for JACK"
+msgid "Zynjacku"
 msgstr ""
 
 #: ../menu-data/zynjacku:zynjacku.desktop.in.h:2
-msgid "Zynjacku"
+msgid "LV2 synths host for JACK"
 msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apport.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apport.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apport.po	2012-01-02 17:51:04.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apport.po	2012-02-23 06:55:50.000000000 +0000
@@ -7,20 +7,20 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-24 15:39+0000\n"
-"PO-Revision-Date: 2011-10-26 14:05+0000\n"
-"Last-Translator: Peter Mráz <Unknown>\n"
+"POT-Creation-Date: 2012-02-20 16:20+0000\n"
+"PO-Revision-Date: 2012-01-19 16:12+0000\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:39+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: ../apport/ui.py:92
 msgid "This package does not seem to be installed correctly"
-msgstr ""
+msgstr "Vyzerá to tak, že tento balík nie je nainštalovaný korektne"
 
 #. TRANS: %s is the name of the operating system
 #: ../apport/ui.py:95
@@ -29,6 +29,8 @@
 "This is not an official %s package. Please remove any third party package "
 "and try again."
 msgstr ""
+"Toto nie je oficiálny %s balík. Prosím, odstráňte všetky balíky tretích "
+"strán a skúste to znovu."
 
 #: ../apport/ui.py:117
 #, python-format
@@ -43,21 +45,44 @@
 "\n"
 "%s"
 
-#: ../apport/ui.py:213
+#. package does not exist
+#: ../apport/ui.py:193 ../apport/ui.py:200 ../apport/ui.py:206
+#: ../apport/ui.py:285 ../apport/ui.py:293 ../apport/ui.py:364
+#: ../apport/ui.py:367 ../apport/ui.py:565 ../apport/ui.py:898
+#: ../apport/ui.py:1033 ../apport/ui.py:1037 ../apport/ui.py:1056
+#: ../apport/ui.py:1062 ../apport/ui.py:1615 ../apport/ui.py:1632
+#: ../apport/ui.py:2254 ../apport/ui.py:2273 ../apport/ui.py:2284
+#: ../apport/ui.py:2295
+msgid "Invalid problem report"
+msgstr "Neplatné hlásenie problému"
+
+#: ../apport/ui.py:195 ../apport/ui.py:1039
+msgid "This problem report is damaged and cannot be processed."
+msgstr "Toto hlásenie problému je poškodené a nie je možné ho spracovať."
+
+#: ../apport/ui.py:201
+msgid "The report belongs to a package that is not installed."
+msgstr "Hlásenie patrí k balíku, ktorý nie je nainštalovaný."
+
+#: ../apport/ui.py:207
+msgid "An error occurred while attempting to process this problem report."
+msgstr ""
+
+#: ../apport/ui.py:246
 msgid "unknown program"
 msgstr "neznámy program"
 
-#: ../apport/ui.py:214 ../gtk/apport-gtk.py:81
+#: ../apport/ui.py:247
 #, python-format
 msgid "Sorry, the program \"%s\" closed unexpectedly"
 msgstr "Prepáčte, program \"%s\" neočakávane skončil"
 
-#: ../apport/ui.py:215 ../apport/ui.py:1105
+#: ../apport/ui.py:248 ../apport/ui.py:1077
 #, python-format
 msgid "Problem in %s"
 msgstr "Problém v %s"
 
-#: ../apport/ui.py:216
+#: ../apport/ui.py:249
 msgid ""
 "Your computer does not have enough free memory to automatically analyze the "
 "problem and send a report to the developers."
@@ -65,61 +90,42 @@
 "Váš počítač nemá dosť voľnej pamäte na automatickú analýzu problému a "
 "poslanie hlásenia vývojárom."
 
-#. package does not exist
-#: ../apport/ui.py:243 ../apport/ui.py:269 ../apport/ui.py:275
-#: ../apport/ui.py:305 ../apport/ui.py:313 ../apport/ui.py:384
-#: ../apport/ui.py:387 ../apport/ui.py:583 ../apport/ui.py:926
-#: ../apport/ui.py:1061 ../apport/ui.py:1065 ../apport/ui.py:1084
-#: ../apport/ui.py:1090 ../apport/ui.py:1702 ../apport/ui.py:1719
-#: ../apport/ui.py:2334 ../apport/ui.py:2350 ../apport/ui.py:2361
-#: ../apport/ui.py:2372
-msgid "Invalid problem report"
-msgstr "Neplatné hlásenie problému"
-
-#: ../apport/ui.py:244 ../apport/ui.py:276
-msgid "The report belongs to a package that is not installed."
-msgstr "Hlásenie patrí k balíku, ktorý nie je nainštalovaný."
-
-#: ../apport/ui.py:271 ../apport/ui.py:1067
-msgid "This problem report is damaged and cannot be processed."
-msgstr "Toto hlásenie problému je poškodené a nie je možné ho spracovať."
-
-#: ../apport/ui.py:306
+#: ../apport/ui.py:286
 msgid "You are not allowed to access this problem report."
 msgstr "Nemáte povolený prístup k tomuto hláseniu o probléme."
 
-#: ../apport/ui.py:309
+#: ../apport/ui.py:289
 msgid "Error"
 msgstr "Chyba"
 
-#: ../apport/ui.py:310
+#: ../apport/ui.py:290
 msgid "There is not enough disk space available to process this report."
 msgstr ""
 "Nie je dostatok voľného miesta na disku na spracovanie tohto hlásenia."
 
-#: ../apport/ui.py:337
+#: ../apport/ui.py:317
 msgid "No package specified"
 msgstr "Nebol špecifikovaný žiadny balík"
 
-#: ../apport/ui.py:338
+#: ../apport/ui.py:318
 msgid ""
 "You need to specify a package or a PID. See --help for more information."
 msgstr ""
 "Je potrebné špecifikovať balík alebo PID. Pozrite --help pre viac informácií."
 
-#: ../apport/ui.py:354
+#: ../apport/ui.py:334
 msgid "Invalid PID"
 msgstr "Neplatné PID"
 
-#: ../apport/ui.py:355
+#: ../apport/ui.py:335
 msgid "The specified process ID does not belong to a program."
 msgstr "Zadaný identifikátor procesu nepatrí k programu."
 
-#: ../apport/ui.py:363
+#: ../apport/ui.py:343
 msgid "Permission denied"
 msgstr "Prístup odmietnutý"
 
-#: ../apport/ui.py:364
+#: ../apport/ui.py:344
 msgid ""
 "The specified process does not belong to you. Please run this program as the "
 "process owner or as root."
@@ -127,25 +133,25 @@
 "Nemáte dosah na označený proces. Prosím, spustite program ako jeho vlastník, "
 "alebo ako root."
 
-#: ../apport/ui.py:385
+#: ../apport/ui.py:365
 #, python-format
 msgid "Symptom script %s did not determine an affected package"
 msgstr "Skript %s nebol schopný určiť postihnutý balík"
 
-#: ../apport/ui.py:388
+#: ../apport/ui.py:368
 #, python-format
 msgid "Package %s does not exist"
 msgstr "Balík %s neexistuje"
 
-#: ../apport/ui.py:413 ../apport/ui.py:595 ../apport/ui.py:600
+#: ../apport/ui.py:393 ../apport/ui.py:577 ../apport/ui.py:582
 msgid "Cannot create report"
 msgstr "Nie je možné vytvoriť hlásenie"
 
-#: ../apport/ui.py:427 ../apport/ui.py:473 ../apport/ui.py:490
+#: ../apport/ui.py:408 ../apport/ui.py:454 ../apport/ui.py:471
 msgid "Updating problem report"
 msgstr "Aktualizuje sa hlásenie o probléme"
 
-#: ../apport/ui.py:428
+#: ../apport/ui.py:409
 msgid ""
 "You are not the reporter or subscriber of this problem report, or the report "
 "is a duplicate or already closed.\n"
@@ -157,7 +163,7 @@
 "\n"
 "Prosím vytvorte nové hlásenie pomocou \"apport-bug\"."
 
-#: ../apport/ui.py:437
+#: ../apport/ui.py:418
 msgid ""
 "You are not the reporter of this problem report. It is much easier to mark a "
 "bug as a duplicate of another than to move your comments and attachments to "
@@ -177,52 +183,54 @@
 "\n"
 "Naozaj chcete pokračovať?"
 
-#: ../apport/ui.py:474 ../apport/ui.py:491
+#: ../apport/ui.py:455 ../apport/ui.py:472
 msgid "No additional information collected."
 msgstr "Neboli zozbierané žiadne dodatočné informácie."
 
-#: ../apport/ui.py:540
+#: ../apport/ui.py:522
 msgid "What kind of problem do you want to report?"
 msgstr "Aký druh problému chcete nahlásiť?"
 
-#: ../apport/ui.py:557
+#: ../apport/ui.py:539
 msgid "Unknown symptom"
 msgstr "Neznámy príznak"
 
-#: ../apport/ui.py:558
+#: ../apport/ui.py:540
 #, python-format
 msgid "The symptom \"%s\" is not known."
 msgstr "Príznak \"%s\"  nie je známy."
 
-#: ../apport/ui.py:586
+#: ../apport/ui.py:568
 msgid ""
 "After closing this message please click on an application window to report a "
 "problem about it."
 msgstr ""
+"Pre nahlásenie problému s aplikáciou kliknite, prosím, po zavretí tejto "
+"správy na okno aplikácie."
 
-#: ../apport/ui.py:596 ../apport/ui.py:601
+#: ../apport/ui.py:578 ../apport/ui.py:583
 msgid "xprop failed to determine process ID of the window"
-msgstr ""
+msgstr "xprop nedokázal zistiť identifikátor procesu okna"
 
-#: ../apport/ui.py:615
+#: ../apport/ui.py:597
 msgid "%prog <report number>"
 msgstr "%prog <číslo hlásenia>"
 
-#: ../apport/ui.py:617
+#: ../apport/ui.py:599
 msgid "Specify package name."
-msgstr ""
+msgstr "Zadajte názov balíka."
 
-#: ../apport/ui.py:619 ../apport/ui.py:668
+#: ../apport/ui.py:601 ../apport/ui.py:650
 msgid "Add an extra tag to the report. Can be specified multiple times."
-msgstr ""
+msgstr "Pridať k hláseniu značku navyše. Môže byť zadaná viackrát."
 
-#: ../apport/ui.py:649
+#: ../apport/ui.py:631
 msgid ""
 "%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
 msgstr ""
 "%prog [možnosti] [symptóm|pid|balík|cesta k programu|.apport/.crash súbor]"
 
-#: ../apport/ui.py:652
+#: ../apport/ui.py:634
 msgid ""
 "Start in bug filing mode. Requires --package and an optional --pid, or just "
 "a --pid. If neither is given, display a list of known symptoms. (Implied if "
@@ -232,17 +240,17 @@
 "alebo len --pid. Ak nie je zadaný ani jeden z nich, zobrazí sa zoznam "
 "známych príznakov. (Predpokladané ak je zadaný len jeden argument.)"
 
-#: ../apport/ui.py:654
+#: ../apport/ui.py:636
 msgid "Click a window as a target for filing a problem report."
-msgstr ""
+msgstr "Kliknite na okno ktoré bude cieľom pre vyplnenia hlásenia o chybe."
 
-#: ../apport/ui.py:656
+#: ../apport/ui.py:638
 msgid "Start in bug updating mode. Can take an optional --package."
 msgstr ""
 "Začnite v režime aktualizácie chyby. Môžete použiť voliteľný argument --"
 "package."
 
-#: ../apport/ui.py:658
+#: ../apport/ui.py:640
 msgid ""
 "File a bug report about a symptom. (Implied if symptom name is given as only "
 "argument.)"
@@ -250,7 +258,7 @@
 "Vytvorte chybové hlásenie o príznaku. (Predpokladané ak je zadané ako jediný "
 "argument názov príznaku.)"
 
-#: ../apport/ui.py:660
+#: ../apport/ui.py:642
 msgid ""
 "Specify package name in --file-bug mode. This is optional if a --pid is "
 "specified. (Implied if package name is given as only argument.)"
@@ -258,14 +266,14 @@
 "Zadajte názov balíka v režime --file-bug. Je to voliteľné ak je zadaný --"
 "pid. (Predpokladané ak je zadané ako jediný argument názov.)"
 
-#: ../apport/ui.py:662
+#: ../apport/ui.py:644
 msgid ""
 "Specify a running program in --file-bug mode. If this is specified, the bug "
 "report will contain more information.  (Implied if pid is given as only "
 "argument.)"
 msgstr ""
 
-#: ../apport/ui.py:664
+#: ../apport/ui.py:646
 #, python-format
 msgid ""
 "Report the crash from given .apport or .crash file instead of the pending "
@@ -274,86 +282,86 @@
 "Nahláste pád z daného .apport alebo .crash súboru namiesto zostávajúcich v "
 "%s. (Predpokladané ak je zadaný ako jediný argument súbor.)"
 
-#: ../apport/ui.py:666
+#: ../apport/ui.py:648
 msgid ""
 "In bug filing mode, save the collected information into a file instead of "
 "reporting it. This file can then be reported later on from a different "
 "machine."
 msgstr ""
 
-#: ../apport/ui.py:670
+#: ../apport/ui.py:652
 msgid "Print the Apport version number."
 msgstr "Zobraziť čislo verzie programu Apport."
 
-#: ../apport/ui.py:802
+#: ../apport/ui.py:784
 msgid ""
 "This will launch apport-retrace in a terminal window to examine the crash."
 msgstr ""
 
-#: ../apport/ui.py:803
+#: ../apport/ui.py:785
 msgid "Run gdb session"
-msgstr ""
+msgstr "Spustiť gdb reláciu"
 
-#: ../apport/ui.py:804
+#: ../apport/ui.py:786
 msgid "Run gdb session without downloading debug symbols"
-msgstr ""
+msgstr "Spustiť gdb reláciu bez sťahovania ladiacich symbolov"
 
 #. TRANSLATORS: %s contains the crash report file name
-#: ../apport/ui.py:806
+#: ../apport/ui.py:788
 #, python-format
 msgid "Update %s with fully symbolic stack trace"
 msgstr ""
 
-#: ../apport/ui.py:844
+#: ../apport/ui.py:828
 #, python-format
 msgid "The problem happened with the program %s which changed since then."
 msgstr ""
 
-#: ../apport/ui.py:927
+#: ../apport/ui.py:899
 msgid "Could not determine the package or source package name."
 msgstr "Nedá sa zistiť balík alebo zdrojový názov balíka."
 
-#: ../apport/ui.py:942
+#: ../apport/ui.py:914
 msgid "Unable to start web browser"
 msgstr "Nepodarilo sa spustiť internetový prehliadač"
 
-#: ../apport/ui.py:943
+#: ../apport/ui.py:915
 #, python-format
 msgid "Unable to start web browser to open %s."
 msgstr "Nepodarilo sa spustiť internetový prehliadač pre otvorenie %s."
 
-#: ../apport/ui.py:1017
+#: ../apport/ui.py:989
 #, python-format
 msgid "Please enter your account information for the %s bug tracking system"
 msgstr ""
 "Prosím, zadajte vaše prihlasovacie informácie pre systém sledovania chýb %s"
 
-#: ../apport/ui.py:1028
+#: ../apport/ui.py:1000
 msgid "Network problem"
 msgstr "Problém siete"
 
-#: ../apport/ui.py:1030
+#: ../apport/ui.py:1002
 msgid ""
 "Cannot connect to crash database, please check your Internet connection."
 msgstr ""
 "Nie je možné sa pripojiť do databázy pádov, prosím, skontrolujte vaše "
 "internetové pripojenie."
 
-#: ../apport/ui.py:1056
+#: ../apport/ui.py:1028
 msgid "Memory exhaustion"
 msgstr "Vyčerpanie pamäte"
 
-#: ../apport/ui.py:1057
+#: ../apport/ui.py:1029
 msgid "Your system does not have enough memory to process this crash report."
 msgstr "Váš systém nemá dostatok pamäti na spracovanie chybového hlásenia."
 
-#: ../apport/ui.py:1080 ../apport/ui.py:1089
+#: ../apport/ui.py:1052 ../apport/ui.py:1061
 msgid ""
 "This problem report applies to a program which is not installed any more."
 msgstr ""
 "Toto hlásenie problému sa vzťahuje na program, ktorý už nie je nainštalovaný."
 
-#: ../apport/ui.py:1108
+#: ../apport/ui.py:1080
 #, python-format
 msgid ""
 "The problem cannot be reported:\n"
@@ -364,11 +372,11 @@
 "\n"
 "%s"
 
-#: ../apport/ui.py:1141 ../apport/ui.py:1148
+#: ../apport/ui.py:1113 ../apport/ui.py:1120
 msgid "Problem already known"
 msgstr "Problém je už známy"
 
-#: ../apport/ui.py:1142
+#: ../apport/ui.py:1114
 msgid ""
 "This problem was already reported in the bug report displayed in the web "
 "browser. Please check if you can add any further information that might be "
@@ -378,9 +386,9 @@
 "prehliadači. Skontrolujte, prosím, či môžete doplniť ďalšie informácie, "
 "ktoré môžu byť nápomocné pre vývojárov."
 
-#: ../apport/ui.py:1149
+#: ../apport/ui.py:1121
 msgid "This problem was already reported to developers. Thank you!"
-msgstr ""
+msgstr "Tento problém bol už nahlásený vývojárom. Ďakujeme!"
 
 #: ../bin/apport-cli.py:71
 msgid "Press any key to continue..."
@@ -396,12 +404,12 @@
 msgstr "Prosím, zvoľte (%s):"
 
 #. translators: first %s: application name, second %s: date, third %s: time
-#: ../bin/apport-cli.py:139
+#: ../bin/apport-cli.py:140
 #, python-format
 msgid "%s closed unexpectedly on %s at %s."
 msgstr "%s sa nečakane ukončil %s o %s"
 
-#: ../bin/apport-cli.py:143
+#: ../bin/apport-cli.py:144
 msgid ""
 "If you were not doing anything confidential (entering passwords or other\n"
 "private information), you can help to improve the application by reporting\n"
@@ -411,57 +419,53 @@
 "súkromných informácií), môžete pomôcť zlepšiť aplikáciu nahlásením\n"
 "problému."
 
-#: ../bin/apport-cli.py:146 ../bin/apport-cli.py:165 ../bin/apport-cli.py:183
-#: ../kde/apport-kde.py:202 ../kde/apport-kde.py:233 ../kde/apport-kde.py:254
+#: ../bin/apport-cli.py:147 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184
 msgid "&Report Problem..."
 msgstr "&Nahlásiť problém..."
 
-#: ../bin/apport-cli.py:147
+#: ../bin/apport-cli.py:148 ../bin/apport-cli.py:249
 msgid "Cancel and &ignore future crashes of this program version"
 msgstr "Zrušiť a &ignorovať budúce pády tejto verzie programu"
 
-#: ../bin/apport-cli.py:148 ../bin/apport-cli.py:166 ../bin/apport-cli.py:184
-#: ../bin/apport-cli.py:243 ../bin/apport-cli.py:326 ../bin/apport-cli.py:358
-#: ../bin/apport-cli.py:379
+#: ../bin/apport-cli.py:149 ../bin/apport-cli.py:167 ../bin/apport-cli.py:185
+#: ../bin/apport-cli.py:251 ../bin/apport-cli.py:333 ../bin/apport-cli.py:365
+#: ../bin/apport-cli.py:386
 msgid "&Cancel"
 msgstr "&Zrušiť"
 
-#: ../bin/apport-cli.py:163
+#: ../bin/apport-cli.py:164
 #, python-format
 msgid "The package \"%s\" failed to install or upgrade."
 msgstr "Balík \"%s\" sa nepodarilo nainštalovať alebo aktualizovať."
 
-#: ../bin/apport-cli.py:164 ../gtk/apport-gtk.ui.h:23 ../kde/apport-kde.py:230
+#: ../bin/apport-cli.py:165
 msgid ""
 "You can help the developers to fix the package by reporting the problem."
 msgstr "Môžete pomôcť vývojárom opraviť balík ohlásením problému."
 
-#: ../bin/apport-cli.py:176 ../gtk/apport-gtk.py:133 ../kde/apport-kde.py:245
+#: ../bin/apport-cli.py:177
 msgid "Your system encountered a serious kernel problem."
 msgstr "Váš systém zaznamenal vážny problém s jadrom."
 
-#: ../bin/apport-cli.py:180 ../gtk/apport-gtk.py:137 ../kde/apport-kde.py:249
+#: ../bin/apport-cli.py:181
 msgid "You can help the developers to fix the problem by reporting it."
 msgstr "Môžete pomôcť vývojárom odstrániť problém jeho ohlásením."
 
-#: ../bin/apport-cli.py:208
+#: ../bin/apport-cli.py:212
 #, python-format
 msgid "(%i bytes)"
 msgstr "(%i bajtov)"
 
-#: ../bin/apport-cli.py:210 ../gtk/apport-gtk.py:167 ../kde/apport-kde.py:297
+#: ../bin/apport-cli.py:214 ../gtk/apport-gtk.py:117 ../kde/apport-kde.py:307
 msgid "(binary data)"
 msgstr "(binárne dáta)"
 
-#: ../bin/apport-cli.py:218 ../gtk/apport-gtk.py:190 ../kde/apport-kde.py:269
-msgid "Send this data to the developers?"
-msgstr "Odoslať tieto dáta vývojárom?"
-
-#: ../bin/apport-cli.py:220 ../kde/apport-kde.py:274
+#: ../bin/apport-cli.py:235 ../test/gtk.py:248 ../gtk/apport-gtk.py:145
+#: ../kde/apport-kde.py:153 ../test/kde.py:169
 msgid "Send problem report to the developers?"
 msgstr "Odoslať hlásenie o chybe vývojárom?"
 
-#: ../bin/apport-cli.py:221
+#: ../bin/apport-cli.py:236
 msgid ""
 "After the problem report has been sent, please fill out the form in the\n"
 "automatically opened web browser."
@@ -469,53 +473,43 @@
 "Po odoslaní hlásenia o chybe, vyplňte, prosím, formulár v\n"
 "automaticky otvorenom internetovom prehliadači."
 
-#: ../bin/apport-cli.py:226
-#, python-format
-msgid "&Send complete report (recommended; %s)"
-msgstr "&Poslať celé hlásenie (odporúčané; %s)"
-
-#: ../bin/apport-cli.py:228
-#, python-format
-msgid "Send &reduced report (slow Internet connection; %s)"
-msgstr "Odoslať &skrátené hlásenie (pomalé internetové pripojenie; %s)"
-
-#: ../bin/apport-cli.py:231
+#: ../bin/apport-cli.py:239
 #, python-format
 msgid "&Send report (%s)"
 msgstr "&Odoslať hlásenie (%s)"
 
-#: ../bin/apport-cli.py:236
+#: ../bin/apport-cli.py:243
 msgid "&Examine locally"
 msgstr ""
 
-#: ../bin/apport-cli.py:240
+#: ../bin/apport-cli.py:247
 msgid "&View report"
 msgstr "&Pozrieť hlásenie"
 
-#: ../bin/apport-cli.py:241
+#: ../bin/apport-cli.py:248
 msgid "&Keep report file for sending later or copying to somewhere else"
 msgstr ""
 "&Uchovať súbor s hlásením pre neskoršie odoslanie alebo kopírovanie na iné "
 "miesto"
 
-#: ../bin/apport-cli.py:275
+#: ../bin/apport-cli.py:284
 msgid "Problem report file:"
 msgstr "Súbor hlásenia problému:"
 
-#: ../bin/apport-cli.py:283 ../bin/apport-cli.py:288
+#: ../bin/apport-cli.py:290 ../bin/apport-cli.py:295
 msgid "&Confirm"
 msgstr "&Potvrdiť"
 
-#: ../bin/apport-cli.py:287
+#: ../bin/apport-cli.py:294
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: ../bin/apport-cli.py:293 ../kde/apport-kde.py:336
+#: ../bin/apport-cli.py:300 ../kde/apport-kde.py:343
 msgid "Collecting problem information"
 msgstr "Získavajú sa údaje o probléme"
 
-#: ../bin/apport-cli.py:294
+#: ../bin/apport-cli.py:301
 msgid ""
 "The collected information can be sent to the developers to improve the\n"
 "application. This might take a few minutes."
@@ -523,11 +517,11 @@
 "Zhromaždené informácie môžu byť odoslané vývojárom na zlepšenie\n"
 "aplikácie. Môže to trvať pár minút."
 
-#: ../bin/apport-cli.py:306 ../gtk/apport-gtk.ui.h:22 ../kde/apport-kde.py:353
+#: ../bin/apport-cli.py:313 ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:360
 msgid "Uploading problem information"
 msgstr "Nahrávam informácie o probléme"
 
-#: ../bin/apport-cli.py:307
+#: ../bin/apport-cli.py:314
 msgid ""
 "The collected information is being sent to the bug tracking system.\n"
 "This might take a few minutes."
@@ -535,40 +529,40 @@
 "Zhromaždené informácie sa posielajú systému na sledovanie chýb.\n"
 "Môže to trvať pár minút."
 
-#: ../bin/apport-cli.py:357
+#: ../bin/apport-cli.py:364
 msgid "&Done"
 msgstr "&Dokončené"
 
-#: ../bin/apport-cli.py:363
+#: ../bin/apport-cli.py:370
 msgid "none"
 msgstr "žiadny"
 
-#: ../bin/apport-cli.py:364
+#: ../bin/apport-cli.py:371
 #, python-format
 msgid "Selected: %s. Multiple choices:"
 msgstr "Zvolené: %s. Viaceré voľby:"
 
-#: ../bin/apport-cli.py:380
+#: ../bin/apport-cli.py:387
 msgid "Choices:"
 msgstr "Voľby:"
 
-#: ../bin/apport-cli.py:394
+#: ../bin/apport-cli.py:401
 msgid "Path to file (Enter to cancel):"
 msgstr "Cesta k súboru (Enter pre zrušenie):"
 
-#: ../bin/apport-cli.py:400
+#: ../bin/apport-cli.py:407
 msgid "File does not exist."
 msgstr "Súbor neexistuje."
 
-#: ../bin/apport-cli.py:402
+#: ../bin/apport-cli.py:409
 msgid "This is a directory."
 msgstr "Toto je adresár."
 
-#: ../bin/apport-cli.py:408
+#: ../bin/apport-cli.py:415
 msgid "To continue, you must visit the following URL:"
 msgstr "Aby ste pokračovali, musíte navštíviť následujúce URL:"
 
-#: ../bin/apport-cli.py:410
+#: ../bin/apport-cli.py:417
 msgid ""
 "You can launch a browser now, or copy this URL into a browser on another "
 "computer."
@@ -576,11 +570,11 @@
 "Môžete teraz spustiť prehliadač, alebo skopírovať URL do prehliadača na inom "
 "počítači."
 
-#: ../bin/apport-cli.py:412
+#: ../bin/apport-cli.py:419
 msgid "Launch a browser now"
 msgstr "Okamžite spustiť prehliadač"
 
-#: ../bin/apport-cli.py:426
+#: ../bin/apport-cli.py:433
 msgid "No pending crash reports. Try --help for more information."
 msgstr ""
 "Žiadne zostávajúce hlásenia o pádoch. Skúste --help pre viac informácií."
@@ -607,62 +601,56 @@
 "Počas obnovy sa spracovanie zastavilo teste pri konci a preto sa zdá že "
 "skončilo normálne."
 
-#: ../gtk/apport-gtk.ui.h:1
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr "<big><b>Zhromažďujú sa informácie o probléme</b></big>"
+#: ../gtk/apport-gtk.ui.h:1 ../kde/apport-kde.py:395 ../kde/apport-kde.py:431
+msgid "Apport"
+msgstr "Apport"
 
 #: ../gtk/apport-gtk.ui.h:2
-msgid ""
-"<big><b>Send problem report to the developers?</b></big>\n"
-"\n"
-"After the problem report has been sent, please fill out the form in the "
-"automatically opened web browser."
+msgid "Crash report"
 msgstr ""
-"<big><b>Odoslať správu o probléme vývojárom?</b></big>\n"
-"\n"
-"Po odoslaní správy o probléme, vyplňte prosím formulár v automaticky "
-"otvorenom webovom prehliadači."
 
-#: ../gtk/apport-gtk.ui.h:5
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr "<big><b>Nahrávajú sa informácie o probléme</b></big>"
+#: ../gtk/apport-gtk.ui.h:3
+msgid "<big><b>Sorry, Ubuntu has experienced an internal error.</b></big>"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:7
-#, no-c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Sorry, the package \"%s\" failed to "
-"install or upgrade.</span>"
+#: ../gtk/apport-gtk.ui.h:4 ../test/gtk.py:153 ../test/gtk.py:189
+#: ../gtk/apport-gtk.py:221 ../kde/apport-kde.py:199 ../test/kde.py:143
+msgid "If you notice further problems, try restarting the computer."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Prepáčte, zlyhala inštalácia alebo "
-"aktualizácia balíka \"%s\".</span>"
 
-#: ../gtk/apport-gtk.ui.h:8
-msgid "Application problem"
-msgstr "Problém aplikácie"
+#: ../gtk/apport-gtk.ui.h:5
+msgid "Send an error report to help fix this problem"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:9 ../kde/apport-kde.py:388 ../kde/apport-kde.py:424
-msgid "Apport"
-msgstr "Apport"
+#: ../gtk/apport-gtk.ui.h:6
+msgid "Ignore future problems of this program version"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:11 ../kde/apport-kde.py:305
-#, no-c-format, python-format
-msgid "Complete report (recommended; %s)"
-msgstr "Zostaviť hlásenie (odporúča sa; %s)"
+#: ../gtk/apport-gtk.ui.h:7 ../gtk/apport-gtk.py:164 ../gtk/apport-gtk.py:461
+#: ../kde/apport-kde.py:240
+msgid "Show Details"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:12
-msgid "Content of the report"
-msgstr "Obsah hlásenia"
+#: ../gtk/apport-gtk.ui.h:8
+msgid "_Examine locally"
+msgstr ""
 
-#: ../gtk/apport-gtk.ui.h:13 ../kde/apport-kde.py:197
-msgid ""
-"If you were not doing anything confidential (entering passwords or other "
-"private information), you can help to improve the application by reporting "
-"the problem."
+#: ../gtk/apport-gtk.ui.h:9 ../gtk/apport-gtk.py:212 ../kde/apport-kde.py:192
+msgid "Leave Closed"
 msgstr ""
-"V prípade, že nerobíte nič dôverné (zadávanie hesla alebo iných osobných "
-"údajov), môžete pomôcť vylepšiť aplikáciu nahlásením problému."
 
-#: ../gtk/apport-gtk.ui.h:14
+#: ../gtk/apport-gtk.ui.h:10 ../test/gtk.py:68 ../test/gtk.py:95
+#: ../test/gtk.py:161 ../test/gtk.py:197 ../gtk/apport-gtk.py:176
+#: ../gtk/apport-gtk.py:224 ../kde/apport-kde.py:202 ../test/kde.py:63
+#: ../test/kde.py:88 ../test/kde.py:149
+msgid "Continue"
+msgstr ""
+
+#: ../gtk/apport-gtk.ui.h:11
+msgid "<big><b>Collecting problem information</b></big>"
+msgstr "<big><b>Zhromažďujú sa informácie o probléme</b></big>"
+
+#: ../gtk/apport-gtk.ui.h:12
 msgid ""
 "Information is being collected that may help the developers fix the problem "
 "you report."
@@ -670,24 +658,11 @@
 "Zhromažďujú sa údaje pre vývojárov potrebné na opravu vami ohláseného "
 "problému."
 
-#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:252
-msgid "Kernel problem"
-msgstr "Problém jadra"
-
-#: ../gtk/apport-gtk.ui.h:16
-msgid "Package problem"
-msgstr "Problém balíka"
-
-#: ../gtk/apport-gtk.ui.h:18 ../kde/apport-kde.py:308
-#, no-c-format, python-format
-msgid "Reduced report (slow Internet connection; %s)"
-msgstr "Zmenšené hlásenie (pomalé internetové pripojenie; %s)"
-
-#: ../gtk/apport-gtk.ui.h:19
-msgid "Restart _Program"
-msgstr "Reštartovať _program"
+#: ../gtk/apport-gtk.ui.h:14
+msgid "<big><b>Uploading problem information</b></big>"
+msgstr "<big><b>Nahrávajú sa informácie o probléme</b></big>"
 
-#: ../gtk/apport-gtk.ui.h:20 ../kde/apport-kde.py:354
+#: ../gtk/apport-gtk.ui.h:15 ../kde/apport-kde.py:361
 msgid ""
 "The collected information is being sent to the bug tracking system. This "
 "might take a few minutes."
@@ -695,32 +670,6 @@
 "Zhromaždené informácie budú odoslané do systému pre sledovanie chýb, čo môže "
 "chvíľu trvať."
 
-#: ../gtk/apport-gtk.ui.h:21
-msgid ""
-"This will remove some large items from the report. These are very useful for "
-"developers to debug the problem, but might be too big for you to upload if "
-"you have a slow internet connection."
-msgstr ""
-"Toto vymaže veľké veci zo správy. Tieto sú veľmi užitočné pre vývojárov na "
-"debugovanie problému, ale pokiaľ máte pomalé pripojenie na internet, môže to "
-"byť pre vás priveľa na odoslanie."
-
-#: ../gtk/apport-gtk.ui.h:24
-msgid "_Examine locally"
-msgstr ""
-
-#: ../gtk/apport-gtk.ui.h:25
-msgid "_Ignore future crashes of this program version"
-msgstr "_Ignorovať budúce pády tejto verzie programu"
-
-#: ../gtk/apport-gtk.ui.h:26
-msgid "_Report Problem..."
-msgstr "_Ohlásiť problém..."
-
-#: ../gtk/apport-gtk.ui.h:27
-msgid "_Send Report"
-msgstr "_Poslať hlásenie"
-
 #: ../bin/apport-retrace.py:37
 msgid "%prog [options] <apport problem report | crash ID>"
 msgstr "%prog [možnosti] <apport problémové hlásenie | identifikátor pádu>"
@@ -836,80 +785,105 @@
 
 #: ../gtk/apport-gtk-mime.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
 #: ../kde/apport-kde-mime.desktop.in.h:1 ../gtk/apport-gtk.desktop.in.h:1
-msgid "Report a malfunction to the developers"
-msgstr "Oznámiť nefunkčnosť vývojárom"
+msgid "Report a problem..."
+msgstr "Ohlásiť problém..."
 
 #: ../gtk/apport-gtk-mime.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
 #: ../kde/apport-kde-mime.desktop.in.h:2 ../gtk/apport-gtk.desktop.in.h:2
-msgid "Report a problem..."
-msgstr "Ohlásiť problém..."
+msgid "Report a malfunction to the developers"
+msgstr "Oznámiť nefunkčnosť vývojárom"
 
-#: ../data/kernel_oops.py:28
-msgid "Your system might become unstable now and might need to be restarted."
+#: ../test/gtk.py:61 ../test/kde.py:58
+msgid "Ubuntu has restarted after experiencing an internal error."
 msgstr ""
-"Váš systém sa teraz môže stať nestabilným a môže byť potrebné ho reštartovať."
 
-#: ../gtk/apport-gtk.py:79 ../gtk/apport-gtk.py:83 ../kde/apport-kde.py:188
-#, python-format
-msgid "Sorry, %s closed unexpectedly"
-msgstr "Prepáčte, %s sa nečakane ukončil"
+#: ../test/gtk.py:88 ../gtk/apport-gtk.py:200 ../kde/apport-kde.py:181
+#: ../test/kde.py:83
+msgid "Sorry, a problem occurred while installing software."
+msgstr ""
 
-#: ../kde/apport-kde.py:133
-msgid "&Details..."
-msgstr "&Podrobnosti..."
+#: ../test/gtk.py:99 ../test/kde.py:91
+msgid "Package: apport 1.2.3~0ubuntu1"
+msgstr ""
 
-#: ../kde/apport-kde.py:160
-msgid "Username:"
-msgstr "Používateľské meno:"
+#: ../test/gtk.py:123 ../test/kde.py:115
+msgid "The application Apport has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:161
-msgid "Password:"
-msgstr "Heslo:"
+#: ../test/gtk.py:130 ../gtk/apport-gtk.py:213 ../gtk/apport-gtk.py:267
+#: ../kde/apport-kde.py:193 ../kde/apport-kde.py:326 ../test/kde.py:120
+msgid "Relaunch"
+msgstr ""
+
+#: ../test/gtk.py:151 ../test/kde.py:141
+msgid "Sorry, Ubuntu has experienced an internal error."
+msgstr ""
+
+#: ../test/gtk.py:187
+msgid "Sorry, the application apport has closed unexpectedly."
+msgstr ""
+
+#: ../test/gtk.py:204
+msgid "Sorry, apport has closed unexpectedly."
+msgstr ""
+
+#: ../test/gtk.py:256 ../gtk/apport-gtk.py:154 ../kde/apport-kde.py:161
+#: ../test/kde.py:175
+msgid "Send"
+msgstr ""
+
+#: ../data/kernel_oops.py:28
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr ""
+"Váš systém sa teraz môže stať nestabilným a môže byť potrebné ho reštartovať."
 
-#: ../kde/apport-kde.py:191
+#: ../gtk/apport-gtk.py:132
 #, python-format
-msgid "Sorry, the program \"%s\" closed unexpectedly."
-msgstr "Prepáčte, program \"%s\" sa nečakane ukončil."
+msgid "Sorry, the application %s has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:194
+#: ../gtk/apport-gtk.py:135
 #, python-format
-msgid "Sorry, %s closed unexpectedly."
-msgstr "Prepáčte, %s sa nečakane ukončil."
+msgid "Sorry, %s has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:200
-msgid "&Ignore future crashes of this program version"
-msgstr "&Ignorovať budúce zlyhania tejto verzie programu"
+#: ../gtk/apport-gtk.py:139 ../kde/apport-kde.py:196
+#, python-format
+msgid "Sorry, %s has experienced an internal error."
+msgstr ""
 
-#: ../kde/apport-kde.py:209
-msgid "Restart &Program"
-msgstr "Reštartovať &Program"
+#: ../gtk/apport-gtk.py:185 ../kde/apport-kde.py:167
+#, python-format
+msgid "%s has restarted after experiencing an internal error."
+msgstr ""
 
-#: ../kde/apport-kde.py:228
+#: ../gtk/apport-gtk.py:193 ../kde/apport-kde.py:175
 #, python-format
-msgid "Sorry, the package \"%s\" failed to install or upgrade."
-msgstr "Prepáčte, balík %s sa nepodarilo nainštalovať alebo aktualizovať."
+msgid "Package: %s"
+msgstr ""
 
-#: ../kde/apport-kde.py:268 ../kde/apport-kde.py:273
-msgid "Generic error"
-msgstr "Všeobecná chyba"
+#: ../gtk/apport-gtk.py:209 ../kde/apport-kde.py:187
+#, python-format
+msgid "The application %s has closed unexpectedly."
+msgstr ""
 
-#: ../kde/apport-kde.py:275
-msgid ""
-"After the problem report has been sent, please fill out the form in the "
-"automatically opened web browser."
+#: ../gtk/apport-gtk.py:464 ../kde/apport-kde.py:237
+msgid "Hide Details"
 msgstr ""
-"Po odoslaní hlásenia o chybe, prosím vyplňte formulár v automaticky "
-"otvorenom webovom prehliadači."
 
-#: ../kde/apport-kde.py:278
-msgid "&Send"
-msgstr "&Poslať"
+#: ../kde/apport-kde.py:269
+msgid "Username:"
+msgstr "Používateľské meno:"
+
+#: ../kde/apport-kde.py:270
+msgid "Password:"
+msgstr "Heslo:"
 
-#: ../kde/apport-kde.py:335
+#: ../kde/apport-kde.py:342
 msgid "Collecting Problem Information"
 msgstr "Získavajú sa informácie o probléme"
 
-#: ../kde/apport-kde.py:337
+#: ../kde/apport-kde.py:344
 msgid ""
 "The collected information can be sent to the developers to improve the "
 "application. This might take a few minutes."
@@ -917,7 +891,7 @@
 "Zozbierané informácie môžu byť odoslané vývojárom pre zlepšenie aplikácie. "
 "Môže to trvať pár minúť."
 
-#: ../kde/apport-kde.py:352
+#: ../kde/apport-kde.py:359
 msgid "Uploading Problem Information"
 msgstr "Odosielajú sa informácie o probléme"
 
@@ -949,3 +923,4 @@
 "An Ubuntu package has a file conflict with a package that is not a genuine "
 "Ubuntu package"
 msgstr ""
+"Ubuntu balík je v konflikte s balíkom, ktorý nie je pravý Ubuntu balík"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apt-listchanges.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apt-listchanges.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apt-listchanges.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apt-listchanges.po	2012-02-23 06:55:25.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:26+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../apt-listchanges.py:80
 msgid "database %s failed to load.\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apt.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apt.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apt.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apt.po	2012-02-23 06:55:25.000000000 +0000
@@ -4,168 +4,170 @@
 # thanks to Miroslav Kure <kurem@debian.cz>
 #
 # Peter Mann <Peter.Mann@tuke.sk>, 2006.
-# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010.
+# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 08:49+0000\n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 12:47+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
-#: cmdline/apt-cache.cc:154
+#: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Balík %s verzie %s má nesplnené závislosti:\n"
 
-#: cmdline/apt-cache.cc:282
+#: cmdline/apt-cache.cc:286
 msgid "Total package names: "
 msgstr "Celkom názvov balíkov: "
 
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
 msgstr "Celkom štruktúr balíkov: "
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
 msgstr "  Normálnych balíkov: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
 msgstr "  Čisto virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
 msgstr "  Jednoduchých virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
 msgstr "  Zmiešaných virtuálnych balíkov: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Chýbajúcich: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
 msgstr "Celkom rôznych verzií: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
 msgstr "Celkom rôznych popisov: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
 msgstr "Celkom závislostí: "
 
-#: cmdline/apt-cache.cc:337
+#: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "Celkom vzťahov ver/súbor: "
 
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
 msgstr "Celkom vzťahov popis/súbor: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
 msgstr "Celkom poskytnutých mapovaní: "
 
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
 msgstr "Celkom globovaných reťazcov: "
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
 msgstr "Celkom miesta závislých verzií: "
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
 msgstr "Celkom jalového miesta: "
 
-#: cmdline/apt-cache.cc:380
+#: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
 msgstr "Celkom priradeného miesta: "
 
-#: cmdline/apt-cache.cc:511 cmdline/apt-cache.cc:1139
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Súbor balíkov %s je neaktuálny."
 
-#: cmdline/apt-cache.cc:589 cmdline/apt-cache.cc:1374
-#: cmdline/apt-cache.cc:1376 cmdline/apt-cache.cc:1453 cmdline/apt-mark.cc:37
-#: cmdline/apt-mark.cc:84 cmdline/apt-mark.cc:160
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40
+#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163
 msgid "No packages found"
 msgstr "Neboli nájdené žiadne balíky"
 
-#: cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
 msgstr "Musíte zadať aspoň jeden vyhľadávací vzor"
 
-#: cmdline/apt-cache.cc:1353
+#: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
+"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark "
+"showauto“."
 
-#: cmdline/apt-cache.cc:1448
+#: cmdline/apt-cache.cc:1452
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Nedá sa nájsť balík %s"
 
-#: cmdline/apt-cache.cc:1478
+#: cmdline/apt-cache.cc:1482
 msgid "Package files:"
 msgstr "Súbory balíka:"
 
-#: cmdline/apt-cache.cc:1485 cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Vyrovnávacia pamäť je neaktuálna, nedá sa odvolať na súbor balíka"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1499
+#: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
 msgstr "Pripevnené balíky:"
 
-#: cmdline/apt-cache.cc:1511 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
 msgstr "(nenájdené)"
 
-#: cmdline/apt-cache.cc:1519
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Nainštalovaná verzia: "
 
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidát: "
 
-#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1546
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
 msgstr "(žiadna)"
 
-#: cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
 msgstr "  Pripevnený balík: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1562
+#: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
 msgstr "  Tabuľka verzií:"
 
-#: cmdline/apt-cache.cc:1675 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:73
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3230 cmdline/apt-internal-solver.cc:30
-#: cmdline/apt-mark.cc:264 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3264 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pre %s skompilovaný %s %s\n"
 
-#: cmdline/apt-cache.cc:1682
+#: cmdline/apt-cache.cc:1686
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,29 +203,63 @@
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
+"Použitie: apt-cache [voľby] príkaz\n"
+"          apt-cache [voľby] showpkg balík1 [balík2 ...]\n"
+"          apt-cache [voľby] showsrc balík1 [balík2 ...]\n"
+"\n"
+"apt-cache je nízkoúrovňový nástroj na zisťovanie informácií\n"
+"z binárnych súborov vyrovnávacej pamäti APT\n"
+"\n"
+"Príkazy:\n"
+"   gencaches - Zostaví vyrovnávaciu pamäť balíkov a zdrojov\n"
+"   showpkg   - Zobrazí všeobecné údaje o balíku\n"
+"   showsrc   - Zobrazí zdrojové záznamy\n"
+"   stats     - Zobrazí základné štatistiky\n"
+"   dump      - Zobrazí celý súbor v zhustenej podobe\n"
+"   dumpavail - Vypíše súbor dostupných balíkov na štandardný výstup\n"
+"   unmet     - Zobrazí nesplnené závislosti\n"
+"   search    - Prehľadá zoznam balíkov podľa regulárneho výrazu\n"
+"   show      - Zobrazí prehľadné informácie o balíku\n"
+"   depends   - Zobrazí základné údaje o závislostiach balíka\n"
+"   rdepends  - Zobrazí údaje o spätných závislostiach balíka\n"
+"   pkgnames  - Vypíše zoznam názvov všetkých balíkov v systéme\n"
+"   dotty     - Vytvorí diagramy balíka pre GraphViz\n"
+"   xvcg      - Vytvorí diagramy balíka pre xvcg\n"
+"   policy    - Zobrazí nastavenia zásad\n"
+"\n"
+"Voľby:\n"
+"  -h   Tento pomocník.\n"
+"  -p=? Vyrovnávacia pamäť balíkov.\n"
+"  -s=? Vyrovnávacia pamäť zdrojov.\n"
+"  -q   Nezobrazí indikátor priebehu.\n"
+"  -i   Pri príkaze unmet zobrazí iba dôležité závislosti.\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+"Ďalšie informácie nájdete v manuálových stránkach apt-cache(8)\n"
+"a apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Prosím, zadajte názov tohto disku, napríklad „Debian 5.0.3 Disk 1“"
 
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Vložte disk do mechaniky a stlačte Enter"
 
-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Pripojenie „%s“ na „%s“ zlyhalo"
 
-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Zopakujte tento postup pre všetky CD v sade diskov."
 
-#: cmdline/apt-config.cc:44
+#: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
 msgstr "Argumenty nie sú vo dvojiciach"
 
-#: cmdline/apt-config.cc:79
+#: cmdline/apt-config.cc:81
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -251,12 +287,12 @@
 "  -c=? Načíta tento konfiguračný súbor\n"
 "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s nie je platný DEB balík."
+msgstr "%s nie je platný balík DEB."
 
-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -280,40 +316,40 @@
 "  -c=? Načíta tento konfiguračný súbor\n"
 "  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267
+#: cmdline/apt-extracttemplates.cc:269
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Do %s sa nedá zapisovať"
 
-#: cmdline/apt-extracttemplates.cc:309
+#: cmdline/apt-extracttemplates.cc:311
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Nedá sa určiť verzia programu debconf. Je debconf nainštalovaný?"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
 msgstr "Zoznam rozšírení balíka je príliš dlhý"
 
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
 msgstr "Chyba pri spracovávaní adresára %s"
 
-#: ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
 msgstr "Zoznam zdrojových rozšírení je príliš dlhý"
 
-#: ftparchive/apt-ftparchive.cc:377
+#: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
 msgstr "Chyba pri zapisovaní hlavičky do súboru"
 
-#: ftparchive/apt-ftparchive.cc:407
+#: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Chyba pri spracovávaní obsahu %s"
 
-#: ftparchive/apt-ftparchive.cc:595
+#: ftparchive/apt-ftparchive.cc:596
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -393,26 +429,26 @@
 "  -c=?  Načíta tento konfiguračný súbor\n"
 "  -o=?  Nastaví ľubovoľnú voľbu"
 
-#: ftparchive/apt-ftparchive.cc:801
+#: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
 msgstr "Nevyhovel žiaden výber"
 
-#: ftparchive/apt-ftparchive.cc:879
+#: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "V súbore balíka skupiny „%s“ chýbajú niektoré súbory"
 
-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "DB je narušená, súbor je premenovaný na %s.old"
 
-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s"
 
-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -420,110 +456,110 @@
 "Formát DB je neplatný. Ak ste aktualizovali staršiu verziu apt, musíte "
 "odstrániť a znovu vytvoriť databázu."
 
-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Nedá sa otvoriť DB súbor %s: %s"
 
-#: ftparchive/cachedb.cc:123
+#: ftparchive/cachedb.cc:126
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s sa nedá vyhodnotiť"
 
-#: ftparchive/cachedb.cc:245
+#: ftparchive/cachedb.cc:248
 msgid "Archive has no control record"
 msgstr "Archív nemá riadiaci záznam"
 
-#: ftparchive/cachedb.cc:482
+#: ftparchive/cachedb.cc:489
 msgid "Unable to get a cursor"
 msgstr "Nedá sa získať kurzor"
 
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "W: Adresár %s sa nedá čítať\n"
 
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "W: %s sa nedá vyhodnotiť\n"
 
-#: ftparchive/writer.cc:139
+#: ftparchive/writer.cc:141
 msgid "E: "
 msgstr "E: "
 
-#: ftparchive/writer.cc:141
+#: ftparchive/writer.cc:143
 msgid "W: "
 msgstr "W: "
 
-#: ftparchive/writer.cc:148
+#: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
 msgstr "E: Chyby sa týkajú súboru "
 
-#: ftparchive/writer.cc:166 ftparchive/writer.cc:198
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Chyba pri preklade %s"
 
-#: ftparchive/writer.cc:179
+#: ftparchive/writer.cc:181
 msgid "Tree walking failed"
 msgstr "Prechod stromom zlyhal"
 
-#: ftparchive/writer.cc:206
+#: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
 msgstr "%s sa nedá otvoriť"
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " Odlinkovanie %s [%s]\n"
 
-#: ftparchive/writer.cc:273
+#: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Nie je možné vykonať readlink %s"
 
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Nie je možné vykonať unlink %s"
 
-#: ftparchive/writer.cc:284
+#: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Nepodarilo sa zlinkovať %s s %s"
 
-#: ftparchive/writer.cc:294
+#: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
 
-#: ftparchive/writer.cc:399
+#: ftparchive/writer.cc:401
 msgid "Archive had no package field"
 msgstr "Archív neobsahuje pole „package“"
 
-#: ftparchive/writer.cc:407 ftparchive/writer.cc:709
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nemá žiadnu položku override\n"
 
-#: ftparchive/writer.cc:475 ftparchive/writer.cc:825
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správcom %s je %s, nie %s\n"
 
-#: ftparchive/writer.cc:719
+#: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nemá žiadnu položku „source override“\n"
 
-#: ftparchive/writer.cc:723
+#: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nemá žiadnu položku „binary override“\n"
 
-#: ftparchive/contents.cc:337 ftparchive/contents.cc:368
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Zlyhal pokus o pridelenie pamäti"
 
@@ -534,81 +570,69 @@
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Skomolený „override“ %s riadok %lu #1"
+msgid "Malformed override %s line %llu #1"
+msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Skomolený „override“ %s riadok %lu #2"
+msgid "Malformed override %s line %llu #2"
+msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Skomolený „override“ %s riadok %lu #3"
+msgid "Malformed override %s line %llu #3"
+msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr "Nepodarilo sa prečítať „override“ súbor %s"
 
-#: ftparchive/multicompress.cc:67
+#: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Neznámy kompresný algoritmus „%s“"
 
-#: ftparchive/multicompress.cc:97
+#: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimovaný výstup %s potrebuje kompresnú sadu"
 
-#: ftparchive/multicompress.cc:165
+#: ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
 
-#: ftparchive/multicompress.cc:191
+#: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
 msgstr "Zlyhalo vytvorenie FILE*"
 
-#: ftparchive/multicompress.cc:194
+#: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
 msgstr "Volanie fork() zlyhalo"
 
-#: ftparchive/multicompress.cc:208
+#: ftparchive/multicompress.cc:206
 msgid "Compress child"
 msgstr "Komprimovať potomka"
 
-#: ftparchive/multicompress.cc:231
+#: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Vnútorná chyba, nepodarilo sa vytvoriť %s"
 
-#: ftparchive/multicompress.cc:282
-msgid "Failed to create subprocess IPC"
-msgstr "Nedá sa vytvoriť podproces IPC"
-
-#: ftparchive/multicompress.cc:319
-msgid "Failed to exec compressor "
-msgstr "Nepodarilo sa spustiť kompresor "
-
-#: ftparchive/multicompress.cc:358
-msgid "decompressor"
-msgstr "dekompresor"
-
-#: ftparchive/multicompress.cc:401
+#: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
 msgstr "V/V operácia s podprocesom/súborom zlyhala"
 
-#: ftparchive/multicompress.cc:453
+#: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
 msgstr "Chyba čítania pri výpočte MD5"
 
-#: ftparchive/multicompress.cc:470
+#: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problém s odlinkovaním %s"
 
-#: ftparchive/multicompress.cc:485
+#: ftparchive/multicompress.cc:373
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Premenovanie %s na %s zlyhalo"
@@ -722,34 +746,34 @@
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu iba čiastočne nainštalovaných alebo odstránených.\n"
 
-#: cmdline/apt-get.cc:633
+#: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Poznámka: vyberá sa „%s“ pre úlohu „%s“\n"
 
-#: cmdline/apt-get.cc:639
+#: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Poznámka: vyberá sa „%s“ pre regulárny výraz „%s“\n"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:654
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Balík %s je virtuálny balík poskytovaný balíkmi:\n"
 
-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:665
 msgid " [Installed]"
 msgstr " [Nainštalovaný]"
 
-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:674
 msgid " [Not candidate version]"
 msgstr " [Nie je kandidátska verzia]"
 
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:676
 msgid "You should explicitly select one to install."
 msgstr "Mali by ste explicitne vybrať jeden na inštaláciu."
 
-#: cmdline/apt-get.cc:681
+#: cmdline/apt-get.cc:679
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -759,127 +783,127 @@
 "Balík %s nie je dostupný, ale odkazuje naň iný balík. Možno to znamená,\n"
 "že balík chýba, bol zrušený alebo je dostupný iba z iného zdroja\n"
 
-#: cmdline/apt-get.cc:699
+#: cmdline/apt-get.cc:697
 msgid "However the following packages replace it:"
 msgstr "Avšak nahrádzajú ho nasledovné balíky:"
 
-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Balík „%s“ nemá kandidáta na inštaláciu"
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr "Virtuálne balíky ako „%s“ nemožno odstrániť\n"
 
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Poznámka: „%s“ sa vyberá namiesto „%s“\n"
 
-#: cmdline/apt-get.cc:783
+#: cmdline/apt-get.cc:794
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Preskakuje sa %s, pretože je už nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:798
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
 "Preskakuje sa %s, nie je nainštalovaný a bola vy6iadan8 iba aktualizácia.\n"
 
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:810
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nie je možná reinštalácia %s, pretože sa nedá stiahnuť.\n"
 
-#: cmdline/apt-get.cc:804
+#: cmdline/apt-get.cc:815
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je už najnovšej verzie.\n"
 
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2093 cmdline/apt-mark.cc:59
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s je označený ako manuálne nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:860
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Vybraná verzia „%s“ (%s) pre „%s“\n"
 
-#: cmdline/apt-get.cc:854
+#: cmdline/apt-get.cc:865
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Vybraná verzia „%s“ (%s) pre „%s“ kvôli „%s“\n"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:907
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
 
-#: cmdline/apt-get.cc:974
+#: cmdline/apt-get.cc:985
 msgid "Correcting dependencies..."
 msgstr "Opravujú sa závislosti..."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:988
 msgid " failed."
 msgstr " zlyhalo."
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:991
 msgid "Unable to correct dependencies"
 msgstr "Závislosti sa nedajú opraviť"
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:994
 msgid "Unable to minimize the upgrade set"
 msgstr "Sada na aktualizáciu sa nedá minimalizovať"
 
-#: cmdline/apt-get.cc:985
+#: cmdline/apt-get.cc:996
 msgid " Done"
 msgstr " Hotovo"
 
-#: cmdline/apt-get.cc:989
+#: cmdline/apt-get.cc:1000
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“."
 
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1003
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nesplnené závislosti. Skúste použiť -f."
 
-#: cmdline/apt-get.cc:1017
+#: cmdline/apt-get.cc:1028
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UPOZORNENIE: Pri nasledovných balíkoch sa nedá overiť vierohodnosť!"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1032
 msgid "Authentication warning overridden.\n"
 msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1039
 msgid "Install these packages without verification [y/N]? "
 msgstr "Nainštalovať tieto nekontrolované balíky [y/N]? "
 
-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1041
 msgid "Some packages could not be authenticated"
 msgstr "Nedala sa zistiť vierohodnosť niektorých balíkov"
 
-#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Nastali problémy a -y bolo použité bez --force-yes"
 
-#: cmdline/apt-get.cc:1080
+#: cmdline/apt-get.cc:1091
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Vnútorná chyba, InstallPackages bolo volané s poškodenými balíkmi!"
 
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1100
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Je potrebné odstránenie balíka, ale funkcia Odstrániť je vypnutá."
 
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1111
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnútorná chyba, Triedenie sa neukončilo"
 
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1149
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 "Nezvyčajná udalosť... Veľkosti nesúhlasia, pošlite e-mail na "
@@ -887,52 +911,52 @@
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1145
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB archívov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1150
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Je potrebné stiahnuť %sB archívov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1157
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Po tejto operácii sa na disku použije ďalších %sB.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1162
+#: cmdline/apt-get.cc:1173
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po tejto operácii sa na disku uvoľní %sB.\n"
 
-#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2506
-#: cmdline/apt-get.cc:2509
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Na %s sa nedá zistiť veľkosť voľného miesta"
 
-#: cmdline/apt-get.cc:1190
+#: cmdline/apt-get.cc:1201
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Na %s nemáte dostatok voľného miesta."
 
-#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Zadané „iba triviálne“, ale toto nie je triviálna operácia."
 
-#: cmdline/apt-get.cc:1208
+#: cmdline/apt-get.cc:1219
 msgid "Yes, do as I say!"
 msgstr "Áno, urob to, čo vravím!"
 
-#: cmdline/apt-get.cc:1210
+#: cmdline/apt-get.cc:1221
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -943,28 +967,28 @@
 "Ak chcete pokračovať, opíšte frázu „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246
 msgid "Abort."
 msgstr "Prerušené."
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1242
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovať [Y/n]? "
 
-#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2571
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Zlyhalo stiahnutie %s  %s\n"
 
-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1332
 msgid "Some files failed to download"
 msgstr "Niektoré súbory sa nedajú stiahnuť"
 
-#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2583
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611
 msgid "Download complete and in download only mode"
 msgstr "Sťahovanie ukončené v režime „iba stiahnuť“"
 
-#: cmdline/apt-get.cc:1328
+#: cmdline/apt-get.cc:1339
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -972,19 +996,19 @@
 "Niektoré archívy sa nedajú stiahnuť. Skúste spustiť apt-get update alebo --"
 "fix-missing"
 
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1343
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výmena nosiča nie sú momentálne podporované"
 
-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1348
 msgid "Unable to correct missing packages."
 msgstr "Chýbajúce balíky sa nedajú opraviť."
 
-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1349
 msgid "Aborting install."
 msgstr "Inštalácia sa prerušuje."
 
-#: cmdline/apt-get.cc:1366
+#: cmdline/apt-get.cc:1377
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1001,35 +1025,35 @@
 "Nasledovné balíky zmizli z vášho systému, pretože\n"
 "všetky súbory boli prepísané inými balíkmi:"
 
-#: cmdline/apt-get.cc:1370
+#: cmdline/apt-get.cc:1381
 msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
 
-#: cmdline/apt-get.cc:1508
+#: cmdline/apt-get.cc:1519
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorovať nedostupné cieľové vydanie „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1551
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Vyberá sa „%s“ ako zdrojový balík namiesto „%s“\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1578
+#: cmdline/apt-get.cc:1589
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorovať nedostupnú verziu „%s“ balíka „%s“"
 
-#: cmdline/apt-get.cc:1594
+#: cmdline/apt-get.cc:1605
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
-#: cmdline/apt-get.cc:1656
+#: cmdline/apt-get.cc:1668
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nemajú sa odstraňovať veci, nespustí sa AutoRemover"
 
-#: cmdline/apt-get.cc:1751
+#: cmdline/apt-get.cc:1772
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1047,15 +1071,15 @@
 #. "that package should be filed.") << endl;
 #. }
 #. 
-#: cmdline/apt-get.cc:1754 cmdline/apt-get.cc:1923
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944
 msgid "The following information may help to resolve the situation:"
 msgstr "Nasledovné informácie vám možno pomôžu vyriešiť túto situáciu:"
 
-#: cmdline/apt-get.cc:1758
+#: cmdline/apt-get.cc:1779
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnútorná chyba, AutoRemover niečo pokazil"
 
-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1786
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
@@ -1068,7 +1092,7 @@
 msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
-#: cmdline/apt-get.cc:1769
+#: cmdline/apt-get.cc:1790
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1080,19 +1104,19 @@
 msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
-#: cmdline/apt-get.cc:1771
+#: cmdline/apt-get.cc:1792
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Na ich odstránenie použite „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1790
+#: cmdline/apt-get.cc:1811
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
-#: cmdline/apt-get.cc:1889
+#: cmdline/apt-get.cc:1910
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr "Možno to budete chcieť napraviť spustením „apt-get -f install“:"
 
-#: cmdline/apt-get.cc:1893
+#: cmdline/apt-get.cc:1914
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1100,7 +1124,7 @@
 "Nesplnené závislosti. Skúste spustiť „apt-get -f install“ bez balíkov (alebo "
 "navrhnite riešenie)."
 
-#: cmdline/apt-get.cc:1908
+#: cmdline/apt-get.cc:1929
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1112,73 +1136,75 @@
 "požadované balíky ešte neboli vytvorené alebo presunuté z fronty\n"
 "Novoprichádzajúcich (Incoming) balíkov."
 
-#: cmdline/apt-get.cc:1929
+#: cmdline/apt-get.cc:1950
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1976
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: cmdline/apt-get.cc:2045
+#: cmdline/apt-get.cc:2066
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2067
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2109
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
-#: cmdline/apt-get.cc:2095 cmdline/apt-mark.cc:61
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s je označený ako automaticky nainštalovaný.\n"
 
-#: cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:105
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
+"Tento príkaz je zavrhovaný. Prosím, použite namiesto neho „apt-mark auto“ a "
+"„apt-mark manual“."
 
-#: cmdline/apt-get.cc:2119
+#: cmdline/apt-get.cc:2140
 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 
-#: cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:2143
 msgid "Failed"
 msgstr "Chyba"
 
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2148
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2194 cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnútorná chyba, „problem resolver“ niečo pokazil"
 
-#: cmdline/apt-get.cc:2226 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
 msgid "Unable to lock the download directory"
 msgstr "Adresár pre sťahovanie sa nedá zamknúť"
 
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Downloading %s %s"
-msgstr ""
+msgstr "Sťahuje sa %s %s"
 
-#: cmdline/apt-get.cc:2368
+#: cmdline/apt-get.cc:2396
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadať aspoň jeden balík, pre ktorý sa stiahnu zdrojové texty"
 
-#: cmdline/apt-get.cc:2408 cmdline/apt-get.cc:2720
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nedá sa nájsť zdrojový balík pre %s"
 
-#: cmdline/apt-get.cc:2425
+#: cmdline/apt-get.cc:2453
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -1188,7 +1214,7 @@
 "adrese:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2430
+#: cmdline/apt-get.cc:2458
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1196,145 +1222,152 @@
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2483
+#: cmdline/apt-get.cc:2511
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Preskakuje sa už stiahnutý súbor „%s“\n"
 
-#: cmdline/apt-get.cc:2520
+#: cmdline/apt-get.cc:2548
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatok voľného miesta"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2529
+#: cmdline/apt-get.cc:2557
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB/%sB zdrojových archívov.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2562
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Je potrebné stiahnuť %sB zdrojových archívov.\n"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2568
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2606
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:2609
+#: cmdline/apt-get.cc:2637
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Preskakuje sa rozbalenie už rozbaleného zdroja v %s\n"
 
-#: cmdline/apt-get.cc:2621
+#: cmdline/apt-get.cc:2649
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz na rozbalenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2622
+#: cmdline/apt-get.cc:2650
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Skontrolujte, či je nainštalovaný balík „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2644
+#: cmdline/apt-get.cc:2672
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz na zostavenie „%s“ zlyhal.\n"
 
-#: cmdline/apt-get.cc:2664
+#: cmdline/apt-get.cc:2692
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:2683
+#: cmdline/apt-get.cc:2711
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadať aspoň jeden balík, pre ktorý sa budú overovať závislosti na "
 "zostavenie"
 
-#: cmdline/apt-get.cc:2708
+#: cmdline/apt-get.cc:2736
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) "
 "APT::Architectures for setup"
 msgstr ""
+"Informácie o architektúre nie sú dostupné pre %s. Informácie o nastavení "
+"nájdete v apt.conf(5) APT::Architectures"
 
-#: cmdline/apt-get.cc:2725
+#: cmdline/apt-get.cc:2753
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nedajú sa získať závislosti na zostavenie %s"
 
-#: cmdline/apt-get.cc:2745
+#: cmdline/apt-get.cc:2773
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti na zostavenie.\n"
 
-#: cmdline/apt-get.cc:2875
+#: cmdline/apt-get.cc:2909
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"%s závislosť pre %s nemožno splniť, pretože %s nie je povolené na balíkoch "
+"„%s“"
 
-#: cmdline/apt-get.cc:2896
+#: cmdline/apt-get.cc:2930
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr "%s závislosť pre %s sa nemôže splniť, pretože sa nedá nájsť balík %s"
+msgstr "%s závislosť pre %s nemožno splniť, pretože sa nedá nájsť balík %s"
 
-#: cmdline/apt-get.cc:2919
+#: cmdline/apt-get.cc:2953
 #, c-format
 msgid ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Zlyhalo splnenie %s závislosti pre %s: Inštalovaný balík %s je príliš nový"
 
-#: cmdline/apt-get.cc:2958
+#: cmdline/apt-get.cc:2992
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%s závislosť pre %s nemožno splniť, pretože kandidátska verzia balíka %s, "
+"nedokáže splniť požiadavky na verziu"
 
-#: cmdline/apt-get.cc:2964
+#: cmdline/apt-get.cc:2998
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"%s závislosť pre %s nemožno splniť, pretože balík %s nemá kandidátsku verziu"
 
-#: cmdline/apt-get.cc:2987
+#: cmdline/apt-get.cc:3021
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:3003
+#: cmdline/apt-get.cc:3037
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Závislosti na zostavenie %s sa nedajú splniť."
+msgstr "Závislosti na zostavenie %s nemožno splniť."
 
-#: cmdline/apt-get.cc:3008
+#: cmdline/apt-get.cc:3042
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí na zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:3101 cmdline/apt-get.cc:3113
+#: cmdline/apt-get.cc:3135 cmdline/apt-get.cc:3147
 #, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Záznam zmien %s (%s)"
 
-#: cmdline/apt-get.cc:3235
+#: cmdline/apt-get.cc:3269
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:3276
+#: cmdline/apt-get.cc:3310
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1379,8 +1412,50 @@
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Použitie: apt-get [voľby] príkaz\n"
+"          apt-get [voľby] install|remove balík1 [balík2 ...]\n"
+"          apt-get [voľby] source balík1 [balík2 ...]\n"
+"\n"
+"apt-get je jednoduché rozhranie na príkazovom riadku na sťahovanie\n"
+"a inštaláciu balíkov. Najpoužívanejšími príkazmi sú update a install.\n"
+"\n"
+"Príkazy:\n"
+"   update          - Získa nové zoznamy balíkov\n"
+"   upgrade         - Vykoná aktualizáciu\n"
+"   install         - Nainštaluje nové balíky (balík je libc6, nie "
+"libc6.deb)\n"
+"   remove          - Odstráni balíky\n"
+"   autoremove      - Automaticky odstráni všetky nepoužité balíky\n"
+"   purge           - Odstráni a balíky a ich konfiguračné súbory\n"
+"   source          - Stiahne zdrojové archívy\n"
+"   build-dep       - Nastaví závislosti kompilácie pre zdrojové balíky\n"
+"   dist-upgrade    - Aktualizácia distribúcie, pozri apt-get(8)\n"
+"   dselect-upgrade - Riadi sa podľa výberu v dselect\n"
+"   clean           - Zmaže stiahnuté archívy\n"
+"   autoclean       - Zmaže staré stiahnuté archívy\n"
+"   check           - Overí, či neexistujú poškodené závislosti\n"
+"   markauto        - Označí zadané balíky ako automaticky nainštalované\n"
+"   unmarkauto      - Označí zadané balíky ako manuálne nainštalované\n"
+"\n"
+"Voľby:\n"
+"  -h  Tento pomocník\n"
+"  -q  Nezobrazí indikátor priebehu - pre záznam\n"
+"  -qq Zobrazí iba chyby\n"
+"  -d  Iba stiahne - neinštaluje ani nerozbaľuje archívy\n"
+"  -s  Žiadna akcia. Iba simuluje postupnosť pripravených akcií\n"
+"  -y  Na všetky otázky odpovedá Áno\n"
+"  -f  Pokúsi sa opraviť systém s poškodenými závislosťami\n"
+"  -m  Skúsi pokračovať, aj keď sa nepodarí nájsť archívy\n"
+"  -u  Zobrazí tiež zoznam aktualizovaných balíkov\n"
+"  -b  Po stiahnutí zdrojového balíka ho aj skompiluje\n"
+"  -V  Zobrazí čísla verzií\n"
+"  -c=? Načíta tento konfiguračný súbor\n"
+"  -o=? Nastaví ľubovoľnú voľbu, napr. -o dir::cache=/tmp\n"
+"Viac volieb nájdete v manuálových stránkach apt-get(8), sources.list(5)\n"
+"a apt.conf(5).\n"
+"                       Tento APT má schopnosti posvätnej kravy.\n"
 
-#: cmdline/apt-get.cc:3441
+#: cmdline/apt-get.cc:3475
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1392,33 +1467,33 @@
 "      Tiež pamätajte, že zamykanie je deaktivované, takže\n"
 "      sa nespoliehajte na to že to bude platiť v reálnej situácii!"
 
-#: cmdline/acqprogress.cc:57
+#: cmdline/acqprogress.cc:59
 msgid "Hit "
 msgstr "Už existuje "
 
-#: cmdline/acqprogress.cc:81
+#: cmdline/acqprogress.cc:83
 msgid "Get:"
 msgstr "Získava sa:"
 
-#: cmdline/acqprogress.cc:112
+#: cmdline/acqprogress.cc:114
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:116
+#: cmdline/acqprogress.cc:118
 msgid "Err "
 msgstr "Chyba "
 
-#: cmdline/acqprogress.cc:137
+#: cmdline/acqprogress.cc:139
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "%sB sa stiahlo za %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:227
+#: cmdline/acqprogress.cc:229
 #, c-format
 msgid " [Working]"
 msgstr " [Prebieha spracovanie]"
 
-#: cmdline/acqprogress.cc:283
+#: cmdline/acqprogress.cc:285
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1429,7 +1504,7 @@
 " „%s“\n"
 "do mechaniky „%s“ a stlačte Enter\n"
 
-#: cmdline/apt-internal-solver.cc:34
+#: cmdline/apt-internal-solver.cc:36
 msgid ""
 "Usage: apt-internal-resolver\n"
 "\n"
@@ -1445,46 +1520,46 @@
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:46
+#: cmdline/apt-mark.cc:49
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "%s nemožno označiť, pretože nie je nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:52
+#: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s už bol označený ako manuálne nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:54
+#: cmdline/apt-mark.cc:57
 #, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s už bol označený ako automaticky nainštalovaný.\n"
 
-#: cmdline/apt-mark.cc:169
+#: cmdline/apt-mark.cc:172
 #, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s bol už nastavený na podržanie.\n"
 
-#: cmdline/apt-mark.cc:171
+#: cmdline/apt-mark.cc:174
 #, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s bol už nastavený na nepodržanie.\n"
 
-#: cmdline/apt-mark.cc:185 cmdline/apt-mark.cc:207
+#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210
 #, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s je označený na podržanie.\n"
 
-#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:212
+#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215
 #, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Zrušené podržanie %s.\n"
 
-#: cmdline/apt-mark.cc:220
+#: cmdline/apt-mark.cc:223
 msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "Vykonanie dpkg zlyhalo. Ste root?"
 
-#: cmdline/apt-mark.cc:268
+#: cmdline/apt-mark.cc:271
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1505,12 +1580,31 @@
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
+"Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n"
+"\n"
+"apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n"
+"balíkov ako manuálne alebo automaticky nainštalované.\n"
+"Tiež dokáže označenia vypisovať.\n"
+"\n"
+"Príkazy:\n"
+"   auto - Označí uvedené balíky ako automaticky nainštalované\n"
+"   manual - Označí uvedené balíky ako manuálne nainštalované\n"
+"\n"
+"Voľby:\n"
+"  -h  Tento text pomocníka.\n"
+"  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
+"  -qq Nevypisovať nič, len chyby\n"
+"  -s  Nevykonávať zmeny. Iba vypísať, čo by sa urobilo.\n"
+"  -f  čítanie/zápis označenia auto/manálne v uvedenom súbore\n"
+"  -c=? Načítať tento konfiguračný súbor\n"
+"  -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n"
+"Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf(5)."
 
-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Neznámy záznam o balíku!"
 
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apturl.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apturl.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/apturl.po	2012-01-02 17:51:08.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/apturl.po	2012-02-23 06:55:55.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../apturl-gtk:50 ../apturl-kde:53
 msgid "User requested interrupt."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/aspell.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/aspell.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/aspell.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/aspell.po	2012-02-23 06:55:26.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:08+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:27+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: SLOVAKIA\n"
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/avahi.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/avahi.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/avahi.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/avahi.po	2012-02-23 06:55:47.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:55+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../avahi-common/error.c:30
 msgid "OK"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bacula.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bacula.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bacula.po	2012-01-02 17:50:47.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bacula.po	2012-02-23 06:55:36.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: bacula\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-10-29 11:54+0200\n"
+"POT-Creation-Date: 2012-01-17 20:45+0100\n"
 "PO-Revision-Date: 2008-05-03 10:17+0000\n"
 "Last-Translator: salwator <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:32+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/dird/jobq.c:74
 #, c-format
@@ -48,7 +48,7 @@
 msgstr ""
 
 #: src/dird/jobq.c:220 src/dird/job.c:113 src/stored/dircmd.c:198
-#: src/stored/stored.c:531
+#: src/stored/stored.c:503
 #, c-format
 msgid "Unable to init job cond variable: ERR=%s\n"
 msgstr ""
@@ -93,7 +93,7 @@
 msgid "Continue? (yes/mod/no): "
 msgstr ""
 
-#: src/dird/ua_select.c:62 src/dird/ua_run.c:226
+#: src/dird/ua_select.c:62 src/dird/ua_run.c:232
 msgid "mod"
 msgstr ""
 
@@ -113,8 +113,8 @@
 msgid "The defined Storage resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:167 src/dird/ua_dotcmds.c:697 src/dird/ua_cmds.c:1000
-#: src/dird/ua_run.c:231 src/wx-console/wxbrestorepanel.cpp:339
+#: src/dird/ua_select.c:167 src/dird/ua_dotcmds.c:715 src/dird/ua_cmds.c:996
+#: src/dird/ua_run.c:237 src/wx-console/wxbrestorepanel.cpp:339
 #: src/wx-console/wxbrestorepanel.cpp:355
 #: src/wx-console/wxbrestorepanel.cpp:479
 #: src/wx-console/wxbrestorepanel.cpp:480
@@ -135,7 +135,7 @@
 msgid "The defined FileSet resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300 src/dird/ua_run.c:233
+#: src/dird/ua_select.c:190 src/dird/ua_restore.c:1300 src/dird/ua_run.c:239
 msgid "FileSet"
 msgstr ""
 
@@ -143,7 +143,7 @@
 msgid "Select FileSet resource"
 msgstr ""
 
-#: src/dird/ua_select.c:220 src/dird/ua_cmds.c:1987
+#: src/dird/ua_select.c:220 src/dird/ua_cmds.c:1983
 msgid "Could not find a Catalog resource\n"
 msgstr ""
 
@@ -170,7 +170,7 @@
 
 #: src/dird/ua_select.c:266 src/dird/ua_select.c:289 src/dird/ua_select.c:330
 #: src/dird/ua_select.c:1187 src/dird/dird_conf.c:650 src/dird/ua_prune.c:593
-#: src/dird/ua_run.c:232
+#: src/dird/ua_run.c:238
 msgid "Job"
 msgstr ""
 
@@ -195,8 +195,8 @@
 msgid "The defined Client resources are:\n"
 msgstr ""
 
-#: src/dird/ua_select.c:355 src/dird/ua_select.c:464 src/dird/ua_dotcmds.c:698
-#: src/dird/ua_cmds.c:1001 src/dird/ua_run.c:237
+#: src/dird/ua_select.c:355 src/dird/ua_select.c:464 src/dird/ua_dotcmds.c:716
+#: src/dird/ua_cmds.c:997 src/dird/ua_run.c:243
 #: src/wx-console/wxbrestorepanel.cpp:336
 #: src/wx-console/wxbrestorepanel.cpp:354
 #: src/wx-console/wxbrestorepanel.cpp:431
@@ -274,7 +274,7 @@
 msgstr ""
 
 #: src/dird/ua_select.c:553 src/dird/ua_select.c:667 src/dird/ua_update.c:615
-#: src/dird/ua_run.c:245 src/wx-console/wxbrestorepanel.cpp:338
+#: src/dird/ua_run.c:251 src/wx-console/wxbrestorepanel.cpp:338
 #: src/wx-console/wxbrestorepanel.cpp:527
 #: src/wx-console/wxbrestorepanel.cpp:537
 #: src/wx-console/wxbrestorepanel.cpp:1834
@@ -411,7 +411,7 @@
 msgid "Warning Job %s is not running. Continuing anyway ...\n"
 msgstr ""
 
-#: src/dird/ua_select.c:1141 src/dird/ua_cmds.c:697 src/dird/ua_cmds.c:743
+#: src/dird/ua_select.c:1141 src/dird/ua_cmds.c:693 src/dird/ua_cmds.c:739
 msgid "Unauthorized command from this console.\n"
 msgstr ""
 
@@ -453,7 +453,7 @@
 msgid "Confirm cancel (yes/no): "
 msgstr ""
 
-#: src/dird/ua_select.c:1209 src/dird/ua_cmds.c:738 src/dird/ua_cmds.c:1105
+#: src/dird/ua_select.c:1209 src/dird/ua_cmds.c:734 src/dird/ua_cmds.c:1101
 #, c-format
 msgid "Job \"%s\" not found.\n"
 msgstr ""
@@ -557,32 +557,32 @@
 msgid "Unimplemented verify level %d\n"
 msgstr ""
 
-#: src/dird/verify.c:424
+#: src/dird/verify.c:421
 msgid "Verify OK"
 msgstr ""
 
-#: src/dird/verify.c:428
+#: src/dird/verify.c:425
 msgid "*** Verify Error ***"
 msgstr ""
 
-#: src/dird/verify.c:432
+#: src/dird/verify.c:429
 msgid "Verify warnings"
 msgstr ""
 
-#: src/dird/verify.c:435
+#: src/dird/verify.c:432
 msgid "Verify Canceled"
 msgstr ""
 
-#: src/dird/verify.c:438
+#: src/dird/verify.c:435
 msgid "Verify Differences"
 msgstr ""
 
-#: src/dird/verify.c:443
+#: src/dird/verify.c:440
 #, c-format
 msgid "Inappropriate term code: %d %c\n"
 msgstr ""
 
-#: src/dird/verify.c:457
+#: src/dird/verify.c:454
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -605,7 +605,7 @@
 "\n"
 msgstr ""
 
-#: src/dird/verify.c:492
+#: src/dird/verify.c:489
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -626,91 +626,91 @@
 "\n"
 msgstr ""
 
-#: src/dird/verify.c:570
+#: src/dird/verify.c:567
 #, c-format
 msgid ""
 "bird<filed: bad attributes, expected 3 fields got %d\n"
 " mslen=%d msg=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:615
+#: src/dird/verify.c:612
 #, c-format
 msgid "New file: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:616
+#: src/dird/verify.c:613
 #, c-format
 msgid "File not in catalog: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:640
+#: src/dird/verify.c:637
 #, c-format
 msgid "      st_ino   differ. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:649
+#: src/dird/verify.c:646
 #, c-format
 msgid "      st_mode  differ. Cat: %x File: %x\n"
 msgstr ""
 
-#: src/dird/verify.c:657
+#: src/dird/verify.c:654
 #, c-format
 msgid "      st_nlink differ. Cat: %d File: %d\n"
 msgstr ""
 
-#: src/dird/verify.c:665
+#: src/dird/verify.c:662
 #, c-format
 msgid "      st_uid   differ. Cat: %u File: %u\n"
 msgstr ""
 
-#: src/dird/verify.c:673
+#: src/dird/verify.c:670
 #, c-format
 msgid "      st_gid   differ. Cat: %u File: %u\n"
 msgstr ""
 
-#: src/dird/verify.c:681
+#: src/dird/verify.c:678
 #, c-format
 msgid "      st_size  differ. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:690
+#: src/dird/verify.c:687
 msgid "      st_atime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:697
+#: src/dird/verify.c:694
 msgid "      st_mtime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:704
+#: src/dird/verify.c:701
 msgid "      st_ctime differs\n"
 msgstr ""
 
-#: src/dird/verify.c:711
+#: src/dird/verify.c:708
 #, c-format
 msgid "      st_size  decrease. Cat: %s File: %s\n"
 msgstr ""
 
-#: src/dird/verify.c:741
+#: src/dird/verify.c:738
 #, c-format
 msgid "MD5/SHA1 index %d not same as attributes %d\n"
 msgstr ""
 
-#: src/dird/verify.c:749
+#: src/dird/verify.c:746
 #, c-format
 msgid "      %s differs. File=%s Cat=%s\n"
 msgstr ""
 
-#: src/dird/verify.c:760
+#: src/dird/verify.c:757
 #, c-format
 msgid "bdird<filed: bad attributes from filed n=%d : %s\n"
 msgstr ""
 
-#: src/dird/verify.c:799
+#: src/dird/verify.c:796
 #, c-format
 msgid "The following files are in the Catalog but not on %s:\n"
 msgstr ""
 
-#: src/dird/verify.c:814 src/tools/testfind.c:417
+#: src/dird/verify.c:811 src/tools/testfind.c:420
 #, c-format
 msgid "File: %s\n"
 msgstr ""
@@ -720,8 +720,8 @@
 msgid "Start Admin JobId %d, Job=%s\n"
 msgstr ""
 
-#: src/dird/admin.c:92 src/dird/vbackup.c:304 src/dird/migrate.c:1216
-#: src/dird/backup.c:620
+#: src/dird/admin.c:92 src/dird/vbackup.c:304 src/dird/migrate.c:1226
+#: src/dird/backup.c:618
 #, c-format
 msgid "Error getting Job record for Job report: ERR=%s"
 msgstr ""
@@ -738,7 +738,7 @@
 msgid "Admin Canceled"
 msgstr ""
 
-#: src/dird/admin.c:112 src/dird/vbackup.c:354 src/dird/backup.c:676
+#: src/dird/admin.c:112 src/dird/vbackup.c:354 src/dird/backup.c:674
 #: src/dird/restore.c:591
 #, c-format
 msgid "Inappropriate term code: %c\n"
@@ -748,7 +748,7 @@
 msgid "Bacula "
 msgstr ""
 
-#: src/dird/dird.c:111
+#: src/dird/dird.c:112
 #, c-format
 msgid ""
 "\n"
@@ -770,66 +770,66 @@
 "\n"
 msgstr ""
 
-#: src/dird/dird.c:257 src/stored/stored.c:243 src/console/console.c:1109
-#: src/filed/filed.c:217 src/qt-console/main.cpp:156
+#: src/dird/dird.c:258 src/stored/stored.c:227 src/console/console.c:1109
+#: src/filed/filed.c:218 src/qt-console/main.cpp:165
 msgid "Cryptography library initialization failed.\n"
 msgstr ""
 
-#: src/dird/dird.c:261 src/dird/dird.c:289 src/dird/dird.c:535
-#: src/dird/dird.c:538 src/stored/stored.c:247 src/console/console.c:1113
-#: src/filed/filed.c:222 src/qt-console/main.cpp:160
+#: src/dird/dird.c:262 src/dird/dird.c:292 src/dird/dird.c:538
+#: src/dird/dird.c:541 src/stored/stored.c:231 src/console/console.c:1113
+#: src/filed/filed.c:223 src/qt-console/main.cpp:169
 #, c-format
 msgid "Please correct configuration file: %s\n"
 msgstr ""
 
-#: src/dird/dird.c:521
+#: src/dird/dird.c:524
 msgid "Too many open reload requests. Request ignored.\n"
 msgstr ""
 
-#: src/dird/dird.c:536
+#: src/dird/dird.c:539
 msgid "Out of reload table entries. Giving up.\n"
 msgstr ""
 
-#: src/dird/dird.c:539
+#: src/dird/dird.c:542
 msgid "Resetting previous configuration.\n"
 msgstr ""
 
-#: src/dird/dird.c:603
+#: src/dird/dird.c:606
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't know who I am :-(\n"
 msgstr ""
 
-#: src/dird/dird.c:611 src/filed/filed.c:348
+#: src/dird/dird.c:614 src/filed/filed.c:350
 #, c-format
 msgid "No Messages resource defined in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:616
+#: src/dird/dird.c:619
 #, c-format
 msgid "Only one Director resource permitted in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:625 src/dird/dird.c:831 src/dird/dird.c:886
-#: src/dird/dird.c:1053 src/stored/stored.c:382 src/console/console.c:1296
-#: src/console/console.c:1326 src/filed/filed.c:355 src/filed/filed.c:514
+#: src/dird/dird.c:628 src/dird/dird.c:834 src/dird/dird.c:889
+#: src/dird/dird.c:1056 src/stored/stored.c:354 src/console/console.c:1296
+#: src/console/console.c:1326 src/filed/filed.c:357 src/filed/filed.c:516
 #: src/wx-console/console_thread.cpp:118 src/wx-console/console_thread.cpp:144
-#: src/qt-console/main.cpp:212 src/qt-console/main.cpp:242
+#: src/qt-console/main.cpp:224 src/qt-console/main.cpp:254
 msgid "TLS required but not configured in Bacula.\n"
 msgstr ""
 
-#: src/dird/dird.c:633 src/stored/stored.c:438 src/filed/filed.c:524
+#: src/dird/dird.c:636 src/stored/stored.c:410 src/filed/filed.c:526
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:639 src/stored/stored.c:444 src/filed/filed.c:530
+#: src/dird/dird.c:642 src/stored/stored.c:416 src/filed/filed.c:532
 #, c-format
 msgid "\"TLS Key\" file not defined for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:646 src/stored/stored.c:450 src/filed/filed.c:536
+#: src/dird/dird.c:649 src/stored/stored.c:422 src/filed/filed.c:538
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -837,46 +837,46 @@
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/dird/dird.c:665 src/stored/stored.c:469 src/filed/filed.c:555
+#: src/dird/dird.c:668 src/stored/stored.c:441 src/filed/filed.c:557
 #, c-format
 msgid "Failed to initialize TLS context for Director \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:673
+#: src/dird/dird.c:676
 #, c-format
 msgid "No Job records defined in %s\n"
 msgstr ""
 
-#: src/dird/dird.c:731 src/dird/dird.c:744
+#: src/dird/dird.c:734 src/dird/dird.c:747
 #, c-format
 msgid "Hey something is wrong. p=0x%lu\n"
 msgstr ""
 
-#: src/dird/dird.c:805
+#: src/dird/dird.c:808
 #, c-format
 msgid "\"%s\" directive in Job \"%s\" resource is required, but not found.\n"
 msgstr ""
 
-#: src/dird/dird.c:812
+#: src/dird/dird.c:815
 msgid "Too many items in Job resource\n"
 msgstr ""
 
-#: src/dird/dird.c:816
+#: src/dird/dird.c:819
 #, c-format
 msgid "No storage specified in Job \"%s\" nor in Pool.\n"
 msgstr ""
 
-#: src/dird/dird.c:840
+#: src/dird/dird.c:843
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:846
+#: src/dird/dird.c:849
 #, c-format
 msgid "\"TLS Key\" file not defined for Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:853
+#: src/dird/dird.c:856
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -884,46 +884,46 @@
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/dird/dird.c:870 src/dird/dird.c:910 src/filed/filed.c:380
+#: src/dird/dird.c:873 src/dird/dird.c:913 src/filed/filed.c:382
 #, c-format
 msgid "Failed to initialize TLS context for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:893
+#: src/dird/dird.c:896
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:950 src/dird/dird.c:952
+#: src/dird/dird.c:953 src/dird/dird.c:955
 #, c-format
 msgid "Could not open Catalog \"%s\", database \"%s\".\n"
 msgstr ""
 
-#: src/dird/dird.c:955 src/tools/cats_test.c:377
+#: src/dird/dird.c:958 src/tools/cats_test.c:377
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: src/dird/dird.c:1034
+#: src/dird/dird.c:1037
 #, c-format
 msgid "Could not create storage record for %s\n"
 msgstr ""
 
-#: src/dird/dird.c:1042
+#: src/dird/dird.c:1045
 #, c-format
 msgid "Could not update storage record for %s\n"
 msgstr ""
 
-#: src/dird/dird.c:1061
+#: src/dird/dird.c:1064
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/dird/dird.c:1077 src/stored/stored.c:422
+#: src/dird/dird.c:1080 src/stored/stored.c:394
 #, c-format
 msgid "Failed to initialize TLS context for Storage \"%s\" in %s.\n"
 msgstr ""
@@ -942,18 +942,18 @@
 msgid "Old style Include/Exclude not supported\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:393 src/dird/inc_conf.c:742 src/dird/dird_conf.c:1994
+#: src/dird/inc_conf.c:393 src/dird/inc_conf.c:739 src/dird/dird_conf.c:1993
 #, c-format
 msgid "Expecting keyword, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:401 src/dird/inc_conf.c:748 src/dird/dird_conf.c:2000
+#: src/dird/inc_conf.c:401 src/dird/inc_conf.c:745 src/dird/dird_conf.c:1999
 #: src/lib/parse_conf.c:976
 #, c-format
 msgid "expected an equals, got: %s"
 msgstr ""
 
-#: src/dird/inc_conf.c:411 src/dird/inc_conf.c:757 src/dird/dird_conf.c:2011
+#: src/dird/inc_conf.c:411 src/dird/inc_conf.c:754 src/dird/dird_conf.c:2010
 #, c-format
 msgid "Keyword %s not permitted in this resource"
 msgstr ""
@@ -968,55 +968,55 @@
 msgid "Expected a regex string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:561
+#: src/dird/inc_conf.c:559
 #, c-format
 msgid "Expected a wild-card string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:584
+#: src/dird/inc_conf.c:582
 #, c-format
 msgid "Expected an fstype string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:596
+#: src/dird/inc_conf.c:593
 msgid "ExcludeDirContaining directive not permitted in Exclude.\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:623
+#: src/dird/inc_conf.c:620
 #, c-format
 msgid "Expected an drivetype string, got: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:647 src/dird/inc_conf.c:690
+#: src/dird/inc_conf.c:644 src/dird/inc_conf.c:687
 #, c-format
 msgid "Backslash found. Use forward slashes or quote the string.: %s\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:662 src/dird/inc_conf.c:705
+#: src/dird/inc_conf.c:659 src/dird/inc_conf.c:702
 #, c-format
 msgid "Expected a filename, got: %s"
 msgstr ""
 
-#: src/dird/inc_conf.c:679
+#: src/dird/inc_conf.c:676
 msgid "Plugin directive not permitted in Exclude\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:722
+#: src/dird/inc_conf.c:719
 msgid "Options section not permitted in Exclude\n"
 msgstr ""
 
-#: src/dird/inc_conf.c:727 src/dird/dird_conf.c:1980
+#: src/dird/inc_conf.c:724 src/dird/dird_conf.c:1979
 #, c-format
 msgid "Expecting open brace. Got %s"
 msgstr ""
 
-#: src/dird/inc_conf.c:782
+#: src/dird/inc_conf.c:779
 #, c-format
 msgid "Expected a FileSet keyword, got: %s"
 msgstr ""
 
-#: src/dird/ua_query.c:73 src/findlib/create_file.c:291
-#: src/findlib/create_file.c:394
+#: src/dird/ua_query.c:73 src/findlib/create_file.c:288
+#: src/findlib/create_file.c:391
 #, c-format
 msgid "Could not open %s: ERR=%s\n"
 msgstr ""
@@ -1191,8 +1191,8 @@
 msgid "Connecting to Storage daemon %s at %s:%d ...\n"
 msgstr ""
 
-#: src/dird/ua_purge.c:559 src/dird/ua_dotcmds.c:588 src/dird/ua_cmds.c:776
-#: src/dird/ua_cmds.c:1535 src/dird/ua_label.c:762 src/dird/job.c:448
+#: src/dird/ua_purge.c:559 src/dird/ua_dotcmds.c:606 src/dird/ua_cmds.c:772
+#: src/dird/ua_cmds.c:1531 src/dird/ua_label.c:762 src/dird/job.c:448
 msgid "Failed to connect to Storage daemon.\n"
 msgstr ""
 
@@ -1240,7 +1240,7 @@
 msgid "Pool resource"
 msgstr ""
 
-#: src/dird/vbackup.c:116 src/dird/migrate.c:284
+#: src/dird/vbackup.c:116 src/dird/migrate.c:285
 msgid "Job Pool's NextPool resource"
 msgstr ""
 
@@ -1267,30 +1267,30 @@
 msgid "Could not get or create the FileSet record.\n"
 msgstr ""
 
-#: src/dird/vbackup.c:311 src/dird/backup.c:627
+#: src/dird/vbackup.c:311 src/dird/backup.c:625
 #, c-format
 msgid "Error getting Client record for Job report: ERR=%s"
 msgstr ""
 
-#: src/dird/vbackup.c:317 src/dird/migrate.c:1246 src/dird/backup.c:633
+#: src/dird/vbackup.c:317 src/dird/migrate.c:1256 src/dird/backup.c:631
 #, c-format
 msgid "Error getting Media record for Volume \"%s\": ERR=%s"
 msgstr ""
 
-#: src/dird/vbackup.c:327 src/dird/backup.c:643 src/dird/backup.c:652
+#: src/dird/vbackup.c:327 src/dird/backup.c:641 src/dird/backup.c:650
 #: src/stored/bscan.c:1210
 msgid "Backup OK -- with warnings"
 msgstr "Zálohovanie v poriadku -- s varovaniami"
 
-#: src/dird/vbackup.c:329 src/dird/backup.c:645 src/stored/bscan.c:1207
+#: src/dird/vbackup.c:329 src/dird/backup.c:643 src/stored/bscan.c:1207
 msgid "Backup OK"
 msgstr "Zálohovanie v poriadku"
 
-#: src/dird/vbackup.c:334 src/dird/backup.c:656 src/stored/bscan.c:1214
+#: src/dird/vbackup.c:334 src/dird/backup.c:654 src/stored/bscan.c:1214
 msgid "*** Backup Error ***"
 msgstr "*** Chyba zálohovania ***"
 
-#: src/dird/vbackup.c:344 src/dird/backup.c:666 src/stored/bscan.c:1217
+#: src/dird/vbackup.c:344 src/dird/backup.c:664 src/stored/bscan.c:1217
 msgid "Backup Canceled"
 msgstr "Zálohovanie zrušené"
 
@@ -1431,97 +1431,97 @@
 msgid "Message too long to display.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:153 src/dird/ua_cmds.c:236
+#: src/dird/ua_dotcmds.c:155 src/dird/ua_cmds.c:236
 #, c-format
 msgid "Can't use %s command in a runscript"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:173
+#: src/dird/ua_dotcmds.c:175
 msgid ": is an invalid command.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:522 src/dird/ua_restore.c:780
+#: src/dird/ua_dotcmds.c:540 src/dird/ua_restore.c:780
 #: src/dird/ua_restore.c:823
 #, c-format
 msgid "Unable to get Job record for JobId=%s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:582 src/dird/ua_cmds.c:770 src/dird/ua_cmds.c:1524
+#: src/dird/ua_dotcmds.c:600 src/dird/ua_cmds.c:766 src/dird/ua_cmds.c:1520
 #: src/dird/ua_status.c:352 src/dird/job.c:147 src/dird/job.c:153
 #: src/dird/job.c:1157 src/dird/job.c:1161
 msgid "unknown source"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:585 src/dird/ua_cmds.c:773 src/dird/ua_status.c:355
+#: src/dird/ua_dotcmds.c:603 src/dird/ua_cmds.c:769 src/dird/ua_status.c:355
 #, c-format
 msgid "Connecting to Storage daemon %s at %s:%d\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:591 src/dird/ua_cmds.c:779 src/dird/ua_status.c:366
+#: src/dird/ua_dotcmds.c:609 src/dird/ua_cmds.c:775 src/dird/ua_status.c:366
 msgid "Connected to storage daemon\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:611 src/dird/ua_cmds.c:808 src/dird/ua_cmds.c:1206
+#: src/dird/ua_dotcmds.c:629 src/dird/ua_cmds.c:804 src/dird/ua_cmds.c:1202
 #: src/dird/ua_status.c:397
 #, c-format
 msgid "Connecting to Client %s at %s:%d\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:614 src/dird/ua_cmds.c:811 src/dird/ua_cmds.c:1209
+#: src/dird/ua_dotcmds.c:632 src/dird/ua_cmds.c:807 src/dird/ua_cmds.c:1205
 msgid "Failed to connect to Client.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:657 src/dird/ua_dotcmds.c:750
+#: src/dird/ua_dotcmds.c:675 src/dird/ua_dotcmds.c:769
 #, c-format
 msgid "Unknown command: %s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:695 src/dird/ua_cmds.c:998
+#: src/dird/ua_dotcmds.c:713 src/dird/ua_cmds.c:994
 msgid "Available daemons are: \n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:696 src/dird/ua_cmds.c:999
+#: src/dird/ua_dotcmds.c:714 src/dird/ua_cmds.c:995
 msgid "Director"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:699
+#: src/dird/ua_dotcmds.c:717
 msgid "Select daemon type to make die"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:725
+#: src/dird/ua_dotcmds.c:743
 msgid "The Director will generate a deadlock.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:729
+#: src/dird/ua_dotcmds.c:747
 msgid "The Director will segment fault.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:917
+#: src/dird/ua_dotcmds.c:936
 msgid "Access to specified Client or FileSet not allowed.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:922 src/dird/ua_dotcmds.c:966
+#: src/dird/ua_dotcmds.c:941 src/dird/ua_dotcmds.c:985
 #: src/dird/ua_restore.c:941 src/dird/ua_restore.c:969
 #: src/dird/ua_restore.c:990
 #, c-format
 msgid "Query failed: %s. ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:961
+#: src/dird/ua_dotcmds.c:980
 msgid "query keyword not found.\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:988
+#: src/dird/ua_dotcmds.c:1007
 #, c-format
 msgid "List MediaType failed: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:1002
+#: src/dird/ua_dotcmds.c:1021
 #, c-format
 msgid "List Media failed: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_dotcmds.c:1016
+#: src/dird/ua_dotcmds.c:1035
 #, c-format
 msgid "List Location failed: ERR=%s\n"
 msgstr ""
@@ -1795,7 +1795,7 @@
 msgid "%s: is an invalid command.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:289
+#: src/dird/ua_cmds.c:288
 msgid ""
 "You probably don't want to be using this command since it\n"
 "creates database records without labeling the Volumes.\n"
@@ -1803,205 +1803,205 @@
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:308
+#: src/dird/ua_cmds.c:307
 #, c-format
 msgid "Pool already has maximum volumes=%d\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:309
+#: src/dird/ua_cmds.c:308
 msgid "Enter new maximum (zero for unlimited): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:329
+#: src/dird/ua_cmds.c:328
 #, c-format
 msgid "Enter number of Volumes to create. 0=>fixed name. Max=%d: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:335
+#: src/dird/ua_cmds.c:334
 #, c-format
 msgid "The number must be between 0 and %d\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:343
+#: src/dird/ua_cmds.c:342
 msgid "Enter Volume name: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:347
+#: src/dird/ua_cmds.c:346
 msgid "Enter base volume name: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:356 src/dird/ua_label.c:648
+#: src/dird/ua_cmds.c:355 src/dird/ua_label.c:648
 msgid "Volume name too long.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:360 src/dird/ua_label.c:654 src/lib/edit.c:501
+#: src/dird/ua_cmds.c:359 src/dird/ua_label.c:654 src/lib/edit.c:501
 msgid "Volume name must be at least one character long.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:371
+#: src/dird/ua_cmds.c:370
 msgid "Enter the starting number: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:376
+#: src/dird/ua_cmds.c:375
 msgid "Start number must be greater than zero.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:387
+#: src/dird/ua_cmds.c:386
 msgid "Enter slot (0 for none): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:391
+#: src/dird/ua_cmds.c:390
 msgid "InChanger? yes/no: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:419
+#: src/dird/ua_cmds.c:415
 #, c-format
 msgid "%d Volumes created in pool %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:435 src/dird/ua_cmds.c:1037
+#: src/dird/ua_cmds.c:431 src/dird/ua_cmds.c:1033
 msgid "Turn on or off? "
 msgstr ""
 
-#: src/dird/ua_cmds.c:549
+#: src/dird/ua_cmds.c:545
 #, c-format
 msgid ""
 "Can't set %s RecyclePool to %s, %s is not in database.\n"
 "Try to update it with 'update pool=%s'\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:567
+#: src/dird/ua_cmds.c:563
 #, c-format
 msgid ""
 "Can't set %s ScratchPool to %s, %s is not in database.\n"
 "Try to update it with 'update pool=%s'\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:636
+#: src/dird/ua_cmds.c:632
 #, c-format
 msgid ""
 "Error: Pool %s already exists.\n"
 "Use update to change it.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:647
+#: src/dird/ua_cmds.c:643
 #, c-format
 msgid "Pool %s created.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:677
+#: src/dird/ua_cmds.c:673
 msgid "Python interpreter restarted.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:680 src/dird/ua_cmds.c:1335
+#: src/dird/ua_cmds.c:676 src/dird/ua_cmds.c:1331
 msgid "Nothing done.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:704 src/dird/ua_cmds.c:1088 src/dird/ua_run.c:1562
+#: src/dird/ua_cmds.c:700 src/dird/ua_cmds.c:1084 src/dird/ua_run.c:1582
 #, c-format
 msgid "Client \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:713
+#: src/dird/ua_cmds.c:709
 #, c-format
 msgid "Client \"%s\" address set to %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:747
+#: src/dird/ua_cmds.c:743
 #, c-format
 msgid "Job \"%s\" %sabled\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:925
+#: src/dird/ua_cmds.c:921
 msgid "Enter new debug level: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1002
+#: src/dird/ua_cmds.c:998
 msgid "All"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1003
+#: src/dird/ua_cmds.c:999
 msgid "Select daemon type to set debug level"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1092 src/dird/ua_cmds.c:1930
+#: src/dird/ua_cmds.c:1088 src/dird/ua_cmds.c:1926
 #, c-format
 msgid "No authorization for Client \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1097
+#: src/dird/ua_cmds.c:1093
 msgid "Client name missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1109 src/dird/ua_cmds.c:1170 src/dird/ua_cmds.c:1952
+#: src/dird/ua_cmds.c:1105 src/dird/ua_cmds.c:1166 src/dird/ua_cmds.c:1948
 #, c-format
 msgid "No authorization for Job \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1114
+#: src/dird/ua_cmds.c:1110
 msgid "Job name missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1123
+#: src/dird/ua_cmds.c:1119
 #, c-format
 msgid "Fileset \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1127
+#: src/dird/ua_cmds.c:1123
 #, c-format
 msgid "No authorization for FileSet \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1132
+#: src/dird/ua_cmds.c:1128
 msgid "Fileset name missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1143 src/dird/ua_run.c:557
+#: src/dird/ua_cmds.c:1139 src/dird/ua_run.c:563
 #, c-format
 msgid "Level \"%s\" not valid.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1147
+#: src/dird/ua_cmds.c:1143
 msgid "Level value missing.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1153
+#: src/dird/ua_cmds.c:1149
 msgid "Invalid value for accurate. It must be yes or no.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1166
+#: src/dird/ua_cmds.c:1162
 msgid "No job specified.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1214
+#: src/dird/ua_cmds.c:1210
 msgid "Error sending include list.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1219
+#: src/dird/ua_cmds.c:1215
 msgid "Error sending exclude list.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1321
+#: src/dird/ua_cmds.c:1317
 msgid ""
 "In general it is not a good idea to delete either a\n"
 "Pool or a Volume since they may contain data.\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1324
+#: src/dird/ua_cmds.c:1320
 msgid "Choose catalog item to delete"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1388
+#: src/dird/ua_cmds.c:1384
 msgid "Enter JobId to delete: "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1427
+#: src/dird/ua_cmds.c:1423
 #, c-format
 msgid "Job %s and associated records deleted from the catalog.\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1442
+#: src/dird/ua_cmds.c:1438
 #, c-format
 msgid ""
 "\n"
@@ -2009,44 +2009,44 @@
 "and all Jobs saved on that volume from the Catalog\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1449
+#: src/dird/ua_cmds.c:1445
 #, c-format
 msgid "Are you sure you want to delete Volume \"%s\"? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1462
+#: src/dird/ua_cmds.c:1458
 msgid "Can't list jobs on this volume\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1487
+#: src/dird/ua_cmds.c:1483
 #, c-format
 msgid "Are you sure you want to delete Pool \"%s\"? (yes/no): "
 msgstr ""
 
-#: src/dird/ua_cmds.c:1602
+#: src/dird/ua_cmds.c:1598
 #, c-format
 msgid "Using Catalog name=%s DB=%s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1670
+#: src/dird/ua_cmds.c:1666
 msgid "ERR: Can't open db\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1717
+#: src/dird/ua_cmds.c:1713
 msgid "Wait on mount timed out\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1727
+#: src/dird/ua_cmds.c:1723
 msgid "ERR: Job was not found\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1803
+#: src/dird/ua_cmds.c:1799
 msgid ""
 "  Command       Description\n"
 "  =======       ===========\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1807
+#: src/dird/ua_cmds.c:1803
 #, c-format
 msgid ""
 "  %-13s %s\n"
@@ -2055,12 +2055,12 @@
 "\t%s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1812
+#: src/dird/ua_cmds.c:1808
 #, c-format
 msgid "  %-13s %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1816
+#: src/dird/ua_cmds.c:1812
 #, c-format
 msgid ""
 "\n"
@@ -2068,29 +2068,29 @@
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1818
+#: src/dird/ua_cmds.c:1814
 msgid ""
 "\n"
 "When at a prompt, entering a period cancels the command.\n"
 "\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1854 src/filed/status.c:85
+#: src/dird/ua_cmds.c:1850 src/filed/status.c:85
 #, c-format
 msgid "%s Version: %s (%s) %s %s %s %s\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:1913 src/dird/ua_cmds.c:1940 src/dird/ua_cmds.c:1962
+#: src/dird/ua_cmds.c:1909 src/dird/ua_cmds.c:1936 src/dird/ua_cmds.c:1958
 #, c-format
 msgid "No authorization for Catalog \"%s\"\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:2007
+#: src/dird/ua_cmds.c:2003
 #, c-format
 msgid "Could not open catalog database \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_cmds.c:2017
+#: src/dird/ua_cmds.c:2013
 #, c-format
 msgid "Using Catalog \"%s\"\n"
 msgstr ""
@@ -2240,7 +2240,7 @@
 msgid "%d total files; %d marked to be restored; %s bytes.\n"
 msgstr ""
 
-#: src/dird/ua_tree.c:775 src/stored/btape.c:2943
+#: src/dird/ua_tree.c:775 src/stored/btape.c:2947
 #, c-format
 msgid ""
 "  Command    Description\n"
@@ -2643,13 +2643,13 @@
 msgid "Cannot find Console resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1438 src/stored/stored_conf.c:608
+#: src/dird/dird_conf.c:1438 src/stored/stored_conf.c:611
 #: src/filed/filed_conf.c:381
 #, c-format
 msgid "Cannot find Director resource %s\n"
 msgstr ""
 
-#: src/dird/dird_conf.c:1445 src/stored/stored_conf.c:614
+#: src/dird/dird_conf.c:1445 src/stored/stored_conf.c:617
 #, c-format
 msgid "Cannot find Storage resource %s\n"
 msgstr ""
@@ -2705,33 +2705,33 @@
 msgid "Expected one of: %s, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1704
+#: src/dird/dird_conf.c:1703
 #, c-format
 msgid "Expected a Migration Job Type keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1730
+#: src/dird/dird_conf.c:1729
 #, c-format
 msgid "Expected a Job Type keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1754
+#: src/dird/dird_conf.c:1753
 #, c-format
 msgid "Expected a Job Level keyword, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1774
+#: src/dird/dird_conf.c:1773
 #, c-format
 msgid "Expected a Restore replacement option, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1824 src/dird/dird_conf.c:1940
+#: src/dird/dird_conf.c:1823 src/dird/dird_conf.c:1939
 #: src/lib/parse_conf.c:761 src/lib/parse_conf.c:777
 #, c-format
 msgid "Expect %s, got: %s"
 msgstr ""
 
-#: src/dird/dird_conf.c:1846 src/lib/parse_conf.c:478
+#: src/dird/dird_conf.c:1845 src/lib/parse_conf.c:478
 #, c-format
 msgid "Could not find config Resource %s referenced on line %d : %s\n"
 msgstr ""
@@ -3136,97 +3136,97 @@
 msgid "FD gave bad response to JobId command: %s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:183 src/dird/fd_cmds.c:268
+#: src/dird/fd_cmds.c:184 src/dird/fd_cmds.c:272
 msgid ", since="
 msgstr ""
 
-#: src/dird/fd_cmds.c:246
+#: src/dird/fd_cmds.c:249
 msgid ""
 "No prior or suitable Full backup found in catalog. Doing FULL backup.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:247 src/dird/fd_cmds.c:253 src/dird/fd_cmds.c:261
+#: src/dird/fd_cmds.c:250 src/dird/fd_cmds.c:256 src/dird/fd_cmds.c:265
 #, c-format
 msgid " (upgraded from %s)"
 msgstr ""
 
-#: src/dird/fd_cmds.c:252
+#: src/dird/fd_cmds.c:255
 msgid ""
 "No prior or suitable Differential backup found in catalog. Doing "
 "Differential backup.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:259
+#: src/dird/fd_cmds.c:263
 #, c-format
 msgid "Prior failed job found in catalog. Upgrading to %s.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:322
+#: src/dird/fd_cmds.c:328
 #, c-format
 msgid "Unimplemented backup level %d %c\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:395
+#: src/dird/fd_cmds.c:401
 msgid ""
 "FD compression disabled for this Job because AllowCompress=No in Storage "
 "resource.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:494 src/filed/job.c:822
+#: src/dird/fd_cmds.c:500 src/filed/job.c:858
 #, c-format
 msgid "Cannot run program: %s. ERR=%s\n"
 msgstr "Nemôžem spustiť program: %s. ERR=%s\n"
 
-#: src/dird/fd_cmds.c:505 src/dird/fd_cmds.c:530 src/dird/fd_cmds.c:544
+#: src/dird/fd_cmds.c:511 src/dird/fd_cmds.c:536 src/dird/fd_cmds.c:550
 msgid ">filed: write error on socket\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:511
+#: src/dird/fd_cmds.c:517
 #, c-format
 msgid "Error running program: %s. ERR=%s\n"
 msgstr "Chyba pri spustení programu: %s. ERR=%s\n"
 
-#: src/dird/fd_cmds.c:520
+#: src/dird/fd_cmds.c:526
 #, c-format
 msgid "Cannot open included file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:666
+#: src/dird/fd_cmds.c:672
 #, c-format
 msgid "Client \"%s\" RunScript failed.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:689
+#: src/dird/fd_cmds.c:695
 #, c-format
 msgid ""
 "Client \"%s\" may not be used to restore this job. Please upgrade your "
 "client.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:755
+#: src/dird/fd_cmds.c:770
 msgid "RestoreObject failed.\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:791
+#: src/dird/fd_cmds.c:806
 #, c-format
 msgid ""
 "<filed: bad attributes, expected 3 fields got %d\n"
 "msglen=%d msg=%s\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:810 src/dird/fd_cmds.c:869 src/dird/catreq.c:443
+#: src/dird/fd_cmds.c:825 src/dird/fd_cmds.c:884 src/dird/catreq.c:443
 #: src/cats/sqlite.c:374 src/cats/ingres.c:451 src/cats/postgresql.c:441
 #: src/cats/dbi.c:552 src/cats/mysql.c:358
 #, c-format
 msgid "Attribute create error. %s"
 msgstr ""
 
-#: src/dird/fd_cmds.c:847
+#: src/dird/fd_cmds.c:862
 #, c-format
 msgid "%s index %d not same as attributes %d\n"
 msgstr ""
 
-#: src/dird/fd_cmds.c:861
+#: src/dird/fd_cmds.c:876
 #, c-format
 msgid "<filed: Network error getting attributes. ERR=%s\n"
 msgstr ""
@@ -3259,12 +3259,12 @@
 msgid "Slot too large.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:187 src/dird/ua_label.c:352 src/dird/ua_label.c:1215
-#: src/dird/ua_run.c:1537
+#: src/dird/ua_label.c:187 src/dird/ua_label.c:352 src/dird/ua_label.c:1214
+#: src/dird/ua_run.c:1557
 msgid "command line"
 msgstr ""
 
-#: src/dird/ua_label.c:205 src/dird/ua_label.c:516 src/dird/ua_label.c:1222
+#: src/dird/ua_label.c:205 src/dird/ua_label.c:516 src/dird/ua_label.c:1221
 msgid "No slots in changer to scan.\n"
 msgstr ""
 
@@ -3272,7 +3272,7 @@
 msgid "No Volumes found to label, or no barcodes.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:227 src/dird/ua_label.c:1243
+#: src/dird/ua_label.c:227 src/dird/ua_label.c:1242
 #, c-format
 msgid "Slot %d greater than max %d ignored.\n"
 msgstr ""
@@ -3421,17 +3421,17 @@
 msgid "Pool \"%s\" resource not found for volume \"%s\"!\n"
 msgstr ""
 
-#: src/dird/ua_label.c:1234
+#: src/dird/ua_label.c:1233
 msgid "No Volumes found, or no barcodes.\n"
 msgstr ""
 
-#: src/dird/ua_label.c:1237
+#: src/dird/ua_label.c:1236
 msgid ""
 " Slot |   Volume Name    |   Status  |     Media Type       |      Pool      "
 "    |\n"
 msgstr ""
 
-#: src/dird/ua_label.c:1238
+#: src/dird/ua_label.c:1237
 msgid ""
 "------+------------------+-----------+----------------------+----------------"
 "----|\n"
@@ -3462,100 +3462,105 @@
 msgid "run override"
 msgstr ""
 
-#: src/dird/scheduler.c:411
+#: src/dird/scheduler.c:413
 msgid "Inserted job"
 msgstr ""
 
-#: src/dird/scheduler.c:419
+#: src/dird/scheduler.c:421
 msgid "Appended job"
 msgstr ""
 
-#: src/dird/scheduler.c:423
+#: src/dird/scheduler.c:425
 msgid "Run queue"
 msgstr ""
 
-#: src/dird/run_conf.c:206
+#: src/dird/run_conf.c:208
 #, c-format
 msgid "Expected an equals, got: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:219 src/dird/run_conf.c:231
+#: src/dird/run_conf.c:221 src/dird/run_conf.c:233 src/dird/run_conf.c:327
 #, c-format
 msgid "Expect a YES or NO, got: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:245
+#: src/dird/run_conf.c:247
 #, c-format
 msgid "Job level field: %s not found in run record"
 msgstr ""
 
-#: src/dird/run_conf.c:263
+#: src/dird/run_conf.c:265
 #, c-format
 msgid "Could not find specified Pool Resource: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:288
+#: src/dird/run_conf.c:290
 #, c-format
 msgid "Could not find specified Storage Resource: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:300
+#: src/dird/run_conf.c:302
 #, c-format
 msgid "Could not find specified Messages Resource: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:308
+#: src/dird/run_conf.c:312 src/lib/parse_conf.c:736 src/lib/parse_conf.c:742
+#, c-format
+msgid "expected a time period, got: %s"
+msgstr ""
+
+#: src/dird/run_conf.c:331
 #, c-format
 msgid "Expected a keyword name, got: %s"
 msgstr ""
 
-#: src/dird/run_conf.c:347
+#: src/dird/run_conf.c:370
 msgid "Day number out of range (1-31)"
 msgstr "Číslo dňa mimo rozsah (1-31)"
 
-#: src/dird/run_conf.c:364 src/dird/run_conf.c:519
+#: src/dird/run_conf.c:387 src/dird/run_conf.c:542
 msgid "Week number out of range (0-53)"
 msgstr "Číslo týždňa mimo rozsah (0-53)"
 
-#: src/dird/run_conf.c:380
+#: src/dird/run_conf.c:403
 #, c-format
 msgid "Job type field: %s in run record not found"
 msgstr ""
 
-#: src/dird/run_conf.c:387
+#: src/dird/run_conf.c:410
 #, c-format
 msgid "Unexpected token: %d:%s"
 msgstr ""
 
-#: src/dird/run_conf.c:431
+#: src/dird/run_conf.c:454
 msgid "Time must be preceded by keyword AT."
 msgstr ""
 
-#: src/dird/run_conf.c:440
+#: src/dird/run_conf.c:463
 msgid "Time logic error.\n"
 msgstr ""
 
-#: src/dird/run_conf.c:455 src/dird/run_conf.c:474
+#: src/dird/run_conf.c:478 src/dird/run_conf.c:497
 msgid "Bad time specification."
 msgstr ""
 
-#: src/dird/run_conf.c:488
+#: src/dird/run_conf.c:511
 msgid "Range logic error.\n"
 msgstr ""
 
-#: src/dird/run_conf.c:497
+#: src/dird/run_conf.c:520
 msgid "Bad day range specification."
 msgstr ""
 
-#: src/dird/run_conf.c:544
+#: src/dird/run_conf.c:567
 msgid "Invalid month, week or position day range"
 msgstr ""
 
-#: src/dird/run_conf.c:559
+#: src/dird/run_conf.c:582
 msgid "Invalid month, weekday or position range"
 msgstr ""
 
-#: src/dird/run_conf.c:618
+#: src/dird/run_conf.c:641
 msgid "Unexpected run state\n"
 msgstr ""
 
@@ -3647,14 +3652,14 @@
 msgstr ""
 
 #: src/dird/ua_update.c:257 src/dird/ua_update.c:277 src/dird/ua_update.c:698
-#: src/dird/ua_run.c:178 src/dird/backup.c:780 src/dird/backup.c:781
-#: src/dird/backup.c:782 src/dird/ua_input.c:131 src/stored/parse_bsr.c:864
-#: src/tools/dbcheck.c:1342
+#: src/dird/ua_run.c:180 src/dird/backup.c:778 src/dird/backup.c:779
+#: src/dird/backup.c:780 src/dird/ua_input.c:131 src/stored/parse_bsr.c:864
+#: src/tools/dbcheck.c:1352
 msgid "yes"
 msgstr "áno"
 
 #: src/dird/ua_update.c:257 src/dird/ua_update.c:277 src/dird/ua_update.c:698
-#: src/dird/backup.c:780 src/dird/backup.c:781 src/dird/backup.c:782
+#: src/dird/backup.c:778 src/dird/backup.c:779 src/dird/backup.c:780
 #: src/dird/ua_input.c:135 src/stored/parse_bsr.c:864
 msgid "no"
 msgstr "nie"
@@ -3734,7 +3739,7 @@
 msgid "New ActionOnPurge is: %s\n"
 msgstr ""
 
-#: src/dird/ua_update.c:604 src/dird/ua_run.c:229
+#: src/dird/ua_update.c:604 src/dird/ua_run.c:235
 msgid "Parameters to modify:\n"
 msgstr "Parametre na modifikáciu:\n"
 
@@ -3806,7 +3811,7 @@
 msgid "Done"
 msgstr "Hotovo"
 
-#: src/dird/ua_update.c:623 src/dird/ua_run.c:259 src/dird/ua_run.c:588
+#: src/dird/ua_update.c:623 src/dird/ua_run.c:265 src/dird/ua_run.c:594
 msgid "Select parameter to modify"
 msgstr ""
 
@@ -4025,170 +4030,170 @@
 msgid "setup job failed.\n"
 msgstr ""
 
-#: src/dird/migrate.c:257
+#: src/dird/migrate.c:258
 #, c-format
 msgid "Pool for JobId %s not in database. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:265
+#: src/dird/migrate.c:266
 #, c-format
 msgid "Pool resource \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/migrate.c:315 src/dird/migrate.c:886
+#: src/dird/migrate.c:316 src/dird/migrate.c:896
 #, c-format
 msgid "Could not get job record for JobId %s to %s. ERR=%s"
 msgstr ""
 
-#: src/dird/migrate.c:326
+#: src/dird/migrate.c:327
 #, c-format
 msgid "JobId %s already %s probably by another Job. %s stopped.\n"
 msgstr ""
 
-#: src/dird/migrate.c:336
+#: src/dird/migrate.c:337
 #, c-format
 msgid "Start %s JobId %s, Job=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:708
+#: src/dird/migrate.c:710
 #, c-format
 msgid "No %s SQL selection pattern specified.\n"
 msgstr ""
 
-#: src/dird/migrate.c:715 src/dird/migrate.c:734 src/dird/migrate.c:755
-#: src/dird/migrate.c:791 src/dird/migrate.c:818 src/dird/migrate.c:944
-#: src/dird/migrate.c:977 src/dird/migrate.c:1106
+#: src/dird/migrate.c:717 src/dird/migrate.c:736 src/dird/migrate.c:757
+#: src/dird/migrate.c:793 src/dird/migrate.c:820 src/dird/migrate.c:954
+#: src/dird/migrate.c:987 src/dird/migrate.c:1116
 #, c-format
 msgid "SQL failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:738 src/dird/migrate.c:745 src/dird/migrate.c:759
-#: src/dird/migrate.c:822
+#: src/dird/migrate.c:740 src/dird/migrate.c:747 src/dird/migrate.c:761
+#: src/dird/migrate.c:824
 #, c-format
 msgid "No Volumes found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:773 src/dird/migrate.c:858 src/dird/migrate.c:874
+#: src/dird/migrate.c:775 src/dird/migrate.c:864 src/dird/migrate.c:884
 msgid "Invalid JobId found.\n"
 msgstr ""
 
-#: src/dird/migrate.c:833
+#: src/dird/migrate.c:835
 #, c-format
 msgid "Unknown %s Selection Type.\n"
 msgstr ""
 
-#: src/dird/migrate.c:844 src/dird/migrate.c:861 src/dird/migrate.c:877
+#: src/dird/migrate.c:846 src/dird/migrate.c:867 src/dird/migrate.c:887
 #, c-format
 msgid "No JobIds found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:848
+#: src/dird/migrate.c:850
 #, c-format
 msgid "The following %u JobId%s chosen to be %s: %s\n"
 msgstr ""
 
-#: src/dird/migrate.c:849
+#: src/dird/migrate.c:851
 msgid " was"
 msgstr ""
 
-#: src/dird/migrate.c:849
+#: src/dird/migrate.c:851
 msgid "s were"
 msgstr ""
 
-#: src/dird/migrate.c:893
+#: src/dird/migrate.c:903
 #, c-format
 msgid "%s using JobId=%s Job=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:927
+#: src/dird/migrate.c:937
 msgid "Could not start migration job.\n"
 msgstr ""
 
-#: src/dird/migrate.c:929
+#: src/dird/migrate.c:939
 #, c-format
 msgid "%s JobId %d started.\n"
 msgstr ""
 
-#: src/dird/migrate.c:948
+#: src/dird/migrate.c:958
 #, c-format
 msgid "No %s found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:952
+#: src/dird/migrate.c:962
 #, c-format
 msgid "SQL error. Expected 1 MediaId got %d\n"
 msgstr ""
 
-#: src/dird/migrate.c:981 src/dird/migrate.c:1111
+#: src/dird/migrate.c:991 src/dird/migrate.c:1121
 #, c-format
 msgid "No %ss found to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1003
+#: src/dird/migrate.c:1013
 msgid "Selection Type 'pooluncopiedjobs' only applies to Copy Jobs"
 msgstr ""
 
-#: src/dird/migrate.c:1012
+#: src/dird/migrate.c:1022
 #, c-format
 msgid "SQL to get uncopied jobs failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:1035
+#: src/dird/migrate.c:1045
 #, c-format
 msgid "No %s %s selection pattern specified.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1046
+#: src/dird/migrate.c:1056
 #, c-format
 msgid "SQL to get %s failed. ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:1051
+#: src/dird/migrate.c:1061
 #, c-format
 msgid "Query of Pool \"%s\" returned no Jobs to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1060
+#: src/dird/migrate.c:1070
 #, c-format
 msgid "Could not compile regex pattern \"%s\" ERR=%s\n"
 msgstr ""
 
-#: src/dird/migrate.c:1089
+#: src/dird/migrate.c:1099
 #, c-format
 msgid "Regex pattern matched no Jobs to %s.\n"
 msgstr ""
 
-#: src/dird/migrate.c:1254
+#: src/dird/migrate.c:1264
 #, c-format
 msgid "%s OK -- with warnings"
 msgstr ""
 
-#: src/dird/migrate.c:1256
+#: src/dird/migrate.c:1266
 #, c-format
 msgid "%s OK"
 msgstr ""
 
-#: src/dird/migrate.c:1261
+#: src/dird/migrate.c:1271
 #, c-format
 msgid "*** %s Error ***"
 msgstr ""
 
-#: src/dird/migrate.c:1271
+#: src/dird/migrate.c:1281
 #, c-format
 msgid "%s Canceled"
 msgstr ""
 
-#: src/dird/migrate.c:1280
+#: src/dird/migrate.c:1290
 #, c-format
 msgid "Inappropriate %s term code"
 msgstr ""
 
-#: src/dird/migrate.c:1290
+#: src/dird/migrate.c:1300
 #, c-format
 msgid "%s -- no files to %s"
 msgstr ""
 
-#: src/dird/migrate.c:1305
+#: src/dird/migrate.c:1315
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -4223,17 +4228,17 @@
 "\n"
 msgstr ""
 
-#: src/dird/migrate.c:1416
+#: src/dird/migrate.c:1426
 #, c-format
 msgid "No Next Pool specification found in Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:1422
+#: src/dird/migrate.c:1432
 #, c-format
 msgid "No Storage specification found in Next Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/migrate.c:1428
+#: src/dird/migrate.c:1438
 msgid "Storage from Pool's NextPool resource"
 msgstr ""
 
@@ -4287,63 +4292,63 @@
 "\n"
 msgstr ""
 
-#: src/dird/ua_run.c:152
+#: src/dird/ua_run.c:154
 msgid "OK to run? (yes/mod/no): "
 msgstr ""
 
-#: src/dird/ua_run.c:191
+#: src/dird/ua_run.c:193
 msgid "Job failed.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:194
+#: src/dird/ua_run.c:196
 #, c-format
 msgid "Job queued. JobId=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:200
+#: src/dird/ua_run.c:202
 msgid "Job not run.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:230
+#: src/dird/ua_run.c:236
 msgid "Level"
 msgstr ""
 
-#: src/dird/ua_run.c:235
+#: src/dird/ua_run.c:241
 msgid "Restore Client"
 msgstr ""
 
-#: src/dird/ua_run.c:239 src/wx-console/wxbrestorepanel.cpp:356
+#: src/dird/ua_run.c:245 src/wx-console/wxbrestorepanel.cpp:356
 #: src/wx-console/wxbrestorepanel.cpp:854
 #: src/wx-console/wxbrestorepanel.cpp:1918
 msgid "When"
 msgstr ""
 
-#: src/dird/ua_run.c:240 src/wx-console/wxbrestorepanel.cpp:357
+#: src/dird/ua_run.c:246 src/wx-console/wxbrestorepanel.cpp:357
 #: src/wx-console/wxbrestorepanel.cpp:1128
 #: src/wx-console/wxbrestorepanel.cpp:1921
 msgid "Priority"
 msgstr ""
 
-#: src/dird/ua_run.c:247
+#: src/dird/ua_run.c:253
 msgid "Verify Job"
 msgstr ""
 
-#: src/dird/ua_run.c:250 src/wx-console/wxbrestorepanel.cpp:349
+#: src/dird/ua_run.c:256 src/wx-console/wxbrestorepanel.cpp:349
 #: src/wx-console/wxbrestorepanel.cpp:1899
 msgid "Bootstrap"
 msgstr ""
 
-#: src/dird/ua_run.c:251 src/wx-console/wxbrestorepanel.cpp:350
+#: src/dird/ua_run.c:257 src/wx-console/wxbrestorepanel.cpp:350
 #: src/wx-console/wxbrestorepanel.cpp:1104
 #: src/wx-console/wxbrestorepanel.cpp:1901
 msgid "Where"
 msgstr ""
 
-#: src/dird/ua_run.c:252
+#: src/dird/ua_run.c:258
 msgid "File Relocation"
 msgstr ""
 
-#: src/dird/ua_run.c:253 src/wx-console/wxbrestorepanel.cpp:352
+#: src/dird/ua_run.c:259 src/wx-console/wxbrestorepanel.cpp:352
 #: src/wx-console/wxbrestorepanel.cpp:1112
 #: src/wx-console/wxbrestorepanel.cpp:1905
 #: src/wx-console/wxbrestorepanel.cpp:1906
@@ -4353,212 +4358,212 @@
 msgid "Replace"
 msgstr ""
 
-#: src/dird/ua_run.c:254
+#: src/dird/ua_run.c:260
 msgid "JobId"
 msgstr ""
 
-#: src/dird/ua_run.c:257
+#: src/dird/ua_run.c:263
 msgid "Plugin Options"
 msgstr ""
 
-#: src/dird/ua_run.c:268 src/dird/ua_run.c:1543
+#: src/dird/ua_run.c:274 src/dird/ua_run.c:1563
 msgid "user selection"
 msgstr ""
 
-#: src/dird/ua_run.c:300
+#: src/dird/ua_run.c:306
 msgid ""
 "Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now): "
 msgstr ""
 
-#: src/dird/ua_run.c:308 src/dird/ua_run.c:484
+#: src/dird/ua_run.c:314 src/dird/ua_run.c:490
 msgid "Invalid time, using current time.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:315
+#: src/dird/ua_run.c:321
 msgid "Enter new Priority: "
 msgstr ""
 
-#: src/dird/ua_run.c:319
+#: src/dird/ua_run.c:325
 msgid "Priority must be a positive integer.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:340
+#: src/dird/ua_run.c:346
 msgid "Please enter the Bootstrap file name: "
 msgstr ""
 
-#: src/dird/ua_run.c:352
+#: src/dird/ua_run.c:358
 #, c-format
 msgid "Warning cannot open %s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:371
+#: src/dird/ua_run.c:377
 msgid "Please enter path prefix for restore (/ for none): "
 msgstr ""
 
-#: src/dird/ua_run.c:393
+#: src/dird/ua_run.c:399
 msgid "Replace:\n"
 msgstr ""
 
-#: src/dird/ua_run.c:397
+#: src/dird/ua_run.c:403
 msgid "Select replace option"
 msgstr ""
 
-#: src/dird/ua_run.c:408
+#: src/dird/ua_run.c:414
 msgid ""
 "You must set the bootstrap file to NULL to be able to specify a JobId.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:413
+#: src/dird/ua_run.c:419
 msgid "Please Plugin Options string: "
 msgstr ""
 
-#: src/dird/ua_run.c:451 src/dird/ua_run.c:460
+#: src/dird/ua_run.c:457 src/dird/ua_run.c:466
 msgid "User input"
 msgstr ""
 
-#: src/dird/ua_run.c:514
+#: src/dird/ua_run.c:520
 #, c-format
 msgid "Invalid replace option: %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:577
+#: src/dird/ua_run.c:583
 #, c-format
 msgid "strip_prefix=%s add_prefix=%s add_suffix=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:580
+#: src/dird/ua_run.c:586
 msgid "This will replace your current Where value\n"
 msgstr ""
 
-#: src/dird/ua_run.c:581
+#: src/dird/ua_run.c:587
 msgid "Strip prefix"
 msgstr ""
 
-#: src/dird/ua_run.c:582
+#: src/dird/ua_run.c:588
 msgid "Add prefix"
 msgstr ""
 
-#: src/dird/ua_run.c:583
+#: src/dird/ua_run.c:589
 msgid "Add file suffix"
 msgstr ""
 
-#: src/dird/ua_run.c:584
+#: src/dird/ua_run.c:590
 msgid "Enter a regexp"
 msgstr ""
 
-#: src/dird/ua_run.c:585
+#: src/dird/ua_run.c:591
 msgid "Test filename manipulation"
 msgstr ""
 
-#: src/dird/ua_run.c:586
+#: src/dird/ua_run.c:592
 msgid "Use this ?"
 msgstr ""
 
-#: src/dird/ua_run.c:591
+#: src/dird/ua_run.c:597
 msgid "Please enter path prefix to strip: "
 msgstr ""
 
-#: src/dird/ua_run.c:599
+#: src/dird/ua_run.c:605
 msgid "Please enter path prefix to add (/ for none): "
 msgstr ""
 
-#: src/dird/ua_run.c:610
+#: src/dird/ua_run.c:616
 msgid "Please enter file suffix to add: "
 msgstr ""
 
-#: src/dird/ua_run.c:617
+#: src/dird/ua_run.c:623
 msgid "Please enter a valid regexp (!from!to!): "
 msgstr ""
 
-#: src/dird/ua_run.c:630
+#: src/dird/ua_run.c:636
 #, c-format
 msgid "regexwhere=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:636
+#: src/dird/ua_run.c:642
 #, c-format
 msgid "strip_prefix=%s add_prefix=%s add_suffix=%s result=%s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:643
+#: src/dird/ua_run.c:649
 msgid "Cannot use your regexp\n"
 msgstr ""
 
-#: src/dird/ua_run.c:646
+#: src/dird/ua_run.c:652
 msgid "Enter a period (.) to stop this test\n"
 msgstr ""
 
-#: src/dird/ua_run.c:647
+#: src/dird/ua_run.c:653
 msgid "Please enter filename to test: "
 msgstr ""
 
-#: src/dird/ua_run.c:649
+#: src/dird/ua_run.c:655
 #, c-format
 msgid "%s -> %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:693
+#: src/dird/ua_run.c:699
 msgid "Cannot use your regexp.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:706 src/dird/ua_run.c:736
+#: src/dird/ua_run.c:712 src/dird/ua_run.c:742
 msgid "Levels:\n"
 msgstr ""
 
-#: src/dird/ua_run.c:708 src/stored/status.c:600 src/lib/util.c:426
+#: src/dird/ua_run.c:714 src/stored/status.c:600 src/lib/util.c:426
 #: src/lib/util.c:472 src/filed/status.c:519
 msgid "Full"
 msgstr ""
 
-#: src/dird/ua_run.c:709 src/stored/status.c:603 src/lib/util.c:429
+#: src/dird/ua_run.c:715 src/stored/status.c:603 src/lib/util.c:429
 #: src/filed/status.c:522
 msgid "Incremental"
 msgstr ""
 
-#: src/dird/ua_run.c:710 src/stored/status.c:606 src/lib/util.c:432
+#: src/dird/ua_run.c:716 src/stored/status.c:606 src/lib/util.c:432
 #: src/filed/status.c:525
 msgid "Differential"
 msgstr ""
 
-#: src/dird/ua_run.c:711 src/stored/status.c:609 src/lib/util.c:435
+#: src/dird/ua_run.c:717 src/stored/status.c:609 src/lib/util.c:435
 #: src/filed/status.c:528
 msgid "Since"
 msgstr ""
 
-#: src/dird/ua_run.c:712
+#: src/dird/ua_run.c:718
 msgid "VirtualFull"
 msgstr ""
 
-#: src/dird/ua_run.c:713 src/dird/ua_run.c:742
+#: src/dird/ua_run.c:719 src/dird/ua_run.c:748
 msgid "Select level"
 msgstr ""
 
-#: src/dird/ua_run.c:737
+#: src/dird/ua_run.c:743
 msgid "Initialize Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:738 src/stored/status.c:612 src/lib/util.c:438
+#: src/dird/ua_run.c:744 src/stored/status.c:612 src/lib/util.c:438
 #: src/filed/status.c:531
 msgid "Verify Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:739 src/lib/util.c:444
+#: src/dird/ua_run.c:745 src/lib/util.c:444
 msgid "Verify Volume to Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:740 src/lib/util.c:447
+#: src/dird/ua_run.c:746 src/lib/util.c:447
 msgid "Verify Disk to Catalog"
 msgstr ""
 
-#: src/dird/ua_run.c:741
+#: src/dird/ua_run.c:747
 msgid "Verify Volume Data (not yet implemented)"
 msgstr ""
 
-#: src/dird/ua_run.c:762
+#: src/dird/ua_run.c:768
 msgid "Level not appropriate for this Job. Cannot be changed.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:793
+#: src/dird/ua_run.c:799
 #, c-format
 msgid ""
 "Run Admin Job\n"
@@ -4570,7 +4575,7 @@
 "Priority: %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:837
+#: src/dird/ua_run.c:843
 #, c-format
 msgid ""
 "Run Backup job\n"
@@ -4585,12 +4590,12 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dird/ua_run.c:868
+#: src/dird/ua_run.c:874
 #, c-format
 msgid "Could not get job record for selected JobId. ERR=%s"
 msgstr ""
 
-#: src/dird/ua_run.c:907
+#: src/dird/ua_run.c:913
 #, c-format
 msgid ""
 "Run Verify Job\n"
@@ -4606,11 +4611,11 @@
 "Priority:    %d\n"
 msgstr ""
 
-#: src/dird/ua_run.c:936
+#: src/dird/ua_run.c:942
 msgid "Please enter a JobId for restore: "
 msgstr ""
 
-#: src/dird/ua_run.c:976
+#: src/dird/ua_run.c:982
 #, c-format
 msgid ""
 "Run Restore job\n"
@@ -4628,7 +4633,7 @@
 "Plugin Options:  %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1032
+#: src/dird/ua_run.c:1038
 #, c-format
 msgid ""
 "Run Restore job\n"
@@ -4646,7 +4651,7 @@
 "Plugin Options:  %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1063
+#: src/dird/ua_run.c:1069
 #, c-format
 msgid ""
 "Run Restore job\n"
@@ -4654,17 +4659,17 @@
 "Bootstrap:  %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1071
+#: src/dird/ua_run.c:1077
 #, c-format
 msgid "RegexWhere: %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1074
+#: src/dird/ua_run.c:1080
 #, c-format
 msgid "Where:      %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1078
+#: src/dird/ua_run.c:1084
 #, c-format
 msgid ""
 "Replace:         %s\n"
@@ -4677,211 +4682,249 @@
 "Plugin Options:  %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1133
+#: src/dird/ua_run.c:1139
 msgid "Run Copy job\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1135
+#: src/dird/ua_run.c:1141
 msgid "Run Migration job\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1164
+#: src/dird/ua_run.c:1170
 #, c-format
 msgid "Unknown Job Type=%d\n"
 msgstr "Neznámy typ úlohy=%d\n"
 
-#: src/dird/ua_run.c:1231
+#: src/dird/ua_run.c:1239
 #, c-format
 msgid "Value missing for keyword %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1238
+#: src/dird/ua_run.c:1246
 msgid "Job name specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1246
+#: src/dird/ua_run.c:1254
 msgid "JobId specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1255 src/dird/ua_run.c:1395
+#: src/dird/ua_run.c:1263 src/dird/ua_run.c:1403
 msgid "Client specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1263
+#: src/dird/ua_run.c:1271
 msgid "FileSet specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1271
+#: src/dird/ua_run.c:1279
 msgid "Level specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1280
+#: src/dird/ua_run.c:1288
 msgid "Storage specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1288
+#: src/dird/ua_run.c:1296
 msgid "RegexWhere or Where specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1293
+#: src/dird/ua_run.c:1301
 msgid "No authorization for \"regexwhere\" specification.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1300
+#: src/dird/ua_run.c:1308
 msgid "Where or RegexWhere specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1305
+#: src/dird/ua_run.c:1313
 msgid "No authoriztion for \"where\" specification.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1312
+#: src/dird/ua_run.c:1320
 msgid "Bootstrap specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1320
+#: src/dird/ua_run.c:1328
 msgid "Replace specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1328
+#: src/dird/ua_run.c:1336
 msgid "When specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1336
+#: src/dird/ua_run.c:1344
 msgid "Priority specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1341
+#: src/dird/ua_run.c:1349
 msgid "Priority must be positive nonzero setting it to 10.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1351
+#: src/dird/ua_run.c:1359
 msgid "Verify Job specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1379
+#: src/dird/ua_run.c:1387
 msgid "Migration Job specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1387
+#: src/dird/ua_run.c:1395
 msgid "Pool specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1403
+#: src/dird/ua_run.c:1411
 msgid "Restore Client specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1410
+#: src/dird/ua_run.c:1418
 msgid "Plugin Options not yet implemented.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1413
+#: src/dird/ua_run.c:1421
 msgid "Plugin Options specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1418
+#: src/dird/ua_run.c:1426
 msgid "No authoriztion for \"PluginOptions\" specification.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1425
+#: src/dird/ua_run.c:1433
 msgid "Spool flag specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1432
+#: src/dird/ua_run.c:1440
 msgid "Invalid spooldata flag.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1441
+#: src/dird/ua_run.c:1449
 msgid "IgnoreDuplicateCheck flag specified twice.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1448
+#: src/dird/ua_run.c:1456
 msgid "Invalid ignoreduplicatecheck flag.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1469
+#: src/dird/ua_run.c:1461
+msgid "Accurate flag specified twice.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1468
+msgid "Invalid accurate flag.\n"
+msgstr ""
+
+#: src/dird/ua_run.c:1489
 #, c-format
 msgid "Invalid keyword: %s\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1484
+#: src/dird/ua_run.c:1504
 #, c-format
 msgid "Catalog \"%s\" not found\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1488
+#: src/dird/ua_run.c:1508
 #, c-format
 msgid "No authorization. Catalog \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1499
+#: src/dird/ua_run.c:1519
 #, c-format
 msgid "Job \"%s\" not found\n"
 msgstr "Úloha \"%s\" nenájdená\n"
 
-#: src/dird/ua_run.c:1506
+#: src/dird/ua_run.c:1526
 msgid "A job name must be specified.\n"
 msgstr "Musí byť zadaný názov úlohy.\n"
 
-#: src/dird/ua_run.c:1512
+#: src/dird/ua_run.c:1532
 #, c-format
 msgid "No authorization. Job \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1520
+#: src/dird/ua_run.c:1540
 #, c-format
 msgid "Pool \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1530
+#: src/dird/ua_run.c:1550
 #, c-format
 msgid "No authorization. Pool \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1540
+#: src/dird/ua_run.c:1560
 #, c-format
 msgid "Storage \"%s\" not found.\n"
 msgstr "Úložisko \"%s\" nenájdené.\n"
 
-#: src/dird/ua_run.c:1549 src/dird/job.c:1242
+#: src/dird/ua_run.c:1569 src/dird/job.c:1242
 msgid "No storage specified.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1552
+#: src/dird/ua_run.c:1572
 #, c-format
 msgid "No authorization. Storage \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1572 src/dird/ua_run.c:1592
+#: src/dird/ua_run.c:1592 src/dird/ua_run.c:1612
 #, c-format
 msgid "No authorization. Client \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1582
+#: src/dird/ua_run.c:1602
 #, c-format
 msgid "Restore Client \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1601
+#: src/dird/ua_run.c:1621
 #, c-format
 msgid "FileSet \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1610
+#: src/dird/ua_run.c:1630
 #, c-format
 msgid "No authorization. FileSet \"%s\".\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1618
+#: src/dird/ua_run.c:1638
 #, c-format
 msgid "Verify Job \"%s\" not found.\n"
 msgstr ""
 
-#: src/dird/ua_run.c:1628
+#: src/dird/ua_run.c:1648
 #, c-format
 msgid "Migration Job \"%s\" not found.\n"
 msgstr ""
 
+#: src/dird/dir_plugins.c:180 src/stored/sd_plugins.c:183
+#: src/filed/fd_plugins.c:973
+#, c-format
+msgid "Loaded plugin: %s\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:200 src/stored/sd_plugins.c:203
+#: src/filed/fd_plugins.c:992
+#, c-format
+msgid "Plugin magic wrong. Plugin=%s wanted=%s got=%s\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:208 src/stored/sd_plugins.c:211
+#: src/filed/fd_plugins.c:1000
+#, c-format
+msgid "Plugin version incorrect. Plugin=%s wanted=%d got=%d\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:217 src/stored/sd_plugins.c:220
+#: src/filed/fd_plugins.c:1008
+#, c-format
+msgid "Plugin license incompatible. Plugin=%s license=%s\n"
+msgstr ""
+
+#: src/dird/dir_plugins.c:225 src/stored/sd_plugins.c:228
+#: src/filed/fd_plugins.c:1016
+#, c-format
+msgid "Plugin size incorrect. Plugin=%s wanted=%d got=%d\n"
+msgstr ""
+
 #: src/dird/backup.c:96
 msgid "No Storage specification found in Job or Pool.\n"
 msgstr ""
@@ -4918,11 +4961,11 @@
 msgid "No Job status returned from FD.\n"
 msgstr ""
 
-#: src/dird/backup.c:649
+#: src/dird/backup.c:647
 msgid "Backup failed -- incomplete"
 msgstr ""
 
-#: src/dird/backup.c:722
+#: src/dird/backup.c:720
 #, c-format
 msgid ""
 "%s %s %s (%s):\n"
@@ -4961,20 +5004,20 @@
 "\n"
 msgstr ""
 
-#: src/dird/backup.c:824
+#: src/dird/backup.c:822
 #, c-format
 msgid ""
 "Could not get Job Volume Parameters to update Bootstrap file. ERR=%s\n"
 msgstr ""
 
-#: src/dird/backup.c:860
+#: src/dird/backup.c:858
 #, c-format
 msgid ""
 "Could not open WriteBootstrap file:\n"
 "%s: ERR=%s\n"
 msgstr ""
 
-#: src/dird/restore.c:137 src/dird/msgchan.c:463 src/filed/job.c:2370
+#: src/dird/restore.c:137 src/dird/msgchan.c:463 src/filed/job.c:2409
 #, c-format
 msgid "Could not open bootstrap file %s: ERR=%s\n"
 msgstr ""
@@ -5042,25 +5085,25 @@
 "\n"
 msgstr ""
 
-#: src/dird/ua_status.c:175
+#: src/dird/ua_status.c:174
 msgid "Status available for:\n"
 msgstr ""
 
-#: src/dird/ua_status.c:181
+#: src/dird/ua_status.c:180
 msgid "Select daemon type for status"
 msgstr ""
 
-#: src/dird/ua_status.c:295 src/stored/status.c:218
+#: src/dird/ua_status.c:294 src/stored/status.c:218
 #, c-format
 msgid "%s Version: %s (%s) %s %s %s\n"
 msgstr ""
 
-#: src/dird/ua_status.c:298
+#: src/dird/ua_status.c:297
 #, c-format
-msgid "Daemon started %s. Jobs: run=%d, running=%d\n"
+msgid "Daemon started %s. Jobs: run=%d, running=%d mode=%d,%d\n"
 msgstr ""
 
-#: src/dird/ua_status.c:300 src/stored/status.c:229 src/filed/status.c:142
+#: src/dird/ua_status.c:300 src/stored/status.c:228 src/filed/status.c:142
 #, c-format
 msgid " Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"
 msgstr ""
@@ -5313,7 +5356,7 @@
 msgid "Diffs"
 msgstr ""
 
-#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1520
+#: src/dird/ua_status.c:866 src/stored/status.c:549 src/stored/btape.c:1521
 #: src/lib/util.c:189 src/lib/util.c:324 src/filed/status.c:376
 #: src/wx-console/wxbconfigpanel.cpp:209
 msgid "OK"
@@ -5372,35 +5415,35 @@
 msgid "Comment must be at least one character long.\n"
 msgstr ""
 
-#: src/dird/pythondir.c:122 src/stored/pythonsd.c:101
+#: src/dird/pythondir.c:121 src/stored/pythonsd.c:101
 #: src/stored/pythonsd.c:166 src/filed/pythonfd.c:94 src/filed/pythonfd.c:148
 #: src/filed/pythonfd.c:212
 msgid "Job pointer not found."
 msgstr ""
 
-#: src/dird/pythondir.c:154
+#: src/dird/pythondir.c:153
 msgid "Pool record not found."
 msgstr ""
 
-#: src/dird/pythondir.c:210 src/stored/pythonsd.c:143 src/filed/pythonfd.c:125
+#: src/dird/pythondir.c:209 src/stored/pythonsd.c:143 src/filed/pythonfd.c:125
 #, c-format
 msgid "Attribute %s not found."
 msgstr ""
 
-#: src/dird/pythondir.c:253 src/dird/pythondir.c:259 src/stored/pythonsd.c:183
+#: src/dird/pythondir.c:252 src/dird/pythondir.c:258 src/stored/pythonsd.c:183
 #: src/filed/pythonfd.c:167
 msgid "Read-only attribute"
 msgstr ""
 
-#: src/dird/pythondir.c:285
+#: src/dird/pythondir.c:284
 msgid "Priority must be 1-100"
 msgstr ""
 
-#: src/dird/pythondir.c:290
+#: src/dird/pythondir.c:289
 msgid "Job Level can be set only during JobInit"
 msgstr ""
 
-#: src/dird/pythondir.c:304
+#: src/dird/pythondir.c:303
 msgid "Bad JobLevel string"
 msgstr ""
 
@@ -5529,12 +5572,12 @@
 msgid "Client resource"
 msgstr ""
 
-#: src/dird/job.c:1411
+#: src/dird/job.c:1403
 #, c-format
 msgid "Could not start clone job: \"%s\".\n"
 msgstr ""
 
-#: src/dird/job.c:1414
+#: src/dird/job.c:1406
 #, c-format
 msgid "Clone JobId %d started.\n"
 msgstr ""
@@ -5562,16 +5605,16 @@
 msgstr ""
 
 #: src/dird/authenticate.c:127 src/wx-console/authenticate.c:127
-#: src/console/authenticate.c:125
+#: src/console/authenticate.c:122
 msgid ""
 "Authorization problem: Remote server did not advertise required TLS "
 "support.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:134 src/stored/authenticate.c:147
-#: src/stored/authenticate.c:258 src/wx-console/authenticate.c:133
-#: src/console/authenticate.c:132 src/filed/authenticate.c:158
-#: src/filed/authenticate.c:277
+#: src/dird/authenticate.c:134 src/stored/authenticate.c:146
+#: src/stored/authenticate.c:257 src/wx-console/authenticate.c:133
+#: src/console/authenticate.c:129 src/filed/authenticate.c:160
+#: src/filed/authenticate.c:279
 msgid "Authorization problem: Remote server requires TLS.\n"
 msgstr ""
 
@@ -5651,37 +5694,37 @@
 msgid "File daemon at \"%s:%d\" rejected Hello command\n"
 msgstr ""
 
-#: src/dird/authenticate.c:303
+#: src/dird/authenticate.c:302
 #, c-format
 msgid "UA Hello from %s:%s:%d is invalid. Len=%d\n"
 msgstr ""
 
-#: src/dird/authenticate.c:310
+#: src/dird/authenticate.c:309
 #, c-format
 msgid "UA Hello from %s:%s:%d is invalid. Got: %s\n"
 msgstr ""
 
-#: src/dird/authenticate.c:380
+#: src/dird/authenticate.c:377
 msgid ""
 "Authorization problem: Remote client did not advertise required TLS "
 "support.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:388
+#: src/dird/authenticate.c:385
 msgid "Authorization problem: Remote client requires TLS.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:403 src/filed/authenticate.c:167
-#: src/filed/authenticate.c:286
+#: src/dird/authenticate.c:400 src/filed/authenticate.c:169
+#: src/filed/authenticate.c:288
 msgid "TLS negotiation failed.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:417
+#: src/dird/authenticate.c:414
 #, c-format
 msgid "Unable to authenticate console \"%s\" at %s:%s:%d.\n"
 msgstr ""
 
-#: src/dird/authenticate.c:422
+#: src/dird/authenticate.c:419
 #, c-format
 msgid "1000 OK: %s Version: %s (%s)\n"
 msgstr ""
@@ -5714,7 +5757,7 @@
 
 #: src/dird/catreq.c:204
 #, c-format
-msgid "1998 Volume \"%s\" status is %s, %s.\n"
+msgid "1998 Volume \"%s\" catalog status is %s, %s.\n"
 msgstr ""
 
 #: src/dird/catreq.c:209
@@ -5806,13 +5849,13 @@
 msgid "Invalid Catalog Update; DB not open: %s"
 msgstr ""
 
-#: src/dird/catreq.c:671 src/dird/catreq.c:689 src/lib/bsock.c:605
+#: src/dird/catreq.c:670 src/dird/catreq.c:685 src/lib/bsock.c:605
 #, c-format
 msgid "fread attr spool error. ERR=%s\n"
 msgstr ""
 
 #: src/dird/msgchan.c:106 src/tray-monitor/tray-monitor.c:952
-#: src/filed/job.c:1727 src/qt-console/tray-monitor/tray-monitor.cpp:375
+#: src/filed/job.c:1771 src/qt-console/tray-monitor/tray-monitor.cpp:375
 msgid "Storage daemon"
 msgstr ""
 
@@ -6254,14 +6297,14 @@
 "Please see "
 msgstr ""
 
-#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:155
+#: src/tray-monitor/authenticate.c:97 src/console/authenticate.c:152
 #: src/qt-console/tray-monitor/authenticate.cpp:96
 #, c-format
 msgid "Bad response to Hello command: ERR=%s\n"
 msgstr ""
 
 #: src/tray-monitor/authenticate.c:104 src/wx-console/authenticate.c:157
-#: src/console/authenticate.c:162
+#: src/console/authenticate.c:159
 #: src/qt-console/tray-monitor/authenticate.cpp:103
 msgid "Director rejected Hello command\n"
 msgstr ""
@@ -6292,31 +6335,31 @@
 "Please see "
 msgstr ""
 
-#: src/stored/reserve.c:88
+#: src/stored/reserve.c:86
 #, c-format
 msgid "Unable to initialize reservation lock. ERR=%s\n"
 msgstr ""
 
-#: src/stored/reserve.c:158
+#: src/stored/reserve.c:156
 #, c-format
 msgid "Hey! num_writers=%d!!!!\n"
 msgstr ""
 
-#: src/stored/reserve.c:256
+#: src/stored/reserve.c:255
 msgid "3939 Could not get dcr\n"
 msgstr ""
 
-#: src/stored/reserve.c:358
+#: src/stored/reserve.c:357
 #, c-format
 msgid "Device reservation failed for JobId=%d: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:367
+#: src/stored/reserve.c:366
 #, c-format
 msgid "Failed command: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:626 src/stored/dircmd.c:618
+#: src/stored/reserve.c:625 src/stored/dircmd.c:618
 #, c-format
 msgid ""
 "\n"
@@ -6324,85 +6367,85 @@
 "does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:630 src/stored/dircmd.c:596
+#: src/stored/reserve.c:629 src/stored/dircmd.c:596
 #, c-format
 msgid ""
 "\n"
 "     Device \"%s\" requested by DIR could not be opened or does not exist.\n"
 msgstr ""
 
-#: src/stored/reserve.c:646
+#: src/stored/reserve.c:645
 #, c-format
 msgid "3926 Could not get dcr for device: %s\n"
 msgstr ""
 
-#: src/stored/reserve.c:772
+#: src/stored/reserve.c:771
 #, c-format
 msgid "3601 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:782
+#: src/stored/reserve.c:781
 #, c-format
 msgid "3602 JobId=%u device %s is busy (already reading/writing).\n"
 msgstr ""
 
-#: src/stored/reserve.c:829
+#: src/stored/reserve.c:833
 #, c-format
 msgid "3603 JobId=%u device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/reserve.c:838
+#: src/stored/reserve.c:842
 #, c-format
 msgid "3604 JobId=%u device %s is BLOCKED due to user unmount.\n"
 msgstr ""
 
-#: src/stored/reserve.c:875
+#: src/stored/reserve.c:884
 #, c-format
 msgid ""
 "3608 JobId=%u wants Pool=\"%s\" but have Pool=\"%s\" nreserve=%d on drive "
 "%s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:898
+#: src/stored/reserve.c:907
 #, c-format
 msgid "3609 JobId=%u Max concurrent jobs exceeded on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:910
+#: src/stored/reserve.c:919
 #, c-format
 msgid "3610 JobId=%u Volume max jobs exceeded on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:962
+#: src/stored/reserve.c:971
 #, c-format
 msgid "3605 JobId=%u wants free drive but device %s is busy.\n"
 msgstr ""
 
-#: src/stored/reserve.c:971
+#: src/stored/reserve.c:980
 #, c-format
 msgid "3606 JobId=%u prefers mounted drives, but drive %s has no Volume.\n"
 msgstr ""
 
-#: src/stored/reserve.c:993
+#: src/stored/reserve.c:1002
 #, c-format
 msgid "3607 JobId=%u wants Vol=\"%s\" drive has Vol=\"%s\" on drive %s.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1048
+#: src/stored/reserve.c:1057
 #, c-format
 msgid "Logic error!!!! JobId=%u Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1049
+#: src/stored/reserve.c:1058
 #, c-format
 msgid "3910 JobId=%u Logic error!!!! drive %s Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1052
+#: src/stored/reserve.c:1061
 msgid "Logic error!!!! Should not get here.\n"
 msgstr ""
 
-#: src/stored/reserve.c:1055
+#: src/stored/reserve.c:1064
 #, c-format
 msgid "3911 JobId=%u failed reserve drive %s.\n"
 msgstr ""
@@ -6534,7 +6577,7 @@
 msgstr ""
 
 #: src/stored/bls.c:479 src/stored/bextract.c:612 src/stored/bcopy.c:375
-#: src/stored/bscan.c:1370 src/stored/btape.c:3044
+#: src/stored/bscan.c:1370 src/stored/btape.c:3048
 #, c-format
 msgid "Mount Volume \"%s\" on device %s and press return when ready: "
 msgstr ""
@@ -6549,7 +6592,7 @@
 msgid "Invalid connection from %s. Len=%d\n"
 msgstr ""
 
-#: src/stored/dircmd.c:208 src/filed/authenticate.c:206
+#: src/stored/dircmd.c:208 src/filed/authenticate.c:208
 msgid "Unable to authenticate Director\n"
 msgstr ""
 
@@ -6760,7 +6803,7 @@
 msgid "3927 Error scanning release command: %s\n"
 msgstr ""
 
-#: src/stored/dircmd.c:1028 src/filed/job.c:1490
+#: src/stored/dircmd.c:1028 src/filed/job.c:1531
 #, c-format
 msgid "Could not create bootstrap file %s: ERR=%s\n"
 msgstr ""
@@ -6776,7 +6819,7 @@
 
 #: src/stored/dircmd.c:1120
 #, c-format
-msgid "3908 Error scanning autocharger drives/list/slots command: %s\n"
+msgid "3908 Error scanning autochanger drives/list/slots command: %s\n"
 msgstr ""
 
 #: src/stored/dircmd.c:1163
@@ -7036,7 +7079,7 @@
 
 #: src/stored/ansi_label.c:333
 #, c-format
-msgid "Could not write ANSI VOL1 label. ERR=%s\n"
+msgid "Could not write ANSI VOL1 label. Wanted size=%d got=%d ERR=%s\n"
 msgstr ""
 
 #: src/stored/ansi_label.c:371 src/stored/ansi_label.c:400
@@ -7075,7 +7118,7 @@
 msgid "NULL Volume name. This shouldn't happen!!!\n"
 msgstr ""
 
-#: src/stored/append.c:111 src/stored/btape.c:2232
+#: src/stored/append.c:111 src/stored/btape.c:2233
 #, c-format
 msgid "Write session label failed. ERR=%s\n"
 msgstr ""
@@ -7111,18 +7154,18 @@
 "Job write elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n"
 msgstr ""
 
-#: src/stored/append.c:289 src/stored/btape.c:2351
+#: src/stored/append.c:289 src/stored/btape.c:2352
 #, c-format
 msgid "Error writing end session label. ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:305 src/stored/mac.c:127 src/stored/mac.c:246
-#: src/stored/spool.c:301
+#: src/stored/append.c:305 src/stored/mac.c:126 src/stored/mac.c:247
+#: src/stored/spool.c:300
 #, c-format
 msgid "Fatal append error on device %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/append.c:307 src/stored/mac.c:129
+#: src/stored/append.c:307 src/stored/mac.c:128
 msgid "Set ok=FALSE after write_block_to_device.\n"
 msgstr ""
 
@@ -7480,7 +7523,7 @@
 msgid "    Drive %d status unknown.\n"
 msgstr ""
 
-#: src/stored/status.c:331 src/stored/btape.c:687
+#: src/stored/status.c:331 src/stored/btape.c:688
 #, c-format
 msgid "Configured device capabilities:\n"
 msgstr ""
@@ -7496,7 +7539,7 @@
 "\n"
 msgstr ""
 
-#: src/stored/status.c:371 src/stored/btape.c:719
+#: src/stored/status.c:371 src/stored/btape.c:720
 #, c-format
 msgid "Device parameters:\n"
 msgstr ""
@@ -7688,7 +7731,7 @@
 msgstr ""
 
 #: src/stored/bextract.c:196 src/stored/bcopy.c:163 src/stored/bscan.c:248
-#: src/tools/bvfs_test.c:201 src/tools/bbatch.c:190 src/tools/ing_test.c:184
+#: src/tools/bvfs_test.c:201 src/tools/bbatch.c:190 src/tools/ing_test.c:185
 #: src/tools/cats_test.c:321
 msgid "Wrong number of arguments: \n"
 msgstr ""
@@ -7719,7 +7762,7 @@
 msgstr ""
 
 #: src/stored/bextract.c:284 src/stored/bextract.c:290
-#: src/filed/restore.c:1242
+#: src/filed/restore.c:1474
 #, c-format
 msgid "Write error on %s: %s\n"
 msgstr ""
@@ -7728,7 +7771,7 @@
 msgid "Logic error output file should be open but is not.\n"
 msgstr ""
 
-#: src/stored/bextract.c:335 src/filed/restore.c:363
+#: src/stored/bextract.c:335 src/filed/restore.c:566
 #, c-format
 msgid "%s stream not supported on this Client.\n"
 msgstr ""
@@ -7744,7 +7787,7 @@
 msgstr ""
 
 #: src/stored/bextract.c:429 src/stored/bextract.c:494
-#: src/filed/restore.c:1099
+#: src/filed/restore.c:1329
 #, c-format
 msgid "Seek to %s error on %s: ERR=%s\n"
 msgstr ""
@@ -7754,16 +7797,16 @@
 msgid "Uncompression error. ERR=%d\n"
 msgstr ""
 
-#: src/stored/bextract.c:462 src/filed/restore.c:1212
+#: src/stored/bextract.c:462 src/filed/restore.c:1444
 msgid "GZIP data stream found, but GZIP not configured!\n"
 msgstr ""
 
-#: src/stored/bextract.c:517 src/filed/restore.c:1138
+#: src/stored/bextract.c:517 src/filed/restore.c:1370
 #, c-format
 msgid "Compressed header version error. version=0x%x\n"
 msgstr ""
 
-#: src/stored/bextract.c:522 src/filed/restore.c:1143
+#: src/stored/bextract.c:522 src/filed/restore.c:1375
 #, c-format
 msgid "Compressed header size error. comp_len=%d, msglen=%d\n"
 msgstr ""
@@ -7773,7 +7816,7 @@
 msgid "LZO uncompression error. ERR=%d\n"
 msgstr ""
 
-#: src/stored/bextract.c:556 src/filed/restore.c:1176
+#: src/stored/bextract.c:556 src/filed/restore.c:1408
 #, c-format
 msgid "Compression algorithm 0x%x found, but not supported!\n"
 msgstr ""
@@ -7782,7 +7825,7 @@
 msgid "Got Program Name or Data Stream. Ignored.\n"
 msgstr ""
 
-#: src/stored/bextract.c:592 src/filed/restore.c:807
+#: src/stored/bextract.c:592 src/filed/restore.c:325 src/filed/restore.c:1027
 #, c-format
 msgid "Unknown stream=%d ignored. This shouldn't happen!\n"
 msgstr ""
@@ -7807,7 +7850,7 @@
 "\n"
 msgstr ""
 
-#: src/stored/bcopy.c:204 src/stored/device.c:298 src/stored/btape.c:472
+#: src/stored/bcopy.c:204 src/stored/device.c:298 src/stored/btape.c:473
 #, c-format
 msgid "dev open failed: %s\n"
 msgstr ""
@@ -7839,7 +7882,7 @@
 msgstr ""
 
 #: src/stored/bcopy.c:282 src/stored/bcopy.c:290 src/stored/bcopy.c:318
-#: src/stored/btape.c:2750
+#: src/stored/btape.c:2754
 #, c-format
 msgid "Cannot fixup device error. %s\n"
 msgstr ""
@@ -7977,85 +8020,89 @@
 msgid "Unexpected Tape is Off-line\n"
 msgstr ""
 
-#: src/stored/acquire.c:71
+#: src/stored/acquire.c:70
 #, c-format
 msgid "Acquire read: num_writers=%d not zero. Job %d canceled.\n"
 msgstr ""
 
-#: src/stored/acquire.c:80
+#: src/stored/acquire.c:79
 #, c-format
 msgid "No volumes specified for reading. Job %s canceled.\n"
 msgstr ""
 
-#: src/stored/acquire.c:89
+#: src/stored/acquire.c:88
 #, c-format
 msgid "Logic error: no next volume to read. Numvol=%d Curvol=%d\n"
 msgstr ""
 
-#: src/stored/acquire.c:115
+#: src/stored/acquire.c:95 src/stored/acquire.c:163 src/stored/acquire.c:431
+msgid "generate_plugin_event(bsdEventDeviceOpen) Failed\n"
+msgstr ""
+
+#: src/stored/acquire.c:119
 #, c-format
 msgid ""
 "Changing read device. Want Media Type=\"%s\" have=\"%s\"\n"
 "  device=%s\n"
 msgstr ""
 
-#: src/stored/acquire.c:152
+#: src/stored/acquire.c:159
 #, c-format
 msgid "Media Type change.  New read device %s chosen.\n"
 msgstr ""
 
-#: src/stored/acquire.c:165
+#: src/stored/acquire.c:175
 #, c-format
 msgid "No suitable device found to read Volume \"%s\"\n"
 msgstr ""
 
-#: src/stored/acquire.c:205
+#: src/stored/acquire.c:214
 #, c-format
 msgid "Job %s canceled.\n"
 msgstr ""
 
-#: src/stored/acquire.c:223
+#: src/stored/acquire.c:232
 #, c-format
 msgid "Read open device %s Volume \"%s\" failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/acquire.c:313
+#: src/stored/acquire.c:322
 #, c-format
 msgid "Too many errors trying to mount device %s for reading.\n"
 msgstr ""
 
-#: src/stored/acquire.c:322
+#: src/stored/acquire.c:330
 #, c-format
 msgid "Ready to read from volume \"%s\" on device %s.\n"
 msgstr ""
 
-#: src/stored/acquire.c:370
+#: src/stored/acquire.c:383
 #, c-format
 msgid "Want to append, but device %s is busy reading.\n"
 msgstr ""
 
-#: src/stored/acquire.c:403
+#: src/stored/acquire.c:416
 #, c-format
 msgid "Could not ready device %s for append.\n"
 msgstr ""
 
-#: src/stored/acquire.c:488 src/stored/spool.c:322 src/stored/block.c:368
+#: src/stored/acquire.c:508 src/stored/spool.c:321 src/stored/block.c:368
 #: src/stored/block.c:738 src/stored/block.c:812
 #, c-format
 msgid "Could not create JobMedia record for Volume=\"%s\" Job=%s\n"
 msgstr ""
 
-#: src/stored/acquire.c:538
+#: src/stored/acquire.c:559
 #, c-format
 msgid "Alert: %s"
 msgstr ""
 
-#: src/stored/acquire.c:546
+#: src/stored/acquire.c:567
 #, c-format
 msgid "3997 Bad alert command: %s: ERR=%s.\n"
 msgstr ""
 
-#: src/stored/acquire.c:616 src/stored/dev.c:263 src/stored/dev.c:281
+#: src/stored/acquire.c:637 src/stored/dev.c:263 src/stored/dev.c:281
 #: src/stored/dev.c:287 src/stored/dev.c:298 src/lib/openssl.c:122
 #: src/lib/openssl.c:181
 #, c-format
@@ -8161,17 +8208,17 @@
 msgid "No Volume names found for restore.\n"
 msgstr ""
 
-#: src/stored/read.c:121
+#: src/stored/read.c:120
 #, c-format
 msgid ">filed: Error Hdr=%s\n"
 msgstr ""
 
-#: src/stored/read.c:122 src/stored/read.c:137
+#: src/stored/read.c:121 src/stored/read.c:136
 #, c-format
 msgid "Error sending to File daemon. ERR=%s\n"
 msgstr ""
 
-#: src/stored/read.c:136
+#: src/stored/read.c:135
 #, c-format
 msgid "Error sending to FD. ERR=%s\n"
 msgstr ""
@@ -8298,12 +8345,12 @@
 msgid "3996 Open bpipe failed.\n"
 msgstr ""
 
-#: src/stored/autochanger.c:621 src/console/console.c:1454
+#: src/stored/autochanger.c:621 src/console/console.c:1458
 #, c-format
 msgid "Autochanger error: ERR=%s\n"
 msgstr ""
 
-#: src/stored/stored.c:100
+#: src/stored/stored.c:87
 #, c-format
 msgid ""
 "\n"
@@ -8325,66 +8372,66 @@
 "\n"
 msgstr ""
 
-#: src/stored/stored.c:152 src/stored/btape.c:178
+#: src/stored/stored.c:136 src/stored/btape.c:178
 #, c-format
 msgid "Tape block size (%d) not multiple of system size (%d)\n"
 msgstr ""
 
-#: src/stored/stored.c:156 src/stored/btape.c:182
+#: src/stored/stored.c:140 src/stored/btape.c:182
 #, c-format
 msgid "Tape block size (%d) is not a power of 2\n"
 msgstr ""
 
-#: src/stored/stored.c:284
+#: src/stored/stored.c:268
 msgid "Volume Session Time is ZERO!\n"
 msgstr ""
 
-#: src/stored/stored.c:305
+#: src/stored/stored.c:277
 #, c-format
 msgid "Unable to create thread. ERR=%s\n"
 msgstr ""
 
-#: src/stored/stored.c:338 src/stored/bscan.c:262
+#: src/stored/stored.c:310 src/stored/bscan.c:262
 #, c-format
 msgid "No Storage resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:344
+#: src/stored/stored.c:316
 #, c-format
 msgid "Only one Storage resource permitted in %s\n"
 msgstr ""
 
-#: src/stored/stored.c:349
+#: src/stored/stored.c:321
 #, c-format
 msgid "No Director resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:354
+#: src/stored/stored.c:326
 #, c-format
 msgid "No Device resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:362
+#: src/stored/stored.c:334
 #, c-format
 msgid "No Messages resource defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:369 src/stored/bscan.c:270
+#: src/stored/stored.c:341 src/stored/bscan.c:270
 #, c-format
 msgid "No Working Directory defined in %s. Cannot continue.\n"
 msgstr ""
 
-#: src/stored/stored.c:391
+#: src/stored/stored.c:363
 #, c-format
 msgid "\"TLS Certificate\" file not defined for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/stored/stored.c:397
+#: src/stored/stored.c:369
 #, c-format
 msgid "\"TLS Key\" file not defined for Storage \"%s\" in %s.\n"
 msgstr ""
 
-#: src/stored/stored.c:403
+#: src/stored/stored.c:375
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
@@ -8392,17 +8439,17 @@
 "using \"TLS Verify Peer\".\n"
 msgstr ""
 
-#: src/stored/stored.c:539
+#: src/stored/stored.c:511
 #, c-format
 msgid "Could not initialize %s\n"
 msgstr ""
 
-#: src/stored/stored.c:552
+#: src/stored/stored.c:525
 #, c-format
 msgid "Could not open device %s\n"
 msgstr ""
 
-#: src/stored/stored.c:566
+#: src/stored/stored.c:539
 #, c-format
 msgid "Could not mount device %s\n"
 msgstr ""
@@ -8442,41 +8489,41 @@
 msgid "Unable to open archive %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:165
+#: src/stored/fd_cmds.c:166
 #, c-format
 msgid "Command error with FD, hanging up. %s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:168
+#: src/stored/fd_cmds.c:169
 msgid "Command error with FD, hanging up.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:179
+#: src/stored/fd_cmds.c:180
 #, c-format
 msgid "FD command not found: %s\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:205
+#: src/stored/fd_cmds.c:206
 msgid "Append data error.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:210
+#: src/stored/fd_cmds.c:211
 msgid "Attempt to append on non-open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:222 src/stored/fd_cmds.c:265
+#: src/stored/fd_cmds.c:223 src/stored/fd_cmds.c:266
 msgid "Attempt to close non-open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:240
+#: src/stored/fd_cmds.c:241
 msgid "Attempt to open already open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:294
+#: src/stored/fd_cmds.c:295
 msgid "Attempt to read on non-open session.\n"
 msgstr ""
 
-#: src/stored/fd_cmds.c:312 src/stored/fd_cmds.c:321
+#: src/stored/fd_cmds.c:313 src/stored/fd_cmds.c:322
 msgid "Attempt to open read on non-open session.\n"
 msgstr ""
 
@@ -8601,7 +8648,7 @@
 "Invalid tape position on volume \"%s\" on device %s. Expected %d, got %d\n"
 msgstr ""
 
-#: src/stored/mount.c:864 src/stored/btape.c:3116
+#: src/stored/mount.c:864 src/stored/btape.c:3120
 #, c-format
 msgid "Cannot open Dev=%s, Vol=%s\n"
 msgstr ""
@@ -8682,103 +8729,103 @@
 msgid "Writing spooled data to Volume. Despooling %s bytes ...\n"
 msgstr ""
 
-#: src/stored/spool.c:340
+#: src/stored/spool.c:339
 #, c-format
 msgid ""
 "Despooling elapsed time = %02d:%02d:%02d, Transfer rate = %s Bytes/second\n"
 msgstr ""
 
-#: src/stored/spool.c:349 src/stored/spool.c:548 src/stored/spool.c:594
+#: src/stored/spool.c:348 src/stored/spool.c:546 src/stored/spool.c:592
 #, c-format
 msgid "Ftruncate spool file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:409
+#: src/stored/spool.c:407
 #, c-format
 msgid "Spool header read error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:412
+#: src/stored/spool.c:410
 #, c-format
 msgid "Spool read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:413
+#: src/stored/spool.c:411
 #, c-format
 msgid "Spool header read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:420 src/stored/spool.c:421
+#: src/stored/spool.c:418 src/stored/spool.c:419
 #, c-format
 msgid "Spool block too big. Max %u bytes, got %u\n"
 msgstr ""
 
-#: src/stored/spool.c:427 src/stored/spool.c:428
+#: src/stored/spool.c:425 src/stored/spool.c:426
 #, c-format
 msgid "Spool data read error. Wanted %u bytes, got %d\n"
 msgstr ""
 
-#: src/stored/spool.c:489
+#: src/stored/spool.c:487
 msgid "User specified spool size reached.\n"
 msgstr ""
 
-#: src/stored/spool.c:491
+#: src/stored/spool.c:489
 msgid "Bad return from despool in write_block.\n"
 msgstr ""
 
-#: src/stored/spool.c:499
+#: src/stored/spool.c:497
 msgid "Spooling data again ...\n"
 msgstr ""
 
-#: src/stored/spool.c:531
+#: src/stored/spool.c:529
 #, c-format
 msgid "Error writing header to spool file. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:536
+#: src/stored/spool.c:534
 #, c-format
 msgid ""
 "Error writing header to spool file. Disk probably full. Attempting recovery. "
 "Wanted to write=%d got=%d\n"
 msgstr ""
 
-#: src/stored/spool.c:554 src/stored/spool.c:600
+#: src/stored/spool.c:552 src/stored/spool.c:598
 msgid "Fatal despooling error."
 msgstr ""
 
-#: src/stored/spool.c:562
+#: src/stored/spool.c:560
 msgid "Retrying after header spooling error failed.\n"
 msgstr ""
 
-#: src/stored/spool.c:578
+#: src/stored/spool.c:576
 #, c-format
 msgid "Error writing data to spool file. ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:611
+#: src/stored/spool.c:609
 msgid "Retrying after data spooling error failed.\n"
 msgstr ""
 
-#: src/stored/spool.c:681
+#: src/stored/spool.c:679
 msgid "Network error on BlastAttributes.\n"
 msgstr ""
 
-#: src/stored/spool.c:705 src/stored/spool.c:729
+#: src/stored/spool.c:703 src/stored/spool.c:727
 #, c-format
 msgid "Fseek on attributes file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:717
+#: src/stored/spool.c:715
 #, c-format
 msgid "Truncate on attributes file failed: ERR=%s\n"
 msgstr ""
 
-#: src/stored/spool.c:742
+#: src/stored/spool.c:739
 #, c-format
 msgid "Sending spooled attrs to the Director. Despooling %s bytes ...\n"
 msgstr ""
 
-#: src/stored/spool.c:768
+#: src/stored/spool.c:765
 #, c-format
 msgid "fopen attr spool file %s failed: ERR=%s\n"
 msgstr ""
@@ -8818,8 +8865,8 @@
 msgid "Warning: unknown resource type %d\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:552 src/stored/stored_conf.c:642
-#: src/stored/stored_conf.c:677 src/wx-console/console_conf.c:164
+#: src/stored/stored_conf.c:555 src/stored/stored_conf.c:645
+#: src/stored/stored_conf.c:680 src/wx-console/console_conf.c:164
 #: src/wx-console/console_conf.c:239 src/wx-console/console_conf.c:284
 #: src/wx-console/console_conf.c:311 src/console/console_conf.c:157
 #: src/console/console_conf.c:233 src/console/console_conf.c:278
@@ -8831,27 +8878,27 @@
 msgid "Unknown resource type %d\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:581
+#: src/stored/stored_conf.c:584
 #, c-format
 msgid "\"%s\" item is required in \"%s\" resource, but not found.\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:587
+#: src/stored/stored_conf.c:590
 #, c-format
 msgid "Too many items in \"%s\" resource\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:621
+#: src/stored/stored_conf.c:624
 #, c-format
 msgid "Cannot find AutoChanger resource %s\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:637
+#: src/stored/stored_conf.c:640
 #, c-format
 msgid "Unable to init lock: ERR=%s\n"
 msgstr ""
 
-#: src/stored/stored_conf.c:695
+#: src/stored/stored_conf.c:698
 #, c-format
 msgid ""
 "Attempt to define second \"%s\" resource named \"%s\" is not permitted.\n"
@@ -9003,7 +9050,7 @@
 msgid "ioctl MTFSF error on %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/dev.c:1194 src/stored/btape.c:1974
+#: src/stored/dev.c:1194 src/stored/btape.c:1975
 #, c-format
 msgid "read error on %s. ERR=%s.\n"
 msgstr ""
@@ -9152,12 +9199,12 @@
 msgstr ""
 
 #: src/stored/bscan.c:302 src/tools/bvfs_test.c:215 src/tools/bbatch.c:201
-#: src/tools/bbatch.c:250 src/tools/ing_test.c:190
+#: src/tools/bbatch.c:250 src/tools/ing_test.c:191
 msgid "Could not init Bacula database\n"
 msgstr ""
 
 #: src/stored/bscan.c:309 src/tools/bvfs_test.c:224 src/tools/bbatch.c:257
-#: src/tools/ing_test.c:199
+#: src/tools/ing_test.c:200
 #, c-format
 msgid "Using Database: %s, User: %s\n"
 msgstr ""
@@ -9458,21 +9505,21 @@
 msgid "Updated MD5/SHA1 record\n"
 msgstr ""
 
-#: src/stored/job.c:230
+#: src/stored/job.c:231
 #, c-format
 msgid "FD connect failed: Job name not found: %s\n"
 msgstr ""
 
-#: src/stored/job.c:240
+#: src/stored/job.c:241
 #, c-format
 msgid "Hey!!!! JobId %u Job %s already authenticated.\n"
 msgstr ""
 
-#: src/stored/job.c:257
+#: src/stored/job.c:258
 msgid "Unable to authenticate File daemon\n"
 msgstr ""
 
-#: src/stored/job.c:386
+#: src/stored/job.c:387
 msgid "In free_jcr(), but still attached to device!!!!\n"
 msgstr ""
 
@@ -9517,140 +9564,140 @@
 msgid "btape only works with tape storage.\n"
 msgstr ""
 
-#: src/stored/btape.c:382
+#: src/stored/btape.c:383
 #, c-format
 msgid "Total Volume bytes=%sB. Total Write rate = %sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:408
+#: src/stored/btape.c:409
 #, c-format
 msgid "Volume bytes=%sB. Write rate = %sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:476
+#: src/stored/btape.c:477
 #, c-format
 msgid "open device %s: OK\n"
 msgstr ""
 
-#: src/stored/btape.c:499
+#: src/stored/btape.c:500
 msgid "Enter Volume Name: "
 msgstr ""
 
-#: src/stored/btape.c:506
+#: src/stored/btape.c:507
 #, c-format
 msgid "Device open failed. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:511
+#: src/stored/btape.c:512
 #, c-format
 msgid "Wrote Volume label for volume \"%s\".\n"
 msgstr ""
 
-#: src/stored/btape.c:525
+#: src/stored/btape.c:526
 msgid "Volume has no label.\n"
 msgstr ""
 
-#: src/stored/btape.c:528
+#: src/stored/btape.c:529
 msgid "Volume label read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:531
+#: src/stored/btape.c:532
 #, c-format
 msgid "I/O error on device: ERR=%s"
 msgstr ""
 
-#: src/stored/btape.c:534
+#: src/stored/btape.c:535
 msgid "Volume name error\n"
 msgstr ""
 
-#: src/stored/btape.c:537
+#: src/stored/btape.c:538
 #, c-format
 msgid "Error creating label. ERR=%s"
 msgstr ""
 
-#: src/stored/btape.c:540
+#: src/stored/btape.c:541
 msgid "Volume version error.\n"
 msgstr ""
 
-#: src/stored/btape.c:543
+#: src/stored/btape.c:544
 msgid "Bad Volume label type.\n"
 msgstr ""
 
-#: src/stored/btape.c:546
+#: src/stored/btape.c:547
 msgid "Unknown error.\n"
 msgstr ""
 
-#: src/stored/btape.c:564
+#: src/stored/btape.c:565
 #, c-format
 msgid "Bad status from load. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:566
+#: src/stored/btape.c:567
 #, c-format
 msgid "Loaded %s\n"
 msgstr ""
 
-#: src/stored/btape.c:575 src/stored/btape.c:1136 src/stored/btape.c:1209
-#: src/stored/btape.c:1289 src/stored/btape.c:1560
+#: src/stored/btape.c:576 src/stored/btape.c:1137 src/stored/btape.c:1210
+#: src/stored/btape.c:1290 src/stored/btape.c:1561
 #, c-format
 msgid "Bad status from rewind. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:578 src/stored/btape.c:1568
+#: src/stored/btape.c:579 src/stored/btape.c:1569
 #, c-format
 msgid "Rewound %s\n"
 msgstr ""
 
-#: src/stored/btape.c:604 src/stored/btape.c:1572
+#: src/stored/btape.c:605 src/stored/btape.c:1573
 #, c-format
 msgid "Bad status from weof. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:608
+#: src/stored/btape.c:609
 #, c-format
 msgid "Wrote 1 EOF to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:611
+#: src/stored/btape.c:612
 #, c-format
 msgid "Wrote %d EOFs to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:629
+#: src/stored/btape.c:630
 msgid "Moved to end of medium.\n"
 msgstr ""
 
-#: src/stored/btape.c:656
+#: src/stored/btape.c:657
 #, c-format
 msgid "Bad status from bsf. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:658
+#: src/stored/btape.c:659
 #, c-format
 msgid "Backspaced %d file%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:675
+#: src/stored/btape.c:676
 #, c-format
 msgid "Bad status from bsr. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:677
+#: src/stored/btape.c:678
 #, c-format
 msgid "Backspaced %d record%s.\n"
 msgstr ""
 
-#: src/stored/btape.c:705
+#: src/stored/btape.c:706
 #, c-format
 msgid "Device status:\n"
 msgstr ""
 
-#: src/stored/btape.c:724
+#: src/stored/btape.c:725
 #, c-format
 msgid "Status:\n"
 msgstr ""
 
-#: src/stored/btape.c:739
+#: src/stored/btape.c:740
 msgid ""
 "Test writing larger and larger records.\n"
 "This is a torture test for records.\n"
@@ -9659,24 +9706,24 @@
 "plus the header exceeds the block size (by default about 64K)\n"
 msgstr ""
 
-#: src/stored/btape.c:745
+#: src/stored/btape.c:746
 msgid "Do you want to continue? (y/n): "
 msgstr ""
 
-#: src/stored/btape.c:747 src/stored/btape.c:2197
+#: src/stored/btape.c:748 src/stored/btape.c:2198
 msgid "Command aborted.\n"
 msgstr ""
 
-#: src/stored/btape.c:763
+#: src/stored/btape.c:764
 #, c-format
 msgid "Block %d i=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:789
+#: src/stored/btape.c:790
 msgid "Skipping read backwards test because BSR turned off.\n"
 msgstr ""
 
-#: src/stored/btape.c:793
+#: src/stored/btape.c:794
 msgid ""
 "\n"
 "=== Write, backup, and re-read test ===\n"
@@ -9690,73 +9737,73 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:806 src/stored/btape.c:817 src/stored/btape.c:828
-#: src/stored/btape.c:1146 src/stored/btape.c:1162 src/stored/btape.c:1904
-#: src/stored/btape.c:2817
+#: src/stored/btape.c:807 src/stored/btape.c:818 src/stored/btape.c:829
+#: src/stored/btape.c:1147 src/stored/btape.c:1163 src/stored/btape.c:1905
+#: src/stored/btape.c:2821
 msgid "Error writing record to block.\n"
 msgstr ""
 
-#: src/stored/btape.c:810 src/stored/btape.c:821 src/stored/btape.c:832
-#: src/stored/btape.c:1150 src/stored/btape.c:1166 src/stored/btape.c:1908
-#: src/stored/btape.c:2821
+#: src/stored/btape.c:811 src/stored/btape.c:822 src/stored/btape.c:833
+#: src/stored/btape.c:1151 src/stored/btape.c:1167 src/stored/btape.c:1909
+#: src/stored/btape.c:2825
 msgid "Error writing block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:813
+#: src/stored/btape.c:814
 #, c-format
 msgid "Wrote first record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:824
+#: src/stored/btape.c:825
 #, c-format
 msgid "Wrote second record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:835
+#: src/stored/btape.c:836
 #, c-format
 msgid "Wrote third record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:842 src/stored/btape.c:847
+#: src/stored/btape.c:843 src/stored/btape.c:848
 #, c-format
 msgid "Backspace file failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:851
+#: src/stored/btape.c:852
 msgid "Backspaced over EOF OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:853
+#: src/stored/btape.c:854
 #, c-format
 msgid "Backspace record failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:856
+#: src/stored/btape.c:857
 msgid "Backspace record OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:859 src/stored/btape.c:865
+#: src/stored/btape.c:860 src/stored/btape.c:866
 #, c-format
 msgid "Read block failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:870
+#: src/stored/btape.c:871
 msgid "Bad data in record. Test failed!\n"
 msgstr ""
 
-#: src/stored/btape.c:874
+#: src/stored/btape.c:875
 msgid ""
 "\n"
 "Block re-read correct. Test succeeded!\n"
 msgstr ""
 
-#: src/stored/btape.c:875
+#: src/stored/btape.c:876
 msgid ""
 "=== End Write, backup, and re-read test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:882
+#: src/stored/btape.c:883
 msgid ""
 "This is not terribly serious since Bacula only uses\n"
 "this function to verify the last block written to the\n"
@@ -9768,50 +9815,50 @@
 "to your Storage daemon's Device resource definition.\n"
 msgstr ""
 
-#: src/stored/btape.c:904
+#: src/stored/btape.c:905
 #, c-format
 msgid "Begin writing %i files of %sB with raw blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:925 src/stored/btape.c:2873
+#: src/stored/btape.c:926 src/stored/btape.c:2877
 #, c-format
 msgid "Write failed at block %u. stat=%d ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:959
+#: src/stored/btape.c:960
 #, c-format
 msgid "Begin writing %i files of %sB with blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:968
+#: src/stored/btape.c:969
 msgid ""
 "\n"
 "Error writing record to block.\n"
 msgstr ""
 
-#: src/stored/btape.c:972
+#: src/stored/btape.c:973
 msgid ""
 "\n"
 "Error writing block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:1027
+#: src/stored/btape.c:1028
 msgid "The file_size is too big, stop this test with Ctrl-c.\n"
 msgstr ""
 
-#: src/stored/btape.c:1055
+#: src/stored/btape.c:1056
 msgid "Test with zero data, should give the maximum throughput.\n"
 msgstr ""
 
-#: src/stored/btape.c:1067 src/stored/btape.c:1093
+#: src/stored/btape.c:1068 src/stored/btape.c:1094
 msgid "Test with random data, should give the minimum throughput.\n"
 msgstr ""
 
-#: src/stored/btape.c:1082
+#: src/stored/btape.c:1083
 msgid "Test with zero data and bacula block structure.\n"
 msgstr ""
 
-#: src/stored/btape.c:1122
+#: src/stored/btape.c:1123
 #, c-format
 msgid ""
 "\n"
@@ -9825,66 +9872,66 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1154 src/stored/btape.c:1170
+#: src/stored/btape.c:1155 src/stored/btape.c:1171
 #, c-format
 msgid "Wrote %d blocks of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1212 src/stored/btape.c:1292
+#: src/stored/btape.c:1213 src/stored/btape.c:1293
 msgid "Rewind OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1225 src/stored/btape.c:1344
+#: src/stored/btape.c:1226 src/stored/btape.c:1345
 msgid "Got EOF on tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:1230
+#: src/stored/btape.c:1231
 #, c-format
 msgid "Read block %d failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1236
+#: src/stored/btape.c:1237
 #, c-format
 msgid "Read record failed. Block %d! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1242 src/stored/btape.c:1374
+#: src/stored/btape.c:1243 src/stored/btape.c:1375
 #, c-format
 msgid "Bad data in record. Expected %d, got %d at byte %d. Test failed!\n"
 msgstr ""
 
-#: src/stored/btape.c:1249
+#: src/stored/btape.c:1250
 #, c-format
 msgid "%d blocks re-read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:1252 src/stored/btape.c:1381
+#: src/stored/btape.c:1253 src/stored/btape.c:1382
 msgid ""
 "=== Test Succeeded. End Write, rewind, and re-read test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1280
+#: src/stored/btape.c:1281
 msgid "Block position test\n"
 msgstr ""
 
-#: src/stored/btape.c:1335
+#: src/stored/btape.c:1336
 #, c-format
 msgid "Reposition to file:block %d:%d\n"
 msgstr ""
 
-#: src/stored/btape.c:1337
+#: src/stored/btape.c:1338
 msgid "Reposition error.\n"
 msgstr ""
 
-#: src/stored/btape.c:1350
+#: src/stored/btape.c:1351
 #, c-format
 msgid ""
 "Read block %d failed! file=%d blk=%d. ERR=%s\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1352
+#: src/stored/btape.c:1353
 msgid ""
 "This may be because the tape drive block size is not\n"
 " set to variable blocking as normally used by Bacula.\n"
@@ -9898,17 +9945,17 @@
 " in your Device resource.\n"
 msgstr ""
 
-#: src/stored/btape.c:1368
+#: src/stored/btape.c:1369
 #, c-format
 msgid "Read record failed! ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1379
+#: src/stored/btape.c:1380
 #, c-format
 msgid "Block %d re-read correctly.\n"
 msgstr ""
 
-#: src/stored/btape.c:1400
+#: src/stored/btape.c:1401
 msgid ""
 "\n"
 "\n"
@@ -9922,58 +9969,58 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1424
+#: src/stored/btape.c:1425
 msgid "Now moving to end of medium.\n"
 msgstr ""
 
-#: src/stored/btape.c:1426 src/stored/btape.c:1655
+#: src/stored/btape.c:1427 src/stored/btape.c:1656
 #, c-format
 msgid "We should be in file 3. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1427 src/stored/btape.c:1445 src/stored/btape.c:1644
-#: src/stored/btape.c:1656 src/stored/btape.c:1669 src/stored/btape.c:1686
+#: src/stored/btape.c:1428 src/stored/btape.c:1446 src/stored/btape.c:1645
+#: src/stored/btape.c:1657 src/stored/btape.c:1670 src/stored/btape.c:1687
 msgid "This is correct!"
 msgstr ""
 
-#: src/stored/btape.c:1427 src/stored/btape.c:1445 src/stored/btape.c:1644
-#: src/stored/btape.c:1656 src/stored/btape.c:1669 src/stored/btape.c:1686
+#: src/stored/btape.c:1428 src/stored/btape.c:1446 src/stored/btape.c:1645
+#: src/stored/btape.c:1657 src/stored/btape.c:1670 src/stored/btape.c:1687
 msgid "This is NOT correct!!!!"
 msgstr ""
 
-#: src/stored/btape.c:1433
+#: src/stored/btape.c:1434
 msgid ""
 "\n"
 "Now the important part, I am going to attempt to append to the tape.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1440
+#: src/stored/btape.c:1441
 msgid ""
 "Done appending, there should be no I/O errors\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1441
+#: src/stored/btape.c:1442
 msgid "Doing Bacula scan of blocks:\n"
 msgstr ""
 
-#: src/stored/btape.c:1443
+#: src/stored/btape.c:1444
 msgid "End scanning the tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:1444 src/stored/btape.c:1668
+#: src/stored/btape.c:1445 src/stored/btape.c:1669
 #, c-format
 msgid "We should be in file 4. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1469
+#: src/stored/btape.c:1470
 msgid ""
 "\n"
 "Autochanger enabled, but no name or no command device specified.\n"
 msgstr ""
 
-#: src/stored/btape.c:1473
+#: src/stored/btape.c:1474
 msgid ""
 "\n"
 "Ah, I see you have an autochanger configured.\n"
@@ -9981,13 +10028,13 @@
 " that I can write on in Slot 1.\n"
 msgstr ""
 
-#: src/stored/btape.c:1476
+#: src/stored/btape.c:1477
 msgid ""
 "\n"
 "Do you wish to continue with the Autochanger test? (y/n): "
 msgstr ""
 
-#: src/stored/btape.c:1483
+#: src/stored/btape.c:1484
 msgid ""
 "\n"
 "\n"
@@ -9995,74 +10042,74 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1492
+#: src/stored/btape.c:1493
 msgid "3301 Issuing autochanger \"loaded\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1501
+#: src/stored/btape.c:1502
 #, c-format
 msgid "3991 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1502
+#: src/stored/btape.c:1503
 #, c-format
 msgid "3991 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1506
+#: src/stored/btape.c:1507
 #, c-format
 msgid "Slot %d loaded. I am going to unload it.\n"
 msgstr ""
 
-#: src/stored/btape.c:1508
+#: src/stored/btape.c:1509
 msgid "Nothing loaded in the drive. OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1515
+#: src/stored/btape.c:1516
 #, c-format
 msgid "3302 Issuing autochanger \"unload %d %d\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1520
+#: src/stored/btape.c:1521
 #, c-format
 msgid "unload status=%s %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1520
+#: src/stored/btape.c:1521
 msgid "Bad"
 msgstr ""
 
-#: src/stored/btape.c:1523
+#: src/stored/btape.c:1524
 #, c-format
 msgid "3992 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1524
+#: src/stored/btape.c:1525
 #, c-format
 msgid "3992 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1534
+#: src/stored/btape.c:1535
 #, c-format
 msgid "3303 Issuing autochanger \"load %d %d\" command.\n"
 msgstr ""
 
-#: src/stored/btape.c:1542
+#: src/stored/btape.c:1543
 #, c-format
 msgid "3303 Autochanger \"load %d %d\" status is OK.\n"
 msgstr ""
 
-#: src/stored/btape.c:1546
+#: src/stored/btape.c:1547
 #, c-format
 msgid "3993 Bad autochanger command: %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1547
+#: src/stored/btape.c:1548
 #, c-format
 msgid "3993 result=\"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1562
+#: src/stored/btape.c:1563
 msgid ""
 "\n"
 "The test failed, probably because you need to put\n"
@@ -10070,12 +10117,12 @@
 "Adding a 30 second sleep and trying again ...\n"
 msgstr ""
 
-#: src/stored/btape.c:1575
+#: src/stored/btape.c:1576
 #, c-format
 msgid "Wrote EOF to %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1579
+#: src/stored/btape.c:1580
 #, c-format
 msgid ""
 "\n"
@@ -10087,18 +10134,18 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1584
+#: src/stored/btape.c:1585
 msgid ""
 "\n"
 "The test autochanger worked!!\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1595
+#: src/stored/btape.c:1596
 msgid "You must correct this error or the Autochanger will not work.\n"
 msgstr ""
 
-#: src/stored/btape.c:1613
+#: src/stored/btape.c:1614
 msgid ""
 "\n"
 "\n"
@@ -10110,30 +10157,30 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1638
+#: src/stored/btape.c:1639
 msgid "Now forward spacing 1 file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1640 src/stored/btape.c:1652 src/stored/btape.c:1665
-#: src/stored/btape.c:1683 src/stored/btape.c:1859
+#: src/stored/btape.c:1641 src/stored/btape.c:1653 src/stored/btape.c:1666
+#: src/stored/btape.c:1684 src/stored/btape.c:1860
 #, c-format
 msgid "Bad status from fsr. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1643
+#: src/stored/btape.c:1644
 #, c-format
 msgid "We should be in file 1. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1650
+#: src/stored/btape.c:1651
 msgid "Now forward spacing 2 files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1663
+#: src/stored/btape.c:1664
 msgid "Now forward spacing 4 files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1675
+#: src/stored/btape.c:1676
 msgid ""
 "The test worked this time. Please add:\n"
 "\n"
@@ -10142,35 +10189,35 @@
 "to your Device resource for this drive.\n"
 msgstr ""
 
-#: src/stored/btape.c:1681
+#: src/stored/btape.c:1682
 msgid "Now forward spacing 1 more file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1685
+#: src/stored/btape.c:1686
 #, c-format
 msgid "We should be in file 5. I am at file %d. %s\n"
 msgstr ""
 
-#: src/stored/btape.c:1690
+#: src/stored/btape.c:1691
 msgid ""
 "\n"
 "=== End Forward space files test ===\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1694
+#: src/stored/btape.c:1695
 msgid ""
 "\n"
 "The forward space file test failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:1696
+#: src/stored/btape.c:1697
 msgid ""
 "You have Fast Forward Space File enabled.\n"
 "I am turning it off then retrying the test.\n"
 msgstr ""
 
-#: src/stored/btape.c:1702
+#: src/stored/btape.c:1703
 msgid ""
 "You must correct this error or Bacula will not work.\n"
 "Some systems, e.g. OpenBSD, require you to set\n"
@@ -10178,7 +10225,7 @@
 "in your device resource. Use with caution.\n"
 msgstr ""
 
-#: src/stored/btape.c:1736
+#: src/stored/btape.c:1737
 msgid ""
 "\n"
 "Append test failed. Attempting again.\n"
@@ -10188,7 +10235,7 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1744
+#: src/stored/btape.c:1745
 msgid ""
 "\n"
 "\n"
@@ -10200,14 +10247,14 @@
 "to your Device resource in the Storage conf file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1751
+#: src/stored/btape.c:1752
 msgid ""
 "\n"
 "\n"
 "That appears *NOT* to have corrected the problem.\n"
 msgstr ""
 
-#: src/stored/btape.c:1756
+#: src/stored/btape.c:1757
 msgid ""
 "\n"
 "\n"
@@ -10215,7 +10262,7 @@
 "Setting \"BSF at EOM = yes\" and retrying append test.\n"
 msgstr ""
 
-#: src/stored/btape.c:1761
+#: src/stored/btape.c:1762
 msgid ""
 "\n"
 "\n"
@@ -10228,7 +10275,7 @@
 "to your Device resource in the Storage conf file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1772
+#: src/stored/btape.c:1773
 msgid ""
 "\n"
 "Append test failed.\n"
@@ -10255,7 +10302,7 @@
 "in your device resource. Use with caution.\n"
 msgstr ""
 
-#: src/stored/btape.c:1794
+#: src/stored/btape.c:1795
 msgid ""
 "\n"
 "The above Bacula scan should have output identical to what follows.\n"
@@ -10279,111 +10326,111 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:1837
+#: src/stored/btape.c:1838
 #, c-format
 msgid "Bad status from fsf. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1841
+#: src/stored/btape.c:1842
 msgid "Forward spaced 1 file.\n"
 msgstr ""
 
-#: src/stored/btape.c:1844
+#: src/stored/btape.c:1845
 #, c-format
 msgid "Forward spaced %d files.\n"
 msgstr ""
 
-#: src/stored/btape.c:1863
+#: src/stored/btape.c:1864
 msgid "Forward spaced 1 record.\n"
 msgstr ""
 
-#: src/stored/btape.c:1866
+#: src/stored/btape.c:1867
 #, c-format
 msgid "Forward spaced %d records.\n"
 msgstr ""
 
-#: src/stored/btape.c:1911
+#: src/stored/btape.c:1912
 #, c-format
 msgid "Wrote one record of %d bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1913
+#: src/stored/btape.c:1914
 msgid "Wrote block to device.\n"
 msgstr ""
 
-#: src/stored/btape.c:1927
+#: src/stored/btape.c:1928
 msgid "Enter length to read: "
 msgstr ""
 
-#: src/stored/btape.c:1932
+#: src/stored/btape.c:1933
 msgid "Bad length entered, using default of 1024 bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:1941
+#: src/stored/btape.c:1942
 #, c-format
 msgid "Read of %d bytes gives stat=%d. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1964 src/stored/btape.c:2013
+#: src/stored/btape.c:1965 src/stored/btape.c:2014
 #, c-format
 msgid "End of tape\n"
 msgstr ""
 
-#: src/stored/btape.c:1969
+#: src/stored/btape.c:1970
 #, c-format
 msgid "Starting scan at file %u\n"
 msgstr ""
 
-#: src/stored/btape.c:1976
+#: src/stored/btape.c:1977
 #, c-format
 msgid "Bad status from read %d. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:1979 src/stored/btape.c:1993 src/stored/btape.c:2057
-#: src/stored/btape.c:2069 src/stored/btape.c:2082 src/stored/btape.c:2098
+#: src/stored/btape.c:1980 src/stored/btape.c:1994 src/stored/btape.c:2058
+#: src/stored/btape.c:2070 src/stored/btape.c:2083 src/stored/btape.c:2099
 #, c-format
 msgid "1 block of %d bytes in file %d\n"
 msgstr ""
 
-#: src/stored/btape.c:1982 src/stored/btape.c:1996 src/stored/btape.c:2060
-#: src/stored/btape.c:2072 src/stored/btape.c:2085 src/stored/btape.c:2101
+#: src/stored/btape.c:1983 src/stored/btape.c:1997 src/stored/btape.c:2061
+#: src/stored/btape.c:2073 src/stored/btape.c:2086 src/stored/btape.c:2102
 #, c-format
 msgid "%d blocks of %d bytes in file %d\n"
 msgstr ""
 
-#: src/stored/btape.c:2004 src/stored/btape.c:2076
+#: src/stored/btape.c:2005 src/stored/btape.c:2077
 #, c-format
 msgid "End of File mark.\n"
 msgstr ""
 
-#: src/stored/btape.c:2025 src/stored/btape.c:2129
+#: src/stored/btape.c:2026 src/stored/btape.c:2130
 #, c-format
 msgid "Total files=%d, blocks=%d, bytes = %s\n"
 msgstr ""
 
-#: src/stored/btape.c:2089
+#: src/stored/btape.c:2090
 #, c-format
 msgid "Short block read.\n"
 msgstr ""
 
-#: src/stored/btape.c:2092
+#: src/stored/btape.c:2093
 #, c-format
 msgid "Error reading block. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2116
+#: src/stored/btape.c:2117
 #, c-format
 msgid ""
 "Block=%u file,blk=%u,%u blen=%u First rec FI=%s SessId=%u SessTim=%u Strm=%s "
 "rlen=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2138
+#: src/stored/btape.c:2139
 #, c-format
 msgid "Device status: %u. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2170
+#: src/stored/btape.c:2171
 #, c-format
 msgid ""
 "\n"
@@ -10409,79 +10456,79 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2188
+#: src/stored/btape.c:2189
 msgid ""
 "Do you want to run the simplified test (s) with one tape\n"
 "or the complete multiple tape (m) test: (s/m) "
 msgstr ""
 
-#: src/stored/btape.c:2191
+#: src/stored/btape.c:2192
 msgid "Simple test (single tape) selected.\n"
 msgstr ""
 
-#: src/stored/btape.c:2194
+#: src/stored/btape.c:2195
 msgid "Multiple tape test selected.\n"
 msgstr ""
 
-#: src/stored/btape.c:2236
+#: src/stored/btape.c:2237
 msgid "Wrote Start of Session label.\n"
 msgstr ""
 
-#: src/stored/btape.c:2255
+#: src/stored/btape.c:2256
 #, c-format
 msgid "%s Begin writing Bacula records to tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2257
+#: src/stored/btape.c:2258
 #, c-format
 msgid "%s Begin writing Bacula records to first tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2283
+#: src/stored/btape.c:2284
 msgid "Flush block failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:2297
+#: src/stored/btape.c:2298
 #, c-format
 msgid "Wrote block=%u, file,blk=%u,%u VolBytes=%s rate=%sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2308
+#: src/stored/btape.c:2309
 #, c-format
 msgid "%s Flush block, write EOF\n"
 msgstr ""
 
-#: src/stored/btape.c:2317
+#: src/stored/btape.c:2318
 msgid "Wrote 1000 blocks on second tape. Done.\n"
 msgstr ""
 
-#: src/stored/btape.c:2322
+#: src/stored/btape.c:2323
 msgid "Not OK\n"
 msgstr ""
 
-#: src/stored/btape.c:2346
+#: src/stored/btape.c:2347
 msgid "Job canceled.\n"
 msgstr ""
 
-#: src/stored/btape.c:2357
+#: src/stored/btape.c:2358
 msgid "Set ok=false after write_block_to_device.\n"
 msgstr ""
 
-#: src/stored/btape.c:2361
+#: src/stored/btape.c:2362
 msgid "Wrote End of Session label.\n"
 msgstr ""
 
-#: src/stored/btape.c:2385
+#: src/stored/btape.c:2386
 #, c-format
 msgid "Wrote state file last_block_num1=%d last_block_num2=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2389
+#: src/stored/btape.c:2390
 #, c-format
 msgid "Could not create state file: %s ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2400
+#: src/stored/btape.c:2401
 #, c-format
 msgid ""
 "\n"
@@ -10489,7 +10536,7 @@
 "%s Done filling tape at %d:%d. Now beginning re-read of tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2403
+#: src/stored/btape.c:2404
 #, c-format
 msgid ""
 "\n"
@@ -10497,23 +10544,23 @@
 "%s Done filling tapes at %d:%d. Now beginning re-read of first tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2409
+#: src/stored/btape.c:2410
 msgid "do_unfill failed.\n"
 msgstr ""
 
-#: src/stored/btape.c:2414
+#: src/stored/btape.c:2415
 #, c-format
 msgid "%s: Error during test.\n"
 msgstr ""
 
-#: src/stored/btape.c:2449
+#: src/stored/btape.c:2450
 msgid ""
 "\n"
 "The state file level has changed. You must redo\n"
 "the fill command.\n"
 msgstr ""
 
-#: src/stored/btape.c:2456
+#: src/stored/btape.c:2457
 #, c-format
 msgid ""
 "\n"
@@ -10521,95 +10568,95 @@
 "You must redo the fill command.\n"
 msgstr ""
 
-#: src/stored/btape.c:2522
+#: src/stored/btape.c:2523
 msgid "Mount first tape. Press enter when ready: "
 msgstr ""
 
-#: src/stored/btape.c:2538
+#: src/stored/btape.c:2539
 msgid "Rewinding.\n"
 msgstr ""
 
-#: src/stored/btape.c:2543
+#: src/stored/btape.c:2544
 #, c-format
 msgid "Reading the first 10000 records from %u:%u.\n"
 msgstr ""
 
-#: src/stored/btape.c:2547 src/stored/btape.c:2615
+#: src/stored/btape.c:2548 src/stored/btape.c:2616
 #, c-format
 msgid "Reposition from %u:%u to %u:%u\n"
 msgstr ""
 
-#: src/stored/btape.c:2550 src/stored/btape.c:2602 src/stored/btape.c:2618
+#: src/stored/btape.c:2551 src/stored/btape.c:2603 src/stored/btape.c:2619
 #, c-format
 msgid "Reposition error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2553
+#: src/stored/btape.c:2554
 #, c-format
 msgid "Reading block %u.\n"
 msgstr ""
 
-#: src/stored/btape.c:2555 src/stored/btape.c:2607 src/stored/btape.c:2623
+#: src/stored/btape.c:2556 src/stored/btape.c:2608 src/stored/btape.c:2624
 #, c-format
 msgid "Error reading block: ERR=%s\n"
 msgstr ""
 
-#: src/stored/btape.c:2560
+#: src/stored/btape.c:2561
 msgid ""
 "\n"
 "The last block on the tape matches. Test succeeded.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2563
+#: src/stored/btape.c:2564
 msgid ""
 "\n"
 "The last block of the first tape matches.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2587
+#: src/stored/btape.c:2588
 msgid "Mount second tape. Press enter when ready: "
 msgstr ""
 
-#: src/stored/btape.c:2600
+#: src/stored/btape.c:2601
 #, c-format
 msgid "Reposition from %u:%u to 0:1\n"
 msgstr ""
 
-#: src/stored/btape.c:2605 src/stored/btape.c:2621
+#: src/stored/btape.c:2606 src/stored/btape.c:2622
 #, c-format
 msgid "Reading block %d.\n"
 msgstr ""
 
-#: src/stored/btape.c:2611
+#: src/stored/btape.c:2612
 msgid ""
 "\n"
 "The first block on the second tape matches.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2627
+#: src/stored/btape.c:2628
 msgid ""
 "\n"
 "The last block on the second tape matches. Test succeeded.\n"
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:2644
+#: src/stored/btape.c:2645
 #, c-format
 msgid "10000 records read now at %d:%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2667 src/stored/btape.c:2678 src/stored/btape.c:2723
+#: src/stored/btape.c:2671 src/stored/btape.c:2682 src/stored/btape.c:2727
 msgid "Last block written"
 msgstr ""
 
-#: src/stored/btape.c:2669 src/stored/btape.c:2679
+#: src/stored/btape.c:2673 src/stored/btape.c:2683
 msgid "Block read back"
 msgstr ""
 
-#: src/stored/btape.c:2670
+#: src/stored/btape.c:2674
 #, c-format
 msgid ""
 "\n"
@@ -10617,7 +10664,7 @@
 "The blocks differ at byte %u\n"
 msgstr ""
 
-#: src/stored/btape.c:2671
+#: src/stored/btape.c:2675
 msgid ""
 "\n"
 "\n"
@@ -10627,172 +10674,172 @@
 "to write multi-tape Volumes.!!!!\n"
 msgstr ""
 
-#: src/stored/btape.c:2707
+#: src/stored/btape.c:2711
 #, c-format
 msgid "Last block at: %u:%u this_dev_block_num=%d\n"
 msgstr ""
 
-#: src/stored/btape.c:2721
+#: src/stored/btape.c:2725
 #, c-format
 msgid "Block not written: FileIndex=%u blk_block=%u Size=%u\n"
 msgstr ""
 
-#: src/stored/btape.c:2725
+#: src/stored/btape.c:2729
 msgid "Block not written"
 msgstr ""
 
-#: src/stored/btape.c:2740
+#: src/stored/btape.c:2744
 #, c-format
 msgid "End of tape %d:%d. Volume Bytes=%s. Write rate = %sB/s\n"
 msgstr ""
 
-#: src/stored/btape.c:2791
+#: src/stored/btape.c:2795
 msgid "Test writing blocks of 64512 bytes to tape.\n"
 msgstr ""
 
-#: src/stored/btape.c:2793
+#: src/stored/btape.c:2797
 msgid "How many blocks do you want to write? (1000): "
 msgstr ""
 
-#: src/stored/btape.c:2810
+#: src/stored/btape.c:2814
 #, c-format
 msgid "Begin writing %d Bacula blocks to tape ...\n"
 msgstr ""
 
-#: src/stored/btape.c:2853
+#: src/stored/btape.c:2857
 #, c-format
 msgid "Begin writing raw blocks of %u bytes.\n"
 msgstr ""
 
-#: src/stored/btape.c:2884
+#: src/stored/btape.c:2888
 msgid "test autochanger"
 msgstr ""
 
-#: src/stored/btape.c:2885
+#: src/stored/btape.c:2889
 msgid "backspace file"
 msgstr ""
 
-#: src/stored/btape.c:2886
+#: src/stored/btape.c:2890
 msgid "backspace record"
 msgstr ""
 
-#: src/stored/btape.c:2887
+#: src/stored/btape.c:2891
 msgid "list device capabilities"
 msgstr ""
 
-#: src/stored/btape.c:2888
+#: src/stored/btape.c:2892
 msgid "clear tape errors"
 msgstr ""
 
-#: src/stored/btape.c:2889
+#: src/stored/btape.c:2893
 msgid "go to end of Bacula data for append"
 msgstr ""
 
-#: src/stored/btape.c:2890
+#: src/stored/btape.c:2894
 msgid "go to the physical end of medium"
 msgstr ""
 
-#: src/stored/btape.c:2891
+#: src/stored/btape.c:2895
 msgid "fill tape, write onto second volume"
 msgstr ""
 
-#: src/stored/btape.c:2892
+#: src/stored/btape.c:2896
 msgid "read filled tape"
 msgstr ""
 
-#: src/stored/btape.c:2893
+#: src/stored/btape.c:2897
 msgid "forward space a file"
 msgstr ""
 
-#: src/stored/btape.c:2894
+#: src/stored/btape.c:2898
 msgid "forward space a record"
 msgstr ""
 
-#: src/stored/btape.c:2895
+#: src/stored/btape.c:2899
 msgid "print this command"
 msgstr ""
 
-#: src/stored/btape.c:2896
+#: src/stored/btape.c:2900
 msgid "write a Bacula label to the tape"
 msgstr ""
 
-#: src/stored/btape.c:2897
+#: src/stored/btape.c:2901
 msgid "load a tape"
 msgstr ""
 
-#: src/stored/btape.c:2898
+#: src/stored/btape.c:2902
 msgid "quit btape"
 msgstr ""
 
-#: src/stored/btape.c:2899
+#: src/stored/btape.c:2903
 msgid "use write() to fill tape"
 msgstr ""
 
-#: src/stored/btape.c:2900
+#: src/stored/btape.c:2904
 msgid "read and print the Bacula tape label"
 msgstr ""
 
-#: src/stored/btape.c:2901
+#: src/stored/btape.c:2905
 msgid "test record handling functions"
 msgstr ""
 
-#: src/stored/btape.c:2902
+#: src/stored/btape.c:2906
 msgid "rewind the tape"
 msgstr ""
 
-#: src/stored/btape.c:2903
+#: src/stored/btape.c:2907
 msgid "read() tape block by block to EOT and report"
 msgstr ""
 
-#: src/stored/btape.c:2904
+#: src/stored/btape.c:2908
 msgid "Bacula read block by block to EOT and report"
 msgstr ""
 
-#: src/stored/btape.c:2905
+#: src/stored/btape.c:2909
 msgid ""
 "[file_size=n(GB)|nb_file=3|skip_zero|skip_random|skip_raw|skip_block] report "
 "drive speed"
 msgstr ""
 
-#: src/stored/btape.c:2906
+#: src/stored/btape.c:2910
 msgid "print tape status"
 msgstr ""
 
-#: src/stored/btape.c:2907
+#: src/stored/btape.c:2911
 msgid "General test Bacula tape functions"
 msgstr ""
 
-#: src/stored/btape.c:2908
+#: src/stored/btape.c:2912
 msgid "write an EOF on the tape"
 msgstr ""
 
-#: src/stored/btape.c:2909
+#: src/stored/btape.c:2913
 msgid "write a single Bacula block"
 msgstr ""
 
-#: src/stored/btape.c:2910
+#: src/stored/btape.c:2914
 msgid "read a single record"
 msgstr ""
 
-#: src/stored/btape.c:2911
+#: src/stored/btape.c:2915
 msgid "read a single Bacula block"
 msgstr ""
 
-#: src/stored/btape.c:2912
+#: src/stored/btape.c:2916
 msgid "quick fill command"
 msgstr ""
 
-#: src/stored/btape.c:2933
+#: src/stored/btape.c:2937
 #, c-format
 msgid "\"%s\" is an invalid command\n"
 msgstr ""
 
-#: src/stored/btape.c:2942
+#: src/stored/btape.c:2946
 #, c-format
 msgid "Interactive commands:\n"
 msgstr ""
 
-#: src/stored/btape.c:2953
+#: src/stored/btape.c:2957
 #, c-format
 msgid ""
 "\n"
@@ -10810,89 +10857,89 @@
 "\n"
 msgstr ""
 
-#: src/stored/btape.c:3041
+#: src/stored/btape.c:3045
 #, c-format
 msgid "Mount second Volume on device %s and press return when ready: "
 msgstr ""
 
-#: src/stored/btape.c:3069
+#: src/stored/btape.c:3073
 #, c-format
 msgid "Mount blank Volume on device %s and press return when ready: "
 msgstr ""
 
-#: src/stored/btape.c:3089
+#: src/stored/btape.c:3093
 #, c-format
 msgid "End of Volume \"%s\" %d records.\n"
 msgstr ""
 
-#: src/stored/btape.c:3103
+#: src/stored/btape.c:3107
 #, c-format
 msgid "Read block=%u, VolBytes=%s rate=%sB/s\n"
 msgstr ""
 
-#: src/stored/authenticate.c:63
+#: src/stored/authenticate.c:61
 #, c-format
 msgid "I only authenticate Directors, not %d\n"
 msgstr ""
 
-#: src/stored/authenticate.c:69 src/filed/authenticate.c:74
+#: src/stored/authenticate.c:67 src/filed/authenticate.c:76
 #, c-format
 msgid "Bad Hello command from Director at %s. Len=%d.\n"
 msgstr ""
 
-#: src/stored/authenticate.c:80 src/filed/authenticate.c:86
+#: src/stored/authenticate.c:78 src/filed/authenticate.c:88
 #, c-format
 msgid "Bad Hello command from Director at %s: %s\n"
 msgstr ""
 
-#: src/stored/authenticate.c:93
+#: src/stored/authenticate.c:92
 #, c-format
 msgid ""
 "Connection from unknown Director %s at %s rejected.\n"
 "Please see "
 msgstr ""
 
-#: src/stored/authenticate.c:130
+#: src/stored/authenticate.c:129
 msgid ""
 "Incorrect password given by Director.\n"
 "Please see "
 msgstr ""
 
-#: src/stored/authenticate.c:138 src/stored/authenticate.c:249
-#: src/filed/authenticate.c:149 src/filed/authenticate.c:268
+#: src/stored/authenticate.c:137 src/stored/authenticate.c:248
+#: src/filed/authenticate.c:151 src/filed/authenticate.c:270
 msgid ""
 "Authorization problem: Remote server did not advertize required TLS "
 "support.\n"
 msgstr ""
 
-#: src/stored/authenticate.c:156
+#: src/stored/authenticate.c:155
 #, c-format
 msgid "TLS negotiation failed with DIR at \"%s:%d\"\n"
 msgstr ""
 
-#: src/stored/authenticate.c:192
+#: src/stored/authenticate.c:191
 #, c-format
 msgid "Unable to authenticate Director at %s.\n"
 msgstr ""
 
-#: src/stored/authenticate.c:240 src/stored/authenticate.c:280
+#: src/stored/authenticate.c:239 src/stored/authenticate.c:279
 #, c-format
 msgid ""
 "Incorrect authorization key from File daemon at %s rejected.\n"
 "Please see "
 msgstr ""
 
-#: src/stored/authenticate.c:267
+#: src/stored/authenticate.c:266
 #, c-format
 msgid "TLS negotiation failed with FD at \"%s:%d\"\n"
 msgstr ""
 
-#: src/stored/wait.c:134
+#: src/stored/wait.c:133
 #, c-format
 msgid "pthread timedwait error. ERR=%s\n"
 msgstr ""
 
-#: src/stored/wait.c:233
+#: src/stored/wait.c:239
 #, c-format
 msgid "JobId=%s, Job %s waiting to reserve a device.\n"
 msgstr ""
@@ -11048,70 +11095,70 @@
 "free_space_errno=%d).\n"
 msgstr ""
 
-#: src/stored/block.c:963
+#: src/stored/block.c:962
 #, c-format
 msgid "Block buffer size looping problem on device %s\n"
 msgstr ""
 
-#: src/stored/block.c:975
+#: src/stored/block.c:974
 #, c-format
 msgid "Unable to open device part=%d %s: ERR=%s\n"
 msgstr ""
 
-#: src/stored/block.c:1001
+#: src/stored/block.c:1000
 #, c-format
 msgid "Read error on fd=%d at file:blk %u:%u on device %s. ERR=%s.\n"
 msgstr ""
 
-#: src/stored/block.c:1014
+#: src/stored/block.c:1013
 #, c-format
 msgid "Read zero bytes at %u:%u on device %s.\n"
 msgstr ""
 
-#: src/stored/block.c:1038
+#: src/stored/block.c:1037
 #, c-format
 msgid ""
 "Volume data error at %u:%u! Very short block of %d bytes on device %s "
 "discarded.\n"
 msgstr ""
 
-#: src/stored/block.c:1063
+#: src/stored/block.c:1062
 #, c-format
 msgid "Block length %u is greater than buffer %u. Attempting recovery.\n"
 msgstr ""
 
-#: src/stored/block.c:1082
+#: src/stored/block.c:1081
 #, c-format
 msgid "Setting block buffer size to %u bytes.\n"
 msgstr ""
 
-#: src/stored/block.c:1097
+#: src/stored/block.c:1096
 #, c-format
 msgid ""
 "Volume data error at %u:%u! Short block of %d bytes on device %s discarded.\n"
 msgstr ""
 
-#: src/lib/plugins.c:111
+#: src/lib/plugins.c:112
 #, c-format
 msgid "Failed to open Plugin directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/lib/plugins.c:128
+#: src/lib/plugins.c:129
 #, c-format
 msgid "Failed to find any plugins in %s\n"
 msgstr ""
 
-#: src/lib/plugins.c:161
+#: src/lib/plugins.c:163
 #, c-format
-msgid "Plugin load %s failed: ERR=%s\n"
+msgid "dlopen plugin %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/plugins.c:172
+#: src/lib/plugins.c:174
 #, c-format
 msgid "Lookup of loadPlugin in plugin %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/plugins.c:181
+#: src/lib/plugins.c:183
 #, c-format
 msgid "Lookup of unloadPlugin in plugin %s failed: ERR=%s\n"
 msgstr ""
@@ -11454,48 +11501,48 @@
 msgid "fcntl F_GETFL error. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsock.c:763 src/lib/bsock.c:797 src/lib/bsock.c:822
+#: src/lib/bsock.c:763 src/lib/bsock.c:797 src/lib/bsock.c:829
 #, c-format
 msgid "fcntl F_SETFL error. ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsock.c:995 src/qt-console/bcomm/dircomm_auth.cpp:112
+#: src/lib/bsock.c:1002 src/qt-console/bcomm/dircomm_auth.cpp:112
 #, c-format
 msgid "Director authorization problem at \"%s:%d\"\n"
 msgstr ""
 
-#: src/lib/bsock.c:1002 src/qt-console/bcomm/dircomm_auth.cpp:119
+#: src/lib/bsock.c:1009 src/qt-console/bcomm/dircomm_auth.cpp:119
 #, c-format
 msgid ""
 "Authorization problem: Remote server at \"%s:%d\" did not advertise required "
 "TLS support.\n"
 msgstr ""
 
-#: src/lib/bsock.c:1010 src/qt-console/bcomm/dircomm_auth.cpp:127
+#: src/lib/bsock.c:1017 src/qt-console/bcomm/dircomm_auth.cpp:127
 #, c-format
 msgid ""
 "Authorization problem with Director at \"%s:%d\": Remote server requires "
 "TLS.\n"
 msgstr ""
 
-#: src/lib/bsock.c:1022 src/qt-console/bcomm/dircomm_auth.cpp:138
+#: src/lib/bsock.c:1029 src/qt-console/bcomm/dircomm_auth.cpp:138
 #, c-format
 msgid "TLS negotiation failed with Director at \"%s:%d\"\n"
 msgstr ""
 
-#: src/lib/bsock.c:1032 src/qt-console/bcomm/dircomm_auth.cpp:150
+#: src/lib/bsock.c:1039 src/qt-console/bcomm/dircomm_auth.cpp:150
 #, c-format
 msgid ""
 "Bad response to Hello command: ERR=%s\n"
 "The Director at \"%s:%d\" is probably not running.\n"
 msgstr ""
 
-#: src/lib/bsock.c:1041 src/qt-console/bcomm/dircomm_auth.cpp:159
+#: src/lib/bsock.c:1048 src/qt-console/bcomm/dircomm_auth.cpp:159
 #, c-format
 msgid "Director at \"%s:%d\" rejected Hello command\n"
 msgstr ""
 
-#: src/lib/bsock.c:1051 src/qt-console/bcomm/dircomm_auth.cpp:171
+#: src/lib/bsock.c:1058 src/qt-console/bcomm/dircomm_auth.cpp:171
 #, c-format
 msgid ""
 "Authorization problem with Director at \"%s:%d\"\n"
@@ -11551,7 +11598,7 @@
 msgid "fopen %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:813
+#: src/lib/message.c:835
 #, c-format
 msgid ""
 "Msg delivery error: Operator mail program terminated in error.\n"
@@ -11559,77 +11606,77 @@
 "ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:834
+#: src/lib/message.c:856
 #, c-format
 msgid "Msg delivery error: fopen %s failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/message.c:1153
+#: src/lib/message.c:1175
 #, c-format
 msgid "%s: ABORTING due to ERROR in %s:%d\n"
 msgstr ""
 
-#: src/lib/message.c:1157
+#: src/lib/message.c:1179
 #, c-format
 msgid "%s: ERROR TERMINATION at %s:%d\n"
 msgstr ""
 
-#: src/lib/message.c:1162
+#: src/lib/message.c:1184
 #, c-format
 msgid "%s: Fatal Error because: "
 msgstr ""
 
-#: src/lib/message.c:1164
+#: src/lib/message.c:1186
 #, c-format
 msgid "%s: Fatal Error at %s:%d because:\n"
 msgstr ""
 
-#: src/lib/message.c:1168
+#: src/lib/message.c:1190
 #, c-format
 msgid "%s: ERROR: "
 msgstr ""
 
-#: src/lib/message.c:1170
+#: src/lib/message.c:1192
 #, c-format
 msgid "%s: ERROR in %s:%d "
 msgstr ""
 
-#: src/lib/message.c:1173
+#: src/lib/message.c:1195
 #, c-format
 msgid "%s: Warning: "
 msgstr ""
 
-#: src/lib/message.c:1176
+#: src/lib/message.c:1198
 #, c-format
 msgid "%s: Security violation: "
 msgstr ""
 
-#: src/lib/message.c:1264
+#: src/lib/message.c:1286
 #, c-format
 msgid "%s ABORTING due to ERROR\n"
 msgstr ""
 
-#: src/lib/message.c:1267
+#: src/lib/message.c:1289
 #, c-format
 msgid "%s ERROR TERMINATION\n"
 msgstr ""
 
-#: src/lib/message.c:1270
+#: src/lib/message.c:1292
 #, c-format
 msgid "%s JobId %u: Fatal error: "
 msgstr ""
 
-#: src/lib/message.c:1279
+#: src/lib/message.c:1301
 #, c-format
 msgid "%s JobId %u: Error: "
 msgstr ""
 
-#: src/lib/message.c:1285
+#: src/lib/message.c:1307
 #, c-format
 msgid "%s JobId %u: Warning: "
 msgstr ""
 
-#: src/lib/message.c:1291
+#: src/lib/message.c:1313
 #, c-format
 msgid "%s JobId %u: Security violation: "
 msgstr ""
@@ -11708,7 +11755,7 @@
 msgstr ""
 
 #: src/lib/lockmgr.c:275 src/lib/lockmgr.c:611 src/lib/lockmgr.c:639
-#: src/lib/jcr.c:319
+#: src/lib/jcr.c:321
 #, c-format
 msgid "pthread key create failed: ERR=%s\n"
 msgstr ""
@@ -11882,7 +11929,7 @@
 msgid "Unknown error"
 msgstr ""
 
-#: src/lib/cram-md5.c:110 src/lib/cram-md5.c:138
+#: src/lib/cram-md5.c:109 src/lib/cram-md5.c:137
 msgid "1999 Authorization failed.\n"
 msgstr ""
 
@@ -12075,7 +12122,7 @@
 msgid "Unknown term code"
 msgstr ""
 
-#: src/lib/util.c:359 src/lib/jcr.c:230
+#: src/lib/util.c:359 src/lib/jcr.c:232
 msgid "Backup"
 msgstr ""
 
@@ -12132,7 +12179,7 @@
 msgid "Truncate"
 msgstr ""
 
-#: src/lib/util.c:409 src/filed/restore.c:928
+#: src/lib/util.c:409 src/filed/restore.c:1158
 msgid "None"
 msgstr ""
 
@@ -12182,7 +12229,7 @@
 
 #: src/lib/util.c:753 src/lib/util.c:763 src/lib/util.c:771 src/lib/util.c:778
 #: src/lib/util.c:785 src/lib/util.c:799 src/lib/util.c:809 src/lib/util.c:822
-#: src/lib/util.c:833 src/filed/restore.c:944
+#: src/lib/util.c:833 src/filed/restore.c:1174
 msgid "*none*"
 msgstr ""
 
@@ -12274,140 +12321,140 @@
 msgid "Error creating new SSL object"
 msgstr ""
 
-#: src/lib/tls.c:490 src/lib/tls.c:513
+#: src/lib/tls.c:491 src/lib/tls.c:514
 msgid "Connect failure"
 msgstr ""
 
-#: src/lib/tls.c:592 src/lib/tls.c:596
+#: src/lib/tls.c:594 src/lib/tls.c:598
 msgid "TLS shutdown failure."
 msgstr ""
 
-#: src/lib/tls.c:650 src/lib/tls.c:676
+#: src/lib/tls.c:653 src/lib/tls.c:679
 msgid "TLS read/write failure."
 msgstr ""
 
-#: src/lib/jcr.c:232
+#: src/lib/jcr.c:234
 msgid "Verifying"
 msgstr ""
 
-#: src/lib/jcr.c:234
+#: src/lib/jcr.c:236
 msgid "Restoring"
 msgstr ""
 
-#: src/lib/jcr.c:236
+#: src/lib/jcr.c:238
 msgid "Archiving"
 msgstr ""
 
-#: src/lib/jcr.c:238
+#: src/lib/jcr.c:240
 msgid "Copying"
 msgstr ""
 
-#: src/lib/jcr.c:240
+#: src/lib/jcr.c:242
 msgid "Migration"
 msgstr ""
 
-#: src/lib/jcr.c:242
+#: src/lib/jcr.c:244
 msgid "Scanning"
 msgstr ""
 
-#: src/lib/jcr.c:244
+#: src/lib/jcr.c:246
 msgid "Unknown operation"
 msgstr ""
 
-#: src/lib/jcr.c:253
+#: src/lib/jcr.c:255
 msgid "backup"
 msgstr ""
 
-#: src/lib/jcr.c:255
+#: src/lib/jcr.c:257
 msgid "verified"
 msgstr ""
 
-#: src/lib/jcr.c:255
+#: src/lib/jcr.c:257
 msgid "verify"
 msgstr ""
 
-#: src/lib/jcr.c:257
+#: src/lib/jcr.c:259
 msgid "restored"
 msgstr ""
 
-#: src/lib/jcr.c:257
+#: src/lib/jcr.c:259
 msgid "restore"
 msgstr ""
 
-#: src/lib/jcr.c:259
+#: src/lib/jcr.c:261
 msgid "archived"
 msgstr ""
 
-#: src/lib/jcr.c:259
+#: src/lib/jcr.c:261
 msgid "archive"
 msgstr ""
 
-#: src/lib/jcr.c:261
+#: src/lib/jcr.c:263
 msgid "copied"
 msgstr ""
 
-#: src/lib/jcr.c:261
+#: src/lib/jcr.c:263
 msgid "copy"
 msgstr ""
 
-#: src/lib/jcr.c:263
+#: src/lib/jcr.c:265
 msgid "migrated"
 msgstr ""
 
-#: src/lib/jcr.c:263
+#: src/lib/jcr.c:265
 msgid "migrate"
 msgstr ""
 
-#: src/lib/jcr.c:265
+#: src/lib/jcr.c:267
 msgid "scanned"
 msgstr ""
 
-#: src/lib/jcr.c:265
+#: src/lib/jcr.c:267
 msgid "scan"
 msgstr ""
 
-#: src/lib/jcr.c:267
+#: src/lib/jcr.c:269
 msgid "unknown action"
 msgstr ""
 
-#: src/lib/jcr.c:341
+#: src/lib/jcr.c:343
 #, c-format
 msgid "pthread_once failed. ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:348
+#: src/lib/jcr.c:350
 #, c-format
 msgid "Could not init msg_queue mutex. ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:401
+#: src/lib/jcr.c:403
 msgid "NULL jcr.\n"
 msgstr ""
 
-#: src/lib/jcr.c:507
+#: src/lib/jcr.c:509
 #, c-format
 msgid "JCR use_count=%d JobId=%d\n"
 msgstr ""
 
-#: src/lib/jcr.c:617
+#: src/lib/jcr.c:619
 #, c-format
 msgid "pthread_setspecific failed: ERR=%s\n"
 msgstr ""
 
-#: src/lib/jcr.c:1067
+#: src/lib/jcr.c:1097
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Storage "
 "daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1079
+#: src/lib/jcr.c:1109
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading File daemon.\n"
 msgstr ""
 
-#: src/lib/jcr.c:1091
+#: src/lib/jcr.c:1121
 #, c-format
 msgid ""
 "Watchdog sending kill after %d secs to thread stalled reading Director.\n"
@@ -12490,11 +12537,6 @@
 msgid "speed"
 msgstr ""
 
-#: src/lib/parse_conf.c:736 src/lib/parse_conf.c:742
-#, c-format
-msgid "expected a time period, got: %s"
-msgstr ""
-
 #: src/lib/parse_conf.c:803
 #, c-format
 msgid "Expected a Tape Label keyword, got: %s"
@@ -12865,47 +12907,47 @@
 msgid "stop_btimer called with NULL btimer_id\n"
 msgstr ""
 
-#: src/lib/bsys.c:218 src/lib/bsys.c:235 src/lib/bsys.c:259 src/lib/bsys.c:272
+#: src/lib/bsys.c:215 src/lib/bsys.c:232 src/lib/bsys.c:256 src/lib/bsys.c:269
 #, c-format
 msgid "Out of memory: ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:314
+#: src/lib/bsys.c:311
 msgid "Buffer overflow.\n"
 msgstr ""
 
-#: src/lib/bsys.c:380
+#: src/lib/bsys.c:377
 msgid "Bad errno"
 msgstr ""
 
-#: src/lib/bsys.c:395
+#: src/lib/bsys.c:392
 #, c-format
 msgid "Memset for %d bytes at %s:%d\n"
 msgstr ""
 
-#: src/lib/bsys.c:425
+#: src/lib/bsys.c:422
 #, c-format
 msgid "Cannot open pid file. %s ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:440
+#: src/lib/bsys.c:437
 #, c-format
 msgid ""
 "%s is already running. pid=%d\n"
 "Check file %s\n"
 msgstr ""
 
-#: src/lib/bsys.c:454
+#: src/lib/bsys.c:451
 #, c-format
 msgid "Could not open pid file. %s ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:565
+#: src/lib/bsys.c:562
 #, c-format
 msgid "Could not create state file. %s ERR=%s\n"
 msgstr ""
 
-#: src/lib/bsys.c:584
+#: src/lib/bsys.c:581
 #, c-format
 msgid "Write final hdr error: ERR=%s\n"
 msgstr ""
@@ -13013,38 +13055,38 @@
 msgid "expected a positive integer number, got: %s"
 msgstr ""
 
-#: src/lib/lex.c:472
+#: src/lib/lex.c:478
 msgid ""
 "This config file appears to be in an unsupported Unicode format (UTF-16be). "
 "Please resave as UTF-8\n"
 msgstr ""
 
-#: src/lib/lex.c:611 src/lib/lex.c:639
+#: src/lib/lex.c:617 src/lib/lex.c:645
 #, c-format
 msgid "Cannot open included config file %s: %s\n"
 msgstr ""
 
-#: src/lib/lex.c:698 src/lib/lex.c:755
+#: src/lib/lex.c:704 src/lib/lex.c:761
 #, c-format
 msgid "expected an integer or a range, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:712 src/lib/lex.c:720 src/lib/lex.c:731 src/lib/lex.c:739
+#: src/lib/lex.c:718 src/lib/lex.c:726 src/lib/lex.c:737 src/lib/lex.c:745
 #, c-format
 msgid "expected an integer number, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:769
+#: src/lib/lex.c:775
 #, c-format
 msgid "expected a name, got %s: %s"
 msgstr ""
 
-#: src/lib/lex.c:773
+#: src/lib/lex.c:779
 #, c-format
 msgid "name %s length %d too long, max is %d\n"
 msgstr ""
 
-#: src/lib/lex.c:781
+#: src/lib/lex.c:787
 #, c-format
 msgid "expected a string, got %s: %s"
 msgstr ""
@@ -13380,32 +13422,32 @@
 msgid "Cannot reset current directory: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:53
+#: src/findlib/mkpath.c:137
 #, c-format
 msgid "Cannot create directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:57 src/findlib/mkpath.c:112
+#: src/findlib/mkpath.c:141 src/findlib/mkpath.c:202
 #, c-format
 msgid "%s exists but is not a directory.\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:74
+#: src/findlib/mkpath.c:164
 #, c-format
 msgid "Cannot change owner and/or group of %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:79
+#: src/findlib/mkpath.c:169
 #, c-format
 msgid "Cannot change permissions of %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:149
+#: src/findlib/mkpath.c:239
 #, c-format
 msgid "%c: is not a valid drive.\n"
 msgstr ""
 
-#: src/findlib/mkpath.c:195
+#: src/findlib/mkpath.c:283
 msgid "Too many subdirectories. Some permissions not reset.\n"
 msgstr ""
 
@@ -13449,83 +13491,83 @@
 msgid "AdjustTokenPrivileges set "
 msgstr ""
 
-#: src/findlib/create_file.c:130
+#: src/findlib/create_file.c:124
 #, c-format
 msgid "File skipped. Not newer: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:137
+#: src/findlib/create_file.c:131
 #, c-format
 msgid "File skipped. Not older: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:143
+#: src/findlib/create_file.c:141
 #, c-format
 msgid "File skipped. Already exists: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:170
+#: src/findlib/create_file.c:167
 #, c-format
 msgid "File %s already exists and could not be replaced. ERR=%s.\n"
 msgstr ""
 
-#: src/findlib/create_file.c:221 src/findlib/create_file.c:285
-#: src/findlib/create_file.c:381
+#: src/findlib/create_file.c:218 src/findlib/create_file.c:282
+#: src/findlib/create_file.c:378
 #, c-format
 msgid "bpkt already open fid=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:229 src/filed/fd_plugins.c:668
+#: src/findlib/create_file.c:226 src/filed/fd_plugins.c:890
 #, c-format
 msgid "Could not create %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:244
+#: src/findlib/create_file.c:241
 #, c-format
 msgid "Cannot make fifo %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:262
+#: src/findlib/create_file.c:259
 #, c-format
 msgid "Cannot make node %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:307
+#: src/findlib/create_file.c:304
 #, c-format
 msgid "Could not symlink %s -> %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:332 src/findlib/create_file.c:345
+#: src/findlib/create_file.c:329 src/findlib/create_file.c:342
 #, c-format
 msgid "Could not restore file flags for file %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:336 src/findlib/create_file.c:353
+#: src/findlib/create_file.c:333 src/findlib/create_file.c:350
 #, c-format
 msgid "Could not hard link %s -> %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:349
+#: src/findlib/create_file.c:346
 #, c-format
 msgid "Could not reset file flags for file %s: ERR=%s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:404
+#: src/findlib/create_file.c:401
 #, c-format
 msgid "Original file %s have been deleted: type=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:416
+#: src/findlib/create_file.c:413
 #, c-format
 msgid "Original file %s not saved: type=%d\n"
 msgstr ""
 
-#: src/findlib/create_file.c:419
+#: src/findlib/create_file.c:416
 #, c-format
 msgid "Unknown file type %d; not restored: %s\n"
 msgstr ""
 
-#: src/findlib/create_file.c:463
+#: src/findlib/create_file.c:460
 #, c-format
 msgid "Zero length filename: %s\n"
 msgstr ""
@@ -13758,12 +13800,12 @@
 msgid "NetBSD Specific Extended attribs"
 msgstr ""
 
-#: src/findlib/find.c:224
+#: src/findlib/find.c:226
 #, c-format
 msgid "Plugin: \"%s\" not found.\n"
 msgstr ""
 
-#: src/findlib/match.c:210 src/tools/testfind.c:651 src/filed/job.c:1415
+#: src/findlib/match.c:210 src/tools/testfind.c:654 src/filed/job.c:1456
 #, c-format
 msgid "Unknown include/exclude option: %c\n"
 msgstr ""
@@ -13895,7 +13937,7 @@
 
 #: src/cats/sql_create.c:595 src/cats/sql_get.c:205 src/cats/sql_get.c:258
 #: src/cats/sql_get.c:640 src/cats/sql_get.c:722 src/cats/sql_get.c:1041
-#: src/cats/sql.c:339 src/cats/sql.c:346 src/cats/postgresql.c:158
+#: src/cats/sql.c:340 src/cats/sql.c:347 src/cats/postgresql.c:158
 #, c-format
 msgid "error fetching row: %s\n"
 msgstr ""
@@ -14129,50 +14171,50 @@
 msgid "Media record for Vol=%s not found in Catalog.\n"
 msgstr ""
 
-#: src/cats/sql_find.c:95 src/cats/sql_find.c:124 src/cats/sql_find.c:175
+#: src/cats/sql_find.c:98 src/cats/sql_find.c:127 src/cats/sql_find.c:182
 #, c-format
 msgid ""
 "Query error for start time request: ERR=%s\n"
 "CMD=%s\n"
 msgstr ""
 
-#: src/cats/sql_find.c:101 src/cats/sql_find.c:181
+#: src/cats/sql_find.c:104 src/cats/sql_find.c:188
 msgid "No prior Full backup Job record found.\n"
 msgstr ""
 
-#: src/cats/sql_find.c:113
+#: src/cats/sql_find.c:116
 #, c-format
 msgid "Unknown level=%d\n"
 msgstr ""
 
-#: src/cats/sql_find.c:130
+#: src/cats/sql_find.c:133
 #, c-format
 msgid ""
 "No Job record found: ERR=%s\n"
 "CMD=%s\n"
 msgstr ""
 
-#: src/cats/sql_find.c:282
+#: src/cats/sql_find.c:291
 #, c-format
 msgid "Unknown Job level=%d\n"
 msgstr ""
 
-#: src/cats/sql_find.c:292
+#: src/cats/sql_find.c:301
 #, c-format
 msgid "No Job found for: %s.\n"
 msgstr ""
 
-#: src/cats/sql_find.c:303
+#: src/cats/sql_find.c:312
 #, c-format
 msgid "No Job found for: %s\n"
 msgstr ""
 
-#: src/cats/sql_find.c:384
+#: src/cats/sql_find.c:393
 #, c-format
 msgid "Request for Volume item %d greater than max %d or less than 1\n"
 msgstr ""
 
-#: src/cats/sql_find.c:399
+#: src/cats/sql_find.c:408
 #, c-format
 msgid "No Volume record found for item %d.\n"
 msgstr ""
@@ -14263,27 +14305,27 @@
 msgid "Update failed: affected_rows=%s for %s\n"
 msgstr ""
 
-#: src/cats/sql.c:313
+#: src/cats/sql.c:314
 #, c-format
 msgid ""
 "delete %s failed:\n"
 "%s\n"
 msgstr ""
 
-#: src/cats/sql.c:407
+#: src/cats/sql.c:408
 #, c-format
 msgid "Path length is zero. File=%s\n"
 msgstr ""
 
-#: src/cats/sql.c:601
+#: src/cats/sql.c:603
 msgid "No results to list.\n"
 msgstr ""
 
-#: src/cats/sql.c:722
+#: src/cats/sql.c:724
 msgid "Could not init database batch connection"
 msgstr ""
 
-#: src/cats/sql.c:728
+#: src/cats/sql.c:730
 #, c-format
 msgid "Could not open database \"%s\": ERR=%s\n"
 msgstr ""
@@ -14415,7 +14457,7 @@
 "incorrect.\n"
 msgstr ""
 
-#: src/cats/mysql.c:640
+#: src/cats/mysql.c:639
 msgid "A user name for MySQL must be supplied.\n"
 msgstr ""
 
@@ -14436,7 +14478,7 @@
 msgid "Director: name=%s address=%s DIRport=%d\n"
 msgstr ""
 
-#: src/wx-console/authenticate.c:142 src/console/authenticate.c:141
+#: src/wx-console/authenticate.c:142 src/console/authenticate.c:138
 msgid "TLS negotiation failed\n"
 msgstr ""
 
@@ -14444,7 +14486,7 @@
 msgid "Bad response to Hello command: ERR="
 msgstr ""
 
-#: src/wx-console/authenticate.c:167 src/console/authenticate.c:172
+#: src/wx-console/authenticate.c:167 src/console/authenticate.c:169
 msgid ""
 "Director authorization problem.\n"
 "Most likely the passwords do not agree.\n"
@@ -14568,54 +14610,54 @@
 msgid "Enter a period to cancel a command.\n"
 msgstr ""
 
-#: src/console/console.c:1304 src/qt-console/main.cpp:220
+#: src/console/console.c:1304 src/qt-console/main.cpp:232
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Director \"%s\" in %s. At least one CA certificate store is required.\n"
 msgstr ""
 
-#: src/console/console.c:1313 src/qt-console/main.cpp:229
+#: src/console/console.c:1313 src/qt-console/main.cpp:241
 #, c-format
 msgid ""
 "No Director resource defined in %s\n"
 "Without that I don't how to speak to the Director :-(\n"
 msgstr ""
 
-#: src/console/console.c:1333 src/qt-console/main.cpp:250
+#: src/console/console.c:1333 src/qt-console/main.cpp:262
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "Console \"%s\" in %s.\n"
 msgstr ""
 
-#: src/console/console.c:1357
+#: src/console/console.c:1359
 msgid "Too many arguments on input command.\n"
 msgstr ""
 
-#: src/console/console.c:1361
+#: src/console/console.c:1363
 msgid "First argument to input command must be a filename.\n"
 msgstr ""
 
-#: src/console/console.c:1367
+#: src/console/console.c:1369
 #, c-format
 msgid "Cannot open file %s for input. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1397
+#: src/console/console.c:1401
 msgid "Too many arguments on output/tee command.\n"
 msgstr ""
 
-#: src/console/console.c:1414
+#: src/console/console.c:1418
 #, c-format
 msgid "Cannot open file %s for output. ERR=%s\n"
 msgstr ""
 
-#: src/console/console.c:1433
+#: src/console/console.c:1437
 msgid "Too many arguments. Enclose command in double quotes.\n"
 msgstr ""
 
-#: src/console/console.c:1442
+#: src/console/console.c:1446
 #, c-format
 msgid "Cannot popen(\"%s\", \"r\"): ERR=%s\n"
 msgstr ""
@@ -14658,27 +14700,27 @@
 msgid "Files seen = %d\n"
 msgstr ""
 
-#: src/tools/testls.c:215 src/tools/testfind.c:319
+#: src/tools/testls.c:215 src/tools/testfind.c:322
 #, c-format
 msgid "Err: Could not access %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:218 src/tools/testfind.c:322
+#: src/tools/testls.c:218 src/tools/testfind.c:325
 #, c-format
 msgid "Err: Could not follow ff->link %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:221 src/tools/testfind.c:325
+#: src/tools/testls.c:221 src/tools/testfind.c:328
 #, c-format
 msgid "Err: Could not stat %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:224 src/tools/testfind.c:328
+#: src/tools/testls.c:224 src/tools/testfind.c:331
 #, c-format
 msgid "Skip: File not saved. No change. %s\n"
 msgstr ""
 
-#: src/tools/testls.c:227 src/tools/testfind.c:331
+#: src/tools/testls.c:227 src/tools/testfind.c:334
 #, c-format
 msgid "Err: Attempt to backup archive. Not saved. %s\n"
 msgstr ""
@@ -14693,17 +14735,17 @@
 msgid "Skip: File system change prohibited. Directory not entered. %s\n"
 msgstr ""
 
-#: src/tools/testls.c:236 src/tools/testfind.c:334
+#: src/tools/testls.c:236 src/tools/testfind.c:337
 #, c-format
 msgid "Err: Could not open directory %s: %s\n"
 msgstr ""
 
-#: src/tools/testls.c:239 src/tools/testfind.c:337
+#: src/tools/testls.c:239 src/tools/testfind.c:340
 #, c-format
 msgid "Err: Unknown file ff->type %d: %s\n"
 msgstr ""
 
-#: src/tools/bvfs_test.c:56 src/tools/ing_test.c:56
+#: src/tools/bvfs_test.c:56 src/tools/ing_test.c:57
 #, c-format
 msgid ""
 "\n"
@@ -14765,19 +14807,19 @@
 msgid "Error while inserting file\n"
 msgstr ""
 
-#: src/tools/ing_test.c:230 src/tools/ing_test.c:263 src/tools/ing_test.c:301
+#: src/tools/ing_test.c:231 src/tools/ing_test.c:264 src/tools/ing_test.c:302
 msgid "Stmt went wrong\n"
 msgstr ""
 
-#: src/tools/ing_test.c:319
+#: src/tools/ing_test.c:320
 msgid "CREATE-Stmt went wrong\n"
 msgstr ""
 
-#: src/tools/ing_test.c:324
+#: src/tools/ing_test.c:325
 msgid "DROP-Stmt went wrong\n"
 msgstr ""
 
-#: src/tools/fstype.c:47
+#: src/tools/fstype.c:48
 #, c-format
 msgid ""
 "\n"
@@ -14791,7 +14833,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/fstype.c:101 src/tools/drivetype.c:78
+#: src/tools/fstype.c:102 src/tools/drivetype.c:78
 #, c-format
 msgid "%s: unknown\n"
 msgstr ""
@@ -14817,7 +14859,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/testfind.c:69
+#: src/tools/testfind.c:70
 #, c-format
 msgid ""
 "\n"
@@ -14838,7 +14880,7 @@
 "\n"
 msgstr ""
 
-#: src/tools/testfind.c:234
+#: src/tools/testfind.c:235
 #, c-format
 msgid ""
 "\n"
@@ -14850,43 +14892,43 @@
 "Hard links     : %d\n"
 msgstr ""
 
-#: src/tools/testfind.c:275
+#: src/tools/testfind.c:278
 #, c-format
 msgid "Reg: %s\n"
 msgstr ""
 
-#: src/tools/testfind.c:297
+#: src/tools/testfind.c:300
 msgid "\t[will not descend: recursion turned off]"
 msgstr ""
 
-#: src/tools/testfind.c:299
+#: src/tools/testfind.c:302
 msgid "\t[will not descend: file system change not allowed]"
 msgstr ""
 
-#: src/tools/testfind.c:301
+#: src/tools/testfind.c:304
 msgid "\t[will not descend: disallowed file system]"
 msgstr ""
 
-#: src/tools/testfind.c:303
+#: src/tools/testfind.c:306
 msgid "\t[will not descend: disallowed drive type]"
 msgstr ""
 
-#: src/tools/testfind.c:387
+#: src/tools/testfind.c:390
 #, c-format
 msgid "===== Filename truncated to 255 chars: %s\n"
 msgstr ""
 
-#: src/tools/testfind.c:404
+#: src/tools/testfind.c:407
 #, c-format
 msgid "========== Path name truncated to 255 chars: %s\n"
 msgstr ""
 
-#: src/tools/testfind.c:413
+#: src/tools/testfind.c:416
 #, c-format
 msgid "========== Path length is zero. File=%s\n"
 msgstr ""
 
-#: src/tools/testfind.c:416
+#: src/tools/testfind.c:419
 #, c-format
 msgid "Path: %s\n"
 msgstr ""
@@ -15187,9 +15229,9 @@
 msgstr ""
 
 #: src/tools/dbcheck.c:748 src/tools/dbcheck.c:810 src/tools/dbcheck.c:856
-#: src/tools/dbcheck.c:914 src/tools/dbcheck.c:972 src/tools/dbcheck.c:1015
-#: src/tools/dbcheck.c:1057 src/tools/dbcheck.c:1099 src/tools/dbcheck.c:1136
-#: src/tools/dbcheck.c:1169 src/tools/dbcheck.c:1203 src/tools/dbcheck.c:1270
+#: src/tools/dbcheck.c:924 src/tools/dbcheck.c:982 src/tools/dbcheck.c:1025
+#: src/tools/dbcheck.c:1067 src/tools/dbcheck.c:1109 src/tools/dbcheck.c:1146
+#: src/tools/dbcheck.c:1179 src/tools/dbcheck.c:1213 src/tools/dbcheck.c:1280
 msgid "Print them? (yes/no): "
 msgstr ""
 
@@ -15223,179 +15265,184 @@
 msgid "Deleting %d orphaned File records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:890 src/tools/dbcheck.c:948
+#: src/tools/dbcheck.c:891
+#, c-format
+msgid "Pruning orphaned Path entries isn't possible when using BVFS.\n"
+msgstr ""
+
+#: src/tools/dbcheck.c:900 src/tools/dbcheck.c:958
 msgid "Create temporary index? (yes/no): "
 msgstr ""
 
-#: src/tools/dbcheck.c:902
+#: src/tools/dbcheck.c:912
 #, c-format
 msgid "Checking for orphaned Path entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:913
+#: src/tools/dbcheck.c:923
 #, c-format
 msgid "Found %d orphaned Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:926
+#: src/tools/dbcheck.c:936
 #, c-format
 msgid "Deleting %d orphaned Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:960
+#: src/tools/dbcheck.c:970
 #, c-format
 msgid "Checking for orphaned Filename entries. This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:971
+#: src/tools/dbcheck.c:981
 #, c-format
 msgid "Found %d orphaned Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:984
+#: src/tools/dbcheck.c:994
 #, c-format
 msgid "Deleting %d orphaned Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1004
+#: src/tools/dbcheck.c:1014
 #, c-format
 msgid "Checking for orphaned FileSet entries. This takes some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1014
+#: src/tools/dbcheck.c:1024
 #, c-format
 msgid "Found %d orphaned FileSet records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1029
+#: src/tools/dbcheck.c:1039
 #, c-format
 msgid "Deleting %d orphaned FileSet records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1038
+#: src/tools/dbcheck.c:1048
 #, c-format
 msgid "Checking for orphaned Client entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1056
+#: src/tools/dbcheck.c:1066
 #, c-format
 msgid "Found %d orphaned Client records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1071
+#: src/tools/dbcheck.c:1081
 #, c-format
 msgid "Deleting %d orphaned Client records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1080
+#: src/tools/dbcheck.c:1090
 #, c-format
 msgid "Checking for orphaned Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1098
+#: src/tools/dbcheck.c:1108
 #, c-format
 msgid "Found %d orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1113
+#: src/tools/dbcheck.c:1123
 #, c-format
 msgid "Deleting %d orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1115
+#: src/tools/dbcheck.c:1125
 #, c-format
 msgid "Deleting JobMedia records of orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1117
+#: src/tools/dbcheck.c:1127
 #, c-format
 msgid "Deleting Log records of orphaned Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1126
+#: src/tools/dbcheck.c:1136
 #, c-format
 msgid "Checking for Admin Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1135
+#: src/tools/dbcheck.c:1145
 #, c-format
 msgid "Found %d Admin Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1150
+#: src/tools/dbcheck.c:1160
 #, c-format
 msgid "Deleting %d Admin Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1159
+#: src/tools/dbcheck.c:1169
 #, c-format
 msgid "Checking for Restore Job entries.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1168
+#: src/tools/dbcheck.c:1178
 #, c-format
 msgid "Found %d Restore Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1183
+#: src/tools/dbcheck.c:1193
 #, c-format
 msgid "Deleting %d Restore Job records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1193
+#: src/tools/dbcheck.c:1203
 #, c-format
 msgid "Checking for Filenames with a trailing slash\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1202
+#: src/tools/dbcheck.c:1212
 #, c-format
 msgid "Found %d bad Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1220 src/tools/dbcheck.c:1286
+#: src/tools/dbcheck.c:1230 src/tools/dbcheck.c:1296
 #, c-format
 msgid "Reparing %d bad Filename records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1260
+#: src/tools/dbcheck.c:1270
 #, c-format
 msgid "Checking for Paths without a trailing slash\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1269
+#: src/tools/dbcheck.c:1279
 #, c-format
 msgid "Found %d bad Path records.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1432
+#: src/tools/dbcheck.c:1442
 #, c-format
 msgid ""
 "Ok. Index over the %s column already exists and dbcheck will work faster.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1435
+#: src/tools/dbcheck.c:1445
 #, c-format
 msgid ""
 "Note. Index over the %s column not found, that can greatly slow down "
 "dbcheck.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1450
+#: src/tools/dbcheck.c:1460
 #, c-format
 msgid "Create temporary index... This may take some time!\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1458
+#: src/tools/dbcheck.c:1468
 #, c-format
 msgid "Temporary index created.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1473
+#: src/tools/dbcheck.c:1483
 #, c-format
 msgid "Drop temporary index.\n"
 msgstr ""
 
-#: src/tools/dbcheck.c:1483
+#: src/tools/dbcheck.c:1493
 #, c-format
 msgid "Temporary index %s deleted.\n"
 msgstr ""
@@ -15420,7 +15467,7 @@
 msgid "     Could not stat %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:147 src/filed/backup.c:439
+#: src/filed/verify.c:147 src/filed/backup.c:450
 #, c-format
 msgid "     Unchanged file skipped: %s\n"
 msgstr ""
@@ -15440,37 +15487,37 @@
 msgid "     File system change prohibited. Directory skipped: %s\n"
 msgstr ""
 
-#: src/filed/verify.c:164
+#: src/filed/verify.c:165
 #, c-format
 msgid "     Could not open directory %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:169
+#: src/filed/verify.c:170
 #, c-format
 msgid "     Unknown file type %d: %s\n"
 msgstr "     Neznámy typ súboru %d: %s\n"
 
-#: src/filed/verify.c:213 src/filed/verify_vol.c:206
+#: src/filed/verify.c:214 src/filed/verify_vol.c:206
 #, c-format
 msgid "Network error in send to Director: ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify.c:246 src/filed/accurate.c:424 src/filed/backup.c:492
+#: src/filed/verify.c:247 src/filed/accurate.c:428 src/filed/backup.c:503
 #, c-format
 msgid "%s digest initialization failed\n"
 msgstr ""
 
-#: src/filed/verify.c:308
+#: src/filed/verify.c:309
 #, c-format
 msgid "     Cannot open %s: ERR=%s.\n"
 msgstr "     Nemôžem otvoriť %s: ERR=%s.\n"
 
-#: src/filed/verify.c:322
+#: src/filed/verify.c:323
 #, c-format
 msgid "     Cannot open resource fork for %s: ERR=%s.\n"
 msgstr ""
 
-#: src/filed/verify.c:385
+#: src/filed/verify.c:386
 #, c-format
 msgid "Error reading file %s: ERR=%s\n"
 msgstr "Chyba pri čítaní súboru %s: ERR=%s\n"
@@ -15480,12 +15527,12 @@
 msgid "Space saved with Base jobs: %lld MB\n"
 msgstr ""
 
-#: src/filed/accurate.c:395
+#: src/filed/accurate.c:399
 #, c-format
 msgid "Cannot verify checksum for %s\n"
 msgstr ""
 
-#: src/filed/accurate.c:503
+#: src/filed/accurate.c:507
 msgid "2991 Bad accurate command\n"
 msgstr ""
 
@@ -15569,344 +15616,320 @@
 msgid "Bacula Client: Last Job had Warnings"
 msgstr ""
 
-#: src/filed/xattr.c:92 src/filed/xattr.c:107 src/filed/xattr.c:115
-#: src/filed/fd_plugins.c:480 src/filed/fd_plugins.c:494 src/filed/acl.c:101
-#: src/filed/acl.c:116 src/filed/acl.c:124 src/filed/backup.c:947
-#: src/filed/backup.c:1143 src/filed/backup.c:1180 src/filed/backup.c:1193
-#: src/filed/backup.c:1269 src/filed/backup.c:1366
+#: src/filed/xattr.c:96 src/filed/xattr.c:111 src/filed/xattr.c:119
+#: src/filed/fd_plugins.c:696 src/filed/fd_plugins.c:710 src/filed/acl.c:105
+#: src/filed/acl.c:120 src/filed/acl.c:128 src/filed/backup.c:993
+#: src/filed/backup.c:1189 src/filed/backup.c:1226 src/filed/backup.c:1239
+#: src/filed/backup.c:1315 src/filed/backup.c:1413
 #, c-format
 msgid "Network send error to SD. ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:231
+#: src/filed/xattr.c:244
 #, c-format
 msgid "Illegal xattr stream, no XATTR_MAGIC on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:244
+#: src/filed/xattr.c:258
 #, c-format
 msgid "Illegal xattr stream, xattr name length <= 0 on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:359 src/filed/xattr.c:390
+#: src/filed/xattr.c:376 src/filed/xattr.c:408
 #, c-format
 msgid "llistea error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:452 src/filed/xattr.c:479
+#: src/filed/xattr.c:472 src/filed/xattr.c:500
 #, c-format
 msgid "lgetea error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:496 src/filed/xattr.c:746 src/filed/xattr.c:1146
-#: src/filed/xattr.c:1536 src/filed/xattr.c:1870 src/filed/xattr.c:2606
+#: src/filed/xattr.c:519 src/filed/xattr.c:807 src/filed/xattr.c:1249
+#: src/filed/xattr.c:1702 src/filed/xattr.c:2064 src/filed/xattr.c:2843
 #, c-format
 msgid "Xattr stream on file \"%s\" exceeds maximum size of %d bytes\n"
 msgstr ""
 
-#: src/filed/xattr.c:524 src/filed/xattr.c:777 src/filed/xattr.c:1174
-#: src/filed/xattr.c:1574 src/filed/xattr.c:1892
+#: src/filed/xattr.c:550 src/filed/xattr.c:841 src/filed/xattr.c:1280
+#: src/filed/xattr.c:1743 src/filed/xattr.c:2089
 #, c-format
 msgid "Failed to serialize extended attributes on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:587
+#: src/filed/xattr.c:624
 #, c-format
 msgid "lsetea error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:655 src/filed/xattr.c:719 src/filed/xattr.c:730
+#: src/filed/xattr.c:710 src/filed/xattr.c:777 src/filed/xattr.c:789
 #, c-format
 msgid "attr_list error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:845
+#: src/filed/xattr.c:916
 #, c-format
 msgid "Received illegal xattr named %s on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:875 src/filed/xattr.c:884
+#: src/filed/xattr.c:947 src/filed/xattr.c:957
 #, c-format
 msgid "attr_set error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:993 src/filed/xattr.c:1023
+#: src/filed/xattr.c:1092 src/filed/xattr.c:1123
 #, c-format
 msgid "llistxattr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1103 src/filed/xattr.c:1129
+#: src/filed/xattr.c:1204 src/filed/xattr.c:1231
 #, c-format
 msgid "lgetxattr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1236
+#: src/filed/xattr.c:1350
 #, c-format
 msgid "lsetxattr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1356 src/filed/xattr.c:1386
+#: src/filed/xattr.c:1507 src/filed/xattr.c:1539
 #, c-format
 msgid "extattr_list_link error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1403
+#: src/filed/xattr.c:1558
 #, c-format
 msgid "Failed to convert %d into namespace on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1492 src/filed/xattr.c:1518
+#: src/filed/xattr.c:1653 src/filed/xattr.c:1682
 #, c-format
 msgid "extattr_get_link error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1633
+#: src/filed/xattr.c:1809
 #, c-format
 msgid "Failed to split %s into namespace and name part on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1645
+#: src/filed/xattr.c:1822
 #, c-format
 msgid "Failed to convert %s into namespace on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1663
+#: src/filed/xattr.c:1841
 #, c-format
 msgid "extattr_set_link error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1753 src/filed/xattr.c:1774
+#: src/filed/xattr.c:1943 src/filed/xattr.c:1965
 #, c-format
 msgid "getproplist error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:1963
+#: src/filed/xattr.c:2169
 #, c-format
 msgid "Unable create proper proplist to restore xattrs on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:1988
+#: src/filed/xattr.c:2196
 #, c-format
 msgid "setproplist error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2274 src/filed/xattr.c:2324
+#: src/filed/xattr.c:2496 src/filed/xattr.c:2547
 #, c-format
 msgid "Unable to get acl on xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2338
+#: src/filed/xattr.c:2562
 #, c-format
 msgid "Unable to get acl text on xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2407
+#: src/filed/xattr.c:2632
 #, c-format
 msgid "Unable to get status on xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2530
+#: src/filed/xattr.c:2763
 #, c-format
 msgid "Unable to open xattr %s on \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2549
+#: src/filed/xattr.c:2784
 #, c-format
 msgid "Unable to read symlin %s on \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2618
+#: src/filed/xattr.c:2859
 #, c-format
 msgid "Unable to read content of xattr %s on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:2654
+#: src/filed/xattr.c:2897
 #, c-format
 msgid "Unable to chdir to xattr space of file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2710 src/filed/xattr.c:2937
+#: src/filed/xattr.c:2953 src/filed/xattr.c:3193
 #, c-format
 msgid "Unable to open file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2735 src/filed/xattr.c:2986
+#: src/filed/xattr.c:2979 src/filed/xattr.c:3246
 #, c-format
 msgid "Unable to open xattr space %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2748 src/filed/xattr.c:2956
+#: src/filed/xattr.c:2993 src/filed/xattr.c:3214
 #, c-format
 msgid "Unable to chdir to xattr space on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2766
+#: src/filed/xattr.c:3012
 #, c-format
 msgid "Unable to list the xattr space on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2855
+#: src/filed/xattr.c:3105
 #, c-format
 msgid "Unable to convert acl from text on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:2862 src/filed/xattr.c:2883
+#: src/filed/xattr.c:3113 src/filed/xattr.c:3135
 #, c-format
 msgid "Unable to restore acl of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2948
+#: src/filed/xattr.c:3205
 #, c-format
 msgid "Unable to open xattr space on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:2972 src/filed/xattr.c:3111
+#: src/filed/xattr.c:3231 src/filed/xattr.c:3379
 #, c-format
 msgid "Unable to open xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3000
+#: src/filed/xattr.c:3261
 #, c-format
 msgid "Unable to chdir to xattr space %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3036
+#: src/filed/xattr.c:3299
 #, c-format
 msgid "Unable to mkfifo xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3050
+#: src/filed/xattr.c:3315
 #, c-format
 msgid "Unable to mknod xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3065
+#: src/filed/xattr.c:3331
 #, c-format
 msgid "Unable to mkdir xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3082
+#: src/filed/xattr.c:3349
 #, c-format
 msgid "Unable to link xattr %s to %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3131
+#: src/filed/xattr.c:3400
 #, c-format
 msgid ""
 "Unable to restore data of xattr %s on file \"%s\": Not all data available in "
 "xattr stream\n"
 msgstr ""
 
-#: src/filed/xattr.c:3141
+#: src/filed/xattr.c:3411
 #, c-format
 msgid "Unable to restore data of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3161
+#: src/filed/xattr.c:3432
 #, c-format
 msgid "Unable to symlink xattr %s to %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3194
+#: src/filed/xattr.c:3466
 #, c-format
 msgid "Unable to restore owner of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3219
+#: src/filed/xattr.c:3492
 #, c-format
 msgid "Unable to restore filetimes of xattr %s on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3234
+#: src/filed/xattr.c:3508
 #, c-format
 msgid "Illegal xattr stream, failed to parse xattr stream on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:3291
+#: src/filed/xattr.c:3570
 #, c-format
 msgid "Failed to restore extensible attributes on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:3302
+#: src/filed/xattr.c:3583
 #, c-format
 msgid "Failed to restore extended attributes on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/xattr.c:3382 src/filed/acl.c:1871
+#: src/filed/xattr.c:3672 src/filed/acl.c:2109
 #, c-format
 msgid "Unable to stat file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/xattr.c:3429
+#: src/filed/xattr.c:3719
 #, c-format
 msgid ""
 "Can't restore Extended Attributes of %s - incompatible xattr stream "
 "encountered - %d\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:380
+#: src/filed/fd_plugins.c:480 src/filed/fd_plugins.c:619
 #, c-format
 msgid "Command plugin \"%s\": no type in startBackupFile packet.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:393
+#: src/filed/fd_plugins.c:493
 #, c-format
 msgid "Command plugin \"%s\": no object_name in startBackupFile packet.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:405
+#: src/filed/fd_plugins.c:505 src/filed/fd_plugins.c:626
 #, c-format
 msgid "Command plugin \"%s\": no fname in startBackupFile packet.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:467
+#: src/filed/fd_plugins.c:683
 msgid "Plugin save packet not found.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:587
+#: src/filed/fd_plugins.c:806
 #, c-format
 msgid "Plugin=%s not found.\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:644
+#: src/filed/fd_plugins.c:863
 #, c-format
 msgid "Plugin createFile call failed. Stat=%d file=%s\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:652
+#: src/filed/fd_plugins.c:874
 #, c-format
 msgid "Plugin createFile call failed. Returned CF_ERROR file=%s\n"
 msgstr ""
 
-#: src/filed/fd_plugins.c:751
-#, c-format
-msgid "Loaded plugin: %s\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:770
-#, c-format
-msgid "Plugin magic wrong. Plugin=%s wanted=%s got=%s\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:778
-#, c-format
-msgid "Plugin version incorrect. Plugin=%s wanted=%d got=%d\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:786
-#, c-format
-msgid "Plugin license incompatible. Plugin=%s license=%s\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:793
-msgid "Plugin size mismatch.\n"
-msgstr ""
-
-#: src/filed/fd_plugins.c:1375
+#: src/filed/fd_plugins.c:1621
 msgid "Command plugin: no fname in baculaCheckChanges packet.\n"
 msgstr ""
 
-#: src/filed/filed.c:75
+#: src/filed/filed.c:76
 #, c-format
 msgid ""
 "\n"
@@ -15928,237 +15951,252 @@
 "\n"
 msgstr ""
 
-#: src/filed/filed.c:198
+#: src/filed/filed.c:199
 msgid "-k option has no meaning without -u option.\n"
 msgstr ""
 
-#: src/filed/filed.c:335
+#: src/filed/filed.c:337
 #, c-format
 msgid ""
 "No File daemon resource defined in %s\n"
 "Without that I don't know who I am :-(\n"
 msgstr ""
 
-#: src/filed/filed.c:340
+#: src/filed/filed.c:342
 #, c-format
 msgid "Only one Client resource permitted in %s\n"
 msgstr ""
 
-#: src/filed/filed.c:364
+#: src/filed/filed.c:366
 #, c-format
 msgid ""
 "Neither \"TLS CA Certificate\" or \"TLS CA Certificate Dir\" are defined for "
 "File daemon in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:388
+#: src/filed/filed.c:390
 msgid "PKI encryption/signing enabled but not compiled into Bacula.\n"
 msgstr ""
 
-#: src/filed/filed.c:399
+#: src/filed/filed.c:401
 #, c-format
 msgid ""
 "\"PKI Key Pair\" must be defined for File daemon \"%s\" in %s if either "
 "\"PKI Sign\" or \"PKI Encrypt\" are enabled.\n"
 msgstr ""
 
-#: src/filed/filed.c:411 src/filed/filed.c:442 src/filed/filed.c:483
+#: src/filed/filed.c:413 src/filed/filed.c:444 src/filed/filed.c:485
 msgid "Failed to allocate a new keypair object.\n"
 msgstr ""
 
-#: src/filed/filed.c:415
+#: src/filed/filed.c:417
 #, c-format
 msgid "Failed to load public certificate for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:421
+#: src/filed/filed.c:423
 #, c-format
 msgid "Failed to load private key for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:451
+#: src/filed/filed.c:453
 #, c-format
 msgid ""
 "Failed to load private key from file %s for File daemon \"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:458
+#: src/filed/filed.c:460
 #, c-format
 msgid ""
 "Failed to load trusted signer certificate from file %s for File daemon "
 "\"%s\" in %s.\n"
 msgstr ""
 
-#: src/filed/filed.c:489
+#: src/filed/filed.c:491
 #, c-format
 msgid ""
 "Failed to load master key certificate from file %s for File daemon \"%s\" in "
 "%s.\n"
 msgstr ""
 
-#: src/filed/filed.c:505
+#: src/filed/filed.c:507
 #, c-format
 msgid "No Director resource defined in %s\n"
 msgstr ""
 
-#: src/filed/acl.c:179 src/filed/acl.c:201
+#: src/filed/acl.c:225 src/filed/acl.c:248
 #, c-format
 msgid "aclx_get error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:226
+#: src/filed/acl.c:274
 #, c-format
 msgid "Unknown acl type encountered on file \"%s\": %ld\n"
 msgstr ""
 
-#: src/filed/acl.c:248 src/filed/acl.c:256
+#: src/filed/acl.c:298 src/filed/acl.c:307
 #, c-format
 msgid "Failed to convert acl into text on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/acl.c:342 src/filed/acl.c:351
+#: src/filed/acl.c:381
+#, c-format
+msgid ""
+"Trying to restore POSIX acl on file \"%s\" on filesystem without AIXC acl "
+"support\n"
+msgstr ""
+
+#: src/filed/acl.c:389
+#, c-format
+msgid ""
+"Trying to restore NFSv4 acl on file \"%s\" on filesystem without NFS4 acl "
+"support\n"
+msgstr ""
+
+#: src/filed/acl.c:433 src/filed/acl.c:443
 #, c-format
 msgid "aclx_scanStr error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:364
+#: src/filed/acl.c:467
 #, c-format
 msgid "aclx_put error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:692
+#: src/filed/acl.c:809
 #, c-format
 msgid "acl_to_text error on file \"%s\": ERR=%s\n"
 msgstr "acl_to_text chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:719
+#: src/filed/acl.c:837
 #, c-format
 msgid "acl_get_file error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:767
+#: src/filed/acl.c:889
 #, c-format
 msgid ""
 "acl_delete_def_file error on file \"%s\": filesystem doesn't support ACLs\n"
 msgstr ""
 
-#: src/filed/acl.c:772
+#: src/filed/acl.c:895
 #, c-format
 msgid "acl_delete_def_file error on file \"%s\": ERR=%s\n"
 msgstr "acl_delete_def_file chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:780
+#: src/filed/acl.c:904
 #, c-format
 msgid "acl_from_text error on file \"%s\": ERR=%s\n"
 msgstr "acl_from_text chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:793
+#: src/filed/acl.c:918
 #, c-format
 msgid "acl_valid error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:822
+#: src/filed/acl.c:948
 #, c-format
 msgid "acl_set_file error on file \"%s\": filesystem doesn't support ACLs\n"
 msgstr ""
 
-#: src/filed/acl.c:830
+#: src/filed/acl.c:957
 #, c-format
 msgid "acl_set_file error on file \"%s\": ERR=%s\n"
 msgstr "acl_set_file chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:919 src/filed/acl.c:944 src/filed/acl.c:1052
-#: src/filed/acl.c:1486 src/filed/acl.c:1582
+#: src/filed/acl.c:1063 src/filed/acl.c:1089 src/filed/acl.c:1201
+#: src/filed/acl.c:1692 src/filed/acl.c:1795
 #, c-format
 msgid "pathconf error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1066
+#: src/filed/acl.c:1216
 #, c-format
 msgid ""
 "Trying to restore acl on file \"%s\" on filesystem without %s acl support\n"
 msgstr ""
 
-#: src/filed/acl.c:1306
+#: src/filed/acl.c:1492
 #, c-format
 msgid "getacl error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1337
+#: src/filed/acl.c:1525
 #, c-format
 msgid "acltostr error on file \"%s\": ERR=%s\n"
 msgstr "acltostr chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:1354 src/filed/acl.c:1361
+#: src/filed/acl.c:1546 src/filed/acl.c:1554
 #, c-format
 msgid "strtoacl error on file \"%s\": ERR=%s\n"
 msgstr "strtoacl chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:1387
+#: src/filed/acl.c:1582
 #, c-format
 msgid "setacl error on file \"%s\": filesystem doesn't support ACLs\n"
 msgstr ""
 
-#: src/filed/acl.c:1394
+#: src/filed/acl.c:1590
 #, c-format
 msgid "setacl error on file \"%s\": ERR=%s\n"
 msgstr "setacl chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:1504
+#: src/filed/acl.c:1711
 #, c-format
 msgid "acl_get error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1574
+#: src/filed/acl.c:1786
 #, c-format
 msgid ""
 "Trying to restore acl on file \"%s\" on filesystem without acl support\n"
 msgstr ""
 
-#: src/filed/acl.c:1598
+#: src/filed/acl.c:1812
 #, c-format
 msgid ""
-"Trying to restore acl on file \"%s\" on filesystem without aclent acl "
+"Trying to restore POSIX acl on file \"%s\" on filesystem without aclent acl "
 "support\n"
 msgstr ""
 
-#: src/filed/acl.c:1608
+#: src/filed/acl.c:1823
 #, c-format
 msgid ""
-"Trying to restore acl on file \"%s\" on filesystem without ace acl support\n"
+"Trying to restore NFSv4 acl on file \"%s\" on filesystem without ace acl "
+"support\n"
 msgstr ""
 
-#: src/filed/acl.c:1623
+#: src/filed/acl.c:1839
 #, c-format
 msgid "acl_fromtext error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1636 src/filed/acl.c:1643
+#: src/filed/acl.c:1853 src/filed/acl.c:1861
 #, c-format
 msgid "wrong encoding of acl type in acl stream on file \"%s\"\n"
 msgstr ""
 
-#: src/filed/acl.c:1667
+#: src/filed/acl.c:1886
 #, c-format
 msgid "acl_set error on file \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/acl.c:1746
+#: src/filed/acl.c:1971
 #, c-format
 msgid "acltotext error on file \"%s\": ERR=%s\n"
 msgstr "acltotext chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:1764
+#: src/filed/acl.c:1993
 #, c-format
 msgid "aclfromtext error on file \"%s\": ERR=%s\n"
 msgstr "aclfromtext chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:1781
+#: src/filed/acl.c:2011
 #, c-format
 msgid "acl(SETACL) error on file \"%s\": ERR=%s\n"
 msgstr "acl(SETACL) chyba v súbore \"%s\": ERR=%s\n"
 
-#: src/filed/acl.c:1943
+#: src/filed/acl.c:2181
 #, c-format
 msgid "Can't restore ACLs of %s - incompatible acl stream encountered - %d\n"
 msgstr ""
@@ -16167,17 +16205,17 @@
 msgid "Storage command not issued before Verify.\n"
 msgstr ""
 
-#: src/filed/verify_vol.c:97 src/filed/restore.c:282
+#: src/filed/verify_vol.c:97 src/filed/restore.c:483
 #, c-format
 msgid "Record header scan error: %s\n"
 msgstr ""
 
-#: src/filed/verify_vol.c:106 src/filed/restore.c:294
+#: src/filed/verify_vol.c:106 src/filed/restore.c:495
 #, c-format
 msgid "Data record error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/verify_vol.c:110 src/filed/restore.c:298
+#: src/filed/verify_vol.c:110 src/filed/restore.c:499
 #, c-format
 msgid "Actual data size %d not same as header %d\n"
 msgstr ""
@@ -16191,628 +16229,621 @@
 msgid "Cannot set buffer size FD->SD.\n"
 msgstr ""
 
-#: src/filed/backup.c:190
+#: src/filed/backup.c:194
 #, c-format
 msgid "Encountered %ld acl errors while doing backup\n"
 msgstr ""
 
-#: src/filed/backup.c:194
+#: src/filed/backup.c:198
 #, c-format
 msgid "Encountered %ld xattr errors while doing backup\n"
 msgstr ""
 
-#: src/filed/backup.c:261 src/filed/backup.c:270
+#: src/filed/backup.c:267 src/filed/backup.c:276
 msgid "An error occurred while encrypting the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:376
+#: src/filed/backup.c:387
 #, c-format
 msgid "     Recursion turned off. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:383
+#: src/filed/backup.c:394
 #, c-format
 msgid ""
 "     %s is a different filesystem. Will not descend from %s into it.\n"
 msgstr ""
 
-#: src/filed/backup.c:389
+#: src/filed/backup.c:400
 #, c-format
 msgid "     Disallowed filesystem. Will not descend from %s into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:394
+#: src/filed/backup.c:405
 #, c-format
 msgid "     Disallowed drive type. Will not descend into %s\n"
 msgstr ""
 
-#: src/filed/backup.c:405
+#: src/filed/backup.c:416
 #, c-format
 msgid "     Socket file skipped: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:418
+#: src/filed/backup.c:429
 #, c-format
 msgid "     Could not access \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:425
+#: src/filed/backup.c:436
 #, c-format
 msgid "     Could not follow link \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:432
+#: src/filed/backup.c:443
 #, c-format
 msgid "     Could not stat \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:442
+#: src/filed/backup.c:453
 #, c-format
 msgid "     Archive file not saved: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:446
+#: src/filed/backup.c:457
 #, c-format
 msgid "     Could not open directory \"%s\": ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:452
+#: src/filed/backup.c:463
 #, c-format
 msgid "     Unknown file type %d; not saved: %s\n"
 msgstr ""
 
-#: src/filed/backup.c:508
+#: src/filed/backup.c:519
 #, c-format
 msgid "%s signature digest initialization failed\n"
 msgstr ""
 
-#: src/filed/backup.c:588
+#: src/filed/backup.c:624
 #, c-format
 msgid "     Cannot open \"%s\": ERR=%s.\n"
 msgstr ""
 
-#: src/filed/backup.c:625
+#: src/filed/backup.c:661
 #, c-format
 msgid "     Cannot open resource fork for \"%s\": ERR=%s.\n"
 msgstr ""
 
-#: src/filed/backup.c:717
+#: src/filed/backup.c:757
 msgid "Failed to allocate memory for crypto signature.\n"
 msgstr ""
 
-#: src/filed/backup.c:722 src/filed/backup.c:728 src/filed/backup.c:743
+#: src/filed/backup.c:762 src/filed/backup.c:768 src/filed/backup.c:783
 msgid "An error occurred while signing the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:767
+#: src/filed/backup.c:807
 msgid "An error occurred finalizing signing the stream.\n"
 msgstr ""
 
-#: src/filed/backup.c:879
+#: src/filed/backup.c:925
 #, c-format
 msgid "Compression deflateParams error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:916
+#: src/filed/backup.c:962
 msgid "Encrypting sparse or offset data not supported.\n"
 msgstr ""
 
-#: src/filed/backup.c:923
+#: src/filed/backup.c:969
 msgid "Failed to initialize encryption context.\n"
 msgstr ""
 
-#: src/filed/backup.c:1033
+#: src/filed/backup.c:1079
 #, c-format
 msgid "Compression deflate error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:1040
+#: src/filed/backup.c:1086
 #, c-format
 msgid "Compression deflateReset error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:1070
+#: src/filed/backup.c:1116
 #, c-format
 msgid "Compression LZO error: %d\n"
 msgstr ""
 
-#: src/filed/backup.c:1115 src/filed/backup.c:1131
+#: src/filed/backup.c:1161 src/filed/backup.c:1177
 msgid "Encryption error\n"
 msgstr ""
 
-#: src/filed/backup.c:1157
+#: src/filed/backup.c:1203
 #, c-format
 msgid "Read error on file %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/backup.c:1160
+#: src/filed/backup.c:1206
 #, c-format
 msgid "Too many errors. JobErrors=%d.\n"
 msgstr ""
 
-#: src/filed/backup.c:1170
+#: src/filed/backup.c:1216
 msgid "Encryption padding error\n"
 msgstr ""
 
-#: src/filed/backup.c:1234
+#: src/filed/backup.c:1280
 msgid "Invalid file flags, no supported data stream type.\n"
 msgstr ""
 
-#: src/filed/backup.c:1489
+#: src/filed/backup.c:1536
 #, c-format
 msgid "VSS Writer (BackupComplete): %s\n"
 msgstr ""
 
-#: src/filed/restore.c:116
+#: src/filed/restore.c:114
 #, c-format
 msgid "Size of data or stream of %s not correct. Original %s, restored %s.\n"
 msgstr ""
 
-#: src/filed/restore.c:136
+#: src/filed/restore.c:134
 #, c-format
 msgid "Invalid length of Finder Info (got %d, not 32)\n"
 msgstr ""
 
-#: src/filed/restore.c:141
+#: src/filed/restore.c:139
 #, c-format
 msgid "Could not set Finder Info on %s\n"
 msgstr ""
 
-#: src/filed/restore.c:216
+#: src/filed/restore.c:415
 msgid "LZO init failed\n"
 msgstr ""
 
-#: src/filed/restore.c:451
+#: src/filed/restore.c:657
 msgid "Unexpected cryptographic session data stream.\n"
 msgstr ""
 
-#: src/filed/restore.c:461
+#: src/filed/restore.c:667
 msgid ""
 "No private decryption keys have been defined to decrypt encrypted backup "
 "data.\n"
 msgstr ""
 
-#: src/filed/restore.c:472
+#: src/filed/restore.c:678
 msgid "Could not create digest.\n"
 msgstr ""
 
-#: src/filed/restore.c:490
+#: src/filed/restore.c:696
 msgid "Missing private key required to decrypt encrypted backup data.\n"
 msgstr ""
 
-#: src/filed/restore.c:493
+#: src/filed/restore.c:699
 msgid "Decrypt of the session key failed.\n"
 msgstr ""
 
-#: src/filed/restore.c:499
+#: src/filed/restore.c:705
 #, c-format
 msgid "An error occurred while decoding encrypted session data stream: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:566 src/filed/restore.c:619
+#: src/filed/restore.c:772 src/filed/restore.c:825
 #, c-format
 msgid "Missing encryption session data stream for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:574 src/filed/restore.c:626
+#: src/filed/restore.c:780 src/filed/restore.c:832
 #, c-format
 msgid "Failed to initialize decryption context for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:638
+#: src/filed/restore.c:844
 #, c-format
 msgid "Cannot open resource fork for %s.\n"
 msgstr ""
 
-#: src/filed/restore.c:770
+#: src/filed/restore.c:986
 msgid "Unexpected cryptographic signature data stream.\n"
 msgstr ""
 
-#: src/filed/restore.c:778
+#: src/filed/restore.c:994
 #, c-format
 msgid "Failed to decode message signature for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:836
+#: src/filed/restore.c:1058
 #, c-format
 msgid "Encountered %ld acl errors while doing restore\n"
 msgstr ""
 
-#: src/filed/restore.c:840
+#: src/filed/restore.c:1062
 #, c-format
 msgid "Encountered %ld xattr errors while doing restore\n"
 msgstr ""
 
-#: src/filed/restore.c:844
+#: src/filed/restore.c:1066
 #, c-format
 msgid ""
 "%d non-supported data streams and %d non-supported attrib streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:848
+#: src/filed/restore.c:1070
 #, c-format
 msgid "%d non-supported resource fork streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:851
+#: src/filed/restore.c:1073
 #, c-format
 msgid "%d non-supported Finder Info streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:854
+#: src/filed/restore.c:1076
 #, c-format
 msgid "%d non-supported acl streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:857
+#: src/filed/restore.c:1079
 #, c-format
 msgid "%d non-supported crypto streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:860
+#: src/filed/restore.c:1082
 #, c-format
 msgid "%d non-supported xattr streams ignored.\n"
 msgstr ""
 
-#: src/filed/restore.c:932
+#: src/filed/restore.c:1162
 msgid "Zlib errno"
 msgstr ""
 
-#: src/filed/restore.c:934
+#: src/filed/restore.c:1164
 msgid "Zlib stream error"
 msgstr ""
 
-#: src/filed/restore.c:936
+#: src/filed/restore.c:1166
 msgid "Zlib data error"
 msgstr ""
 
-#: src/filed/restore.c:938
+#: src/filed/restore.c:1168
 msgid "Zlib memory error"
 msgstr ""
 
-#: src/filed/restore.c:940
+#: src/filed/restore.c:1170
 msgid "Zlib buffer error"
 msgstr ""
 
-#: src/filed/restore.c:942
+#: src/filed/restore.c:1172
 msgid "Zlib version error"
 msgstr ""
 
-#: src/filed/restore.c:982
+#: src/filed/restore.c:1212
 #, c-format
 msgid "Missing cryptographic signature for %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1015 src/filed/restore.c:1044
+#: src/filed/restore.c:1245 src/filed/restore.c:1274
 #, c-format
 msgid "Signature validation failed for file %s: ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:1032
+#: src/filed/restore.c:1262
 #, c-format
 msgid "Digest one file failed for file: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1071
+#: src/filed/restore.c:1301
 #, c-format
 msgid "Signature validation failed for %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1166
+#: src/filed/restore.c:1398
 #, c-format
 msgid "LZO uncompression error on file %s. ERR=%d\n"
 msgstr ""
 
-#: src/filed/restore.c:1203
+#: src/filed/restore.c:1435
 #, c-format
 msgid "Uncompression error on file %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/restore.c:1236
+#: src/filed/restore.c:1468
 #, c-format
 msgid "Write error in Win32 Block Decomposition on %s: %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1295
+#: src/filed/restore.c:1527
 msgid "Decryption error\n"
 msgstr ""
 
-#: src/filed/restore.c:1389
+#: src/filed/restore.c:1620
 msgid "Logic error: output file should be open\n"
 msgstr ""
 
-#: src/filed/restore.c:1420
+#: src/filed/restore.c:1658
 msgid "Logic error: output file should not be open\n"
 msgstr ""
 
-#: src/filed/restore.c:1453
+#: src/filed/restore.c:1692
 #, c-format
 msgid "Decryption error. buf_len=%d decrypt_len=%d on file %s\n"
 msgstr ""
 
-#: src/filed/restore.c:1574
+#: src/filed/restore.c:1813
 msgid "Open File Manager paused\n"
 msgstr ""
 
-#: src/filed/restore.c:1578
+#: src/filed/restore.c:1817
 msgid "FAILED to pause Open File Manager\n"
 msgstr ""
 
-#: src/filed/restore.c:1586
+#: src/filed/restore.c:1825
 #, c-format
 msgid "Running as '%s'. Privmask=%#08x\n"
 msgstr ""
 
-#: src/filed/restore.c:1588
+#: src/filed/restore.c:1827
 msgid "Failed to retrieve current UserName\n"
 msgstr ""
 
-#: src/filed/job.c:454
+#: src/filed/job.c:458
 #, c-format
 msgid "2901 Job %s not found.\n"
 msgstr ""
 
-#: src/filed/job.c:464
+#: src/filed/job.c:468
 #, c-format
 msgid "2001 Job %s marked to be canceled.\n"
 msgstr ""
 
-#: src/filed/job.c:467
+#: src/filed/job.c:471
 msgid "2902 Error scanning cancel command.\n"
 msgstr ""
 
-#: src/filed/job.c:490
+#: src/filed/job.c:494
 #, c-format
 msgid "2991 Bad setdebug command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:513
+#: src/filed/job.c:517
 #, c-format
 msgid "Bad estimate command: %s"
 msgstr ""
 
-#: src/filed/job.c:514
+#: src/filed/job.c:518
 msgid "2992 Bad estimate command.\n"
 msgstr ""
 
-#: src/filed/job.c:537
+#: src/filed/job.c:541
 #, c-format
 msgid "Bad Job Command: %s"
 msgstr ""
 
-#: src/filed/job.c:563
+#: src/filed/job.c:580
 #, c-format
 msgid "Bad RunBeforeJob command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:564 src/filed/job.c:582
+#: src/filed/job.c:581 src/filed/job.c:600
 msgid "2905 Bad RunBeforeJob command.\n"
 msgstr ""
 
-#: src/filed/job.c:593
+#: src/filed/job.c:611
 msgid "2905 Bad RunBeforeNow command.\n"
 msgstr ""
 
-#: src/filed/job.c:612
+#: src/filed/job.c:630
 #, c-format
 msgid "Bad RunAfter command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:613
+#: src/filed/job.c:631
 msgid "2905 Bad RunAfterJob command.\n"
 msgstr ""
 
-#: src/filed/job.c:647
+#: src/filed/job.c:667
 #, c-format
 msgid "Bad RunScript command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:648
+#: src/filed/job.c:668
 msgid "2905 Bad RunScript command.\n"
 msgstr ""
 
-#: src/filed/job.c:692
+#: src/filed/job.c:722
 #, c-format
 msgid "Bad RestoreObject command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:753
+#: src/filed/job.c:789
 msgid "2909 Bad RestoreObject command.\n"
 msgstr ""
 
-#: src/filed/job.c:792
+#: src/filed/job.c:828
 #, c-format
 msgid "Plugin Directory not defined. Cannot use plugin: \"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:834
+#: src/filed/job.c:870
 #, c-format
 msgid "Error running program: %s. stat=%d: ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:845
+#: src/filed/job.c:881
 #, c-format
 msgid "Cannot open FileSet input file: %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:991
+#: src/filed/job.c:1027
 #, c-format
 msgid "REGEX %s compile error. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:1137
+#: src/filed/job.c:1178
 #, c-format
 msgid "Invalid FileSet command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1607
+#: src/filed/job.c:1651
 #, c-format
 msgid ""
 "DIR and FD clocks differ by %lld seconds, FD automatically compensating.\n"
 msgstr ""
 
-#: src/filed/job.c:1616
+#: src/filed/job.c:1660
 #, c-format
 msgid "Unknown backup level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1629
+#: src/filed/job.c:1673
 #, c-format
 msgid "Bad level command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1651
+#: src/filed/job.c:1695
 #, c-format
 msgid "Bad session command: %s"
 msgstr ""
 
-#: src/filed/job.c:1712
+#: src/filed/job.c:1756
 #, c-format
 msgid "Bad storage command: %s"
 msgstr ""
 
-#: src/filed/job.c:1733
+#: src/filed/job.c:1777
 #, c-format
 msgid "Failed to connect to Storage daemon: %s:%d\n"
 msgstr ""
 
-#: src/filed/job.c:1745
+#: src/filed/job.c:1789
 msgid "Failed to authenticate Storage daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1792
+#: src/filed/job.c:1836
 msgid "ACL support not configured for your machine.\n"
 msgstr ""
 
-#: src/filed/job.c:1796
+#: src/filed/job.c:1840
 msgid "XATTR support not configured for your machine.\n"
 msgstr ""
 
-#: src/filed/job.c:1805
+#: src/filed/job.c:1849
 msgid "Cannot contact Storage daemon\n"
 msgstr ""
 
-#: src/filed/job.c:1824
+#: src/filed/job.c:1868
 #, c-format
 msgid "Bad response to append open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1829
+#: src/filed/job.c:1873
 msgid "Bad response from stored to open command\n"
 msgstr ""
 
-#: src/filed/job.c:1860
+#: src/filed/job.c:1904
 #, c-format
 msgid "Generate VSS snapshots. Driver=\"%s\", Drive(s)=\"%s\"\n"
 msgstr ""
 
-#: src/filed/job.c:1863
-#, c-format
-msgid "Generate VSS snapshots failed. ERR=%s\n"
+#: src/filed/job.c:1906
+msgid "CreateSGenerate VSS snapshots failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1869
+#: src/filed/job.c:1912
 #, c-format
 msgid "Generate VSS snapshot of drive \"%c:\\\" failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1875
+#: src/filed/job.c:1918
 #, c-format
 msgid "VSS Writer (PrepareForBackup): %s\n"
 msgstr ""
 
-#: src/filed/job.c:1880
+#: src/filed/job.c:1923
 msgid "No drive letters found for generating VSS snapshots.\n"
 msgstr ""
 
-#: src/filed/job.c:1884
-#, c-format
-msgid "VSS was not initialized properly. ERR=%s\n"
+#: src/filed/job.c:1926
+msgid "VSS was not initialized properly.\n"
 msgstr ""
 
-#: src/filed/job.c:1934
+#: src/filed/job.c:1976
 msgid "Append Close with SD failed.\n"
 msgstr ""
 
-#: src/filed/job.c:1938
+#: src/filed/job.c:1980
 #, c-format
 msgid "Bad status %d returned from Storage Daemon.\n"
 msgstr ""
 
-#: src/filed/job.c:1968
+#: src/filed/job.c:2010
 #, c-format
 msgid "2994 Bad verify command: %s\n"
 msgstr ""
 
-#: src/filed/job.c:1983 src/filed/job.c:2024
+#: src/filed/job.c:2025 src/filed/job.c:2066
 #, c-format
 msgid "2994 Bad verify level: %s\n"
 msgstr ""
 
-#: src/filed/job.c:2093
+#: src/filed/job.c:2138
 #, c-format
 msgid "Bad replace command. CMD=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2111
+#: src/filed/job.c:2161
 #, c-format
 msgid "Bad where regexp. where=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2154
-#, c-format
-msgid "VSS Writer (PreRestore): %s\n"
-msgstr ""
-
-#: src/filed/job.c:2165
+#: src/filed/job.c:2199
 #, c-format
 msgid "VSS was not initialized properly. VSS support is disabled. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2207
+#: src/filed/job.c:2244
 #, c-format
 msgid "VSS Writer (RestoreComplete): %s\n"
 msgstr ""
 
-#: src/filed/job.c:2254
+#: src/filed/job.c:2292
 msgid "Improper calling sequence.\n"
 msgstr ""
 
-#: src/filed/job.c:2274
+#: src/filed/job.c:2312
 #, c-format
 msgid "Bad response to SD read open: %s\n"
 msgstr ""
 
-#: src/filed/job.c:2279
+#: src/filed/job.c:2317
 msgid "Bad response from stored to read open command\n"
 msgstr ""
 
-#: src/filed/job.c:2346
+#: src/filed/job.c:2385
 #, c-format
 msgid "Comm error with SD. bad response to %s. ERR=%s\n"
 msgstr ""
 
-#: src/filed/job.c:2349
+#: src/filed/job.c:2388
 #, c-format
 msgid "Bad response to %s command. Wanted %s, got %s\n"
 msgstr ""
 
-#: src/filed/authenticate.c:66
+#: src/filed/authenticate.c:68
 #, c-format
 msgid "I only authenticate directors, not %d\n"
 msgstr ""
 
-#: src/filed/authenticate.c:98
+#: src/filed/authenticate.c:100
 #, c-format
 msgid "Connection from unknown Director %s at %s rejected.\n"
 msgstr ""
 
-#: src/filed/authenticate.c:142
+#: src/filed/authenticate.c:144
 #, c-format
 msgid "Incorrect password given by Director at %s.\n"
 msgstr ""
 
-#: src/filed/authenticate.c:261
+#: src/filed/authenticate.c:263
 msgid ""
 "Authorization key rejected by Storage daemon.\n"
 "Please see "
@@ -17806,7 +17837,7 @@
 msgid "Console: name=%s\n"
 msgstr ""
 
-#: src/qt-console/main.cpp:179
+#: src/qt-console/main.cpp:191
 #, c-format
 msgid ""
 "\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bash.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bash.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bash.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bash.po	2012-02-23 06:55:26.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:10+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: arrayfunc.c:50
 msgid "bad array subscript"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bfd.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bfd.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bfd.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bfd.po	2012-02-23 06:55:26.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: aout-adobe.c:127
 msgid "%B: Unknown section type in a.out.adobe file: %x\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/binutils.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/binutils.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/binutils.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/binutils.po	2012-02-23 06:55:26.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:30+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: addr2line.c:81
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bison-runtime.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bison-runtime.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/bison-runtime.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/bison-runtime.po	2012-02-23 06:55:26.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:17+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:33+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: data/glr.c:923 data/yacc.c:727
 msgid "syntax error: cannot back up"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/checkbox.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/checkbox.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/checkbox.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/checkbox.po	2012-02-23 06:55:58.000000000 +0000
@@ -0,0 +1,3291 @@
+# Slovak translation for checkbox
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the checkbox package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-16 16:07+0000\n"
+"PO-Revision-Date: 2011-01-20 07:34+0000\n"
+"Last-Translator: Marek Štubniak <marcofreez@centrum.sk>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:48+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+
+#. Title of the user interface
+#: ../gtk/checkbox-gtk.ui.h:1 ../gtk/checkbox-gtk.desktop.in.h:1
+#: ../plugins/user_interface.py:42
+msgid "System Testing"
+msgstr "Testovanie systému"
+
+#: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:538
+msgid "_Test"
+msgstr "_Test"
+
+#: ../gtk/checkbox-gtk.ui.h:3
+msgid "_Yes"
+msgstr "_Áno"
+
+#: ../gtk/checkbox-gtk.ui.h:4
+msgid "_No"
+msgstr "_Nie"
+
+#: ../gtk/checkbox-gtk.ui.h:5
+msgid "_Skip this test"
+msgstr "_Preskočiť tento test"
+
+#: ../gtk/checkbox-gtk.ui.h:6 ../checkbox_cli/cli_interface.py:348
+#: ../checkbox_urwid/urwid_interface.py:261
+msgid "Further information:"
+msgstr "Ďalšie informácie:"
+
+#: ../gtk/checkbox-gtk.ui.h:7
+msgid "_Select All"
+msgstr "_Vybrať všetky"
+
+#: ../gtk/checkbox-gtk.ui.h:8
+msgid "_Deselect All"
+msgstr "O_dznačiť všetko"
+
+#: ../gtk/checkbox-gtk.ui.h:9
+msgid "_Previous"
+msgstr "_Predchádzajúce"
+
+#: ../gtk/checkbox-gtk.ui.h:10
+msgid "Ne_xt"
+msgstr "Ď_alej"
+
+#: ../gtk/checkbox-gtk.desktop.in.h:2
+msgid "Test your system and submit results to the Ubuntu Friendly project"
+msgstr ""
+"Otestujte svoj systém a zapíšte výsledok do \"Ubuntu Friendly\" projektu"
+
+#. description
+#: ../jobs/audio.txt.in:7
+msgid "Test to detect audio devices"
+msgstr "Test pre detekciu zvukových zariadení"
+
+#. description
+#: ../jobs/audio.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that internal speakers work correctly\n"
+"STEPS:\n"
+"    1. Make sure that no external speakers or headphones are connected\n"
+"       If testing a desktop, external speakers are allowed\n"
+"    2. Click the Test button to play a brief tone on your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a tone?"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať či vnútorné reproduktory pracujú správne\n"
+"KROKY:\n"
+"    1. Uistite sa, že žiadne externé reproduktory alebo slúchadlá nie sú "
+"pripojené\n"
+"       Ak je testovaný osobný počítač - desktop, externé reproduktory sú "
+"povolené\n"
+"    2. Kliknite na tlačítko Test, bude zahratý krátky tón na vašom audio "
+"zariadení\n"
+"OVERENIE:\n"
+"    Počuli ste tón?"
+
+#. description
+#: ../jobs/audio.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that headphones connector works correctly\n"
+"STEPS:\n"
+"    1. Connect a pair of headphones to your audio device\n"
+"    2. Click the Test button to play a sound to your audio device\n"
+"VERIFICATION:\n"
+"    Did you hear a sound through the headphones and did the sound play "
+"without any distortion, clicks or other strange noises from your headphones?"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať či konektor slúchadiel pracuje správne\n"
+"KROKY:\n"
+"    1. Pripojte slúchadlá do audio zariadenia - sluchádkového výstupu\n"
+"    2. Kliknite na tlačítko Test, bude zahratý krátky tón na vašom audio "
+"zariadení\n"
+"OVERENIE:\n"
+"    Počuli ste zvuk cez slúchadlá a zvuk bol prehratý bez skreslenia, "
+"kliknutí alebo iných zvláštnych zvukov ?"
+
+#. description
+#: ../jobs/audio.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using the onboard microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Disconnect any external microphones that you have plugged in\n"
+"    2. Click \"Test\", then speak into your internal microphone\n"
+"    3. After a few seconds, your speech will be played back to you.\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať, či nahrávanie zvuku pomocou vstavaného "
+"mikrofón funguje správne\n"
+"KROKY:\n"
+"    1. Odpojte všetky externé mikrofóny, ktoré sú zapojené\n"
+"    2. Kliknite na tlačidlo \"Test\", potom začnite hovoriť do vašeho "
+"vstavaného mikrofón\n"
+"    3. Po niekoľkých sekundách bude vaša reč prehratá späť.\n"
+"OVERENIE:\n"
+"    Bola vaša reč prehratá správne?"
+
+#. description
+#: ../jobs/audio.txt.in:66
+msgid ""
+"PURPOSE:\n"
+"    This test will check that recording sound using an external microphone "
+"works correctly\n"
+"STEPS:\n"
+"    1. Connect a microphone to your microphone port\n"
+"    2. Click \"Test\", then speak into the external microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back?"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať, či nahrávanie zvuku pomocou externého "
+"mikrofón funguje správne\n"
+"KROKY:\n"
+"    1. Pripojte mikrofón do mikrofónového vstupu\n"
+"    2. Kliknite na tlačidlo \"Test\", potom začnite hovoriť do vašeho "
+"externého mikrofón\n"
+"    3. Po niekoľkých sekundách bude vaša reč prehratá späť.\n"
+"OVERENIE:\n"
+"    Bola vaša reč prehratá správne?"
+
+#. description
+#: ../jobs/audio.txt.in:82
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a USB audio device works correctly\n"
+"STEPS:\n"
+"    1. Connect a USB audio device to your system\n"
+"    2. Click \"Test\", then speak into the microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
+"VERIFICATION:\n"
+"    Did you hear your speech played back through the USB headphones?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:99
+msgid ""
+"Play back a sound on the default output and listen for it on the  default "
+"input.  This makes the most sense when the output and input  are directly "
+"connected, as with a patch cable."
+msgstr ""
+"Prehrávať zvuk z štandardného výstupu a počúvať ho na štandardnom vstupe. Je "
+"najlepšie, keď sú vstup a výstup priamo pripojené, s prepojovacím káblom."
+
+#. description
+#: ../jobs/autotest.txt.in:6
+msgid ""
+"PURPOSE:\n"
+"   This test will attempt to install and run the Autotest Suite.  These "
+"tests can be destructive, so this test is blacklisted by default."
+msgstr ""
+"ÚČEL:\n"
+"   Tento test sa pokúsi nainštalovať a spustiť Autotest Suite - Autotesovací "
+"Balík. Tieto testy môžu byť deštruktívne, takže tento test je zakázaný v "
+"predvolenom nastavení."
+
+#. description
+#: ../jobs/bluetooth.txt.in:8
+msgid ""
+"Automated test to store bluetooth device information in checkbox report"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will check that bluetooth connection works correctly\n"
+"STEPS:\n"
+"    1. Enable bluetooth on any mobile device (PDA, smartphone, etc.)\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Right-click on the bluetooth icon and select browse files\n"
+"    8. Authorize the computer to browse the files in the device if needed\n"
+"    9. You should be able to browse the files\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať, či bluetooth spojenie funguje správne\n"
+"KROKY:\n"
+"    1. Zapnite bluetooth na akomkoľvek mobilnom zariadení (PDA, smartphone, "
+"etc.)\n"
+"    2. Kliknite na ikonu bluetooth v panele menu\n"
+"    3. Zvoľte 'Nastavenie nového zariadenia'\n"
+"    4. Vyberte zvolené zariadenie so zoznamu\n"
+"    5. V zariadení napíšte PIN kód, ktorý bol automaticky vybratý "
+"sprievodcom\n"
+"    6. Zariadenie by sa malo spárovať s počítačom\n"
+"    7. Kliknite pravým tlačidlom myši na ikonu bluetooth a vyberte "
+"prehliadanie súborov\n"
+"    8. V prípade potreby povolte počítaču prehliadanie súborov v zariadení\n"
+"    9. Mali by ste byť schopní prehliadať súbory\n"
+"OVERENIE:\n"
+"    Prešli ste úspešne všetky kroky?"
+
+#. description
+#: ../jobs/bluetooth.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can transfer information through a "
+"bluetooth connection\n"
+"STEPS:\n"
+"    1. Make sure that you're able to browse the files in your mobile device\n"
+"    2. Copy a file from the computer to the mobile device\n"
+"    3. Copy a file from the mobile device to the computer\n"
+"VERIFICATION:\n"
+"    Were all files copied correctly?"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať, či je možné prenášať informácie cez "
+"pripojenie bluetooth\n"
+"KROKY:\n"
+"    1. Uistite sa, že môžete prehliadať súbory vo vašom mobilnom zariadení\n"
+"    2. Skopírujte súbor z počítača do mobilného zariadenia\n"
+"    3. Skopírujte súbor z mobilného zariadenia do počítača \n"
+"OVERENIE:\n"
+"    Boli všetky súbory skopírované správne?"
+
+#. description
+#: ../jobs/bluetooth.txt.in:47
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can record and hear audio using a "
+"bluetooth audio device\n"
+"STEPS:\n"
+"    1. Enable the bluetooth headset\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. In the device write the PIN code automatically chosen by the wizard\n"
+"    6. The device should pair with the computer\n"
+"    7. Click \"Test\" to record for five seconds and reproduce in the "
+"bluetooth device\n"
+"VERIFICATION:\n"
+"    Did you hear the sound you recorded in the bluetooth"
+msgstr ""
+"ǓČEL:\n"
+"    Tento test bude kontrolovať, či je možné nahrávať a počúvať zvuk pomocou "
+"bluetooth audio zariadenia\n"
+"KROKY:\n"
+"    1. Zapnite bluetooth headset\n"
+"    2. Kliknite na ikonu bluetooth v panele menu\n"
+"    3. Zvoľte 'Nastavenie nového zariadenia'\n"
+"    4. Vyberte zvolené zariadenie so zoznamu\n"
+"    5. V zariadení napíšte PIN kód, ktorý bol automaticky vybratý "
+"sprievodcom\n"
+"    6. Zariadenie by sa malo spárovať s počítačom\n"
+"    7. Kliknite na tlačidlo \"Test\" pre záznam po dobu piatich sekúnd a "
+"prehranie v bluetooth zariadení\n"
+"OVERENIE:\n"
+"    Počuli ste zvuk nahraný cez  bluetooth"
+
+#. description
+#: ../jobs/bluetooth.txt.in:65
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth keyboard\n"
+"STEPS:\n"
+"    1. Enable the bluetooth keyboard\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Click \"Test\"\n"
+"    6. Enter some text\n"
+"VERIFICATION:\n"
+"    Were you able to enter some text with the bluetooth keyboard?"
+msgstr ""
+
+#. description
+#: ../jobs/bluetooth.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that you can use a bluetooth mouse\n"
+"STEPS:\n"
+"    1. Enable the bluetooth mouse\n"
+"    2. Click on the bluetooth icon in the menu bar\n"
+"    3. Select 'Setup new device'\n"
+"    4. Look for the device in the list and select it\n"
+"    5. Move the mouse around the screen\n"
+"    6. Perform some single/double/right click operations\n"
+"VERIFICATION:\n"
+"    Did the mouse work as expected?"
+msgstr ""
+"ÚČEL:\n"
+"    Tento test skontroluje, či môžete používať bluetooth myš\n"
+"KROKY:\n"
+"    1. Povoľte bluetooth myš\n"
+"    2. Kliknite na ikonu bluetooth v panele menu\n"
+"    3. Zvoľte 'Nastavenie nového zariadenia'\n"
+"    4. Vyberte zvolené zariadenie zo zoznamu\n"
+"    5. Pohybujte myšou po obrazovke\n"
+"    6. Vykonávať niektoré operácie s myšou, jednoduché kliknutie / dvoj klik "
+"/ kliknite pravým tlačidlom myši \n"
+"OVERENIE:\n"
+"    Fungovala myš podľa očakávaní?"
+
+#. description
+#: ../jobs/camera.txt.in:7
+msgid "This Automated test attempts to detect a camera."
+msgstr "Automatizovaný test rozpoznamia kamery."
+
+#. description
+#: ../jobs/camera.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a video capture from the camera for ten "
+"seconds.\n"
+"VERIFICATION:\n"
+"    Did you see the video capture?"
+msgstr ""
+
+#. description
+#: ../jobs/camera.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the built-in camera works\n"
+"STEPS:\n"
+"    1. Click on Test to display a still image from the camera\n"
+"VERIFICATION:\n"
+"    Did you see the image?"
+msgstr ""
+"ÚČEL:\n"
+"    Tento test bude kontrolovať funkčnosť vstavanej kamery\n"
+"KROKY:\n"
+"    1. Kliknite na tlačidlo Test, pre zachytenie obrázka z kamery\n"
+"OVERENIE:\n"
+"    Videli ste zachytený obrázok."
+
+#. description
+#: ../jobs/codecs.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Ogg Vorbis audio "
+"files.\n"
+"STEPS:\n"
+"   1. Click Test to play an Ogg Vorbis file (.ogg)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+"ÚČEL:\n"
+"    Tento test preverí schopnosť vašeho systému prehrávať zvukové súbory Ogg "
+"Vorbis.\n"
+"KROKY:\n"
+"    1. Kliknite na tlačidlo Test prehrať súbor Ogg Vorbis (.ogg)\n"
+"    2. Pre pokračovanie prosím zatvorte prehrávač.\n"
+"OVERENIE:\n"
+"    Bolo vzorka prehratá správne?"
+
+#. description
+#: ../jobs/codecs.txt.in:22
+msgid ""
+"PURPOSE:\n"
+"   This test will verify your system's ability to play Wave Audio files.\n"
+"STEPS:\n"
+"   1. Select Test to play a Wave Audio format file (.wav)\n"
+"   2. Please close the player to proceed.\n"
+"VERIFICATION:\n"
+"   Did the sample play correctly?"
+msgstr ""
+"ÚČEL:\n"
+"    Tento test preverí schopnosť vašeho systému prehrávať zvukové súbory "
+"Wave.\n"
+"KROKY:\n"
+"    1. Kliknite na tlačidlo Test pre prehranie audio súbor Wave (.wav)\n"
+"    2. Pre pokračovanie prosím zatvorte prehrávač.\n"
+"OVERENIE:\n"
+"    Bolo vzorka prehratá správne?"
+
+#. description
+#: ../jobs/cpu.txt.in:8
+msgid ""
+"Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq)."
+msgstr ""
+"Test schopností škálovania procesora - CPU pomocou Firmware Test Suite (fwts "
+"cpufreq)."
+
+#. description
+#: ../jobs/cpu.txt.in:15
+msgid "Test for clock jitter."
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:23
+msgid "Test offlining CPUs in a multicore system."
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:30
+msgid "This test checks cpu topology for accuracy"
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:38
+msgid "This test checks that CPU frequency governors are obeyed when set."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:5
+msgid "Test if the atd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:11
+msgid "Test if the cron daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:17
+msgid "Test if the cupsd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:23
+msgid "Test if the getty daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:29
+msgid "Test if the init daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:35
+msgid "Test if the klogd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:41
+msgid "Test if the nmbd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:47
+msgid "Test if the smbd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:53
+msgid "Test if the syslogd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:61
+msgid "Test if the udevd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/daemons.txt.in:67
+msgid "Test if the winbindd daemon is running when the package is installed."
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:4
+msgid "Detects and displays disks attached to the system."
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:9
+msgid "Benchmark for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:23
+msgid "Check stats changes for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:40
+msgid "SMART test"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:56
+msgid "Maximum disk space used during a default installation test"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:71
+msgid "Verify system storage performs at or above baseline performance"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:88
+msgid ""
+"Verify that storage devices, such as Fibre Channel and RAID can be detected "
+"and perform under stress."
+msgstr ""
+
+#. description
+#: ../jobs/fingerprint.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader will work properly for "
+"logging into your system.\n"
+"PREREQUISITES:\n"
+"   This test case assumes that there's a testing account from which test "
+"cases are run and a personal account that the tester uses to verify the "
+"fingerprint reader\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select your user name.\n"
+"   3. A window should appear that provides the ability to login either "
+"typing your password or using fingerprint authentication.\n"
+"   4. Use the fingerprint reader to login.\n"
+"   5. Click on the user switcher applet.\n"
+"   6. Select the testing account to continue running tests.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/fingerprint.txt.in:20
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a fingerprint reader can be used to unlock a "
+"locked system.\n"
+"STEPS:\n"
+"   1. Click on the user switcher applet.\n"
+"   2. Select 'Lock screen'.\n"
+"   3. Press any key or move the mouse.\n"
+"   4. A window should appear that provides the ability to unlock either "
+"typing your password or using fingerprint authentication.\n"
+"   5. Use the fingerprint reader to unlock.\n"
+"   6. Your screen should be unlocked.\n"
+"VERIFICATION:\n"
+"   Did the authentication procedure work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check the system can detect the insertion of a FireWire "
+"HDD\n"
+"STEPS:\n"
+"    1. Click 'Test' to begin the test. This test will\n"
+"       timeout and fail if the insertion has not been detected within 10 "
+"seconds.\n"
+"    2. Plug a FireWire HDD into an available FireWire port.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the "
+"automatically\n"
+"    selected result"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:19
+msgid ""
+"This is an automated test which performs read/write operations on an "
+"attached FireWire HDD"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:27
+msgid ""
+" PURPOSE:\n"
+"   This test will check the system can detect the removal of a FireWire HDD\n"
+" STEPS:\n"
+"   1. Click 'Test' to begin the test. This test will timeout and fail if\n"
+"      the removal has not been detected within 10 seconds.\n"
+"   2. Remove the previously attached FireWire HDD from the FireWire port.\n"
+" VERIFICATION:\n"
+"   The verification of this test is automated. Do not change the "
+"automatically\n"
+"   selected result"
+msgstr ""
+
+#. description
+#: ../jobs/floppy.txt.in:4
+msgid "Floppy test"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:5
+msgid "Test to output the Xorg version"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:12
+msgid "Run gtkperf to make sure that GTK based test cases work"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will verify that the GUI is usable after manually changing "
+"resolution\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new resolution from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Select the original resolution from the dropdown list\n"
+"    5. Click on Apply\n"
+"VERIFICATION:\n"
+"    Did the resolution change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will test display rotation\n"
+"STEPS:\n"
+"    1. Open the Displays application\n"
+"    2. Select a new rotation value from the dropdown list\n"
+"    3. Click on Apply\n"
+"    4. Click on Restore Previous Configuration\n"
+"    5. Click on Apply\n"
+"    6. Repeat 2-5 for different rotation values\n"
+"VERIFICATION:\n"
+"    Did the display rotation change as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:50
+msgid "Test that the X process is running."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:56
+msgid "Test that the X is not running in failsafe mode."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:63
+msgid ""
+"Test that X does not leak memory when running programs on systems with intel "
+"based graphics."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will verify the default display resolution\n"
+"STEPS:\n"
+"    1. This display is using the following resolution:\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Is this acceptable for your display?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid ""
+"Ensure the current resolution meets or exceeds the recommended minimum "
+"resolution (800x600). See here for details:"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:85
+msgid "https://help.ubuntu.com/community/Installation/SystemRequirements"
+msgstr "https://help.ubuntu.com/community/Installation/SystemRequirements"
+
+#. description
+#: ../jobs/graphics.txt.in:95
+msgid ""
+"PURPOSE:\n"
+"    This test will test the default display\n"
+"STEPS:\n"
+"    1. Click \"Test\" to display a video test.\n"
+"VERIFICATION:\n"
+"    Do you see color bars and static?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:106
+msgid "Check that VESA drivers are not in use"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:113
+msgid ""
+"PURPOSE:\n"
+"    This test cycles through the detected video modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start cycling through the video modes\n"
+"VERIFICATION:\n"
+"    Did the screen appear to be working for each mode?"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:126
+msgid "Check that hardware is able to run compiz"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:133
+msgid "Check that hardware is able to run Unity 3D"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:139
+msgid ""
+"PURPOSE:\n"
+"    This test tests the basic 3D capabilities of your video card\n"
+"STEPS:\n"
+"    1. Click \"Test\" to execute an OpenGL demo. Press ESC at any time to "
+"close.\n"
+"    2. Verify that the animation is not jerky or slow.\n"
+"VERIFICATION:\n"
+"    1. Did the 3d animation appear?\n"
+"    2. Was the animation free from slowness/jerkiness?"
+msgstr ""
+
+#. description
+#: ../jobs/hibernate.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"    This test will check to make sure your system can successfully hibernate "
+"(if supported)\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. The system will hibernate and should wake itself within 5 minutes\n"
+"    3. If your system does not wake itself after 5 minutes, please press the "
+"power button to wake the system manually\n"
+"    4. If the system fails to resume from hibernate, please restart System "
+"Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and did it work properly after "
+"waking up?"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:5
+msgid "Attaches a report of installed codecs for Intel HDA"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:10
+msgid "Attaches a report of CPU information"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:15
+msgid "Attaches a copy of /var/log/dmesg to the test results"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:20
+msgid "Attaches info on DMI"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:26
+msgid "Attaches dmidecode output"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:31
+msgid "Attaches very verbose lspci output."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:40
+msgid "Attaches the contents of the various modprobe conf files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:45
+msgid "Attaches the contents of the /etc/modules file."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:50
+msgid "attaches the contents of various sysctl config files."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:54
+msgid "Attaches a report of sysfs attributes."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:65
+msgid ""
+"Attaches a dump of the udev database showing system hardware information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:72
+msgid "Attaches a tarball of gcov data if present."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:77
+msgid "Attaches a list of the currently running kernel modules."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:85
+msgid "Captures a screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:91
+msgid "Attaches the screenshot captured in info/screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:96
+msgid "Gather log from the Firmware Test Suite run."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:103
+msgid "Attaches the contents of /proc/acpi/sleep if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:107
+msgid "Bootchart information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:116
+msgid "SATA/IDE device information."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:133
+msgid "Attaches the bootchart png file for bootchart runs"
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:142
+msgid "Attaches the bootchart log for bootchart test runs."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:150
+msgid "installs the installer bootchart tarball if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/info.txt.in:155
+msgid "Attaches the installer debug log if it exists."
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test your pointing device\n"
+"STEPS:\n"
+"    1. Move the cursor using the pointing device or touch the screen.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Did the pointing device work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/input.txt.in:17
+msgid ""
+"PURPOSE:\n"
+"    This test will test your keyboard\n"
+"STEPS:\n"
+"    1. Click on Test\n"
+"    2. On the open text area, use your keyboard to type something\n"
+"VERIFICATION:\n"
+"    Is your keyboard working properly?"
+msgstr ""
+
+#. description
+#: ../jobs/install.txt.in:6
+msgid ""
+"Tests to see that apt can access repositories and get updates (does not "
+"install updates). This is done to confirm that you could recover from an "
+"incomplete or broken update."
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will test the brightness key\n"
+"STEPS:\n"
+"    1. Press the brightness buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the brightness change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:14
+msgid ""
+"PURPOSE:\n"
+"    This test will test the volume keys\n"
+"STEPS:\n"
+"    1. Press the volume buttons on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume change following to your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:25
+msgid ""
+"PURPOSE:\n"
+"    This test will test the mute key\n"
+"STEPS:\n"
+"    1. Press the mute button on the keyboard\n"
+"VERIFICATION:\n"
+"    Did the volume mute following your key presses?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will test the sleep key\n"
+"STEPS:\n"
+"    1. Press the sleep key on the keyboard\n"
+"    2. Wake your system up by pressing the power button\n"
+"VERIFICATION:\n"
+"    Did the system go to sleep after pressing the sleep key?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:49
+msgid ""
+"PURPOSE:\n"
+"    This test will test the battery information key\n"
+"STEPS:\n"
+"    1. Press the battery information key on the keyboard\n"
+"VERIFICATION:\n"
+"    Did a notification appear showing the battery status?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:60
+msgid ""
+"PURPOSE:\n"
+"    This test will test the wireless key\n"
+"STEPS:\n"
+"    1. Press the wireless key on the keyboard\n"
+"    2. Press the same key again\n"
+"VERIFICATION:\n"
+"    Did the wireless go off on the first press and on again on the second?"
+msgstr ""
+
+#. description
+#: ../jobs/keys.txt.in:74
+msgid ""
+"PURPOSE:\n"
+"    This test will test the media keys of your keyboard\n"
+"STEPS:\n"
+"    1. Click test to open a window on which to test the media control keys.\n"
+"    2. If all the keys work, the test will be marked as passed.\n"
+"    3. If your computer has no media control keys, Skip this test.\n"
+"    VERIFICATION:\n"
+"    Do the keys work as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:3
+msgid "Audio tests"
+msgstr "Testovanie zvuku"
+
+#. description
+#: ../jobs/local.txt.in:8
+msgid "Autotest Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:13
+msgid "Bluetooth tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:18
+msgid "Camera tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:23
+msgid "Codec tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:28
+msgid "CPU tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:33
+msgid "System Daemon tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:38
+msgid "Disk tests"
+msgstr "Testovanie diskov"
+
+#. description
+#: ../jobs/local.txt.in:43
+msgid "Fingerprint reader tests"
+msgstr "Testovanie čítačky odtlačkov prstov"
+
+#. description
+#: ../jobs/local.txt.in:48
+msgid "Firewire disk tests"
+msgstr "Testovanie firewire"
+
+#. description
+#: ../jobs/local.txt.in:53
+msgid "Floppy disk tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:58
+msgid "Graphics tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:63
+msgid "Hibernation tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:68
+msgid "Informational tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:73
+msgid "Input Devices tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:78
+msgid "Software Installation tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:83
+msgid "Hotkey tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:88
+msgid "Linux Test Project tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:93
+msgid "Mago Automated Desktop Testing"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:98
+msgid "Media Card tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:103
+msgid "Memory tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:108
+msgid "Miscellaneous tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:113
+msgid "Monitor tests"
+msgstr "Testovanie monitora"
+
+#. description
+#: ../jobs/local.txt.in:118
+msgid "Networking tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:123
+msgid "Optical Drive tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:128
+msgid "Panel Clock Verification tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:133
+msgid "PCMCIA/PCIX Card tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:138
+msgid "Peripheral tests"
+msgstr "Testovanie ďalších zariadení"
+
+#. description
+#: ../jobs/local.txt.in:143
+msgid "Phoronix Test Suite tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:148
+msgid "Power Management tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:153
+msgid "QA Regression tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:158
+msgid "Server Services checks"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:163
+msgid "Suspend tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:168
+msgid "Unity tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:173
+msgid "USB tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:178
+msgid "User Applications"
+msgstr "Používateľské aplikácie"
+
+#. description
+#: ../jobs/local.txt.in:183
+msgid "Wireless networking tests"
+msgstr ""
+
+#. description
+#: ../jobs/local.txt.in:188
+msgid "Stress tests"
+msgstr ""
+
+#. description
+#: ../jobs/ltp.txt.in:3
+msgid ""
+"This test installs and runs Linux Test Project syscalls test. This can be "
+"destructive, thus this test is blacklisted by default."
+msgstr ""
+
+#. description
+#: ../jobs/mago.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"   This test installs and runs the Mago Automated Desktop Testing suite."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Multimedia Card (MMC) media\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:20
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert test is "
+"run. It tests reading and writing to the MMC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of the MMC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:43
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an MMC card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:59
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert-after-"
+"suspend test is run. It tests reading and writing to the MMC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:67
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an MMC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital (SD) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:97
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert test is "
+"run. It tests reading and writing to the SD card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:105
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:120
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SD card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:136
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert-after-"
+"suspend test is run. It tests reading and writing to the SD card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:144
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader after the system "
+"has been suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:158
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital High-Capacity (SDHC) media "
+"card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:174
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert test is "
+"run. It tests reading and writing to the SDHC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:182
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SDHC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:197
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SDHC media card after the system has been "
+"suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:213
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert-after-"
+"suspend test is run. It tests reading and writing to the SDHC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:221
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an SDHC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:235
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Compact Flash (CF) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:251
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert test is "
+"run. It tests reading and writing to the CF card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:259
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of a CF card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:274
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a CF card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:290
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert-after-"
+"suspend test is run. It tests reading and writing to the CF card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:298
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of a CF card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:5
+msgid ""
+"This test checks the amount of memory which is reporting in meminfo against "
+"the size of the memory modules detected by DMI."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:14
+msgid "Test and exercise memory."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system can switch to a virtual terminal "
+"and back to X\n"
+"STEPS:\n"
+"    1. Click \"Test\" to switch to another virtual terminal and then back to "
+"X\n"
+"VERIFICATION:\n"
+"    Did your screen change temporarily to a text console and then switch "
+"back to your current session?"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:21
+msgid "Run Firmware Test Suite (fwts) automated tests."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:31
+msgid ""
+"This will run some basic connectivity tests against a BMC, verifying that "
+"IPMI works."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:37
+msgid ""
+"   Determine if we need to run tests specific to portable computers that may "
+"not apply to desktops."
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:45
+msgid ""
+"Test that the /var/crash directory doesn't contain anything. Lists the files "
+"contained within if it does, or echoes the status of the directory (doesn't "
+"exist/is empty)"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:53
+msgid ""
+"Test to check that virtualization is supported and the test system has at "
+"least a minimal amount of RAM to function as an OpenStack Compute Node"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check your VGA port. Skip if your system does not have a "
+"VGA port.\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the VGA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:15
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVI port. Skip if your system does not have a "
+"DVI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DVI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:26
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DisplayPort port. Skip if your system does not "
+"have a DisplayPort port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the DisplayPort port "
+"on your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:37
+msgid ""
+"PURPOSE:\n"
+"    This test will check your HDMI port. Skip if your system does not have a "
+"HDMI port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the HDMI port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:48
+msgid ""
+"PURPOSE:\n"
+"    This test will check your S-VIDEO port. Skip if your system does not "
+"have a S-VIDEO port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the S-VIDEO port on "
+"your system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:59
+msgid ""
+"PURPOSE:\n"
+"    This test will check your RCA port. Skip if your system does not have a "
+"RCA port\n"
+"STEPS:\n"
+"    1. Connect a display (if not already connected) to the RCA port on your "
+"system\n"
+"VERIFICATION:\n"
+"    Was the desktop displayed correctly on both screens?"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your monitor power saving capabilities\n"
+"STEPS:\n"
+"    1. Click \"Test\" to try the power saving capabilities of your monitor\n"
+"    2. Press any key or move the mouse to recover\n"
+"VERIFICATION:\n"
+"    Did the the monitor go blank and turn on again?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:5
+msgid "Test to detect the available network controllers"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:11
+msgid "Tests whether the system has a working Internet connection."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:16
+msgid "Network Information"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:40
+msgid ""
+"This is an automated test to gather some info on the current state of your "
+"network devices. If no devices are found, the test will exit with an error."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:46
+msgid ""
+"PURPOSE:\n"
+"    This test will check your wired connection\n"
+"STEPS:\n"
+"    1. Click on the Network icon in the top panel\n"
+"    2. Select a network below the \"Wired network\" section\n"
+"    3. Click \"Test\" to verify that it's possible to establish a HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:59
+msgid ""
+"PURPOSE:\n"
+"    This test will check that a DSL modem can be configured and connected.\n"
+"STEPS:\n"
+"    1. Connect the telephone line to the computer\n"
+"    2. Click on the Network icon on the top panel.\n"
+"    3. Select \"Edit Connections\"\n"
+"    4. Select the \"DSL\" tab\n"
+"    5. Click on \"Add\" button\n"
+"    6. Configure the connection parameters properly\n"
+"    7. Click \"Test\" to verify that it's possible to establish an HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:76
+msgid ""
+"Automated test case to verify availability of some system on the network "
+"using ICMP ECHO packets."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:83 ../jobs/peripheral.txt.in:37
+msgid ""
+"Automated test case to make sure that it's possible to download files "
+"through HTTP"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:91
+msgid "Test to see if we can sync local clock to an NTP server"
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:97
+msgid ""
+"Verify that an installation of checkbox-server on the network can be reached "
+"over SSH."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:103
+msgid "Try to enable a remote printer on the network and print a test page."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:108
+msgid ""
+"Automated test to walk multiple network cards and test each one in sequence."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:128
+msgid "Test to measure the network bandwidth"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:8
+msgid "Test to detect the optical drives"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check your optical devices ability to read CD media\n"
+"STEPS:\n"
+"    1. Insert appropriate non-blank media into your optical drive(s). Movie "
+"and Audio Disks may not work. Self-created data disks have the greatest "
+"chance of working.\n"
+"    2. If a file browser does not open automatically, open the file browser "
+"and access the disk.\n"
+"    3. Attempt to open a text file on the disk, or copy a file from the disk "
+"to your home directory.\n"
+"VERIFICATION:\n"
+"    Were you able to view files on the disk and either open a file to read "
+"or copy a file to your home directory?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:33
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's CD writing capabilities. This test "
+"requires a blank CD-R. If you do not have a blank CD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank CD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    3. When the CD tray ejects the media after burning, close it (DO NOT "
+"remove the disk, it is needed for the second portion of the test). Note, you "
+"must close the drive within 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:47
+msgid ""
+"PURPOSE:\n"
+"    This test will check your CD audio playback capabilities\n"
+"STEPS:\n"
+"    1. Insert an audio CD in your optical drive\n"
+"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
+"Launcher)\n"
+"    3. Click \"Listen to Music\" to open Banshee\n"
+"    4. Select the CD under \"Libraries\" in the left panel of Banshee\n"
+"    5. Click the Play button to listen to music\n"
+"    6. Stop playing after some time\n"
+"    7. Right click on the CD icon under \"Libraries\" and select \"Eject "
+"Disc\"\n"
+"    8. The CD should be ejected\n"
+"    9. Close Banshee\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:70
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's DVD writing capabilities. This test "
+"requires a blank DVD-R. If you do not have a blank DVD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank DVD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    3. When the CD tray ejects the media after burning, close it (DO NOT "
+"remove the disk, it is needed for the second portion of the test). Note, you "
+"must close the drive within 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:84
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVD movie playback capabilities. Note that "
+"installation of non-free software (codecs, player, etc) may be required "
+"prior to performing this test.\n"
+"STEPS:\n"
+"    1. Insert a DVD that contains any movie in your optical drive\n"
+"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
+"Launcher)\n"
+"    3. Click \"Media Apps\" and then click on \"Movie Player\"\n"
+"    4. Play the movie using Movie Player, stop the movie after verifying "
+"that it plays\n"
+"    6. Eject the DVD\n"
+"VERIFICATION:\n"
+"    Did all the steps work?"
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:102
+msgid ""
+"PURPOSE:\n"
+"    This test will check your DVD  playback capabilities\n"
+"STEPS:\n"
+"    1. Insert a DVD that contains any movie in your optical drive\n"
+"    2. Click \"Test\" to play the DVD in Totem\n"
+"VERIFICATION:\n"
+"    Did the file play?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_clock_test.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that the desktop clock displays the correct date "
+"and time\n"
+"VERIFICATION:\n"
+"   Is the clock in the upper right corner of your desktop displaying the "
+"correct date and time for your timezone?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_clock_test.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that the desktop clock synchronizes with the system "
+"clock.\n"
+"STEPS:\n"
+"   1. Click the \"Test\" button and verify the clock moves ahead by 1 hour.\n"
+"   Note: It may take a minute or so for the clock to refresh\n"
+"   2. Right click on the clock, then click on \"Time & Date Settings...\"\n"
+"   3. Ensure that your clock application is set to manual.\n"
+"   4. Change the time 1 hour back\n"
+"   5. Close the window and reboot\n"
+"VERIFICATION:\n"
+"   Is your system clock displaying the correct date and time for your "
+"timezone?"
+msgstr ""
+
+#. description
+#: ../jobs/panel_reboot.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that you can reboot your system from the desktop "
+"menu\n"
+"STEPS:\n"
+"   1. Click the Gear icon in the upper right corner of the desktop and click "
+"on \"Shut Down\"\n"
+"   2. Click the \"Restart\" button on the left side of the Shut Down dialog\n"
+"   3. After logging back in, restart System Testing and it should resume "
+"here\n"
+"VERIFICATION:\n"
+"   Did your system restart and bring up the GUI login cleanly?"
+msgstr ""
+
+#. description
+#: ../jobs/pcmcia-pcix.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This will verify that a PCMCIA or ExpressCard slot can detect inserted "
+"devices\n"
+"STEPS:\n"
+"    1. Plug a PCMCIA or ExpressCard device into the computer\n"
+"VERIFICATION:\n"
+"    Was the device correctly detected?"
+msgstr ""
+
+#. description
+#: ../jobs/peripheral.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a network printer is usable\n"
+"STEPS:\n"
+"   1. Make sure that a printer is available in your network\n"
+"   2. Click on the Gear icon in the upper right corner and then click on "
+"Printers\n"
+"   3. If the printer isn't already listed, click on Add\n"
+"   4. The printer should be detected and proper configuration values  should "
+"be displayed\n"
+"   5. Print a test page\n"
+"VERIFICATION:\n"
+"   Were you able to print a test page to the network printer?"
+msgstr ""
+
+#. description
+#: ../jobs/peripheral.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"   This test will verify that a USB DLS or Mobile Broadband modem works\n"
+"STEPS:\n"
+"   1. Connect the USB cable to the computer\n"
+"   2. Right click on the Network icon in the panel\n"
+"   3. Select 'Edit Connections'\n"
+"   4. Select the 'DSL' (for ADSL modem) or 'Mobile Broadband' (for 3G modem) "
+"tab\n"
+"   5. Click on add 'Add' button\n"
+"   6. Configure the connection parameters properly\n"
+"   7. Notify OSD should confirm that the connection has been established\n"
+"   8. Select Test to verify that it's possible to establish an HTTP "
+"connection\n"
+"VERIFICATION:\n"
+"   Was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/phoronix.txt.in:9
+msgid ""
+"PURPOSE:\n"
+"   This test will download and install the Phoronix Test Suite and run some "
+"selected benchmarking tests."
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system shutdown/booting cycle\n"
+"STEPS:\n"
+"    1. Shutdown your machine\n"
+"    2. Boot your machine\n"
+"    3. Repeat steps 1 and 2 at least 5 times\n"
+"VERIFICATION:\n"
+"    Did the system shutdown and rebooted correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:15
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Close your laptop lid\n"
+"VERIFICATION:\n"
+"   Does closing your laptop lid cause your system to suspend?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:32
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Click \"Test\"\n"
+"    2. Close and open the lid\n"
+"VERIFICATION:\n"
+"    Did the screen turn off while the lid was closed?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:50
+msgid ""
+"PURPOSE:\n"
+"    This test will check your lid sensors\n"
+"STEPS:\n"
+"    1. Click \"Test\"\n"
+"    2. Close the lid\n"
+"    3. Wait 5 seconds with the lid closed\n"
+"    4. Open the lid\n"
+"VERIFICATION:\n"
+"    Did the system resume when the lid was opened?"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:66
+msgid "Make sure that the RTC (Real-Time Clock) device exists."
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:71
+msgid "Test ACPI Wakealarm (fwts wakealarm) "
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:80
+msgid ""
+"Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple "
+"regression check)"
+msgstr ""
+
+#. description
+#: ../jobs/qa_regression.txt.in:7
+msgid ""
+"PURPOSE:\n"
+"   This is to install and run the Ubuntu QA regression tests (destructive)"
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:5
+msgid "Verifies that sshd is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:11
+msgid "Verifies that Print/CUPs server is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:18
+msgid "Verifies that DNS server is running and working."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:25
+msgid "Verifies that Samba server is running."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:32
+msgid "Verifies that the LAMP stack is running (Apache, MySQL and PHP)."
+msgstr ""
+
+#. description
+#: ../jobs/server-services.txt.in:39
+msgid "Verifies that Tomcat server is running and working."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:8
+msgid ""
+"PURPOSE:\n"
+"    Create jobs that use the CPU as much as possible for two hours. The test "
+"is considered passed if the system does not freeze."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:18
+msgid ""
+"PURPOSE:\n"
+"    This test will enter and resume from hibernate for 30 iterations\n"
+"STEPS:\n"
+"    1. Ensure your system has no power-on or HDD passwords set, and that "
+"grub is set to boot Ubuntu by default if you have a multi-boot set-up\n"
+"    2. Click \"Test\" to start the test (very lengthy)\n"
+"    3. If your system does not wake itself after 2 minutes, you will need to "
+"press the power button\n"
+"    4. If the system fails to resume from hibernation and must be rebooted, "
+"please restart System Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully hibernate and wake 30 times?"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:35
+msgid ""
+"PURPOSE:\n"
+"    This test will enter and resume from suspend for 30 iterations\n"
+"STEPS:\n"
+"    1. Click \"Test\" to start the test (very lengthy)\n"
+"    2. If the system fails to resume from suspend and must be rebooted, "
+"please restart System Testing and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did the system successfully suspend and resume 30 times?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:4
+msgid "Record the current network before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:9
+msgid "Record the current resolution before suspending."
+msgstr "Zaznamenať aktuálne rozlíšenie pred prechodom do režimu spánku."
+
+#. description
+#: ../jobs/suspend.txt.in:17
+msgid "Record mixer settings before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:24
+msgid "Verify that all the CPUs are online before suspending"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:31
+msgid ""
+"Dumps memory info to a file for comparison after suspend test has been run"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:49
+msgid ""
+"This test disconnects all connections and then connects to the wireless "
+"interface. It then checks the connection to confirm it's working as expected."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:83
+msgid ""
+"PURPOSE:\n"
+"    This test will check suspend and resume\n"
+"STEPS:\n"
+"    1. Click \"Test\" and your system will suspend for about 30 - 60 "
+"seconds\n"
+"    2. If your system does not wake itself up after 60 seconds, please press "
+"the power button momentarily to wake the system manually\n"
+"    3. If your system fails to wake at all and must be rebooted, restart "
+"System Testing after reboot and mark this test as Failed\n"
+"VERIFICATION:\n"
+"    Did your system suspend and resume correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:96
+msgid "Test the network after resuming."
+msgstr "Otestovať sieť po prebudení."
+
+#. description
+#: ../jobs/suspend.txt.in:102
+msgid ""
+"Test to see that we have the same resolution after resuming as before."
+msgstr "Otestovať, že máte rovnaké rozlíšenie po prebudení ako pred tým."
+
+#. description
+#: ../jobs/suspend.txt.in:111
+msgid ""
+"Verify that mixer settings after suspend are the same as before suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:127
+msgid "Verify that all CPUs are online after resuming."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:144
+msgid "Verify that all memory is available after resuming from suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:153
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the display is correct after suspend and "
+"resume\n"
+"VERIFICATION:\n"
+"    Does the display work normally after resuming from suspend?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:174
+msgid ""
+"This test checks that the wireless interface is working after suspending the "
+"system. It disconnects all interfaces and then connects to the wireless "
+"interface and checks that the connection is working as expected."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:186
+msgid ""
+"This test grabs the hardware address of the bluetooth adapter after suspend "
+"and compares it to the address grabbed before suspend."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:196
+msgid ""
+"This is an automated Bluetooth file transfer test. It sends an image to the "
+"device specified by the BTDEVADDR environment variable."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:206
+msgid ""
+"PURPOSE:\n"
+"    This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a "
+"specified device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and you will be prompted to enter the Bluetooth device "
+"name of a device that can accept file transfers (It may take a few moments "
+"after entering the name for the file to begin sending)\n"
+"    2. Accept any prompts that appear on both devices\n"
+"VERIFICATION:\n"
+"    Was the data correctly transferred?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:220
+msgid ""
+"PURPOSE:\n"
+"    This test will cycle through the detected display modes\n"
+"STEPS:\n"
+"    1. Click \"Test\" and the display will cycle trough the display modes\n"
+"VERIFICATION:\n"
+"    Did your display look fine in the detected mode?"
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:232
+msgid ""
+"This test will check to make sure supported video modes work after a suspend "
+"and resume. This is done automatically by taking screenshots and uploading "
+"them as an attachment."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:241
+msgid ""
+"This attaches screenshots from the "
+"suspend/cycle_resolutions_after_suspend_auto test to the results submission."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:251
+msgid ""
+"This will check to make sure that your audio device works properly after a "
+"suspend and resume.  This may work fine with speakers and onboard "
+"microphone, however, it works best if used with a cable connecting the audio-"
+"out jack to the audio-in jack."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:260
+msgid "This is the automated version of suspend/suspend_advanced."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:269
+msgid ""
+"This automatically tests Wake-on-LAN capability with the aid of a suitably "
+"configured server. During this process the system will suspend, then "
+"automatically wake up after no more than 5 minutes."
+msgstr ""
+
+#. description
+#: ../jobs/unity.txt.in:6
+msgid ""
+"Xlib is required for unity testing. This checks for Xlib and installs it if "
+"not available."
+msgstr ""
+
+#. description
+#: ../jobs/unity.txt.in:13
+msgid ""
+"This test will verify that Unity is running and then run the autopilot.py "
+"test against the Unity interface."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:5
+msgid "Detects and shows USB devices attached to this system."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:12
+msgid ""
+"PURPOSE:\n"
+"    This test will check that your system detects USB storage devices.\n"
+"STEPS:\n"
+"    1. Plug in one or more USB keys or hard drives.\n"
+"    2. Click on \"Test\".\n"
+"INFO:\n"
+"    $output\n"
+"VERIFICATION:\n"
+"    Were the drives detected?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB keyboard into the computer.\n"
+"    2. Click on \"Test\" and enter some text.\n"
+"VERIFICATION:\n"
+"    Does the keyboard work?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:41
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB mouse into the computer.\n"
+"    2. Perform some single/double/right click operations.\n"
+"VERIFICATION:\n"
+"    Does the mouse work correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:55
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the insertion of\n"
+"    a USB storage device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a USB storage device (pen-drive/HDD).\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:72
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal of\n"
+"    a USB storage device\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the USB device.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:88
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Plug a USB HDD or thumbdrive into the computer.\n"
+"    2. An icon should appear on the Launcher.\n"
+"    3. Click \"Test\" to begin the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:104
+msgid "This test is automated and executes after the usb/insert test is run."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:111
+msgid ""
+"This is an automated version of usb/storage-automated and assumes that the  "
+"server has usb storage devices plugged in prior to checkbox execution. It  "
+"is intended for servers and SRU automated testing."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:119
+msgid ""
+"PURPOSE:\n"
+"    This test will check your USB connection.\n"
+"STEPS:\n"
+"    1. Connect a USB storage device to an external USB slot on this "
+"computer.\n"
+"    2. An icon should appear on the Launcher.\n"
+"    3. Confirm that the icon appears.\n"
+"    4. Eject the device.\n"
+"    5. Repeat with each external USB slot.\n"
+"VERIFICATION:\n"
+"    Do all USB slots work with the device?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:6
+msgid ""
+"PURPOSE:\n"
+" This test will check that the update manager can find updates.\n"
+"STEPS:\n"
+" 1. Click Test to launch update-manager.\n"
+" 2. Follow the prompts and if updates are found, install them.\n"
+" 3. When Update Manager has finished, please close the app by clicking the "
+"Close button in the lower right corner.\n"
+"VERIFICATION:\n"
+" Did Update manager find and install updates (Pass if no updates are found,\n"
+" but Fail if updates are found but not installed)"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:22
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can create a new folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. On the menu bar, click File -> Create Folder.\n"
+" 3. In the name box for the new folder, enter the name Test Folder and hit "
+"Enter.\n"
+" 4. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a new folder called Test Folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:37
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can copy a folder\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the folder called Test Folder and click on Copy.\n"
+" 3. Right Click on any white area in the window and click on Paste.\n"
+" 4. Right click on the folder called Test Folder(copy) and click Rename.\n"
+" 5. Enter the name Test Data in the name box and hit Enter.\n"
+" 6. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a folder called Test Data?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:54
+msgid ""
+"PURPOSE:\n"
+" This test will verify that the file browser can move a folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Click and drag the folder called Test Data onto the icon called Test "
+"Folder.\n"
+" 3. Release the button.\n"
+" 4. Double click the folder called Test Folder to open it up.\n"
+" 5. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Was the folder called Test Data successfully moved into the folder called "
+"Test Folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:70
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can create a new file.\n"
+"STEPS:\n"
+" 1. Click Select Test to open the File Browser.\n"
+" 2. Right click in the white space and click Create Document -> Empty "
+"Document.\n"
+" 3. Enter the name Test File 1 in the name box and hit Enter.\n"
+" 4. Close the File browser.\n"
+"VERIFICATION:\n"
+" Do you now have a file called Test File 1?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:85
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can copy a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the file called Test File 1 and click Copy.\n"
+" 3. Right click in the white space and click Paste.\n"
+" 4. Right click on the file called Test File 1(copy) and click Rename.\n"
+" 5. Enter the name Test File 2 in the name box and hit Enter.\n"
+" 6. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Do you now have a file called Test File 2?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:102
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can move a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Click and drag the file called Test File 2 onto the icon for the folder "
+"called Test Data.\n"
+" 3. Release the button.\n"
+" 4. Double click the icon for Test Data to open that folder up.\n"
+" 5. Close the File Browser.\n"
+"VERIFICATION:\n"
+" Was the file Test File 2 successfully moved into the Test Data folder?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:118
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can delete a file.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the file called Test File 1 and click on Move To Trash.\n"
+" 3. Verify that Test File 1 has been removed.\n"
+" 4. Close the File Browser.\n"
+"VERIFICATION:\n"
+"  Is Test File 1 now gone?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:133
+msgid ""
+"PURPOSE:\n"
+" This test will check that the file browser can delete a folder.\n"
+"STEPS:\n"
+" 1. Click Test to open the File Browser.\n"
+" 2. Right click on the folder called Test Folder and click on Move To "
+"Trash.\n"
+" 3. Verify that the folder was deleted.\n"
+" 4. Close the file browser.\n"
+"VERIFICATION:\n"
+" Has Test Folder been successfully deleted?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:207
+msgid "Common Document Types Test"
+msgstr "Testovanie bežných typov dokumentov"
+
+#. description
+#: ../jobs/user_apps.txt.in:228
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can render a basic web page.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view the test web page.\n"
+"VERIFICATION:\n"
+" Did the Ubuntu Test page load correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:241
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can run a java applet in a web page. "
+"Note:\n"
+" this may require installing additional software to complete successfully.\n"
+"STEPS:\n"
+" 1. Select Test to open Firefox with the Java test page, and follow the "
+"instructions there.\n"
+"VERIFICATION:\n"
+" Did the applet display?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:255
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can run flash applications. Note: this "
+"may\n"
+" require installing additional software to successfully complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view a sample Flash test.\n"
+"VERIFICATION:\n"
+" Did you see the text?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:269
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can play a Flash video. Note: this may\n"
+" require installing additional software to successfully complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox and view a short flash video.\n"
+"VERIFICATION:\n"
+" Did the video play correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:283
+msgid ""
+"PURPOSE:\n"
+" This test will check that Firefox can play a Quicktime (.mov) video file.\n"
+" Note: this may require installing additional software to successfully\n"
+" complete.\n"
+"STEPS:\n"
+" 1. Select Test to launch Firefox with a sample video.\n"
+"VERIFICATION:\n"
+" Did the video play using a plugin?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:297
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Facebook Chat service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:311
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Google Talk (gtalk) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:325
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Jabber service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:339
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the AOL Instant Messaging (AIM) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:353
+msgid ""
+"PURPOSE:\n"
+" This test will check that Empathy messaging client works.\n"
+"STEPS:\n"
+" 1. Select Test to launch Empathy.\n"
+" 2. Configure it to connect to the Microsoft Network (MSN) service.\n"
+" 3. Once you have completed the test, please quit Empathy to continue here.\n"
+"VERIFICATION:\n"
+" Were you able to connect correctly and send/receive messages?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:367
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a POP3 account.\n"
+"VERIFICATION:\n"
+" Were you able to receive and read e-mail correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:380
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a IMAP account.\n"
+"VERIFICATION:\n"
+" Were you able to receive and read e-mail correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:393
+msgid ""
+"PURPOSE:\n"
+" This test will check that Evolution works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to launch Evolution.\n"
+" 2. Configure it to connect to a SMTP account.\n"
+"VERIFICATION:\n"
+" Were you able to send e-mail without errors?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:406
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator.\n"
+"VERIFICATION:\n"
+" Did it launch correctly?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:419
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+" 1. Simple math functions (+,-,/,*)\n"
+" 2. Nested math functions ((,))\n"
+" 3. Fractional math\n"
+" 4. Decimal math\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:436
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+"  1. Memory set\n"
+"  2. Memory reset\n"
+"  3. Memory last clear\n"
+"  4. Memory clear\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:453
+msgid ""
+"PURPOSE:\n"
+" This test checks that gcalctool (Calculator) works.\n"
+"STEPS:\n"
+" Click the \"Test\" button to open the calculator and perform:\n"
+"  1. Cut\n"
+"  2. Copy\n"
+"  3. Paste\n"
+"VERIFICATION:\n"
+" Did the functions perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:468
+msgid ""
+"PURPOSE:\n"
+" This test checks that gedit works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open gedit.\n"
+" 2. Enter some text and save the file (make a note of the file name you "
+"use), then close gedit.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:482
+msgid ""
+"PURPOSE:\n"
+" This test checks that gedit works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open gedit, and re-open the file you "
+"created previously.\n"
+" 2. Edit then save the file, then close gedit.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/user_apps.txt.in:495
+msgid ""
+"PURPOSE:\n"
+" This test will check that Gnome Terminal works.\n"
+"STEPS:\n"
+" 1. Click the \"Test\" button to open Terminal.\n"
+" 2. Type 'ls' and press enter. You should see a list of files and folder in "
+"your home directory.\n"
+" 3. Close the terminal window.\n"
+"VERIFICATION:\n"
+" Did this perform as expected?"
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:6
+msgid "Wireless scanning test. It scans and reports on discovered APs."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:12
+msgid ""
+"PURPOSE:\n"
+"    This test will check your wireless connection.\n"
+"STEPS:\n"
+"    1. Click on the Network icon in the panel.\n"
+"    2. Select a network below the 'Wireless networks' section.\n"
+"    3. Click \"Test\" to verify that it's possible to establish an HTTP "
+"connection.\n"
+"VERIFICATION:\n"
+"    Did a notification show and was the connection correctly established?"
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:28
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11b/g protocols."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:38
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11b/g protocols."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:48
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11n protocol."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:58
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11n protocol."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:70
+msgid ""
+"Tests the performance of a systems wireless connection through the iperf "
+"tool."
+msgstr ""
+
+#. description
+#: ../jobs/wireless.txt.in:81
+msgid ""
+"Tests the performance of a systems wireless connection through the iperf "
+"tool, using UDP packets."
+msgstr ""
+
+#: ../checkbox/application.py:66
+msgid "Usage: checkbox [OPTIONS]"
+msgstr "Použitie: zaškrtávacie tlačidlo [MOŽNOSTI]"
+
+#: ../checkbox/application.py:70
+msgid "Print version information and exit."
+msgstr "Tlačiť informácie o verzii a ukončiť."
+
+#: ../checkbox/application.py:74
+msgid "The file to write the log to."
+msgstr "Súbor na zapísanie záznamu."
+
+#: ../checkbox/application.py:77
+msgid "One of debug, info, warning, error or critical."
+msgstr "Jedna oprava, informácia, výstraha, chyba alebo kritická."
+
+#: ../checkbox/application.py:82
+msgid "Configuration override parameters."
+msgstr "Konfigurácia prekračuje parametre."
+
+#: ../checkbox/application.py:84
+msgid "Shorthand for --config=.*/jobs_info/blacklist."
+msgstr ""
+
+#: ../checkbox/application.py:86
+msgid "Shorthand for --config=.*/jobs_info/blacklist_file."
+msgstr ""
+
+#: ../checkbox/application.py:88
+msgid "Shorthand for --config=.*/jobs_info/whitelist."
+msgstr ""
+
+#: ../checkbox/application.py:90
+msgid "Shorthand for --config=.*/jobs_info/whitelist_file."
+msgstr ""
+
+#: ../checkbox/application.py:115
+msgid "Missing configuration file as argument.\n"
+msgstr "Chýbajúci konfiguračný súbor ako parameter.\n"
+
+#: ../checkbox/job.py:84
+msgid "Command not found."
+msgstr ""
+
+#: ../checkbox/job.py:92
+#, python-format
+msgid "Command received signal %s: %s"
+msgstr ""
+
+#: ../checkbox/lib/signal.py:23
+msgid ""
+"Hangup detected on controlling terminal or death of controlling process"
+msgstr ""
+"Bolo zistené zamrznutie kontrolného terminála alebo ukončenie riadiaceho "
+"procesu."
+
+#: ../checkbox/lib/signal.py:24
+msgid "Interrupt from keyboard"
+msgstr "Prerušenie z klávesnice"
+
+#: ../checkbox/lib/signal.py:25
+msgid "Quit from keyboard"
+msgstr "Ukončenie z klávesnice"
+
+#: ../checkbox/lib/signal.py:26
+msgid "Illegal Instruction"
+msgstr "Nepovolená inštrukcia"
+
+#: ../checkbox/lib/signal.py:27
+msgid "Abort signal from abort(3)"
+msgstr "Ukončujúci signál (3)"
+
+#: ../checkbox/lib/signal.py:28
+msgid "Floating point exception"
+msgstr "Výnimka pri operácii s plávajúcou desatinnou čiarkou"
+
+#: ../checkbox/lib/signal.py:29
+msgid "Kill signal"
+msgstr "Signál pre násilne ukončenie"
+
+#: ../checkbox/lib/signal.py:30
+msgid "Invalid memory reference"
+msgstr "Neplatný odkaz v pamäti"
+
+#: ../checkbox/lib/signal.py:31
+msgid "Broken pipe: write to pipe with no readers"
+msgstr "Porušená rúra: zapisovanie do rúry bez čítania"
+
+#: ../checkbox/lib/signal.py:32
+msgid "Timer signal from alarm(2)"
+msgstr "časový signál pre alarm"
+
+#: ../checkbox/lib/signal.py:33
+msgid "Termination signal"
+msgstr "Signál pre ukončenie"
+
+#: ../checkbox/lib/signal.py:34
+msgid "User-defined signal 1"
+msgstr "Signál definovaný používateľom"
+
+#: ../checkbox/lib/signal.py:35
+msgid "User-defined signal 2"
+msgstr "Signál definovaný používateľom 2"
+
+#: ../checkbox/lib/signal.py:36
+msgid "Child stopped or terminated"
+msgstr "Podradený proces prerušený alebo ukončený"
+
+#: ../checkbox/lib/signal.py:37
+msgid "Continue if stopped"
+msgstr "Pokračuje ak bolo prerušené"
+
+#: ../checkbox/lib/signal.py:38
+msgid "Stop process"
+msgstr "Zastaviť proces"
+
+#: ../checkbox/lib/signal.py:39
+msgid "Stop typed at tty"
+msgstr "Prerušenie písania na virtuálnej konzoly"
+
+#: ../checkbox/lib/signal.py:40
+msgid "tty input for background process"
+msgstr "Vstup virtuálnej konzoly pre proces na pozadí"
+
+#: ../checkbox/lib/signal.py:41
+msgid "tty output for background process"
+msgstr "Výstup virtuálnej konzoly pre proces na pozadí"
+
+#: ../checkbox/lib/signal.py:77
+msgid "UNKNOWN"
+msgstr "NEZNÁMY"
+
+#: ../checkbox/lib/signal.py:89
+msgid "Unknown signal"
+msgstr "Neznámy signál"
+
+#: ../checkbox_cli/cli_interface.py:31
+#: ../checkbox_urwid/urwid_interface.py:686
+msgid "yes"
+msgstr "áno"
+
+#: ../checkbox_cli/cli_interface.py:32
+#: ../checkbox_urwid/urwid_interface.py:687
+msgid "no"
+msgstr "nie"
+
+#: ../checkbox_cli/cli_interface.py:33
+#: ../checkbox_urwid/urwid_interface.py:688
+msgid "skip"
+msgstr "preskočiť"
+
+#: ../checkbox_cli/cli_interface.py:126
+msgid "Press any key to continue..."
+msgstr "Pokračujte stlačením ľubovoľného klávesu..."
+
+#: ../checkbox_cli/cli_interface.py:135
+#, python-format
+msgid "Please choose (%s): "
+msgstr "Zvoľte prosím (%s): "
+
+#: ../checkbox_cli/cli_interface.py:250 ../checkbox_cli/cli_interface.py:281
+msgid "Space when finished"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:280
+msgid "Combine with character above to expand node"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:320
+msgid "test"
+msgstr "testovať"
+
+#: ../checkbox_cli/cli_interface.py:344
+msgid "test again"
+msgstr "testovať znovu"
+
+#: ../checkbox_cli/cli_interface.py:350
+msgid "Please type here and press Ctrl-D when finished:\n"
+msgstr "Napíšte sem prosím a stlačte Ctrl-D, keď budete hotový:\n"
+
+#: ../checkbox_urwid/urwid_interface.py:60
+msgid "Checkbox System Testing"
+msgstr "Checkbox - Testovanie systému"
+
+#: ../checkbox_urwid/urwid_interface.py:99
+msgid "Continue"
+msgstr "Pokračovať"
+
+#: ../checkbox_urwid/urwid_interface.py:192
+#: ../checkbox_urwid/urwid_interface.py:268
+#: ../checkbox_urwid/urwid_interface.py:418
+msgid "Previous"
+msgstr "Predchádzajúce"
+
+#: ../checkbox_urwid/urwid_interface.py:193
+#: ../checkbox_urwid/urwid_interface.py:269
+#: ../checkbox_urwid/urwid_interface.py:419
+msgid "Next"
+msgstr "Dalej"
+
+#. Show buttons
+#: ../checkbox_urwid/urwid_interface.py:416
+msgid "Select All"
+msgstr "Označiť všetko"
+
+#: ../checkbox_urwid/urwid_interface.py:417
+msgid "Deselect All"
+msgstr "Odznačiť všetko"
+
+#: ../checkbox_urwid/urwid_interface.py:774
+msgid "Test"
+msgstr "Otestovať"
+
+#: ../checkbox_urwid/urwid_interface.py:789
+msgid "Test Again"
+msgstr "Znovu otestovať"
+
+#: ../checkbox_gtk/gtk_interface.py:503
+msgid "_Test Again"
+msgstr "_Testovať znovu"
+
+#: ../checkbox_gtk/gtk_interface.py:551
+msgid "Info"
+msgstr "Informácia"
+
+#: ../checkbox_gtk/gtk_interface.py:575
+msgid "Error"
+msgstr "Chyba"
+
+#: ../checkbox/user_interface.py:137
+#, python-format
+msgid "Unable to start web browser to open %s."
+msgstr "Nepodarilo sa spustiť internetový prehliadač pre otvorenie %s."
+
+#: ../plugins/apport_prompt.py:83
+msgid ""
+"Collecting information about this test.\n"
+"This might take a few minutes."
+msgstr ""
+"Zbierajú sa informácie o tomto teste.\n"
+"Môže to trvať pár minút."
+
+#: ../plugins/apport_prompt.py:118
+msgid ""
+"Collected information is being sent for bug tracking.\n"
+"This might take a few minutes."
+msgstr ""
+"Zbierajú sa informácie na nahlásenie chyby.\n"
+"Môže to trvať pár minút."
+
+#: ../plugins/apport_prompt.py:227
+#, python-format
+msgid "Test %(name)s from suite %(suite)s failed."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:231
+#, python-format
+msgid "Test %s failed."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:232
+msgid "Do you want to report a bug?"
+msgstr "Chcete nahlásiť chybu?"
+
+#: ../plugins/apport_prompt.py:249
+#, python-format
+msgid "Is a package upgrade in process? Error: %s"
+msgstr "Prebieha aktualizácia balíčka? Chyba: %s"
+
+#: ../plugins/final_prompt.py:33
+msgid "Successfully finished testing!"
+msgstr "Testovanie bolo úspešne dokončené!"
+
+#: ../plugins/final_prompt.py:34
+msgid "_Finish"
+msgstr "_Dokončiť"
+
+#: ../plugins/gather_prompt.py:35
+msgid "Gathering information from your system..."
+msgstr "Zhromažďujú sa informácie o vašom systéme..."
+
+#: ../plugins/intro_prompt.py:28
+msgid ""
+"Welcome to System Testing!\n"
+"\n"
+"Checkbox provides tests to confirm that your system is working properly. "
+"Once you are finished running the tests, you can view a summary report for "
+"your system."
+msgstr ""
+"Vitajte v programe Testovanie systému!\n"
+"Tento program obsahuje sériu testov, ktoré slúžia na zistenie, či váš systém "
+"pracuje správne. Akonáhle dokončíte sériu testov, môžete vidieť súhrnnú "
+"správu o vašom systéme."
+
+#: ../plugins/intro_prompt.py:33
+msgid ""
+"\n"
+"\n"
+"Warning: Some tests could cause your system to freeze or become "
+"unresponsive. Please save all your work and close all other running "
+"applications before beginning the testing process."
+msgstr ""
+
+#: ../plugins/launchpad_exchange.py:136
+#, python-format
+msgid "Failed to process form: %s"
+msgstr "Nepodarilo sa spracovať formulár: %s"
+
+#: ../plugins/launchpad_exchange.py:151
+#, python-format
+msgid ""
+"Failed to contact server. Please try\n"
+"again or upload the following file name:\n"
+"%s\n"
+"\n"
+"directly to the system database:\n"
+"https://launchpad.net/+hwdb/+submit"
+msgstr ""
+"Zlyhalo kontaktovanie so serverom. Skúste znovu, \n"
+"alebo nahrajte nasledujúci názov súboru:\n"
+"%s\n"
+"\n"
+"priamo do systémovej databázy:\n"
+"https://launchpad.net/+hwdb/+submit"
+
+#: ../plugins/launchpad_exchange.py:160
+msgid ""
+"Failed to upload to server,\n"
+"please try again later."
+msgstr ""
+"Zlyhalo nahrávanie na server.\n"
+"Skúste to znovu neskôr, prosím."
+
+#: ../plugins/launchpad_exchange.py:172
+msgid "Information not posted to Launchpad."
+msgstr "Informácie neboli zaslané do Launchpad."
+
+#: ../plugins/launchpad_prompt.py:74
+#, python-format
+msgid ""
+"The following report has been generated for submission to the Launchpad "
+"hardware database:\n"
+"\n"
+"  [[%s|View Report]]\n"
+"\n"
+"You can submit this information about your system by providing the email "
+"address you use to sign in to Launchpad. If you do not have a Launchpad "
+"account, please register here:\n"
+"\n"
+"  https://launchpad.net/+login"
+msgstr ""
+
+#: ../plugins/launchpad_prompt.py:93
+msgid "Email address must be in a proper format."
+msgstr "E-mailová adresa musí byť v správnom formáte."
+
+#: ../plugins/launchpad_prompt.py:99
+msgid "Exchanging information with the server..."
+msgstr "Vymieňajú sa informácie so serverom..."
+
+#: ../plugins/launchpad_report.py:164
+msgid ""
+"The generated report seems to have validation errors,\n"
+"so it might not be processed by Launchpad."
+msgstr ""
+
+#: ../plugins/lock_prompt.py:63
+msgid "There is another checkbox running. Please close it first."
+msgstr "Je spustený ďalší program Testovanie systému. Prosím, ukončite ho."
+
+#: ../plugins/recover_prompt.py:53
+msgid "Recover"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:54
+msgid "Restart"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:56
+msgid ""
+"Checkbox did not finish completely.\n"
+"Do you want to recover from the previous run?"
+msgstr ""
+"Program checkbox nedokončil testy.\n"
+"Chcete ich obnoviť z minulého spustenia?"
+
+#: ../plugins/report_prompt.py:39
+msgid "Building report..."
+msgstr "Zostavuje sa hlásenie..."
+
+#: ../plugins/shell_test.py:52
+#, python-format
+msgid "Running %s..."
+msgstr "Beží %s..."
+
+#. Get results
+#: ../plugins/suites_prompt.py:110
+msgid "Select the suites to test"
+msgstr "Prosím, vyberte si testy, ktoré sa majú uskutočniť"
+
+#: ../scripts/keyboard_test:21
+msgid "Enter text:\n"
+msgstr "Vložte nejaký text:\n"
+
+#: ../scripts/keyboard_test:41
+msgid "Type Text"
+msgstr "Napíšte nejaký text:"
+
+#: ../scripts/internet_test:139
+msgid "No Internet connection"
+msgstr "Žiadne internetové pripojenie"
+
+#: ../scripts/internet_test:142
+msgid "Connection established lost a packet"
+msgstr "Pripojenie je vytvorené, ale je nestabilné"
+
+#: ../scripts/internet_test:145
+msgid "Internet connection fully established"
+msgstr "Internetové pripojenie bolo úspešne vytvorené"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/command-not-found.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/command-not-found.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/command-not-found.po	2012-01-02 17:51:04.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/command-not-found.po	2012-02-23 06:55:50.000000000 +0000
@@ -7,65 +7,31 @@
 msgstr ""
 "Project-Id-Version: command-not-found\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-22 18:05+0000\n"
+"POT-Creation-Date: 2007-03-20 18:10+0100\n"
 "PO-Revision-Date: 2007-09-22 20:30+0000\n"
 "Last-Translator: Peter Júnoš <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../CommandNotFound/CommandNotFound.py:133
-#, python-format
-msgid "No command '%s' found, but there are %s similar ones"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-02-21 22:40+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../CommandNotFound/CommandNotFound.py:135
-#, python-format
-msgid "No command '%s' found, did you mean:"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:137
-#, python-format
-msgid " Command '%s' from package '%s' (%s)"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:210
-#, python-format
-msgid "Command '%(command)s' is available in '%(place)s'"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:212
-#, python-format
-msgid "Command '%(command)s' is available in the following places"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:217
-#, python-format
-msgid ""
-"The command could not be located because '%s' is not included in the PATH "
-"environment variable."
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:219
-msgid ""
-"This is most likely caused by the lack of administrative privileges "
-"associated with your user account."
-msgstr ""
+msgid "Ubuntu has the following similar programs"
+msgstr "Ubuntu má nasledujúce podobné programy"
 
-#: ../CommandNotFound/CommandNotFound.py:234
+#: ../CommandNotFound/CommandNotFound.py:139
 #, python-format
 msgid "The program '%s' is currently not installed. "
 msgstr "Program '%s' nie je momentálne nainštalovaný. "
 
-#: ../CommandNotFound/CommandNotFound.py:236
-#: ../CommandNotFound/CommandNotFound.py:239
+#: ../CommandNotFound/CommandNotFound.py:141
+#: ../CommandNotFound/CommandNotFound.py:144
 msgid "You can install it by typing:"
 msgstr "Môžete ho nainštalovať zadaním:"
 
-#: ../CommandNotFound/CommandNotFound.py:242
+#: ../CommandNotFound/CommandNotFound.py:147
 #, python-format
 msgid ""
 "To run '%(command)s' please ask your administrator to install the package "
@@ -74,45 +40,32 @@
 "Aby ste mohli spúšťať príkaz „%(command)s“ požiadajte prosím správcu vášho "
 "systému, aby nainštaloval balík „%(package)s“"
 
-#: ../CommandNotFound/CommandNotFound.py:244
+#: ../CommandNotFound/CommandNotFound.py:149
+#: ../CommandNotFound/CommandNotFound.py:161
 #, python-format
-msgid "You will have to enable the component called '%s'"
-msgstr ""
+msgid "Make sure you have the '%s' component enabled"
+msgstr "Uistite sa, že máte komponentu '%s' zapnutú"
 
-#: ../CommandNotFound/CommandNotFound.py:247
+#: ../CommandNotFound/CommandNotFound.py:151
 #, python-format
 msgid "The program '%s' can be found in the following packages:"
 msgstr "Program '%s' je možné nájsť v následujúcih balíkoch:"
 
-#: ../CommandNotFound/CommandNotFound.py:252
-#, python-format
-msgid "You will have to enable component called '%s'"
-msgstr ""
-
-#: ../CommandNotFound/CommandNotFound.py:254
-#: ../CommandNotFound/CommandNotFound.py:256
+#: ../CommandNotFound/CommandNotFound.py:155
+#: ../CommandNotFound/CommandNotFound.py:157
 #, python-format
 msgid "Try: %s <selected package>"
 msgstr "Skúste: %s <zvolený balík>"
 
-#: ../CommandNotFound/CommandNotFound.py:258
+#: ../CommandNotFound/CommandNotFound.py:159
 msgid "Ask your administrator to install one of them"
 msgstr "Požiadajte správcu vášho systému, aby jeden z nich nainštaloval"
 
-#: ../command-not-found:58
+#: ../command-not-found:18
 #, c-format
 msgid "%prog [options] <command-name>"
 msgstr "%prog [voľby] <názov-príkazu>"
 
-#: ../command-not-found:61
+#: ../command-not-found:20
 msgid "use this path to locate data fields"
 msgstr "použite túto cestu na nájdenie dátových polí"
-
-#: ../command-not-found:64
-msgid "ignore local binaries and display the available packages"
-msgstr ""
-
-#: ../command-not-found:71
-#, c-format
-msgid "%s: command not found"
-msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/compiz.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/compiz.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/compiz.po	2012-01-02 17:51:03.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/compiz.po	2012-02-23 06:55:50.000000000 +0000
@@ -7,67 +7,55 @@
 msgstr ""
 "Project-Id-Version: compiz\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-05 12:40+0000\n"
-"PO-Revision-Date: 2011-12-08 18:53+0000\n"
+"POT-Creation-Date: 2012-02-17 21:28+0000\n"
+"PO-Revision-Date: 2012-02-18 00:12+0000\n"
 "Last-Translator: pepino <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:34+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1
-msgid "Desktop"
-msgstr "Pracovná plocha"
-
-#: ../gtk/gnome/50-compiz-key.xml.in.h:1
-msgid "Window Management"
-msgstr "Správa okien"
-
-#: ../gtk/gnome/compiz.desktop.in.h:1 ../gtk/gnome/compiz-wm.desktop.in.h:1
+#: ../gtk/gnome/compiz.desktop.in.h:1
 msgid "Compiz"
 msgstr "Compiz"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:1
-msgid "Action to take when scrolling the mouse wheel on a window title bar."
-msgstr "Akcia, ktorá sa vykoná pri otáčaní kolieskom myši nad titulkom okna."
-
-#: ../gtk/window-decorator/gwd.schemas.in.h:2
 msgid "Blur type"
 msgstr "Typ rozostrenia"
 
+#: ../gtk/window-decorator/gwd.schemas.in.h:2
+msgid "Type of blur used for window decorations"
+msgstr "Typ rozostrenia použitej na dekoráciu okna"
+
 #: ../gtk/window-decorator/gwd.schemas.in.h:3
-msgid "Metacity theme active window opacity"
-msgstr "Priehľadnosť aktívneho okna témy metacity"
+msgid "Use metacity theme"
+msgstr "Použiť tému metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:4
-msgid "Metacity theme active window opacity shade"
-msgstr "Tieň aktívneho okna témy metacity"
+msgid "Use metacity theme when drawing window decorations"
+msgstr "Použiť tému metacity pri vykresľovaní dekorácií okna"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:5
-msgid "Metacity theme opacity"
-msgstr "Priehľadnosť témy metacity"
+msgid "Title bar mouse wheel action"
+msgstr "Akcia pri rolovaní nad titulkom okna"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:6
-msgid "Metacity theme opacity shade"
-msgstr "Tieň témy metacity"
+msgid "Action to take when scrolling the mouse wheel on a window title bar."
+msgstr "Akcia, ktorá sa vykoná pri otáčaní kolieskom myši nad titulkom okna."
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:7
-msgid "Opacity to use for active windows with metacity theme decorations"
-msgstr "Priehľadnosť pre aktívne okná s dekoráciami témy metacity"
+msgid "Metacity theme opacity"
+msgstr "Priehľadnosť témy metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:8
 msgid "Opacity to use for metacity theme decorations"
 msgstr "Priehľadnosť s dekoráciami témy metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:9
-msgid ""
-"Shade active windows with metacity theme decorations from opaque to "
-"translucent"
-msgstr ""
-"Vytieňovať aktívne okná s dekoráciou témy metacity z nepriehľadnej do "
-"priehľadnej."
+msgid "Metacity theme opacity shade"
+msgstr "Tieň témy metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:10
 msgid ""
@@ -76,453 +64,465 @@
 "Vytieňovať okná s dekoráciou témy metacity z nepriehľadnej do priehľadnej."
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:11
-msgid "Title bar mouse wheel action"
-msgstr "Akcia pri rolovaní nad titulkom okna"
+msgid "Metacity theme active window opacity"
+msgstr "Priehľadnosť aktívneho okna témy metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:12
-msgid "Type of blur used for window decorations"
-msgstr "Typ rozostrenia použitej na dekoráciu okna"
+msgid "Opacity to use for active windows with metacity theme decorations"
+msgstr "Priehľadnosť pre aktívne okná s dekoráciami témy metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:13
-msgid "Use metacity theme"
-msgstr "Použiť tému metacity"
+msgid "Metacity theme active window opacity shade"
+msgstr "Tieň aktívneho okna témy metacity"
 
 #: ../gtk/window-decorator/gwd.schemas.in.h:14
-msgid "Use metacity theme when drawing window decorations"
-msgstr "Použiť tému metacity pri vykresľovaní dekorácií okna"
+msgid ""
+"Shade active windows with metacity theme decorations from opaque to "
+"translucent"
+msgstr ""
+"Vytieňovať aktívne okná s dekoráciou témy metacity z nepriehľadnej do "
+"priehľadnej."
+
+#: ../gtk/window-decorator/gwd.schemas.in.h:15
+msgid "Use tooltips"
+msgstr ""
+
+#: ../gtk/window-decorator/gwd.schemas.in.h:16
+msgid "Show tooltip windows on decorator functions"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:1
-msgid "Active Plugins"
-msgstr "Aktívne zásuvné moduly"
+msgid "General Options"
+msgstr "Všeobecné nastavenia"
 
 #: ../metadata/core.xml.in.h:2
-msgid "Audible Bell"
-msgstr "Akustický zvonček"
+msgid "General compiz options"
+msgstr "Všeobecné nastavenia Compiz"
 
 #: ../metadata/core.xml.in.h:3
-msgid "Audible system beep"
-msgstr "Akustické systémové pípnutie"
+msgid "Active Plugins"
+msgstr "Aktívne zásuvné moduly"
 
 #: ../metadata/core.xml.in.h:4
-msgid "Auto-Raise"
-msgstr "Automaticky do popredia"
+msgid "List of currently active plugins"
+msgstr "Zoznam práve aktívnych modulov"
 
 #: ../metadata/core.xml.in.h:5
-msgid "Auto-Raise Delay"
-msgstr "Oneskorenie automatického presunu do popredia"
+msgid "Audible Bell"
+msgstr "Akustický zvonček"
 
 #: ../metadata/core.xml.in.h:6
-msgid "Automatic detection of output devices"
-msgstr "Automatická detekcia výstupných zariadení"
+msgid "Audible system beep"
+msgstr "Akustické systémové pípnutie"
 
 #: ../metadata/core.xml.in.h:7
-msgid "Click To Focus"
-msgstr "Zamerať kliknutím"
+msgid "Ignore Hints When Maximized"
+msgstr "Pri maximalizovaní ignorovať tipy"
 
 #: ../metadata/core.xml.in.h:8
-msgid "Click on window moves input focus to it"
-msgstr "Kliknutím na okno presunúť zameranie na okno"
+msgid "Ignore size increment and aspect hints when window is maximized"
+msgstr "Pri maximalizovaní okna ignorovať veľkosť nárastu a vzhľad tipov"
 
 #: ../metadata/core.xml.in.h:9
-msgid "Close Window"
-msgstr "Zatvoriť okno"
+msgid "Hide Skip Taskbar Windows"
+msgstr "Skryť okná neprítomné v lište úloh"
 
 #: ../metadata/core.xml.in.h:10
-msgid "Close active window"
-msgstr "Zatvoriť aktívne okno"
+msgid "Hide windows not in taskbar when entering show desktop mode"
+msgstr ""
+"Skryť okná neprítomné v lište úloh pri vstupe do režimu zobrazenia pracovnej "
+"plochy"
 
 #: ../metadata/core.xml.in.h:11
-msgid "Default Icon"
-msgstr "Východzia ikona"
+msgid "Edge Trigger Delay"
+msgstr "Oneskorenie operácie na okraji"
 
 #: ../metadata/core.xml.in.h:12
-msgid "Default window icon image"
-msgstr "Východzí obrázok ikony okna"
+msgid ""
+"Duration the pointer must rest in a screen edge before an edge action is "
+"taken."
+msgstr ""
+"Interval, počas ktorého musí ukazovateľ zostať na okraji obrazovky, než sa "
+"vykoná operácia."
 
 #: ../metadata/core.xml.in.h:13
-msgid "Desktop Size"
-msgstr ""
+msgid "Ping Delay"
+msgstr "Oneskorenie pingu"
 
 #: ../metadata/core.xml.in.h:14
-msgid "Detect Outputs"
-msgstr "Detekovať výstupy"
+msgid "Interval between ping messages"
+msgstr "Interval medzi odosielaním pingu"
 
 #: ../metadata/core.xml.in.h:15
-msgid "Display Settings"
-msgstr ""
+msgid "Default Icon"
+msgstr "Východzia ikona"
 
 #: ../metadata/core.xml.in.h:16
-msgid ""
-"Duration the pointer must rest in a screen edge before an edge action is "
-"taken."
-msgstr ""
-"Interval, počas ktorého musí ukazovateľ zostať na okraji obrazovky, než sa "
-"vykoná operácia."
+msgid "Default window icon image"
+msgstr "Východzí obrázok ikony okna"
 
 #: ../metadata/core.xml.in.h:17
-msgid "Edge Trigger Delay"
-msgstr "Oneskorenie operácie na okraji"
+msgid "Save plugin states on unload"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:18
-msgid "Focus &amp; Raise Behaviour"
+msgid ""
+"Save the state of plugins when they are unloaded such they will resume their "
+"past internal state when reloaded"
 msgstr ""
 
 #: ../metadata/core.xml.in.h:19
-msgid "Focus Prevention Level"
-msgstr "Predchádzať ukradnutiu aktivity"
+msgid "Display Settings"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:20
-msgid "Focus Prevention Windows"
-msgstr "Predchádzať zameraniu okien"
+msgid "Overlapping Output Handling"
+msgstr "Obsluha prekrývajúceho sa výstupu"
 
 #: ../metadata/core.xml.in.h:21
-msgid "Focus prevention windows"
-msgstr "Predchádzať zameraniu okien"
+msgid "Which one of overlapping output devices should be preferred"
+msgstr "Ktoré z prekrývajúcich sa výstupných zariadení sa má uprednostniť"
 
 #: ../metadata/core.xml.in.h:22
-msgid "General Options"
-msgstr "Všeobecné nastavenia"
+msgid "Smart mode"
+msgstr "Inteligentný režim"
 
 #: ../metadata/core.xml.in.h:23
-msgid "General compiz options"
-msgstr "Všeobecné nastavenia Compiz"
+msgid "Prefer larger output"
+msgstr "Uprednostniť väčší výstup"
 
 #: ../metadata/core.xml.in.h:24
-msgid "Hide Skip Taskbar Windows"
-msgstr "Skryť okná neprítomné v lište úloh"
+msgid "Prefer smaller output"
+msgstr "Uprednostniť menší výstup"
 
 #: ../metadata/core.xml.in.h:25
-msgid "Hide all windows and focus desktop"
-msgstr "Skryť všetky okná a zobraziť pracovnú plochu"
+msgid "Detect Outputs"
+msgstr "Detekovať výstupy"
 
 #: ../metadata/core.xml.in.h:26
-msgid "Hide windows not in taskbar when entering show desktop mode"
-msgstr ""
-"Skryť okná neprítomné v lište úloh pri vstupe do režimu zobrazenia pracovnej "
-"plochy"
+msgid "Automatic detection of output devices"
+msgstr "Automatická detekcia výstupných zariadení"
 
 #: ../metadata/core.xml.in.h:27
-msgid "High"
-msgstr "Vysoké"
+msgid "Outputs"
+msgstr "Výstupy"
 
 #: ../metadata/core.xml.in.h:28
-msgid "Horizontal Virtual Size"
-msgstr "Vodorovná virtuálna veľkosť"
+msgid "List of strings describing output devices"
+msgstr "Zoznam reťazcov popisujúcich výstupné zariadenia"
 
 #: ../metadata/core.xml.in.h:29
-msgid "Ignore Hints When Maximized"
-msgstr "Pri maximalizovaní ignorovať tipy"
+msgid "Focus &amp; Raise Behaviour"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:30
-msgid "Ignore size increment and aspect hints when window is maximized"
-msgstr "Pri maximalizovaní okna ignorovať veľkosť nárastu a vzhľad tipov"
+msgid "Click To Focus"
+msgstr "Zamerať kliknutím"
 
 #: ../metadata/core.xml.in.h:31
-msgid "Interval before raising selected windows"
-msgstr "Interval pred presunutím vybraných okien do popredia"
+msgid "Click on window moves input focus to it"
+msgstr "Kliknutím na okno presunúť zameranie na okno"
 
 #: ../metadata/core.xml.in.h:32
-msgid "Interval between ping messages"
-msgstr "Interval medzi odosielaním pingu"
+msgid "Raise On Click"
+msgstr "Kliknutím dať do popredia"
 
 #: ../metadata/core.xml.in.h:33
-msgid "Key bindings"
-msgstr ""
+msgid "Raise windows when clicked"
+msgstr "Presunúť okno do popredia po kliknutí"
 
 #: ../metadata/core.xml.in.h:34
-msgid "Level of focus stealing prevention"
-msgstr "Úroveň prevencie pred ukradnutím aktivity okna"
+msgid "Auto-Raise"
+msgstr "Automaticky do popredia"
 
 #: ../metadata/core.xml.in.h:35
-msgid "List of currently active plugins"
-msgstr "Zoznam práve aktívnych modulov"
+msgid "Raise selected windows after interval"
+msgstr "Prepnúť vybrané okná do popredia po uplynutí intervalu"
 
 #: ../metadata/core.xml.in.h:36
-msgid "List of strings describing output devices"
-msgstr "Zoznam reťazcov popisujúcich výstupné zariadenia"
+msgid "Auto-Raise Delay"
+msgstr "Oneskorenie automatického presunu do popredia"
 
 #: ../metadata/core.xml.in.h:37
-msgid "Low"
-msgstr "Nízke"
+msgid "Interval before raising selected windows"
+msgstr "Interval pred presunutím vybraných okien do popredia"
 
 #: ../metadata/core.xml.in.h:38
-msgid "Lower Window"
-msgstr "Presunúť okno do pozadia"
+msgid "Focus Prevention Level"
+msgstr "Predchádzať ukradnutiu aktivity"
 
 #: ../metadata/core.xml.in.h:39
-msgid "Lower window beneath other windows"
-msgstr "Presunúť okno do pozadia"
+msgid "Level of focus stealing prevention"
+msgstr "Úroveň prevencie pred ukradnutím aktivity okna"
 
 #: ../metadata/core.xml.in.h:40
-msgid "Maximize Window"
-msgstr "Maximalizovať okno"
+msgid "Off"
+msgstr "Vypnuté"
 
 #: ../metadata/core.xml.in.h:41
-msgid "Maximize Window Horizontally"
-msgstr "Maximalizovať okno vodorovne"
+msgid "Low"
+msgstr "Nízke"
 
-#: ../metadata/core.xml.in.h:42
-msgid "Maximize Window Vertically"
-msgstr "Maximalizovať okno zvisle"
+#: ../metadata/core.xml.in.h:42 ../plugins/resize/resize.xml.in.h:8
+msgid "Normal"
+msgstr "Normálny"
 
 #: ../metadata/core.xml.in.h:43
-msgid "Maximize active window"
-msgstr "Maximalizovať aktívne okno"
+msgid "High"
+msgstr "Vysoké"
 
 #: ../metadata/core.xml.in.h:44
-msgid "Maximize active window horizontally"
-msgstr "Maximalizovať aktívne okno vodorovne"
+msgid "Very High"
+msgstr "Veľmi vysoké"
 
 #: ../metadata/core.xml.in.h:45
-msgid "Maximize active window vertically"
-msgstr "Maximalizovať aktívne okno zvisle"
+msgid "Focus Prevention Windows"
+msgstr "Predchádzať zameraniu okien"
 
 #: ../metadata/core.xml.in.h:46
-msgid "Minimize Window"
-msgstr "Minimalizovať Okno"
-
+msgid "Focus prevention windows"
+msgstr "Predchádzať zameraniu okien"
+
 #: ../metadata/core.xml.in.h:47
-msgid "Minimize active window"
-msgstr "Minimalizovať aktívne okno"
+msgid "Key bindings"
+msgstr ""
 
-#: ../metadata/core.xml.in.h:48 ../plugins/resize/resize.xml.in.h:14
-msgid "Normal"
-msgstr "Normálny"
+#: ../metadata/core.xml.in.h:48
+msgid "Close Window"
+msgstr "Zatvoriť okno"
 
 #: ../metadata/core.xml.in.h:49
-msgid "Number of Desktops"
-msgstr "Počet Pracovných plôch"
+msgid "Close active window"
+msgstr "Zatvoriť aktívne okno"
 
 #: ../metadata/core.xml.in.h:50
-msgid "Number of virtual desktops"
-msgstr "Počet virtuálnych pracovných plôch"
+msgid "Raise Window"
+msgstr "Presunúť okno do popredia"
 
 #: ../metadata/core.xml.in.h:51
-msgid "Off"
-msgstr "Vypnuté"
+msgid "Raise window above other windows"
+msgstr "Presunúť okno dopredu nad ostatné okná"
 
 #: ../metadata/core.xml.in.h:52
-msgid "Outputs"
-msgstr "Výstupy"
+msgid "Lower Window"
+msgstr "Presunúť okno do pozadia"
 
 #: ../metadata/core.xml.in.h:53
-msgid "Overlapping Output Handling"
-msgstr "Obsluha prekrývajúceho sa výstupu"
+msgid "Lower window beneath other windows"
+msgstr "Presunúť okno do pozadia"
 
 #: ../metadata/core.xml.in.h:54
-msgid "Ping Delay"
-msgstr "Oneskorenie pingu"
+msgid "Minimize Window"
+msgstr "Minimalizovať Okno"
 
 #: ../metadata/core.xml.in.h:55
-msgid "Prefer larger output"
-msgstr "Uprednostniť väčší výstup"
+msgid "Minimize active window"
+msgstr "Minimalizovať aktívne okno"
 
 #: ../metadata/core.xml.in.h:56
-msgid "Prefer smaller output"
-msgstr "Uprednostniť menší výstup"
+msgid "Maximize Window"
+msgstr "Maximalizovať okno"
 
 #: ../metadata/core.xml.in.h:57
-msgid "Raise On Click"
-msgstr "Kliknutím dať do popredia"
+msgid "Maximize active window"
+msgstr "Maximalizovať aktívne okno"
 
 #: ../metadata/core.xml.in.h:58
-msgid "Raise Window"
-msgstr "Presunúť okno do popredia"
+msgid "Unmaximize Window"
+msgstr "Zrušiť maximalizáciu okna"
 
 #: ../metadata/core.xml.in.h:59
-msgid "Raise selected windows after interval"
-msgstr "Prepnúť vybrané okná do popredia po uplynutí intervalu"
+msgid "Unmaximize active window"
+msgstr "Zrušiť maximalizáciu aktívneho okna"
 
 #: ../metadata/core.xml.in.h:60
-msgid "Raise window above other windows"
-msgstr "Presunúť okno dopredu nad ostatné okná"
+msgid "Maximize Window Horizontally"
+msgstr "Maximalizovať okno vodorovne"
 
 #: ../metadata/core.xml.in.h:61
-msgid "Raise windows when clicked"
-msgstr "Presunúť okno do popredia po kliknutí"
+msgid "Maximize active window horizontally"
+msgstr "Maximalizovať aktívne okno vodorovne"
 
 #: ../metadata/core.xml.in.h:62
-msgid "Save plugin states on unload"
-msgstr ""
+msgid "Maximize Window Vertically"
+msgstr "Maximalizovať okno zvisle"
 
 #: ../metadata/core.xml.in.h:63
-msgid ""
-"Save the state of plugins when they are unloaded such they will resume their "
-"past internal state when reloaded"
-msgstr ""
+msgid "Maximize active window vertically"
+msgstr "Maximalizovať aktívne okno zvisle"
 
 #: ../metadata/core.xml.in.h:64
-msgid "Screen size multiplier for horizontal virtual size"
-msgstr "Násobiteľ vodorovnej virtuálnej veľkosti obrazovky"
+msgid "Window Menu"
+msgstr "Menu Okna"
 
 #: ../metadata/core.xml.in.h:65
-msgid "Screen size multiplier for vertical virtual size"
-msgstr "Násobiteľ zvislej virtuálnej veľkosti obrazovky"
+msgid "Window menu key binding"
+msgstr "Klávesová skratka hlavnej ponuky okna"
 
 #: ../metadata/core.xml.in.h:66
-msgid "Show Desktop"
-msgstr "Zobraziť Plochu"
+msgid "Window menu button binding"
+msgstr "Klávesová skratka tlačidla hlavnej ponuky okna"
 
 #: ../metadata/core.xml.in.h:67
-msgid "Smart mode"
-msgstr "Inteligentný režim"
+msgid "Show Desktop"
+msgstr "Zobraziť Plochu"
 
 #: ../metadata/core.xml.in.h:68
-msgid "Toggle Window Maximized"
-msgstr "Prepnúť maximalizáciu okna"
+msgid "Hide all windows and focus desktop"
+msgstr "Skryť všetky okná a zobraziť pracovnú plochu"
 
 #: ../metadata/core.xml.in.h:69
-msgid "Toggle Window Maximized Horizontally"
-msgstr "Prepnúť vodorovnú maximalizáciu okna"
+msgid "Toggle Window Maximized"
+msgstr "Prepnúť maximalizáciu okna"
 
 #: ../metadata/core.xml.in.h:70
-msgid "Toggle Window Maximized Vertically"
-msgstr "Prepnúť zvislú maximalizáciu okna"
+msgid "Toggle active window maximized"
+msgstr "Prepnúť maximalizáciu aktívneho okna"
 
 #: ../metadata/core.xml.in.h:71
-msgid "Toggle Window Shaded"
-msgstr "Prepnúť tieňovanie okna"
+msgid "Toggle Window Maximized Horizontally"
+msgstr "Prepnúť vodorovnú maximalizáciu okna"
 
 #: ../metadata/core.xml.in.h:72
-msgid "Toggle active window maximized"
-msgstr "Prepnúť maximalizáciu aktívneho okna"
-
-#: ../metadata/core.xml.in.h:73
 msgid "Toggle active window maximized horizontally"
 msgstr "Prepnúť horizontálnu maximalizáciu aktívneho okna"
 
+#: ../metadata/core.xml.in.h:73
+msgid "Toggle Window Maximized Vertically"
+msgstr "Prepnúť zvislú maximalizáciu okna"
+
 #: ../metadata/core.xml.in.h:74
 msgid "Toggle active window maximized vertically"
 msgstr "Prepnúť vertikálnu maximalizáciu aktívneho okna"
 
 #: ../metadata/core.xml.in.h:75
-msgid "Toggle active window shaded"
-msgstr "Prepnúť tieňovanie aktívneho okna"
+msgid "Toggle Window Shaded"
+msgstr "Prepnúť tieňovanie okna"
 
 #: ../metadata/core.xml.in.h:76
-msgid "Unmaximize Window"
-msgstr "Zrušiť maximalizáciu okna"
+msgid "Toggle active window shaded"
+msgstr "Prepnúť tieňovanie aktívneho okna"
 
 #: ../metadata/core.xml.in.h:77
-msgid "Unmaximize active window"
-msgstr "Zrušiť maximalizáciu aktívneho okna"
+msgid "Desktop Size"
+msgstr ""
 
 #: ../metadata/core.xml.in.h:78
-msgid "Vertical Virtual Size"
-msgstr "Vertikálna Virtuálna Veľkosť"
+msgid "Horizontal Virtual Size"
+msgstr "Vodorovná virtuálna veľkosť"
 
 #: ../metadata/core.xml.in.h:79
-msgid "Very High"
-msgstr "Veľmi vysoké"
+msgid "Screen size multiplier for horizontal virtual size"
+msgstr "Násobiteľ vodorovnej virtuálnej veľkosti obrazovky"
 
 #: ../metadata/core.xml.in.h:80
-msgid "Which one of overlapping output devices should be preferred"
-msgstr "Ktoré z prekrývajúcich sa výstupných zariadení sa má uprednostniť"
+msgid "Vertical Virtual Size"
+msgstr "Vertikálna Virtuálna Veľkosť"
 
 #: ../metadata/core.xml.in.h:81
-msgid "Window Menu"
-msgstr "Menu Okna"
+msgid "Screen size multiplier for vertical virtual size"
+msgstr "Násobiteľ zvislej virtuálnej veľkosti obrazovky"
 
 #: ../metadata/core.xml.in.h:82
-msgid "Window menu button binding"
-msgstr "Klávesová skratka tlačidla hlavnej ponuky okna"
+msgid "Number of Desktops"
+msgstr "Počet Pracovných plôch"
 
 #: ../metadata/core.xml.in.h:83
-msgid "Window menu key binding"
-msgstr "Klávesová skratka hlavnej ponuky okna"
+msgid "Number of virtual desktops"
+msgstr "Počet virtuálnych pracovných plôch"
 
 #: ../plugins/blur/blur.xml.in.h:1
-msgid "4xBilinear"
-msgstr "Filter:"
+msgid "Blur Windows"
+msgstr "Rozostrovať okná"
 
 #: ../plugins/blur/blur.xml.in.h:2
-msgid "Alpha Blur"
-msgstr "Rozmaznie alfa"
+msgid "Blur windows"
+msgstr "Rozostrovať okná"
 
 #: ../plugins/blur/blur.xml.in.h:3
-msgid "Alpha blur windows"
-msgstr "Alfa rozostrenie okien"
+msgid "Pulse"
+msgstr "Pulz"
 
 #: ../plugins/blur/blur.xml.in.h:4
-msgid "Blur Filter"
-msgstr "Filter rozostrenia"
+msgid "Pulse effect"
+msgstr "Efekt pulzu"
 
 #: ../plugins/blur/blur.xml.in.h:5
-msgid "Blur Occlusion"
-msgstr "Oklúzia rozostrenia"
+msgid "Blur Speed"
+msgstr "Rýchlosť rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:6
-msgid "Blur Saturation"
-msgstr "Sýtosť rozostrenia"
+msgid "Window blur speed"
+msgstr "Rýchlosť rozmazania okna"
 
 #: ../plugins/blur/blur.xml.in.h:7
-msgid "Blur Speed"
-msgstr "Rýchlosť rozostrenia"
+msgid "Focus blur windows"
+msgstr "Rozmazať aktívne okná"
 
 #: ../plugins/blur/blur.xml.in.h:8
-msgid "Blur Windows"
-msgstr "Rozostrovať okná"
+msgid "Windows that should be affected by focus blur"
+msgstr "Okná, ktoré majú byť ovplyvnené rozmazaním"
 
 #: ../plugins/blur/blur.xml.in.h:9
-msgid "Blur behind translucent parts of windows"
-msgstr "Rozmazanie za priehľadnými časťami okien"
+msgid "Focus Blur"
+msgstr "Rozmazať aktívne"
 
 #: ../plugins/blur/blur.xml.in.h:10
-msgid "Blur saturation"
-msgstr "Sýtosť rozostrenia"
+msgid "Blur windows that doesn't have focus"
+msgstr "Rozostrovať okná, ktoré nie sú aktívne"
 
 #: ../plugins/blur/blur.xml.in.h:11
-msgid "Blur windows"
-msgstr "Rozostrovať okná"
+msgid "Alpha blur windows"
+msgstr "Alfa rozostrenie okien"
 
 #: ../plugins/blur/blur.xml.in.h:12
-msgid "Blur windows that doesn't have focus"
-msgstr "Rozostrovať okná, ktoré nie sú aktívne"
+msgid "Windows that should be use alpha blur by default"
+msgstr "Okná, ktoré by mali štandardne použiť alfa rozmazanie"
 
 #: ../plugins/blur/blur.xml.in.h:13
-msgid "Disable blurring of screen regions obscured by other windows."
-msgstr "Zakázať rozmazanie častí obrazovky, ktoré sú zakryté inými oknami."
+msgid "Alpha Blur"
+msgstr "Rozmaznie alfa"
 
 #: ../plugins/blur/blur.xml.in.h:14
-msgid "Filter method used for blurring"
-msgstr "Metóda filtra použitá pre rozmazanie"
+msgid "Blur behind translucent parts of windows"
+msgstr "Rozmazanie za priehľadnými časťami okien"
 
 #: ../plugins/blur/blur.xml.in.h:15
-msgid "Focus Blur"
-msgstr "Rozmazať aktívne"
+msgid "Blur Filter"
+msgstr "Filter rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:16
-msgid "Focus blur windows"
-msgstr "Rozmazať aktívne okná"
+msgid "Filter method used for blurring"
+msgstr "Metóda filtra použitá pre rozmazanie"
 
 #: ../plugins/blur/blur.xml.in.h:17
-msgid "Gaussian"
-msgstr "Gaussovské rozostrenie"
+msgid "4xBilinear"
+msgstr "Filter:"
 
 #: ../plugins/blur/blur.xml.in.h:18
-msgid "Gaussian Radius"
-msgstr "Polomer gaussovského rozostrenia"
+msgid "Gaussian"
+msgstr "Gaussovské rozostrenie"
 
-#: ../plugins/blur/blur.xml.in.h:19
-msgid "Gaussian Strength"
-msgstr "Sila gaussovského rozostrenia"
+#: ../plugins/blur/blur.xml.in.h:19 ../plugins/decor/decor.xml.in.h:17
+#: ../plugins/switcher/switcher.xml.in.h:25
+msgid "Mipmap"
+msgstr "Mipmapy"
 
 #: ../plugins/blur/blur.xml.in.h:20
-msgid "Gaussian radius"
+msgid "Gaussian Radius"
 msgstr "Polomer gaussovského rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:21
-msgid "Gaussian strength"
-msgstr "Sila gausovského rozostrenia"
+msgid "Gaussian radius"
+msgstr "Polomer gaussovského rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:22
-msgid "Independent texture fetch"
-msgstr "Nezávislé stiahnutia textúr"
+msgid "Gaussian Strength"
+msgstr "Sila gaussovského rozostrenia"
 
-#: ../plugins/blur/blur.xml.in.h:23 ../plugins/decor/decor.xml.in.h:10
-#: ../plugins/switcher/switcher.xml.in.h:16
-msgid "Mipmap"
-msgstr "Mipmapy"
+#: ../plugins/blur/blur.xml.in.h:23
+msgid "Gaussian strength"
+msgstr "Sila gausovského rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:24
 msgid "Mipmap LOD"
@@ -533,966 +533,974 @@
 msgstr "Úroveň podrobností mipmáp"
 
 #: ../plugins/blur/blur.xml.in.h:26
-msgid "Pulse"
-msgstr "Pulz"
+msgid "Blur Saturation"
+msgstr "Sýtosť rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:27
-msgid "Pulse effect"
-msgstr "Efekt pulzu"
+msgid "Blur saturation"
+msgstr "Sýtosť rozostrenia"
 
 #: ../plugins/blur/blur.xml.in.h:28
-msgid ""
-"Use the available texture units to do as many as possible independent "
-"texture fetches."
-msgstr ""
-"Použiť dostupné jednotky textúr na vykonanie čo najväčšieho počtu "
-"nezávislých stiahnutí textúr"
-
+msgid "Blur Occlusion"
+msgstr "Oklúzia rozostrenia"
+
 #: ../plugins/blur/blur.xml.in.h:29
-msgid "Window blur speed"
-msgstr "Rýchlosť rozmazania okna"
+msgid "Disable blurring of screen regions obscured by other windows."
+msgstr "Zakázať rozmazanie častí obrazovky, ktoré sú zakryté inými oknami."
 
 #: ../plugins/blur/blur.xml.in.h:30
-msgid "Windows that should be affected by focus blur"
-msgstr "Okná, ktoré majú byť ovplyvnené rozmazaním"
+msgid "Independent texture fetch"
+msgstr "Nezávislé stiahnutia textúr"
 
 #: ../plugins/blur/blur.xml.in.h:31
-msgid "Windows that should be use alpha blur by default"
-msgstr "Okná, ktoré by mali štandardne použiť alfa rozmazanie"
+msgid ""
+"Use the available texture units to do as many as possible independent "
+"texture fetches."
+msgstr ""
+"Použiť dostupné jednotky textúr na vykonanie čo najväčšieho počtu "
+"nezávislých stiahnutí textúr"
 
 #: ../plugins/commands/commands.xml.in.h:1
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command0"
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7
+msgid "Commands"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:2
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command1"
+msgid "Assigns bundings to arbitrary commands"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:3
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command10"
-msgstr ""
+msgid "Command line 0"
+msgstr "Príkazový riadok 0"
 
 #: ../plugins/commands/commands.xml.in.h:4
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command11"
-msgstr ""
+msgid "Command line to be executed in shell when run_command0 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command0"
 
 #: ../plugins/commands/commands.xml.in.h:5
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command12"
-msgstr ""
+msgid "Command line 1"
+msgstr "Príkazový riadok 1"
 
 #: ../plugins/commands/commands.xml.in.h:6
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command13"
-msgstr ""
+msgid "Command line to be executed in shell when run_command1 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command1"
 
 #: ../plugins/commands/commands.xml.in.h:7
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command14"
-msgstr ""
+msgid "Command line 2"
+msgstr "Príkazový riadok 2"
 
 #: ../plugins/commands/commands.xml.in.h:8
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command2"
-msgstr ""
+msgid "Command line to be executed in shell when run_command2 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command2"
 
 #: ../plugins/commands/commands.xml.in.h:9
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command3"
-msgstr ""
+msgid "Command line 3"
+msgstr "Príkazový riadok 3"
 
 #: ../plugins/commands/commands.xml.in.h:10
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command4"
-msgstr ""
+msgid "Command line to be executed in shell when run_command3 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command3"
 
 #: ../plugins/commands/commands.xml.in.h:11
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command5"
-msgstr ""
+msgid "Command line 4"
+msgstr "Príkazový riadok 4"
 
 #: ../plugins/commands/commands.xml.in.h:12
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command6"
-msgstr ""
+msgid "Command line to be executed in shell when run_command4 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command4"
 
 #: ../plugins/commands/commands.xml.in.h:13
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command7"
-msgstr ""
+msgid "Command line 5"
+msgstr "Príkazový riadok 5"
 
 #: ../plugins/commands/commands.xml.in.h:14
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command8"
-msgstr ""
+msgid "Command line to be executed in shell when run_command5 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command5"
 
 #: ../plugins/commands/commands.xml.in.h:15
-msgid ""
-"A button binding that when invoked, will run the shell command identified by "
-"command9"
-msgstr ""
+msgid "Command line 6"
+msgstr "Príkazový riadok 6"
 
 #: ../plugins/commands/commands.xml.in.h:16
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command15"
-msgstr ""
+msgid "Command line to be executed in shell when run_command6 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command6"
 
 #: ../plugins/commands/commands.xml.in.h:17
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command16"
-msgstr ""
+msgid "Command line 7"
+msgstr "Príkazový riadok 7"
 
 #: ../plugins/commands/commands.xml.in.h:18
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command17"
-msgstr ""
+msgid "Command line to be executed in shell when run_command7 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command7"
 
 #: ../plugins/commands/commands.xml.in.h:19
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command18"
-msgstr ""
+msgid "Command line 8"
+msgstr "Príkazový riadok 8"
 
 #: ../plugins/commands/commands.xml.in.h:20
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command19"
-msgstr ""
+msgid "Command line to be executed in shell when run_command8 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command8"
 
 #: ../plugins/commands/commands.xml.in.h:21
-msgid ""
-"A button bunding that when invoked, will run the shell command identified by "
-"command20"
-msgstr ""
+msgid "Command line 9"
+msgstr "Príkazový riadok 9"
 
 #: ../plugins/commands/commands.xml.in.h:22
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command12"
-msgstr ""
+msgid "Command line to be executed in shell when run_command9 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command9"
 
 #: ../plugins/commands/commands.xml.in.h:23
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command13"
-msgstr ""
+msgid "Command line 10"
+msgstr "Príkazový riadok 10"
 
 #: ../plugins/commands/commands.xml.in.h:24
-msgid ""
-"A edge binding that when invoked, will run the shell command identified by "
-"command14"
-msgstr ""
+msgid "Command line to be executed in shell when run_command10 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command10"
 
 #: ../plugins/commands/commands.xml.in.h:25
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command15"
-msgstr ""
+msgid "Command line 11"
+msgstr "Príkazový riadok 11"
 
 #: ../plugins/commands/commands.xml.in.h:26
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command16"
-msgstr ""
+msgid "Command line to be executed in shell when run_command11 is invoked"
+msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command11"
 
 #: ../plugins/commands/commands.xml.in.h:27
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line 12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:28
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line to be executed in shell when run_command12 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:29
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line 13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:30
-msgid ""
-"A edge bunding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line to be executed in shell when run_command13 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:31
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command0"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command0"
+msgid "Command line 14"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:32
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command1"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command1"
+msgid "Command line to be executed in shell when run_command14 is invoked"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:33
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command10"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command10"
+msgid "Command line 15"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:34
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command11"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command11"
+msgid "Command line to be executed in shell when run_command15 is invoked"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:35
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command12"
+msgid "Command line 16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:36
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command13"
+msgid "Command line to be executed in shell when run_command16 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:37
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command14"
+msgid "Command line 17"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:38
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command15"
+msgid "Command line to be executed in shell when run_command17 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:39
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command16"
+msgid "Command line 18"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:40
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command17"
+msgid "Command line to be executed in shell when run_command18 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:41
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command18"
+msgid "Command line 19"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:42
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command19"
+msgid "Command line to be executed in shell when run_command19 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:43
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command2"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command2"
+msgid "Command line 20"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:44
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command20"
+msgid "Command line to be executed in shell when run_command20 is invoked"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:45
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command3"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command3"
+msgid "Key Bindings"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:46
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command4"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command4"
+msgid "Run command 0"
+msgstr "Spustiť príkaz 0"
 
 #: ../plugins/commands/commands.xml.in.h:47
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command5"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command5"
+"A keybunding that when invoked, will run the shell command identified by "
+"command0"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:48
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command6"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command6"
+msgid "Run command 1"
+msgstr "Spustiť príkaz 1"
 
 #: ../plugins/commands/commands.xml.in.h:49
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command7"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command7"
+"A keybunding that when invoked, will run the shell command identified by "
+"command1"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:50
-msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command8"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command8"
+msgid "Run command 2"
+msgstr "Spustiť príkaz 2"
 
 #: ../plugins/commands/commands.xml.in.h:51
 msgid ""
-"A keybinding that when invoked, will run the shell command identified by "
-"command9"
-msgstr "Klávesové skratky, ktoré spustia príkaz identifikovaný ako command9"
+"A keybunding that when invoked, will run the shell command identified by "
+"command2"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:52
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command0"
-msgstr ""
+msgid "Run command 3"
+msgstr "Spustiť príkaz 3"
 
 #: ../plugins/commands/commands.xml.in.h:53
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command1"
+"A keybunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:54
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command10"
-msgstr ""
+msgid "Run command 4"
+msgstr "Spustiť príkaz 4"
 
 #: ../plugins/commands/commands.xml.in.h:55
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command11"
+"A keybunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:56
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command2"
-msgstr ""
+msgid "Run command 5"
+msgstr "Spustiť príkaz 5"
 
 #: ../plugins/commands/commands.xml.in.h:57
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command3"
+"A keybunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:58
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command4"
-msgstr ""
+msgid "Run command 6"
+msgstr "Spustiť príkaz 6"
 
 #: ../plugins/commands/commands.xml.in.h:59
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command5"
+"A keybunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:60
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command6"
-msgstr ""
+msgid "Run command 7"
+msgstr "Spustiť príkaz 7"
 
 #: ../plugins/commands/commands.xml.in.h:61
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
+"A keybunding that when invoked, will run the shell command identified by "
 "command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:62
-msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command8"
-msgstr ""
+msgid "Run command 8"
+msgstr "Spustiť príkaz 8"
 
 #: ../plugins/commands/commands.xml.in.h:63
 msgid ""
-"An edge binding that when invoked, will run the shell command identified by "
-"command9"
+"A keybunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:64
-msgid "Assigns bindings to arbitrary commands"
-msgstr ""
+msgid "Run command 9"
+msgstr "Spustiť príkaz 9"
 
 #: ../plugins/commands/commands.xml.in.h:65
-msgid "Button Bindings"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:66
-msgid "Command line 0"
-msgstr "Príkazový riadok 0"
+msgid "Run command 10"
+msgstr "Spustiť príkaz 10"
 
 #: ../plugins/commands/commands.xml.in.h:67
-msgid "Command line 1"
-msgstr "Príkazový riadok 1"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command10"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:68
-msgid "Command line 10"
-msgstr "Príkazový riadok 10"
+msgid "Run command 11"
+msgstr "Spustiť príkaz 11"
 
 #: ../plugins/commands/commands.xml.in.h:69
-msgid "Command line 11"
-msgstr "Príkazový riadok 11"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command11"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:70
-msgid "Command line 12"
+msgid "Run command 12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:71
-msgid "Command line 13"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command12"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:72
-msgid "Command line 14"
+msgid "Run command 13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:73
-msgid "Command line 15"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:74
-msgid "Command line 16"
+msgid "Run command 14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:75
-msgid "Command line 17"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command14"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:76
-msgid "Command line 18"
+msgid "Run command 15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:77
-msgid "Command line 19"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command15"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:78
-msgid "Command line 2"
-msgstr "Príkazový riadok 2"
+msgid "Run command 16"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:79
-msgid "Command line 20"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command16"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:80
-msgid "Command line 3"
-msgstr "Príkazový riadok 3"
+msgid "Run command 17"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:81
-msgid "Command line 4"
-msgstr "Príkazový riadok 4"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command17"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:82
-msgid "Command line 5"
-msgstr "Príkazový riadok 5"
+msgid "Run command 18"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:83
-msgid "Command line 6"
-msgstr "Príkazový riadok 6"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command18"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:84
-msgid "Command line 7"
-msgstr "Príkazový riadok 7"
+msgid "Run command 19"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:85
-msgid "Command line 8"
-msgstr "Príkazový riadok 8"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command19"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:86
-msgid "Command line 9"
-msgstr "Príkazový riadok 9"
+msgid "Run command 20"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:87
-msgid "Command line to be executed in shell when run_command0 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command0"
+msgid ""
+"A keybunding that when invoked, will run the shell command identified by "
+"command20"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:88
-msgid "Command line to be executed in shell when run_command1 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command1"
+msgid "Button Bindings"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:89
-msgid "Command line to be executed in shell when run_command10 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command10"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command0"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:90
-msgid "Command line to be executed in shell when run_command11 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command11"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command1"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:91
-msgid "Command line to be executed in shell when run_command12 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command2"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:92
-msgid "Command line to be executed in shell when run_command13 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command3"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:93
-msgid "Command line to be executed in shell when run_command14 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:94
-msgid "Command line to be executed in shell when run_command15 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:95
-msgid "Command line to be executed in shell when run_command16 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:96
-msgid "Command line to be executed in shell when run_command17 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:97
-msgid "Command line to be executed in shell when run_command18 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:98
-msgid "Command line to be executed in shell when run_command19 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:99
-msgid "Command line to be executed in shell when run_command2 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command2"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command10"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:100
-msgid "Command line to be executed in shell when run_command20 is invoked"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:101
-msgid "Command line to be executed in shell when run_command3 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command3"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command12"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:102
-msgid "Command line to be executed in shell when run_command4 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command4"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command13"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:103
-msgid "Command line to be executed in shell when run_command5 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command5"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command14"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:104
-msgid "Command line to be executed in shell when run_command6 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command6"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command15"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:105
-msgid "Command line to be executed in shell when run_command7 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command7"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command16"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:106
-msgid "Command line to be executed in shell when run_command8 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command8"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command17"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:107
-msgid "Command line to be executed in shell when run_command9 is invoked"
-msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command9"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command18"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:108
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1
-msgid "Commands"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command19"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:109
-msgid "Edge Bindings"
+msgid ""
+"A button bunding that when invoked, will run the shell command identified by "
+"command20"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:110
-msgid "Key Bindings"
+msgid "Edge Bindings"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:111
-msgid "Run command 0"
-msgstr "Spustiť príkaz 0"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command0"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:112
-msgid "Run command 1"
-msgstr "Spustiť príkaz 1"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command1"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:113
-msgid "Run command 10"
-msgstr "Spustiť príkaz 10"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command2"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:114
-msgid "Run command 11"
-msgstr "Spustiť príkaz 11"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command3"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:115
-msgid "Run command 12"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command4"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:116
-msgid "Run command 13"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command5"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:117
-msgid "Run command 14"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command6"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:118
-msgid "Run command 15"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command7"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:119
-msgid "Run command 16"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command8"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:120
-msgid "Run command 17"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command9"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:121
-msgid "Run command 18"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command10"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:122
-msgid "Run command 19"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command11"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:123
-msgid "Run command 2"
-msgstr "Spustiť príkaz 2"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command12"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:124
-msgid "Run command 20"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command13"
 msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:125
-msgid "Run command 3"
-msgstr "Spustiť príkaz 3"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command14"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:126
-msgid "Run command 4"
-msgstr "Spustiť príkaz 4"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command15"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:127
-msgid "Run command 5"
-msgstr "Spustiť príkaz 5"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command16"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:128
-msgid "Run command 6"
-msgstr "Spustiť príkaz 6"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command17"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:129
-msgid "Run command 7"
-msgstr "Spustiť príkaz 7"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command18"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:130
-msgid "Run command 8"
-msgstr "Spustiť príkaz 8"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command19"
+msgstr ""
 
 #: ../plugins/commands/commands.xml.in.h:131
-msgid "Run command 9"
-msgstr "Spustiť príkaz 9"
+msgid ""
+"An edge bunding that when invoked, will run the shell command identified by "
+"command20"
+msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:1
-msgid ""
-"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps"
+msgid "Composite"
 msgstr ""
-"Povoliť vykresľovanie celoobrazovkových okien bez presmerovania do "
-"mimoobrazovkových pixmapov"
 
 #: ../plugins/composite/composite.xml.in.h:2
-msgid "Automatic detection of refresh rate"
-msgstr "Automatická detekcia obnovovacej frekvencie"
+msgid "Composite plugin"
+msgstr ""
 
 #: ../plugins/composite/composite.xml.in.h:3
-msgid "Composite"
-msgstr ""
+msgid "Slow Animations"
+msgstr "Pomalé animácie"
 
 #: ../plugins/composite/composite.xml.in.h:4
-msgid "Composite plugin"
-msgstr ""
+msgid "Toggle use of slow animations"
+msgstr "Prepnúť použitie pomalých animácií"
 
 #: ../plugins/composite/composite.xml.in.h:5
 msgid "Detect Refresh Rate"
 msgstr "Deteguj Obnovovaciu Frekvenciu"
 
 #: ../plugins/composite/composite.xml.in.h:6
-msgid "Force independent output painting."
-msgstr "Vynútenie vykreslenia nezávislého výstupu"
+msgid "Automatic detection of refresh rate"
+msgstr "Automatická detekcia obnovovacej frekvencie"
 
 #: ../plugins/composite/composite.xml.in.h:7
-msgid ""
-"Paint each output device independly, even if the output devices overlap"
-msgstr ""
-"Vykresli každý výstup zariadenia nezávisle aj keď sa výstupy zariadení "
-"prekrývajú"
-
-#: ../plugins/composite/composite.xml.in.h:8
 msgid "Refresh Rate"
 msgstr "Obnovovacia frekvencia"
 
+#: ../plugins/composite/composite.xml.in.h:8
+msgid "The rate at which the screen is redrawn (times/second)"
+msgstr "Frekvencia prekresľovania obrazovky v Hz"
+
 #: ../plugins/composite/composite.xml.in.h:9
-msgid "Slow Animations"
-msgstr "Pomalé animácie"
+msgid "Unredirect Fullscreen Windows"
+msgstr "Nepresmerovať okná v celoobrazovkovom režime"
 
 #: ../plugins/composite/composite.xml.in.h:10
-msgid "The rate at which the screen is redrawn (times/second)"
-msgstr "Frekvencia prekresľovania obrazovky v Hz"
+msgid ""
+"Allow drawing of fullscreen windows to not be redirected to offscreen pixmaps"
+msgstr ""
+"Povoliť vykresľovanie celoobrazovkových okien bez presmerovania do "
+"mimoobrazovkových pixmapov"
 
 #: ../plugins/composite/composite.xml.in.h:11
-msgid "Toggle use of slow animations"
-msgstr "Prepnúť použitie pomalých animácií"
+msgid "Force independent output painting."
+msgstr "Vynútenie vykreslenia nezávislého výstupu"
 
 #: ../plugins/composite/composite.xml.in.h:12
-msgid "Unredirect Fullscreen Windows"
-msgstr "Nepresmerovať okná v celoobrazovkovom režime"
+msgid ""
+"Paint each output device independly, even if the output devices overlap"
+msgstr ""
+"Vykresli každý výstup zariadenia nezávisle aj keď sa výstupy zariadení "
+"prekrývajú"
 
 #: ../plugins/copytex/copytex.xml.in.h:1
-msgid "Copy pixmap content to texture"
+msgid "Copy to texture"
 msgstr ""
 
 #: ../plugins/copytex/copytex.xml.in.h:2
-msgid "Copy to texture"
+msgid "Copy pixmap content to texture"
 msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:1
-msgid "Allow mipmaps to be generated for decoration textures"
-msgstr "Umožniť tvorbu mipmáp pre dekoračné textúry"
+msgid "Window Decoration"
+msgstr "Dekorácie okna"
 
 #: ../plugins/decor/decor.xml.in.h:2
-msgid "Command"
-msgstr "Príkaz"
+msgid "Window decorations"
+msgstr "Dekorácie okna"
 
 #: ../plugins/decor/decor.xml.in.h:3
-msgid "Decoration windows"
-msgstr "Dekorované okná"
+msgid "Active Shadow"
+msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:4
-msgid ""
-"Decorator command line that is executed if no decorator is already running"
-msgstr ""
-"Príkazový riadok programu pre dekorácie, ktorý sa vykoná, pokiaľ nebude "
-"spustený žiadny program pre dekorácie"
+msgid "Shadow Radius"
+msgstr "Polomer tieňa"
 
 #: ../plugins/decor/decor.xml.in.h:5
-msgid "Drop shadow X offset"
-msgstr "Posun X vrhaného tieňa"
+msgid "Drop shadow radius"
+msgstr "Polomer vrhaného tieňa"
 
 #: ../plugins/decor/decor.xml.in.h:6
-msgid "Drop shadow Y offset"
-msgstr "Posun Y vrhaného tieňa"
+msgid "Shadow Opacity"
+msgstr "Krytie tieňa"
 
 #: ../plugins/decor/decor.xml.in.h:7
-msgid "Drop shadow color"
-msgstr "Farba vrhaného tieňa"
-
-#: ../plugins/decor/decor.xml.in.h:8
 msgid "Drop shadow opacity"
 msgstr "Nepriehľadnosť vrhaného tieňa"
 
-#: ../plugins/decor/decor.xml.in.h:9
-msgid "Drop shadow radius"
-msgstr "Polomer vrhaného tieňa"
-
-#: ../plugins/decor/decor.xml.in.h:11
+#: ../plugins/decor/decor.xml.in.h:8
 msgid "Shadow Color"
 msgstr "Farba tieňa"
 
-#: ../plugins/decor/decor.xml.in.h:12
+#: ../plugins/decor/decor.xml.in.h:9
+msgid "Drop shadow color"
+msgstr "Farba vrhaného tieňa"
+
+#: ../plugins/decor/decor.xml.in.h:10
 msgid "Shadow Offset X"
 msgstr "Posun tieňa X"
 
-#: ../plugins/decor/decor.xml.in.h:13
+#: ../plugins/decor/decor.xml.in.h:11
+msgid "Drop shadow X offset"
+msgstr "Posun X vrhaného tieňa"
+
+#: ../plugins/decor/decor.xml.in.h:12
 msgid "Shadow Offset Y"
 msgstr "Posun tieňa Y"
 
+#: ../plugins/decor/decor.xml.in.h:13
+msgid "Drop shadow Y offset"
+msgstr "Posun Y vrhaného tieňa"
+
 #: ../plugins/decor/decor.xml.in.h:14
-msgid "Shadow Opacity"
-msgstr "Krytie tieňa"
+msgid "Inactive Shadow"
+msgstr ""
 
 #: ../plugins/decor/decor.xml.in.h:15
-msgid "Shadow Radius"
-msgstr "Polomer tieňa"
+msgid "Command"
+msgstr "Príkaz"
 
 #: ../plugins/decor/decor.xml.in.h:16
-msgid "Shadow windows"
-msgstr "Tieňované okná"
-
-#: ../plugins/decor/decor.xml.in.h:17
-msgid "Window Decoration"
-msgstr "Dekorácie okna"
+msgid ""
+"Decorator command line that is executed if no decorator is already running"
+msgstr ""
+"Príkazový riadok programu pre dekorácie, ktorý sa vykoná, pokiaľ nebude "
+"spustený žiadny program pre dekorácie"
 
 #: ../plugins/decor/decor.xml.in.h:18
-msgid "Window decorations"
-msgstr "Dekorácie okna"
+msgid "Allow mipmaps to be generated for decoration textures"
+msgstr "Umožniť tvorbu mipmáp pre dekoračné textúry"
 
 #: ../plugins/decor/decor.xml.in.h:19
+msgid "Decoration windows"
+msgstr "Dekorované okná"
+
+#: ../plugins/decor/decor.xml.in.h:20
 msgid "Windows that should be decorated"
 msgstr "Okná, ktoré by mali byť dekorované"
 
-#: ../plugins/decor/decor.xml.in.h:20
+#: ../plugins/decor/decor.xml.in.h:21
+msgid "Shadow windows"
+msgstr "Tieňované okná"
+
+#: ../plugins/decor/decor.xml.in.h:22
 msgid "Windows that should have a shadow"
 msgstr "Okná, ktoré by mali mať tieň"
 
+#: ../plugins/fade/fade.xml.in.h:1
+msgid "Fading Windows"
+msgstr "Stmievanie okien"
+
 #: ../plugins/fade/fade.xml.in.h:2
-#, no-c-format
-msgid "Brightness (in %) of unresponsive windows"
-msgstr ""
+msgid "Fade in windows when mapped and fade out windows when unmapped"
+msgstr "Rozsvecovanie okien pri mapovaní a stmievania pri odmapovaní"
 
 #: ../plugins/fade/fade.xml.in.h:3
-msgid "Constant speed"
+msgid "Fade Mode"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:4
-msgid "Constant time"
+msgid "Window fade mode"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:5
-msgid "Dim Unresponsive Windows"
+msgid "Constant speed"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:6
-msgid "Dim windows that are not responding to window manager requests"
+msgid "Constant time"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:7
-msgid "Fade Mode"
-msgstr ""
-
-#: ../plugins/fade/fade.xml.in.h:8
 msgid "Fade Speed"
 msgstr "Rýchlosť stmievania"
 
+#: ../plugins/fade/fade.xml.in.h:8
+msgid "Window fade speed"
+msgstr "Rýchlosť stmievania okna"
+
 #: ../plugins/fade/fade.xml.in.h:9
 msgid "Fade Time"
 msgstr "Doba stmavnutia"
 
 #: ../plugins/fade/fade.xml.in.h:10
-msgid "Fade effect on system beep"
-msgstr "Efekt stmievania pri systémovom pípnutí"
+msgid "Window fade time (in ms) in \"Constant time\" mode"
+msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:11
-msgid "Fade in windows when mapped and fade out windows when unmapped"
-msgstr "Rozsvecovanie okien pri mapovaní a stmievania pri odmapovaní"
-
-#: ../plugins/fade/fade.xml.in.h:12
 msgid "Fade windows"
 msgstr "Stmievanie okien"
 
+#: ../plugins/fade/fade.xml.in.h:12
+msgid "Windows that should be fading"
+msgstr "Okná, ktoré by mali blednúť"
+
 #: ../plugins/fade/fade.xml.in.h:13
-msgid "Fading Windows"
-msgstr "Stmievanie okien"
+msgid "Visual Bell"
+msgstr "Vizuálny zvonček"
 
 #: ../plugins/fade/fade.xml.in.h:14
+msgid "Fade effect on system beep"
+msgstr "Efekt stmievania pri systémovom pípnutí"
+
+#: ../plugins/fade/fade.xml.in.h:15
 msgid "Fullscreen Visual Bell"
 msgstr "Celoobrazovkový vizuálny zvonček"
 
-#: ../plugins/fade/fade.xml.in.h:15
+#: ../plugins/fade/fade.xml.in.h:16
 msgid "Fullscreen fade effect on system beep"
 msgstr "Celoobrazovkový efekt blednutia pri systémovom pípnutí"
 
 #: ../plugins/fade/fade.xml.in.h:17
-#, no-c-format
-msgid "Saturation (in %) of unresponsive windows"
+msgid "Dim Unresponsive Windows"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:18
-msgid "Unresponsive Window Brightness"
+msgid "Dim windows that are not responding to window manager requests"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:19
-msgid "Unresponsive Window Saturation"
+msgid "Unresponsive Window Brightness"
 msgstr ""
 
-#: ../plugins/fade/fade.xml.in.h:20
-msgid "Visual Bell"
-msgstr "Vizuálny zvonček"
-
 #: ../plugins/fade/fade.xml.in.h:21
-msgid "Window fade mode"
+#, no-c-format
+msgid "Brightness (in %) of unresponsive windows"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:22
-msgid "Window fade speed"
-msgstr "Rýchlosť stmievania okna"
-
-#: ../plugins/fade/fade.xml.in.h:23
-msgid "Window fade time (in ms) in \"Constant time\" mode"
+msgid "Unresponsive Window Saturation"
 msgstr ""
 
 #: ../plugins/fade/fade.xml.in.h:24
-msgid "Windows that should be fading"
-msgstr "Okná, ktoré by mali blednúť"
+#, no-c-format
+msgid "Saturation (in %) of unresponsive windows"
+msgstr ""
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1
 msgid "Gnome Compatibility"
 msgstr ""
 
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2
+msgid "Options that keep Compiz compatible to the Gnome desktop environment"
+msgstr ""
+
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:3
-msgid "Open a terminal"
-msgstr "Otvoriť terminál"
+msgid "Show Main Menu"
+msgstr "Zobraziť Hlavnú ponuku"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:4
-msgid "Options that keep Compiz compatible to the Gnome desktop environment"
-msgstr ""
+msgid "Show the main menu"
+msgstr "Zobraziť hlavné menu"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:5
 msgid "Run Dialog"
 msgstr "Spustiť Dialóg"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:6
-msgid "Run terminal command"
-msgstr ""
+msgid "Show Run Application dialog"
+msgstr "Zobraziť dialóg spustenia aplikácie"
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8
 msgid "Screenshot command line"
 msgstr "Príkaz pre snímanie obrazovky"
 
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8
-msgid "Show Main Menu"
-msgstr "Zobraziť Hlavnú ponuku"
-
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:9
-msgid "Show Run Application dialog"
-msgstr "Zobraziť dialóg spustenia aplikácie"
+msgid "Take a screenshot"
+msgstr "Zosnímať obrazovku"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:10
-msgid "Show the main menu"
-msgstr "Zobraziť hlavné menu"
+msgid "Window screenshot command line"
+msgstr "Príkazový na zosnímania okna"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:11
-msgid "Take a screenshot"
-msgstr "Zosnímať obrazovku"
-
-#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12
 msgid "Take a screenshot of a window"
 msgstr "Zosnímať okno"
 
+#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12
+msgid "Run terminal command"
+msgstr ""
+
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:13
 msgid "Terminal command line"
 msgstr "Príkaz pre terminál"
 
 #: ../plugins/gnomecompat/gnomecompat.xml.in.h:14
-msgid "Window screenshot command line"
-msgstr "Príkazový na zosnímania okna"
+msgid "Open a terminal"
+msgstr "Otvoriť terminál"
 
 #: ../plugins/imgpng/imgpng.xml.in.h:1
 msgid "Png"
@@ -1503,28 +1511,20 @@
 msgstr "Načítanie PNG obrázkov"
 
 #: ../plugins/imgsvg/imgsvg.xml.in.h:1
-msgid "Set overlay"
-msgstr ""
-
-#: ../plugins/imgsvg/imgsvg.xml.in.h:2
-msgid "Set window overlay"
-msgstr ""
-
-#: ../plugins/imgsvg/imgsvg.xml.in.h:3
 msgid "Svg"
 msgstr "SVG"
 
-#: ../plugins/imgsvg/imgsvg.xml.in.h:4
+#: ../plugins/imgsvg/imgsvg.xml.in.h:2
 msgid "Svg image loader"
 msgstr "Načítanie SVG obrázkov"
 
-#: ../plugins/ini/ini.xml.in.h:1
-msgid "Ini"
-msgstr "Ini"
-
-#: ../plugins/ini/ini.xml.in.h:2
-msgid "Ini Flat File Backend"
-msgstr "Pozadie ini súboru"
+#: ../plugins/imgsvg/imgsvg.xml.in.h:3
+msgid "Set overlay"
+msgstr ""
+
+#: ../plugins/imgsvg/imgsvg.xml.in.h:4
+msgid "Set window overlay"
+msgstr ""
 
 #: ../plugins/inotify/inotify.xml.in.h:1
 msgid "File Watcher"
@@ -1535,285 +1535,285 @@
 msgstr "Modul upozornenia zmeny súboru"
 
 #: ../plugins/move/move.xml.in.h:1
-msgid "Constrain Y"
-msgstr "Obmedzenie Y"
+msgid "Move Window"
+msgstr "Presunúť okno"
 
 #: ../plugins/move/move.xml.in.h:2
-msgid "Constrain Y coordinate to workspace area"
-msgstr "Obmedziť súradnicu Y na priestor pracovnej plochy"
+msgid "Move window"
+msgstr "Presunúť okno"
 
 #: ../plugins/move/move.xml.in.h:3
-msgid ""
-"Do not update the server-side position of windows until finished moving"
-msgstr "Aktualizovať pozíciu okna až po dokončení presunu"
-
-#: ../plugins/move/move.xml.in.h:4
 msgid "Initiate Window Move"
 msgstr "Zahájiť presun okna"
 
-#: ../plugins/move/move.xml.in.h:5
-msgid "Lazy Positioning"
-msgstr "Lenivé presúvanie"
+#: ../plugins/move/move.xml.in.h:4
+msgid "Start moving window"
+msgstr "Začať pohyb okna"
+
+#: ../plugins/move/move.xml.in.h:5 ../plugins/scale/scale.xml.in.h:12
+#: ../plugins/switcher/switcher.xml.in.h:31
+msgid "Opacity"
+msgstr "Nepriehľadnosť"
 
 #: ../plugins/move/move.xml.in.h:6
-msgid "Move Window"
-msgstr "Presunúť okno"
+msgid "Opacity level of moving windows"
+msgstr "Úroveň nepriehľadnosti presúvaných okien"
 
 #: ../plugins/move/move.xml.in.h:7
-msgid "Move window"
-msgstr "Presunúť okno"
+msgid "Constrain Y"
+msgstr "Obmedzenie Y"
 
-#: ../plugins/move/move.xml.in.h:8 ../plugins/scale/scale.xml.in.h:29
-#: ../plugins/switcher/switcher.xml.in.h:23
-msgid "Opacity"
-msgstr "Nepriehľadnosť"
+#: ../plugins/move/move.xml.in.h:8
+msgid "Constrain Y coordinate to workspace area"
+msgstr "Obmedziť súradnicu Y na priestor pracovnej plochy"
 
 #: ../plugins/move/move.xml.in.h:9
-msgid "Opacity level of moving windows"
-msgstr "Úroveň nepriehľadnosti presúvaných okien"
+msgid "Snapoff maximized windows"
+msgstr "Odtrhávať maximalizované okná"
 
 #: ../plugins/move/move.xml.in.h:10
 msgid "Snapoff and auto unmaximized maximized windows when dragging"
 msgstr "Odtrhávať a automaticky obnoviť maximalizované okná počas ťahania"
 
 #: ../plugins/move/move.xml.in.h:11
-msgid "Snapoff maximized windows"
-msgstr "Odtrhávať maximalizované okná"
+msgid "Lazy Positioning"
+msgstr "Lenivé presúvanie"
 
 #: ../plugins/move/move.xml.in.h:12
-msgid "Start moving window"
-msgstr "Začať pohyb okna"
+msgid ""
+"Do not update the server-side position of windows until finished moving"
+msgstr "Aktualizovať pozíciu okna až po dokončení presunu"
 
 #: ../plugins/opengl/opengl.xml.in.h:1
-msgid "Best"
-msgstr "Najlepšie"
+msgid "OpenGL"
+msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:2
-msgid "Fast"
-msgstr "Rýchlo"
+msgid "OpenGL Plugin"
+msgstr ""
 
 #: ../plugins/opengl/opengl.xml.in.h:3
-msgid "Good"
-msgstr "V poriadku"
+msgid "Texture Filter"
+msgstr "Filter textúr"
 
 #: ../plugins/opengl/opengl.xml.in.h:4
-msgid "If available use compression for textures converted from images"
-msgstr ""
-"Ak sa dá, použiť kompresiu textúr, ktoré boli konvertované z obrázkov."
+msgid "Texture filtering"
+msgstr "Filtrovanie textúr"
 
 #: ../plugins/opengl/opengl.xml.in.h:5
-msgid "Lighting"
-msgstr "Osvetlenie"
+msgid "Fast"
+msgstr "Rýchlo"
 
 #: ../plugins/opengl/opengl.xml.in.h:6
-msgid "Only perform screen updates during vertical blanking period"
-msgstr ""
-"Vykonávať aktualizácie obrazovky počas intervalu vertikálneho zatemnenia"
+msgid "Good"
+msgstr "V poriadku"
 
 #: ../plugins/opengl/opengl.xml.in.h:7
-msgid "OpenGL"
-msgstr ""
+msgid "Best"
+msgstr "Najlepšie"
 
 #: ../plugins/opengl/opengl.xml.in.h:8
-msgid "OpenGL Plugin"
-msgstr ""
+msgid "Lighting"
+msgstr "Osvetlenie"
 
 #: ../plugins/opengl/opengl.xml.in.h:9
-msgid "Sync To VBlank"
-msgstr "Synchronizovať pri VBlank"
+msgid "Use diffuse light when screen is transformed"
+msgstr "Použiť rozptýlené svetlo pri transformácii obrazovky"
 
 #: ../plugins/opengl/opengl.xml.in.h:10
-msgid "Texture Compression"
-msgstr "Kompersia textúr"
+msgid "Sync To VBlank"
+msgstr "Synchronizovať pri VBlank"
 
 #: ../plugins/opengl/opengl.xml.in.h:11
-msgid "Texture Filter"
-msgstr "Filter textúr"
+msgid "Only perform screen updates during vertical blanking period"
+msgstr ""
+"Vykonávať aktualizácie obrazovky počas intervalu vertikálneho zatemnenia"
 
 #: ../plugins/opengl/opengl.xml.in.h:12
-msgid "Texture filtering"
-msgstr "Filtrovanie textúr"
+msgid "Texture Compression"
+msgstr "Kompersia textúr"
 
 #: ../plugins/opengl/opengl.xml.in.h:13
-msgid "Use diffuse light when screen is transformed"
-msgstr "Použiť rozptýlené svetlo pri transformácii obrazovky"
+msgid "If available use compression for textures converted from images"
+msgstr ""
+"Ak sa dá, použiť kompresiu textúr, ktoré boli konvertované z obrázkov."
 
 #: ../plugins/place/place.xml.in.h:1
-msgid "Algorithm to use for window placement"
-msgstr "Algoritmus použitý pre rozmiestnenie okna"
+msgid "Place Windows"
+msgstr "Rozmiestniť okná"
 
 #: ../plugins/place/place.xml.in.h:2
-msgid "Cascade"
-msgstr "Kaskáda"
+msgid "Place windows at appropriate positions when mapped"
+msgstr "Umiestniť mapované okná na zodpovedajúce pozície"
 
 #: ../plugins/place/place.xml.in.h:3
-msgid "Centered"
-msgstr "Vystrednené"
+msgid "Workarounds"
+msgstr "Núdzové riešenia"
 
 #: ../plugins/place/place.xml.in.h:4
-msgid "Fixed Window Placement"
-msgstr ""
+msgid "Window placement workarounds"
+msgstr "Núdzové riešenia umiestnenia okna"
 
 #: ../plugins/place/place.xml.in.h:5
-msgid "Force Placement Windows"
-msgstr "Vynútené umiestnenie okien"
+msgid "Placement Mode"
+msgstr "Spôsob rozmiestnenia"
 
 #: ../plugins/place/place.xml.in.h:6
-msgid "Horizontal viewport positions"
-msgstr "Vodorovné pozície pohľadov"
+msgid "Algorithm to use for window placement"
+msgstr "Algoritmus použitý pre rozmiestnenie okna"
 
 #: ../plugins/place/place.xml.in.h:7
-msgid "Keep In Workarea"
-msgstr ""
+msgid "Cascade"
+msgstr "Kaskáda"
 
 #: ../plugins/place/place.xml.in.h:8
-msgid ""
-"Keep placed window in work area, even if that means that the position might "
-"differ from the specified position"
-msgstr ""
+msgid "Centered"
+msgstr "Vystrednené"
 
 #: ../plugins/place/place.xml.in.h:9
+msgid "Smart"
+msgstr "Inteligentné"
+
+#: ../plugins/place/place.xml.in.h:10
 msgid "Maximize"
 msgstr "Maximalizovať"
 
-#: ../plugins/place/place.xml.in.h:10
-msgid "Mode"
+#: ../plugins/place/place.xml.in.h:11
+msgid "Random"
+msgstr "Náhodné"
+
+#: ../plugins/place/place.xml.in.h:12
+msgid "Pointer"
 msgstr ""
 
-#: ../plugins/place/place.xml.in.h:11 ../plugins/scale/scale.xml.in.h:25
+#: ../plugins/place/place.xml.in.h:13 ../plugins/scale/scale.xml.in.h:26
 msgid "Multi Output Mode"
 msgstr "Viacnásobný výstupný režim"
 
-#: ../plugins/place/place.xml.in.h:12
-msgid "Place Windows"
-msgstr "Rozmiestniť okná"
-
-#: ../plugins/place/place.xml.in.h:13
-msgid "Place across all outputs"
-msgstr ""
-
 #: ../plugins/place/place.xml.in.h:14
-msgid "Place windows at appropriate positions when mapped"
-msgstr "Umiestniť mapované okná na zodpovedajúce pozície"
+msgid ""
+"Selects how window placement should behave if multiple outputs are selected"
+msgstr ""
+"Označuje ako by sa malo správať umiestňovanie okien ak je označených viacero "
+"výstupov"
 
 #: ../plugins/place/place.xml.in.h:15
-msgid "Placement Mode"
-msgstr "Spôsob rozmiestnenia"
+msgid "Use active output device"
+msgstr "Použiť aktívne výstupné zariadenie"
 
 #: ../plugins/place/place.xml.in.h:16
-msgid "Pointer"
-msgstr ""
+msgid "Use output device with pointer"
+msgstr "Použiť výstupné zariadenie s ukazovateľom"
 
 #: ../plugins/place/place.xml.in.h:17
-msgid "Positioned windows"
-msgstr "Umiestnené okná"
+msgid "Use output device of focussed window"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:18
-msgid "Positioning modes"
+msgid "Place across all outputs"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:19
-msgid "Random"
-msgstr "Náhodné"
+msgid "Force Placement Windows"
+msgstr "Vynútené umiestnenie okien"
 
 #: ../plugins/place/place.xml.in.h:20
 msgid ""
-"Selects how window placement should behave if multiple outputs are selected"
+"Windows that should forcedly be placed, even if they indicate the window "
+"manager should avoid placing them."
 msgstr ""
-"Označuje ako by sa malo správať umiestňovanie okien ak je označených viacero "
-"výstupov"
+"Okná ktoré by mali byť nútene umiestnené aj keď by sa okenný manažér mal "
+"vyhnúť takémuto umiestneniu."
 
 #: ../plugins/place/place.xml.in.h:21
-msgid "Smart"
-msgstr "Inteligentné"
+msgid "Fixed Window Placement"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:22
-msgid "Use active output device"
-msgstr "Použiť aktívne výstupné zariadenie"
+msgid "Windows with fixed positions"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:23
-msgid "Use output device of focussed window"
-msgstr ""
+msgid "Positioned windows"
+msgstr "Umiestnené okná"
 
 #: ../plugins/place/place.xml.in.h:24
-msgid "Use output device with pointer"
-msgstr "Použiť výstupné zariadenie s ukazovateľom"
+msgid "Windows that should be positioned by default"
+msgstr "Okná, ktoré by mali byť štandardne umiestnené"
 
 #: ../plugins/place/place.xml.in.h:25
-msgid "Vertical viewport positions"
-msgstr "Zvislé pozície pohľadov"
+msgid "X Positions"
+msgstr "Pozície X"
 
 #: ../plugins/place/place.xml.in.h:26
-msgid "Viewport positioned windows"
-msgstr "Okná umiestnené v pohľadoch"
+msgid "X position values"
+msgstr "Hodnoty pozíce na osi X"
 
 #: ../plugins/place/place.xml.in.h:27
-msgid "Window placement workarounds"
-msgstr "Núdzové riešenia umiestnenia okna"
+msgid "Y Positions"
+msgstr "Pozície Y"
 
 #: ../plugins/place/place.xml.in.h:28
-msgid "Windows"
-msgstr ""
+msgid "Y position values"
+msgstr "Hodnoty pozíce na osi Y"
 
 #: ../plugins/place/place.xml.in.h:29
-msgid "Windows that should be positioned by default"
-msgstr "Okná, ktoré by mali byť štandardne umiestnené"
+msgid "Keep In Workarea"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:30
-msgid "Windows that should be positioned in specific viewports by default"
-msgstr "Okná, ktoré by mali byť štandardne umiestnené na konkrétnu plochu"
+msgid ""
+"Keep placed window in work area, even if that means that the position might "
+"differ from the specified position"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:31
-msgid ""
-"Windows that should forcedly be placed, even if they indicate the window "
-"manager should avoid placing them."
+msgid "Windows with fixed placement mode"
 msgstr ""
-"Okná ktoré by mali byť nútene umiestnené aj keď by sa okenný manažér mal "
-"vyhnúť takémuto umiestneniu."
 
 #: ../plugins/place/place.xml.in.h:32
-msgid "Windows that should have a certain positioning mo+de"
+msgid "Windows"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:33
-msgid "Windows with fixed placement mode"
+msgid "Windows that should have a certain positioning mo+de"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:34
-msgid "Windows with fixed positions"
+msgid "Mode"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:35
-msgid "Windows with fixed viewport"
+msgid "Positioning modes"
 msgstr ""
 
 #: ../plugins/place/place.xml.in.h:36
-msgid "Workarounds"
-msgstr "Núdzové riešenia"
+msgid "Windows with fixed viewport"
+msgstr ""
 
 #: ../plugins/place/place.xml.in.h:37
-msgid "X Positions"
-msgstr "Pozície X"
+msgid "Viewport positioned windows"
+msgstr "Okná umiestnené v pohľadoch"
 
 #: ../plugins/place/place.xml.in.h:38
-msgid "X Viewport Positions"
-msgstr "Pozície plochy na osi X"
+msgid "Windows that should be positioned in specific viewports by default"
+msgstr "Okná, ktoré by mali byť štandardne umiestnené na konkrétnu plochu"
 
 #: ../plugins/place/place.xml.in.h:39
-msgid "X position values"
-msgstr "Hodnoty pozíce na osi X"
+msgid "X Viewport Positions"
+msgstr "Pozície plochy na osi X"
 
 #: ../plugins/place/place.xml.in.h:40
-msgid "Y Positions"
-msgstr "Pozície Y"
+msgid "Horizontal viewport positions"
+msgstr "Vodorovné pozície pohľadov"
 
 #: ../plugins/place/place.xml.in.h:41
 msgid "Y Viewport Positions"
 msgstr "Pozície plochy na osi Y"
 
 #: ../plugins/place/place.xml.in.h:42
-msgid "Y position values"
-msgstr "Hodnoty pozíce na osi Y"
+msgid "Vertical viewport positions"
+msgstr "Zvislé pozície pohľadov"
 
 #: ../plugins/regex/regex.xml.in.h:1
 msgid "Regex Matching"
@@ -1824,130 +1824,130 @@
 msgstr "Zodpovedajúce regulárne výrazy okna"
 
 #: ../plugins/resize/resize.xml.in.h:1
-msgid "Additional Modifier Keys"
-msgstr ""
+msgid "Resize Window"
+msgstr "Zmeniť veľkosť okna"
 
 #: ../plugins/resize/resize.xml.in.h:2
-msgid "Alt"
-msgstr ""
+msgid "Resize window"
+msgstr "Zmeniť veľkosť okna"
 
-#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:5
-#: ../plugins/switcher/switcher.xml.in.h:6
+#: ../plugins/resize/resize.xml.in.h:3 ../plugins/scale/scale.xml.in.h:30
+#: ../plugins/switcher/switcher.xml.in.h:2
 msgid "Bindings"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:4
-msgid "Border Color"
-msgstr "Farba ohraničenia"
+msgid "Initiate Window Resize"
+msgstr "Začať zmenu veľkosti okna"
 
 #: ../plugins/resize/resize.xml.in.h:5
-msgid "Border color used for outline and rectangle resize modes"
-msgstr ""
-"Farba okraja, ktorý sa použije pri režimoch obrysov a zmeny veľkosti "
-"obdĺžnikom"
+msgid "Start resizing window"
+msgstr "Začať zmenu veľkosti okna"
 
 #: ../plugins/resize/resize.xml.in.h:6
-msgid "Centered Modifier"
-msgstr ""
-
-#: ../plugins/resize/resize.xml.in.h:7
-msgid "Control"
-msgstr ""
-
-#: ../plugins/resize/resize.xml.in.h:8
 msgid "Default Resize Mode"
 msgstr "Štandardný režim zmeny veľkosti"
 
-#: ../plugins/resize/resize.xml.in.h:9
+#: ../plugins/resize/resize.xml.in.h:7
 msgid "Default mode used for window resizing"
 msgstr "Štandardný režim použitý pre zmenu veľkosti okna"
 
+#: ../plugins/resize/resize.xml.in.h:9
+msgid "Outline"
+msgstr "Obrys"
+
 #: ../plugins/resize/resize.xml.in.h:10
-msgid "Fill Color"
-msgstr "Farba výplne"
+msgid "Rectangle"
+msgstr "Obdĺžnik"
 
 #: ../plugins/resize/resize.xml.in.h:11
-msgid "Fill color used for rectangle resize mode"
-msgstr "Farba výplne použitá pre pravouhlú zmenu veľkosti"
+msgid "Stretch"
+msgstr "Roztiahnutie"
 
 #: ../plugins/resize/resize.xml.in.h:12
-msgid "Initiate Window Resize"
-msgstr "Začať zmenu veľkosti okna"
+msgid "Border Color"
+msgstr "Farba ohraničenia"
 
 #: ../plugins/resize/resize.xml.in.h:13
-msgid "Meta"
+msgid "Border color used for outline and rectangle resize modes"
 msgstr ""
+"Farba okraja, ktorý sa použije pri režimoch obrysov a zmeny veľkosti "
+"obdĺžnikom"
+
+#: ../plugins/resize/resize.xml.in.h:14
+msgid "Fill Color"
+msgstr "Farba výplne"
 
 #: ../plugins/resize/resize.xml.in.h:15
-msgid "Normal Resize Windows"
-msgstr "Normálna veľkosť okien"
+msgid "Fill color used for rectangle resize mode"
+msgstr "Farba výplne použitá pre pravouhlú zmenu veľkosti"
 
 #: ../plugins/resize/resize.xml.in.h:16
-msgid "Outline"
-msgstr "Obrys"
+msgid "Specific Window Matches"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:17
-msgid "Outline Modifier"
-msgstr ""
+msgid "Normal Resize Windows"
+msgstr "Normálna veľkosť okien"
 
 #: ../plugins/resize/resize.xml.in.h:18
-msgid "Outline Resize Windows"
-msgstr "Obrysová zmena veľkosti okien"
+msgid "Windows that normal resize should be used for"
+msgstr "Okná, pre ktoré bude použitá normálna zmena veľkosti"
 
 #: ../plugins/resize/resize.xml.in.h:19
-msgid "Rectangle"
-msgstr "Obdĺžnik"
+msgid "Outline Resize Windows"
+msgstr "Obrysová zmena veľkosti okien"
 
 #: ../plugins/resize/resize.xml.in.h:20
-msgid "Rectangle Modifier"
-msgstr ""
+msgid "Windows that outline resize should be used for"
+msgstr "Okná, pre ktoré bude použitá zmena veľkosti s efektom obrysu"
 
 #: ../plugins/resize/resize.xml.in.h:21
 msgid "Rectangle Resize Windows"
 msgstr "Pravouhlá zmena veľkosti okien"
 
 #: ../plugins/resize/resize.xml.in.h:22
-msgid "Resize Window"
-msgstr "Zmeniť veľkosť okna"
+msgid "Windows that rectangle resize should be used for"
+msgstr "Okná, pre ktoré bude použitá zmena veľkosti s efektom obdĺžnika"
 
 #: ../plugins/resize/resize.xml.in.h:23
-msgid "Resize window"
-msgstr "Zmeniť veľkosť okna"
+msgid "Stretch Resize Windows"
+msgstr "Zmena veľkosti okien roztiahnutím"
 
 #: ../plugins/resize/resize.xml.in.h:24
-msgid "Shift"
-msgstr ""
+msgid "Windows that stretch resize should be used for"
+msgstr "Okná, pre ktoré bude použitá zmena veľkosti s efektom roztiahnutia"
 
 #: ../plugins/resize/resize.xml.in.h:25
-msgid "Specific Window Matches"
+msgid "Additional Modifier Keys"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:26
-msgid "Start resizing window"
-msgstr "Začať zmenu veľkosti okna"
+msgid "Outline Modifier"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:27
-msgid "Stretch"
-msgstr "Roztiahnutie"
+msgid "Use these bindings to resize with an outline."
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:28
-msgid "Stretch Modifier"
+msgid "Shift"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:29
-msgid "Stretch Resize Windows"
-msgstr "Zmena veľkosti okien roztiahnutím"
+msgid "Alt"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:30
-msgid "Use these bindings to resize by stretching."
+msgid "Control"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:31
-msgid "Use these bindings to resize from the center."
+msgid "Meta"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:32
-msgid "Use these bindings to resize with an outline."
+msgid "Rectangle Modifier"
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:33
@@ -1955,473 +1955,427 @@
 msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:34
-msgid "Windows that normal resize should be used for"
-msgstr "Okná, pre ktoré bude použitá normálna zmena veľkosti"
+msgid "Stretch Modifier"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:35
-msgid "Windows that outline resize should be used for"
-msgstr "Okná, pre ktoré bude použitá zmena veľkosti s efektom obrysu"
+msgid "Use these bindings to resize by stretching."
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:36
-msgid "Windows that rectangle resize should be used for"
-msgstr "Okná, pre ktoré bude použitá zmena veľkosti s efektom obdĺžnika"
+msgid "Centered Modifier"
+msgstr ""
 
 #: ../plugins/resize/resize.xml.in.h:37
-msgid "Windows that stretch resize should be used for"
-msgstr "Okná, pre ktoré bude použitá zmena veľkosti s efektom roztiahnutia"
+msgid "Use these bindings to resize from the center."
+msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:1 ../plugins/switcher/switcher.xml.in.h:2
-msgid "Amount of opacity in percent"
-msgstr "Miera nepriehľadnosti v percentách"
+#: ../plugins/scale/scale.xml.in.h:1
+msgid "Scale"
+msgstr "Zmena mierky"
 
 #: ../plugins/scale/scale.xml.in.h:2
-msgid "Appearance"
-msgstr ""
+msgid "Scale windows"
+msgstr "Meniť mierku okien"
 
 #: ../plugins/scale/scale.xml.in.h:3
-msgid "Behaviour"
+msgid "Appearance"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:4
-msgid "Big"
-msgstr "Veľký"
+msgid "Spacing"
+msgstr "Vzdialenosť"
 
-#: ../plugins/scale/scale.xml.in.h:6
-msgid "Button Bindings Toggle Scale Mode"
-msgstr ""
+#: ../plugins/scale/scale.xml.in.h:5
+msgid "Space between windows"
+msgstr "Medzera medzi oknami"
+
+#: ../plugins/scale/scale.xml.in.h:6 ../plugins/switcher/switcher.xml.in.h:19
+msgid "Speed"
+msgstr "Rýchlosť"
 
 #: ../plugins/scale/scale.xml.in.h:7
-msgid ""
-"Button bindings toggle scale mode instead of enabling it when pressed and "
-"disabling it when released."
-msgstr ""
+msgid "Scale speed"
+msgstr "Rýchlosť zmeny mierky"
 
-#: ../plugins/scale/scale.xml.in.h:8
-msgid "Click Desktop to Show Desktop"
-msgstr "Zobraziť pracovnú plochu kliknutím na plochu"
+#: ../plugins/scale/scale.xml.in.h:8 ../plugins/switcher/switcher.xml.in.h:21
+msgid "Timestep"
+msgstr "Krok"
 
 #: ../plugins/scale/scale.xml.in.h:9
+msgid "Scale timestep"
+msgstr "Časový krok zmeny mierky"
+
+#: ../plugins/scale/scale.xml.in.h:10
 msgid "Darken Background"
 msgstr "Stmaviť pozadie"
 
-#: ../plugins/scale/scale.xml.in.h:10
+#: ../plugins/scale/scale.xml.in.h:11
 msgid "Darken background when scaling windows"
 msgstr "Stmaviť pozadie pri vykreslovaní okien"
 
-#: ../plugins/scale/scale.xml.in.h:11
-msgid "Drag and Drop Distance"
-msgstr ""
-
-#: ../plugins/scale/scale.xml.in.h:12
-msgid "Drag and Drop Hover Timeout"
-msgstr ""
-
-#: ../plugins/scale/scale.xml.in.h:13
-msgid "Emblem"
-msgstr "Emblém"
+#: ../plugins/scale/scale.xml.in.h:13 ../plugins/switcher/switcher.xml.in.h:32
+msgid "Amount of opacity in percent"
+msgstr "Miera nepriehľadnosti v percentách"
 
 #: ../plugins/scale/scale.xml.in.h:14
-msgid "Enter Show Desktop mode when Desktop is clicked during Scale"
-msgstr ""
-"Vstúpiť do režimu Zobraziť plochu, keď sa na plochu klikne počas zmeny mierky"
+msgid "Overlay Icon"
+msgstr "Prekladať ikonou"
 
 #: ../plugins/scale/scale.xml.in.h:15
-msgid "Initiate Window Picker"
-msgstr "Začať výber okna"
+msgid "Overlay an icon on windows once they are scaled"
+msgstr "Pri zmene veľkosti okien prekladať okná ikonou"
 
 #: ../plugins/scale/scale.xml.in.h:16
-msgid "Initiate Window Picker For All Windows"
-msgstr "Začať výber okna pre všetky okná"
-
+msgid "None"
+msgstr "Žiadna"
+
 #: ../plugins/scale/scale.xml.in.h:17
-msgid "Initiate Window Picker For Window Group"
-msgstr "Začať výber okna pre skupinu okien"
+msgid "Emblem"
+msgstr "Emblém"
 
 #: ../plugins/scale/scale.xml.in.h:18
-msgid "Initiate Window Picker For Windows on Current Output"
-msgstr "Spustiť vyberanie okien na štandardnom výstupe"
+msgid "Big"
+msgstr "Veľký"
 
 #: ../plugins/scale/scale.xml.in.h:19
-msgid "Key Bindings Toggle Scale Mode"
+msgid "Behaviour"
 msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:20
-msgid ""
-"Key bindings toggle scale mode instead of enabling it when pressed and "
-"disabling it when released."
-msgstr ""
+msgid "Scale Windows"
+msgstr "Zmena mierky okna"
 
 #: ../plugins/scale/scale.xml.in.h:21
-msgid "Layout and start transforming all windows"
-msgstr "Rozložiť a začať transformáciu všetkých okien"
+msgid "Windows that should be scaled in scale mode"
+msgstr "Okná, ktoré majú meniť veľkosť v režime zmeny mierky"
 
 #: ../plugins/scale/scale.xml.in.h:22
-msgid "Layout and start transforming window group"
-msgstr "Rozložiť a začať transformáciu skupiny okien"
+msgid "Drag and Drop Hover Timeout"
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:23
-msgid "Layout and start transforming windows"
-msgstr "Rozmiestnenie a začiatok transformácie okien"
+msgid ""
+"Time (in ms) before scale mode is terminated when hovering over a window "
+"dragging and dropping an item"
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:24
-msgid "Layout and start transforming windows on current output"
-msgstr "Rozmiestnenie a začiatok transformácie okien na aktuálnom výstupe"
+msgid "Drag and Drop Distance"
+msgstr ""
 
-#: ../plugins/scale/scale.xml.in.h:26
-msgid "None"
-msgstr "Žiadna"
+#: ../plugins/scale/scale.xml.in.h:25
+msgid "The minimum distance (in px) beyond which the timeout is reset."
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:27
-msgid "On all output devices"
-msgstr "Na všetkých výstupných zariadeniach"
+msgid "Selects where windows are scaled if multiple output devices are used."
+msgstr "Či sa mení veľkosť okien pri použití viacerých výstupných zariadení."
 
 #: ../plugins/scale/scale.xml.in.h:28
 msgid "On current output device"
 msgstr "Na aktuálnom výstupnom zariadení"
 
-#: ../plugins/scale/scale.xml.in.h:30
-msgid "Overlay Icon"
-msgstr "Prekladať ikonou"
+#: ../plugins/scale/scale.xml.in.h:29
+msgid "On all output devices"
+msgstr "Na všetkých výstupných zariadeniach"
 
 #: ../plugins/scale/scale.xml.in.h:31
-msgid "Overlay an icon on windows once they are scaled"
-msgstr "Pri zmene veľkosti okien prekladať okná ikonou"
+msgid "Key Bindings Toggle Scale Mode"
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:32
-msgid "Scale"
-msgstr "Zmena mierky"
+msgid ""
+"Key bindings toggle scale mode instead of enabling it when pressed and "
+"disabling it when released."
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:33
-msgid "Scale Windows"
-msgstr "Zmena mierky okna"
+msgid "Button Bindings Toggle Scale Mode"
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:34
-msgid "Scale speed"
-msgstr "Rýchlosť zmeny mierky"
+msgid ""
+"Button bindings toggle scale mode instead of enabling it when pressed and "
+"disabling it when released."
+msgstr ""
 
 #: ../plugins/scale/scale.xml.in.h:35
-msgid "Scale timestep"
-msgstr "Časový krok zmeny mierky"
+msgid "Initiate Window Picker"
+msgstr "Začať výber okna"
 
 #: ../plugins/scale/scale.xml.in.h:36
-msgid "Scale windows"
-msgstr "Meniť mierku okien"
+msgid "Layout and start transforming windows"
+msgstr "Rozmiestnenie a začiatok transformácie okien"
 
 #: ../plugins/scale/scale.xml.in.h:37
-msgid "Selects where windows are scaled if multiple output devices are used."
-msgstr "Či sa mení veľkosť okien pri použití viacerých výstupných zariadení."
+msgid "Initiate Window Picker For All Windows"
+msgstr "Začať výber okna pre všetky okná"
 
 #: ../plugins/scale/scale.xml.in.h:38
-msgid "Space between windows"
-msgstr "Medzera medzi oknami"
+msgid "Layout and start transforming all windows"
+msgstr "Rozložiť a začať transformáciu všetkých okien"
 
 #: ../plugins/scale/scale.xml.in.h:39
-msgid "Spacing"
-msgstr "Vzdialenosť"
+msgid "Initiate Window Picker For Window Group"
+msgstr "Začať výber okna pre skupinu okien"
 
-#: ../plugins/scale/scale.xml.in.h:40 ../plugins/switcher/switcher.xml.in.h:40
-#: ../plugins/zoom/zoom.xml.in.h:3
-msgid "Speed"
-msgstr "Rýchlosť"
+#: ../plugins/scale/scale.xml.in.h:40
+msgid "Layout and start transforming window group"
+msgstr "Rozložiť a začať transformáciu skupiny okien"
 
 #: ../plugins/scale/scale.xml.in.h:41
-msgid "The minimum distance (in px) beyond which the timeout is reset."
-msgstr ""
+msgid "Initiate Window Picker For Windows on Current Output"
+msgstr "Spustiť vyberanie okien na štandardnom výstupe"
 
 #: ../plugins/scale/scale.xml.in.h:42
-msgid ""
-"Time (in ms) before scale mode is terminated when hovering over a window "
-"dragging and dropping an item"
-msgstr ""
+msgid "Layout and start transforming windows on current output"
+msgstr "Rozmiestnenie a začiatok transformácie okien na aktuálnom výstupe"
 
-#: ../plugins/scale/scale.xml.in.h:43 ../plugins/switcher/switcher.xml.in.h:44
-#: ../plugins/zoom/zoom.xml.in.h:4
-msgid "Timestep"
-msgstr "Krok"
+#: ../plugins/scale/scale.xml.in.h:43
+msgid "Click Desktop to Show Desktop"
+msgstr "Zobraziť pracovnú plochu kliknutím na plochu"
 
 #: ../plugins/scale/scale.xml.in.h:44
-msgid "Windows that should be scaled in scale mode"
-msgstr "Okná, ktoré majú meniť veľkosť v režime zmeny mierky"
+msgid "Enter Show Desktop mode when Desktop is clicked during Scale"
+msgstr ""
+"Vstúpiť do režimu Zobraziť plochu, keď sa na plochu klikne počas zmeny mierky"
 
 #: ../plugins/switcher/switcher.xml.in.h:1
-msgid "Amount of brightness in percent"
-msgstr "Hodnota jasu v percentách"
+msgid "Application Switcher"
+msgstr "Prepínač aplikácií"
 
 #: ../plugins/switcher/switcher.xml.in.h:3
-msgid "Amount of saturation in percent"
-msgstr "Hodnota sýtosti v percentách"
+msgid "Next window"
+msgstr "Nasledujúce okno"
 
 #: ../plugins/switcher/switcher.xml.in.h:4
-msgid "Application Switcher"
-msgstr "Prepínač aplikácií"
+msgid "Popup switcher if not visible and select next window"
+msgstr "Zobraziť prepínač ak nie je viditeľný a vybrať ďalšie okno"
 
 #: ../plugins/switcher/switcher.xml.in.h:5
-msgid "Auto Rotate"
-msgstr "Automatické otáčanie"
+msgid "Prev window"
+msgstr "Predchádzajúce okno"
+
+#: ../plugins/switcher/switcher.xml.in.h:6
+msgid "Popup switcher if not visible and select previous window"
+msgstr "Zobraziť prepínač ak nie je viditeľný a vybrať predchádzajúce okno"
 
 #: ../plugins/switcher/switcher.xml.in.h:7
-msgid "Brightness"
-msgstr "Jas"
+msgid "Next window (All windows)"
+msgstr "Nasledujúce okno (všetky okná)"
 
 #: ../plugins/switcher/switcher.xml.in.h:8
-msgid "Bring To Front"
-msgstr "Preniesť do popredia"
+msgid ""
+"Popup switcher if not visible and select next window out of all windows"
+msgstr ""
+"Zobraziť prepínač ak nie je viditeľný a vybrať ďalšie okno spomedzi všetkých "
+"okien"
 
 #: ../plugins/switcher/switcher.xml.in.h:9
-msgid "Bring selected window to front"
-msgstr "Preniesť vybrané okno do popredia"
+msgid "Prev window (All windows)"
+msgstr "Predchádzajúce okno (všetky okná)"
 
 #: ../plugins/switcher/switcher.xml.in.h:10
-msgid "Distance desktop should be zoom out while switching windows"
+msgid ""
+"Popup switcher if not visible and select previous window out of all windows"
 msgstr ""
-"Vzdialenosť, na ktorú by sa mala plocha oddialiť počas prepínania okien"
+"Zobraziť prepínač ak nie je viditeľný a vybrať predchádzajúce okno zo "
+"všetkých okien"
 
 #: ../plugins/switcher/switcher.xml.in.h:11
-msgid "Focus on Switch"
-msgstr ""
+msgid "Next window (No popup)"
+msgstr "Nasledujúce okno (žiadne vyskakovacie okno)"
 
 #: ../plugins/switcher/switcher.xml.in.h:12
-msgid "Focus windows when they are visible during the switch"
-msgstr ""
+msgid "Select next window without showing the popup window."
+msgstr "Vybrať ďalšie okno bez ukázania vyskakovacieho okna"
 
 #: ../plugins/switcher/switcher.xml.in.h:13
-msgid "Generate mipmaps when possible for higher quality scaling"
-msgstr "Ak je to možné, vytvárať pre vysoko kvalitné modelovanie mipmapy"
+msgid "Prev window (No popup)"
+msgstr "Predchádzajúce okno (žiadne vyskakovacie okno)"
 
 #: ../plugins/switcher/switcher.xml.in.h:14
-msgid "Icon"
-msgstr "Ikona"
+msgid "Select previous window without showing the popup window."
+msgstr "Vybrať predchádzajúce okno bez ukázania vyskakovacieho okna"
 
 #: ../plugins/switcher/switcher.xml.in.h:15
-msgid "Minimized"
-msgstr "Minimalizované"
-
-#: ../plugins/switcher/switcher.xml.in.h:17
 msgid "Next Panel"
 msgstr "Nasledujúca výplň"
 
-#: ../plugins/switcher/switcher.xml.in.h:18
-msgid "Next window"
-msgstr "Nasledujúce okno"
+#: ../plugins/switcher/switcher.xml.in.h:16
+msgid "Select next panel type window."
+msgstr "Označ nasledujúci typ výplne okna"
 
-#: ../plugins/switcher/switcher.xml.in.h:19
-msgid "Next window (All windows)"
-msgstr "Nasledujúce okno (všetky okná)"
+#: ../plugins/switcher/switcher.xml.in.h:17
+msgid "Prev Panel"
+msgstr "Predchádzajúca výplň"
 
-#: ../plugins/switcher/switcher.xml.in.h:20
-msgid "Next window (No popup)"
-msgstr "Nasledujúce okno (žiadne vyskakovacie okno)"
+#: ../plugins/switcher/switcher.xml.in.h:18
+msgid "Select previous panel type window."
+msgstr "Vybrať predchádzajúci typ výplne okna"
 
-#: ../plugins/switcher/switcher.xml.in.h:21
-msgid "Only show icon"
-msgstr ""
+#: ../plugins/switcher/switcher.xml.in.h:20
+msgid "Switcher speed"
+msgstr "Rýchlosť prepínača"
 
 #: ../plugins/switcher/switcher.xml.in.h:22
-msgid "Only show the window icon and do not display a thumbnail at all"
-msgstr ""
+msgid "Switcher timestep"
+msgstr "Časový krok prepínača"
 
-#: ../plugins/switcher/switcher.xml.in.h:24
-msgid "Popup switcher if not visible and select next window"
-msgstr "Zobraziť prepínač ak nie je viditeľný a vybrať ďalšie okno"
+#: ../plugins/switcher/switcher.xml.in.h:23
+msgid "Switcher windows"
+msgstr "Okná prepínača"
 
-#: ../plugins/switcher/switcher.xml.in.h:25
-msgid ""
-"Popup switcher if not visible and select next window out of all windows"
-msgstr ""
-"Zobraziť prepínač ak nie je viditeľný a vybrať ďalšie okno spomedzi všetkých "
-"okien"
+#: ../plugins/switcher/switcher.xml.in.h:24
+msgid "Windows that should be shown in switcher"
+msgstr "Okná, ktoré budú zobrazené v prepínači"
 
 #: ../plugins/switcher/switcher.xml.in.h:26
-msgid "Popup switcher if not visible and select previous window"
-msgstr "Zobraziť prepínač ak nie je viditeľný a vybrať predchádzajúce okno"
+msgid "Generate mipmaps when possible for higher quality scaling"
+msgstr "Ak je to možné, vytvárať pre vysoko kvalitné modelovanie mipmapy"
 
 #: ../plugins/switcher/switcher.xml.in.h:27
-msgid ""
-"Popup switcher if not visible and select previous window out of all windows"
-msgstr ""
-"Zobraziť prepínač ak nie je viditeľný a vybrať predchádzajúce okno zo "
-"všetkých okien"
+msgid "Saturation"
+msgstr "Sýtosť"
 
 #: ../plugins/switcher/switcher.xml.in.h:28
-msgid "Prev Panel"
-msgstr "Predchádzajúca výplň"
+msgid "Amount of saturation in percent"
+msgstr "Hodnota sýtosti v percentách"
 
 #: ../plugins/switcher/switcher.xml.in.h:29
-msgid "Prev window"
-msgstr "Predchádzajúce okno"
+msgid "Brightness"
+msgstr "Jas"
 
 #: ../plugins/switcher/switcher.xml.in.h:30
-msgid "Prev window (All windows)"
-msgstr "Predchádzajúce okno (všetky okná)"
-
-#: ../plugins/switcher/switcher.xml.in.h:31
-msgid "Prev window (No popup)"
-msgstr "Predchádzajúce okno (žiadne vyskakovacie okno)"
-
-#: ../plugins/switcher/switcher.xml.in.h:32
-msgid "Rotate to the selected window while switching"
-msgstr "Otočiť na vybrané okno pri prepínaní"
+msgid "Amount of brightness in percent"
+msgstr "Hodnota jasu v percentách"
 
 #: ../plugins/switcher/switcher.xml.in.h:33
-msgid "Saturation"
-msgstr "Sýtosť"
+msgid "Focus on Switch"
+msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:34
-msgid "Select next panel type window."
-msgstr "Označ nasledujúci typ výplne okna"
+msgid "Focus windows when they are visible during the switch"
+msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:35
-msgid "Select next window without showing the popup window."
-msgstr "Vybrať ďalšie okno bez ukázania vyskakovacieho okna"
+msgid "Bring To Front"
+msgstr "Preniesť do popredia"
 
 #: ../plugins/switcher/switcher.xml.in.h:36
-msgid "Select previous panel type window."
-msgstr "Vybrať predchádzajúci typ výplne okna"
+msgid "Bring selected window to front"
+msgstr "Preniesť vybrané okno do popredia"
 
 #: ../plugins/switcher/switcher.xml.in.h:37
-msgid "Select previous window without showing the popup window."
-msgstr "Vybrať predchádzajúce okno bez ukázania vyskakovacieho okna"
+msgid "Zoom"
+msgstr "Priblíženie"
 
 #: ../plugins/switcher/switcher.xml.in.h:38
-msgid "Show icon next to thumbnail"
-msgstr "Ukázať ikonu vedľa náhľadu"
+msgid "Distance desktop should be zoom out while switching windows"
+msgstr ""
+"Vzdialenosť, na ktorú by sa mala plocha oddialiť počas prepínania okien"
 
 #: ../plugins/switcher/switcher.xml.in.h:39
-msgid "Show minimized windows"
-msgstr "Zobraziť minimalizované okná"
+msgid "Icon"
+msgstr "Ikona"
+
+#: ../plugins/switcher/switcher.xml.in.h:40
+msgid "Show icon next to thumbnail"
+msgstr "Ukázať ikonu vedľa náhľadu"
 
 #: ../plugins/switcher/switcher.xml.in.h:41
-msgid "Switcher speed"
-msgstr "Rýchlosť prepínača"
+msgid "Only show icon"
+msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:42
-msgid "Switcher timestep"
-msgstr "Časový krok prepínača"
+msgid "Only show the window icon and do not display a thumbnail at all"
+msgstr ""
 
 #: ../plugins/switcher/switcher.xml.in.h:43
-msgid "Switcher windows"
-msgstr "Okná prepínača"
+msgid "Minimized"
+msgstr "Minimalizované"
+
+#: ../plugins/switcher/switcher.xml.in.h:44
+msgid "Show minimized windows"
+msgstr "Zobraziť minimalizované okná"
 
 #: ../plugins/switcher/switcher.xml.in.h:45
-msgid "Windows that should be shown in switcher"
-msgstr "Okná, ktoré budú zobrazené v prepínači"
+msgid "Auto Rotate"
+msgstr "Automatické otáčanie"
 
 #: ../plugins/switcher/switcher.xml.in.h:46
-msgid "Zoom"
-msgstr "Priblíženie"
+msgid "Rotate to the selected window while switching"
+msgstr "Otočiť na vybrané okno pri prepínaní"
 
 #: ../plugins/water/water.xml.in.h:1
-msgid "Add line"
-msgstr "Pridať čiaru"
+msgid "Water Effect"
+msgstr "Efekt vody"
 
 #: ../plugins/water/water.xml.in.h:2
-msgid "Add point"
-msgstr "Pridať bod"
-
-#: ../plugins/water/water.xml.in.h:3
 msgid "Adds water effects to different desktop actions"
 msgstr "Do rôznych akcií plochy pridávať efekt vody"
 
-#: ../plugins/water/water.xml.in.h:4
-msgid "Delay (in ms) between each rain-drop"
-msgstr "Oneskorenie (v ms) medzi jednotlivými kvapkami"
+#: ../plugins/water/water.xml.in.h:3
+msgid "Initiate"
+msgstr "Začať"
 
-#: ../plugins/water/water.xml.in.h:5
+#: ../plugins/water/water.xml.in.h:4
 msgid "Enable pointer water effects"
 msgstr "Povoliť vodné efekty ukazateľa"
 
-#: ../plugins/water/water.xml.in.h:6 ../plugins/zoom/zoom.xml.in.h:2
-msgid "Initiate"
-msgstr "Začať"
+#: ../plugins/water/water.xml.in.h:5
+msgid "Toggle rain"
+msgstr "Prepnúť dážď"
+
+#: ../plugins/water/water.xml.in.h:6
+msgid "Toggle rain effect"
+msgstr "Prepnúť efekt dažďa"
 
 #: ../plugins/water/water.xml.in.h:7
-msgid "Line"
-msgstr "Čiara"
+msgid "Toggle wiper"
+msgstr "Prepnúť stierač"
 
 #: ../plugins/water/water.xml.in.h:8
-msgid "Offset Scale"
-msgstr "Mierka posunutia"
+msgid "Toggle wiper effect"
+msgstr "Prepnúť efekt stierača"
 
 #: ../plugins/water/water.xml.in.h:9
-msgid "Point"
-msgstr "Bod"
+msgid "Offset Scale"
+msgstr "Mierka posunutia"
 
 #: ../plugins/water/water.xml.in.h:10
-msgid "Rain Delay"
-msgstr "Oneskorenie dažďa"
+msgid "Water offset scale"
+msgstr "Mierka posunutia vody"
 
 #: ../plugins/water/water.xml.in.h:11
-msgid "Title wave"
-msgstr "Vlna v nadpise"
+msgid "Rain Delay"
+msgstr "Oneskorenie dažďa"
 
 #: ../plugins/water/water.xml.in.h:12
-msgid "Toggle rain"
-msgstr "Prepnúť dážď"
+msgid "Delay (in ms) between each rain-drop"
+msgstr "Oneskorenie (v ms) medzi jednotlivými kvapkami"
 
 #: ../plugins/water/water.xml.in.h:13
-msgid "Toggle rain effect"
-msgstr "Prepnúť efekt dažďa"
+msgid "Title wave"
+msgstr "Vlna v nadpise"
 
 #: ../plugins/water/water.xml.in.h:14
-msgid "Toggle wiper"
-msgstr "Prepnúť stierač"
+msgid "Wave effect from window title"
+msgstr "Efekt vlny v nadpise okna"
 
 #: ../plugins/water/water.xml.in.h:15
-msgid "Toggle wiper effect"
-msgstr "Prepnúť efekt stierača"
+msgid "Point"
+msgstr "Bod"
 
 #: ../plugins/water/water.xml.in.h:16
-msgid "Water Effect"
-msgstr "Efekt vody"
+msgid "Add point"
+msgstr "Pridať bod"
 
 #: ../plugins/water/water.xml.in.h:17
-msgid "Water offset scale"
-msgstr "Mierka posunutia vody"
+msgid "Line"
+msgstr "Čiara"
 
 #: ../plugins/water/water.xml.in.h:18
-msgid "Wave effect from window title"
-msgstr "Efekt vlny v nadpise okna"
-
-#: ../plugins/zoom/zoom.xml.in.h:1
-msgid "Filter Linear"
-msgstr "Lineárny filter"
-
-#: ../plugins/zoom/zoom.xml.in.h:5
-msgid "Use linear filter when zoomed in"
-msgstr "Pri priblížení použiť lineárny filter"
-
-#: ../plugins/zoom/zoom.xml.in.h:6
-msgid "Zoom Desktop"
-msgstr "Priblížiť plochu"
-
-#: ../plugins/zoom/zoom.xml.in.h:7
-msgid "Zoom In"
-msgstr "Priblížiť"
-
-#: ../plugins/zoom/zoom.xml.in.h:8
-msgid "Zoom Out"
-msgstr "Oddialiť"
-
-#: ../plugins/zoom/zoom.xml.in.h:9
-msgid "Zoom Pan"
-msgstr "Posúvanie priblíženia"
-
-#: ../plugins/zoom/zoom.xml.in.h:10
-msgid "Zoom Speed"
-msgstr "Rýchlosť priblíženia"
-
-#: ../plugins/zoom/zoom.xml.in.h:11
-msgid "Zoom Timestep"
-msgstr "Časový krok priblíženia"
-
-#: ../plugins/zoom/zoom.xml.in.h:12
-msgid "Zoom and pan desktop cube"
-msgstr "Priblížiť a posúvať kocku plochy"
-
-#: ../plugins/zoom/zoom.xml.in.h:13
-msgid "Zoom factor"
-msgstr "Pomer zväčšenia"
-
-#: ../plugins/zoom/zoom.xml.in.h:14
-msgid "Zoom pan"
-msgstr "Posúvanie priblíženia"
+msgid "Add line"
+msgstr "Pridať čiaru"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/coreutils.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/coreutils.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/coreutils.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/coreutils.po	2012-02-23 06:55:27.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:35+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/cracklib.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/cracklib.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/cracklib.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/cracklib.po	2012-02-23 06:55:27.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/fascist.c:550
 msgid "you are not registered in the password file"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/cryptsetup.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/cryptsetup.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/cryptsetup.po	2012-01-02 17:50:47.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/cryptsetup.po	2012-02-23 06:55:36.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:14+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/libdevmapper.c:120
 msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dctrl-tools.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dctrl-tools.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dctrl-tools.po	2012-01-02 17:51:04.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dctrl-tools.po	2012-02-23 06:55:50.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/ifile.c:54
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/debconf.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/debconf.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/debconf.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/debconf.po	2012-02-23 06:55:27.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: debconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-30 12:23-0400\n"
+"POT-Creation-Date: 2012-02-10 22:59+0000\n"
 "PO-Revision-Date: 2010-12-09 22:10+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: ../Debconf/AutoSelect.pm:76
@@ -214,7 +214,7 @@
 "uložte ho a ukončite editor. V tejto fáze si debconf načíta upravený súubor "
 "a použije zadané hodnoty pre nastavenie systému."
 
-#: ../Debconf/FrontEnd/Gnome.pm:97 ../Debconf/FrontEnd/Kde.pm:100
+#: ../Debconf/FrontEnd/Gnome.pm:144 ../Debconf/FrontEnd/Kde.pm:100
 #: ../Debconf/FrontEnd/Kde.pm:104
 #, perl-format
 msgid "Debconf on %s"
@@ -279,52 +279,52 @@
 msgid "Template #%s in %s does not contain a 'Template:' line\n"
 msgstr "Šablóna č.%s v %s neobsahuje riadok „Template:“\n"
 
-#: ../dpkg-preconfigure:121
+#: ../dpkg-preconfigure:125
 #, perl-format
 msgid "must specify some debs to preconfigure"
 msgstr "musíte zadať nejaké balíky na predbežné nastavenie"
 
-#: ../dpkg-preconfigure:126
+#: ../dpkg-preconfigure:130
 msgid "delaying package configuration, since apt-utils is not installed"
 msgstr ""
 "nastavenie balíkov sa odkladá, pretože nie sú nainštalované nástroje apt-"
 "utils"
 
-#: ../dpkg-preconfigure:133
+#: ../dpkg-preconfigure:137
 #, perl-format
 msgid "unable to re-open stdin: %s"
 msgstr "nedá sa znovu otvoriť štandardný vstup: %s"
 
-#: ../dpkg-preconfigure:164 ../dpkg-preconfigure:176
+#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180
 #, perl-format
 msgid "apt-extracttemplates failed: %s"
 msgstr "apt-extracttemplates zlyhalo: %s"
 
-#: ../dpkg-preconfigure:168 ../dpkg-preconfigure:180
+#: ../dpkg-preconfigure:172 ../dpkg-preconfigure:184
 #, perl-format
 msgid "Extracting templates from packages: %d%%"
 msgstr "Z balíkov sa vyberajú šablóny: %d%%"
 
-#: ../dpkg-preconfigure:190
+#: ../dpkg-preconfigure:194
 msgid "Preconfiguring packages ...\n"
 msgstr "Pripravuje sa nastavenie balíkov ...\n"
 
-#: ../dpkg-preconfigure:202
+#: ../dpkg-preconfigure:206
 #, perl-format
 msgid "template parse error: %s"
 msgstr "chyba spracovania šablóny: %s"
 
-#: ../dpkg-preconfigure:216
+#: ../dpkg-preconfigure:220
 #, perl-format
 msgid "debconf: can't chmod: %s"
 msgstr "debconf: nedajú sa zmeniť práva: %s"
 
-#: ../dpkg-preconfigure:227
+#: ../dpkg-preconfigure:231
 #, perl-format
 msgid "%s failed to preconfigure, with exit status %s"
 msgstr "%s sa nedá pripraviť na nastavenie, výstupná chyba %s"
 
-#: ../dpkg-reconfigure:103
+#: ../dpkg-reconfigure:107
 msgid ""
 "Usage: dpkg-reconfigure [options] packages\n"
 "  -a,  --all\t\t\tReconfigure all packages.\n"
@@ -341,26 +341,26 @@
 "       --force\t\t\tVynúti rekonfiguráciu poškodených balíkov.       --no-"
 "reload\t\tNenačítavať znovu šablóny. (Používajte opatrne.)"
 
-#: ../dpkg-reconfigure:117
+#: ../dpkg-reconfigure:121
 #, perl-format
 msgid "%s must be run as root"
 msgstr "%s sa musí spustiť s právami root-a"
 
-#: ../dpkg-reconfigure:150
+#: ../dpkg-reconfigure:154
 msgid "please specify a package to reconfigure"
 msgstr "zadajte balík na rekonfiguráciu"
 
-#: ../dpkg-reconfigure:171
+#: ../dpkg-reconfigure:175
 #, perl-format
 msgid "%s is not installed"
 msgstr "%s nie je nainštalovaný"
 
-#: ../dpkg-reconfigure:175
+#: ../dpkg-reconfigure:179
 #, perl-format
 msgid "%s is broken or not fully installed"
 msgstr "%s je poškodený alebo nie je úplne nainštalovaný"
 
-#: ../dpkg-reconfigure:254
+#: ../dpkg-reconfigure:258
 #, perl-format
 msgid "Cannot read status file: %s"
 msgstr "Nedá sa načítať stavový súbor: %s"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/debian-tasks.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/debian-tasks.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/debian-tasks.po	2012-01-02 17:51:00.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/debian-tasks.po	2012-02-23 06:55:47.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: tasksel\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-31 21:35-0300\n"
-"PO-Revision-Date: 2011-08-10 16:46+0000\n"
+"PO-Revision-Date: 2012-01-21 00:58+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #. Description
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dpkg-dev.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dpkg-dev.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dpkg-dev.po	2012-01-02 17:50:38.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dpkg-dev.po	2012-02-23 06:55:27.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:32+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: scripts/dpkg-architecture.pl:36 scripts/dpkg-buildflags.pl:31
 #: scripts/dpkg-buildpackage.pl:37 scripts/dpkg-checkbuilddeps.pl:36
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dpkg.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dpkg.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dpkg.po	2012-01-02 17:50:38.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dpkg.po	2012-02-23 06:55:27.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: lib/dpkg/ar.c:66
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dselect.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dselect.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/dselect.po	2012-01-02 17:50:38.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/dselect.po	2012-02-23 06:55:27.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:41+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: dselect/basecmds.cc:125
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ecryptfs-utils.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ecryptfs-utils.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ecryptfs-utils.po	2012-01-02 17:51:08.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ecryptfs-utils.po	2012-02-23 06:55:54.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ecryptfs-utils\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-14 20:26+0000\n"
+"POT-Creation-Date: 2012-02-17 03:43+0000\n"
 "PO-Revision-Date: 2011-10-02 21:17+0000\n"
 "Last-Translator: Peter Mráz <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:49+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/desktop/ecryptfs-mount-private.desktop.in.h:1
 msgid "Access Your Private Data"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/eject.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/eject.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/eject.po	2012-01-02 17:50:38.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/eject.po	2012-02-23 06:55:27.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:33+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:42+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../eject.c:155
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/example-content.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/example-content.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/example-content.po	2012-01-02 17:51:03.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/example-content.po	2012-02-23 06:55:50.000000000 +0000
@@ -7,20 +7,20 @@
 msgstr ""
 "Project-Id-Version: example-content\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-22 22:50+0000\n"
+"POT-Creation-Date: 2012-01-30 12:22+0000\n"
 "PO-Revision-Date: 2010-09-16 12:50+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:30+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:33+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../data/examples.desktop.in.h:1
-msgid "Example content for Ubuntu"
-msgstr "Ukážkový obsah pre Ubuntu"
-
-#: ../data/examples.desktop.in.h:2
 msgid "Examples"
 msgstr "Príklady"
+
+#: ../data/examples.desktop.in.h:2
+msgid "Example content for Ubuntu"
+msgstr "Ukážkový obsah pre Ubuntu"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/failsafexinit.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/failsafexinit.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/failsafexinit.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/failsafexinit.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-# Slovak translation for xorg
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the xorg package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: xorg\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-04-05 21:41+0000\n"
-"PO-Revision-Date: 2010-09-16 13:16+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: debian/local/Failsafe/failsafeXinit:36
-msgid "Ubuntu Failsafe-X"
-msgstr "Ubuntu záchranné X"
-
-#: debian/local/Failsafe/failsafeXinit:51
-msgid "What would you like to do?"
-msgstr "Čo by ste chceli urobiť?"
-
-#: debian/local/Failsafe/failsafeXinit:52
-#: debian/local/Failsafe/failsafeXinit:71
-#: debian/local/Failsafe/failsafeXinit:84
-msgid "Choice"
-msgstr "Výber"
-
-#: debian/local/Failsafe/failsafeXinit:53
-msgid "Run Ubuntu in low-graphics mode for just one session"
-msgstr "Spustiť Ubuntu v režime s nízkym rozlíšením len na jednu reláciu"
-
-#: debian/local/Failsafe/failsafeXinit:54
-msgid "Reconfigure graphics"
-msgstr "Rekonfigurovať grafiku"
-
-#: debian/local/Failsafe/failsafeXinit:55
-msgid "Troubleshoot the error"
-msgstr "Vyriešiť chybu"
-
-#: debian/local/Failsafe/failsafeXinit:56
-msgid "Exit to console login"
-msgstr "Ukončiť do prihlasovacej konzole"
-
-#: debian/local/Failsafe/failsafeXinit:57
-msgid "Restart X"
-msgstr "Reštartovať X"
-
-#: debian/local/Failsafe/failsafeXinit:68
-msgid "Reconfiguration"
-msgstr "Rekonfigurácia"
-
-#: debian/local/Failsafe/failsafeXinit:69
-msgid "How would you like to reconfigure your display?"
-msgstr "Ako by ste chceli rekonfigurovať vašu obrazovku?"
-
-#: debian/local/Failsafe/failsafeXinit:72
-msgid "Use default (generic) configuration"
-msgstr "Použiť predvolenú (typickú) konfiguráciu"
-
-#: debian/local/Failsafe/failsafeXinit:73
-msgid "Create new configuration for this hardware"
-msgstr "Vytvoriť novú konfiguráciu pre tento hardvér"
-
-#: debian/local/Failsafe/failsafeXinit:74
-msgid "Use your backed-up configuration"
-msgstr "Použiť konfiguráciu zo zálohy"
-
-#: debian/local/Failsafe/failsafeXinit:81
-msgid "Troubleshooting"
-msgstr "Riešenie problémov"
-
-#: debian/local/Failsafe/failsafeXinit:82
-msgid "What information would you like to review?"
-msgstr "Ktoré informácie by ste chceli prekontrolovať?"
-
-#: debian/local/Failsafe/failsafeXinit:85
-msgid "Review the xserver log file"
-msgstr "Prezrieť záznamy X servera"
-
-#: debian/local/Failsafe/failsafeXinit:86
-msgid "Review the startup errors"
-msgstr "Prezrieť chyby pri štarte"
-
-#: debian/local/Failsafe/failsafeXinit:87
-msgid "Edit configuration file"
-msgstr "Upraviť konfiguračný súbor"
-
-#: debian/local/Failsafe/failsafeXinit:88
-msgid "Archive configuration and logs"
-msgstr "Archivovať konfiguráciu a záznamy"
-
-#: debian/local/Failsafe/failsafeXinit:99
-msgid ""
-"A bug report has been written.\\nYou can send it next time you log in."
-msgstr ""
-"Bolo napísané hlásenie chyby.\\nPri ďalšom prihlásení ho môžete odoslať."
-
-#: debian/local/Failsafe/failsafeXinit:101
-msgid "Your bug could not be recorded successfully.\\n"
-msgstr "Vaša chyba nemohla byť úspešne nahratá.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:104
-#, sh-format
-msgid "Cannot file bug:  \\$apport_hook is not present."
-msgstr "Nemožno podať hlásenie o chybe: \\$apport_hook nie je prítomný."
-
-#: debian/local/Failsafe/failsafeXinit:113
-msgid ""
-"Your config could not be backed up.\\nDo you want to continue anyway?\\n"
-msgstr ""
-"Vaša konfigurácia nemohla byť zálohovaná.\\nChcete napriek tomu pokračovať?\\"
-"n"
-
-#: debian/local/Failsafe/failsafeXinit:122
-msgid ""
-"Your configuration has been restored to default,\\nand your old "
-"configuration backed up.\\nPlease restart.\\n"
-msgstr ""
-"Bola obnovená predvolená konfigurácia\\na vaša stará konfigurácia bola "
-"zálohovaná.\\nReštartujte, prosím.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:124
-msgid ""
-"Failure restoring configuration to default.\\nYour config has not been "
-"changed."
-msgstr ""
-"Nepodarilo sa obnoviť predvolenú konfiguráciu.\\nVaša konfigurácia sa "
-"nezmenila."
-
-#: debian/local/Failsafe/failsafeXinit:133
-msgid ""
-"A new configuration has been generated,\\nand your old configuration backed "
-"up.\\nPlease restart.\\n"
-msgstr ""
-"Bola vygenerovaná nová konfigurácia\\na vaša stará konfigurácia bola "
-"zálohovaná.\\nReštartujte, prosím.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:135
-msgid "Could not generate a new configuration"
-msgstr "Nepodarilo sa vygenerovať novú konfiguráciu"
-
-#: debian/local/Failsafe/failsafeXinit:149
-msgid "Sorry, this option is not implemented yet"
-msgstr "Prepáčte, ale táto možnosť nie je zatiaľ implementovaná"
-
-#: debian/local/Failsafe/failsafeXinit:177
-#, sh-format
-msgid "Relevant configuration and log files have been saved to:\\n"
-msgstr "Súvisiaca konfigurácia a súbory so záznamami boli uložené do:\\n"
-
-#: debian/local/Failsafe/failsafeXinit:177
-msgid "Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\\n"
-msgstr "Hlásenia chýb môžete odoslať na http://www.launchpad.net/ubuntu/.\\n"
-
-#: debian/local/Failsafe/failsafeXinit:184
-msgid ""
-"<big><b>Ubuntu is running in low-graphics mode</b></big>\\n\\nYour screen, "
-"graphics card, and input device settings\\ncould not be detected correctly.  "
-"You will need to configure these yourself."
-msgstr ""
-"<big><b>Ubuntu beží v režime s nízkym rozlíšením</b></big>\\n\\nNastavenia "
-"vašej obrazovky, grafickej karty, vstupného zariadenia\\nemohli byť správne "
-"rozpoznané. Budete ich musieť nastaviť vlastnoručne."
-
-#: debian/local/Failsafe/failsafeXinit:186
-msgid ""
-"<big><b>Ubuntu is running in low-graphics mode</b></big>\\n\\nThe following "
-"error was encountered.  You may need\\nto update your configuration to solve "
-"this.\\n\\n"
-msgstr ""
-"<big><b>Ubuntu beží v režime s nízkym rozlíšením</b></big>\\n\\nVyskytla sa "
-"nasledujúca chyba. Mali by ste \\naktualizovať pre vyriešenie vašu "
-"konfiguráciu.\\n\\n"
-
-#: debian/local/Failsafe/failsafeXinit:230
-msgid "Stand by one minute while the display restarts..."
-msgstr "Počkajte minútu, zakiaľ sa obrazovka reštartuje..."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/fetchmail.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/fetchmail.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/fetchmail.po	2012-01-02 17:50:39.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/fetchmail.po	2012-02-23 06:55:28.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:44+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: checkalias.c:179
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/findutils.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/findutils.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/findutils.po	2012-01-02 17:50:39.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/findutils.po	2012-02-23 06:55:28.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: gnulib/lib/argmatch.c:133
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/flex.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/flex.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/flex.po	2012-01-02 17:50:39.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/flex.po	2012-02-23 06:55:28.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: dfa.c:61
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/fluid.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/fluid.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/fluid.po	2012-01-02 17:50:48.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/fluid.po	2012-02-23 06:55:36.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: fluid.cxx:1573
 msgid "&File"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/FontForge.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/FontForge.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/FontForge.po	2012-01-02 17:50:39.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/FontForge.po	2012-02-23 06:55:29.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:48+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: alignment.c:297 anchorsaway.c:1274 combinations.c:1115 cvhints.c:483
 #: cvhints.c:786 displayfonts.c:1132 displayfonts.c:1633
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/friendly-recovery.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/friendly-recovery.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/friendly-recovery.po	2012-01-02 17:51:09.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/friendly-recovery.po	2012-02-23 06:55:55.000000000 +0000
@@ -7,67 +7,187 @@
 msgstr ""
 "Project-Id-Version: friendly-recovery\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 17:09-0400\n"
-"PO-Revision-Date: 2010-04-14 16:12+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"POT-Creation-Date: 2012-02-16 12:08-0500\n"
+"PO-Revision-Date: 2012-01-17 19:04+0000\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:57+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:56+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../lib/recovery-mode/recovery-menu:7
+#: ../lib/recovery-mode/options/apt-snapshots:20
 #, sh-format
-msgid "Recovery Menu"
-msgstr "Ponuka obnovy"
+msgid "Revert to old snapshot and reboot"
+msgstr ""
 
-#: ../lib/recovery-mode/recovery-menu:13
+#: ../lib/recovery-mode/options/apt-snapshots:31
 #, sh-format
-msgid "   Resume normal boot"
-msgstr "   Pokračovať v normálnom štarte"
+msgid "Snapshot"
+msgstr ""
 
-#: ../lib/recovery-mode/recovery-menu:26
+#: ../lib/recovery-mode/options/clean:6
 #, sh-format
-msgid "Couldn't find whiptail, starting root shell instead of recovery menu."
-msgstr ""
+msgid "Try to make free space"
+msgstr "Skúsiť uvoľniť miesto na disku"
 
-#: ../lib/recovery-mode/options/dpkg:6
+#: ../lib/recovery-mode/options/clean:12
 #, sh-format
-msgid "Repair broken packages"
-msgstr "Opraviť poškodené balíky"
+msgid ""
+"Trying to find packages you don't need (apt-get autoremove), please review "
+"carefully."
+msgstr ""
 
-#: ../lib/recovery-mode/options/dpkg:33
+#: ../lib/recovery-mode/options/clean:16 ../lib/recovery-mode/options/dpkg:41
+#: ../lib/recovery-mode/options/grub:16 ../lib/recovery-mode/recovery-menu:84
 #, sh-format
 msgid "Finished, please press ENTER"
 msgstr "Hotovo, prosím, stlačte ENTER"
 
-#: ../lib/recovery-mode/options/fsck:8
-#, sh-format
-msgid "Reboot into file system check"
-msgstr "Reštartovať do kontroly súborového systému"
-
-#: ../lib/recovery-mode/options/root:6
+#: ../lib/recovery-mode/options/dpkg:6
 #, sh-format
-msgid "Drop to root shell prompt"
-msgstr "Prepnúť do príkazového riadku ako root"
+msgid "Repair broken packages"
+msgstr "Opraviť poškodené balíky"
 
 #: ../lib/recovery-mode/options/failsafeX:11
 #, sh-format
 msgid "Run in failsafe graphic mode"
 msgstr "Spustiť v záchranom grafickom režime"
 
-#: ../lib/recovery-mode/options/netroot:6
+#: ../lib/recovery-mode/options/fsck:6
 #, sh-format
-msgid "Drop to root shell prompt with networking"
-msgstr "Prepnúť do príkazového riadku ako root so zapnutou sieťou"
+msgid "Check all file systems"
+msgstr ""
 
 #: ../lib/recovery-mode/options/grub:6
 #, sh-format
 msgid "Update grub bootloader"
 msgstr "Aktualizovať zavádzač grub"
 
-#: ../lib/recovery-mode/options/clean:6
+#: ../lib/recovery-mode/options/network:6
 #, sh-format
-msgid "Try to make free space"
-msgstr "Skúsiť uvoľniť miesto na disku"
+msgid "Enable networking"
+msgstr ""
+
+#: ../lib/recovery-mode/options/root:9
+#, sh-format
+msgid "Drop to root shell prompt"
+msgstr "Prepnúť do príkazového riadku ako root"
+
+#: ../lib/recovery-mode/options/system-summary:9
+#: ../lib/recovery-mode/options/system-summary:57
+#, sh-format
+msgid "System summary"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:15
+#, sh-format
+msgid "Read-only mode"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:17
+#, sh-format
+msgid "Read/Write mode"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:21
+#, sh-format
+msgid "none"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:23
+#, sh-format
+msgid "IP configured"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:25
+#, sh-format
+msgid "IP and DNS configured"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:36
+#, sh-format
+msgid "No software RAID detected (mdstat)"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:39
+#, sh-format
+msgid "=== General information ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:40
+#, sh-format
+msgid "System mode:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:41
+#, sh-format
+msgid "CPU information:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:42
+#, sh-format
+msgid "Network connectivity:"
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:44
+#, sh-format
+msgid "=== Detailed disk usage ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:47
+#, sh-format
+msgid "=== Software RAID state ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:50
+#, sh-format
+msgid "=== Detailed memory usage ==="
+msgstr ""
+
+#: ../lib/recovery-mode/options/system-summary:53
+#, sh-format
+msgid "=== Detailed network configuration ==="
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:20
+#, sh-format
+msgid "Recovery Menu (filesystem state: read-only)"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:22
+#, sh-format
+msgid "Recovery Menu (filesystem state: read/write)"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:26
+#, sh-format
+msgid "   Resume normal boot"
+msgstr "   Pokračovať v normálnom štarte"
+
+#: ../lib/recovery-mode/recovery-menu:47
+#, sh-format
+msgid ""
+"You are now going to exit the recovery mode and continue the boot sequence. "
+"Please note that some graphic drivers require a full graphical boot and so "
+"will fail when resuming from recovery.\n"
+"If that's the case, simply reboot from the login screen and then perform a "
+"standard boot."
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:67
+#, sh-format
+msgid ""
+"Continuing will remount your / filesystem in read/write mode and mount any "
+"other filesystem defined in /etc/fstab.\n"
+"Do you wish to continue?"
+msgstr ""
+
+#: ../lib/recovery-mode/recovery-menu:95
+#, sh-format
+msgid ""
+"The option you selected requires your filesystem to be in read-only mode. "
+"Unfortunately another option you selected earlier, made you exit this mode.\n"
+"The easiest way of getting back in read-only mode is to reboot your system."
+msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gas.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gas.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gas.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gas.po	2012-02-23 06:55:26.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: app.c:488 app.c:502
 msgid "end of file in comment"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gawk.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gawk.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gawk.po	2012-01-02 17:50:39.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gawk.po	2012-02-23 06:55:29.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:50+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: array.c:112
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gdb.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gdb.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gdb.po	2012-01-02 17:50:39.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gdb.po	2012-02-23 06:55:29.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: gdb\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-07 22:12+0100\n"
+"POT-Creation-Date: 2012-01-24 09:23+0000\n"
 "PO-Revision-Date: 2008-04-04 03:12+0000\n"
 "Last-Translator: salwator <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ada-exp.y:259
 msgid "Invalid conversion"
@@ -73,12 +73,12 @@
 msgid "Internal error in encoding of renaming declaration"
 msgstr ""
 
-#: ada-exp.y:1036 c-exp.y:740 objc-exp.y:628 p-exp.y:647
+#: ada-exp.y:1036 c-exp.y:740 objc-exp.y:628 p-exp.y:646
 #, possible-c-format
 msgid "No file or function \"%s\"."
 msgstr "Žiadny súbor alebo funkcia \"%s\"."
 
-#: ada-exp.y:1038 c-exp.y:754 m2-exp.y:565 objc-exp.y:639 p-exp.y:658
+#: ada-exp.y:1038 c-exp.y:754 m2-exp.y:565 objc-exp.y:639 p-exp.y:657
 #, possible-c-format
 msgid "No function \"%s\" in specified context."
 msgstr ""
@@ -102,9 +102,9 @@
 msgid "No definition of \"%s\" found."
 msgstr ""
 
-#: ada-exp.y:1395 c-exp.y:845 c-exp.y:897 cli/cli-cmds.c:913 f-exp.y:520
-#: linespec.c:1823 linespec.c:2109 objc-exp.y:721 objc-exp.y:775 p-exp.y:717
-#: p-exp.y:786 source.c:179 symtab.c:2858
+#: ada-exp.y:1395 c-exp.y:860 c-exp.y:912 cli/cli-cmds.c:915 f-exp.y:519
+#: linespec.c:2133 linespec.c:2959 objc-exp.y:721 objc-exp.y:775 p-exp.y:716
+#: p-exp.y:785 source.c:177 symtab.c:3030
 msgid "No symbol table is loaded.  Use the \"file\" command."
 msgstr ""
 
@@ -127,426 +127,437 @@
 msgid "Invalid use of type."
 msgstr ""
 
-#: ada-lang.c:504
+#: ada-lang.c:511
 #, possible-c-format
 msgid "Unable to find field %s in struct %s.  Aborting"
 msgstr ""
 
-#: ada-lang.c:625
+#: ada-lang.c:632
 msgid "object size is larger than varsize-limit"
 msgstr ""
 
-#: ada-lang.c:689
+#: ada-lang.c:696
 msgid "Unexpected type in ada_discrete_type_high_bound."
 msgstr ""
 
-#: ada-lang.c:709
+#: ada-lang.c:716
 msgid "Unexpected type in ada_discrete_type_low_bound."
 msgstr ""
 
-#: ada-lang.c:768
+#: ada-lang.c:775
 msgid "Invalid address for Ada main program name."
 msgstr ""
 
-#: ada-lang.c:848
+#: ada-lang.c:855
 #, possible-c-format
 msgid "invalid Ada operator name: %s"
 msgstr ""
 
-#: ada-lang.c:1507 ada-lang.c:1525 ada-lang.c:1539 ada-lang.c:1607
+#: ada-lang.c:1517 ada-lang.c:1535 ada-lang.c:1549 ada-lang.c:1617
 msgid "Bad GNAT array descriptor"
 msgstr ""
 
-#: ada-lang.c:1644
+#: ada-lang.c:1654
 msgid "Bad GNAT array descriptor bounds"
 msgstr ""
 
-#: ada-lang.c:1887
+#: ada-lang.c:1897
 msgid "Bounds unavailable for null array pointer."
 msgstr ""
 
-#: ada-lang.c:1976
+#: ada-lang.c:1986
 msgid "could not understand bit size information on packed array"
 msgstr ""
 
-#: ada-lang.c:2056
+#: ada-lang.c:2066
 msgid "could not find bounds information on packed array"
 msgstr ""
 
-#: ada-lang.c:2063
+#: ada-lang.c:2073
 msgid "could not understand bounds information on packed array"
 msgstr ""
 
-#: ada-lang.c:2097
+#: ada-lang.c:2107
 msgid "can't unpack array"
 msgstr ""
 
-#: ada-lang.c:2150
+#: ada-lang.c:2160
 msgid "attempt to do packed indexing of something other than a packed array"
 msgstr ""
 
-#: ada-lang.c:2160
+#: ada-lang.c:2170
 msgid "don't know bounds of array"
 msgstr ""
 
-#: ada-lang.c:2166
+#: ada-lang.c:2176
 #, possible-c-format
 msgid "packed array index %ld out of bounds"
 msgstr ""
 
-#: ada-lang.c:2445 ada-lang.c:8551 valops.c:1217
+#: ada-lang.c:2455 ada-lang.c:8728 valops.c:1218
 msgid "Left operand of assignment is not a modifiable lvalue."
 msgstr ""
 
-#: ada-lang.c:2542 ada-lang.c:2563
+#: ada-lang.c:2552 ada-lang.c:2573
 #, possible-c-format
 msgid "too many subscripts (%d expected)"
 msgstr ""
 
-#: ada-lang.c:2694
+#: ada-lang.c:2704
 #, possible-c-format
 msgid "invalid dimension number to '%s"
 msgstr ""
 
-#: ada-lang.c:2713
+#: ada-lang.c:2723
 msgid "attempt to take bound of something that is not an array"
 msgstr ""
 
-#: ada-lang.c:2833
+#: ada-lang.c:2843
 msgid "Could not find operator name for opcode"
 msgstr ""
 
-#: ada-lang.c:3023
+#: ada-lang.c:3033
 msgid "Unexpected operator during name resolution"
 msgstr ""
 
-#: ada-lang.c:3087
+#: ada-lang.c:3097
 #, possible-c-format
 msgid "No definition found for %s"
 msgstr ""
 
-#: ada-lang.c:3099 ada-lang.c:3151
+#: ada-lang.c:3109 ada-lang.c:3161
 #, possible-c-format
 msgid "Could not find a match for %s"
 msgstr ""
 
-#: ada-lang.c:3104 ada-lang.c:3384
+#: ada-lang.c:3114 ada-lang.c:3394
 #, possible-c-format
 msgid "Multiple matches for %s\n"
 msgstr ""
 
-#: ada-lang.c:3472
+#: ada-lang.c:3482
 msgid "Request to select 0 symbols!"
 msgstr ""
 
-#: ada-lang.c:3477 linespec.c:542
+#: ada-lang.c:3487 linespec.c:626
 msgid ""
 "canceled because the command is ambiguous\n"
 "See set/show multiple-symbol."
 msgstr ""
 
-#: ada-lang.c:3487
+#: ada-lang.c:3497
 msgid "[0] cancel\n"
 msgstr ""
 
-#: ada-lang.c:3489
+#: ada-lang.c:3499
 msgid "[1] all\n"
 msgstr ""
 
-#: ada-lang.c:3504
+#: ada-lang.c:3514
 #, possible-c-format
 msgid "[%d] %s at <no source file available>:%d\n"
 msgstr ""
 
-#: ada-lang.c:3509 ada-lang.c:3523
+#: ada-lang.c:3519 ada-lang.c:3533
 #, possible-c-format
 msgid "[%d] %s at %s:%d\n"
 msgstr ""
 
-#: ada-lang.c:3533
+#: ada-lang.c:3543
 #, possible-c-format
 msgid "'(%s) (enumeral)\n"
 msgstr ""
 
-#: ada-lang.c:3538
+#: ada-lang.c:3548
 #, possible-c-format
 msgid "[%d] %s in %s (enumeral)\n"
 msgstr ""
 
-#: ada-lang.c:3539
+#: ada-lang.c:3549
 #, possible-c-format
 msgid "[%d] %s at %s:?\n"
 msgstr ""
 
-#: ada-lang.c:3545
+#: ada-lang.c:3555
 #, possible-c-format
 msgid "[%d] %s (enumeral)\n"
 msgstr ""
 
-#: ada-lang.c:3546
+#: ada-lang.c:3556
 #, possible-c-format
 msgid "[%d] %s at ?\n"
 msgstr ""
 
-#: ada-lang.c:3593 ada-lang.c:3607 linespec.c:610
+#: ada-lang.c:3603 ada-lang.c:3617 linespec.c:649
 msgid "one or more choice numbers"
 msgstr ""
 
-#: ada-lang.c:3614
+#: ada-lang.c:3624
 msgid "Argument must be choice number"
 msgstr ""
 
-#: ada-lang.c:3618
+#: ada-lang.c:3628
 msgid "cancelled"
 msgstr ""
 
-#: ada-lang.c:3645
+#: ada-lang.c:3655
 #, possible-c-format
 msgid "Select no more than %d of the above"
 msgstr ""
 
 #. PNH: Do we ever get here?  See ada_search_struct_field,
 #. find_struct_field.
-#: ada-lang.c:6361
+#: ada-lang.c:6540
 msgid "Cannot assign this kind of variant record"
 msgstr ""
 
-#: ada-lang.c:6458 valops.c:2350
+#: ada-lang.c:6637 valops.c:2350
 #, possible-c-format
 msgid "There is no member named %s."
 msgstr ""
 
-#: ada-lang.c:6464
+#: ada-lang.c:6643
 msgid "Attempt to extract a component of a value that is not a record."
 msgstr ""
 
-#: ada-lang.c:6515
+#: ada-lang.c:6694
 msgid "Type (null) is not a structure or union type"
 msgstr ""
 
 #. XXX: type_sprint
-#: ada-lang.c:6519 ada-lang.c:6598 ada-lang.c:6605
+#: ada-lang.c:6698 ada-lang.c:6777 ada-lang.c:6784
 msgid "Type "
 msgstr ""
 
-#: ada-lang.c:6521
+#: ada-lang.c:6700
 msgid " is not a structure or union type"
 msgstr ""
 
-#: ada-lang.c:6600
+#: ada-lang.c:6779
 msgid " has no component named <null>"
 msgstr ""
 
-#: ada-lang.c:6607
+#: ada-lang.c:6786
 #, possible-c-format
 msgid " has no component named %s"
 msgstr ""
 
-#: ada-lang.c:6946
+#: ada-lang.c:7125
 msgid "unexpected null name on descriptive type"
 msgstr ""
 
-#: ada-lang.c:7300
+#: ada-lang.c:7479
 #, possible-c-format
 msgid "Invalid type size for `%s' detected: %d."
 msgstr ""
 
-#: ada-lang.c:7303
+#: ada-lang.c:7482
 #, possible-c-format
 msgid "Invalid type size for <unnamed> detected: %d."
 msgstr ""
 
-#: ada-lang.c:7314
+#: ada-lang.c:7493
 msgid "record type with dynamic size is larger than varsize-limit"
 msgstr ""
 
-#: ada-lang.c:7627
+#: ada-lang.c:7806
 msgid "array type with dynamic size is larger than varsize-limit"
 msgstr ""
 
-#: ada-lang.c:7983
+#: ada-lang.c:8162
 msgid "'POS only defined on discrete types"
 msgstr ""
 
-#: ada-lang.c:7995
+#: ada-lang.c:8174
 msgid "enumeration value is invalid: can't find 'POS"
 msgstr ""
 
-#: ada-lang.c:8013
+#: ada-lang.c:8192
 msgid "'VAL only defined on discrete types"
 msgstr ""
 
-#: ada-lang.c:8015
+#: ada-lang.c:8194
 msgid "'VAL requires integral argument"
 msgstr ""
 
-#: ada-lang.c:8022
+#: ada-lang.c:8201
 msgid "argument to 'VAL out of range"
 msgstr ""
 
-#: ada-lang.c:8359
+#: ada-lang.c:8538
 msgid "Incompatible types in assignment"
 msgstr ""
 
-#: ada-lang.c:8393
+#: ada-lang.c:8572
 #, possible-c-format
 msgid "second operand of %s must not be zero."
 msgstr ""
 
-#: ada-lang.c:8438
+#: ada-lang.c:8617
 msgid "Attempt to compare array with non-array"
 msgstr ""
 
-#: ada-lang.c:8569
+#: ada-lang.c:8746
 msgid "Left-hand side must be array or record."
 msgstr ""
 
-#: ada-lang.c:8594
+#: ada-lang.c:8771
 msgid "Misplaced 'others' clause"
 msgstr ""
 
-#: ada-lang.c:8599
+#: ada-lang.c:8776
 msgid "Internal error: bad aggregate clause"
 msgstr ""
 
-#: ada-lang.c:8621
+#: ada-lang.c:8798
 msgid "Extra components in aggregate ignored."
 msgstr ""
 
-#: ada-lang.c:8688
+#: ada-lang.c:8865
 msgid "Invalid record component association."
 msgstr ""
 
-#: ada-lang.c:8694
+#: ada-lang.c:8871
 #, possible-c-format
 msgid "Unknown component name: %s."
 msgstr ""
 
-#: ada-lang.c:8699
+#: ada-lang.c:8876
 msgid "Index in component association out of bounds."
 msgstr ""
 
-#: ada-lang.c:8775
+#: ada-lang.c:8952
 msgid "Internal error: miscounted aggregate components."
 msgstr ""
 
-#: ada-lang.c:9144
+#: ada-lang.c:9321
 msgid "Fixed-point values must be assigned to fixed-point variables"
 msgstr ""
 
-#: ada-lang.c:9161
+#: ada-lang.c:9338
 msgid "Operands of fixed-point addition must have the same type"
 msgstr ""
 
-#: ada-lang.c:9183
+#: ada-lang.c:9360
 msgid "Operands of fixed-point subtraction must have the same type"
 msgstr ""
 
 #. Only encountered when an unresolved symbol occurs in a
 #. context other than a function call, in which case, it is
 #. invalid.
-#: ada-lang.c:9285 ada-lang.c:9355
+#: ada-lang.c:9462 ada-lang.c:9532
 #, possible-c-format
 msgid "Unexpected unresolved symbol, %s, during evaluation"
 msgstr ""
 
-#: ada-lang.c:9404
+#: ada-lang.c:9581
 #, possible-c-format
 msgid "cannot subscript or call something of type `%s'"
 msgstr ""
 
-#: ada-lang.c:9423
+#: ada-lang.c:9600
 msgid "cannot subscript or call a record"
 msgstr ""
 
-#: ada-lang.c:9425
+#: ada-lang.c:9602
 #, possible-c-format
 msgid "wrong number of subscripts; expecting %d"
 msgstr ""
 
-#: ada-lang.c:9437 ada-lang.c:9451
+#: ada-lang.c:9614 ada-lang.c:9628
 msgid "element type of array unknown"
 msgstr ""
 
-#: ada-lang.c:9460
+#: ada-lang.c:9637
 msgid "Attempt to index or call something other than an array or function"
 msgstr ""
 
-#: ada-lang.c:9490
+#: ada-lang.c:9667
 msgid "cannot slice a packed array"
 msgstr ""
 
-#: ada-lang.c:9518 valops.c:3682
+#: ada-lang.c:9695 valops.c:3681
 msgid "cannot take slice of non-array"
 msgstr ""
 
-#: ada-lang.c:9556
+#: ada-lang.c:9734
 msgid "Membership test incompletely implemented; always returns true"
 msgstr ""
 
-#: ada-lang.c:9645
+#: ada-lang.c:9823
 #, possible-c-format
 msgid "Invalid operand to '%s"
 msgstr ""
 
 #. Should never happen.
-#: ada-lang.c:9670 ada-lang.c:9695 ada-lang.c:9725
+#: ada-lang.c:9848 ada-lang.c:9873 ada-lang.c:9903
 msgid "unexpected attribute encountered"
 msgstr ""
 
-#: ada-lang.c:9703
+#: ada-lang.c:9881
 msgid "the 'length attribute applies only to array types"
 msgstr ""
 
-#: ada-lang.c:9707
+#: ada-lang.c:9885
 msgid "unimplemented type attribute"
 msgstr ""
 
-#: ada-lang.c:9775
+#: ada-lang.c:9953
 msgid "'modulus must be applied to modular type"
 msgstr ""
 
-#: ada-lang.c:9871
+#: ada-lang.c:10049
 msgid "Attempt to dereference null array pointer."
 msgstr ""
 
-#: ada-lang.c:9899 eval.c:2638 eval.c:3052 valops.c:1786
+#: ada-lang.c:10077 eval.c:2639 eval.c:3049 valops.c:1786
 msgid "Attempt to take contents of a non-pointer value."
 msgstr ""
 
-#: ada-lang.c:9967 eval.c:2859
+#: ada-lang.c:10145 eval.c:2856
 msgid "Attempt to use a type name as an expression"
 msgstr ""
 
-#: ada-lang.c:9979
+#: ada-lang.c:10157
 #, possible-c-format
 msgid ""
 "Undefined name, ambiguous name, or renaming used in component association: "
 "%s."
 msgstr ""
 
-#: ada-lang.c:9982
+#: ada-lang.c:10160
 msgid "Aggregates only allowed on the right of an assignment"
 msgstr ""
 
-#: ada-lang.c:9985
+#: ada-lang.c:10163
 msgid "aggregate apparently mangled"
 msgstr ""
 
-#: ada-lang.c:10280
+#: ada-lang.c:10458
 msgid "Unknown lower bound, using 1."
 msgstr ""
 
-#: ada-lang.c:10299
+#: ada-lang.c:10477
 #, possible-c-format
 msgid "Unknown upper bound, using %ld."
 msgstr ""
 
-#: ada-lang.c:10527
+#: ada-lang.c:10683
+msgid ""
+"Your Ada runtime appears to be missing some debugging information.\n"
+"Cannot insert Ada exception catchpoint in this configuration."
+msgstr ""
+
+#: ada-lang.c:10693
+#, possible-c-format
+msgid "Symbol \"%s\" is not a function (class = %d)"
+msgstr ""
+
+#: ada-lang.c:10736
 msgid "Unable to insert catchpoint.  Is this an Ada main program?"
 msgstr ""
 
-#: ada-lang.c:10535
+#: ada-lang.c:10744
 msgid "Unable to insert catchpoint. Try to start the program first."
 msgstr ""
 
@@ -556,95 +567,95 @@
 #. configurable run time mode, or that a-except as been optimized
 #. out by the linker...  In any case, at this point it is not worth
 #. supporting this feature.
-#: ada-lang.c:10544
-msgid "Cannot insert catchpoints in this configuration."
+#: ada-lang.c:10753
+msgid "Cannot insert Ada exception catchpoints in this configuration."
 msgstr ""
 
-#: ada-lang.c:10713 ada-lang.c:10855 ada-lang.c:10888 ada-lang.c:10917
+#: ada-lang.c:10912 ada-lang.c:11272 ada-lang.c:11316 ada-lang.c:11347
 msgid "unexpected catchpoint type"
 msgstr ""
 
-#: ada-lang.c:10739
+#: ada-lang.c:10938
 #, possible-c-format
 msgid "failed to get exception name: %s"
 msgstr ""
 
-#: ada-lang.c:10836
+#: ada-lang.c:11052
 #, possible-c-format
-msgid "`%s' Ada exception"
+msgid ""
+"failed to reevaluate internal exception condition for catchpoint %d: %s"
 msgstr ""
 
-#: ada-lang.c:10871
-#, possible-c-format
-msgid "Catchpoint %d: `%s' Ada exception"
+#: ada-lang.c:11143
+msgid "Error in testing exception condition:\n"
 msgstr ""
 
-#: ada-lang.c:10874
+#: ada-lang.c:11253 ada-lang.c:11297
 #, possible-c-format
-msgid "Catchpoint %d: all Ada exceptions"
+msgid "`%s' Ada exception"
 msgstr ""
 
-#: ada-lang.c:10879
-#, possible-c-format
-msgid "Catchpoint %d: unhandled Ada exceptions"
+#: ada-lang.c:11287 breakpoint.c:9796
+msgid "Temporary catchpoint "
 msgstr ""
 
-#: ada-lang.c:10884
-#, possible-c-format
-msgid "Catchpoint %d: failed Ada assertions"
+#: ada-lang.c:11288 breakpoint.c:9797
+msgid "Catchpoint "
 msgstr ""
 
-#: ada-lang.c:11111 breakpoint.c:613 breakpoint.c:624
-msgid "Junk at end of expression"
+#: ada-lang.c:11304
+msgid "all Ada exceptions"
 msgstr ""
 
-#: ada-lang.c:11156 ada-lang.c:11179
-#, possible-c-format
-msgid "unexpected catchpoint kind (%d)"
+#: ada-lang.c:11308
+msgid "unhandled Ada exceptions"
 msgstr ""
 
-#: ada-lang.c:11287
-#, possible-c-format
-msgid "Unable to break on '%s' in this configuration."
+#: ada-lang.c:11312
+msgid "failed Ada assertions"
+msgstr ""
+
+#: ada-lang.c:11573 breakpoint.c:645 breakpoint.c:658
+msgid "Junk at end of expression"
 msgstr ""
 
-#: ada-lang.c:11291
+#: ada-lang.c:11620 ada-lang.c:11643
 #, possible-c-format
-msgid "Symbol \"%s\" is not a function (class = %d)"
+msgid "unexpected catchpoint kind (%d)"
 msgstr ""
 
-#: ada-lang.c:11360 breakpoint.c:7843 breakpoint.c:9311 breakpoint.c:9440
-#: breakpoint.c:9484 breakpoint.c:9630 breakpoint.c:12185
+#: ada-lang.c:11806 breakpoint.c:7635 breakpoint.c:9544 breakpoint.c:9673
+#: breakpoint.c:9718 breakpoint.c:9861 breakpoint.c:13030 skip.c:191
 msgid "Junk at end of arguments."
 msgstr ""
 
 #. XXX: gdb_sprint_host_address, type_sprint
-#: ada-lang.c:11541
+#: ada-lang.c:12006
 msgid "Type @"
 msgstr ""
 
-#: ada-lang.c:11899
+#: ada-lang.c:12366
 msgid "\"set ada\" must be followed by the name of a setting.\n"
 msgstr ""
 
-#: ada-lang.c:11918
+#: ada-lang.c:12428
 msgid "Prefix command for changing Ada-specfic settings"
 msgstr ""
 
-#: ada-lang.c:11922
+#: ada-lang.c:12432
 msgid "Generic command for showing Ada-specific settings."
 msgstr ""
 
-#: ada-lang.c:11926
+#: ada-lang.c:12436
 msgid "Enable or disable an optimization trusting PAD types over XVS types"
 msgstr ""
 
-#: ada-lang.c:11927
+#: ada-lang.c:12437
 msgid ""
 "Show whether an optimization trusting PAD types over XVS types is activated"
 msgstr ""
 
-#: ada-lang.c:11929
+#: ada-lang.c:12439
 msgid ""
 "This is related to the encoding used by the GNAT compiler.  The debugger\n"
 "should normally trust the contents of PAD types, but certain older versions\n"
@@ -656,6 +667,18 @@
 "this option to \"off\" unless necessary."
 msgstr ""
 
+#: ada-lang.c:12449
+msgid ""
+"Catch Ada exceptions, when raised.\n"
+"With an argument, catch only exceptions with the given name."
+msgstr ""
+
+#: ada-lang.c:12456
+msgid ""
+"Catch failed Ada assertions, when raised.\n"
+"With an argument, catch only exceptions with the given name."
+msgstr ""
+
 #: ada-lex.l:129 ada-lex.l:133
 msgid "Based real literals not implemented yet."
 msgstr ""
@@ -669,153 +692,149 @@
 msgid "Invalid character '%s' in expression."
 msgstr ""
 
-#: ada-lex.l:343
+#: ada-lex.l:342
 #, possible-c-format
 msgid "Invalid base: %d."
 msgstr ""
 
-#: ada-lex.l:354 ada-lex.l:361
+#: ada-lex.l:353 ada-lex.l:360
 msgid "Integer literal out of range"
 msgstr ""
 
-#: ada-lex.l:356
+#: ada-lex.l:355
 #, possible-c-format
 msgid "Invalid digit `%c' in based literal"
 msgstr ""
 
-#: ada-lex.l:602
+#: ada-lex.l:601
 #, possible-c-format
 msgid "ambiguous attribute name: `%s'"
 msgstr ""
 
-#: ada-lex.l:605
+#: ada-lex.l:604
 #, possible-c-format
 msgid "unrecognized attribute: `%s'"
 msgstr ""
 
-#: ada-tasks.c:59 ada-tasks.c:81
+#: ada-tasks.c:66 ada-tasks.c:88
 msgid "Unactivated"
 msgstr ""
 
-#: ada-tasks.c:60 ada-tasks.c:82
+#: ada-tasks.c:67 ada-tasks.c:89
 msgid "Runnable"
 msgstr ""
 
-#: ada-tasks.c:61 ada-tasks.c:83
+#: ada-tasks.c:68 ada-tasks.c:90
 msgid "Terminated"
 msgstr ""
 
-#: ada-tasks.c:62
+#: ada-tasks.c:69
 msgid "Child Activation Wait"
 msgstr ""
 
-#: ada-tasks.c:63
+#: ada-tasks.c:70
 msgid "Accept or Select Term"
 msgstr ""
 
-#: ada-tasks.c:64 ada-tasks.c:86
+#: ada-tasks.c:71 ada-tasks.c:93
 msgid "Waiting on entry call"
 msgstr ""
 
-#: ada-tasks.c:65
+#: ada-tasks.c:72
 msgid "Async Select Wait"
 msgstr ""
 
-#: ada-tasks.c:66 ada-tasks.c:88
+#: ada-tasks.c:73 ada-tasks.c:95
 msgid "Delay Sleep"
 msgstr ""
 
-#: ada-tasks.c:67
+#: ada-tasks.c:74
 msgid "Child Termination Wait"
 msgstr ""
 
-#: ada-tasks.c:68
+#: ada-tasks.c:75
 msgid "Wait Child in Term Alt"
 msgstr ""
 
-#: ada-tasks.c:73 ada-tasks.c:95
+#: ada-tasks.c:80 ada-tasks.c:102
 msgid "Asynchronous Hold"
 msgstr ""
 
-#: ada-tasks.c:75 ada-tasks.c:97
+#: ada-tasks.c:82 ada-tasks.c:104
 msgid "Activating"
 msgstr ""
 
-#: ada-tasks.c:76
+#: ada-tasks.c:83
 msgid "Selective Wait"
 msgstr ""
 
-#: ada-tasks.c:84
+#: ada-tasks.c:91
 msgid "Waiting for child activation"
 msgstr ""
 
-#: ada-tasks.c:85
+#: ada-tasks.c:92
 msgid "Blocked in accept or select with terminate"
 msgstr ""
 
-#: ada-tasks.c:87
+#: ada-tasks.c:94
 msgid "Asynchronous Selective Wait"
 msgstr ""
 
-#: ada-tasks.c:89
+#: ada-tasks.c:96
 msgid "Waiting for children termination"
 msgstr ""
 
-#: ada-tasks.c:90
+#: ada-tasks.c:97
 msgid "Waiting for children in terminate alternative"
 msgstr ""
 
-#: ada-tasks.c:98
+#: ada-tasks.c:105
 msgid "Blocked in selective wait statement"
 msgstr ""
 
-#: ada-tasks.c:279
+#: ada-tasks.c:414
 msgid "Unknown task name format. Aborting"
 msgstr ""
 
-#: ada-tasks.c:404
+#: ada-tasks.c:488
 msgid "Cannot find Ada_Task_Control_Block type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:417
+#: ada-tasks.c:501
 msgid "Cannot find Common_ATCB type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:419
+#: ada-tasks.c:503
 msgid "Cannot find Private_Data type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:421
+#: ada-tasks.c:505
 msgid "Cannot find Entry_Call_Record type. Aborting"
 msgstr ""
 
-#: ada-tasks.c:695
+#: ada-tasks.c:942
 msgid "Cannot inspect Ada tasks when program is not running"
 msgstr ""
 
-#: ada-tasks.c:703
+#: ada-tasks.c:970 ada-tasks.c:1120 ada-tasks.c:1284
 msgid "Your application does not use any Ada tasks.\n"
 msgstr ""
 
-#: ada-tasks.c:745
+#: ada-tasks.c:1081
 #, possible-c-format
-msgid " Accepting RV with %-4d"
+msgid "Accepting RV with %-4d"
 msgstr ""
 
-#: ada-tasks.c:748
+#: ada-tasks.c:1087
 #, possible-c-format
-msgid " Waiting on RV with %-3d"
+msgid "Waiting on RV with %-3d"
 msgstr ""
 
-#: ada-tasks.c:757
-msgid " <no name>\n"
+#: ada-tasks.c:1097
+msgid "<no name>"
 msgstr ""
 
-#: ada-tasks.c:769
-msgid "  ID       TID P-ID Pri State                  Name\n"
-msgstr ""
-
-#: ada-tasks.c:785 ada-tasks.c:898
+#: ada-tasks.c:1125 ada-tasks.c:1236
 #, possible-c-format
 msgid ""
 "Task ID %d not known.  Use the \"info tasks\" command to\n"
@@ -823,98 +842,98 @@
 msgstr ""
 
 #. Print the Ada task ID.
-#: ada-tasks.c:790
+#: ada-tasks.c:1130
 #, possible-c-format
 msgid "Ada Task: %s\n"
 msgstr ""
 
-#: ada-tasks.c:795
+#: ada-tasks.c:1135
 #, possible-c-format
 msgid "Name: %s\n"
 msgstr ""
 
-#: ada-tasks.c:797
+#: ada-tasks.c:1137
 msgid "<no name>\n"
 msgstr ""
 
 #. Print the TID and LWP.
-#: ada-tasks.c:800
+#: ada-tasks.c:1140
 #, possible-c-format
 msgid "Thread: %#lx\n"
 msgstr ""
 
-#: ada-tasks.c:801
+#: ada-tasks.c:1141
 #, possible-c-format
 msgid "LWP: %#lx\n"
 msgstr ""
 
-#: ada-tasks.c:811
+#: ada-tasks.c:1151
 #, possible-c-format
 msgid "Parent: %d"
 msgstr ""
 
-#: ada-tasks.c:817
+#: ada-tasks.c:1157
 msgid "No parent\n"
 msgstr ""
 
 #. Print the base priority.
-#: ada-tasks.c:820
+#: ada-tasks.c:1160
 #, possible-c-format
 msgid "Base Priority: %d\n"
 msgstr ""
 
-#: ada-tasks.c:829
+#: ada-tasks.c:1169
 #, possible-c-format
 msgid "State: Accepting rendezvous with %d"
 msgstr ""
 
-#: ada-tasks.c:835
+#: ada-tasks.c:1175
 #, possible-c-format
 msgid "State: Waiting on task %d's entry"
 msgstr ""
 
-#: ada-tasks.c:839
+#: ada-tasks.c:1179
 #, possible-c-format
 msgid "State: %s"
 msgstr ""
 
-#: ada-tasks.c:883
+#: ada-tasks.c:1220
 msgid "[Current task is unknown]\n"
 msgstr ""
 
-#: ada-tasks.c:885
+#: ada-tasks.c:1222
 #, possible-c-format
 msgid "[Current task is %d]\n"
 msgstr ""
 
-#: ada-tasks.c:903
+#: ada-tasks.c:1241
 #, possible-c-format
 msgid "Cannot switch to task %d: Task is no longer running"
 msgstr ""
 
-#: ada-tasks.c:923
+#: ada-tasks.c:1261
 #, possible-c-format
 msgid ""
 "Unable to compute thread ID for task %d.\n"
 "Cannot switch to this task."
 msgstr ""
 
-#: ada-tasks.c:929
+#: ada-tasks.c:1267
 #, possible-c-format
 msgid "[Switching to task %d]\n"
 msgstr ""
 
-#: ada-tasks.c:961
+#: ada-tasks.c:1303
 msgid ""
 "Task switching not supported when debugging from core files\n"
 "(use thread support instead)"
 msgstr ""
 
-#: ada-tasks.c:1013
+#: ada-tasks.c:1401
 msgid "Provide information about all known Ada tasks"
 msgstr ""
 
-#: ada-tasks.c:1015
+#: ada-tasks.c:1403
 msgid ""
 "Use this command to switch between Ada tasks.\n"
 "Without argument, this command simply prints the current task ID"
@@ -924,38 +943,38 @@
 msgid "<undecipherable array type>"
 msgstr ""
 
-#: ada-typeprint.c:651
+#: ada-typeprint.c:655
 msgid " <incomplete type> end record"
 msgstr ""
 
-#: ada-typeprint.c:821
+#: ada-typeprint.c:816
 #, possible-c-format
 msgid "<%d-byte integer>"
 msgstr ""
 
-#: ada-typeprint.c:843
+#: ada-typeprint.c:838
 #, possible-c-format
 msgid "<%d-byte float>"
 msgstr ""
 
-#: ada-typeprint.c:856
+#: ada-typeprint.c:851
 msgid "array (?) of ? (<mal-formed descriptor>)"
 msgstr ""
 
-#: ada-valprint.c:218 ada-valprint.c:524 c-lang.c:522
+#: ada-valprint.c:217 ada-valprint.c:523 valprint.c:1808
 #, possible-c-format
 msgid " <repeats %u times>"
 msgstr ""
 
-#: ada-valprint.c:452
+#: ada-valprint.c:451
 msgid "internal error: unhandled type in ada_print_scalar"
 msgstr ""
 
-#: ada-valprint.c:456 typeprint.c:270
+#: ada-valprint.c:455 typeprint.c:269
 msgid "Invalid type code in symbol table."
 msgstr ""
 
-#: ada-valprint.c:1123
+#: ada-valprint.c:1132
 msgid "<optimized out or zero length>"
 msgstr ""
 
@@ -1002,7 +1021,7 @@
 msgstr ""
 
 #. i18n: Like "Thread-Id %d, [state] unknown"
-#: aix-thread.c:563 python/py-auto-load.c:431
+#: aix-thread.c:563
 msgid "unknown"
 msgstr ""
 
@@ -1073,44 +1092,85 @@
 msgid "Enables debugging output (used to debug GDB)."
 msgstr ""
 
+#: alphabsd-nat.c:96 alphabsd-nat.c:128 amd64bsd-nat.c:53 amd64bsd-nat.c:87
+#: amd64-linux-nat.c:165 amd64-linux-nat.c:220 hppabsd-nat.c:134
+#: hppabsd-nat.c:164 hppanbsd-nat.c:172 hppanbsd-nat.c:202 i386bsd-nat.c:141
+#: i386bsd-nat.c:192 i386-linux-nat.c:266 i386-linux-nat.c:281
+#: m32r-linux-nat.c:115 m32r-linux-nat.c:164 m68kbsd-nat.c:121
+#: m68kbsd-nat.c:151 m68klinux-nat.c:263 m68klinux-nat.c:278 m88kbsd-nat.c:73
+#: m88kbsd-nat.c:89 mips64obsd-nat.c:87 mips64obsd-nat.c:103
+#: mips-linux-nat.c:235 mips-linux-nat.c:292 mipsnbsd-nat.c:53
+#: mipsnbsd-nat.c:84 ppcnbsd-nat.c:92 ppcnbsd-nat.c:123 ppcobsd-nat.c:82
+#: ppcobsd-nat.c:118 s390-nat.c:247 s390-nat.c:264 shnbsd-nat.c:54
+#: shnbsd-nat.c:75 sparc-nat.c:172 sparc-nat.c:208 vaxbsd-nat.c:73
+#: vaxbsd-nat.c:89 xtensa-linux-nat.c:194 xtensa-linux-nat.c:213
+msgid "Couldn't get registers"
+msgstr ""
+
+#: alphabsd-nat.c:110 alphabsd-nat.c:147 amd64bsd-nat.c:66 amd64bsd-nat.c:105
+#: amd64-linux-nat.c:192 amd64-linux-nat.c:255 hppabsd-nat.c:145
+#: hppabsd-nat.c:179 hppanbsd-nat.c:183 hppanbsd-nat.c:217 i386bsd-nat.c:165
+#: i386bsd-nat.c:172 i386bsd-nat.c:228 i386-linux-nat.c:330
+#: i386-linux-nat.c:344 m68kbsd-nat.c:132 m68kbsd-nat.c:166
+#: m68klinux-nat.c:360 m68klinux-nat.c:374 mipsnbsd-nat.c:67
+#: mipsnbsd-nat.c:103 ppcobsd-nat.c:99 ppcobsd-nat.c:139 s390-nat.c:284
+#: s390-nat.c:301 sparc-nat.c:184
+msgid "Couldn't get floating point status"
+msgstr ""
+
+#: alphabsd-nat.c:134 amd64bsd-nat.c:93 amd64-linux-nat.c:225
+#: hppabsd-nat.c:170 hppanbsd-nat.c:208 i386bsd-nat.c:198 i386-linux-nat.c:286
+#: m32r-linux-nat.c:169 m68kbsd-nat.c:157 m68klinux-nat.c:283 m88kbsd-nat.c:95
+#: mips64obsd-nat.c:109 mipsnbsd-nat.c:90 ppcnbsd-nat.c:130 ppcobsd-nat.c:129
+#: s390-nat.c:269 sparc-nat.c:213 vaxbsd-nat.c:95 xtensa-linux-nat.c:221
+msgid "Couldn't write registers"
+msgstr ""
+
+#: alphabsd-nat.c:153 amd64bsd-nat.c:111 amd64-linux-nat.c:260
+#: hppabsd-nat.c:185 hppanbsd-nat.c:223 i386bsd-nat.c:234 i386-linux-nat.c:349
+#: m68kbsd-nat.c:172 m68klinux-nat.c:379 mipsnbsd-nat.c:109 ppcobsd-nat.c:146
+#: s390-nat.c:306
+msgid "Couldn't write floating point status"
+msgstr ""
+
 #: alpha-nat.c:132
 #, possible-c-format
 msgid "Register %s not found in core file."
 msgstr ""
 
-#: alpha-tdep.c:262
+#: alpha-tdep.c:261
 msgid "Cannot retrieve value from floating point register"
 msgstr ""
 
-#: alpha-tdep.c:277
+#: alpha-tdep.c:276
 msgid "Cannot store value in floating point register"
 msgstr ""
 
-#: alpha-tdep.c:504 alpha-tdep.c:528 alpha-tdep.c:574 alpha-tdep.c:599
+#: alpha-tdep.c:503 alpha-tdep.c:527 alpha-tdep.c:573 alpha-tdep.c:598
 msgid "unknown floating point width"
 msgstr ""
 
 #. FIXME: 128-bit long doubles are returned like structures:
 #. by writing into indirect storage provided by the caller
 #. as the first argument.
-#: alpha-tdep.c:570 alpha-tdep.c:595
+#: alpha-tdep.c:569 alpha-tdep.c:594
 msgid "Cannot set a 128-bit long double return value."
 msgstr ""
 
-#: alpha-tdep.c:1013
+#: alpha-tdep.c:1100
 #, possible-c-format
 msgid ""
 "Hit beginning of text section without finding enclosing function for address "
 "%s"
 msgstr ""
 
-#: alpha-tdep.c:1016
+#: alpha-tdep.c:1103
 #, possible-c-format
 msgid ""
 "Hit heuristic-fence-post without finding enclosing function for address %s"
 msgstr ""
 
-#: alpha-tdep.c:1021
+#: alpha-tdep.c:1108
 msgid ""
 "This warning occurs if you are debugging a function without any symbols\n"
 "(for example, in a stripped executable).  In that case, you may wish to\n"
@@ -1121,157 +1181,116 @@
 "(more likely) you have encountered a bug in GDB.\n"
 msgstr ""
 
-#: alpha-tdep.c:1793 mips-tdep.c:6552
+#: alpha-tdep.c:1883 mips-tdep.c:6523
 msgid "Set the distance searched for the start of a function."
 msgstr ""
 
-#: alpha-tdep.c:1794 mips-tdep.c:6553
+#: alpha-tdep.c:1884 mips-tdep.c:6524
 msgid "Show the distance searched for the start of a function."
 msgstr ""
 
-#: alpha-tdep.c:1795 mips-tdep.c:6554
+#: alpha-tdep.c:1885 mips-tdep.c:6525
 msgid ""
 "If you are debugging a stripped executable, GDB needs to search through the\n"
 "program for the start of a function.  This command sets the distance of the\n"
 "search.  The only need to set it is when debugging a stripped executable."
 msgstr ""
 
-#: alphabsd-nat.c:97 alphabsd-nat.c:129 amd64-linux-nat.c:166
-#: amd64-linux-nat.c:221 amd64bsd-nat.c:54 amd64bsd-nat.c:88 hppabsd-nat.c:135
-#: hppabsd-nat.c:165 hppanbsd-nat.c:172 hppanbsd-nat.c:202
-#: i386-linux-nat.c:267 i386-linux-nat.c:282 i386bsd-nat.c:142
-#: i386bsd-nat.c:193 m32r-linux-nat.c:116 m32r-linux-nat.c:165
-#: m68kbsd-nat.c:122 m68kbsd-nat.c:152 m68klinux-nat.c:264 m68klinux-nat.c:279
-#: m88kbsd-nat.c:74 m88kbsd-nat.c:90 mips-linux-nat.c:236 mips-linux-nat.c:293
-#: mips64obsd-nat.c:88 mips64obsd-nat.c:104 mipsnbsd-nat.c:53
-#: mipsnbsd-nat.c:84 ppcnbsd-nat.c:93 ppcnbsd-nat.c:124 ppcobsd-nat.c:83
-#: ppcobsd-nat.c:119 s390-nat.c:148 s390-nat.c:165 shnbsd-nat.c:55
-#: shnbsd-nat.c:76 sparc-nat.c:171 sparc-nat.c:207 vaxbsd-nat.c:74
-#: vaxbsd-nat.c:90 xtensa-linux-nat.c:194 xtensa-linux-nat.c:213
-msgid "Couldn't get registers"
-msgstr ""
-
-#: alphabsd-nat.c:111 alphabsd-nat.c:148 amd64-linux-nat.c:193
-#: amd64-linux-nat.c:256 amd64bsd-nat.c:67 amd64bsd-nat.c:106
-#: hppabsd-nat.c:146 hppabsd-nat.c:180 hppanbsd-nat.c:183 hppanbsd-nat.c:217
-#: i386-linux-nat.c:331 i386-linux-nat.c:345 i386bsd-nat.c:166
-#: i386bsd-nat.c:173 i386bsd-nat.c:229 m68kbsd-nat.c:133 m68kbsd-nat.c:167
-#: m68klinux-nat.c:361 m68klinux-nat.c:375 mipsnbsd-nat.c:67
-#: mipsnbsd-nat.c:103 ppcobsd-nat.c:100 ppcobsd-nat.c:140 s390-nat.c:185
-#: s390-nat.c:202 sparc-nat.c:183
-msgid "Couldn't get floating point status"
+#: amd64fbsd-nat.c:187
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
 msgstr ""
 
-#: alphabsd-nat.c:135 amd64-linux-nat.c:226 amd64bsd-nat.c:94
-#: hppabsd-nat.c:171 hppanbsd-nat.c:208 i386-linux-nat.c:287 i386bsd-nat.c:199
-#: m32r-linux-nat.c:170 m68kbsd-nat.c:158 m68klinux-nat.c:284 m88kbsd-nat.c:96
-#: mips64obsd-nat.c:110 mipsnbsd-nat.c:90 ppcnbsd-nat.c:131 ppcobsd-nat.c:130
-#: s390-nat.c:170 sparc-nat.c:212 vaxbsd-nat.c:96 xtensa-linux-nat.c:221
-msgid "Couldn't write registers"
+#: amd64fbsd-nat.c:200
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
 msgstr ""
 
-#: alphabsd-nat.c:154 amd64-linux-nat.c:261 amd64bsd-nat.c:112
-#: hppabsd-nat.c:186 hppanbsd-nat.c:223 i386-linux-nat.c:350 i386bsd-nat.c:235
-#: m68kbsd-nat.c:173 m68klinux-nat.c:380 mipsnbsd-nat.c:109 ppcobsd-nat.c:147
-#: s390-nat.c:207
-msgid "Couldn't write floating point status"
+#: amd64fbsd-nat.c:213
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
 msgstr ""
 
-#: amd64-linux-nat.c:186 amd64-linux-nat.c:245
+#: amd64-linux-nat.c:185 amd64-linux-nat.c:244
 msgid "Couldn't get extended state status"
 msgstr ""
 
-#: amd64-linux-nat.c:251 i386-linux-nat.c:416
+#: amd64-linux-nat.c:250 i386-linux-nat.c:415
 msgid "Couldn't write extended state status"
 msgstr ""
 
-#: amd64-linux-nat.c:290 i386-linux-nat.c:678
+#: amd64-linux-nat.c:283 i386-linux-nat.c:671
 msgid "Couldn't read debug register"
 msgstr ""
 
-#: amd64-linux-nat.c:313 i386-linux-nat.c:701 mips-linux-nat.c:881
-#: mips-linux-nat.c:899
+#: amd64-linux-nat.c:303 i386-linux-nat.c:691 mips-linux-nat.c:879
+#: mips-linux-nat.c:897
 msgid "Couldn't write debug register"
 msgstr ""
 
-#: amd64-linux-nat.c:733
+#: amd64-linux-nat.c:720
 msgid "Couldn't get CS register"
 msgstr ""
 
-#: amd64-linux-tdep.c:1202 i386-linux-tdep.c:434
+#: amd64-linux-tdep.c:1201 i386-linux-tdep.c:433
 #, possible-c-format
 msgid "Process record and replay target doesn't support syscall number %s\n"
 msgstr ""
 
-#: amd64-tdep.c:188 avr-tdep.c:1344 cris-tdep.c:1852 s390-tdep.c:159
+#: amd64-tdep.c:190 avr-tdep.c:1343 cris-tdep.c:1851 s390-tdep.c:193
 #, possible-c-format
 msgid "Unmapped DWARF Register #%d encountered."
 msgstr ""
 
 #. We shouldn't get here.
-#: amd64-tdep.c:1091
+#: amd64-tdep.c:1107
 msgid "unable to find free reg"
 msgstr ""
 
-#: amd64fbsd-nat.c:188
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_rip) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: amd64fbsd-nat.c:201
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_rsp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: amd64fbsd-nat.c:214
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_rbp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: arch-utils.c:215 m32c-tdep.c:2599 m32c-tdep.c:2620
+#: arch-utils.c:214 m32c-tdep.c:2598 m32c-tdep.c:2619
 msgid "No virtual frame pointer available"
 msgstr ""
 
-#: arch-utils.c:278
+#: arch-utils.c:277
 msgid "The target endianness is set automatically (currently big endian)\n"
 msgstr ""
 
-#: arch-utils.c:281
+#: arch-utils.c:280
 msgid ""
 "The target endianness is set automatically (currently little endian)\n"
 msgstr ""
 
-#: arch-utils.c:286
+#: arch-utils.c:285
 msgid "The target is assumed to be big endian\n"
 msgstr ""
 
-#: arch-utils.c:289
+#: arch-utils.c:288
 msgid "The target is assumed to be little endian\n"
 msgstr ""
 
-#: arch-utils.c:304
+#: arch-utils.c:303
 msgid "set_endian: architecture update failed"
 msgstr ""
 
-#: arch-utils.c:310
+#: arch-utils.c:309
 msgid "Little endian target not supported by GDB\n"
 msgstr ""
 
-#: arch-utils.c:318
+#: arch-utils.c:317
 msgid "Big endian target not supported by GDB\n"
 msgstr ""
 
-#: arch-utils.c:324
+#: arch-utils.c:323
 msgid "set_endian: bad value"
 msgstr ""
 
-#: arch-utils.c:383
+#: arch-utils.c:382
 #, possible-c-format
 msgid ""
 "Selected architecture %s is not compatible with reported target architecture "
@@ -1280,303 +1299,358 @@
 
 #. We have no idea which one is better.  This is a bug, but not
 #. a critical problem; warn the user.
-#: arch-utils.c:407
+#: arch-utils.c:406
 #, possible-c-format
 msgid ""
 "Selected architecture %s is ambiguous with reported target architecture %s"
 msgstr ""
 
-#: arch-utils.c:438
+#: arch-utils.c:437
 #, possible-c-format
 msgid "The target architecture is set automatically (currently %s)\n"
 msgstr ""
 
-#: arch-utils.c:442
+#: arch-utils.c:441
 #, possible-c-format
 msgid "The target architecture is assumed to be %s\n"
 msgstr ""
 
-#: arch-utils.c:462
+#: arch-utils.c:461
 msgid "could not select an architecture automatically"
 msgstr ""
 
-#: arch-utils.c:469
+#: arch-utils.c:468
 msgid "set_architecture: bfd_scan_arch failed"
 msgstr ""
 
-#: arch-utils.c:473
+#: arch-utils.c:472
 #, possible-c-format
 msgid "Architecture `%s' not recognized.\n"
 msgstr ""
 
-#: arch-utils.c:558
+#: arch-utils.c:557
 msgid "Architecture of file not recognized."
 msgstr ""
 
-#: arch-utils.c:605
+#: arch-utils.c:604
 msgid "initialize_current_architecture: No arch"
 msgstr ""
 
-#: arch-utils.c:609
+#: arch-utils.c:608
 msgid "initialize_current_architecture: Arch not found"
 msgstr ""
 
-#: arch-utils.c:652
+#: arch-utils.c:651
 msgid ""
 "initialize_current_architecture: Selection of initial architecture failed"
 msgstr ""
 
-#: arch-utils.c:666
+#: arch-utils.c:665
 msgid "Set architecture of target."
 msgstr ""
 
-#: arch-utils.c:667
+#: arch-utils.c:666
 msgid "Show architecture of target."
 msgstr ""
 
-#: arch-utils.c:799
+#: arch-utils.c:793
+msgid "This architecture has no method to collect a return address."
+msgstr ""
+
+#: arch-utils.c:806
 msgid "Set endianness of target."
 msgstr ""
 
-#: arch-utils.c:800
+#: arch-utils.c:807
 msgid "Show endianness of target."
 msgstr ""
 
-#: arm-linux-nat.c:108
+#: arm-linux-nat.c:107
 msgid "Unable to fetch floating point register."
 msgstr ""
 
-#: arm-linux-nat.c:138 arm-linux-nat.c:167 arm-linux-nat.c:204
+#: arm-linux-nat.c:137 arm-linux-nat.c:166 arm-linux-nat.c:203
 msgid "Unable to fetch the floating point registers."
 msgstr ""
 
-#: arm-linux-nat.c:183
+#: arm-linux-nat.c:182
 msgid "Unable to store floating point register."
 msgstr ""
 
-#: arm-linux-nat.c:220
+#: arm-linux-nat.c:219
 msgid "Unable to store floating point registers."
 msgstr ""
 
-#: arm-linux-nat.c:240
+#: arm-linux-nat.c:239
 msgid "Unable to fetch general register."
 msgstr ""
 
-#: arm-linux-nat.c:282 arm-linux-nat.c:321 arm-linux-nat.c:355
+#: arm-linux-nat.c:281 arm-linux-nat.c:320 arm-linux-nat.c:354
 msgid "Unable to fetch general registers."
 msgstr ""
 
-#: arm-linux-nat.c:337
+#: arm-linux-nat.c:336
 msgid "Unable to store general register."
 msgstr ""
 
-#: arm-linux-nat.c:373
+#: arm-linux-nat.c:372
 msgid "Unable to store general registers."
 msgstr ""
 
-#: arm-linux-nat.c:395 arm-linux-nat.c:424
+#: arm-linux-nat.c:394 arm-linux-nat.c:423
 msgid "Unable to fetch WMMX registers."
 msgstr ""
 
-#: arm-linux-nat.c:450
+#: arm-linux-nat.c:449
 msgid "Unable to store WMMX registers."
 msgstr ""
 
-#: arm-linux-nat.c:472
+#: arm-linux-nat.c:471
 msgid "Unable to fetch VFP registers."
 msgstr ""
 
-#: arm-linux-nat.c:496
+#: arm-linux-nat.c:495
 msgid "Unable to fetch VFP registers (for update)."
 msgstr ""
 
-#: arm-linux-nat.c:511
+#: arm-linux-nat.c:510
 msgid "Unable to store VFP registers."
 msgstr ""
 
-#: arm-linux-nat.c:980
+#: arm-linux-nat.c:979
 msgid "Unexpected error setting breakpoint address"
 msgstr ""
 
-#: arm-linux-nat.c:983
+#: arm-linux-nat.c:982
 msgid "Unexpected error setting breakpoint"
 msgstr ""
 
-#: arm-linux-nat.c:1025
+#: arm-linux-nat.c:1024
 msgid "Unexpected error clearing breakpoint"
 msgstr ""
 
-#: arm-linux-tdep.c:1109
+#: arm-linux-tdep.c:1103
 msgid "arm_linux_init_abi: Floating point model not supported"
 msgstr ""
 
+#: armnbsd-nat.c:88
+msgid "unable to fetch general register"
+msgstr ""
+
+#: armnbsd-nat.c:141 armnbsd-nat.c:189 armnbsd-nat.c:227
+msgid "unable to fetch general registers"
+msgstr ""
+
+#: armnbsd-nat.c:159
+msgid "unable to fetch floating-point register"
+msgstr ""
+
+#: armnbsd-nat.c:289 armnbsd-nat.c:372
+#, possible-c-format
+msgid "unable to write register %d to inferior"
+msgstr ""
+
+#: armnbsd-nat.c:337
+msgid "unable to store general registers"
+msgstr ""
+
+#: armnbsd-nat.c:351
+msgid "unable to fetch floating-point registers"
+msgstr ""
+
+#: armnbsd-nat.c:394
+msgid "unable to store floating-point registers"
+msgstr ""
+
+#: armnbsd-nat.c:446
+msgid "wrong size of register set in core file"
+msgstr ""
+
+#: armnbsd-nat.c:458
+msgid "wrong size of FPA register set in core file"
+msgstr ""
+
+#: armnbsd-tdep.c:64 arm-tdep.c:10079
+msgid "arm_gdbarch_init: bad byte order for float format"
+msgstr ""
+
 #. multiply
-#: arm-tdep.c:1579 arm-tdep.c:4623 arm-tdep.c:4644 arm-tdep.c:4759
+#: arm-tdep.c:1574 arm-tdep.c:4608 arm-tdep.c:4629 arm-tdep.c:4744
 msgid "Invalid update to pc in instruction"
 msgstr ""
 
-#: arm-tdep.c:1649
+#: arm-tdep.c:1644
 msgid "bad value in switch"
 msgstr ""
 
-#: arm-tdep.c:3017
+#: arm-tdep.c:3007
 #, possible-c-format
 msgid "Unexpected register %d"
 msgstr ""
 
 #. Should never happen.
-#: arm-tdep.c:3284
+#: arm-tdep.c:3274
 msgid "unknown type alignment"
 msgstr ""
 
-#: arm-tdep.c:3345 arm-tdep.c:3367
+#: arm-tdep.c:3335 arm-tdep.c:3357
 #, possible-c-format
 msgid "Invalid VFP CPRC type: %d."
 msgstr ""
 
-#: arm-tdep.c:3801
+#: arm-tdep.c:3791
 #, c-format
 msgid "Hardware FPU type %d\n"
 msgstr ""
 
-#: arm-tdep.c:3803
+#: arm-tdep.c:3793
 #, c-format
 msgid "Software FPU type %d\n"
 msgstr ""
 
 #. i18n: [floating point unit] mask
-#: arm-tdep.c:3805
+#: arm-tdep.c:3795
 msgid "mask: "
 msgstr ""
 
 #. i18n: [floating point unit] flags
-#: arm-tdep.c:3808
+#: arm-tdep.c:3798
 msgid "flags: "
 msgstr ""
 
-#: arm-tdep.c:4037
+#: arm-tdep.c:4027
 #, possible-c-format
 msgid "Bad REGNUM %d"
 msgstr ""
 
-#: arm-tdep.c:4844
+#: arm-tdep.c:4828
 msgid "Bad bit-field extraction\n"
 msgstr ""
 
-#: arm-tdep.c:4865 arm-tdep.c:4871
+#: arm-tdep.c:4849 arm-tdep.c:4855
 msgid "Infinite loop detected"
 msgstr ""
 
 #. Unpredictable behaviour.  Try to do something sensible (switch to ARM
 #. mode, align dest to 4 bytes).
-#: arm-tdep.c:5440
+#: arm-tdep.c:5425
 msgid "Single-stepping BX to non-word-aligned ARM instruction."
 msgstr ""
 
-#: arm-tdep.c:5502
+#: arm-tdep.c:5487
 msgid "Instruction wrote to PC in an unexpected way when single-stepping"
 msgstr ""
 
-#: arm-tdep.c:5508
+#: arm-tdep.c:5493
 msgid "Invalid argument to displaced_write_reg"
 msgstr ""
 
-#: arm-tdep.c:6099
+#: arm-tdep.c:6454
 msgid "copy_extra_ld_st: instruction decode error"
 msgstr ""
 
-#: arm-tdep.c:6292
+#: arm-tdep.c:6768
 msgid "Cannot single-step exception return"
 msgstr ""
 
-#: arm-tdep.c:6412
+#: arm-tdep.c:6888
 #, possible-c-format
 msgid "displaced: LDM: move loaded register r%d to r%d\n"
 msgstr ""
 
-#: arm-tdep.c:6417
+#: arm-tdep.c:6893
 #, possible-c-format
 msgid "displaced: LDM: register r%d already in the right place\n"
 msgstr ""
 
-#: arm-tdep.c:6437
+#: arm-tdep.c:6913
 #, possible-c-format
 msgid "displaced: LDM: restored clobbered register r%d\n"
 msgstr ""
 
-#: arm-tdep.c:6479
+#: arm-tdep.c:6956 arm-tdep.c:7067
 msgid "displaced: Unpredictable LDM or STM with base register r15"
 msgstr ""
 
-#: arm-tdep.c:6548
+#: arm-tdep.c:7025 arm-tdep.c:7111
 #, possible-c-format
 msgid ""
 "displaced: LDM r%d%s, {..., pc}: original reg list %.4x, modified list %.4x\n"
 msgstr ""
 
-#: arm-tdep.c:7076
-msgid "Displaced stepping is only supported in ARM mode"
+#: arm-tdep.c:8070
+#, possible-c-format
+msgid ""
+"displaced: POP {..., pc}: original reg list %.4x, modified list %.4x\n"
+msgstr ""
+
+#: arm-tdep.c:8187
+msgid "thumb_process_displaced_16bit_insn: Instruction decode error"
+msgstr ""
+
+#: arm-tdep.c:8395
+msgid "thumb_process_displaced_32bit_insn: Instruction decode error"
 msgstr ""
 
-#: arm-tdep.c:7134
+#: arm-tdep.c:8479
 msgid "arm_process_displaced_insn: Instruction decode error"
 msgstr ""
 
-#: arm-tdep.c:7411
+#: arm-tdep.c:8756
 msgid "arm_extract_return_value: Floating point model not supported"
 msgstr ""
 
-#: arm-tdep.c:7602
+#: arm-tdep.c:8947
 msgid "arm_store_return_value: Floating point model not supported"
 msgstr ""
 
-#: arm-tdep.c:7825
+#: arm-tdep.c:9176
 msgid "\"set arm\" must be followed by an apporpriate subcommand.\n"
 msgstr ""
 
-#: arm-tdep.c:7849 rs6000-tdep.c:4204 rs6000-tdep.c:4231
+#: arm-tdep.c:9200 rs6000-tdep.c:4202 rs6000-tdep.c:4229
 msgid "could not update architecture"
 msgstr ""
 
-#: arm-tdep.c:7866
+#: arm-tdep.c:9217
 #, possible-c-format
 msgid "Invalid fp model accepted: %s."
 msgstr ""
 
-#: arm-tdep.c:7880
+#: arm-tdep.c:9231
 #, possible-c-format
 msgid ""
 "The current ARM floating point model is \"auto\" (currently \"%s\").\n"
 msgstr ""
 
-#: arm-tdep.c:7884
+#: arm-tdep.c:9235
 #, possible-c-format
 msgid "The current ARM floating point model is \"%s\".\n"
 msgstr ""
 
-#: arm-tdep.c:7903
+#: arm-tdep.c:9254
 #, possible-c-format
 msgid "Invalid ABI accepted: %s."
 msgstr ""
 
-#: arm-tdep.c:7917
+#: arm-tdep.c:9268
 #, possible-c-format
 msgid "The current ARM ABI is \"auto\" (currently \"%s\").\n"
 msgstr ""
 
-#: arm-tdep.c:7921
+#: arm-tdep.c:9272
 #, possible-c-format
 msgid "The current ARM ABI is \"%s\".\n"
 msgstr ""
 
-#: arm-tdep.c:7932
+#: arm-tdep.c:9283
 #, possible-c-format
 msgid ""
 "The current execution mode assumed (when symbols are unavailable) is "
 "\"%s\".\n"
 msgstr ""
 
-#: arm-tdep.c:7944
+#: arm-tdep.c:9295
 #, possible-c-format
 msgid ""
 "The current execution mode assumed (even when symbols are available) is "
@@ -1584,61 +1658,57 @@
 msgstr ""
 
 #. Leave it as "auto".
-#: arm-tdep.c:8428
+#: arm-tdep.c:9779
 #, possible-c-format
 msgid "unknown ARM EABI version 0x%x"
 msgstr ""
 
-#: arm-tdep.c:8728 armnbsd-tdep.c:65
-msgid "arm_gdbarch_init: bad byte order for float format"
-msgstr ""
-
-#: arm-tdep.c:8906
+#: arm-tdep.c:10257
 #, possible-c-format
 msgid "arm_dump_tdep: Lowest pc = 0x%lx"
 msgstr ""
 
-#: arm-tdep.c:8953 arm-tdep.c:8957
+#: arm-tdep.c:10304 arm-tdep.c:10308
 msgid "Various ARM-specific commands."
 msgstr ""
 
-#: arm-tdep.c:8988
+#: arm-tdep.c:10339
 msgid "The valid values are:\n"
 msgstr ""
 
-#: arm-tdep.c:8990
+#: arm-tdep.c:10341
 msgid "The default is \"std\"."
 msgstr ""
 
-#: arm-tdep.c:8996
+#: arm-tdep.c:10347
 msgid "Set the disassembly style."
 msgstr ""
 
-#: arm-tdep.c:8997
+#: arm-tdep.c:10348
 msgid "Show the disassembly style."
 msgstr ""
 
-#: arm-tdep.c:9005
+#: arm-tdep.c:10356
 msgid "Set usage of ARM 32-bit mode."
 msgstr ""
 
-#: arm-tdep.c:9006
+#: arm-tdep.c:10357
 msgid "Show usage of ARM 32-bit mode."
 msgstr ""
 
-#: arm-tdep.c:9007
+#: arm-tdep.c:10358
 msgid "When off, a 26-bit PC will be used."
 msgstr ""
 
-#: arm-tdep.c:9015
+#: arm-tdep.c:10366
 msgid "Set the floating point type."
 msgstr ""
 
-#: arm-tdep.c:9016
+#: arm-tdep.c:10367
 msgid "Show the floating point type."
 msgstr ""
 
-#: arm-tdep.c:9017
+#: arm-tdep.c:10368
 msgid ""
 "auto - Determine the FP typefrom the OS-ABI.\n"
 "softfpa - Software FP, mixed-endian doubles on little-endian ARMs.\n"
@@ -1647,606 +1717,569 @@
 "vfp - VFP co-processor."
 msgstr ""
 
-#: arm-tdep.c:9027
+#: arm-tdep.c:10378
 msgid "Set the ABI."
 msgstr ""
 
-#: arm-tdep.c:9028
+#: arm-tdep.c:10379
 msgid "Show the ABI."
 msgstr ""
 
-#: arm-tdep.c:9036
+#: arm-tdep.c:10387
 msgid "Set the mode assumed when symbols are unavailable."
 msgstr ""
 
-#: arm-tdep.c:9037
+#: arm-tdep.c:10388
 msgid "Show the mode assumed when symbols are unavailable."
 msgstr ""
 
-#: arm-tdep.c:9042
+#: arm-tdep.c:10393
 msgid "Set the mode assumed even when symbols are available."
 msgstr ""
 
-#: arm-tdep.c:9043
+#: arm-tdep.c:10394
 msgid "Show the mode assumed even when symbols are available."
 msgstr ""
 
-#: arm-tdep.c:9049
+#: arm-tdep.c:10400
 msgid "Set ARM debugging."
 msgstr ""
 
-#: arm-tdep.c:9050
+#: arm-tdep.c:10401
 msgid "Show ARM debugging."
 msgstr ""
 
-#: arm-tdep.c:9051
+#: arm-tdep.c:10402
 msgid "When on, arm-specific debugging is enabled."
 msgstr ""
 
-#: armnbsd-nat.c:88
-msgid "unable to fetch general register"
-msgstr ""
-
-#: armnbsd-nat.c:141 armnbsd-nat.c:189 armnbsd-nat.c:227
-msgid "unable to fetch general registers"
-msgstr ""
-
-#: armnbsd-nat.c:159
-msgid "unable to fetch floating-point register"
-msgstr ""
-
-#: armnbsd-nat.c:289 armnbsd-nat.c:372
-#, possible-c-format
-msgid "unable to write register %d to inferior"
-msgstr ""
-
-#: armnbsd-nat.c:337
-msgid "unable to store general registers"
-msgstr ""
-
-#: armnbsd-nat.c:351
-msgid "unable to fetch floating-point registers"
-msgstr ""
-
-#: armnbsd-nat.c:394
-msgid "unable to store floating-point registers"
-msgstr ""
-
-#: armnbsd-nat.c:446
-msgid "wrong size of register set in core file"
-msgstr ""
-
-#: armnbsd-nat.c:458
-msgid "wrong size of FPA register set in core file"
-msgstr ""
-
-#: auxv.c:342
+#: auxv.c:419
 msgid "End of vector"
 msgstr ""
 
-#: auxv.c:343 auxv.c:364
+#: auxv.c:420 auxv.c:441
 msgid "Entry should be ignored"
 msgstr ""
 
-#: auxv.c:344
+#: auxv.c:421
 msgid "File descriptor of program"
 msgstr ""
 
-#: auxv.c:345
+#: auxv.c:422
 msgid "Program headers for program"
 msgstr ""
 
-#: auxv.c:346
+#: auxv.c:423
 msgid "Size of program header entry"
 msgstr ""
 
-#: auxv.c:347
+#: auxv.c:424
 msgid "Number of program headers"
 msgstr ""
 
-#: auxv.c:348
+#: auxv.c:425
 msgid "System page size"
 msgstr ""
 
-#: auxv.c:349
+#: auxv.c:426
 msgid "Base address of interpreter"
 msgstr ""
 
-#: auxv.c:350
+#: auxv.c:427
 msgid "Flags"
 msgstr ""
 
-#: auxv.c:351
+#: auxv.c:428
 msgid "Entry point of program"
 msgstr ""
 
-#: auxv.c:352
+#: auxv.c:429
 msgid "Program is not ELF"
 msgstr ""
 
-#: auxv.c:353 auxv.c:372
+#: auxv.c:430 auxv.c:449
 msgid "Real user ID"
 msgstr ""
 
-#: auxv.c:354 auxv.c:371
+#: auxv.c:431 auxv.c:448
 msgid "Effective user ID"
 msgstr ""
 
-#: auxv.c:355 auxv.c:374
+#: auxv.c:432 auxv.c:451
 msgid "Real group ID"
 msgstr ""
 
-#: auxv.c:356 auxv.c:373
+#: auxv.c:433 auxv.c:450
 msgid "Effective group ID"
 msgstr ""
 
-#: auxv.c:357
+#: auxv.c:434
 msgid "Frequency of times()"
 msgstr ""
 
-#: auxv.c:358
+#: auxv.c:435
 msgid "String identifying platform"
 msgstr ""
 
-#: auxv.c:359 auxv.c:380
+#: auxv.c:436 auxv.c:457
 msgid "Machine-dependent CPU capability hints"
 msgstr ""
 
-#: auxv.c:360
+#: auxv.c:437
 msgid "Used FPU control word"
 msgstr ""
 
-#: auxv.c:361
+#: auxv.c:438
 msgid "Data cache block size"
 msgstr ""
 
-#: auxv.c:362
+#: auxv.c:439
 msgid "Instruction cache block size"
 msgstr ""
 
-#: auxv.c:363
+#: auxv.c:440
 msgid "Unified cache block size"
 msgstr ""
 
-#: auxv.c:365
+#: auxv.c:442
 msgid "String identifying base platform"
 msgstr ""
 
-#: auxv.c:366
+#: auxv.c:443
 msgid "Address of 16 random bytes"
 msgstr ""
 
-#: auxv.c:367
+#: auxv.c:444
 msgid "File name of executable"
 msgstr ""
 
-#: auxv.c:368
+#: auxv.c:445
 msgid "Boolean, was exec setuid-like?"
 msgstr ""
 
-#: auxv.c:369
+#: auxv.c:446
 msgid "Special system info/entry points"
 msgstr ""
 
-#: auxv.c:370
+#: auxv.c:447
 msgid "System-supplied DSO's ELF header"
 msgstr ""
 
-#: auxv.c:375
+#: auxv.c:452
 msgid "Dynamic linker's ELF header"
 msgstr ""
 
-#: auxv.c:376
+#: auxv.c:453
 msgid "Dynamic linker's section headers"
 msgstr ""
 
-#: auxv.c:377
+#: auxv.c:454
 msgid "String giving name of dynamic linker"
 msgstr ""
 
-#: auxv.c:378
+#: auxv.c:455
 msgid "Large pagesize"
 msgstr ""
 
-#: auxv.c:379
+#: auxv.c:456
 msgid "Platform name string"
 msgstr ""
 
-#: auxv.c:381
+#: auxv.c:458
 msgid "Should flush icache?"
 msgstr ""
 
-#: auxv.c:382
+#: auxv.c:459
 msgid "CPU name string"
 msgstr ""
 
-#: auxv.c:383
+#: auxv.c:460
 msgid "COFF entry point address"
 msgstr ""
 
-#: auxv.c:384
+#: auxv.c:461
 msgid "COFF executable file descriptor"
 msgstr ""
 
-#: auxv.c:386
+#: auxv.c:463
 msgid "Canonicalized file name given to execve"
 msgstr ""
 
-#: auxv.c:387
+#: auxv.c:464
 msgid "String for name of MMU module"
 msgstr ""
 
-#: auxv.c:388
+#: auxv.c:465
 msgid "Dynamic linker's data segment address"
 msgstr ""
 
-#: auxv.c:390
+#: auxv.c:467
 msgid "AF_SUN_ flags passed from the kernel"
 msgstr ""
 
-#: auxv.c:430
+#: auxv.c:505
 msgid "The program has no auxiliary information now."
 msgstr ""
 
-#: auxv.c:436
+#: auxv.c:511
 msgid "No auxiliary vector found, or failed reading it."
 msgstr ""
 
-#: auxv.c:438
+#: auxv.c:513
 msgid "Auxiliary vector is empty."
 msgstr ""
 
-#: auxv.c:449
+#: auxv.c:524
 msgid ""
 "Display the inferior's auxiliary vector.\n"
 "This is information provided by the operating system at program startup."
 msgstr ""
 
-#: avr-tdep.c:374 avr-tdep.c:392 i386-tdep.c:276 i386-tdep.c:2624
-#: i386-tdep.c:2714 i386-tdep.c:2783 s390-tdep.c:197 s390-tdep.c:216
-#: s390-tdep.c:279 s390-tdep.c:328 sparc64-tdep.c:320 spu-tdep.c:180
-#: spu-tdep.c:248 spu-tdep.c:309
+#: avr-tdep.c:373 avr-tdep.c:391 i386-tdep.c:277 i386-tdep.c:2790
+#: i386-tdep.c:2894 i386-tdep.c:2977 s390-tdep.c:231 s390-tdep.c:250
+#: s390-tdep.c:313 s390-tdep.c:362 sparc64-tdep.c:339 spu-tdep.c:179
+#: spu-tdep.c:247 spu-tdep.c:308
 msgid "invalid regnum"
 msgstr ""
 
-#: avr-tdep.c:635
+#: avr-tdep.c:634
 #, possible-c-format
 msgid "Num pushes too large: %d\n"
 msgstr ""
 
-#: avr-tdep.c:1486
+#: avr-tdep.c:1485
 msgid "ERR: info io_registers NOT supported by current target\n"
 msgstr ""
 
-#: avr-tdep.c:1494
+#: avr-tdep.c:1493
 msgid "Error fetching number of io registers\n"
 msgstr ""
 
-#: avr-tdep.c:1503
+#: avr-tdep.c:1502
 #, possible-c-format
 msgid ""
 "Target has %u io registers:\n"
 "\n"
 msgstr ""
 
-#: avr-tdep.c:1552
+#: avr-tdep.c:1551
 msgid "query remote avr target for io space register values"
 msgstr ""
 
-#: ax-gdb.c:508
+#: ax-gdb.c:549
 msgid "gen_fetch: strange size"
 msgstr ""
 
-#: ax-gdb.c:520
+#: ax-gdb.c:561
 msgid "gen_fetch: bad type code"
 msgstr ""
 
-#: ax-gdb.c:637
+#: ax-gdb.c:678
 msgid "gen_var_ref: LOC_CONST_BYTES symbols are not supported"
 msgstr ""
 
-#: ax-gdb.c:669
+#: ax-gdb.c:710
 #, possible-c-format
 msgid "Cannot compute value of typedef `%s'."
 msgstr ""
 
-#: ax-gdb.c:701
+#: ax-gdb.c:742
 #, possible-c-format
 msgid "Couldn't resolve symbol `%s'."
 msgstr ""
 
-#: ax-gdb.c:725
+#: ax-gdb.c:766
 #, possible-c-format
 msgid "Cannot find value of botched symbol `%s'."
 msgstr ""
 
-#: ax-gdb.c:761
+#: ax-gdb.c:802
 msgid "Value not scalar: cannot be an rvalue."
 msgstr ""
 
-#: ax-gdb.c:1006
+#: ax-gdb.c:1047
 msgid "Invalid type cast: intended type must be scalar."
 msgstr ""
 
-#: ax-gdb.c:1029
+#: ax-gdb.c:1070
 msgid "Casts to requested type are not yet implemented."
 msgstr ""
 
-#: ax-gdb.c:1097
+#: ax-gdb.c:1138
 msgid ""
 "First argument of `-' is a pointer, but second argument is neither\n"
 "an integer nor a pointer of the same type."
 msgstr ""
 
-#: ax-gdb.c:1150
+#: ax-gdb.c:1191
 #, possible-c-format
 msgid "Invalid combination of types in %s."
 msgstr ""
 
-#: ax-gdb.c:1167
+#: ax-gdb.c:1208
 msgid "Invalid type of operand to `!'."
 msgstr ""
 
-#: ax-gdb.c:1178
+#: ax-gdb.c:1219
 msgid "Invalid type of operand to `~'."
 msgstr ""
 
-#: ax-gdb.c:1196
+#: ax-gdb.c:1237
 msgid "gen_deref: expected a pointer"
 msgstr ""
 
-#: ax-gdb.c:1205 valops.c:926
+#: ax-gdb.c:1246 valops.c:926
 msgid "Attempt to dereference a generic pointer."
 msgstr ""
 
-#: ax-gdb.c:1226
+#: ax-gdb.c:1267
 msgid "Operand of `&' is an rvalue, which has no address."
 msgstr ""
 
-#: ax-gdb.c:1229
+#: ax-gdb.c:1270
 msgid "Operand of `&' is in a register, and has no address."
 msgstr ""
 
-#: ax-gdb.c:1301
+#: ax-gdb.c:1342
 msgid "gen_bitfield_ref: bitfield too wide"
 msgstr ""
 
-#: ax-gdb.c:1453 ax-gdb.c:1595
+#: ax-gdb.c:1494 ax-gdb.c:1636
 #, possible-c-format
 msgid "static field `%s' has been optimized out, cannot use"
 msgstr ""
 
-#: ax-gdb.c:1465
+#: ax-gdb.c:1506
 msgid "find_field: anonymous unions not supported"
 msgstr ""
 
-#: ax-gdb.c:1513
+#: ax-gdb.c:1554
 #, possible-c-format
 msgid "The left operand of `%s' is not a %s."
 msgstr ""
 
-#: ax-gdb.c:1519
+#: ax-gdb.c:1560
 msgid "Structure does not live in memory."
 msgstr ""
 
-#: ax-gdb.c:1525
+#: ax-gdb.c:1566
 #, possible-c-format
 msgid "Couldn't find member named `%s' in struct/union/class `%s'"
 msgstr ""
 
-#: ax-gdb.c:1583
+#: ax-gdb.c:1624
 msgid "non-aggregate type to gen_struct_elt_for_reference"
 msgstr ""
 
-#: ax-gdb.c:1601 valops.c:3279
+#: ax-gdb.c:1642 valops.c:3298
 msgid "pointers to bitfield members not allowed"
 msgstr ""
 
 #. FIXME we need a way to do "want_address" equivalent
-#: ax-gdb.c:1605 valops.c:3288
+#: ax-gdb.c:1646 valops.c:3307
 #, possible-c-format
 msgid "Cannot reference non-static field \"%s\""
 msgstr ""
 
-#: ax-gdb.c:1626 eval.c:1574 valops.c:3463
+#: ax-gdb.c:1667 eval.c:1593 valops.c:3482
 #, possible-c-format
 msgid "No symbol \"%s\" in namespace \"%s\"."
 msgstr ""
 
-#: ax-gdb.c:1656 ax-gdb.c:1974 ax-gdb.c:2157
+#: ax-gdb.c:1697 ax-gdb.c:2015 ax-gdb.c:2197
 #, possible-c-format
 msgid "`%s' has been optimized out, cannot use"
 msgstr ""
 
-#: ax-gdb.c:1680
+#: ax-gdb.c:1721
 msgid "non-aggregate type in gen_aggregate_elt_ref"
 msgstr ""
 
-#: ax-gdb.c:1707
+#: ax-gdb.c:1748
 msgid "Left operand of `@' must be an object in memory."
 msgstr ""
 
-#: ax-gdb.c:1715
+#: ax-gdb.c:1756
 msgid "Right operand of `@' must be a constant, in agent expressions."
 msgstr ""
 
-#: ax-gdb.c:1718
+#: ax-gdb.c:1759
 msgid "Right operand of `@' must be an integer."
 msgstr ""
 
-#: ax-gdb.c:1721
+#: ax-gdb.c:1762
 msgid "Right operand of `@' must be positive."
 msgstr ""
 
-#: ax-gdb.c:1900 ax-gdb.c:1936
+#: ax-gdb.c:1941 ax-gdb.c:1977
 #, possible-c-format
 msgid "$%s is not a trace state variable, may not assign to it"
 msgstr ""
 
-#: ax-gdb.c:1904 ax-gdb.c:1940
+#: ax-gdb.c:1945 ax-gdb.c:1981
 msgid "May only assign to trace state variables"
 msgstr ""
 
-#: ax-gdb.c:1989 tracepoint.c:1370
+#: ax-gdb.c:2030 tracepoint.c:1468
 #, possible-c-format
 msgid "Register $%s not available"
 msgstr ""
 
-#: ax-gdb.c:1993
+#: ax-gdb.c:2034
 #, possible-c-format
 msgid "'%s' is a user-register; GDB cannot yet trace user-register contents."
 msgstr ""
 
-#: ax-gdb.c:2019
+#: ax-gdb.c:2060
 #, possible-c-format
 msgid ""
 "$%s is not a trace state variable; GDB agent expressions cannot use "
 "convenience variables."
 msgstr ""
 
-#: ax-gdb.c:2098
+#: ax-gdb.c:2139
 msgid "Argument of unary `*' is not a pointer."
 msgstr ""
 
-#: ax-gdb.c:2134
+#: ax-gdb.c:2175
 msgid "gen_expr: unhandled struct case"
 msgstr ""
 
-#: ax-gdb.c:2152
+#: ax-gdb.c:2192
 #, possible-c-format
 msgid "no `%s' found"
 msgstr ""
 
-#: ax-gdb.c:2174 eval.c:808 eval.c:2952
+#: ax-gdb.c:2214 eval.c:806 eval.c:2949
 #, possible-c-format
 msgid "There is no field named %s"
 msgstr ""
 
-#: ax-gdb.c:2180
+#: ax-gdb.c:2220
 msgid "Attempt to use a type name as an expression."
 msgstr ""
 
-#: ax-gdb.c:2183
+#: ax-gdb.c:2223
 #, possible-c-format
 msgid "Unsupported operator %s (%d) in expression."
 msgstr ""
 
-#: ax-gdb.c:2259
+#: ax-gdb.c:2299
 msgid "cannot subscript requested type: cannot call user defined functions"
 msgstr ""
 
-#: ax-gdb.c:2272 eval.c:2246 eval.c:2301 eval.c:2331 jv-lang.c:981
+#: ax-gdb.c:2312 eval.c:2247 eval.c:2302 eval.c:2332 jv-lang.c:989
 #: m2-lang.c:265
 #, possible-c-format
 msgid "cannot subscript something of type `%s'"
 msgstr ""
 
-#: ax-gdb.c:2275 eval.c:2249 eval.c:2334 jv-lang.c:983 m2-lang.c:268
+#: ax-gdb.c:2315 eval.c:2250 eval.c:2335 jv-lang.c:991 m2-lang.c:268
 msgid "cannot subscript requested type"
 msgstr ""
 
-#: ax-gdb.c:2280 valarith.c:960
+#: ax-gdb.c:2320 valarith.c:952
 msgid "Argument to arithmetic operation not a number or boolean."
 msgstr ""
 
-#: ax-gdb.c:2335
+#: ax-gdb.c:2375
 msgid "gen_expr: op case sets don't match"
 msgstr ""
 
-#: ax-gdb.c:2461 ax-gdb.c:2497
+#: ax-gdb.c:2527 ax-gdb.c:2579
 msgid "GDB can't do agent expression translation with overlays."
 msgstr ""
 
-#: ax-gdb.c:2464 ax-gdb.c:2500
+#: ax-gdb.c:2530 ax-gdb.c:2582
 msgid "expression to translate"
 msgstr ""
 
-#: ax-gdb.c:2524
+#: ax-gdb.c:2606
 msgid "Translate an expression into remote agent bytecode for tracing."
 msgstr ""
 
-#: ax-gdb.c:2529
+#: ax-gdb.c:2611
 msgid "Translate an expression into remote agent bytecode for evaluation."
 msgstr ""
 
-#: ax-general.c:129
+#: ax-general.c:128
 msgid "GDB bug: ax-general.c (read_const): incomplete constant"
 msgstr ""
 
-#: ax-general.c:153
+#: ax-general.c:152
 msgid "GDB bug: ax-general.c (ax_pick): stack depth out of range"
 msgstr ""
 
-#: ax-general.c:166
+#: ax-general.c:165
 msgid "GDB bug: ax-general.c (generic_ext): bit count out of range"
 msgstr ""
 
-#: ax-general.c:169
+#: ax-general.c:168
 msgid "GDB bug: ax-general.c (generic_ext): opcode has inadequate range"
 msgstr ""
 
-#: ax-general.c:200
+#: ax-general.c:199
 msgid ""
 "GDB bug: ax-general.c (ax_trace_quick): size out of range for trace_quick"
 msgstr ""
 
-#: ax-general.c:236
+#: ax-general.c:235
 msgid "GDB bug: ax-general.c (ax_label): label target out of range"
 msgstr ""
 
 #. FIXME: floating-point support not present yet.
-#: ax-general.c:282
+#: ax-general.c:281
 msgid "GDB bug: ax-general.c (ax_const_d): floating point not supported yet"
 msgstr ""
 
-#: ax-general.c:296 ax-general.c:410
+#: ax-general.c:295 ax-general.c:409
 #, possible-c-format
 msgid "'%s' is a pseudo-register; GDB cannot yet trace its contents."
 msgstr ""
 
-#: ax-general.c:300 ax-general.c:414
+#: ax-general.c:299 ax-general.c:413
 #, possible-c-format
 msgid "Trace '%s' failed."
 msgstr ""
 
-#: ax-general.c:307
+#: ax-general.c:306
 msgid "GDB bug: ax-general.c (ax_reg): register number out of range"
 msgstr ""
 
-#: ax-general.c:325
+#: ax-general.c:324
 #, possible-c-format
 msgid "ax-general.c (ax_tsv): variable number is %d, out of range"
 msgstr ""
 
-#: ax-general.c:357
+#: ax-general.c:356
 #, possible-c-format
 msgid "Scope: %s\n"
 msgstr ""
 
-#: ax-general.c:358
+#: ax-general.c:357
 msgid "Reg mask:"
 msgstr ""
 
-#: ax-general.c:360
+#: ax-general.c:359
 #, possible-c-format
 msgid " %02x"
 msgstr ""
 
-#: ax-general.c:361 darwin-nat-info.c:295 darwin-nat-info.c:588
-#: darwin-nat-info.c:795 darwin-nat.c:531
+#: ax-general.c:360 darwin-nat.c:544 darwin-nat-info.c:294
+#: darwin-nat-info.c:587 darwin-nat-info.c:795
 msgid "\n"
 msgstr ""
 
-#: ax-general.c:367
+#: ax-general.c:366
 msgid "GDB bug: ax-general.c (ax_print): opcode map out of sync"
 msgstr ""
 
-#: ax-general.c:376
+#: ax-general.c:375
 #, possible-c-format
 msgid "%3d  <bad opcode %02x>\n"
 msgstr ""
 
-#: ax-general.c:382
+#: ax-general.c:381
 #, possible-c-format
 msgid "%3d  <incomplete opcode %s>\n"
 msgstr ""
@@ -2356,586 +2389,512 @@
 msgid "    Maximum hash chain length: %3d\n"
 msgstr ""
 
-#: bfd-target.c:92
+#: bfd-target.c:91
 msgid "BFD backed target"
 msgstr ""
 
-#: bfd-target.c:93
+#: bfd-target.c:92
 msgid "You should never see this"
 msgstr ""
 
-#: bfin-tdep.c:454
+#: bfin-tdep.c:453
 msgid ""
 "Function Prologue not recognised; pc will point to ENTRY_POINT of the "
 "function"
 msgstr ""
 
-#: bfin-tdep.c:702 bfin-tdep.c:722 xtensa-tdep.c:338 xtensa-tdep.c:643
-#: xtensa-tdep.c:742
+#: bfin-tdep.c:701 bfin-tdep.c:721 xtensa-tdep.c:336 xtensa-tdep.c:641
+#: xtensa-tdep.c:740
 #, possible-c-format
 msgid "invalid register number %d"
 msgstr ""
 
-#: breakpoint.c:276
+#: block.c:201
+#, possible-c-format
+msgid ""
+"DW_OP_GNU_entry_value resolving cannot find DW_TAG_GNU_call_site %s in %s"
+msgstr ""
+
+#: breakpoint.c:309
 #, possible-c-format
 msgid "Debugger's willingness to use watchpoint hardware is %s.\n"
 msgstr ""
 
-#: breakpoint.c:292
+#: breakpoint.c:325
 #, possible-c-format
 msgid "Debugger's behavior regarding pending breakpoints is %s.\n"
 msgstr ""
 
-#: breakpoint.c:308
+#: breakpoint.c:341
 #, possible-c-format
 msgid "Automatic usage of hardware breakpoints is %s.\n"
 msgstr ""
 
-#: breakpoint.c:334
+#: breakpoint.c:367
 #, possible-c-format
 msgid "Always inserted breakpoint mode is %s (currently %s).\n"
 msgstr ""
 
-#: breakpoint.c:339
+#: breakpoint.c:372
 #, possible-c-format
 msgid "Always inserted breakpoint mode is %s.\n"
 msgstr ""
 
-#: breakpoint.c:596
+#: breakpoint.c:626
 #, possible-c-format
 msgid "Breakpoint %d now unconditional.\n"
 msgstr ""
 
-#: breakpoint.c:642
+#: breakpoint.c:676
 msgid "breakpoint number"
 msgstr ""
 
-#: breakpoint.c:647
+#: breakpoint.c:681
 #, possible-c-format
 msgid "Bad breakpoint argument: '%s'"
 msgstr ""
 
-#: breakpoint.c:658
+#: breakpoint.c:692
 msgid ""
 "Cannot set a condition where a Python 'stop' method has been defined in the "
 "breakpoint."
 msgstr ""
 
-#: breakpoint.c:664 breakpoint.c:11289
+#: breakpoint.c:698 breakpoint.c:12114
 #, possible-c-format
 msgid "No breakpoint number %d."
 msgstr ""
 
-#: breakpoint.c:681
+#: breakpoint.c:715
 msgid "The 'while-stepping' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:691
+#: breakpoint.c:725
 msgid "The 'collect' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:694
+#: breakpoint.c:728
 msgid "The 'teval' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:729
+#: breakpoint.c:769
 msgid "The 'while-stepping' command cannot be used for fast tracepoint"
 msgstr ""
 
-#: breakpoint.c:732
+#: breakpoint.c:772
 msgid "The 'while-stepping' command cannot be used for static tracepoint"
 msgstr ""
 
-#: breakpoint.c:736
+#: breakpoint.c:776
 msgid "The 'while-stepping' command can be used only once"
 msgstr ""
 
-#: breakpoint.c:751
+#: breakpoint.c:791
 msgid "The 'while-stepping' command cannot be nested"
 msgstr ""
 
-#: breakpoint.c:884
+#: breakpoint.c:924
 #, possible-c-format
 msgid "Type commands for breakpoint(s) %s, one per line."
 msgstr ""
 
-#: breakpoint.c:957
+#: breakpoint.c:997
 msgid "No breakpoints specified."
 msgstr ""
 
-#: breakpoint.c:1075
+#: breakpoint.c:1117
 #, possible-c-format
 msgid "reading through apparently deleted breakpoint #%d?"
 msgstr ""
 
-#: breakpoint.c:1477
+#: breakpoint.c:1520
+msgid "Target does not support this type of hardware watchpoint."
+msgstr ""
+
+#: breakpoint.c:1523
+msgid ""
+"There are not enough available hardware resources for this watchpoint."
+msgstr ""
+
+#: breakpoint.c:1539
+msgid "Expression cannot be implemented with read/access watchpoint."
+msgstr ""
+
+#: breakpoint.c:1573
 #, possible-c-format
 msgid ""
 "Watchpoint %d deleted because the program has left the block\n"
 "in which its expression is valid.\n"
 msgstr ""
 
-#: breakpoint.c:1591
+#: breakpoint.c:1705
 msgid ""
 "Note: automatically using hardware breakpoints for read-only addresses.\n"
 msgstr ""
 
-#: breakpoint.c:1600
+#: breakpoint.c:1714
 #, possible-c-format
 msgid "cannot set software breakpoint at readonly address %s"
 msgstr ""
 
-#: breakpoint.c:1630
+#: breakpoint.c:1739
 #, possible-c-format
 msgid "hardware breakpoint %d not supported in overlay!"
 msgstr ""
 
-#: breakpoint.c:1776
+#: breakpoint.c:1881
 #, possible-c-format
 msgid ""
 "Error inserting catchpoint %d: Your system does not support this type\n"
 "of catchpoint."
 msgstr ""
 
-#: breakpoint.c:1780
+#: breakpoint.c:1885
 #, possible-c-format
 msgid "Error inserting catchpoint %d."
 msgstr ""
 
-#: breakpoint.c:2496
+#: breakpoint.c:2597
 msgid "Cannot detach breakpoints of inferior_ptid"
 msgstr ""
 
-#: breakpoint.c:2623
+#: breakpoint.c:2717
 #, possible-c-format
 msgid "Could not remove hardware watchpoint %d."
 msgstr ""
 
-#: breakpoint.c:3298
+#: breakpoint.c:3424
 msgid "<unreadable>"
 msgstr ""
 
+#: breakpoint.c:3471
+msgid "print_bp_stop_message: unrecognized enum value"
+msgstr ""
+
 #. Did we stop because the user set the stop_on_solib_events
 #. variable?  (If so, we report this as a generic, "Stopped due
 #. to shlib event" message.)
-#: breakpoint.c:3375 infrun.c:5816
+#: breakpoint.c:3520 breakpoint.c:11123
 msgid "Stopped due to shared library event\n"
 msgstr ""
 
-#. Not sure how we will get here.
-#. GDB should not stop for these breakpoints.
-#: breakpoint.c:3382
-msgid "Thread Event Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. By analogy with the thread event, GDB should not stop for these.
-#: breakpoint.c:3388
-msgid "Overlay Event Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. These should never be enabled.
-#: breakpoint.c:3394
-msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. These should never be enabled.
-#: breakpoint.c:3400
-msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#. These should never be enabled.
-#: breakpoint.c:3407
-msgid "Exception Master Breakpoint: gdb should not stop!\n"
-msgstr ""
-
-#: breakpoint.c:3561
-msgid "print_bp_stop_message: unrecognized enum value"
-msgstr ""
-
 #. Error from catch_errors.
-#: breakpoint.c:4046
+#: breakpoint.c:3962
 #, possible-c-format
 msgid "Watchpoint %d deleted.\n"
 msgstr ""
 
-#: breakpoint.c:4151
+#: breakpoint.c:4077
 msgid "Watchpoint condition cannot be tested in the current scope"
 msgstr ""
 
-#: breakpoint.c:4522
+#: breakpoint.c:4448
 msgid "bpstat_what: tracepoint encountered"
 msgstr ""
 
-#: breakpoint.c:4535
+#: breakpoint.c:4461
 #, possible-c-format
 msgid "bpstat_what: unhandled bptype %d"
 msgstr ""
 
-#: breakpoint.c:4754
+#: breakpoint.c:4682
 #, possible-c-format
 msgid "bptypes table does not describe type #%d."
 msgstr ""
 
-#: breakpoint.c:4845
+#: breakpoint.c:4772
 msgid "print_one_breakpoint: bp_none encountered\n"
 msgstr ""
 
-#: breakpoint.c:5417
+#: breakpoint.c:5359
 msgid "Note: breakpoint "
 msgstr ""
 
 #. if (others == ???)
-#: breakpoint.c:5419
+#: breakpoint.c:5361
 msgid "Note: breakpoints "
 msgstr ""
 
-#: breakpoint.c:5440
+#: breakpoint.c:5381
 msgid "also set at pc "
 msgstr ""
 
-#: breakpoint.c:5612
+#: breakpoint.c:5561
 #, possible-c-format
 msgid "Breakpoint %d address previously adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:5615
+#: breakpoint.c:5564
 #, possible-c-format
 msgid "Breakpoint address adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:5715
+#: breakpoint.c:5664
 msgid "unknown breakpoint type"
 msgstr ""
 
-#: breakpoint.c:6204
+#: breakpoint.c:6166
 #, possible-c-format
 msgid "Temporarily disabling breakpoints for unloaded shared library \"%s\""
 msgstr ""
 
-#: breakpoint.c:6250
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (forked process %d), "
-msgstr ""
-
-#: breakpoint.c:6287
+#: breakpoint.c:6286
 #, possible-c-format
 msgid "Catchpoint %d (fork)"
 msgstr ""
 
-#: breakpoint.c:6349
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (vforked process %d), "
-msgstr ""
-
-#: breakpoint.c:6385
+#: breakpoint.c:6394
 #, possible-c-format
 msgid "Catchpoint %d (vfork)"
 msgstr ""
 
-#: breakpoint.c:6557
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (call to syscall %s), "
-msgstr ""
-
-#: breakpoint.c:6560
-#, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (returned from syscall %s), "
-msgstr ""
-
-#: breakpoint.c:6634
+#: breakpoint.c:6682
 #, possible-c-format
 msgid "Catchpoint %d (syscalls"
 msgstr ""
 
-#: breakpoint.c:6636
+#: breakpoint.c:6684
 #, possible-c-format
 msgid "Catchpoint %d (syscall"
 msgstr ""
 
-#: breakpoint.c:6653
+#: breakpoint.c:6701
 #, possible-c-format
 msgid "Catchpoint %d (any syscall)"
 msgstr ""
 
-#: breakpoint.c:6800
+#: breakpoint.c:6902
 #, possible-c-format
-msgid ""
-"\n"
-"Catchpoint %d (exec'd %s), "
+msgid "Catchpoint %d (exec)"
 msgstr ""
 
-#: breakpoint.c:6830
-#, possible-c-format
-msgid "Catchpoint %d (exec)"
+#: breakpoint.c:7264 breakpoint.c:12318
+msgid "No hardware breakpoint support in the target."
 msgstr ""
 
-#: breakpoint.c:7116
-#, possible-c-format
-msgid "(apparently deleted?) Eventpoint %d: "
-msgstr ""
-
-#: breakpoint.c:7159
-msgid "Temporary breakpoint"
-msgstr ""
-
-#: breakpoint.c:7161
-msgid "Breakpoint"
-msgstr ""
-
-#: breakpoint.c:7162 breakpoint.c:7183 breakpoint.c:7193 breakpoint.c:7203
-#, possible-c-format
-msgid " %d"
-msgstr ""
-
-#: breakpoint.c:7164
-msgid " at gnu-indirect-function resolver"
-msgstr ""
-
-#: breakpoint.c:7173
-#, possible-c-format
-msgid "Hardware assisted breakpoint %d"
-msgstr ""
-
-#: breakpoint.c:7182
-msgid "Tracepoint"
-msgstr ""
-
-#: breakpoint.c:7192
-msgid "Fast tracepoint"
-msgstr ""
-
-#: breakpoint.c:7202
-msgid "Static tracepoint"
-msgstr ""
-
-#: breakpoint.c:7234
-#, possible-c-format
-msgid " (%s) pending."
-msgstr ""
-
-#: breakpoint.c:7357 breakpoint.c:11504
-msgid "No hardware breakpoint support in the target."
-msgstr ""
-
-#: breakpoint.c:7359 breakpoint.c:8551 breakpoint.c:11506
+#: breakpoint.c:7266 breakpoint.c:8335 breakpoint.c:12320
 msgid "Hardware breakpoints used exceeds limit."
 msgstr ""
 
-#: breakpoint.c:7412 breakpoint.c:7421
+#: breakpoint.c:7317 breakpoint.c:7326
 #, possible-c-format
 msgid "Probed static tracepoint marker \"%s\"\n"
 msgstr ""
 
-#: breakpoint.c:7426
+#: breakpoint.c:7331
 msgid "Couldn't determine the static tracepoint marker to probe"
 msgstr ""
 
-#: breakpoint.c:7450
+#: breakpoint.c:7350
 #, possible-c-format
 msgid "Garbage %s follows condition"
 msgstr ""
 
-#: breakpoint.c:7688
+#: breakpoint.c:7502
 msgid "No default breakpoint address now."
 msgstr ""
 
-#: breakpoint.c:7767
+#: breakpoint.c:7567
 #, possible-c-format
 msgid "May not have a fast tracepoint at 0x%s%s"
 msgstr ""
 
-#: breakpoint.c:7826
+#: breakpoint.c:7618
 msgid "Junk after thread keyword."
 msgstr ""
 
-#: breakpoint.c:7828 breakpoint.c:8888 thread.c:1246
+#: breakpoint.c:7620 breakpoint.c:9098 thread.c:1239
 #, possible-c-format
 msgid "Unknown thread %d."
 msgstr ""
 
-#: breakpoint.c:7838
+#: breakpoint.c:7630
 msgid "Junk after task keyword."
 msgstr ""
 
-#: breakpoint.c:7840
+#: breakpoint.c:7632
 #, possible-c-format
 msgid "Unknown task %d."
 msgstr ""
 
-#: breakpoint.c:7871
+#: breakpoint.c:7663
 #, possible-c-format
 msgid "No known static tracepoint marker named %s"
 msgstr ""
 
-#: breakpoint.c:7976
-msgid "Make breakpoint pending on future shared library load? "
+#: breakpoint.c:7766
+#, possible-c-format
+msgid "Make %s pending on future shared library load? "
 msgstr ""
 
-#: breakpoint.c:8153
+#: breakpoint.c:7944
 msgid ""
 "Multiple breakpoints were set.\n"
 "Use the \"delete\" command to delete unwanted breakpoints."
 msgstr ""
 
-#: breakpoint.c:8208
+#: breakpoint.c:7998 linespec.c:2429
 #, possible-c-format
 msgid "No line %d in file \"%s\"."
 msgstr ""
 
-#: breakpoint.c:8282
+#: breakpoint.c:8072
 msgid ""
 "Specify the type of breakpoint to set.\n"
 "Usage: stop in <function | address>\n"
 "       stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:8315
+#: breakpoint.c:8105
 msgid "Usage: stop in <function | address>\n"
 msgstr ""
 
-#: breakpoint.c:8347
+#: breakpoint.c:8137
 msgid "Usage: stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:8468
+#: breakpoint.c:8262
 #, possible-c-format
 msgid "Hardware assisted ranged breakpoint %d from %s to %s."
 msgstr ""
 
-#: breakpoint.c:8519 breakpoint.c:8613
+#: breakpoint.c:8303 breakpoint.c:8383
 msgid "Could not find location of the end of the range."
 msgstr ""
 
-#: breakpoint.c:8544
+#: breakpoint.c:8328
 msgid "This target does not support hardware ranged breakpoints."
 msgstr ""
 
-#: breakpoint.c:8554
+#: breakpoint.c:8339
 msgid "No address range specified."
 msgstr ""
 
-#: breakpoint.c:8572
+#: breakpoint.c:8349
 msgid "Too few arguments."
 msgstr ""
 
-#: breakpoint.c:8574
+#: breakpoint.c:8351
 msgid "Could not find location of the beginning of the range."
 msgstr ""
 
-#: breakpoint.c:8576 breakpoint.c:8615
+#: breakpoint.c:8357 breakpoint.c:8388
 msgid "Cannot create a ranged breakpoint with multiple locations."
 msgstr ""
 
-#: breakpoint.c:8621
-msgid "Invalid address range, end preceeds start."
+#: breakpoint.c:8396
+msgid "Invalid address range, end precedes start."
 msgstr ""
 
 #. Length overflowed.
-#: breakpoint.c:8626
+#: breakpoint.c:8401
 msgid "Address range too large."
 msgstr ""
 
-#: breakpoint.c:8884
-#, possible-c-format
-msgid "Invalid thread ID specification %s."
+#: breakpoint.c:8788 breakpoint.c:8911 breakpoint.c:8967 breakpoint.c:8998
+msgid "Invalid hardware watchpoint type."
 msgstr ""
 
-#: breakpoint.c:8916
-#, possible-c-format
-msgid "Cannot watch constant value `%.*s'."
+#: breakpoint.c:8819
+msgid "Invalid watchpoint type."
 msgstr ""
 
-#: breakpoint.c:8953
-msgid "Junk at end of command."
+#: breakpoint.c:8915
+msgid ""
+"\n"
+"Check the underlying instruction at PC for the memory\n"
+"address and value which triggered this watchpoint.\n"
 msgstr ""
 
-#: breakpoint.c:8964
-msgid "Expression cannot be implemented with read/access watchpoint."
+#: breakpoint.c:9086
+msgid "You can specify only one thread."
 msgstr ""
 
-#: breakpoint.c:8972
-msgid "Target does not support this type of hardware watchpoint."
+#: breakpoint.c:9094
+#, possible-c-format
+msgid "Invalid thread ID specification %s."
 msgstr ""
 
-#: breakpoint.c:8975
-msgid "Target can only support one kind of HW watchpoint at a time."
+#: breakpoint.c:9108
+msgid "You can specify only one mask."
 msgstr ""
 
-#: breakpoint.c:9305
-msgid "Couldn't get information on specified line."
+#: breakpoint.c:9146
+#, possible-c-format
+msgid "Cannot watch constant value `%.*s'."
 msgstr ""
 
-#: breakpoint.c:9457
-msgid "unsupported or unknown fork kind; cannot catch it"
+#: breakpoint.c:9167
+msgid "This target does not support masked watchpoints."
 msgstr ""
 
-#: breakpoint.c:9556
-msgid "Temporary catchpoint "
+#: breakpoint.c:9169
+msgid "Invalid mask or memory region."
 msgstr ""
 
-#: breakpoint.c:9557
-msgid "Catchpoint "
+#: breakpoint.c:9195
+msgid "Junk at end of command."
+msgstr ""
+
+#: breakpoint.c:9538
+msgid "Couldn't get information on specified line."
+msgstr ""
+
+#: breakpoint.c:9690
+msgid "unsupported or unknown fork kind; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:9559
+#: breakpoint.c:9799
 msgid " (throw)"
 msgstr ""
 
-#: breakpoint.c:9560
+#: breakpoint.c:9800
 msgid " (catch)"
 msgstr ""
 
-#: breakpoint.c:9634
+#: breakpoint.c:9865
 msgid "Unsupported or unknown exception event; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:9639
+#: breakpoint.c:9870
 msgid "Unsupported with this platform/compiler combination."
 msgstr ""
 
 #. Here we have to issue an error instead of a warning,
 #. because GDB cannot do anything useful if there's no
 #. syscall number to be caught.
-#: breakpoint.c:9786
+#: breakpoint.c:9966
 #, possible-c-format
 msgid "Unknown syscall name '%s'."
 msgstr ""
 
-#: breakpoint.c:9810
+#: breakpoint.c:9990
 msgid ""
 "The feature 'catch syscall' is not supported on this architecture yet."
 msgstr ""
 
-#: breakpoint.c:9862 breakpoint.c:9869
+#: breakpoint.c:10021 breakpoint.c:10028
 msgid "Catch requires an event name."
 msgstr ""
 
-#: breakpoint.c:9901
+#: breakpoint.c:10085
 msgid "No source file specified."
 msgstr ""
 
-#: breakpoint.c:9986
+#: breakpoint.c:10175
 #, possible-c-format
 msgid "No breakpoint at %s."
 msgstr ""
 
-#: breakpoint.c:9988
+#: breakpoint.c:10177
 msgid "No breakpoint at this line."
 msgstr ""
 
-#: breakpoint.c:9996
+#: breakpoint.c:10200
 msgid "Deleted breakpoint "
 msgstr ""
 
-#: breakpoint.c:9998
+#: breakpoint.c:10202
 msgid "Deleted breakpoints "
 msgstr ""
 
@@ -2947,136 +2906,196 @@
 #. Note that at this point, old_loc->owner is still
 #. valid, as delete_breakpoint frees the breakpoint
 #. only after calling us.
-#: breakpoint.c:10277
+#: breakpoint.c:10547
 #, possible-c-format
 msgid "warning: Error removing breakpoint %d\n"
 msgstr ""
 
-#: breakpoint.c:10382
+#: breakpoint.c:10651
 msgid "allegedly permanent breakpoint is not actually inserted"
 msgstr ""
 
-#: breakpoint.c:10408
+#: breakpoint.c:10683
 msgid "another breakpoint was inserted on top of a permanent breakpoint"
 msgstr ""
 
-#: breakpoint.c:10626
+#: breakpoint.c:10763
+#, possible-c-format
+msgid " (%s) pending."
+msgstr ""
+
+#: breakpoint.c:11040
+msgid "Temporary breakpoint"
+msgstr ""
+
+#: breakpoint.c:11042
+msgid "Breakpoint"
+msgstr ""
+
+#: breakpoint.c:11043 breakpoint.c:11261 breakpoint.c:11265 breakpoint.c:11269
+#, possible-c-format
+msgid " %d"
+msgstr ""
+
+#: breakpoint.c:11045
+msgid " at gnu-indirect-function resolver"
+msgstr ""
+
+#: breakpoint.c:11048
+#, possible-c-format
+msgid "Hardware assisted breakpoint %d"
+msgstr ""
+
+#: breakpoint.c:11069
+#, possible-c-format
+msgid "unhandled breakpoint type %d"
+msgstr ""
+
+#. Not sure how we will get here.
+#. GDB should not stop for these breakpoints.
+#: breakpoint.c:11132
+msgid "Thread Event Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. By analogy with the thread event, GDB should not stop for these.
+#: breakpoint.c:11137
+msgid "Overlay Event Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. These should never be enabled.
+#: breakpoint.c:11142
+msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. These should never be enabled.
+#: breakpoint.c:11147
+msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#. These should never be enabled.
+#: breakpoint.c:11153
+msgid "Exception Master Breakpoint: gdb should not stop!\n"
+msgstr ""
+
+#: breakpoint.c:11260
+msgid "Tracepoint"
+msgstr ""
+
+#: breakpoint.c:11264
+msgid "Fast tracepoint"
+msgstr ""
+
+#: breakpoint.c:11268
+msgid "Static tracepoint"
+msgstr ""
+
+#: breakpoint.c:11273 breakpoint.c:11292
+#, possible-c-format
+msgid "unhandled tracepoint type %d"
+msgstr ""
+
+#: breakpoint.c:11486
 msgid "Delete all breakpoints? "
 msgstr ""
 
-#: breakpoint.c:10742
+#: breakpoint.c:11593
 #, possible-c-format
 msgid "static tracepoint %d changed probed marker from %s to %s"
 msgstr ""
 
-#: breakpoint.c:10776
+#: breakpoint.c:11628
 #, possible-c-format
 msgid ""
 "marker for static tracepoint %d (%s) not found at previous line number"
 msgstr ""
 
-#: breakpoint.c:10874
+#: breakpoint.c:11726
 #, possible-c-format
-msgid "failed to reevaluate condition for breakpoint %d: %s"
-msgstr ""
-
-#: breakpoint.c:10970
-#, possible-c-format
-msgid "marker %s not found"
+msgid "Could not reset ranged breakpoint %d: multiple locations found\n"
 msgstr ""
 
-#: breakpoint.c:11087
+#: breakpoint.c:11766
 #, possible-c-format
-msgid "attempted to reset apparently deleted breakpoint #%d?"
+msgid "failed to reevaluate condition for breakpoint %d: %s"
 msgstr ""
 
-#: breakpoint.c:11149
+#: breakpoint.c:11857
 #, possible-c-format
-msgid "Deleting unknown breakpoint type %d\n"
+msgid "marker %s not found"
 msgstr ""
 
-#: breakpoint.c:11264
+#: breakpoint.c:12089
 #, possible-c-format
 msgid "Ignore count ignored for tracepoint %d."
 msgstr ""
 
-#: breakpoint.c:11273
+#: breakpoint.c:12098
 #, possible-c-format
 msgid "Will stop next time breakpoint %d is reached."
 msgstr ""
 
-#: breakpoint.c:11277
+#: breakpoint.c:12102
 #, possible-c-format
 msgid "Will ignore next crossing of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:11280
+#: breakpoint.c:12105
 #, possible-c-format
 msgid "Will ignore next %d crossings of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:11301
+#: breakpoint.c:12126
 msgid "a breakpoint number"
 msgstr ""
 
-#: breakpoint.c:11305
+#: breakpoint.c:12130
 #, possible-c-format
 msgid "bad breakpoint number: '%s'"
 msgstr ""
 
-#: breakpoint.c:11307
+#: breakpoint.c:12132
 msgid "Second argument (specified ignore-count) is missing."
 msgstr ""
 
-#: breakpoint.c:11330
+#: breakpoint.c:12155
 msgid "one or more breakpoint numbers"
 msgstr ""
 
-#: breakpoint.c:11343
+#: breakpoint.c:12168
 #, possible-c-format
 msgid "bad breakpoint number at or near '%s'"
 msgstr ""
 
-#: breakpoint.c:11372
+#: breakpoint.c:12180
 #, possible-c-format
 msgid "No breakpoint number %d.\n"
 msgstr ""
 
-#: breakpoint.c:11392 breakpoint.c:11401
+#: breakpoint.c:12200 breakpoint.c:12209
 #, possible-c-format
 msgid "Bad breakpoint number '%s'"
 msgstr ""
 
-#: breakpoint.c:11406 breakpoint.c:11413
+#: breakpoint.c:12214 breakpoint.c:12221
 #, possible-c-format
 msgid "Bad breakpoint location number '%s'"
 msgstr ""
 
-#: breakpoint.c:11462
-#, possible-c-format
-msgid "attempted to disable apparently deleted breakpoint #%d?"
-msgstr ""
-
-#: breakpoint.c:11519
+#: breakpoint.c:12340
 #, possible-c-format
 msgid "Cannot enable watchpoint %d: "
 msgstr ""
 
-#: breakpoint.c:11564
-#, possible-c-format
-msgid "attempted to enable apparently deleted breakpoint #%d?"
-msgstr ""
-
-#: breakpoint.c:11664 symtab.c:4443
+#: breakpoint.c:12507 symtab.c:4681
 msgid "Empty line specification."
 msgstr ""
 
-#: breakpoint.c:11674 symtab.c:4454
+#: breakpoint.c:12515 symtab.c:4691
 #, possible-c-format
 msgid "Junk at end of line specification: %s"
 msgstr ""
 
-#: breakpoint.c:11756
+#: breakpoint.c:12597
 #, possible-c-format
 msgid "Could not insert single-step breakpoint at %s"
 msgstr ""
@@ -3085,81 +3104,76 @@
 #. address.  Since there is no way to confirm that the address
 #. means the same thing as when the trace was started, warn the
 #. user.
-#: breakpoint.c:12007
+#: breakpoint.c:12850
 #, possible-c-format
 msgid "Uploaded tracepoint %d has no source location, using raw address"
 msgstr ""
 
-#: breakpoint.c:12016
+#: breakpoint.c:12859
 #, possible-c-format
 msgid "Uploaded tracepoint %d condition has no source form, ignoring it"
 msgstr ""
 
-#: breakpoint.c:12063
+#: breakpoint.c:12906
 #, possible-c-format
 msgid "Uploaded tracepoint %d actions have no source form, ignoring them"
 msgstr ""
 
-#: breakpoint.c:12134
+#: breakpoint.c:12980
 msgid "Delete all tracepoints? "
 msgstr ""
 
-#: breakpoint.c:12156
+#: breakpoint.c:12999
 #, possible-c-format
 msgid "Setting tracepoint %d's passcount to %d\n"
 msgstr ""
 
-#: breakpoint.c:12173
+#: breakpoint.c:13016
 msgid "passcount command requires an argument (count + optional TP num)"
 msgstr ""
 
-#: breakpoint.c:12264
+#: breakpoint.c:13114
 msgid "tracepoint number"
 msgstr ""
 
-#: breakpoint.c:12272
+#: breakpoint.c:13122
 #, possible-c-format
 msgid "bad tracepoint number at or near '%s'\n"
 msgstr ""
 
-#: breakpoint.c:12275
+#: breakpoint.c:13125
 msgid "Tracepoint argument missing and no previous tracepoint\n"
 msgstr ""
 
-#: breakpoint.c:12307
+#: breakpoint.c:13169
 msgid "Argument required (file name in which to save)"
 msgstr ""
 
-#: breakpoint.c:12333
+#: breakpoint.c:13195
 msgid "Nothing to save."
 msgstr ""
 
-#: breakpoint.c:12341
+#: breakpoint.c:13203
 #, possible-c-format
 msgid "Unable to open file '%s' for saving (%s)"
 msgstr ""
 
-#: breakpoint.c:12387
-#, possible-c-format
-msgid "unhandled breakpoint type %d"
-msgstr ""
-
-#: breakpoint.c:12464
+#: breakpoint.c:13273
 #, possible-c-format
 msgid "Saved to file '%s'.\n"
 msgstr ""
 
-#: breakpoint.c:12564
+#: breakpoint.c:13371
 msgid "\"save\" must be followed by the name of a save subcommand.\n"
 msgstr ""
 
-#: breakpoint.c:12602
+#: breakpoint.c:13598
 msgid ""
 "Set ignore-count of breakpoint number N to COUNT.\n"
 "Usage is `ignore N COUNT'."
 msgstr ""
 
-#: breakpoint.c:12608
+#: breakpoint.c:13604
 msgid ""
 "Set commands to be executed when a breakpoint is hit.\n"
 "Give breakpoint number as argument after \"commands\".\n"
@@ -3170,14 +3184,14 @@
 "then no output is printed when it is hit, except what the commands print."
 msgstr ""
 
-#: breakpoint.c:12617
+#: breakpoint.c:13613
 msgid ""
 "Specify breakpoint number N to break only if COND is true.\n"
 "Usage is `condition N COND', where N is an integer and COND is an\n"
 "expression to be evaluated whenever breakpoint N is reached."
 msgstr ""
 
-#: breakpoint.c:12622
+#: breakpoint.c:13618
 msgid ""
 "Set a temporary breakpoint.\n"
 "Like \"break\" except the breakpoint is only temporary,\n"
@@ -3186,7 +3200,7 @@
 "\n"
 msgstr ""
 
-#: breakpoint.c:12631
+#: breakpoint.c:13627
 msgid ""
 "Set a hardware assisted breakpoint.\n"
 "Like \"break\" except the breakpoint requires hardware support,\n"
@@ -3194,7 +3208,7 @@
 "\n"
 msgstr ""
 
-#: breakpoint.c:12639
+#: breakpoint.c:13635
 msgid ""
 "Set a temporary hardware assisted breakpoint.\n"
 "Like \"hbreak\" except the breakpoint is only temporary,\n"
@@ -3202,7 +3216,7 @@
 "\n"
 msgstr ""
 
-#: breakpoint.c:12647 breakpoint.c:12655
+#: breakpoint.c:13643 breakpoint.c:13651
 msgid ""
 "Enable some breakpoints.\n"
 "Give breakpoint numbers (separated by spaces) as arguments.\n"
@@ -3211,7 +3225,7 @@
 "With a subcommand you can enable temporarily."
 msgstr ""
 
-#: breakpoint.c:12664
+#: breakpoint.c:13660
 msgid ""
 "Enable some breakpoints.\n"
 "Give breakpoint numbers (separated by spaces) as arguments.\n"
@@ -3219,36 +3233,36 @@
 "May be abbreviated to simply \"enable\".\n"
 msgstr ""
 
-#: breakpoint.c:12671 breakpoint.c:12686
+#: breakpoint.c:13667 breakpoint.c:13682
 msgid ""
 "Enable breakpoints for one hit.  Give breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion, it becomes disabled."
 msgstr ""
 
-#: breakpoint.c:12676 breakpoint.c:12681
+#: breakpoint.c:13672 breakpoint.c:13677
 msgid ""
 "Enable breakpoints and delete when hit.  Give breakpoint numbers.\n"
 "If a breakpoint is hit while enabled in this fashion, it is deleted."
 msgstr ""
 
-#: breakpoint.c:12691 breakpoint.c:12700
+#: breakpoint.c:13687 breakpoint.c:13696
 msgid ""
 "Disable some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
 "To disable all breakpoints, give no argument.\n"
-"A disabled breakpoint is not forgotten, but has no effect until reenabled."
+"A disabled breakpoint is not forgotten, but has no effect until re-enabled."
 msgstr ""
 
-#: breakpoint.c:12706
+#: breakpoint.c:13702
 msgid ""
 "Disable some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
 "To disable all breakpoints, give no argument.\n"
-"A disabled breakpoint is not forgotten, but has no effect until reenabled.\n"
+"A disabled breakpoint is not forgotten, but has no effect until re-enabled.\n"
 "This command may be abbreviated \"disable\"."
 msgstr ""
 
-#: breakpoint.c:12714
+#: breakpoint.c:13710
 msgid ""
 "Delete some breakpoints or auto-display expressions.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -3258,14 +3272,14 @@
 "The \"unset\" command is also an alias for \"delete\"."
 msgstr ""
 
-#: breakpoint.c:12725
+#: breakpoint.c:13721
 msgid ""
 "Delete some breakpoints.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
 "To delete all breakpoints, give no argument.\n"
 msgstr ""
 
-#: breakpoint.c:12730
+#: breakpoint.c:13726
 msgid ""
 "Delete some breakpoints or auto-display expressions.\n"
 "Arguments are breakpoint numbers with spaces in between.\n"
@@ -3273,7 +3287,7 @@
 "This command may be abbreviated \"delete\"."
 msgstr ""
 
-#: breakpoint.c:12737
+#: breakpoint.c:13733
 msgid ""
 "Clear breakpoint at specified line or function.\n"
 "Argument may be line number, function name, or \"*\" and an address.\n"
@@ -3288,23 +3302,23 @@
 "See also the \"delete\" command which clears breakpoints by number."
 msgstr ""
 
-#: breakpoint.c:12750
+#: breakpoint.c:13746
 msgid "Set breakpoint at specified line or function.\n"
 msgstr ""
 
-#: breakpoint.c:12765
+#: breakpoint.c:13761
 msgid "Break in function/address or break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:12769
+#: breakpoint.c:13765
 msgid "Break in function or address."
 msgstr ""
 
-#: breakpoint.c:12771
+#: breakpoint.c:13767
 msgid "Break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:12772 breakpoint.c:12808
+#: breakpoint.c:13768 breakpoint.c:13804
 msgid ""
 "Status of user-settable breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -3326,7 +3340,7 @@
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:12789
+#: breakpoint.c:13785
 msgid ""
 "Status of specified breakpoints (all user-settable breakpoints if no "
 "argument).\n"
@@ -3349,7 +3363,7 @@
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:12824
+#: breakpoint.c:13820
 msgid ""
 "Status of all breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -3375,42 +3389,42 @@
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:12845
+#: breakpoint.c:13841
 msgid "Set catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:12850
+#: breakpoint.c:13846
 msgid "Set temporary catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
 #. Add catch and tcatch sub-commands.
-#: breakpoint.c:12856
+#: breakpoint.c:13852
 msgid ""
 "Catch an exception, when caught.\n"
 "With an argument, catch only exceptions with the given name."
 msgstr ""
 
-#: breakpoint.c:12863
+#: breakpoint.c:13859
 msgid ""
 "Catch an exception, when thrown.\n"
 "With an argument, catch only exceptions with the given name."
 msgstr ""
 
-#: breakpoint.c:12870
+#: breakpoint.c:13866
 msgid "Catch calls to fork."
 msgstr ""
 
-#: breakpoint.c:12875
+#: breakpoint.c:13871
 msgid "Catch calls to vfork."
 msgstr ""
 
-#: breakpoint.c:12880
+#: breakpoint.c:13876
 msgid "Catch calls to exec."
 msgstr ""
 
-#: breakpoint.c:12885
+#: breakpoint.c:13881
 msgid ""
 "Catch system calls by their names and/or numbers.\n"
 "Arguments say which system calls to catch.  If no arguments\n"
@@ -3419,19 +3433,7 @@
 "(if your system supports that), or system call numbers."
 msgstr ""
 
-#: breakpoint.c:12895
-msgid ""
-"Catch Ada exceptions, when raised.\n"
-"With an argument, catch only exceptions with the given name."
-msgstr ""
-
-#: breakpoint.c:12902
-msgid ""
-"Catch failed Ada assertions, when raised.\n"
-"With an argument, catch only exceptions with the given name."
-msgstr ""
-
-#: breakpoint.c:12910
+#: breakpoint.c:13892
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: watch [-l|-location] EXPRESSION\n"
@@ -3441,7 +3443,7 @@
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:12919
+#: breakpoint.c:13901
 msgid ""
 "Set a read watchpoint for an expression.\n"
 "Usage: rwatch [-l|-location] EXPRESSION\n"
@@ -3451,7 +3453,7 @@
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:12928
+#: breakpoint.c:13910
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: awatch [-l|-location] EXPRESSION\n"
@@ -3461,19 +3463,19 @@
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:12937
+#: breakpoint.c:13919
 msgid "Status of specified watchpoints (all watchpoints if no argument)."
 msgstr ""
 
-#: breakpoint.c:12943
+#: breakpoint.c:13925
 msgid "Set debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:12944
+#: breakpoint.c:13926
 msgid "Show debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:12945
+#: breakpoint.c:13927
 msgid ""
 "If zero, gdb will not use hardware for new watchpoints, even if\n"
 "such is available.  (However, any hardware watchpoints that were\n"
@@ -3482,19 +3484,25 @@
 msgstr ""
 
 #. Tracepoint manipulation commands.
-#: breakpoint.c:12958
+#: breakpoint.c:13940
 msgid ""
 "Set a tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:12970
+#: breakpoint.c:13943 breakpoint.c:13955
+msgid ""
+"\n"
+"Do \"help tracepoints\" for info on other tracepoint commands."
+msgstr ""
+
+#: breakpoint.c:13952
 msgid ""
 "Set a fast tracepoint at specified line or function.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:12977
+#: breakpoint.c:13959
 msgid ""
 "Set a static tracepoint at specified line, function or marker.\n"
 "\n"
@@ -3522,35 +3530,35 @@
 "Do \"help tracepoints\" for info on other tracepoint commands."
 msgstr ""
 
-#: breakpoint.c:13003
+#: breakpoint.c:13985
 msgid ""
 "Status of specified tracepoints (all tracepoints if no argument).\n"
 "Convenience variable \"$tpnum\" contains the number of the\n"
 "last tracepoint set."
 msgstr ""
 
-#: breakpoint.c:13010
+#: breakpoint.c:13992
 msgid ""
 "Delete specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means delete all tracepoints."
 msgstr ""
 
-#: breakpoint.c:13016
+#: breakpoint.c:13998
 msgid ""
 "Disable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means disable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:13023
+#: breakpoint.c:14005
 msgid ""
 "Enable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means enable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:13030
+#: breakpoint.c:14012
 msgid ""
 "Set the passcount for a tracepoint.\n"
 "The trace will end when the tracepoint has been passed 'count' times.\n"
@@ -3558,12 +3566,12 @@
 "if TPNUM is omitted, passcount refers to the last tracepoint defined."
 msgstr ""
 
-#: breakpoint.c:13037
+#: breakpoint.c:14019
 msgid "Save breakpoint definitions as a script."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:13041
+#: breakpoint.c:14023
 msgid ""
 "Save current breakpoint definitions as a script.\n"
 "This includes all types of breakpoints (breakpoints, watchpoints,\n"
@@ -3571,29 +3579,29 @@
 "session to restore them."
 msgstr ""
 
-#: breakpoint.c:13049
+#: breakpoint.c:14031
 msgid ""
 "Save current tracepoint definitions as a script.\n"
 "Use the 'source' command in another debug session to restore them."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:13058 breakpoint.c:13064
+#: breakpoint.c:14040 breakpoint.c:14046
 msgid ""
 "Breakpoint specific settings\n"
 "Configure various breakpoint-specific variables such as\n"
 "pending breakpoint behavior"
 msgstr ""
 
-#: breakpoint.c:13072
+#: breakpoint.c:14054
 msgid "Set debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:13073
+#: breakpoint.c:14055
 msgid "Show debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:13074
+#: breakpoint.c:14056
 msgid ""
 "If on, an unrecognized breakpoint location will cause gdb to create a\n"
 "pending breakpoint.  If off, an unrecognized breakpoint location results in\n"
@@ -3601,15 +3609,15 @@
 "user-query to see if a pending breakpoint should be created."
 msgstr ""
 
-#: breakpoint.c:13087
+#: breakpoint.c:14069
 msgid "Set automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:13088
+#: breakpoint.c:14070
 msgid "Show automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:13089
+#: breakpoint.c:14071
 msgid ""
 "If set, the debugger will automatically use hardware breakpoints for\n"
 "breakpoints set with \"break\" but falling in read-only memory.  If not "
@@ -3617,15 +3625,15 @@
 "a warning will be emitted for such breakpoints."
 msgstr ""
 
-#: breakpoint.c:13099
+#: breakpoint.c:14081
 msgid "Set mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:13100
+#: breakpoint.c:14082
 msgid "Show mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:13101
+#: breakpoint.c:14083
 msgid ""
 "When this mode is off, breakpoints are inserted in inferior when it is\n"
 "resumed, and removed when execution stops.  When this mode is on,\n"
@@ -3637,7 +3645,7 @@
 "inferior in all-stop mode, gdb behaves as if always-inserted mode is off."
 msgstr ""
 
-#: breakpoint.c:13115
+#: breakpoint.c:14097
 msgid ""
 "Set a breakpoint for an address range.\n"
 "break-range START-LOCATION, END-LOCATION\n"
@@ -3655,96 +3663,96 @@
 "range (including START-LOCATION and END-LOCATION)."
 msgstr ""
 
-#: bsd-kvm.c:155
+#: bsd-kvm.c:154
 #, possible-c-format
 msgid "\tUsing the kernel crash dump %s.\n"
 msgstr ""
 
-#: bsd-kvm.c:158
+#: bsd-kvm.c:157
 msgid "\tUsing the currently running kernel.\n"
 msgstr ""
 
 #. i18n: PCB == "Process Control Block".
-#: bsd-kvm.c:252
+#: bsd-kvm.c:251
 msgid "Cannot find a valid PCB"
 msgstr ""
 
-#: bsd-kvm.c:273
+#: bsd-kvm.c:272
 msgid "proc address"
 msgstr ""
 
-#: bsd-kvm.c:276 bsd-kvm.c:304
+#: bsd-kvm.c:275 bsd-kvm.c:303
 msgid "No kernel memory image."
 msgstr ""
 
 #. i18n: PCB == "Process Control Block".
-#: bsd-kvm.c:301
+#: bsd-kvm.c:300
 msgid "pcb address"
 msgstr ""
 
-#: bsd-kvm.c:346
+#: bsd-kvm.c:345
 msgid "Kernel memory interface"
 msgstr ""
 
-#: bsd-kvm.c:347
+#: bsd-kvm.c:346
 msgid ""
 "Use a kernel virtual memory image as a target.\n"
 "Optionally specify the filename of a core dump."
 msgstr ""
 
-#: bsd-kvm.c:364
+#: bsd-kvm.c:363
 msgid "Generic command for manipulating the kernel memory interface."
 msgstr ""
 
-#: bsd-kvm.c:370
+#: bsd-kvm.c:369
 msgid "Set current context from proc address"
 msgstr ""
 
 #. i18n: PCB == "Process Control Block".
-#: bsd-kvm.c:374
+#: bsd-kvm.c:373
 msgid "Set current context from pcb address"
 msgstr ""
 
-#: bsd-uthread.c:101
+#: bsd-uthread.c:100
 msgid "Bad magic"
 msgstr ""
 
-#: buildsym.c:329
+#: buildsym.c:324
 #, possible-c-format
 msgid "block end address less than block start address in %s (patched it)"
 msgstr ""
 
-#: buildsym.c:336
+#: buildsym.c:331
 #, possible-c-format
 msgid "block end address %s less than block start address %s (patched it)"
 msgstr ""
 
-#: buildsym.c:369
+#: buildsym.c:364
 #, possible-c-format
 msgid "inner block not inside outer block in %s"
 msgstr ""
 
-#: buildsym.c:375
+#: buildsym.c:370
 #, possible-c-format
 msgid "inner block (%s-%s) not inside outer block (%s-%s)"
 msgstr ""
 
-#: buildsym.c:514
+#: buildsym.c:509
 #, possible-c-format
 msgid "block at %s out of order"
 msgstr ""
 
 #. We should always be able to find the objfile ...
-#: buildsym.c:688 buildsym.c:702 dbxread.c:3094 exec.c:444 exec.c:626
-#: language.c:514 language.c:912 mdebugread.c:3700 minsyms.c:161 monitor.c:327
-#: monitor.c:357 monitor.c:1321 printcmd.c:499 printcmd.c:835 printcmd.c:2663
-#: psymtab.c:673 psymtab.c:691 remote-mips.c:2702 target.c:916 target.c:1001
-#: target.c:1016 target.c:1043 utils.c:2389 utils.c:3283 utils.c:3326
-#: utils.c:3493 valprint.c:634
+#: buildsym.c:683 buildsym.c:697 dbxread.c:3096 exec.c:442 exec.c:624
+#: language.c:513 language.c:911 mdebugread.c:3705 minsyms.c:159 monitor.c:325
+#: monitor.c:355 monitor.c:1321 printcmd.c:495 printcmd.c:831 printcmd.c:2677
+#: psymtab.c:702 psymtab.c:720 remote-mips.c:2700 target.c:960 target.c:1045
+#: target.c:1060 target.c:1087 utils.c:2049 utils.c:2987 utils.c:3030
+#: utils.c:3197 valprint.c:639
 msgid "failed internal consistency check"
 msgstr ""
 
-#: buildsym.c:968
+#: buildsym.c:963
 msgid "Context stack not empty in end_symtab"
 msgstr ""
 
@@ -3752,767 +3760,439 @@
 msgid "Undefined string concatenation."
 msgstr ""
 
-#: c-exp.y:764 m2-exp.y:589 objc-exp.y:649 p-exp.y:668
+#: c-exp.y:764
+#, possible-c-format
+msgid "@entry can be used only for function parameters, not for \"%s\""
+msgstr ""
+
+#: c-exp.y:779 m2-exp.y:589 objc-exp.y:649 p-exp.y:667
 #, possible-c-format
 msgid "No symbol \"%s\" in specified context."
 msgstr ""
 
-#: c-exp.y:781 c-exp.y:797 objc-exp.y:664 objc-exp.y:678 p-exp.y:683
+#: c-exp.y:796 c-exp.y:812 objc-exp.y:664 objc-exp.y:678 p-exp.y:682
 #, possible-c-format
 msgid "`%s' is not defined as an aggregate type."
 msgstr ""
 
-#: c-exp.y:816
+#: c-exp.y:831
 #, possible-c-format
 msgid "No type \"%s\" within class or namespace \"%s\"."
 msgstr ""
 
-#: c-exp.y:847 c-exp.y:899 f-exp.y:522 m2-exp.y:638 objc-exp.y:724
-#: objc-exp.y:778 objc-exp.y:861 p-exp.y:720 p-exp.y:789 printcmd.c:1241
-#: valops.c:2693
+#: c-exp.y:862 c-exp.y:914 f-exp.y:521 m2-exp.y:638 objc-exp.y:724
+#: objc-exp.y:778 objc-exp.y:861 p-exp.y:719 p-exp.y:788 printcmd.c:1237
+#: valops.c:2697
 #, possible-c-format
 msgid "No symbol \"%s\" in current context."
 msgstr ""
 
-#: c-exp.y:1530 objc-exp.y:1105 p-exp.y:964
+#: c-exp.y:1545 objc-exp.y:1105 p-exp.y:963
 msgid "Numeric constant too large."
 msgstr ""
 
-#: c-exp.y:1630
+#: c-exp.y:1645
 msgid "\\x escape without a following hex digit"
 msgstr ""
 
-#: c-exp.y:1680
+#: c-exp.y:1695
 #, possible-c-format
 msgid "\\%c escape without a following hex digit"
 msgstr ""
 
-#: c-exp.y:1847 macroexp.c:398 objc-exp.y:1513 p-exp.y:1375
+#: c-exp.y:1862 macroexp.c:397 objc-exp.y:1513 p-exp.y:1374
 msgid "Unterminated string in expression."
 msgstr ""
 
-#: c-exp.y:1849 linespec.c:1019 macroexp.c:344 objc-exp.y:1283 p-exp.y:1204
+#: c-exp.y:1864 linespec.c:1058 macroexp.c:343 objc-exp.y:1283 p-exp.y:1203
 msgid "Unmatched single quote."
 msgstr ""
 
-#: c-exp.y:2221 f-exp.y:1102 m2-exp.y:955 objc-exp.y:1399 p-exp.y:1302
+#: c-exp.y:2236 f-exp.y:1101 m2-exp.y:955 objc-exp.y:1399 p-exp.y:1301
 #, possible-c-format
 msgid "Invalid number \"%s\"."
 msgstr ""
 
-#: c-exp.y:2264 objc-exp.y:1270 p-exp.y:1191
+#: c-exp.y:2293 objc-exp.y:1270 p-exp.y:1190
 msgid "Empty character constant."
 msgstr ""
 
-#: c-exp.y:2272 objc-exp.y:1288 p-exp.y:1210
+#: c-exp.y:2301 objc-exp.y:1288 p-exp.y:1209
 msgid "Invalid character constant."
 msgstr ""
 
 #. We must have come across a bad character (e.g. ';').
-#: c-exp.y:2281 f-exp.y:1136 m2-exp.y:964 objc-exp.y:1525 p-exp.y:1387
+#: c-exp.y:2310 f-exp.y:1135 m2-exp.y:964 objc-exp.y:1525 p-exp.y:1386
 #, possible-c-format
 msgid "Invalid character '%c' in expression."
 msgstr ""
 
-#: c-exp.y:2661 f-exp.y:1227 m2-exp.y:1093 objc-exp.y:1785 p-exp.y:1742
+#: c-exp.y:2690 f-exp.y:1226 m2-exp.y:1093 objc-exp.y:1785 p-exp.y:1741
 #, possible-c-format
 msgid "A %s in expression, near `%s'."
 msgstr ""
 
-#: c-lang.c:68 c-lang.c:1012
-msgid "unhandled c_string_type"
+#: charset.c:217
+#, possible-c-format
+msgid "The host character set is \"auto; currently %s\".\n"
 msgstr ""
 
-#: c-lang.c:731
+#: charset.c:220
 #, possible-c-format
-msgid "Error reading string from inferior: %s"
+msgid "The host character set is \"%s\".\n"
 msgstr ""
 
-#: c-lang.c:765
+#: charset.c:230
 #, possible-c-format
-msgid "Trying to read string with inappropriate type `%s'."
+msgid "The target character set is \"auto; currently %s\".\n"
 msgstr ""
 
-#: c-lang.c:769
-msgid "Trying to read string with inappropriate type."
+#: charset.c:234
+#, possible-c-format
+msgid "The target character set is \"%s\".\n"
 msgstr ""
 
-#: c-lang.c:870
-msgid "Malformed escape sequence"
+#: charset.c:247
+#, possible-c-format
+msgid "The target wide character set is \"auto; currently %s\".\n"
 msgstr ""
 
-#: c-lang.c:897
-msgid "\\x used with no following hex digits."
+#: charset.c:251
+#, possible-c-format
+msgid "The target wide character set is \"%s\".\n"
 msgstr ""
 
-#: c-lang.c:919
-msgid "\\u used with no following hex digits"
+#: charset.c:326 charset.c:332
+#, possible-c-format
+msgid "Cannot convert between character sets `%s' and `%s'"
 msgstr ""
 
-#: c-lang.c:1071
-msgid "Could not convert character constant to target character set"
+#: charset.c:488 charset.c:595
+msgid "Converting character sets"
 msgstr ""
 
-#. To avoid memory corruption.
-#: c-lang.c:1097 eval.c:992
-msgid "Too many array elements"
+#: charset.c:524
+#, possible-c-format
+msgid "Could not convert character to `%s' character set"
 msgstr ""
 
-#: c-typeprint.c:334
-msgid "type not handled in c_type_print_varspec_prefix()"
+#: charset.c:555 charset.c:696
+msgid "Internal error while converting character sets"
 msgstr ""
 
-#: c-typeprint.c:692
-msgid "type not handled in c_type_print_varspec_suffix()"
+#. No valid charset found, generate error here.
+#: charset.c:1002
+msgid "Unable to find a vaild charset for string conversions"
 msgstr ""
 
-#: c-typeprint.c:738 m2-typeprint.c:83
-msgid "<type unknown>"
+#: charset.c:1045
+msgid "Set the host and target character sets."
 msgstr ""
 
-#: c-typeprint.c:766
-msgid "<unnamed typedef>"
+#: charset.c:1046
+msgid "Show the host and target character sets."
 msgstr ""
 
-#: c-typeprint.c:826
-msgid "<incomplete type>\n"
+#: charset.c:1047
+msgid ""
+"The `host character set' is the one used by the system GDB is running on.\n"
+"The `target character set' is the one used by the program being debugged.\n"
+"You may only use supersets of ASCII for your host character set; GDB does\n"
+"not support any others.\n"
+"To see a list of the character sets GDB supports, type `set charset <TAB>'."
 msgstr ""
 
-#: c-typeprint.c:829
-msgid "<no data fields>\n"
+#: charset.c:1061
+msgid "Set the host character set."
 msgstr ""
 
-#: c-typeprint.c:1052
-#, possible-c-format
-msgid "<undefined type> %s;\n"
+#: charset.c:1062
+msgid "Show the host character set."
 msgstr ""
 
-#: c-typeprint.c:1095
-#, possible-c-format
-msgid "<badly mangled name '%s'>"
+#: charset.c:1063
+msgid ""
+"The `host character set' is the one used by the system GDB is running on.\n"
+"You may only use supersets of ASCII for your host character set; GDB does\n"
+"not support any others.\n"
+"To see a list of the character sets GDB supports, type `set host-charset "
+"<TAB>'."
 msgstr ""
 
-#: c-typeprint.c:1158
-#, possible-c-format
-msgid " (Local at %s:%d)\n"
+#: charset.c:1073
+msgid "Set the target character set."
 msgstr ""
 
-#: c-typeprint.c:1217
-msgid "struct <unknown>"
+#: charset.c:1074
+msgid "Show the target character set."
 msgstr ""
 
-#. This should not occur.
-#: c-typeprint.c:1226
-msgid "<range type>"
+#: charset.c:1075
+msgid ""
+"The `target character set' is the one used by the program being debugged.\n"
+"GDB translates characters and strings between the host and target\n"
+"character sets as needed.\n"
+"To see a list of the character sets GDB supports, type `set target-"
+"charset'<TAB>"
 msgstr ""
 
-#. At least for dump_symtab, it is important that this not
-#. be an error ().
-#: c-typeprint.c:1248
-#, possible-c-format
-msgid "<invalid type code %d>"
+#: charset.c:1086
+msgid "Set the target wide character set."
 msgstr ""
 
-#: c-valprint.c:177
-msgid "Could not determine the array high bound"
+#: charset.c:1087
+msgid "Show the target wide character set."
+msgstr ""
+
+#: charset.c:1088
+msgid ""
+"The `target wide character set' is the one used by the program being "
+"debugged.\n"
+"In particular it is the encoding used by `wchar_t'.\n"
+"GDB translates characters and strings between the host and target\n"
+"character sets as needed.\n"
+"To see a list of the character sets GDB supports, type\n"
+"`set target-wide-charset'<TAB>"
+msgstr ""
+
+#: c-lang.c:68 c-lang.c:616
+msgid "unhandled c_string_type"
 msgstr ""
 
-#: c-valprint.c:227
+#: c-lang.c:335
 #, possible-c-format
-msgid "%d vtable entries"
+msgid "Error reading string from inferior: %s"
 msgstr ""
 
-#. This happens (without TYPE_FLAG_STUB set) on systems which
-#. don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a
-#. "struct foo *bar" and no complete type for struct foo in that
-#. file.
-#. This happens (without TYPE_FLAG_STUB set) on systems which don't use
-#. dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
-#. and no complete type for struct foo in that file.
-#: c-valprint.c:597 m2-valprint.c:581 m2-valprint.c:661 valprint.c:361
-msgid "<incomplete type>"
-msgstr ""
-
-#: c-valprint.c:626
-#, possible-c-format
-msgid "Invalid C/C++ type code %d in symbol table."
-msgstr ""
-
-#: c-valprint.c:743
-msgid " [incomplete object]"
-msgstr ""
-
-#: charset.c:218
-#, possible-c-format
-msgid "The host character set is \"auto; currently %s\".\n"
-msgstr ""
-
-#: charset.c:221
-#, possible-c-format
-msgid "The host character set is \"%s\".\n"
-msgstr ""
-
-#: charset.c:231
-#, possible-c-format
-msgid "The target character set is \"auto; currently %s\".\n"
-msgstr ""
-
-#: charset.c:235
-#, possible-c-format
-msgid "The target character set is \"%s\".\n"
-msgstr ""
-
-#: charset.c:248
-#, possible-c-format
-msgid "The target wide character set is \"auto; currently %s\".\n"
-msgstr ""
-
-#: charset.c:252
-#, possible-c-format
-msgid "The target wide character set is \"%s\".\n"
-msgstr ""
-
-#: charset.c:327 charset.c:333
-#, possible-c-format
-msgid "Cannot convert between character sets `%s' and `%s'"
-msgstr ""
-
-#: charset.c:489 charset.c:596
-msgid "Converting character sets"
-msgstr ""
-
-#: charset.c:525
-#, possible-c-format
-msgid "Could not convert character to `%s' character set"
-msgstr ""
-
-#: charset.c:556 charset.c:697
-msgid "Internal error while converting character sets"
-msgstr ""
-
-#. No valid charset found, generate error here.
-#: charset.c:986
-msgid "Unable to find a vaild charset for string conversions"
-msgstr ""
-
-#: charset.c:1029
-msgid "Set the host and target character sets."
-msgstr ""
-
-#: charset.c:1030
-msgid "Show the host and target character sets."
-msgstr ""
-
-#: charset.c:1031
-msgid ""
-"The `host character set' is the one used by the system GDB is running on.\n"
-"The `target character set' is the one used by the program being debugged.\n"
-"You may only use supersets of ASCII for your host character set; GDB does\n"
-"not support any others.\n"
-"To see a list of the character sets GDB supports, type `set charset <TAB>'."
-msgstr ""
-
-#: charset.c:1045
-msgid "Set the host character set."
-msgstr ""
-
-#: charset.c:1046
-msgid "Show the host character set."
-msgstr ""
-
-#: charset.c:1047
-msgid ""
-"The `host character set' is the one used by the system GDB is running on.\n"
-"You may only use supersets of ASCII for your host character set; GDB does\n"
-"not support any others.\n"
-"To see a list of the character sets GDB supports, type `set host-charset "
-"<TAB>'."
-msgstr ""
-
-#: charset.c:1057
-msgid "Set the target character set."
-msgstr ""
-
-#: charset.c:1058
-msgid "Show the target character set."
-msgstr ""
-
-#: charset.c:1059
-msgid ""
-"The `target character set' is the one used by the program being debugged.\n"
-"GDB translates characters and strings between the host and target\n"
-"character sets as needed.\n"
-"To see a list of the character sets GDB supports, type `set target-"
-"charset'<TAB>"
-msgstr ""
-
-#: charset.c:1070
-msgid "Set the target wide character set."
-msgstr ""
-
-#: charset.c:1071
-msgid "Show the target wide character set."
-msgstr ""
-
-#: charset.c:1072
-msgid ""
-"The `target wide character set' is the one used by the program being "
-"debugged.\n"
-"In particular it is the encoding used by `wchar_t'.\n"
-"GDB translates characters and strings between the host and target\n"
-"character sets as needed.\n"
-"To see a list of the character sets GDB supports, type\n"
-"`set target-wide-charset'<TAB>"
-msgstr ""
-
-#: cli/cli-utils.c:53
-msgid "History value must have integer type."
-msgstr ""
-
-#: cli/cli-utils.c:74
-msgid "Convenience variable must have integer value.\n"
-msgstr ""
-
-#: cli/cli-utils.c:151
-msgid "inverted range"
-msgstr ""
-
-#: cli/cli-utils.c:165
-msgid "negative value"
-msgstr ""
-
-#: cli/cli-utils.c:207
-msgid "Args must be numbers or '$' variables."
-msgstr ""
-
-#: cli/cli-logging.c:46
-#, possible-c-format
-msgid "The current logfile is \"%s\".\n"
-msgstr ""
-
-#: cli/cli-logging.c:56
-#, possible-c-format
-msgid ""
-"Currently logging to %s.  Turn the logging off and on to make the new "
-"setting effective."
-msgstr ""
-
-#: cli/cli-logging.c:65
-#, possible-c-format
-msgid "Whether logging overwrites or appends to the log file is %s.\n"
-msgstr ""
-
-#: cli/cli-logging.c:110 cli/cli-logging.c:188 cli/cli-logging.c:198
-msgid "set logging"
-msgstr ""
-
-#: cli/cli-logging.c:133 cli/cli-logging.c:230 top.c:492
-msgid "Current output protocol does not support redirection"
-msgstr ""
-
-#: cli/cli-logging.c:143
-#, possible-c-format
-msgid "The logging output mode is %s.\n"
-msgstr ""
-
-#: cli/cli-logging.c:262
-msgid ""
-"\"set logging\" lets you log output to a file.\n"
-"Usage: set logging on [FILENAME]\n"
-"       set logging off\n"
-"       set logging file FILENAME\n"
-"       set logging overwrite [on|off]\n"
-"       set logging redirect [on|off]\n"
-msgstr ""
-
-#: cli/cli-logging.c:274
-#, possible-c-format
-msgid "Currently logging to \"%s\".\n"
-msgstr ""
-
-#: cli/cli-logging.c:277
-#, possible-c-format
-msgid "Future logs will be written to %s.\n"
-msgstr ""
-
-#: cli/cli-logging.c:281
-msgid "Logs will overwrite the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:283
-msgid "Logs will be appended to the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:288
-msgid "Output is being sent only to the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:290
-msgid "Output is being logged and displayed.\n"
-msgstr ""
-
-#: cli/cli-logging.c:295
-msgid "Output will be sent only to the log file.\n"
-msgstr ""
-
-#: cli/cli-logging.c:297
-msgid "Output will be logged and displayed.\n"
-msgstr ""
-
-#: cli/cli-logging.c:310
-msgid "Set logging options"
-msgstr ""
-
-#: cli/cli-logging.c:313
-msgid "Show logging options"
-msgstr ""
-
-#: cli/cli-logging.c:315
-msgid "Set whether logging overwrites or appends to the log file."
-msgstr ""
-
-#: cli/cli-logging.c:316
-msgid "Show whether logging overwrites or appends to the log file."
-msgstr ""
-
-#: cli/cli-logging.c:317
-msgid "If set, logging overrides the log file."
-msgstr ""
-
-#: cli/cli-logging.c:322
-msgid "Set the logging output mode."
-msgstr ""
-
-#: cli/cli-logging.c:323
-msgid "Show the logging output mode."
-msgstr ""
-
-#: cli/cli-logging.c:324
-msgid ""
-"If redirect is off, output will go to both the screen and the log file.\n"
-"If redirect is on, output will go only to the log file."
-msgstr ""
-
-#: cli/cli-logging.c:330
-msgid "Set the current logfile."
-msgstr ""
-
-#: cli/cli-logging.c:331
-msgid "Show the current logfile."
-msgstr ""
-
-#: cli/cli-logging.c:332
-msgid "The logfile is used when directing GDB's output."
-msgstr ""
-
-#: cli/cli-logging.c:338
-msgid "Enable logging."
-msgstr ""
-
-#: cli/cli-logging.c:340
-msgid "Disable logging."
-msgstr ""
-
-#: cli/cli-script.c:91
-msgid "if/while commands require arguments."
-msgstr ""
-
-#: cli/cli-script.c:126
-msgid "Error reading in canned sequence of commands."
-msgstr ""
-
-#: cli/cli-script.c:328
-msgid "Max user call depth exceeded -- command aborted."
-msgstr ""
-
-#: cli/cli-script.c:347
-msgid "Error executing canned sequence of commands."
-msgstr ""
-
-#: cli/cli-script.c:574
-msgid "Invalid control type in canned commands structure."
-msgstr ""
-
-#: cli/cli-script.c:638
-msgid "arg_cleanup called with no user args.\n"
-msgstr ""
-
-#: cli/cli-script.c:677
+#: c-lang.c:369
 #, possible-c-format
-msgid "user defined function may only have %d arguments."
-msgstr ""
-
-#: cli/cli-script.c:776
-#, possible-c-format
-msgid "Missing argument %d in user function."
-msgstr ""
-
-#: cli/cli-script.c:876
-msgid "Control nesting too deep!"
-msgstr ""
-
-#: cli/cli-script.c:1072
-msgid "Recursed on a simple control type."
-msgstr ""
-
-#: cli/cli-script.c:1075
-msgid "Allocated body is smaller than this command type needs."
+msgid "Trying to read string with inappropriate type `%s'."
 msgstr ""
 
-#: cli/cli-script.c:1370
-msgid "name of command to define"
+#: c-lang.c:373
+msgid "Trying to read string with inappropriate type."
 msgstr ""
 
-#: cli/cli-script.c:1392
-#, possible-c-format
-msgid "\"%s\" is not a prefix command."
+#: c-lang.c:474
+msgid "Malformed escape sequence"
 msgstr ""
 
-#: cli/cli-script.c:1403
-#, possible-c-format
-msgid "Junk in argument list: \"%s\""
+#: c-lang.c:501
+msgid "\\x used with no following hex digits."
 msgstr ""
 
-#: cli/cli-script.c:1452
-#, possible-c-format
-msgid "Redefine command \"%s\"? "
+#: c-lang.c:523
+msgid "\\u used with no following hex digits"
 msgstr ""
 
-#: cli/cli-script.c:1454
-#, possible-c-format
-msgid "Really redefine built-in command \"%s\"? "
+#: c-lang.c:675
+msgid "Could not convert character constant to target character set"
 msgstr ""
 
-#: cli/cli-script.c:1456
-#, possible-c-format
-msgid "Command \"%s\" not redefined."
+#. To avoid memory corruption.
+#: c-lang.c:701 eval.c:1011
+msgid "Too many array elements"
 msgstr ""
 
-#: cli/cli-script.c:1483
+#: cli/cli-cmds.c:219
 #, possible-c-format
-msgid "Your new `%s' command does not hook any existing command."
+msgid "Argument required (%s)."
 msgstr ""
 
-#: cli/cli-script.c:1486
-msgid "Proceed? "
+#: cli/cli-cmds.c:229
+msgid "\"info\" must be followed by the name of an info command.\n"
 msgstr ""
 
-#: cli/cli-script.c:1487 cli/cli-cmds.c:341 infcmd.c:1119 infcmd.c:1133
-#: infcmd.c:2236 symfile.c:1104 symfile.c:1269 symfile.c:2359
-#: tracepoint.c:1915 tracepoint.c:1921
+#: cli/cli-cmds.c:336 cli/cli-script.c:1501 infcmd.c:1140 infcmd.c:1154
+#: infcmd.c:2288 symfile.c:1103 symfile.c:1268 symfile.c:2360
+#: tracepoint.c:2165 tracepoint.c:2171
 msgid "Not confirmed."
 msgstr ""
 
-#. Should never come here as hookc would be 0.
-#: cli/cli-script.c:1527 complaints.c:305 exceptions.c:153 exceptions.c:170
-#: exceptions.c:197 exceptions.c:263 hppa-tdep.c:3099 hppa-tdep.c:3112
-#: infcall.c:672 infcmd.c:1415 infrun.c:3238 language.c:798 language.c:824
-#: mi/mi-out.c:332 mi/mi-out.c:351 mips-tdep.c:256 mips-tdep.c:313
-#: mips-tdep.c:1427 mips-tdep.c:4118 mips-tdep.c:5105 mn10300-tdep.c:127
-#: reggroups.c:220 remote.c:6408 utils.c:1187 utils.c:1206
-msgid "bad switch"
-msgstr ""
-
-#: cli/cli-script.c:1547
-#, possible-c-format
-msgid "Command \"%s\" is built-in."
-msgstr ""
-
-#: cli/cli-script.c:1614
-msgid "called with NULL file pointer!"
-msgstr ""
-
-#: cli/cli-script.c:1642
-#, possible-c-format
-msgid ""
-"%s:%d: Error in sourced command file:\n"
-"%s"
-msgstr ""
-
-#: cli/cli-script.c:1645
-msgid "bad reason"
-msgstr ""
-
-#: cli/cli-decode.c:1297
-#, possible-c-format
-msgid "Undefined %scommand: \"%s\".  Try \"help%s%.*s\"."
-msgstr ""
-
-#: cli/cli-decode.c:1330
-#, possible-c-format
-msgid "Lack of needed %scommand"
-msgstr ""
-
-#: cli/cli-decode.c:1395
-#, possible-c-format
-msgid "Ambiguous %scommand \"%s\": %s."
-msgstr ""
-
-#: cli/cli-decode.c:1779
-msgid "Invalid command"
-msgstr ""
-
-#: cli/cli-cmds.c:214
-#, possible-c-format
-msgid "Argument required (%s)."
-msgstr ""
-
-#: cli/cli-cmds.c:224
-msgid "\"info\" must be followed by the name of an info command.\n"
-msgstr ""
-
-#: cli/cli-cmds.c:352
+#: cli/cli-cmds.c:347
 #, possible-c-format
 msgid "The \"pwd\" command does not take an argument: %s"
 msgstr ""
 
-#: cli/cli-cmds.c:354
+#: cli/cli-cmds.c:349
 #, possible-c-format
 msgid "Error finding name of working directory: %s"
 msgstr ""
 
-#: cli/cli-cmds.c:358
+#: cli/cli-cmds.c:353
 #, possible-c-format
 msgid ""
 "Working directory %s\n"
 " (canonically %s).\n"
 msgstr ""
 
-#: cli/cli-cmds.c:361
+#: cli/cli-cmds.c:356
 #, possible-c-format
 msgid "Working directory %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:377
+#: cli/cli-cmds.c:372
 msgid "new working directory"
 msgstr ""
 
-#: cli/cli-cmds.c:473
+#: cli/cli-cmds.c:468
 #, possible-c-format
 msgid "Script filename extension recognition is \"%s\".\n"
 msgstr ""
 
-#: cli/cli-cmds.c:575
+#: cli/cli-cmds.c:572
 msgid "source command requires file name of file to source."
 msgstr ""
 
-#: cli/cli-cmds.c:756
+#: cli/cli-cmds.c:757
 msgid "Fork failed"
 msgstr ""
 
-#: cli/cli-cmds.c:782
+#: cli/cli-cmds.c:783
 msgid "No default source file yet."
 msgstr ""
 
-#: cli/cli-cmds.c:808 cli/cli-cmds.c:970
+#: cli/cli-cmds.c:810 cli/cli-cmds.c:975
 msgid "Junk at end of line specification."
 msgstr ""
 
 #. FIXME-32x64--assumes sal.pc fits in long.
-#: cli/cli-cmds.c:820 cli/cli-cmds.c:989
+#: cli/cli-cmds.c:822 cli/cli-cmds.c:994
 #, possible-c-format
 msgid "No source file for address %s."
 msgstr ""
 
-#: cli/cli-cmds.c:840 cli/cli-cmds.c:1010
+#: cli/cli-cmds.c:842 cli/cli-cmds.c:1015
 #, possible-c-format
 msgid "No line number known for %s."
 msgstr ""
 
-#: cli/cli-cmds.c:974
+#: cli/cli-cmds.c:979
 msgid "Specified start and end are in different files."
 msgstr ""
 
-#: cli/cli-cmds.c:976
+#: cli/cli-cmds.c:981
 msgid "Two empty args do not say what lines to list."
 msgstr ""
 
-#: cli/cli-cmds.c:1019 cli/cli-cmds.c:1025
+#: cli/cli-cmds.c:1024 cli/cli-cmds.c:1030
 msgid "No default source file yet.  Do \"help list\"."
 msgstr ""
 
 #. Assume g++ compiled code; old GDB 4.16 behaviour.
-#: cli/cli-cmds.c:1091 dwarf2loc.c:1002 python/py-symbol.c:278 stack.c:1740
-#: stack.c:1748 stack.c:1822 valops.c:1495
+#: cli/cli-cmds.c:1096 dwarf2loc.c:1862 python/py-symbol.c:295 stack.c:2050
+#: stack.c:2058 stack.c:2132 valops.c:1499
 msgid "No frame selected."
 msgstr ""
 
-#: cli/cli-cmds.c:1095 tui/tui-stack.c:383
+#: cli/cli-cmds.c:1100
 msgid "No function contains program counter for selected frame."
 msgstr ""
 
-#: cli/cli-cmds.c:1139
+#: cli/cli-cmds.c:1144
 msgid "Missing modifier."
 msgstr ""
 
-#: cli/cli-cmds.c:1152
+#: cli/cli-cmds.c:1157
 msgid "Invalid disassembly modifier."
 msgstr ""
 
-#: cli/cli-cmds.c:1174
+#: cli/cli-cmds.c:1179
 msgid "No function contains specified address."
 msgstr ""
 
-#: cli/cli-cmds.c:1234
-msgid "Not a user command."
+#: cli/cli-cmds.c:1239
+msgid "Not a user command."
+msgstr ""
+
+#: cli/cli-cmds.c:1262
+msgid "REGEXP string is empty"
+msgstr ""
+
+#: cli/cli-cmds.c:1278
+#, possible-c-format
+msgid "Error in regular expression: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1340
+msgid "Usage: alias [-a] [--] ALIAS = COMMAND"
+msgstr ""
+
+#: cli/cli-cmds.c:1379
+#, possible-c-format
+msgid "Invalid command name: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1381
+#, possible-c-format
+msgid "Invalid command element name: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1395
+#, possible-c-format
+msgid "Invalid command to alias to: %s"
+msgstr ""
+
+#: cli/cli-cmds.c:1402
+#, possible-c-format
+msgid "Alias already exists: %s"
 msgstr ""
 
-#: cli/cli-cmds.c:1257
-msgid "REGEXP string is empty"
+#: cli/cli-cmds.c:1427
+msgid "Mismatched command length between ALIAS and COMMAND."
 msgstr ""
 
-#: cli/cli-cmds.c:1273
-#, possible-c-format
-msgid "Error in regular expression: %s"
+#: cli/cli-cmds.c:1447
+msgid "ALIAS and COMMAND prefixes do not match."
 msgstr ""
 
-#: cli/cli-cmds.c:1288
+#: cli/cli-cmds.c:1467
 #, possible-c-format
 msgid "file: \"%s\", line number: %d\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1295
+#: cli/cli-cmds.c:1553
 msgid "\"set debug\" must be followed by the name of a debug subcommand.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1342
+#: cli/cli-cmds.c:1601
 #, possible-c-format
 msgid "Verbose printing of informational messages is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1345
+#: cli/cli-cmds.c:1604
 #, possible-c-format
 msgid "Verbosity is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1352
+#: cli/cli-cmds.c:1611
 #, possible-c-format
 msgid "History expansion on command input is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1360
+#: cli/cli-cmds.c:1619
 #, possible-c-format
 msgid "Baud rate for remote serial I/O is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1368
+#: cli/cli-cmds.c:1627
 #, possible-c-format
 msgid "Debugging of remote protocol is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1377
+#: cli/cli-cmds.c:1636
 #, possible-c-format
 msgid "Timeout limit to wait for target to respond is %s.\n"
 msgstr ""
 
-#: cli/cli-cmds.c:1386
+#: cli/cli-cmds.c:1645
 #, possible-c-format
 msgid "The max call depth for user-defined commands is %s.\n"
 msgstr ""
 
 #. Define the classes of commands.
-#. They will appear in the help list in the reverse of this order.
-#: cli/cli-cmds.c:1400
+#. They will appear in the help list in alphabetical order.
+#: cli/cli-cmds.c:1659
 msgid ""
 "Maintenance commands.\n"
 "Some gdb commands are provided just for use by gdb maintainers.\n"
@@ -4520,42 +4200,42 @@
 "well documented as user commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1406
+#: cli/cli-cmds.c:1665
 msgid "Obscure features."
 msgstr ""
 
-#: cli/cli-cmds.c:1408
+#: cli/cli-cmds.c:1667
 msgid "Aliases of other commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1409
+#: cli/cli-cmds.c:1668
 msgid ""
 "User-defined commands.\n"
 "The commands in this class are those defined by the user.\n"
 "Use the \"define\" command to define a command."
 msgstr ""
 
-#: cli/cli-cmds.c:1413
+#: cli/cli-cmds.c:1672
 msgid "Support facilities."
 msgstr ""
 
-#: cli/cli-cmds.c:1415
+#: cli/cli-cmds.c:1674
 msgid "Status inquiries."
 msgstr ""
 
-#: cli/cli-cmds.c:1416
+#: cli/cli-cmds.c:1675
 msgid "Specifying and examining files."
 msgstr ""
 
-#: cli/cli-cmds.c:1419
+#: cli/cli-cmds.c:1678
 msgid "Making program stop at certain points."
 msgstr ""
 
-#: cli/cli-cmds.c:1420
+#: cli/cli-cmds.c:1679
 msgid "Examining data."
 msgstr ""
 
-#: cli/cli-cmds.c:1421
+#: cli/cli-cmds.c:1680
 msgid ""
 "Examining the stack.\n"
 "The stack is made up of stack frames.  Gdb assigns numbers to stack frames\n"
@@ -4567,23 +4247,23 @@
 "The commands below can be used to select other frames by number or address."
 msgstr ""
 
-#: cli/cli-cmds.c:1430
+#: cli/cli-cmds.c:1689
 msgid "Running the program."
 msgstr ""
 
 #. Define general commands.
-#: cli/cli-cmds.c:1434
+#: cli/cli-cmds.c:1693
 msgid "Print working directory.  This is used for your program as well."
 msgstr ""
 
-#: cli/cli-cmds.c:1437
+#: cli/cli-cmds.c:1696
 msgid ""
 "Set working directory to DIR for debugger and program being debugged.\n"
 "The change does not take effect for the program being debugged\n"
 "until the next time it is started."
 msgstr ""
 
-#: cli/cli-cmds.c:1443
+#: cli/cli-cmds.c:1702
 msgid ""
 "Print a constant string.  Give string as argument.\n"
 "C escape sequences may be used in the argument.\n"
@@ -4594,14 +4274,14 @@
 "to be printed or after trailing whitespace."
 msgstr ""
 
-#: cli/cli-cmds.c:1451
+#: cli/cli-cmds.c:1710
 msgid ""
 "Document a user-defined command.\n"
 "Give command name as argument.  Give documentation on following lines.\n"
 "End with a line of just \"end\"."
 msgstr ""
 
-#: cli/cli-cmds.c:1455
+#: cli/cli-cmds.c:1714
 msgid ""
 "Define a new command name.  Command name is argument.\n"
 "Definition appears on following lines, one command per line.\n"
@@ -4610,7 +4290,7 @@
 "Commands defined in this way may have up to ten arguments."
 msgstr ""
 
-#: cli/cli-cmds.c:1462
+#: cli/cli-cmds.c:1721
 #, possible-c-format
 msgid ""
 "Read commands from a file named FILE.\n"
@@ -4624,15 +4304,15 @@
 "when GDB is started."
 msgstr ""
 
-#: cli/cli-cmds.c:1477
+#: cli/cli-cmds.c:1736
 msgid "Set mode for script filename extension recognition."
 msgstr ""
 
-#: cli/cli-cmds.c:1478
+#: cli/cli-cmds.c:1737
 msgid "Show mode for script filename extension recognition."
 msgstr ""
 
-#: cli/cli-cmds.c:1479
+#: cli/cli-cmds.c:1738
 msgid ""
 "off  == no filename extension recognition (all sourced files are GDB "
 "scripts)\n"
@@ -4642,71 +4322,71 @@
 "supported"
 msgstr ""
 
-#: cli/cli-cmds.c:1489
+#: cli/cli-cmds.c:1748
 msgid "Exit gdb."
 msgstr ""
 
-#: cli/cli-cmds.c:1491
+#: cli/cli-cmds.c:1750
 msgid "Print list of commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1496
+#: cli/cli-cmds.c:1755
 msgid "Set verbosity."
 msgstr ""
 
-#: cli/cli-cmds.c:1497
+#: cli/cli-cmds.c:1756
 msgid "Show verbosity."
 msgstr ""
 
-#: cli/cli-cmds.c:1504
+#: cli/cli-cmds.c:1763
 msgid "Generic command for setting command history parameters."
 msgstr ""
 
-#: cli/cli-cmds.c:1507
+#: cli/cli-cmds.c:1766
 msgid "Generic command for showing command history parameters."
 msgstr ""
 
-#: cli/cli-cmds.c:1510
+#: cli/cli-cmds.c:1769
 msgid "Set history expansion on command input."
 msgstr ""
 
-#: cli/cli-cmds.c:1511
+#: cli/cli-cmds.c:1770
 msgid "Show history expansion on command input."
 msgstr ""
 
-#: cli/cli-cmds.c:1512
+#: cli/cli-cmds.c:1771
 msgid "Without an argument, history expansion is enabled."
 msgstr ""
 
-#: cli/cli-cmds.c:1518
+#: cli/cli-cmds.c:1777
 msgid "Generic command for showing things about the program being debugged."
 msgstr ""
 
-#: cli/cli-cmds.c:1525
+#: cli/cli-cmds.c:1784
 msgid "List the completions for the rest of the line as a command."
 msgstr ""
 
-#: cli/cli-cmds.c:1527
+#: cli/cli-cmds.c:1786
 msgid "Generic command for showing things about the debugger."
 msgstr ""
 
 #. Another way to get at the same thing.
-#: cli/cli-cmds.c:1531
+#: cli/cli-cmds.c:1790
 msgid "Show all GDB settings."
 msgstr ""
 
-#: cli/cli-cmds.c:1533
+#: cli/cli-cmds.c:1792
 msgid ""
 "Show the history of commands you typed.\n"
 "You can supply a command number to start with, or a `+' to start after\n"
 "the previous command number shown."
 msgstr ""
 
-#: cli/cli-cmds.c:1540
+#: cli/cli-cmds.c:1799
 msgid "Show what version of GDB this is."
 msgstr ""
 
-#: cli/cli-cmds.c:1542
+#: cli/cli-cmds.c:1801
 msgid ""
 "Execute nested commands WHILE the conditional expression is non zero.\n"
 "The conditional expression must follow the word `while' and must in turn be\n"
@@ -4714,7 +4394,7 @@
 "and should be terminated by the word `end'."
 msgstr ""
 
-#: cli/cli-cmds.c:1548
+#: cli/cli-cmds.c:1807
 msgid ""
 "Execute nested commands once IF the conditional expression is non zero.\n"
 "The conditional expression must follow the word `if' and must in turn be\n"
@@ -4725,63 +4405,63 @@
 
 #. If target is open when baud changes, it doesn't take effect until
 #. the next open (I think, not sure).
-#: cli/cli-cmds.c:1557
+#: cli/cli-cmds.c:1816
 msgid "Set baud rate for remote serial I/O."
 msgstr ""
 
-#: cli/cli-cmds.c:1558
+#: cli/cli-cmds.c:1817
 msgid "Show baud rate for remote serial I/O."
 msgstr ""
 
-#: cli/cli-cmds.c:1559
+#: cli/cli-cmds.c:1818
 msgid ""
 "This value is used to set the speed of the serial port when debugging\n"
 "using remote targets."
 msgstr ""
 
-#: cli/cli-cmds.c:1566
+#: cli/cli-cmds.c:1825
 msgid "Set debugging of remote protocol."
 msgstr ""
 
-#: cli/cli-cmds.c:1567
+#: cli/cli-cmds.c:1826
 msgid "Show debugging of remote protocol."
 msgstr ""
 
-#: cli/cli-cmds.c:1568
+#: cli/cli-cmds.c:1827
 msgid ""
 "When enabled, each packet sent or received with the remote target\n"
 "is displayed."
 msgstr ""
 
-#: cli/cli-cmds.c:1575
+#: cli/cli-cmds.c:1834
 msgid "Set timeout limit to wait for target to respond."
 msgstr ""
 
-#: cli/cli-cmds.c:1576
+#: cli/cli-cmds.c:1835
 msgid "Show timeout limit to wait for target to respond."
 msgstr ""
 
-#: cli/cli-cmds.c:1577
+#: cli/cli-cmds.c:1836
 msgid ""
 "This value is used to set the time limit for gdb to wait for a response\n"
 "from the target."
 msgstr ""
 
-#: cli/cli-cmds.c:1585
+#: cli/cli-cmds.c:1844
 msgid "Generic command for setting gdb debugging flags"
 msgstr ""
 
-#: cli/cli-cmds.c:1589
+#: cli/cli-cmds.c:1848
 msgid "Generic command for showing gdb debugging flags"
 msgstr ""
 
-#: cli/cli-cmds.c:1592
+#: cli/cli-cmds.c:1851
 msgid ""
 "Execute the rest of the line as a shell command.\n"
 "With no arguments, run an inferior shell."
 msgstr ""
 
-#: cli/cli-cmds.c:1597
+#: cli/cli-cmds.c:1856
 msgid ""
 "Edit specified file or function.\n"
 "With no argument, edits file containing most recent line listed.\n"
@@ -4793,7 +4473,7 @@
 "Uses EDITOR environment variable contents as editor (or ex as default)."
 msgstr ""
 
-#: cli/cli-cmds.c:1609
+#: cli/cli-cmds.c:1868
 msgid ""
 "List specified function or line.\n"
 "With no argument, lists ten more lines after or around previous listing.\n"
@@ -4810,7 +4490,7 @@
 "arg."
 msgstr ""
 
-#: cli/cli-cmds.c:1632
+#: cli/cli-cmds.c:1891
 msgid ""
 "Disassemble a specified section of memory.\n"
 "Default is the function surrounding the pc of the selected frame.\n"
@@ -4822,394 +4502,705 @@
 "  in the form of \"start,end\", or \"start,+length\"."
 msgstr ""
 
-#: cli/cli-cmds.c:1653
+#: cli/cli-cmds.c:1905
 msgid "Run the ``make'' program using the rest of the line as arguments."
 msgstr ""
 
-#: cli/cli-cmds.c:1656
+#: cli/cli-cmds.c:1908
 msgid ""
 "Show definitions of user defined commands.\n"
 "Argument is the name of the user defined command.\n"
 "With no argument, show definitions of all user defined commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1661
+#: cli/cli-cmds.c:1913
 msgid "Search for commands matching a REGEXP"
 msgstr ""
 
-#: cli/cli-cmds.c:1664
+#: cli/cli-cmds.c:1916
 msgid "Set the max call depth for user-defined commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1665
+#: cli/cli-cmds.c:1917
 msgid "Show the max call depth for user-defined commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1671
+#: cli/cli-cmds.c:1923
 msgid "Set tracing of GDB CLI commands."
 msgstr ""
 
-#: cli/cli-cmds.c:1672
+#: cli/cli-cmds.c:1924
 msgid "Show state of GDB CLI command tracing."
 msgstr ""
 
-#: cli/cli-cmds.c:1673
+#: cli/cli-cmds.c:1925
 msgid "When 'on', each command is displayed as it is executed."
 msgstr ""
 
-#: cli/cli-dump.c:76
+#: cli/cli-cmds.c:1931
+msgid ""
+"Define a new command that is an alias of an existing command.\n"
+"Usage: alias [-a] [--] ALIAS = COMMAND\n"
+"ALIAS is the name of the alias command to create.\n"
+"COMMAND is the command being aliased to.\n"
+"If \"-a\" is specified, the command is an abbreviation,\n"
+"and will not appear in help command list output.\n"
+"\n"
+"Examples:\n"
+"Make \"spe\" an alias of \"set print elements\":\n"
+"  alias spe = set print elements\n"
+"Make \"elms\" an alias of \"elements\" in the \"set print\" command:\n"
+"  alias -a set print elms = set print elements"
+msgstr ""
+
+#: cli/cli-decode.c:1330
+#, possible-c-format
+msgid "Undefined %scommand: \"%s\".  Try \"help%s%.*s\"."
+msgstr ""
+
+#: cli/cli-decode.c:1363
+#, possible-c-format
+msgid "Lack of needed %scommand"
+msgstr ""
+
+#: cli/cli-decode.c:1428
+#, possible-c-format
+msgid "Ambiguous %scommand \"%s\": %s."
+msgstr ""
+
+#: cli/cli-decode.c:1812
+msgid "Invalid command"
+msgstr ""
+
+#: cli/cli-dump.c:75
 msgid "Missing filename."
 msgstr ""
 
-#: cli/cli-dump.c:117 cli/cli-dump.c:137
+#: cli/cli-dump.c:116 cli/cli-dump.c:136
 #, possible-c-format
 msgid "Failed to open %s: %s."
 msgstr ""
 
-#: cli/cli-dump.c:122
+#: cli/cli-dump.c:121
 #, possible-c-format
 msgid "'%s' is not a recognized file format."
 msgstr ""
 
-#: cli/cli-dump.c:141
+#: cli/cli-dump.c:140
 #, possible-c-format
 msgid "bfd_openw_with_cleanup: %s."
 msgstr ""
 
-#. Append to existing file.
-#. FIXME -- doesn't work...
-#: cli/cli-dump.c:145
-msgid "bfd_openw does not work with append."
+#. Append to existing file.
+#. FIXME -- doesn't work...
+#: cli/cli-dump.c:144
+msgid "bfd_openw does not work with append."
+msgstr ""
+
+#: cli/cli-dump.c:147
+#, possible-c-format
+msgid "bfd_openw_with_cleanup: unknown mode %s."
+msgstr ""
+
+#: cli/cli-dump.c:163
+msgid ""
+"\"dump\" must be followed by a subcommand.\n"
+"\n"
+msgstr ""
+
+#: cli/cli-dump.c:170
+msgid ""
+"\"append\" must be followed by a subcommand.\n"
+"\n"
+msgstr ""
+
+#: cli/cli-dump.c:205
+#, possible-c-format
+msgid "writing dump file '%s' (%s)"
+msgstr ""
+
+#: cli/cli-dump.c:226
+msgid "Missing start address."
+msgstr ""
+
+#: cli/cli-dump.c:231
+msgid "Missing stop address."
+msgstr ""
+
+#: cli/cli-dump.c:237
+msgid "Invalid memory address range (start >= end)."
+msgstr ""
+
+#: cli/cli-dump.c:277
+#, possible-c-format
+msgid "No value to %s."
+msgstr ""
+
+#: cli/cli-dump.c:280
+msgid "Invalid expression."
+msgstr ""
+
+#: cli/cli-dump.c:299
+msgid "value is not an lval: address assumed to be zero"
+msgstr ""
+
+#. No, no useable data in this section.
+#: cli/cli-dump.c:459
+#, possible-c-format
+msgid "skipping section %s...\n"
+msgstr ""
+
+#: cli/cli-dump.c:478
+#, possible-c-format
+msgid "Failed to read bfd file %s: '%s'."
+msgstr ""
+
+#: cli/cli-dump.c:501 cli/cli-dump.c:553
+#, possible-c-format
+msgid "restore: memory write failed (%s)."
+msgstr ""
+
+#: cli/cli-dump.c:524
+#, possible-c-format
+msgid "Start address is greater than length of binary file %s."
+msgstr ""
+
+#: cli/cli-dump.c:599
+msgid "Start must be less than end."
+msgstr ""
+
+#: cli/cli-dump.c:668
+msgid "Dump target code/data to a local file."
+msgstr ""
+
+#: cli/cli-dump.c:673
+msgid "Append target code/data to a local file."
+msgstr ""
+
+#: cli/cli-dump.c:689
+msgid "Write target code/data to an srec file."
+msgstr ""
+
+#: cli/cli-dump.c:695
+msgid "Write target code/data to an intel hex file."
+msgstr ""
+
+#: cli/cli-dump.c:701
+msgid "Write target code/data to a tekhex file."
+msgstr ""
+
+#: cli/cli-dump.c:707
+msgid "Write target code/data to a raw binary file."
+msgstr ""
+
+#: cli/cli-dump.c:713
+msgid "Append target code/data to a raw binary file."
+msgstr ""
+
+#: cli/cli-dump.c:718
+msgid ""
+"Write contents of memory to an srec file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory\n"
+"within the range [START .. STOP) to the specified FILE in srec format."
+msgstr ""
+
+#: cli/cli-dump.c:724
+msgid ""
+"Write the value of an expression to an srec file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in srec format."
+msgstr ""
+
+#: cli/cli-dump.c:730
+msgid ""
+"Write contents of memory to an ihex file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory within\n"
+"the range [START .. STOP) to the specified FILE in intel hex format."
+msgstr ""
+
+#: cli/cli-dump.c:736
+msgid ""
+"Write the value of an expression to an ihex file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in intel hex format."
+msgstr ""
+
+#: cli/cli-dump.c:742
+msgid ""
+"Write contents of memory to a tekhex file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory\n"
+"within the range [START .. STOP) to the specified FILE in tekhex format."
+msgstr ""
+
+#: cli/cli-dump.c:748
+msgid ""
+"Write the value of an expression to a tekhex file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in tekhex format."
+msgstr ""
+
+#: cli/cli-dump.c:754
+msgid ""
+"Write contents of memory to a raw binary file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory\n"
+"within the range [START .. STOP) to the specified FILE in binary format."
+msgstr ""
+
+#: cli/cli-dump.c:760
+msgid ""
+"Write the value of an expression to a raw binary file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in raw target ordered bytes."
+msgstr ""
+
+#: cli/cli-dump.c:766
+msgid ""
+"Append contents of memory to a raw binary file.\n"
+"Arguments are FILE START STOP.  Writes the contents of memory within the\n"
+"range [START .. STOP) to the specified FILE in raw target ordered bytes."
+msgstr ""
+
+#: cli/cli-dump.c:772
+msgid ""
+"Append the value of an expression to a raw binary file.\n"
+"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
+"to the specified FILE in raw target ordered bytes."
+msgstr ""
+
+#: cli/cli-dump.c:778
+msgid ""
+"Restore the contents of FILE to target memory.\n"
+"Arguments are FILE OFFSET START END where all except FILE are optional.\n"
+"OFFSET will be added to the base address of the file (default zero).\n"
+"If START and END are given, only the file contents within that range\n"
+"(file relative) will be restored to target memory."
+msgstr ""
+
+#: cli/cli-logging.c:45
+#, possible-c-format
+msgid "The current logfile is \"%s\".\n"
+msgstr ""
+
+#: cli/cli-logging.c:55
+#, possible-c-format
+msgid ""
+"Currently logging to %s.  Turn the logging off and on to make the new "
+"setting effective."
+msgstr ""
+
+#: cli/cli-logging.c:64
+#, possible-c-format
+msgid "Whether logging overwrites or appends to the log file is %s.\n"
+msgstr ""
+
+#: cli/cli-logging.c:110 cli/cli-logging.c:188 cli/cli-logging.c:198
+msgid "set logging"
+msgstr ""
+
+#: cli/cli-logging.c:133 cli/cli-logging.c:230 top.c:522
+msgid "Current output protocol does not support redirection"
+msgstr ""
+
+#: cli/cli-logging.c:143
+#, possible-c-format
+msgid "The logging output mode is %s.\n"
+msgstr ""
+
+#: cli/cli-logging.c:262
+msgid ""
+"\"set logging\" lets you log output to a file.\n"
+"Usage: set logging on [FILENAME]\n"
+"       set logging off\n"
+"       set logging file FILENAME\n"
+"       set logging overwrite [on|off]\n"
+"       set logging redirect [on|off]\n"
+msgstr ""
+
+#: cli/cli-logging.c:274
+#, possible-c-format
+msgid "Currently logging to \"%s\".\n"
+msgstr ""
+
+#: cli/cli-logging.c:277
+#, possible-c-format
+msgid "Future logs will be written to %s.\n"
+msgstr ""
+
+#: cli/cli-logging.c:281
+msgid "Logs will overwrite the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:283
+msgid "Logs will be appended to the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:288
+msgid "Output is being sent only to the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:290
+msgid "Output is being logged and displayed.\n"
+msgstr ""
+
+#: cli/cli-logging.c:295
+msgid "Output will be sent only to the log file.\n"
+msgstr ""
+
+#: cli/cli-logging.c:297
+msgid "Output will be logged and displayed.\n"
+msgstr ""
+
+#: cli/cli-logging.c:310
+msgid "Set logging options"
+msgstr ""
+
+#: cli/cli-logging.c:313
+msgid "Show logging options"
+msgstr ""
+
+#: cli/cli-logging.c:315
+msgid "Set whether logging overwrites or appends to the log file."
+msgstr ""
+
+#: cli/cli-logging.c:316
+msgid "Show whether logging overwrites or appends to the log file."
 msgstr ""
 
-#: cli/cli-dump.c:148
-#, possible-c-format
-msgid "bfd_openw_with_cleanup: unknown mode %s."
+#: cli/cli-logging.c:317
+msgid "If set, logging overrides the log file."
 msgstr ""
 
-#: cli/cli-dump.c:164
-msgid ""
-"\"dump\" must be followed by a subcommand.\n"
-"\n"
+#: cli/cli-logging.c:322
+msgid "Set the logging output mode."
 msgstr ""
 
-#: cli/cli-dump.c:171
-msgid ""
-"\"append\" must be followed by a subcommand.\n"
-"\n"
+#: cli/cli-logging.c:323
+msgid "Show the logging output mode."
 msgstr ""
 
-#: cli/cli-dump.c:206
-#, possible-c-format
-msgid "writing dump file '%s' (%s)"
+#: cli/cli-logging.c:324
+msgid ""
+"If redirect is off, output will go to both the screen and the log file.\n"
+"If redirect is on, output will go only to the log file."
 msgstr ""
 
-#: cli/cli-dump.c:227
-msgid "Missing start address."
+#: cli/cli-logging.c:330
+msgid "Set the current logfile."
 msgstr ""
 
-#: cli/cli-dump.c:232
-msgid "Missing stop address."
+#: cli/cli-logging.c:331
+msgid "Show the current logfile."
 msgstr ""
 
-#: cli/cli-dump.c:238
-msgid "Invalid memory address range (start >= end)."
+#: cli/cli-logging.c:332
+msgid "The logfile is used when directing GDB's output."
 msgstr ""
 
-#: cli/cli-dump.c:278
-#, possible-c-format
-msgid "No value to %s."
+#: cli/cli-logging.c:338
+msgid "Enable logging."
 msgstr ""
 
-#: cli/cli-dump.c:281
-msgid "Invalid expression."
+#: cli/cli-logging.c:340
+msgid "Disable logging."
 msgstr ""
 
-#: cli/cli-dump.c:300
-msgid "value is not an lval: address assumed to be zero"
+#: cli/cli-script.c:90
+msgid "if/while commands require arguments."
 msgstr ""
 
-#. No, no useable data in this section.
-#: cli/cli-dump.c:460
-#, possible-c-format
-msgid "skipping section %s...\n"
+#: cli/cli-script.c:125
+msgid "Error reading in canned sequence of commands."
 msgstr ""
 
-#: cli/cli-dump.c:479
-#, possible-c-format
-msgid "Failed to read bfd file %s: '%s'."
+#: cli/cli-script.c:327
+msgid "Max user call depth exceeded -- command aborted."
 msgstr ""
 
-#: cli/cli-dump.c:502 cli/cli-dump.c:554
-#, possible-c-format
-msgid "restore: memory write failed (%s)."
+#: cli/cli-script.c:349
+msgid "Error executing canned sequence of commands."
 msgstr ""
 
-#: cli/cli-dump.c:525
-#, possible-c-format
-msgid "Start address is greater than length of binary file %s."
+#: cli/cli-script.c:576
+msgid "Invalid control type in canned commands structure."
 msgstr ""
 
-#: cli/cli-dump.c:600
-msgid "Start must be less than end."
+#: cli/cli-script.c:652
+msgid "arg_cleanup called with no user args.\n"
 msgstr ""
 
-#: cli/cli-dump.c:669
-msgid "Dump target code/data to a local file."
+#: cli/cli-script.c:691
+#, possible-c-format
+msgid "user defined function may only have %d arguments."
 msgstr ""
 
-#: cli/cli-dump.c:674
-msgid "Append target code/data to a local file."
+#: cli/cli-script.c:790
+#, possible-c-format
+msgid "Missing argument %d in user function."
 msgstr ""
 
-#: cli/cli-dump.c:690
-msgid "Write target code/data to an srec file."
+#: cli/cli-script.c:890
+msgid "Control nesting too deep!"
 msgstr ""
 
-#: cli/cli-dump.c:696
-msgid "Write target code/data to an intel hex file."
+#: cli/cli-script.c:1086
+msgid "Recursed on a simple control type."
 msgstr ""
 
-#: cli/cli-dump.c:702
-msgid "Write target code/data to a tekhex file."
+#: cli/cli-script.c:1089
+msgid "Allocated body is smaller than this command type needs."
 msgstr ""
 
-#: cli/cli-dump.c:708
-msgid "Write target code/data to a raw binary file."
+#: cli/cli-script.c:1384
+msgid "name of command to define"
 msgstr ""
 
-#: cli/cli-dump.c:714
-msgid "Append target code/data to a raw binary file."
+#: cli/cli-script.c:1406
+#, possible-c-format
+msgid "\"%s\" is not a prefix command."
 msgstr ""
 
-#: cli/cli-dump.c:719
-msgid ""
-"Write contents of memory to an srec file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory\n"
-"within the range [START .. STOP) to the specifed FILE in srec format."
+#: cli/cli-script.c:1417
+#, possible-c-format
+msgid "Junk in argument list: \"%s\""
 msgstr ""
 
-#: cli/cli-dump.c:725
-msgid ""
-"Write the value of an expression to an srec file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in srec format."
+#: cli/cli-script.c:1466
+#, possible-c-format
+msgid "Redefine command \"%s\"? "
 msgstr ""
 
-#: cli/cli-dump.c:731
-msgid ""
-"Write contents of memory to an ihex file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory within\n"
-"the range [START .. STOP) to the specifed FILE in intel hex format."
+#: cli/cli-script.c:1468
+#, possible-c-format
+msgid "Really redefine built-in command \"%s\"? "
 msgstr ""
 
-#: cli/cli-dump.c:737
-msgid ""
-"Write the value of an expression to an ihex file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in intel hex format."
+#: cli/cli-script.c:1470
+#, possible-c-format
+msgid "Command \"%s\" not redefined."
 msgstr ""
 
-#: cli/cli-dump.c:743
-msgid ""
-"Write contents of memory to a tekhex file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory\n"
-"within the range [START .. STOP) to the specifed FILE in tekhex format."
+#: cli/cli-script.c:1497
+#, possible-c-format
+msgid "Your new `%s' command does not hook any existing command."
 msgstr ""
 
-#: cli/cli-dump.c:749
-msgid ""
-"Write the value of an expression to a tekhex file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in tekhex format."
+#: cli/cli-script.c:1500
+msgid "Proceed? "
 msgstr ""
 
-#: cli/cli-dump.c:755
-msgid ""
-"Write contents of memory to a raw binary file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory\n"
-"within the range [START .. STOP) to the specifed FILE in binary format."
+#. Should never come here as hookc would be 0.
+#: cli/cli-script.c:1541 complaints.c:305 exceptions.c:143 exceptions.c:160
+#: exceptions.c:187 exceptions.c:239 hppa-tdep.c:3098 hppa-tdep.c:3111
+#: infcall.c:671 infcmd.c:1460 infrun.c:3306 language.c:797 language.c:823
+#: mi/mi-out.c:348 mi/mi-out.c:367 mips-tdep.c:254 mips-tdep.c:311
+#: mips-tdep.c:1411 mips-tdep.c:4086 mips-tdep.c:5073 mn10300-tdep.c:126
+#: reggroups.c:219 remote.c:6492 utils.c:987 utils.c:1006
+msgid "bad switch"
 msgstr ""
 
-#: cli/cli-dump.c:761
-msgid ""
-"Write the value of an expression to a raw binary file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in raw target ordered bytes."
+#: cli/cli-script.c:1561
+#, possible-c-format
+msgid "Command \"%s\" is built-in."
 msgstr ""
 
-#: cli/cli-dump.c:767
-msgid ""
-"Append contents of memory to a raw binary file.\n"
-"Arguments are FILE START STOP.  Writes the contents of memory within the\n"
-"range [START .. STOP) to the specifed FILE in raw target ordered bytes."
+#: cli/cli-script.c:1615
+msgid "called with NULL file pointer!"
 msgstr ""
 
-#: cli/cli-dump.c:773
+#: cli/cli-script.c:1643
+#, possible-c-format
 msgid ""
-"Append the value of an expression to a raw binary file.\n"
-"Arguments are FILE EXPRESSION.  Writes the value of EXPRESSION\n"
-"to the specified FILE in raw target ordered bytes."
+"%s:%d: Error in sourced command file:\n"
+"%s"
 msgstr ""
 
-#: cli/cli-dump.c:779
-msgid ""
-"Restore the contents of FILE to target memory.\n"
-"Arguments are FILE OFFSET START END where all except FILE are optional.\n"
-"OFFSET will be added to the base address of the file (default zero).\n"
-"If START and END are given, only the file contents within that range\n"
-"(file relative) will be restored to target memory."
+#: cli/cli-script.c:1646
+msgid "bad reason"
 msgstr ""
 
-#: cli/cli-setshow.c:60
+#: cli/cli-setshow.c:59
 msgid "\"on\", \"off\" or \"auto\" expected."
 msgstr ""
 
-#: cli/cli-setshow.c:89
+#: cli/cli-setshow.c:88
 msgid "\"on\" or \"off\" expected."
 msgstr ""
 
-#: cli/cli-setshow.c:193
+#: cli/cli-setshow.c:194
 msgid "filename to set it to."
 msgstr ""
 
-#: cli/cli-setshow.c:214 cli/cli-setshow.c:224 cli/cli-setshow.c:236
-#: cli/cli-setshow.c:241
+#: cli/cli-setshow.c:215 cli/cli-setshow.c:225 cli/cli-setshow.c:237
+#: cli/cli-setshow.c:242
 msgid "integer to set it to."
 msgstr ""
 
-#: cli/cli-setshow.c:229
+#: cli/cli-setshow.c:230
 #, possible-c-format
 msgid "integer %u out of range"
 msgstr ""
 
-#: cli/cli-setshow.c:272
+#: cli/cli-setshow.c:273
 #, possible-c-format
 msgid "Requires an argument. Valid arguments are %s."
 msgstr ""
 
-#: cli/cli-setshow.c:301
+#: cli/cli-setshow.c:302
 #, possible-c-format
 msgid "Undefined item: \"%s\"."
 msgstr ""
 
-#: cli/cli-setshow.c:304
+#: cli/cli-setshow.c:305
 #, possible-c-format
 msgid "Ambiguous item \"%s\"."
 msgstr ""
 
-#: cli/cli-setshow.c:310 cli/cli-setshow.c:381
+#: cli/cli-setshow.c:311 cli/cli-setshow.c:379
 msgid "gdb internal error: bad var_type in do_setshow_command"
 msgstr ""
 
-#: cli/cli-setshow.c:355
+#: cli/cli-setshow.c:356
 msgid "do_setshow_command: invalid var_auto_boolean"
 msgstr ""
 
-#: cli/cli-setshow.c:405
+#: cli/cli-setshow.c:403
 msgid "gdb internal error: bad cmd_type in do_setshow_command"
 msgstr ""
 
-#: coffread.c:592
+#: cli/cli-utils.c:53
+msgid "History value must have integer type."
+msgstr ""
+
+#: cli/cli-utils.c:74
+msgid "Convenience variable must have integer value.\n"
+msgstr ""
+
+#: cli/cli-utils.c:151
+msgid "inverted range"
+msgstr ""
+
+#: cli/cli-utils.c:165
+msgid "negative value"
+msgstr ""
+
+#: cli/cli-utils.c:207
+msgid "Args must be numbers or '$' variables."
+msgstr ""
+
+#: coffread.c:594
 #, possible-c-format
 msgid "\"%s\": error reading line numbers."
 msgstr ""
 
-#: coffread.c:600
+#: coffread.c:602
 #, possible-c-format
 msgid "\"%s\": can't get string table"
 msgstr ""
 
-#: coffread.c:624
+#: coffread.c:626
 #, possible-c-format
 msgid ""
 "The debugging information in `%s' is corrupted.\n"
 "The file has a `.stabs' section, but no `.stabstr' section."
 msgstr ""
 
-#: coffread.c:822
+#: coffread.c:824
 #, possible-c-format
 msgid "Bad n_sclass for symbol %s"
 msgstr ""
 
-#: coffread.c:989
+#: coffread.c:991
 #, possible-c-format
 msgid "`.bf' symbol %d has no aux entry"
 msgstr ""
 
-#: coffread.c:1007
+#: coffread.c:1009
 msgid "Bad coff function information."
 msgstr ""
 
-#: coffread.c:1016
+#: coffread.c:1018
 #, possible-c-format
 msgid ""
 "`.ef' symbol without matching `.bf' symbol ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1028
+#: coffread.c:1030
 #, possible-c-format
 msgid "Unmatched .ef symbol(s) ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1037
+#: coffread.c:1039
 #, possible-c-format
 msgid "`.ef' symbol %d has no aux entry"
 msgstr ""
 
-#: coffread.c:1085
+#: coffread.c:1087
 #, possible-c-format
 msgid ""
 "`.eb' symbol without matching `.bb' symbol ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1095 xcoffread.c:173
+#: coffread.c:1097 xcoffread.c:189
 #, possible-c-format
 msgid "Mismatched .eb symbol ignored starting at symnum %d"
 msgstr ""
 
-#: coffread.c:1156 coffread.c:1163 coffread.c:1173
+#: coffread.c:1158 coffread.c:1165 coffread.c:1175
 #, possible-c-format
 msgid "%s: error reading symbols"
 msgstr ""
 
-#: coffread.c:1186
+#: coffread.c:1188
 #, c-format
 msgid "thumb symbol %s, class 0x%x\n"
 msgstr ""
 
-#: coffread.c:1313
+#: coffread.c:1315
 msgid "coff file name too long"
 msgstr ""
 
-#: coffread.c:1400
+#: coffread.c:1402
 #, possible-c-format
 msgid "Line number pointer %ld lower than start of line numbers"
 msgstr ""
 
-#: coffread.c:1796
+#: coffread.c:1798
 #, possible-c-format
 msgid "Symbol table entry for %s has bad tagndx value"
 msgstr ""
 
-#: coffread.c:1966
+#: coffread.c:1968
 #, possible-c-format
 msgid "Unexpected type for symbol %s"
 msgstr ""
 
-#: common/signals.c:352
+#: common/common-utils.c:136
+msgid "vasprintf call failed"
+msgstr ""
+
+#: common/gdb_assert.h:54
+#, possible-c-format
+msgid "%s: Assertion `%s' failed."
+msgstr ""
+
+#: common/gdb_assert.h:58
+#, possible-c-format
+msgid "Assertion `%s' failed."
+msgstr ""
+
+#: common/signals.c:350
 msgid ""
 "GDB bug: target.c (target_signal_from_host): unrecognized real-time signal"
 msgstr ""
 
 #. The user might be trying to do "signal SIGSAK" where this system
 #. doesn't have SIGSAK.
-#: common/signals.c:647
+#: common/signals.c:645
 #, possible-c-format
 msgid "Signal %s does not exist on this system."
 msgstr ""
 
-#: common/signals.c:670
+#: common/signals.c:668
 msgid ""
 "Only signals 1-15 are valid as numeric signals.\n"
 "Use \"info signals\" for a list of symbolic signals."
@@ -5236,63 +5227,55 @@
 msgid "Various kinds of warranty you do not have."
 msgstr ""
 
-#: core-regset.c:76 m68klinux-nat.c:533
-msgid "Wrong size gregset in core file."
-msgstr ""
-
-#: core-regset.c:86 m68klinux-nat.c:543
-msgid "Wrong size fpregset in core file."
-msgstr ""
-
-#: corefile.c:77
+#: corefile.c:76
 msgid "GDB can't read core files on this machine."
 msgstr ""
 
-#: corefile.c:191
+#: corefile.c:190
 msgid "core file may not match specified executable file."
 msgstr ""
 
-#: corefile.c:193
+#: corefile.c:192
 msgid "exec file is newer than core file."
 msgstr ""
 
-#: corefile.c:209
+#: corefile.c:208
 msgid ""
 "No executable file specified.\n"
 "Use the \"file\" or \"exec-file\" command."
 msgstr ""
 
-#: corefile.c:224
+#: corefile.c:223
 #, possible-c-format
 msgid "Cannot access memory at address %s"
 msgstr ""
 
-#: corefile.c:228
+#: corefile.c:227
 #, possible-c-format
 msgid "Error accessing memory address %s: %s."
 msgstr ""
 
-#: corefile.c:422
+#: corefile.c:421
 #, possible-c-format
 msgid "The current BFD target is \"%s\".\n"
 msgstr ""
 
-#: corefile.c:453
+#: corefile.c:452
 msgid ""
 "Use FILE as core dump for examining memory and registers.\n"
 "No arg means have no core file.  This command has been superseded by the\n"
 "`target core' and `detach' commands."
 msgstr ""
 
-#: corefile.c:461
+#: corefile.c:460
 msgid "Set the current BFD target."
 msgstr ""
 
-#: corefile.c:462
+#: corefile.c:461
 msgid "Show the current BFD target."
 msgstr ""
 
-#: corefile.c:463
+#: corefile.c:462
 msgid "Use `set gnutarget auto' to specify automatic detection."
 msgstr ""
 
@@ -5320,7 +5303,7 @@
 msgid "\"%s\" is not a core dump: %s"
 msgstr ""
 
-#: corelow.c:369 record.c:833
+#: corelow.c:369 record.c:849
 #, possible-c-format
 msgid "\"%s\": Can't find sections: %s"
 msgstr ""
@@ -5375,35 +5358,43 @@
 msgid "init_core_ops: core target already exists (\"%s\")."
 msgstr ""
 
-#: cp-abi.c:44
+#: core-regset.c:76 m68klinux-nat.c:532
+msgid "Wrong size gregset in core file."
+msgstr ""
+
+#: core-regset.c:86 m68klinux-nat.c:542
+msgid "Wrong size fpregset in core file."
+msgstr ""
+
+#: cp-abi.c:43
 msgid "ABI doesn't define required function is_constructor_name"
 msgstr ""
 
-#: cp-abi.c:52
+#: cp-abi.c:51
 msgid "ABI doesn't define required function is_destructor_name"
 msgstr ""
 
-#: cp-abi.c:60
+#: cp-abi.c:59
 msgid "ABI doesn't define required function is_vtable_name"
 msgstr ""
 
-#: cp-abi.c:68
+#: cp-abi.c:67
 msgid "ABI doesn't define required function is_operator_name"
 msgstr ""
 
-#: cp-abi.c:91
+#: cp-abi.c:90
 msgid "Cannot determine virtual baseclass offset of incomplete object"
 msgstr ""
 
-#: cp-abi.c:134 cp-abi.c:142 cp-abi.c:151 cp-abi.c:169
+#: cp-abi.c:133 cp-abi.c:141 cp-abi.c:150 cp-abi.c:168
 msgid "GDB does not support pointers to methods on this target"
 msgstr ""
 
-#: cp-abi.c:203
+#: cp-abi.c:202
 msgid "Too many C++ ABIs, please increase CP_ABI_MAX in cp-abi.c"
 msgstr ""
 
-#: cp-abi.c:221
+#: cp-abi.c:220
 #, possible-c-format
 msgid "Cannot find C++ ABI \"%s\" to set it as auto default."
 msgstr ""
@@ -5413,56 +5404,56 @@
 msgid "Could not find \"%s\" in ABI list"
 msgstr ""
 
-#: cp-abi.c:328
+#: cp-abi.c:330
 msgid ""
 "Set the ABI used for inspecting C++ objects.\n"
 "\"set cp-abi\" with no arguments will list the available ABIs."
 msgstr ""
 
-#: cp-abi.c:334
+#: cp-abi.c:336
 msgid "Show the ABI used for inspecting C++ objects."
 msgstr ""
 
-#: cp-name-parser.y:1571
+#: cp-name-parser.y:1570
 msgid "empty character constant"
 msgstr ""
 
-#: cp-name-parser.y:1578
+#: cp-name-parser.y:1577
 msgid "invalid character constant"
 msgstr ""
 
-#: cp-name-parser.y:1702
+#: cp-name-parser.y:1701
 msgid "invalid number"
 msgstr ""
 
 #. These can't occur in C++ names.
-#: cp-name-parser.y:1778
+#: cp-name-parser.y:1777
 msgid "unexpected string literal"
 msgstr ""
 
 #. We must have come across a bad character (e.g. ';').
-#: cp-name-parser.y:1785
+#: cp-name-parser.y:1784
 msgid "invalid character"
 msgstr ""
 
-#: cp-namespace.c:709
+#: cp-namespace.c:719
 msgid "cp_lookup_nested_type called on a non-aggregate type."
 msgstr ""
 
-#: cp-namespace.c:1009
-msgid "Possible namespaces:\n"
+#: cp-namespace.c:800
+msgid "The `maint namespace' command was removed.\n"
 msgstr ""
 
-#: cp-namespace.c:1031
-msgid "Print the list of possible C++ namespaces."
+#: cp-namespace.c:813
+msgid "Deprecated placeholder for removed functionality."
 msgstr ""
 
-#: cp-support.c:985
+#: cp-support.c:1387
 #, possible-c-format
 msgid "RTTI symbol not found for class '%s'"
 msgstr ""
 
-#: cp-support.c:991
+#: cp-support.c:1393
 #, possible-c-format
 msgid "RTTI symbol for class '%s' is not a type"
 msgstr ""
@@ -5471,1086 +5462,1190 @@
 #. symbols for namespaces with the same name as the struct.
 #. This warning is an indication of a bug in the lookup order
 #. or a bug in the way that the symbol tables are populated.
-#: cp-support.c:1006
+#: cp-support.c:1408
 #, possible-c-format
 msgid "RTTI symbol for class '%s' is a namespace"
 msgstr ""
 
-#: cp-support.c:1009
+#: cp-support.c:1411
 #, possible-c-format
 msgid "RTTI symbol for class '%s' has bad type"
 msgstr ""
 
-#: cp-support.c:1021
+#: cp-support.c:1423
 msgid "\"maintenance cplus\" must be followed by the name of a command.\n"
 msgstr ""
 
-#: cp-support.c:1162
+#: cp-support.c:1564
 msgid "C++ maintenance commands."
 msgstr ""
 
-#: cp-support.c:1173
+#: cp-support.c:1575
 msgid "Print the first class/namespace component of NAME."
 msgstr ""
 
-#: cp-valprint.c:47
+#: cp-valprint.c:46
 #, possible-c-format
 msgid "Printing of C++ virtual function tables is %s.\n"
 msgstr ""
 
-#: cp-valprint.c:59
+#: cp-valprint.c:58
 #, possible-c-format
 msgid "Printing of object's derived type based on vtable info is %s.\n"
 msgstr ""
 
-#: cp-valprint.c:70
+#: cp-valprint.c:69
 #, possible-c-format
 msgid "Printing of C++ static members is %s.\n"
 msgstr ""
 
-#: cp-valprint.c:314 jv-valprint.c:408 p-valprint.c:803 valprint.c:282
+#: cp-valprint.c:313 jv-valprint.c:407 p-valprint.c:812 valprint.c:283
 msgid "<synthetic pointer>"
 msgstr ""
 
-#: cp-valprint.c:808
+#: cp-valprint.c:352 mi/mi-cmd-stack.c:302 python/py-prettyprint.c:293
+#: stack.c:286
+#, possible-c-format
+msgid "<error reading variable: %s>"
+msgstr ""
+
+#: cp-valprint.c:817
 msgid "Set printing of C++ static members."
 msgstr ""
 
-#: cp-valprint.c:809
+#: cp-valprint.c:818
 msgid "Show printing of C++ static members."
 msgstr ""
 
-#: cp-valprint.c:816
+#: cp-valprint.c:825
 msgid "Set printing of C++ virtual function tables."
 msgstr ""
 
-#: cp-valprint.c:817
+#: cp-valprint.c:826
 msgid "Show printing of C++ virtual function tables."
 msgstr ""
 
-#: cp-valprint.c:824
+#: cp-valprint.c:833
 msgid "Set printing of object's derived type based on vtable info."
 msgstr ""
 
-#: cp-valprint.c:825
+#: cp-valprint.c:834
 msgid "Show printing of object's derived type based on vtable info."
 msgstr ""
 
-#: cris-tdep.c:291 i386-linux-tdep.c:341
+#: cris-tdep.c:290 i386-linux-tdep.c:340
 msgid "Couldn't recognize signal trampoline."
 msgstr ""
 
 #. Invalid (unimplemented) register.  Should not happen as there are
 #. no unimplemented CRISv32 registers.
-#: cris-tdep.c:1698
+#: cris-tdep.c:1697
 #, possible-c-format
 msgid "crisv32_register_type: unknown regno %d"
 msgstr ""
 
-#: cris-tdep.c:1732
+#: cris-tdep.c:1731
 msgid "cris_store_return_value: type length too large."
 msgstr ""
 
-#: cris-tdep.c:1903
+#: cris-tdep.c:1902
 msgid "cris_extract_return_value: type length too large"
 msgstr ""
 
 #. Could not find a target.  Things are likely to go downhill
 #. from here.
-#: cris-tdep.c:2146
+#: cris-tdep.c:2145
 msgid "CRIS software single step could not find a step target."
 msgstr ""
 
-#: cris-tdep.c:3932 irix5-nat.c:240 mips-linux-tdep.c:625
+#: cris-tdep.c:3931 irix5-nat.c:239 mips-linux-tdep.c:624
 msgid "wrong size gregset struct in core file"
 msgstr ""
 
-#: cris-tdep.c:3972
+#: cris-tdep.c:3971
 msgid "Set the current CRIS version."
 msgstr ""
 
-#: cris-tdep.c:3973
-msgid "Show the current CRIS version."
+#: cris-tdep.c:3972
+msgid "Show the current CRIS version."
+msgstr ""
+
+#: cris-tdep.c:3973
+msgid ""
+"Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n"
+"Defaults to 10. "
+msgstr ""
+
+#: cris-tdep.c:3983
+msgid "Set the current CRIS mode."
+msgstr ""
+
+#: cris-tdep.c:3984
+msgid "Show the current CRIS mode."
+msgstr ""
+
+#: cris-tdep.c:3985
+msgid ""
+"Set to CRIS_MODE_GURU when debugging in guru mode.\n"
+"Makes GDB use the NRP register instead of the ERP register in certain cases."
+msgstr ""
+
+#: cris-tdep.c:3994
+msgid "Set the usage of Dwarf-2 CFI for CRIS."
+msgstr ""
+
+#: cris-tdep.c:3995
+msgid "Show the usage of Dwarf-2 CFI for CRIS."
+msgstr ""
+
+#: cris-tdep.c:3996
+msgid "Set this to \"off\" if using gcc-cris < R59."
+msgstr ""
+
+#: cris-tdep.c:4034 cris-tdep.c:4060
+msgid "cris_gdbarch_update: failed to update architecture."
+msgstr ""
+
+#: cris-tdep.c:4119
+msgid "cris_gdbarch_init: big endian byte order in info"
+msgstr ""
+
+#: cris-tdep.c:4124
+msgid "cris_gdbarch_init: unknown byte order in info"
+msgstr ""
+
+#: cris-tdep.c:4154
+msgid "cris_gdbarch_init: unsupported CRIS version"
+msgstr ""
+
+#: cris-tdep.c:4196
+msgid "cris_gdbarch_init: unknown CRIS version"
+msgstr ""
+
+#: c-typeprint.c:333
+msgid "type not handled in c_type_print_varspec_prefix()"
+msgstr ""
+
+#: c-typeprint.c:691
+msgid "type not handled in c_type_print_varspec_suffix()"
+msgstr ""
+
+#: c-typeprint.c:734 m2-typeprint.c:82
+msgid "<type unknown>"
+msgstr ""
+
+#: c-typeprint.c:762
+msgid "<unnamed typedef>"
+msgstr ""
+
+#: c-typeprint.c:822
+msgid "<incomplete type>\n"
+msgstr ""
+
+#: c-typeprint.c:825
+msgid "<no data fields>\n"
 msgstr ""
 
-#: cris-tdep.c:3974
-msgid ""
-"Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n"
-"Defaults to 10. "
+#: c-typeprint.c:1053
+#, possible-c-format
+msgid "<undefined type> %s;\n"
 msgstr ""
 
-#: cris-tdep.c:3984
-msgid "Set the current CRIS mode."
+#: c-typeprint.c:1102
+#, possible-c-format
+msgid "<badly mangled name '%s'>"
 msgstr ""
 
-#: cris-tdep.c:3985
-msgid "Show the current CRIS mode."
+#: c-typeprint.c:1165
+#, possible-c-format
+msgid " (Local at %s:%d)\n"
 msgstr ""
 
-#: cris-tdep.c:3986
-msgid ""
-"Set to CRIS_MODE_GURU when debugging in guru mode.\n"
-"Makes GDB use the NRP register instead of the ERP register in certain cases."
+#: c-typeprint.c:1224
+msgid "struct <unknown>"
 msgstr ""
 
-#: cris-tdep.c:3995
-msgid "Set the usage of Dwarf-2 CFI for CRIS."
+#. This should not occur.
+#: c-typeprint.c:1233
+msgid "<range type>"
 msgstr ""
 
-#: cris-tdep.c:3996
-msgid "Show the usage of Dwarf-2 CFI for CRIS."
+#. At least for dump_symtab, it is important that this not
+#. be an error ().
+#: c-typeprint.c:1255
+#, possible-c-format
+msgid "<invalid type code %d>"
 msgstr ""
 
-#: cris-tdep.c:3997
-msgid "Set this to \"off\" if using gcc-cris < R59."
+#: c-valprint.c:176
+msgid "Could not determine the array high bound"
 msgstr ""
 
-#: cris-tdep.c:4035 cris-tdep.c:4061
-msgid "cris_gdbarch_update: failed to update architecture."
+#: c-valprint.c:226
+#, possible-c-format
+msgid "%d vtable entries"
 msgstr ""
 
-#: cris-tdep.c:4120
-msgid "cris_gdbarch_init: big endian byte order in info"
+#. This happens (without TYPE_FLAG_STUB set) on systems which
+#. don't use dbx xrefs (NO_DBX_XREFS in gcc) if a file has a
+#. "struct foo *bar" and no complete type for struct foo in that
+#. file.
+#. This happens (without TYPE_FLAG_STUB set) on systems which don't use
+#. dbx xrefs (NO_DBX_XREFS in gcc) if a file has a "struct foo *bar"
+#. and no complete type for struct foo in that file.
+#: c-valprint.c:605 m2-valprint.c:581 m2-valprint.c:661 valprint.c:362
+msgid "<incomplete type>"
 msgstr ""
 
-#: cris-tdep.c:4125
-msgid "cris_gdbarch_init: unknown byte order in info"
+#: c-valprint.c:634
+#, possible-c-format
+msgid "Invalid C/C++ type code %d in symbol table."
 msgstr ""
 
-#: cris-tdep.c:4155
-msgid "cris_gdbarch_init: unsupported CRIS version"
+#: c-valprint.c:751
+msgid " [incomplete object]"
 msgstr ""
 
-#: cris-tdep.c:4197
-msgid "cris_gdbarch_init: unknown CRIS version"
+#: darwin-nat.c:186
+#, possible-c-format
+msgid "[%d inferior]: "
 msgstr ""
 
-#: darwin-nat-info.c:54
-#, possible-c-format
-msgid "%s must be specified with 0x..."
+#: darwin-nat.c:198
+msgid "[UNKNOWN]"
 msgstr ""
 
-#: darwin-nat-info.c:58
+#: darwin-nat.c:200
 #, possible-c-format
-msgid ":\t%#lx\n"
+msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)"
 msgstr ""
 
-#: darwin-nat-info.c:61
-#, possible-c-format
-msgid ":\t%u.%06u sec\n"
+#: darwin-nat.c:232
+#, c-format
+msgid "unknown (%d)"
 msgstr ""
 
-#: darwin-nat-info.c:87
+#: darwin-nat.c:257
 #, possible-c-format
-msgid "%d processes:\n"
+msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n"
 msgstr ""
 
-#: darwin-nat-info.c:98
-#, possible-c-format
-msgid "    %s is %d has task %#x\n"
+#: darwin-nat.c:259
+msgid "no error"
 msgstr ""
 
-#: darwin-nat-info.c:104
+#: darwin-nat.c:325
 #, possible-c-format
-msgid "    %s is %d unknown task port\n"
+msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:122 darwin-nat-info.c:814 darwin-nat-info.c:835
-msgid "No inferior running\n"
+#: darwin-nat.c:484
+msgid "message header:\n"
 msgstr ""
 
-#: darwin-nat-info.c:130
+#: darwin-nat.c:485
 #, possible-c-format
-msgid "cannot parse task id '%s'\n"
+msgid " bits: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:154
+#: darwin-nat.c:486
 #, possible-c-format
-msgid "TASK_BASIC_INFO for 0x%x:\n"
+msgid " size: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:166
-msgid ""
-"\n"
-"TASK_EVENTS_INFO:\n"
+#: darwin-nat.c:487
+#, possible-c-format
+msgid " remote-port: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:182
-msgid ""
-"\n"
-"TASK_THREAD_TIMES_INFO:\n"
+#: darwin-nat.c:488
+#, possible-c-format
+msgid " local-port: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:212
+#: darwin-nat.c:489
 #, possible-c-format
-msgid "Ports for task 0x%x:\n"
+msgid " reserved: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:213
-msgid "port   type\n"
+#: darwin-nat.c:490
+#, possible-c-format
+msgid " id: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:233
+#: darwin-nat.c:509
 #, possible-c-format
-msgid "%04x: %08x "
+msgid "body: descriptor_count=%u\n"
 msgstr ""
 
-#: darwin-nat-info.c:240
+#: darwin-nat.c:518
 #, possible-c-format
-msgid " %s("
+msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:243
-msgid "??"
+#: darwin-nat.c:522
+#, possible-c-format
+msgid " descr %d: type=%u\n"
 msgstr ""
 
-#: darwin-nat-info.c:245
+#: darwin-nat.c:532
 #, possible-c-format
-msgid "%u"
+msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n"
 msgstr ""
 
-#: darwin-nat-info.c:246
-msgid " refs)"
+#: darwin-nat.c:540
+msgid "  data:"
 msgstr ""
 
-#: darwin-nat-info.c:252
-msgid " gdb-task"
+#: darwin-nat.c:682
+#, possible-c-format
+msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:254
-msgid " host-self"
+#: darwin-nat.c:695
+#, possible-c-format
+msgid "ptrace THUP: res=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:256
-msgid " gdb-exception"
+#: darwin-nat.c:702
+#, possible-c-format
+msgid "darwin_resume_thread: kill 0x%x %d: %d\n"
 msgstr ""
 
-#: darwin-nat-info.c:258
-msgid " gdb-port_set"
+#. Set single step.
+#: darwin-nat.c:708
+#, possible-c-format
+msgid "darwin_set_sstep (thread=%x, enable=%d)\n"
 msgstr ""
 
-#: darwin-nat-info.c:264
-msgid " inferior-task"
+#: darwin-nat.c:797
+#, possible-c-format
+msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:266
-msgid " inferior-notify"
+#. Should not happen...
+#: darwin-nat.c:877
+#, possible-c-format
+msgid "darwin_wait: ill-formatted message (id=%x)\n"
 msgstr ""
 
-#: darwin-nat-info.c:275
-msgid " inferior-excp-port"
+#: darwin-nat.c:890
+#, possible-c-format
+msgid "darwin_wait: thread=%x, got %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:287
+#: darwin-nat.c:913
 #, possible-c-format
-msgid " inferior-thread for 0x%x"
+msgid "  (signal %d: %s)\n"
 msgstr ""
 
-#: darwin-nat-info.c:316
+#: darwin-nat.c:958
 #, possible-c-format
-msgid "Port 0x%lx in task 0x%lx:\n"
+msgid "wait4: res=%d: %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:318
+#: darwin-nat.c:974
 #, possible-c-format
-msgid "  port set: 0x%x\n"
+msgid "darwin_wait: pid=%d exit, status=%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:319
+#: darwin-nat.c:984
 #, possible-c-format
-msgid "     seqno: 0x%x\n"
+msgid "darwin_wait: pid=%d\n"
 msgstr ""
 
-#: darwin-nat-info.c:320
+#: darwin-nat.c:991
 #, possible-c-format
-msgid "   mscount: 0x%x\n"
+msgid "Bad local-port: %x\n"
 msgstr ""
 
-#: darwin-nat-info.c:321
+#: darwin-nat.c:1041
 #, possible-c-format
-msgid "    qlimit: 0x%x\n"
+msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n"
 msgstr ""
 
-#: darwin-nat-info.c:322
+#: darwin-nat.c:1075
 #, possible-c-format
-msgid "  msgcount: 0x%x\n"
+msgid "mach_msg: ret=%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:323
+#: darwin-nat.c:1109
 #, possible-c-format
-msgid "  sorights: 0x%x\n"
+msgid "darwin_wait: mach_msg(pending) ret=%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:324
+#: darwin-nat.c:1127
 #, possible-c-format
-msgid "   srights: 0x%x\n"
+msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n"
 msgstr ""
 
-#: darwin-nat-info.c:325
-#, possible-c-format
-msgid " pdrequest: 0x%x\n"
+#: darwin-nat.c:1131
+msgid "darwin_wait: unhandled pending message\n"
 msgstr ""
 
-#: darwin-nat-info.c:326
+#: darwin-nat.c:1255
 #, possible-c-format
-msgid " nsrequest: 0x%x\n"
+msgid "cannot kill: %s"
 msgstr ""
 
-#: darwin-nat-info.c:327
+#: darwin-nat.c:1321
 #, possible-c-format
-msgid "     flags: 0x%x\n"
+msgid "Failed to kill inferior: ptrace returned %d [%s] (pid=%d)"
 msgstr ""
 
-#: darwin-nat-info.c:336
-msgid "Task and port"
+#: darwin-nat.c:1370
+#, possible-c-format
+msgid ""
+"Unable to find Mach task port for process-id %d: %s (0x%lx).\n"
+" (please check gdb is codesigned - see taskgated(8))"
 msgstr ""
 
-#: darwin-nat-info.c:358
+#: darwin-nat.c:1375
 #, possible-c-format
-msgid "Threads in task %#x:\n"
+msgid "inferior task: 0x%x, pid: %d\n"
 msgstr ""
 
-#: darwin-nat-info.c:361
+#: darwin-nat.c:1486
 #, possible-c-format
-msgid "    %#x\n"
+msgid "unable to create a pipe: %s"
 msgstr ""
 
-#: darwin-nat-info.c:381
-msgid "Thread"
+#. Trying to masturbate?
+#: darwin-nat.c:1573 gnu-nat.c:2167 inf-ptrace.c:205 inf-ttrace.c:743
+msgid "I refuse to debug myself!"
 msgstr ""
 
-#: darwin-nat-info.c:384
-msgid "THREAD_BASIC_INFO\n"
+#: darwin-nat.c:1580 inf-ptrace.c:220 inf-ttrace.c:750
+#, possible-c-format
+msgid "Attaching to program: %s, %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:435
-msgid "share"
+#: darwin-nat.c:1583 inf-ptrace.c:223 inf-ttrace.c:753 procfs.c:3303
+#, possible-c-format
+msgid "Attaching to %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:437
-msgid "copy "
+#: darwin-nat.c:1590
+#, possible-c-format
+msgid "Can't attach to process %d: %s (%d)"
 msgstr ""
 
-#: darwin-nat-info.c:439
-msgid "none "
+#: darwin-nat.c:1635 inf-ptrace.c:282 inf-ttrace.c:798 procfs.c:3329
+#, possible-c-format
+msgid "Detaching from program: %s, %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:441
-msgid "???  "
+#: darwin-nat.c:1651
+#, possible-c-format
+msgid "Unable to detach from process-id %d: %s (%d)"
 msgstr ""
 
-#: darwin-nat-info.c:451
-msgid "cow"
+#: darwin-nat.c:1679
+#, c-format
+msgid "Thread 0x%lx of process %u"
 msgstr ""
 
-#: darwin-nat-info.c:453
-msgid "private"
+#: darwin-nat.c:1712
+#, possible-c-format
+msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n"
 msgstr ""
 
-#: darwin-nat-info.c:455
-msgid "empty"
+#: darwin-nat.c:1721
+#, possible-c-format
+msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s"
 msgstr ""
 
-#: darwin-nat-info.c:457
-msgid "shared"
+#: darwin-nat.c:1753
+#, possible-c-format
+msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n"
 msgstr ""
 
-#: darwin-nat-info.c:459
-msgid "true-shrd"
+#: darwin-nat.c:1761
+#, possible-c-format
+msgid ""
+"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, "
+"len=%s\n"
 msgstr ""
 
-#: darwin-nat-info.c:461
-msgid "prv-alias"
+#: darwin-nat.c:1770
+#, possible-c-format
+msgid "No memory at %s (vs %s+0x%x).  Nothing written"
 msgstr ""
 
-#: darwin-nat-info.c:463
-msgid "shr-alias"
+#: darwin-nat.c:1788
+#, possible-c-format
+msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s"
 msgstr ""
 
-#: darwin-nat-info.c:465
-msgid "???"
+#: darwin-nat.c:1803
+#, possible-c-format
+msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s"
 msgstr ""
 
-#: darwin-nat-info.c:475 darwin-nat-info.c:763
-msgid "default"
+#: darwin-nat.c:1817
+#, possible-c-format
+msgid "darwin_read_write_inferior: mach_vm_write failed: %s"
 msgstr ""
 
-#: darwin-nat-info.c:477
-msgid "malloc"
+#: darwin-nat.c:1865
+#, possible-c-format
+msgid "darwin_xfer_memory(%s, %d, %c)\n"
 msgstr ""
 
-#: darwin-nat-info.c:479
-msgid "malloc_small"
+#: darwin-nat.c:1883
+#, possible-c-format
+msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n"
 msgstr ""
 
-#: darwin-nat-info.c:481
-msgid "malloc_large"
+#: darwin-nat.c:2037
+msgid "Darwin child process"
 msgstr ""
 
-#: darwin-nat-info.c:483
-msgid "malloc_huge"
+#: darwin-nat.c:2039
+msgid "Darwin child process (started by the \"run\" command)."
 msgstr ""
 
-#: darwin-nat-info.c:485
-msgid "sbrk"
+#: darwin-nat.c:2063
+#, possible-c-format
+msgid "GDB task: 0x%lx, pid: %d\n"
 msgstr ""
 
-#: darwin-nat-info.c:487
-msgid "realloc"
+#: darwin-nat.c:2067
+msgid "Set if printing inferior communication debugging statements."
 msgstr ""
 
-#: darwin-nat-info.c:489
-msgid "malloc_tiny"
+#: darwin-nat.c:2068
+msgid "Show if printing inferior communication debugging statements."
 msgstr ""
 
-#: darwin-nat-info.c:491
-msgid "analysis_tool"
+#: darwin-nat.c:2074
+msgid "Set if mach exceptions are caught."
 msgstr ""
 
-#: darwin-nat-info.c:493
-msgid "mach_msg"
+#: darwin-nat.c:2075
+msgid "Show if mach exceptions are caught."
 msgstr ""
 
-#: darwin-nat-info.c:495
-msgid "iokit"
+#: darwin-nat.c:2076
+msgid ""
+"When this mode is on, all low level exceptions are reported before being\n"
+"reported by the kernel."
 msgstr ""
 
-#: darwin-nat-info.c:497
-msgid "stack"
+#: darwin-nat-info.c:53
+#, possible-c-format
+msgid "%s must be specified with 0x..."
 msgstr ""
 
-#: darwin-nat-info.c:499
-msgid "guard"
+#: darwin-nat-info.c:57
+#, possible-c-format
+msgid ":\t%#lx\n"
 msgstr ""
 
-#: darwin-nat-info.c:501
-msgid "shared_pmap"
+#: darwin-nat-info.c:60
+#, possible-c-format
+msgid ":\t%u.%06u sec\n"
 msgstr ""
 
-#: darwin-nat-info.c:503
-msgid "dylib"
+#: darwin-nat-info.c:86
+#, possible-c-format
+msgid "%d processes:\n"
 msgstr ""
 
-#: darwin-nat-info.c:505
-msgid "appkit"
+#: darwin-nat-info.c:97
+#, possible-c-format
+msgid "    %s is %d has task %#x\n"
 msgstr ""
 
-#: darwin-nat-info.c:507
-msgid "foundation"
+#: darwin-nat-info.c:103
+#, possible-c-format
+msgid "    %s is %d unknown task port\n"
 msgstr ""
 
-#: darwin-nat-info.c:532
-msgid "No memory regions."
+#: darwin-nat-info.c:121 darwin-nat-info.c:814 darwin-nat-info.c:835
+msgid "No inferior running\n"
 msgstr ""
 
-#: darwin-nat-info.c:576
+#: darwin-nat-info.c:129
 #, possible-c-format
-msgid "%s-%s %s/%s  %s %s %s"
+msgid "cannot parse task id '%s'\n"
 msgstr ""
 
-#: darwin-nat-info.c:582
-msgid "shrd"
+#: darwin-nat-info.c:153
+#, possible-c-format
+msgid "TASK_BASIC_INFO for 0x%x:\n"
 msgstr ""
 
-#: darwin-nat-info.c:582
-msgid "priv"
+#: darwin-nat-info.c:165
+msgid ""
+"\n"
+"TASK_EVENTS_INFO:\n"
 msgstr ""
 
-#: darwin-nat-info.c:583
-msgid "reserved"
+#: darwin-nat-info.c:181
+msgid ""
+"\n"
+"TASK_THREAD_TIMES_INFO:\n"
 msgstr ""
 
-#: darwin-nat-info.c:583
-msgid "not-rsvd"
+#: darwin-nat-info.c:211
+#, possible-c-format
+msgid "Ports for task 0x%x:\n"
 msgstr ""
 
-#: darwin-nat-info.c:586
-#, possible-c-format
-msgid " (%d sub-rgn)"
+#: darwin-nat-info.c:212
+msgid "port   type\n"
 msgstr ""
 
-#: darwin-nat-info.c:674
-msgid "sm "
+#: darwin-nat-info.c:232
+#, possible-c-format
+msgid "%04x: %08x "
 msgstr ""
 
-#: darwin-nat-info.c:674
-msgid "obj"
+#: darwin-nat-info.c:239
+#, possible-c-format
+msgid " %s("
 msgstr ""
 
-#: darwin-nat-info.c:743
-msgid "Inferior not available"
+#: darwin-nat-info.c:242
+msgid "??"
 msgstr ""
 
-#: darwin-nat-info.c:754
+#: darwin-nat-info.c:244
 #, possible-c-format
-msgid "%d exceptions:\n"
+msgid "%u"
 msgstr ""
 
-#: darwin-nat-info.c:759
-#, possible-c-format
-msgid "port 0x%04x, behavior: "
+#: darwin-nat-info.c:245
+msgid " refs)"
 msgstr ""
 
-#: darwin-nat-info.c:766
-msgid "state"
+#: darwin-nat-info.c:251
+msgid " gdb-task"
 msgstr ""
 
-#: darwin-nat-info.c:769
-msgid "state-identity"
+#: darwin-nat-info.c:253
+msgid " host-self"
 msgstr ""
 
-#: darwin-nat-info.c:772
-#, possible-c-format
-msgid "0x%x"
+#: darwin-nat-info.c:255
+msgid " gdb-exception"
 msgstr ""
 
-#: darwin-nat-info.c:774
-msgid ", masks:"
+#: darwin-nat-info.c:257
+msgid " gdb-port_set"
 msgstr ""
 
-#: darwin-nat-info.c:776
-msgid " BAD_ACCESS"
+#: darwin-nat-info.c:263
+msgid " inferior-task"
 msgstr ""
 
-#: darwin-nat-info.c:778
-msgid " BAD_INSTRUCTION"
+#: darwin-nat-info.c:265
+msgid " inferior-notify"
 msgstr ""
 
-#: darwin-nat-info.c:780
-msgid " ARITHMETIC"
+#: darwin-nat-info.c:274
+msgid " inferior-excp-port"
 msgstr ""
 
-#: darwin-nat-info.c:782
-msgid " EMULATION"
+#: darwin-nat-info.c:286
+#, possible-c-format
+msgid " inferior-thread for 0x%x"
 msgstr ""
 
-#: darwin-nat-info.c:784
-msgid " SOFTWARE"
+#: darwin-nat-info.c:315
+#, possible-c-format
+msgid "Port 0x%lx in task 0x%lx:\n"
 msgstr ""
 
-#: darwin-nat-info.c:786
-msgid " BREAKPOINT"
+#: darwin-nat-info.c:317
+#, possible-c-format
+msgid "  port set: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:788
-msgid " SYSCALL"
+#: darwin-nat-info.c:318
+#, possible-c-format
+msgid "     seqno: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:790
-msgid " MACH_SYSCALL"
+#: darwin-nat-info.c:319
+#, possible-c-format
+msgid "   mscount: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:792
-msgid " RPC_ALERT"
+#: darwin-nat-info.c:320
+#, possible-c-format
+msgid "    qlimit: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:794
-msgid " CRASH"
+#: darwin-nat-info.c:321
+#, possible-c-format
+msgid "  msgcount: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:828
-msgid "Parameter is saved, host or none"
+#: darwin-nat-info.c:322
+#, possible-c-format
+msgid "  sorights: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:850
-msgid "Get list of tasks in system."
+#: darwin-nat-info.c:323
+#, possible-c-format
+msgid "   srights: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:852
-msgid "Get list of ports in a task."
+#: darwin-nat-info.c:324
+#, possible-c-format
+msgid " pdrequest: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:854
-msgid "Get info on a specific port."
+#: darwin-nat-info.c:325
+#, possible-c-format
+msgid " nsrequest: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:856
-msgid "Get info on a specific task."
+#: darwin-nat-info.c:326
+#, possible-c-format
+msgid "     flags: 0x%x\n"
 msgstr ""
 
-#: darwin-nat-info.c:858
-msgid "Get list of threads in a task."
+#: darwin-nat-info.c:335
+msgid "Task and port"
 msgstr ""
 
-#: darwin-nat-info.c:860
-msgid "Get info on a specific thread."
+#: darwin-nat-info.c:357
+#, possible-c-format
+msgid "Threads in task %#x:\n"
 msgstr ""
 
-#: darwin-nat-info.c:863
-msgid "Get information on all mach region for the task."
+#: darwin-nat-info.c:360
+#, possible-c-format
+msgid "    %#x\n"
 msgstr ""
 
-#: darwin-nat-info.c:865
-msgid "Get information on all mach sub region for the task."
+#: darwin-nat-info.c:380
+msgid "Thread"
 msgstr ""
 
-#: darwin-nat-info.c:867
-msgid "Get information on mach region at given address."
+#: darwin-nat-info.c:383
+msgid "THREAD_BASIC_INFO\n"
 msgstr ""
 
-#: darwin-nat-info.c:870
-msgid "Disp mach exceptions."
+#: darwin-nat-info.c:434
+msgid "share"
 msgstr ""
 
-#: darwin-nat.c:185
-#, possible-c-format
-msgid "[%d inferior]: "
+#: darwin-nat-info.c:436
+msgid "copy "
 msgstr ""
 
-#: darwin-nat.c:197
-msgid "[UNKNOWN]"
+#: darwin-nat-info.c:438
+msgid "none "
 msgstr ""
 
-#: darwin-nat.c:199
-#, possible-c-format
-msgid "Mach error at \"%s:%u\" in function \"%s\": %s (0x%lx)"
+#: darwin-nat-info.c:440
+msgid "???  "
 msgstr ""
 
-#: darwin-nat.c:231
-#, c-format
-msgid "unknown (%d)"
+#: darwin-nat-info.c:450
+msgid "cow"
 msgstr ""
 
-#: darwin-nat.c:244
-#, possible-c-format
-msgid "ptrace (%s, %d, 0x%x, %d): %d (%s)\n"
+#: darwin-nat-info.c:452
+msgid "private"
 msgstr ""
 
-#: darwin-nat.c:246
-msgid "no error"
+#: darwin-nat-info.c:454
+msgid "empty"
 msgstr ""
 
-#: darwin-nat.c:312
-#, possible-c-format
-msgid " new_ix:%d/%d, old_ix:%d/%d, new_id:%x old_id:%x\n"
+#: darwin-nat-info.c:456
+msgid "shared"
 msgstr ""
 
-#: darwin-nat.c:471
-msgid "message header:\n"
+#: darwin-nat-info.c:458
+msgid "true-shrd"
 msgstr ""
 
-#: darwin-nat.c:472
-#, possible-c-format
-msgid " bits: 0x%x\n"
+#: darwin-nat-info.c:460
+msgid "prv-alias"
 msgstr ""
 
-#: darwin-nat.c:473
-#, possible-c-format
-msgid " size: 0x%x\n"
+#: darwin-nat-info.c:462
+msgid "shr-alias"
 msgstr ""
 
-#: darwin-nat.c:474
-#, possible-c-format
-msgid " remote-port: 0x%x\n"
+#: darwin-nat-info.c:464
+msgid "???"
 msgstr ""
 
-#: darwin-nat.c:475
-#, possible-c-format
-msgid " local-port: 0x%x\n"
+#: darwin-nat-info.c:474 darwin-nat-info.c:763
+msgid "default"
 msgstr ""
 
-#: darwin-nat.c:476
-#, possible-c-format
-msgid " reserved: 0x%x\n"
+#: darwin-nat-info.c:476
+msgid "malloc"
 msgstr ""
 
-#: darwin-nat.c:477
-#, possible-c-format
-msgid " id: 0x%x\n"
+#: darwin-nat-info.c:478
+msgid "malloc_small"
 msgstr ""
 
-#: darwin-nat.c:496
-#, possible-c-format
-msgid "body: descriptor_count=%u\n"
+#: darwin-nat-info.c:480
+msgid "malloc_large"
 msgstr ""
 
-#: darwin-nat.c:505
-#, possible-c-format
-msgid " descr %d: type=%u (port) name=0x%x, dispo=%d\n"
+#: darwin-nat-info.c:482
+msgid "malloc_huge"
 msgstr ""
 
-#: darwin-nat.c:509
-#, possible-c-format
-msgid " descr %d: type=%u\n"
+#: darwin-nat-info.c:484
+msgid "sbrk"
 msgstr ""
 
-#: darwin-nat.c:519
-#, possible-c-format
-msgid "NDR: mig=%02x if=%02x encod=%02x int=%02x char=%02x float=%02x\n"
+#: darwin-nat-info.c:486
+msgid "realloc"
 msgstr ""
 
-#: darwin-nat.c:527
-msgid "  data:"
+#: darwin-nat-info.c:488
+msgid "malloc_tiny"
 msgstr ""
 
-#: darwin-nat.c:666
-#, possible-c-format
-msgid "darwin_resume_thread: state=%d, thread=0x%x, step=%d nsignal=%d\n"
+#: darwin-nat-info.c:490
+msgid "analysis_tool"
 msgstr ""
 
-#: darwin-nat.c:679
-#, possible-c-format
-msgid "ptrace THUP: res=%d\n"
+#: darwin-nat-info.c:492
+msgid "mach_msg"
 msgstr ""
 
-#: darwin-nat.c:686
-#, possible-c-format
-msgid "darwin_resume_thread: kill 0x%x %d: %d\n"
+#: darwin-nat-info.c:494
+msgid "iokit"
 msgstr ""
 
-#. Set single step.
-#: darwin-nat.c:692
-#, possible-c-format
-msgid "darwin_set_sstep (thread=%x, enable=%d)\n"
+#: darwin-nat-info.c:496
+msgid "stack"
 msgstr ""
 
-#: darwin-nat.c:781
-#, possible-c-format
-msgid "darwin_resume: pid=%d, tid=0x%x, step=%d, signal=%d\n"
+#: darwin-nat-info.c:498
+msgid "guard"
 msgstr ""
 
-#. Should not happen...
-#: darwin-nat.c:861
-#, possible-c-format
-msgid "darwin_wait: ill-formatted message (id=%x)\n"
+#: darwin-nat-info.c:500
+msgid "shared_pmap"
 msgstr ""
 
-#: darwin-nat.c:874
-#, possible-c-format
-msgid "darwin_wait: thread=%x, got %s\n"
+#: darwin-nat-info.c:502
+msgid "dylib"
 msgstr ""
 
-#: darwin-nat.c:897
-#, possible-c-format
-msgid "  (signal %d: %s)\n"
+#: darwin-nat-info.c:504
+msgid "appkit"
 msgstr ""
 
-#: darwin-nat.c:942
-#, possible-c-format
-msgid "wait4: res=%d: %s\n"
+#: darwin-nat-info.c:506
+msgid "foundation"
 msgstr ""
 
-#: darwin-nat.c:958
-#, possible-c-format
-msgid "darwin_wait: pid=%d exit, status=%x\n"
+#: darwin-nat-info.c:531
+msgid "No memory regions."
 msgstr ""
 
-#: darwin-nat.c:968
+#: darwin-nat-info.c:575
 #, possible-c-format
-msgid "darwin_wait: pid=%d\n"
+msgid "%s-%s %s/%s  %s %s %s"
 msgstr ""
 
-#: darwin-nat.c:975
-#, possible-c-format
-msgid "Bad local-port: %x\n"
+#: darwin-nat-info.c:581
+msgid "shrd"
 msgstr ""
 
-#: darwin-nat.c:1025
-#, possible-c-format
-msgid "darwin_wait: waiting for a message pid=%d thread=%lx\n"
+#: darwin-nat-info.c:581
+msgid "priv"
 msgstr ""
 
-#: darwin-nat.c:1059
-#, possible-c-format
-msgid "mach_msg: ret=%x\n"
+#: darwin-nat-info.c:582
+msgid "reserved"
 msgstr ""
 
-#: darwin-nat.c:1093
-#, possible-c-format
-msgid "darwin_wait: mach_msg(pending) ret=%x\n"
+#: darwin-nat-info.c:582
+msgid "not-rsvd"
 msgstr ""
 
-#: darwin-nat.c:1111
+#: darwin-nat-info.c:585
 #, possible-c-format
-msgid "darwin_wait: thread %x hit a non-gdb breakpoint\n"
+msgid " (%d sub-rgn)"
 msgstr ""
 
-#: darwin-nat.c:1115
-msgid "darwin_wait: unhandled pending message\n"
+#: darwin-nat-info.c:674
+msgid "sm "
 msgstr ""
 
-#: darwin-nat.c:1239
-#, possible-c-format
-msgid "cannot kill: %s"
+#: darwin-nat-info.c:674
+msgid "obj"
 msgstr ""
 
-#: darwin-nat.c:1351
-#, possible-c-format
-msgid ""
-"Unable to find Mach task port for process-id %d: %s (0x%lx).\n"
-" (please check gdb is codesigned - see taskgated(8))"
+#: darwin-nat-info.c:743
+msgid "Inferior not available"
 msgstr ""
 
-#: darwin-nat.c:1356
+#: darwin-nat-info.c:754
 #, possible-c-format
-msgid "inferior task: 0x%x, pid: %d\n"
+msgid "%d exceptions:\n"
 msgstr ""
 
-#: darwin-nat.c:1467
+#: darwin-nat-info.c:759
 #, possible-c-format
-msgid "unable to create a pipe: %s"
+msgid "port 0x%04x, behavior: "
 msgstr ""
 
-#. Trying to masturbate?
-#: darwin-nat.c:1520 gnu-nat.c:2166 inf-ptrace.c:206 inf-ttrace.c:744
-msgid "I refuse to debug myself!"
+#: darwin-nat-info.c:766
+msgid "state"
 msgstr ""
 
-#: darwin-nat.c:1527 inf-ptrace.c:221 inf-ttrace.c:751
-#, possible-c-format
-msgid "Attaching to program: %s, %s\n"
+#: darwin-nat-info.c:769
+msgid "state-identity"
 msgstr ""
 
-#: darwin-nat.c:1530 inf-ptrace.c:224 inf-ttrace.c:754 procfs.c:3305
+#: darwin-nat-info.c:772
 #, possible-c-format
-msgid "Attaching to %s\n"
+msgid "0x%x"
 msgstr ""
 
-#: darwin-nat.c:1537
-#, possible-c-format
-msgid "Can't attach to process %d: %s (%d)"
+#: darwin-nat-info.c:774
+msgid ", masks:"
 msgstr ""
 
-#: darwin-nat.c:1582 inf-ptrace.c:283 inf-ttrace.c:799 procfs.c:3331
-#, possible-c-format
-msgid "Detaching from program: %s, %s\n"
+#: darwin-nat-info.c:776
+msgid " BAD_ACCESS"
 msgstr ""
 
-#: darwin-nat.c:1598
-#, possible-c-format
-msgid "Unable to detach from process-id %d: %s (%d)"
+#: darwin-nat-info.c:778
+msgid " BAD_INSTRUCTION"
 msgstr ""
 
-#: darwin-nat.c:1622
-#, c-format
-msgid "Thread 0x%lx of process %u"
+#: darwin-nat-info.c:780
+msgid " ARITHMETIC"
 msgstr ""
 
-#: darwin-nat.c:1655
-#, possible-c-format
-msgid "darwin_read_write_inferior(task=%x, %s, len=%d)\n"
+#: darwin-nat-info.c:782
+msgid " EMULATION"
 msgstr ""
 
-#: darwin-nat.c:1664
-#, possible-c-format
-msgid "darwin_read_write_inferior: mach_vm_read failed at %s: %s"
+#: darwin-nat-info.c:784
+msgid " SOFTWARE"
 msgstr ""
 
-#: darwin-nat.c:1696
-#, possible-c-format
-msgid "darwin_read_write_inferior: mach_vm_region_recurse failed at %s: %s\n"
+#: darwin-nat-info.c:786
+msgid " BREAKPOINT"
 msgstr ""
 
-#: darwin-nat.c:1704
-#, possible-c-format
-msgid ""
-"darwin_read_write_inferior: mach_vm_region_recurse addr=%s, start=%s, "
-"len=%s\n"
+#: darwin-nat-info.c:788
+msgid " SYSCALL"
 msgstr ""
 
-#: darwin-nat.c:1713
-#, possible-c-format
-msgid "No memory at %s (vs %s+0x%x).  Nothing written"
+#: darwin-nat-info.c:790
+msgid " MACH_SYSCALL"
 msgstr ""
 
-#: darwin-nat.c:1731
-#, possible-c-format
-msgid "darwin_read_write_inf: mach_vm_protect max failed at %s: %s"
+#: darwin-nat-info.c:792
+msgid " RPC_ALERT"
 msgstr ""
 
-#: darwin-nat.c:1746
-#, possible-c-format
-msgid "darwin_read_write_inf: mach_vm_protect failed at %s (len=0x%lx): %s"
+#: darwin-nat-info.c:794
+msgid " CRASH"
 msgstr ""
 
-#: darwin-nat.c:1760
-#, possible-c-format
-msgid "darwin_read_write_inferior: mach_vm_write failed: %s"
+#: darwin-nat-info.c:828
+msgid "Parameter is saved, host or none"
 msgstr ""
 
-#: darwin-nat.c:1782
-#, possible-c-format
-msgid "darwin_xfer_memory(%s, %d, %c)\n"
+#: darwin-nat-info.c:850
+msgid "Get list of tasks in system."
 msgstr ""
 
-#: darwin-nat.c:1800
-#, possible-c-format
-msgid "darwin_xfer_partial(%s, %d, rbuf=%s, wbuf=%s) pid=%u\n"
+#: darwin-nat-info.c:852
+msgid "Get list of ports in a task."
 msgstr ""
 
-#: darwin-nat.c:1943
-msgid "Darwin child process"
+#: darwin-nat-info.c:854
+msgid "Get info on a specific port."
 msgstr ""
 
-#: darwin-nat.c:1945
-msgid "Darwin child process (started by the \"run\" command)."
+#: darwin-nat-info.c:856
+msgid "Get info on a specific task."
 msgstr ""
 
-#: darwin-nat.c:1969
-#, possible-c-format
-msgid "GDB task: 0x%lx, pid: %d\n"
+#: darwin-nat-info.c:858
+msgid "Get list of threads in a task."
 msgstr ""
 
-#: darwin-nat.c:1973
-msgid "Set if printing inferior communication debugging statements."
+#: darwin-nat-info.c:860
+msgid "Get info on a specific thread."
 msgstr ""
 
-#: darwin-nat.c:1974
-msgid "Show if printing inferior communication debugging statements."
+#: darwin-nat-info.c:863
+msgid "Get information on all mach region for the task."
 msgstr ""
 
-#: darwin-nat.c:1980
-msgid "Set if mach exceptions are caught."
+#: darwin-nat-info.c:865
+msgid "Get information on all mach sub region for the task."
 msgstr ""
 
-#: darwin-nat.c:1981
-msgid "Show if mach exceptions are caught."
+#: darwin-nat-info.c:867
+msgid "Get information on mach region at given address."
 msgstr ""
 
-#: darwin-nat.c:1982
-msgid ""
-"When this mode is on, all low level exceptions are reported before being\n"
-"reported by the kernel."
+#: darwin-nat-info.c:870
+msgid "Disp mach exceptions."
 msgstr ""
 
-#: dbxread.c:168 mdebugread.c:3436
+#: dbxread.c:170 mdebugread.c:3441
 #, possible-c-format
 msgid "unknown symbol type %s"
 msgstr ""
 
-#: dbxread.c:175
+#: dbxread.c:177
 #, possible-c-format
 msgid "N_LBRAC/N_RBRAC symbol mismatch at symtab pos %d"
 msgstr ""
 
-#: dbxread.c:182
+#: dbxread.c:184
 #, possible-c-format
 msgid "\"repeated\" header file %s not previously seen, at symtab pos %d"
 msgstr ""
 
-#: dbxread.c:227
+#: dbxread.c:229
 msgid "Can't find any code sections in symbol file"
 msgstr ""
 
-#: dbxread.c:646
+#: dbxread.c:648
 msgid "Can't find .text section in symbol file"
 msgstr ""
 
-#: dbxread.c:708
+#: dbxread.c:710
 #, possible-c-format
 msgid "ridiculous string table size (%d bytes)."
 msgstr ""
 
-#: dbxread.c:833
+#: dbxread.c:835
 msgid "Premature end of file reading symbol table"
 msgstr ""
 
-#: dbxread.c:974
+#: dbxread.c:976
 #, possible-c-format
 msgid "bad string table offset in symbol %d"
 msgstr ""
 
-#: dbxread.c:1178 mdebugread.c:2245 xcoffread.c:2156
+#: dbxread.c:1180 mdebugread.c:2250 xcoffread.c:2182
 #, possible-c-format
 msgid "function `%s' appears to be defined outside of all compilation units"
 msgstr ""
 
-#: dbxread.c:1429
+#: dbxread.c:1431
 #, possible-c-format
 msgid "string table offset backs up at %d"
 msgstr ""
 
-#: dbxread.c:1577
+#: dbxread.c:1579
 #, possible-c-format
 msgid "N_BINCL %s not in entries for any file, at symtab pos %d"
 msgstr ""
 
-#: dbxread.c:2038 mdebugread.c:3371 xcoffread.c:2872
+#: dbxread.c:2040 mdebugread.c:3376 xcoffread.c:2898
 #, possible-c-format
 msgid "unknown symbol descriptor `%c'"
 msgstr ""
 
-#: dbxread.c:2607
+#: dbxread.c:2609
 msgid "First symbol in segment of executable not a source symbol"
 msgstr ""
 
-#: dbxread.c:2884
+#: dbxread.c:2886
 msgid ""
 "misplaced N_LBRAC entry; discarding local symbols which have no enclosing "
 "block"
 msgstr ""
 
-#: dbxread.c:2905
+#: dbxread.c:2907
 msgid "block start larger than block end"
 msgstr ""
 
-#: dbxread.c:3199
+#: dbxread.c:3201
 #, possible-c-format
 msgid "unmatched N_LBRAC before symtab pos %d"
 msgstr ""
 
-#: dbxread.c:3357 dbxread.c:3451 dbxread.c:3548
+#: dbxread.c:3359 dbxread.c:3453 dbxread.c:3549
 #, possible-c-format
 msgid "ridiculous string table size: %d bytes"
 msgstr ""
 
-#: dbxread.c:3524
+#: dbxread.c:3525
 #, possible-c-format
 msgid ""
 "stabsect_build_psymtabs:  Found stabs (%s), but not string section (%s)"
 msgstr ""
 
-#: dbxread.c:3535
+#: dbxread.c:3536
 #, possible-c-format
 msgid "Can't find %s section in symbol file"
 msgstr ""
 
-#: dcache.c:134
+#: dcache.c:140
 #, possible-c-format
 msgid "Deprecated remotecache flag is %s.\n"
 msgstr ""
 
-#: dcache.c:550 dcache.c:611
+#: dcache.c:570 dcache.c:633
 msgid "No data cache available.\n"
 msgstr ""
 
-#: dcache.c:565
+#: dcache.c:585
 msgid "No such cache line exists.\n"
 msgstr ""
 
-#: dcache.c:571 dcache.c:627
+#: dcache.c:591 dcache.c:649
 #, possible-c-format
 msgid "Line %d: address %s [%d hits]\n"
 msgstr ""
 
-#: dcache.c:598
+#: dcache.c:618
 msgid "Usage: info dcache [linenumber]\n"
 msgstr ""
 
-#: dcache.c:606
+#: dcache.c:626
 #, possible-c-format
-msgid "Dcache line width %d, maximum size %d\n"
+msgid "Dcache %u lines of %u bytes each.\n"
 msgstr ""
 
-#: dcache.c:615
+#: dcache.c:637
 #, possible-c-format
 msgid "Contains data for %s\n"
 msgstr ""
 
-#: dcache.c:635
+#: dcache.c:657
 #, possible-c-format
 msgid "Cache state: %d active lines, %d hits\n"
 msgstr ""
 
-#: dcache.c:642
+#: dcache.c:667
+msgid "Dcache size must be greater than 0."
+msgstr ""
+
+#: dcache.c:682
+#, possible-c-format
+msgid "Invalid dcache line size: %u (must be power of 2)."
+msgstr ""
+
+#: dcache.c:706
 msgid "Set cache use for remote targets."
 msgstr ""
 
-#: dcache.c:643
+#: dcache.c:707
 msgid "Show cache use for remote targets."
 msgstr ""
 
-#: dcache.c:644
+#: dcache.c:708
 msgid ""
 "This used to enable the data cache for remote targets.  The cache\n"
 "functionality is now controlled by the memory region system and the\n"
@@ -6558,7 +6653,7 @@
 "exists only for compatibility reasons."
 msgstr ""
 
-#: dcache.c:654
+#: dcache.c:718
 msgid ""
 "Print information on the dcache performance.\n"
 "With no arguments, this command prints the cache configuration and a\n"
@@ -6566,6 +6661,31 @@
 "the contents of a given line."
 msgstr ""
 
+#: dcache.c:724
+msgid "Use this command to set number of lines in dcache and line-size."
+msgstr ""
+
+#. allow_unknown
+#: dcache.c:727
+msgid "Show dcachesettings."
+msgstr ""
+
+#: dcache.c:732
+msgid "Set dcache line size in bytes (must be power of 2)."
+msgstr ""
+
+#: dcache.c:733
+msgid "Show dcache line size."
+msgstr ""
+
+#: dcache.c:740
+msgid "Set number of dcache lines."
+msgstr ""
+
+#: dcache.c:741
+msgid "Show number of dcache lines."
+msgstr ""
+
 #: dec-thread.c:355
 #, possible-c-format
 msgid "unable to get thread info, ignoring thread %ld"
@@ -6592,36 +6712,62 @@
 msgid "Show debugging of DEC threads module."
 msgstr ""
 
-#: demangle.c:61
+#: demangle.c:54
+#, possible-c-format
+msgid "Demangling of encoded C++/ObjC names when displaying symbols is %s.\n"
+msgstr ""
+
+#: demangle.c:67
+#, possible-c-format
+msgid "Demangling of C++/ObjC names in disassembly listings is %s.\n"
+msgstr ""
+
+#: demangle.c:86
 #, possible-c-format
 msgid "The current C++ demangling style is \"%s\".\n"
 msgstr ""
 
-#: demangle.c:114
+#: demangle.c:136
 #, possible-c-format
 msgid "Unknown demangling style `%s'.\n"
 msgstr ""
 
-#: demangle.c:117
+#: demangle.c:139
 msgid ""
 "The currently understood settings are:\n"
 "\n"
 msgstr ""
 
-#: demangle.c:139
+#: demangle.c:161
 #, possible-c-format
 msgid "`%s' style demangling chosen as the default."
 msgstr ""
 
-#: demangle.c:200
+#: demangle.c:220
+msgid "Set demangling of encoded C++/ObjC names when displaying symbols."
+msgstr ""
+
+#: demangle.c:221
+msgid "Show demangling of encoded C++/ObjC names when displaying symbols."
+msgstr ""
+
+#: demangle.c:227
+msgid "Set demangling of C++/ObjC names in disassembly listings."
+msgstr ""
+
+#: demangle.c:228
+msgid "Show demangling of C++/ObjC names in disassembly listings."
+msgstr ""
+
+#: demangle.c:240
 msgid "Set the current C++ demangling style."
 msgstr ""
 
-#: demangle.c:201
+#: demangle.c:241
 msgid "Show the current C++ demangling style."
 msgstr ""
 
-#: demangle.c:202
+#: demangle.c:242
 msgid ""
 "Use `set demangle-style' without arguments for a list of demangling styles."
 msgstr ""
@@ -6654,11 +6800,11 @@
 msgid "Can't read elf symbols from %s: %s"
 msgstr ""
 
-#: dictionary.c:588
+#: dictionary.c:587
 msgid "dict_add_symbol: non-expandable dictionary"
 msgstr ""
 
-#: doublest.c:806
+#: doublest.c:801
 #, possible-c-format
 msgid "Unrecognized %d-bit floating-point type."
 msgstr ""
@@ -6670,7 +6816,7 @@
 #. assumption might be wrong on targets that support
 #. floating-point types that only differ in endianness for
 #. example.  So we warn instead, and zero out the target buffer.
-#: doublest.c:887
+#: doublest.c:882
 msgid "Can't convert floating-point number to desired type."
 msgstr ""
 
@@ -6683,7 +6829,7 @@
 msgid "File is not an object file\n"
 msgstr ""
 
-#: dsrec.c:129 dsrec.c:143 symfile.c:1959
+#: dsrec.c:129 dsrec.c:143 symfile.c:1958
 msgid "Canceled the download"
 msgstr ""
 
@@ -6692,35 +6838,145 @@
 msgid "make_srec:  Bad address (%s), or bad flags (0x%x)."
 msgstr ""
 
-#: dummy-frame.c:314
+#: dummy-frame.c:312
 msgid "maintenance print dummy-frames"
 msgstr ""
 
-#: dummy-frame.c:327
+#: dummy-frame.c:325
 msgid "Print the contents of the internal dummy-frame stack."
 msgstr ""
 
-#: dwarf2-frame.c:319
-msgid "Support for DW_OP_fbreg is unimplemented"
+#: dwarf2expr.c:80
+#, possible-c-format
+msgid "Unsupported address size in DWARF expressions: %d bits"
 msgstr ""
 
-#: dwarf2-frame.c:328
-msgid "Support for DW_OP_call_frame_cfa is unimplemented"
+#: dwarf2expr.c:183
+msgid "dwarf expression stack underflow"
 msgstr ""
 
-#: dwarf2-frame.c:336
-msgid "Support for DW_OP_GNU_implicit_pointer is unimplemented"
+#: dwarf2expr.c:193 dwarf2expr.c:293
+#, possible-c-format
+msgid "Asked for position %d of stack, stack only has %d elements on it."
+msgstr ""
+
+#: dwarf2expr.c:207
+msgid "integral type expected in DWARF expression"
+msgstr ""
+
+#: dwarf2expr.c:227
+msgid "no unsigned variant found for type, while evaluating DWARF expression"
+msgstr ""
+
+#: dwarf2expr.c:249
+msgid "no signed variant found for type, while evaluating DWARF expression"
+msgstr ""
+
+#: dwarf2expr.c:386
+msgid "read_uleb128: Corrupted DWARF expression."
+msgstr ""
+
+#: dwarf2expr.c:413
+msgid "read_sleb128: Corrupted DWARF expression."
+msgstr ""
+
+#: dwarf2expr.c:441
+#, possible-c-format
+msgid ""
+"DWARF-2 expression error: `%s' operations must be used either alone or in "
+"conjunction with DW_OP_piece or DW_OP_bit_piece."
+msgstr ""
+
+#: dwarf2expr.c:475
+msgid "Could not find type for DW_OP_GNU_const_type"
+msgstr ""
+
+#: dwarf2expr.c:477
+msgid "DW_OP_GNU_const_type has different sizes for type and data"
+msgstr ""
+
+#: dwarf2expr.c:661
+#, possible-c-format
+msgid "DWARF-2 expression error: Loop detected (%d)."
+msgstr ""
+
+#: dwarf2expr.c:824
+msgid ""
+"DWARF-2 expression error: DW_OP_reg operations must be used either alone or "
+"in conjunction with DW_OP_piece or DW_OP_bit_piece."
+msgstr ""
+
+#: dwarf2expr.c:848 dwarf2loc.c:2595
+msgid "DW_OP_implicit_value: too few bytes available."
+msgstr ""
+
+#: dwarf2expr.c:869
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_implicit_pointer is not allowed in frame "
+"context"
+msgstr ""
+
+#: dwarf2expr.c:959
+msgid "Not implemented: computing frame base using explicit value operator"
+msgstr ""
+
+#: dwarf2expr.c:989
+#, possible-c-format
+msgid "Not enough elements for DW_OP_swap.  Need 2, have %d."
+msgstr ""
+
+#: dwarf2expr.c:1009
+#, possible-c-format
+msgid "Not enough elements for DW_OP_rot.  Need 3, have %d."
+msgstr ""
+
+#: dwarf2expr.c:1122
+msgid "Incompatible types on DWARF stack"
+msgstr ""
+
+#: dwarf2expr.c:1245
+msgid "Can't be reached."
+msgstr ""
+
+#: dwarf2expr.c:1331
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_uninit must always be the very last op."
 msgstr ""
 
-#: dwarf2-frame.c:343
-msgid "Support for DW_OP_GNU_push_tls_address is unimplemented"
+#: dwarf2expr.c:1357
+msgid "DW_OP_GNU_entry_value: too few bytes available."
 msgstr ""
 
-#: dwarf2-frame.c:353
-msgid "Support for DW_OP_call* is invalid in CFI"
+#: dwarf2expr.c:1382
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_entry_value is supported only for single "
+"DW_OP_reg* or for DW_OP_breg*(0)+DW_OP_deref*"
+msgstr ""
+
+#: dwarf2expr.c:1444
+msgid "DW_OP_GNU_reinterpret has wrong size"
+msgstr ""
+
+#: dwarf2expr.c:1453
+#, possible-c-format
+msgid "Unhandled dwarf expression opcode 0x%x"
+msgstr ""
+
+#: dwarf2expr.c:1479 dwarf2expr.c:1487 dwarf2expr.c:1495 dwarf2expr.c:1503
+#: dwarf2expr.c:1511
+#, possible-c-format
+msgid "%s is invalid in this context"
+msgstr ""
+
+#: dwarf2expr.c:1519
+msgid "Support for typed DWARF is not supported in this context"
 msgstr ""
 
-#: dwarf2-frame.c:377
+#: dwarf2expr.c:1531
+msgid "Support for DW_OP_GNU_entry_value is unimplemented"
+msgstr ""
+
+#: dwarf2-frame.c:336
 #, possible-c-format
 msgid ""
 "incomplete CFI data; DW_CFA_restore unspecified\n"
@@ -6730,716 +6986,863 @@
 #. This is actually invalid DWARF, but if we ever do run across
 #. it somehow, we might as well support it.  So, instead, report
 #. it as unimplemented.
-#: dwarf2-frame.c:422
+#: dwarf2-frame.c:392
 msgid ""
 "Not implemented: computing unwound register using explicit value operator"
 msgstr ""
 
-#: dwarf2-frame.c:550
+#: dwarf2-frame.c:524
 #, possible-c-format
 msgid "bad CFI data; mismatched DW_CFA_restore_state at %s"
 msgstr ""
 
-#: dwarf2-frame.c:710
+#: dwarf2-frame.c:684
 msgid "Unknown CFI encountered."
 msgstr ""
 
-#: dwarf2-frame.c:926
+#: dwarf2-frame.c:905
 msgid "Could not compute CFA; needed to translate this expression"
 msgstr ""
 
-#: dwarf2-frame.c:956 dwarf2loc.c:1407
+#: dwarf2-frame.c:935 dwarf2loc.c:2331
 #, possible-c-format
 msgid "Unable to access DWARF register number %d"
 msgstr ""
 
-#: dwarf2-frame.c:980 dwarf2-frame.c:1098
+#: dwarf2-frame.c:959 dwarf2-frame.c:1105
 msgid "Unknown CFA rule."
 msgstr ""
 
-#: dwarf2-frame.c:1153
+#: dwarf2-frame.c:1160
 #, possible-c-format
 msgid "incomplete CFI data; unspecified registers (e.g., %s) at %s"
 msgstr ""
 
-#: dwarf2-frame.c:1325
+#: dwarf2-frame.c:1354
 msgid "Unknown register rule."
 msgstr ""
 
-#: dwarf2-frame.c:1435
+#: dwarf2-frame.c:1492
 msgid "can't compute CFA for this frame"
 msgstr ""
 
-#: dwarf2-frame.c:1562
+#: dwarf2-frame.c:1619
 msgid "Unsupported address size"
 msgstr ""
 
-#: dwarf2-frame.c:1579
+#: dwarf2-frame.c:1636
 msgid "Unsupported encoding: DW_EH_PE_indirect"
 msgstr ""
 
-#: dwarf2-frame.c:1612 dwarf2-frame.c:1660
+#: dwarf2-frame.c:1669 dwarf2-frame.c:1717
 msgid "Invalid or unsupported encoding"
 msgstr ""
 
-#: dwarf2-frame.c:2152
+#: dwarf2-frame.c:1927
+msgid "Found a CIE when not expecting it."
+msgstr ""
+
+#: dwarf2-frame.c:2096
+msgid "Found an FDE when not expecting it."
+msgstr ""
+
+#: dwarf2-frame.c:2234
 #, possible-c-format
 msgid "Corrupt data in %s:%s; align 4 workaround apparently succeeded"
 msgstr ""
 
-#: dwarf2-frame.c:2159
+#: dwarf2-frame.c:2241
 #, possible-c-format
 msgid "Corrupt data in %s:%s; align 8 workaround apparently succeeded"
 msgstr ""
 
-#: dwarf2-frame.c:2167
+#: dwarf2-frame.c:2249
 #, possible-c-format
 msgid "Corrupt data in %s:%s"
 msgstr ""
 
-#: dwarf2expr.c:122
-msgid "dwarf expression stack underflow"
+#: dwarf2-frame.c:2340
+#, possible-c-format
+msgid "skipping .eh_frame info of %s: %s"
 msgstr ""
 
-#: dwarf2expr.c:132 dwarf2expr.c:187
+#: dwarf2-frame.c:2380
 #, possible-c-format
-msgid "Asked for position %d of stack, stack only has %d elements on it."
+msgid "skipping .debug_frame info of %s: %s"
 msgstr ""
 
-#: dwarf2expr.c:171
-msgid "Unsupported address size.\n"
+#: dwarf2loc.c:90
+msgid "dwarf2_find_location_expression: Corrupted DWARF expression."
 msgstr ""
 
-#: dwarf2expr.c:279
-msgid "read_uleb128: Corrupted DWARF expression."
+#: dwarf2loc.c:243
+#, possible-c-format
+msgid "Could not find the frame base for \"%s\"."
 msgstr ""
 
-#: dwarf2expr.c:305
-msgid "read_sleb128: Corrupted DWARF expression."
+#: dwarf2loc.c:333
+#, possible-c-format
+msgid "Entry values and tail call frames debugging is %s.\n"
 msgstr ""
 
-#: dwarf2expr.c:332
+#: dwarf2loc.c:362
+#, possible-c-format
+msgid "DW_AT_GNU_call_site_target is not specified at %s in %s"
+msgstr ""
+
+#: dwarf2loc.c:374
 #, possible-c-format
 msgid ""
-"DWARF-2 expression error: `%s' operations must be used either alone or in "
-"conjuction with DW_OP_piece or DW_OP_bit_piece."
+"DW_AT_GNU_call_site_target DWARF block resolving requires known frame which "
+"is currently not available at %s in %s"
 msgstr ""
 
-#: dwarf2expr.c:354
+#: dwarf2loc.c:405
 #, possible-c-format
-msgid "DWARF-2 expression error: Loop detected (%d)."
+msgid "Cannot find function \"%s\" for a call site target at %s in %s"
 msgstr ""
 
-#: dwarf2expr.c:500
-msgid ""
-"DWARF-2 expression error: DW_OP_reg operations must be used either alone or "
-"in conjuction with DW_OP_piece or DW_OP_bit_piece."
+#: dwarf2loc.c:418
+msgid "invalid call site target kind"
 msgstr ""
 
-#: dwarf2expr.c:522 dwarf2loc.c:1671
-msgid "DW_OP_implicit_value: too few bytes available."
+#: dwarf2loc.c:434
+#, possible-c-format
+msgid ""
+"DW_TAG_GNU_call_site resolving failed to find function name for address %s"
 msgstr ""
 
-#: dwarf2expr.c:625
-msgid "Not implemented: computing frame base using explicit value operator"
+#: dwarf2loc.c:503
+#, possible-c-format
+msgid ""
+"DW_OP_GNU_entry_value resolving has found function \"%s\" at %s can call "
+"itself via tail calls"
 msgstr ""
 
-#: dwarf2expr.c:654
+#: dwarf2loc.c:669
 #, possible-c-format
-msgid "Not enough elements for DW_OP_swap.  Need 2, have %d."
+msgid "Unable to find function for PC %s"
 msgstr ""
 
-#: dwarf2expr.c:674
+#: dwarf2loc.c:768
 #, possible-c-format
-msgid "Not enough elements for DW_OP_rot.  Need 3, have %d."
+msgid ""
+"There are no unambiguously determinable intermediate callers or callees "
+"between caller function \"%s\" at %s and callee function \"%s\" at %s"
 msgstr ""
 
-#: dwarf2expr.c:760 dwarf2expr.c:768 valarith.c:1159 valarith.c:1170
-#: valarith.c:1285 valarith.c:1296
-msgid "Division by zero"
+#: dwarf2loc.c:845
+#, possible-c-format
+msgid ""
+"DW_OP_GNU_entry_value resolving callee gdbarch %s (of %s (%s)) does not "
+"match caller gdbarch %s"
 msgstr ""
 
-#: dwarf2expr.c:812
-msgid "Can't be reached."
+#: dwarf2loc.c:857
+#, possible-c-format
+msgid "DW_OP_GNU_entry_value resolving requires caller of %s (%s)"
 msgstr ""
 
-#: dwarf2expr.c:890
+#: dwarf2loc.c:873
+#, possible-c-format
 msgid ""
-"DWARF-2 expression error: DW_OP_GNU_uninit must always be the very last op."
+"DW_OP_GNU_entry_value resolving expects callee %s at %s but the called frame "
+"is for %s at %s"
 msgstr ""
 
-#: dwarf2expr.c:916
+#. DW_TAG_GNU_call_site_parameter will be missing just if GCC could not
+#. determine its value.
+#: dwarf2loc.c:903
 #, possible-c-format
-msgid "Unhandled dwarf expression opcode 0x%x"
+msgid "Cannot find matching parameter at DW_TAG_GNU_call_site %s at %s"
 msgstr ""
 
-#: dwarf2loc.c:88
-msgid "dwarf2_find_location_expression: Corrupted DWARF expression."
+#: dwarf2loc.c:939 dwarf2loc.c:986
+msgid "Cannot resolve DW_AT_GNU_call_site_data_value"
 msgstr ""
 
-#: dwarf2loc.c:220
-#, possible-c-format
-msgid "Could not find the frame base for \"%s\"."
+#: dwarf2loc.c:1150
+msgid ""
+"DWARF-2 expression error: DW_OP_GNU_entry_value is supported only for single "
+"DW_OP_reg* or for DW_OP_fbreg(*)"
 msgstr ""
 
-#: dwarf2loc.c:519
+#: dwarf2loc.c:1388
 msgid "Should not be able to create a lazy value with an enclosing type"
 msgstr ""
 
-#: dwarf2loc.c:611 dwarf2loc.c:1159
+#: dwarf2loc.c:1480 dwarf2loc.c:2044
 #, possible-c-format
 msgid "Unable to access DWARF register number %s"
 msgstr ""
 
-#: dwarf2loc.c:676 dwarf2loc.c:1235
+#: dwarf2loc.c:1537 dwarf2loc.c:2137
 msgid "invalid location type"
 msgstr ""
 
-#: dwarf2loc.c:798
+#: dwarf2loc.c:1659
 msgid ""
 "Can't do read-modify-write to update bitfield; containing word has been "
 "optimized out"
 msgstr ""
 
-#: dwarf2loc.c:803
+#: dwarf2loc.c:1664
 msgid ""
 "Can't do read-modify-write to update bitfield; containing word is unavailable"
 msgstr ""
 
-#: dwarf2loc.c:818
+#: dwarf2loc.c:1679
 #, possible-c-format
 msgid "Unable to write to DWARF register number %s"
 msgstr ""
 
-#: dwarf2loc.c:996
+#: dwarf2loc.c:1856
 msgid "Invalid use of DW_OP_GNU_implicit_pointer"
 msgstr ""
 
-#: dwarf2loc.c:1059
+#: dwarf2loc.c:1926
 msgid "access outside bounds of object referenced via synthetic pointer"
 msgstr ""
 
-#: dwarf2loc.c:1155
+#: dwarf2loc.c:2039
 msgid "cannot use offset on synthetic pointer to register"
 msgstr ""
 
-#: dwarf2loc.c:1388
+#: dwarf2loc.c:2312
 #, possible-c-format
 msgid "DWARF operator %s cannot be translated to an agent expression"
 msgstr ""
 
-#: dwarf2loc.c:1391
+#: dwarf2loc.c:2315
 #, possible-c-format
 msgid ""
 "Unknown DWARF operator 0x%02x cannot be translated to an agent expression"
 msgstr ""
 
-#: dwarf2loc.c:1673
+#: dwarf2loc.c:2597
 #, possible-c-format
 msgid "Cannot translate DW_OP_implicit_value of %d bytes"
 msgstr ""
 
-#: dwarf2loc.c:1757
+#: dwarf2loc.c:2681
 msgid "No block found for address"
 msgstr ""
 
-#: dwarf2loc.c:1762
+#: dwarf2loc.c:2686
 msgid "No function found for block"
 msgstr ""
 
 #. Note that dwarf_stack_op_name will never return
 #. NULL here.
-#: dwarf2loc.c:1833
+#: dwarf2loc.c:2757
 #, possible-c-format
 msgid "Unsupported size %d in %s"
 msgstr ""
 
-#: dwarf2loc.c:2021
+#: dwarf2loc.c:2945
 msgid "Cannot translate empty pieces to agent expressions"
 msgstr ""
 
-#: dwarf2loc.c:2034
+#: dwarf2loc.c:2958
 msgid "Expression pieces exceed word size"
 msgstr ""
 
-#: dwarf2loc.c:2120
+#: dwarf2loc.c:3044
 msgid "invalid label"
 msgstr ""
 
-#: dwarf2loc.c:2178 dwarf2loc.c:2188
+#: dwarf2loc.c:3125 dwarf2loc.c:3134
 #, possible-c-format
 msgid "a variable in $%s"
 msgstr ""
 
-#: dwarf2loc.c:2209
+#: dwarf2loc.c:3155
 #, possible-c-format
 msgid "No block found for address for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2215
+#: dwarf2loc.c:3161
 #, possible-c-format
 msgid "No function found for block for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2228
+#: dwarf2loc.c:3174
 #, possible-c-format
 msgid "Unexpected opcode after DW_OP_breg%u for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2248
+#: dwarf2loc.c:3192
 #, possible-c-format
 msgid "a variable at frame base reg $%s offset %s+%s"
 msgstr ""
 
-#: dwarf2loc.c:2262
+#: dwarf2loc.c:3204
 #, possible-c-format
 msgid "a variable at offset %s from base reg $%s"
 msgstr ""
 
-#: dwarf2loc.c:2293
+#: dwarf2loc.c:3235
 #, possible-c-format
 msgid ""
 "a thread-local variable at offset 0x%s in the thread-local storage for `%s'"
 msgstr ""
 
-#: dwarf2loc.c:2304
+#: dwarf2loc.c:3246
 #, possible-c-format
 msgid "the constant %d"
 msgstr ""
 
-#: dwarf2loc.c:2325
-msgid "a complex DWARF expression:\n"
-msgstr ""
-
-#: dwarf2loc.c:2339
+#: dwarf2loc.c:3278
 #, possible-c-format
 msgid "Unrecognized DWARF opcode 0x%02x at %ld"
 msgstr ""
 
-#: dwarf2loc.c:2603
+#: dwarf2loc.c:3617
 msgid ", and "
 msgstr ""
 
-#: dwarf2loc.c:2636
+#: dwarf2loc.c:3633
+msgid "a complex DWARF expression:\n"
+msgstr ""
+
+#: dwarf2loc.c:3655
 #, possible-c-format
 msgid "an empty %s-byte piece"
 msgstr ""
 
-#: dwarf2loc.c:2639
+#: dwarf2loc.c:3658
 #, possible-c-format
 msgid " [%s-byte piece]"
 msgstr ""
 
-#: dwarf2loc.c:2651
+#: dwarf2loc.c:3670
 #, possible-c-format
 msgid "an empty %s-bit piece"
 msgstr ""
 
-#: dwarf2loc.c:2655
+#: dwarf2loc.c:3674
 #, possible-c-format
 msgid " [%s-bit piece, offset %s bits]"
 msgstr ""
 
-#: dwarf2loc.c:2667
+#: dwarf2loc.c:3686
 #, possible-c-format
 msgid "Corrupted DWARF2 expression for \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2783
+#: dwarf2loc.c:3823
 msgid "multi-location:\n"
 msgstr ""
 
-#: dwarf2loc.c:2789
+#: dwarf2loc.c:3829
 #, possible-c-format
 msgid "Corrupted DWARF expression for symbol \"%s\"."
 msgstr ""
 
-#: dwarf2loc.c:2808
+#: dwarf2loc.c:3848
 #, possible-c-format
 msgid "  Base address %s"
 msgstr ""
 
 #. (It would improve readability to print only the minimum
 #. necessary digits of the second number of the range.)
-#: dwarf2loc.c:2826
+#: dwarf2loc.c:3866
 #, possible-c-format
 msgid "  Range %s-%s: "
 msgstr ""
 
-#: dwarf2read.c:801
+#: dwarf2loc.c:3914
+msgid "Set entry values and tail call frames debugging."
+msgstr ""
+
+#: dwarf2loc.c:3916
+msgid "Show entry values and tail call frames debugging."
+msgstr ""
+
+#: dwarf2loc.c:3918
+msgid ""
+"When non-zero, the process of determining parameter values from function "
+"entry point and tail call frames will be printed."
+msgstr ""
+
+#: dwarf2read.c:822
 #, possible-c-format
 msgid ""
 "The upper bound on the age of cached dwarf2 compilation units is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:813
+#: dwarf2read.c:834
 msgid "statement list doesn't fit in .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:820
+#: dwarf2read.c:841
 msgid ".debug_line section has line data without a file"
 msgstr ""
 
-#: dwarf2read.c:827
+#: dwarf2read.c:848
 msgid ".debug_line section has line program sequence without an end"
 msgstr ""
 
-#: dwarf2read.c:834
+#: dwarf2read.c:855
 msgid "location expression too complex"
 msgstr ""
 
-#: dwarf2read.c:842
+#: dwarf2read.c:863
 #, possible-c-format
 msgid "const value length mismatch for '%s', got %d, expected %d"
 msgstr ""
 
-#: dwarf2read.c:850
-msgid "macro info runs off end of `.debug_macinfo' section"
+#: dwarf2read.c:871
+#, possible-c-format
+msgid "macro info runs off end of `%s' section"
 msgstr ""
 
-#: dwarf2read.c:857
+#: dwarf2read.c:879
 #, possible-c-format
 msgid ""
 "macro debug info contains a malformed macro definition:\n"
 "`%s'"
 msgstr ""
 
-#: dwarf2read.c:866
+#: dwarf2read.c:888
 #, possible-c-format
 msgid "invalid attribute class or form for '%s' in '%s'"
 msgstr ""
 
-#: dwarf2read.c:1453
+#: dwarf2read.c:1518
 #, possible-c-format
 msgid ""
 "Support for zlib-compressed DWARF data (from '%s') is disabled in this copy "
 "of GDB"
 msgstr ""
 
-#: dwarf2read.c:1469 dwarf2read.c:1610
+#: dwarf2read.c:1534 dwarf2read.c:1672
 #, possible-c-format
 msgid "Dwarf Error: Can't read DWARF data from '%s'"
 msgstr ""
 
-#: dwarf2read.c:1476
+#: dwarf2read.c:1541
 #, possible-c-format
 msgid "Dwarf Error: Corrupt DWARF ZLIB header from '%s'"
 msgstr ""
 
-#: dwarf2read.c:1501
+#: dwarf2read.c:1566
 #, possible-c-format
 msgid "Dwarf Error: setting up DWARF uncompression in '%s': %d"
 msgstr ""
 
-#: dwarf2read.c:1507
+#: dwarf2read.c:1572
 #, possible-c-format
 msgid "Dwarf Error: zlib error uncompressing from '%s': %d"
 msgstr ""
 
-#: dwarf2read.c:1514
+#: dwarf2read.c:1579
 #, possible-c-format
 msgid "Dwarf Error: concluding DWARF uncompression in '%s': %d"
 msgstr ""
 
-#: dwarf2read.c:2461
+#: dwarf2read.c:2621
 #, possible-c-format
 msgid "  Number of unread CUs: %d\n"
 msgstr ""
 
-#: dwarf2read.c:2675
+#: dwarf2read.c:2853
 #, possible-c-format
 msgid "(Internal error: pc %s in read in CU, but not in symtab.)"
 msgstr ""
 
-#: dwarf2read.c:2834
+#: dwarf2read.c:3016
 msgid "read_comp_unit_head: dwarf from non elf file"
 msgstr ""
 
-#: dwarf2read.c:2850
+#: dwarf2read.c:3043
 #, possible-c-format
 msgid ""
 "Dwarf Error: wrong version in compilation unit header (is %d, should be 2, "
 "3, or 4) [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:2857
+#: dwarf2read.c:3050
 #, possible-c-format
 msgid ""
 "Dwarf Error: bad offset (0x%lx) in compilation unit header (offset 0x%lx + "
 "6) [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:2865
+#: dwarf2read.c:3058
 #, possible-c-format
 msgid ""
 "Dwarf Error: bad length (0x%lx) in compilation unit header (offset 0x%lx + "
 "0) [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:3056
+#: dwarf2read.c:3261
 msgid "debug type entry runs off end of `.debug_types' section, ignored"
 msgstr ""
 
-#: dwarf2read.c:3116
+#: dwarf2read.c:3299
+#, possible-c-format
+msgid ""
+"debug type entry at offset 0x%x is duplicate to the entry at offset 0x%x, "
+"signature 0x%s"
+msgstr ""
+
+#: dwarf2read.c:3341
 msgid "missing `.debug_types' section for DW_FORM_ref_sig8 die"
 msgstr ""
 
-#: dwarf2read.c:3777
+#: dwarf2read.c:4013
 #, possible-c-format
 msgid "unhandled containing DIE tag %d for DIE at %d"
 msgstr ""
 
-#: dwarf2read.c:4111 dwarf2read.c:9096
+#: dwarf2read.c:4347 dwarf2read.c:9705
 msgid "malformed enumerator DIE ignored"
 msgstr ""
 
-#: dwarf2read.c:4139
+#: dwarf2read.c:4385
 #, possible-c-format
 msgid "Dwarf Error: Could not find abbrev number %d [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:4190 dwarf2read.c:9312
+#: dwarf2read.c:4436 dwarf2read.c:9921
 msgid "ignoring absolute DW_AT_sibling"
 msgstr ""
 
-#: dwarf2read.c:4266 dwarf2read.c:9746
+#: dwarf2read.c:4512 dwarf2read.c:10366
 #, possible-c-format
 msgid "Dwarf Error: Cannot handle %s in DWARF reader [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:4312
+#: dwarf2read.c:4558
 #, possible-c-format
 msgid "bug: psymtab for %s is already read in."
 msgstr ""
 
-#: dwarf2read.c:4319 mdebugread.c:281
+#: dwarf2read.c:4565 mdebugread.c:286
 #, possible-c-format
 msgid "Reading in symbols for %s..."
 msgstr ""
 
-#: dwarf2read.c:4348 mdebugread.c:294 psymtab.c:102 symfile.c:1156
+#: dwarf2read.c:4594 mdebugread.c:299 psymtab.c:102 symfile.c:1158
 msgid "done.\n"
 msgstr ""
 
-#: dwarf2read.c:4780
+#: dwarf2read.c:5005
 #, possible-c-format
 msgid "Tag '%s' has unexpected children"
 msgstr ""
 
-#: dwarf2read.c:4970
+#: dwarf2read.c:5195
 msgid "template parameter missing DW_AT_type"
 msgstr ""
 
-#: dwarf2read.c:4986
+#: dwarf2read.c:5211
 msgid "template parameter missing DW_AT_const_value"
 msgstr ""
 
-#: dwarf2read.c:5181
+#: dwarf2read.c:5406
 #, possible-c-format
 msgid ""
 "Computed physname <%s> does not match demangled <%s> (from linkage <%s>) - "
 "DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:5228
+#: dwarf2read.c:5455 dwarf2read.c:5551
 #, possible-c-format
 msgid "Tag '%s' has no DW_AT_import"
 msgstr ""
 
-#: dwarf2read.c:5527
+#: dwarf2read.c:5542
+#, possible-c-format
+msgid ""
+"child DW_TAG_imported_declaration expected - DIE at 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:5563
+#, possible-c-format
+msgid ""
+"child DW_TAG_imported_declaration has unknown imported name - DIE at 0x%x "
+"[in module %s]"
+msgstr ""
+
+#: dwarf2read.c:5751
+msgid "CU refers to both DW_AT_GNU_macros and DW_AT_macro_info"
+msgstr ""
+
+#: dwarf2read.c:5841
 #, possible-c-format
 msgid "Dwarf Error: Missing children for type unit [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:5617
+#: dwarf2read.c:5931
 #, possible-c-format
 msgid "DIE 0x%x and its abstract origin 0x%x have different tags"
 msgstr ""
 
-#: dwarf2read.c:5660
+#: dwarf2read.c:5974
 #, possible-c-format
 msgid "Child DIE 0x%x and its abstract origin 0x%x have different tags"
 msgstr ""
 
-#: dwarf2read.c:5665
+#: dwarf2read.c:5979
 #, possible-c-format
 msgid "Child DIE 0x%x and its abstract origin 0x%x have different parents"
 msgstr ""
 
-#: dwarf2read.c:5678
+#: dwarf2read.c:5992
 #, possible-c-format
 msgid ""
 "Multiple children of DIE 0x%x refer to DIE 0x%x as their abstract origin"
 msgstr ""
 
-#: dwarf2read.c:5740
+#: dwarf2read.c:6054
 #, possible-c-format
 msgid "missing name for subprogram DIE at %d"
 msgstr ""
 
-#: dwarf2read.c:5750
+#: dwarf2read.c:6064
 #, possible-c-format
 msgid "cannot get low and high bounds for subprogram DIE at %d"
 msgstr ""
 
-#: dwarf2read.c:5977
+#: dwarf2read.c:6279
+#, possible-c-format
+msgid "missing DW_AT_low_pc for DW_TAG_GNU_call_site DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6295
+#, possible-c-format
+msgid "Duplicate PC %s for DW_TAG_GNU_call_site DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6310
+#, possible-c-format
+msgid ""
+"Tag %d is not DW_TAG_GNU_call_site_parameter in DW_TAG_GNU_call_site child "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6368
+#, possible-c-format
+msgid ""
+"Cannot find function owning DW_TAG_GNU_call_site DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6406
+#, possible-c-format
+msgid ""
+"DW_AT_GNU_call_site_target target DIE has invalid physname, for referencing "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6419
+#, possible-c-format
+msgid ""
+"DW_AT_GNU_call_site_target target DIE has invalid low pc, for referencing "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6428
+#, possible-c-format
+msgid ""
+"DW_TAG_GNU_call_site DW_AT_GNU_call_site_target is neither block nor "
+"reference, for DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6457
+#, possible-c-format
+msgid ""
+"No DW_FORM_block* DW_AT_location for DW_TAG_GNU_call_site child DIE 0x%x [in "
+"module %s]"
+msgstr ""
+
+#: dwarf2read.c:6470
+#, possible-c-format
+msgid ""
+"Only single DW_OP_reg or DW_OP_fbreg is supported for DW_FORM_block* "
+"DW_AT_location for DW_TAG_GNU_call_site child DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6481
+#, possible-c-format
+msgid ""
+"No DW_FORM_block* DW_AT_GNU_call_site_value for DW_TAG_GNU_call_site child "
+"DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6499
+#, possible-c-format
+msgid ""
+"No DW_FORM_block* DW_AT_GNU_call_site_data_value for DW_TAG_GNU_call_site "
+"child DIE 0x%x [in module %s]"
+msgstr ""
+
+#: dwarf2read.c:6543
 #, possible-c-format
 msgid "Offset %d out of bounds for DW_AT_ranges attribute"
 msgstr ""
 
-#: dwarf2read.c:6031 dwarf2read.c:6329
+#: dwarf2read.c:6597 dwarf2read.c:6896
 msgid "Invalid .debug_ranges data (no base address)"
 msgstr ""
 
-#: dwarf2read.c:6039 dwarf2read.c:6338
+#: dwarf2read.c:6605 dwarf2read.c:6905
 msgid "Invalid .debug_ranges data (inverted range)"
 msgstr ""
 
-#: dwarf2read.c:6297
+#: dwarf2read.c:6864
 #, possible-c-format
 msgid "Offset %lu out of bounds for DW_AT_ranges attribute"
 msgstr ""
 
-#: dwarf2read.c:6765
+#: dwarf2read.c:7332
 #, possible-c-format
 msgid "unsupported accessibility %d"
 msgstr ""
 
-#: dwarf2read.c:6777
+#: dwarf2read.c:7344
 msgid "unexpected virtuality in component of Ada type"
 msgstr ""
 
-#: dwarf2read.c:6802
+#: dwarf2read.c:7369
 msgid "unexpected member function in Ada type"
 msgstr ""
 
-#: dwarf2read.c:6885
+#: dwarf2read.c:7452
 #, possible-c-format
 msgid "member function type missing for '%s'"
 msgstr ""
 
-#: dwarf2read.c:6974
+#: dwarf2read.c:7541
 #, possible-c-format
 msgid ""
 "Member function \"%s\" (offset %d) is virtual but the vtable offset is not "
 "specified"
 msgstr ""
 
-#: dwarf2read.c:6994
+#: dwarf2read.c:7561
 msgid "unexpected member functions in Ada type"
 msgstr ""
 
-#: dwarf2read.c:7321
+#: dwarf2read.c:7888
 #, possible-c-format
 msgid "virtual function table pointer not found when defining class '%s'"
 msgstr ""
 
-#: dwarf2read.c:7643
+#: dwarf2read.c:8234
 msgid ""
 "DW_AT_byte_size for array type smaller than the total size of elements"
 msgstr ""
 
-#: dwarf2read.c:7863
+#: dwarf2read.c:8454
 #, possible-c-format
 msgid "DW_TAG_module has no name, offset 0x%x"
 msgstr ""
 
-#: dwarf2read.c:7970
+#: dwarf2read.c:8561
 #, possible-c-format
 msgid "invalid pointer size %d"
 msgstr ""
 
-#: dwarf2read.c:8342
+#: dwarf2read.c:8933
 msgid "DW_AT_name missing from DW_TAG_base_type"
 msgstr ""
 
-#: dwarf2read.c:8389
+#: dwarf2read.c:8986
 #, possible-c-format
 msgid "unsupported DW_AT_encoding: '%s'"
 msgstr ""
 
-#: dwarf2read.c:8750
+#: dwarf2read.c:9345
 #, possible-c-format
 msgid "Dwarf Error: could not find abbrev number %d [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9364
+#: dwarf2read.c:9689
+#, possible-c-format
+msgid ""
+"DW_TAG_typedef has childen - GCC PR debug/47510 bug - DIE at 0x%x [in module "
+"%s]"
+msgstr ""
+
+#: dwarf2read.c:9973
 #, possible-c-format
 msgid "DW_AT_low_pc %s is zero for DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9375
+#: dwarf2read.c:9984
 #, possible-c-format
 msgid ""
 "DW_AT_low_pc %s is not < DW_AT_high_pc %s for DIE at 0x%x [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9474
+#: dwarf2read.c:10083
 #, possible-c-format
 msgid "could not find partial DIE 0x%x in cache [from module %s]\n"
 msgstr ""
 
-#: dwarf2read.c:9763
+#: dwarf2read.c:10383
 #, possible-c-format
 msgid "Suspicious DW_AT_byte_size value treated as zero instead of %s"
 msgstr ""
 
-#: dwarf2read.c:9847
+#: dwarf2read.c:10467
 #, possible-c-format
 msgid "read_address: bad switch, signed [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9866
+#: dwarf2read.c:10486
 #, possible-c-format
 msgid "read_address: bad switch, unsigned [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:9960
+#: dwarf2read.c:10580
 msgid "intermixed 32-bit and 64-bit DWARF sections"
 msgstr ""
 
-#: dwarf2read.c:9996
+#: dwarf2read.c:10616
 #, possible-c-format
 msgid "read_offset_1: bad switch [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10039
+#: dwarf2read.c:10654
 #, possible-c-format
 msgid "DW_FORM_strp used without .debug_str section [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10045
+#: dwarf2read.c:10657
 #, possible-c-format
 msgid "DW_FORM_strp pointing outside of .debug_str section [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10372
+#: dwarf2read.c:10992
 msgid "missing .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:10421
+#: dwarf2read.c:11041
 msgid "invalid maximum_ops_per_instruction in `.debug_line' section"
 msgstr ""
 
-#: dwarf2read.c:10472
+#: dwarf2read.c:11092
 msgid "line number info header doesn't fit in `.debug_line' section"
 msgstr ""
 
-#: dwarf2read.c:10519
+#: dwarf2read.c:11139
 #, possible-c-format
 msgid "misplaced first line number at 0x%lx for '%s'"
 msgstr ""
 
-#: dwarf2read.c:10756
+#: dwarf2read.c:11358
 #, possible-c-format
 msgid ".debug_line address at offset 0x%lx is 0 [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:10793 dwarf2read.c:10802
+#: dwarf2read.c:11395 dwarf2read.c:11404
 msgid "mangled .debug_line section"
 msgstr ""
 
-#: dwarf2read.c:11159
+#: dwarf2read.c:11795
 msgid "file index out of range"
 msgstr ""
 
@@ -7447,499 +7850,520 @@
 #. trash data, but since we must specifically ignore things
 #. we don't recognize, there is nothing else we should do at
 #. this point.
-#: dwarf2read.c:11429
+#: dwarf2read.c:12057
 #, possible-c-format
 msgid "unsupported tag: '%s'"
 msgstr ""
 
-#: dwarf2read.c:11597
+#: dwarf2read.c:12225
 #, possible-c-format
 msgid "unsupported const value attribute form: '%s'"
 msgstr ""
 
-#: dwarf2read.c:11717
+#: dwarf2read.c:12345
 #, possible-c-format
 msgid ""
 "Dwarf Error: Problem turning containing type into gdb type [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:11749 dwarf2read.c:13720
+#: dwarf2read.c:12377 dwarf2read.c:14432
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find signatured DIE referenced from DIE at 0x%x [in "
 "module %s]"
 msgstr ""
 
-#: dwarf2read.c:11760
+#: dwarf2read.c:12388
 #, possible-c-format
 msgid "Dwarf Error: Bad type attribute %s [in module %s]"
 msgstr ""
 
 #. read_type_die already issued a complaint.
-#: dwarf2read.c:11784
+#: dwarf2read.c:12412
 #, possible-c-format
 msgid "<unknown type in %s, CU 0x%x, DIE 0x%x>"
 msgstr ""
 
-#: dwarf2read.c:11886
+#: dwarf2read.c:12514
 #, possible-c-format
 msgid "unexpected tag in read_type_die: '%s'"
 msgstr ""
 
-#: dwarf2read.c:12061
+#: dwarf2read.c:12730
 #, possible-c-format
 msgid "template param type '%s' defined within parent '%s'"
 msgstr ""
 
-#: dwarf2read.c:13487
+#: dwarf2read.c:14179
 #, possible-c-format
 msgid "unsupported die ref attribute form: '%s'"
 msgstr ""
 
-#: dwarf2read.c:13509
+#: dwarf2read.c:14201
 #, possible-c-format
 msgid "Attribute value is not a constant (%s)"
 msgstr ""
 
-#: dwarf2read.c:13573
+#: dwarf2read.c:14265
 #, possible-c-format
 msgid "Dwarf Error: Expected reference attribute [in module %s]"
 msgstr ""
 
-#: dwarf2read.c:13641
+#: dwarf2read.c:14333
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find DIE at 0x%x referenced from DIE at 0x%x [in module "
 "%s]"
 msgstr ""
 
-#: dwarf2read.c:13666
+#: dwarf2read.c:14363
 #, possible-c-format
 msgid "Dwarf Error: Cannot find DIE at 0x%x referenced in module %s"
 msgstr ""
 
-#: dwarf2read.c:13692
+#: dwarf2read.c:14390
 #, possible-c-format
 msgid ""
 "Dwarf Error: DIE at 0x%x referenced in module %s is neither DW_FORM_block* "
 "nor DW_FORM_exprloc"
 msgstr ""
 
-#: dwarf2read.c:13740
+#: dwarf2read.c:14452
 #, possible-c-format
 msgid ""
 "Dwarf Error: Cannot find signatured DIE at 0x%x referenced from DIE at 0x%x "
 "[in module %s]"
 msgstr ""
 
-#: dwarf2read.c:14074
+#: dwarf2read.c:14798
 #, possible-c-format
 msgid "unsupported stack op: '%s'"
 msgstr ""
 
-#: dwarf2read.c:14077
+#: dwarf2read.c:14801
 #, possible-c-format
 msgid "unsupported stack op: '%02x'"
 msgstr ""
 
-#: dwarf2read.c:14089
+#: dwarf2read.c:14813
 msgid "location description stack overflow"
 msgstr ""
 
-#: dwarf2read.c:14096
+#: dwarf2read.c:14820
 msgid "location description stack underflow"
 msgstr ""
 
-#: dwarf2read.c:14192
+#: dwarf2read.c:14916
 #, possible-c-format
 msgid "bad file number in macro information (%d)"
 msgstr ""
 
-#: dwarf2read.c:14247
+#: dwarf2read.c:14971
 #, possible-c-format
 msgid ""
 "macro definition contains spaces in formal argument list:\n"
 "`%s'"
 msgstr ""
 
-#: dwarf2read.c:14414
-msgid "missing .debug_macinfo section"
+#: dwarf2read.c:15187
+#, possible-c-format
+msgid "invalid form 0x%x in `%s'"
+msgstr ""
+
+#: dwarf2read.c:15216
+#, possible-c-format
+msgid "unrecognized DW_MACFINO opcode 0x%x"
+msgstr ""
+
+#: dwarf2read.c:15260
+#, possible-c-format
+msgid "unrecognized version `%d' in .debug_macro section"
 msgstr ""
 
-#: dwarf2read.c:14555
+#: dwarf2read.c:15388
 #, possible-c-format
 msgid "debug info with no main source gives macro %s on line %d: %s"
 msgstr ""
 
-#: dwarf2read.c:14558 dwarf2read.c:14570
+#: dwarf2read.c:15390 dwarf2read.c:15399
 msgid "definition"
 msgstr ""
 
-#: dwarf2read.c:14560 dwarf2read.c:14572
+#: dwarf2read.c:15390 dwarf2read.c:15399
 msgid "undefinition"
 msgstr ""
 
-#: dwarf2read.c:14561 dwarf2read.c:14573
-msgid "something-or-other"
-msgstr ""
-
-#: dwarf2read.c:14567
+#: dwarf2read.c:15397
 #, possible-c-format
 msgid "debug info gives %s macro %s with %s line %d: %s"
 msgstr ""
 
-#: dwarf2read.c:14568 dwarf2read.c:14598
+#: dwarf2read.c:15398 dwarf2read.c:15428
 msgid "command-line"
 msgstr ""
 
-#: dwarf2read.c:14568
+#: dwarf2read.c:15398
 msgid "in-file"
 msgstr ""
 
-#: dwarf2read.c:14574 dwarf2read.c:14599
+#: dwarf2read.c:15400 dwarf2read.c:15429
 msgid "zero"
 msgstr ""
 
-#: dwarf2read.c:14574 dwarf2read.c:14599
+#: dwarf2read.c:15400 dwarf2read.c:15429
 msgid "non-zero"
 msgstr ""
 
-#: dwarf2read.c:14596
+#: dwarf2read.c:15426
 #, possible-c-format
 msgid "debug info gives source %d included from %s at %s line %d"
 msgstr ""
 
-#: dwarf2read.c:14598
+#: dwarf2read.c:15428
 msgid "file"
 msgstr ""
 
-#: dwarf2read.c:14616
+#: dwarf2read.c:15447
 msgid "macro debug info has an unmatched `close_file' directive"
 msgstr ""
 
-#: dwarf2read.c:14642
+#: dwarf2read.c:15473
 msgid "no terminating 0-type entry for macros in `.debug_macinfo' section"
 msgstr ""
 
-#: dwarf2read.c:14765
+#: dwarf2read.c:15540
+#, possible-c-format
+msgid "missing %s section"
+msgstr ""
+
+#: dwarf2read.c:15772
 msgid "Location list used without specifying the CU base address."
 msgstr ""
 
-#: dwarf2read.c:14902
+#: dwarf2read.c:15931
 #, possible-c-format
 msgid ""
 "Dwarf Error: could not find partial DIE containing offset 0x%lx [in module "
 "%s]"
 msgstr ""
 
-#: dwarf2read.c:14914
+#: dwarf2read.c:15943
 #, possible-c-format
 msgid "invalid dwarf2 offset %u"
 msgstr ""
 
-#: dwarf2read.c:14930
+#: dwarf2read.c:15959
 #, possible-c-format
 msgid "no compilation unit with offset %u."
 msgstr ""
 
-#: dwarf2read.c:15209
+#: dwarf2read.c:16238
 #, possible-c-format
 msgid "A problem internal to GDB: DIE 0x%x has type already set"
 msgstr ""
 
-#: dwarf2read.c:15853
+#: dwarf2read.c:16896
 msgid "Ada is not currently supported by the index"
 msgstr ""
 
-#: dwarf2read.c:15886
+#: dwarf2read.c:16929
 msgid "couldn't data write to file"
 msgstr ""
 
-#: dwarf2read.c:15976
+#: dwarf2read.c:17012
 msgid "Cannot use an index to create the index"
 msgstr ""
 
-#: dwarf2read.c:15987
+#: dwarf2read.c:17015
+msgid "Cannot make an index when the file has multiple .debug_types sections"
+msgstr ""
+
+#: dwarf2read.c:17026
 #, possible-c-format
 msgid "Can't open `%s' for writing"
 msgstr ""
 
-#: dwarf2read.c:16210
+#: dwarf2read.c:17184
 msgid "usage: save gdb-index DIRECTORY"
 msgstr ""
 
-#: dwarf2read.c:16231
+#: dwarf2read.c:17205
 #, possible-c-format
 msgid "Error while writing index for `%s': "
 msgstr ""
 
-#: dwarf2read.c:16246
+#: dwarf2read.c:17220
 #, possible-c-format
 msgid "Whether to always disassemble DWARF expressions is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:16256
+#: dwarf2read.c:17230
 #, possible-c-format
 msgid "Whether to check \"physname\" is %s.\n"
 msgstr ""
 
-#: dwarf2read.c:16270
+#: dwarf2read.c:17244
 msgid ""
 "Set DWARF 2 specific variables.\n"
 "Configure DWARF 2 variables such as the cache size"
 msgstr ""
 
 #. allow-unknown
-#: dwarf2read.c:16276
+#: dwarf2read.c:17250
 msgid ""
 "Show DWARF 2 specific variables\n"
 "Show DWARF 2 variables such as the cache size"
 msgstr ""
 
-#: dwarf2read.c:16283
+#: dwarf2read.c:17257
 msgid "Set the upper bound on the age of cached dwarf2 compilation units."
 msgstr ""
 
-#: dwarf2read.c:16284
+#: dwarf2read.c:17258
 msgid "Show the upper bound on the age of cached dwarf2 compilation units."
 msgstr ""
 
-#: dwarf2read.c:16285
+#: dwarf2read.c:17259
 msgid ""
 "A higher limit means that cached compilation units will be stored\n"
 "in memory longer, and more total memory will be used.  Zero disables\n"
 "caching, which can slow down startup."
 msgstr ""
 
-#: dwarf2read.c:16295
+#: dwarf2read.c:17269
 msgid "Set whether `info address' always disassembles DWARF expressions."
 msgstr ""
 
-#: dwarf2read.c:16296
+#: dwarf2read.c:17270
 msgid "Show whether `info address' always disassembles DWARF expressions."
 msgstr ""
 
-#: dwarf2read.c:16297
+#: dwarf2read.c:17271
 msgid ""
 "When enabled, DWARF expressions are always printed in an assembly-like\n"
 "syntax.  When disabled, expressions will be printed in a more\n"
 "conversational style, when possible."
 msgstr ""
 
-#: dwarf2read.c:16306
+#: dwarf2read.c:17280
 msgid "Set debugging of the dwarf2 DIE reader."
 msgstr ""
 
-#: dwarf2read.c:16307
+#: dwarf2read.c:17281
 msgid "Show debugging of the dwarf2 DIE reader."
 msgstr ""
 
-#: dwarf2read.c:16308
+#: dwarf2read.c:17282
 msgid ""
 "When enabled (non-zero), DIEs are dumped after they are read in.\n"
 "The value is the maximum depth to print."
 msgstr ""
 
-#: dwarf2read.c:16315
+#: dwarf2read.c:17289
 msgid "Set cross-checking of \"physname\" code against demangler."
 msgstr ""
 
-#: dwarf2read.c:16316
+#: dwarf2read.c:17290
 msgid "Show cross-checking of \"physname\" code against demangler."
 msgstr ""
 
-#: dwarf2read.c:16317
+#: dwarf2read.c:17291
 msgid ""
 "When enabled, GDB's internal \"physname\" code is checked against\n"
 "the demangler."
 msgstr ""
 
-#: dwarf2read.c:16324
+#: dwarf2read.c:17298
 msgid ""
 "Save a gdb-index file.\n"
 "Usage: save gdb-index DIRECTORY"
 msgstr ""
 
-#: elfread.c:146
+#: elfread.c:144
 #, possible-c-format
 msgid "Loadable segment \"%s\" outside of ELF segments"
 msgstr ""
 
-#: elfread.c:489
+#: elfread.c:478
 #, possible-c-format
 msgid "elf/stab section information %s without a preceding file symbol"
 msgstr ""
 
-#: elfread.c:501
+#: elfread.c:490
 #, possible-c-format
 msgid "duplicated elf/stab section information for %s"
 msgstr ""
 
 #. This case indicates buggy inferior program, the resolved address
 #. should never change.
-#: elfread.c:781
+#: elfread.c:770
 #, possible-c-format
 msgid ""
 "gnu-indirect-function \"%s\" has changed its resolved function_address from "
 "%s to %s"
 msgstr ""
 
-#: elfread.c:1036
+#: elfread.c:1025
 #, possible-c-format
 msgid ""
 "handle_inferior_event: Invalid gnu-indirect-function breakpoint type %d"
 msgstr ""
 
-#: elfread.c:1098
+#: elfread.c:1087
 #, possible-c-format
 msgid "File \"%s\" has no build-id, file skipped"
 msgstr ""
 
-#: elfread.c:1101
+#: elfread.c:1090
 #, possible-c-format
 msgid "File \"%s\" has a different build-id, file skipped"
 msgstr ""
 
-#: elfread.c:1189
+#: elfread.c:1178
 #, possible-c-format
 msgid "\"%s\": separate debug info file has no debug info"
 msgstr ""
 
-#: elfread.c:1256 elfread.c:1267 elfread.c:1292 machoread.c:637
-#: machoread.c:651
+#: elfread.c:1245 elfread.c:1256 elfread.c:1281 machoread.c:863
+#: machoread.c:882
 #, possible-c-format
 msgid "Can't read symbols from %s: %s"
 msgstr ""
 
-#: elfread.c:1534
+#: elfread.c:1540
 #, possible-c-format
 msgid "elf/stab section information questionable for %s"
 msgstr ""
 
-#: elfread.c:1554
+#: elfread.c:1560
 #, possible-c-format
 msgid "elf/stab section information missing for %s"
 msgstr ""
 
-#: eval.c:371 valops.c:2026
+#: eval.c:369 valops.c:2026
 #, possible-c-format
 msgid "there is no field named %s"
 msgstr ""
 
-#: eval.c:397
+#: eval.c:395
 msgid "too many initializers"
 msgstr ""
 
-#: eval.c:401
+#: eval.c:399
 msgid "don't know which variant you want to set"
 msgstr ""
 
-#: eval.c:472
+#: eval.c:470
 msgid "tuple range index out of range"
 msgstr ""
 
-#: eval.c:484
+#: eval.c:482
 msgid "tuple index out of range"
 msgstr ""
 
-#: eval.c:878
+#: eval.c:875
+#, possible-c-format
+msgid "Symbol \"%s\" does not have any specific entry value"
+msgstr ""
+
+#: eval.c:897
 #, possible-c-format
 msgid "Register $%s not available."
 msgstr ""
 
-#: eval.c:892
+#: eval.c:911
 #, possible-c-format
 msgid "Value of register %s not available."
 msgstr ""
 
-#: eval.c:1018
+#: eval.c:1037
 msgid "(power)set type with unknown size"
 msgstr ""
 
 #. different element modes.
-#: eval.c:1053
+#: eval.c:1072
 msgid "POWERSET tuple elements of different mode"
 msgstr ""
 
-#: eval.c:1057
+#: eval.c:1076
 msgid "incompatible POWERSET tuple elements"
 msgstr ""
 
-#: eval.c:1060
+#: eval.c:1079
 msgid "empty POWERSET tuple range"
 msgstr ""
 
-#: eval.c:1064
+#: eval.c:1083
 msgid "POWERSET tuple element out of range"
 msgstr ""
 
-#: eval.c:1241
+#: eval.c:1260
 msgid "no 'respondsTo:' or 'respondsToSelector:' method"
 msgstr ""
 
-#: eval.c:1250
+#: eval.c:1269
 msgid "no 'methodFor:' or 'methodForSelector:' method"
 msgstr ""
 
-#: eval.c:1269
+#: eval.c:1288
 msgid "Target does not respond to this message selector."
 msgstr ""
 
-#: eval.c:1355
+#: eval.c:1374
 msgid ""
 "method address has symbol information with non-function type; skipping"
 msgstr ""
 
-#: eval.c:1408
+#: eval.c:1427
 msgid ""
 "Expression of type other than \"method returning ...\" used as a method"
 msgstr ""
 
-#: eval.c:1474
+#: eval.c:1493
 msgid "Non-pointer-to-member value used in pointer-to-member construct"
 msgstr ""
 
 #. For the time being, we don't handle this.
-#: eval.c:1714
+#: eval.c:1721
 #, possible-c-format
 msgid "Call to overloaded function %s requires `this' pointer"
 msgstr ""
 
-#: eval.c:1815
+#: eval.c:1816
 msgid "Cannot evaluate function -- may be inlined"
 msgstr ""
 
-#: eval.c:1840
+#: eval.c:1841
 msgid ""
 "Expression of type other than \"Function returning ...\" used as function"
 msgstr ""
 
-#: eval.c:1918
+#: eval.c:1919
 msgid "Cannot perform substring on this type"
 msgstr ""
 
-#: eval.c:2053
+#: eval.c:2054
 msgid "non-pointer-to-member value used in pointer-to-member construct"
 msgstr ""
 
-#: eval.c:2225
+#: eval.c:2226
 msgid "':' operator used in invalid context"
 msgstr ""
 
-#: eval.c:2347
+#: eval.c:2348
 #, possible-c-format
 msgid "Too many subscripts for F77 (%d Max)"
 msgstr ""
 
-#: eval.c:2352
+#: eval.c:2353
 msgid "Wrong number of subscripts"
 msgstr ""
 
-#: eval.c:2546
+#: eval.c:2547
 msgid "Non-integral right operand for \"@\" operator."
 msgstr ""
 
-#: eval.c:2617
+#: eval.c:2618
 msgid "Attempt to dereference pointer to member without an object"
 msgstr ""
 
@@ -7951,143 +8375,132 @@
 #. If there are any cases landing here which mean a user error,
 #. then they should be separate cases, with more descriptive
 #. error messages.
-#: eval.c:2871
+#: eval.c:2868
 msgid "GDB does not (yet) know how to evaluate that kind of expression"
 msgstr ""
 
-#: eval.c:2937
+#: eval.c:2934
 msgid "Attempt to take address of register or constant."
 msgstr ""
 
-#: eval.c:2970 valops.c:1645 valops.c:1660 valops.c:1694
+#: eval.c:2967 valops.c:1645 valops.c:1660 valops.c:1694
 msgid "Attempt to take address of value not located in memory."
 msgstr ""
 
-#: eval.c:3089
+#: eval.c:3086
 msgid "Internal error in eval_type."
 msgstr ""
 
-#: eval.c:3100
+#: eval.c:3097
 msgid "Can't get dimensions for a non-array type"
 msgstr ""
 
 #: event-loop.c:552 event-loop.c:561 event-loop.c:625 event-loop.c:704
-#: event-loop.c:810 event-loop.c:876 event-loop.c:950 event-loop.c:1383
+#: event-loop.c:806 event-loop.c:872 event-loop.c:946 event-loop.c:1379
 msgid "use_poll without HAVE_POLL"
 msgstr ""
 
-#: event-loop.c:796
-#, possible-c-format
-msgid "Hangup detected on fd %d\n"
-msgstr ""
-
-#: event-loop.c:799
+#: event-loop.c:795
 #, possible-c-format
 msgid "Error detected on fd %d\n"
 msgstr ""
 
-#: event-loop.c:802
+#: event-loop.c:798
 #, possible-c-format
 msgid "Invalid or non-`poll'able fd %d\n"
 msgstr ""
 
-#: event-loop.c:817
+#: event-loop.c:813
 #, possible-c-format
 msgid "Exception condition detected on fd %d\n"
 msgstr ""
 
-#. The prompt stack has not been initialized to "", we are
-#. using gdb w/o the --async switch.
-#: event-top.c:340
-msgid "Command has same effect as set annotate"
-msgstr ""
-
-#: event-top.c:426
+#: event-top.c:367
 msgid "error detected on stdin\n"
 msgstr ""
 
 #. This message is based on ANSI C, section 4.7.  Note that integer
 #. divide by zero causes this, so "float" is a misnomer.
-#: event-top.c:1003
+#: event-top.c:951
 msgid "Erroneous arithmetic operation."
 msgstr ""
 
-#: exceptions.c:136 exceptions.c:194
+#: exceptions.c:126 exceptions.c:184
 msgid "bad state"
 msgstr ""
 
-#: exceptions.c:333
+#: exceptions.c:309
 msgid "Bad switch."
 msgstr ""
 
-#: exec.c:80
+#: exec.c:78
 #, possible-c-format
 msgid "Writing into executable and core files is %s.\n"
 msgstr ""
 
-#: exec.c:178 exec.c:209
+#: exec.c:176 exec.c:207
 msgid "No executable file now.\n"
 msgstr ""
 
-#: exec.c:244
+#: exec.c:242
 #, possible-c-format
 msgid "\"%s\": could not open as an executable file: %s"
 msgstr ""
 
-#: exec.c:260
+#: exec.c:258
 #, possible-c-format
 msgid "\"%s\": not in executable format: %s"
 msgstr ""
 
-#: exec.c:276 exec.c:286
+#: exec.c:274 exec.c:284
 #, possible-c-format
 msgid "\"%s\": can't find the file sections: %s"
 msgstr ""
 
-#: exec.c:327
+#: exec.c:325
 msgid ""
 "A program is being debugged already.\n"
 "Are you sure you want to change the file? "
 msgstr ""
 
-#: exec.c:329
+#: exec.c:327
 msgid "File not changed."
 msgstr ""
 
-#: exec.c:345
+#: exec.c:343
 msgid "No executable file name was specified"
 msgstr ""
 
-#: exec.c:707 maint.c:373 maint.c:405
+#: exec.c:705 maint.c:361 maint.c:393
 #, possible-c-format
 msgid "file type %s.\n"
 msgstr ""
 
-#: exec.c:732
+#: exec.c:730
 #, possible-c-format
 msgid "Cannot find section for the entry point of %s."
 msgstr ""
 
-#: exec.c:738
+#: exec.c:736
 #, possible-c-format
 msgid "\tEntry point: %s\n"
 msgstr ""
 
-#: exec.c:773
+#: exec.c:771
 #, possible-c-format
 msgid "\tMapping info for file `%s'.\n"
 msgstr ""
 
-#: exec.c:806
+#: exec.c:804
 msgid "Must specify section name and its virtual address"
 msgstr ""
 
-#: exec.c:834
+#: exec.c:832
 #, possible-c-format
 msgid "Section %s not found"
 msgstr ""
 
-#: exec.c:921
+#: exec.c:919
 msgid ""
 "Use FILE as program to be debugged.\n"
 "It is read for its symbols, for getting the contents of pure memory,\n"
@@ -8097,7 +8510,7 @@
 "No arg means to have no executable file and no symbols."
 msgstr ""
 
-#: exec.c:931
+#: exec.c:929
 msgid ""
 "Use FILE as program for getting contents of pure memory.\n"
 "If FILE cannot be found as specified, your execution directory path\n"
@@ -8105,7 +8518,7 @@
 "No arg means have no executable file."
 msgstr ""
 
-#: exec.c:938
+#: exec.c:936
 msgid ""
 "Change the base address of section SECTION of the exec file to ADDR.\n"
 "This can be used if the exec file does not contain section addresses,\n"
@@ -8114,19 +8527,19 @@
 "``info files'' command lists all the sections and their addresses."
 msgstr ""
 
-#: exec.c:945
+#: exec.c:943
 msgid "Set writing into executable and core files."
 msgstr ""
 
-#: exec.c:946
+#: exec.c:944
 msgid "Show writing into executable and core files."
 msgstr ""
 
-#: exec.c:958
+#: exec.c:956
 msgid "Can't create a corefile"
 msgstr ""
 
-#: expprint.c:234
+#: expprint.c:243
 msgid "bad selector"
 msgstr ""
 
@@ -8135,89 +8548,22 @@
 #. Not found; don't try to keep going because we don't know how
 #. to interpret further elements.  For example, this happens
 #. if opcode is OP_TYPE.
-#: expprint.c:495 expprint.c:574
+#: expprint.c:504 expprint.c:580
 msgid "Invalid expression"
 msgstr ""
 
-#: f-exp.y:761 m2-exp.y:726
-msgid "Overflow on numeric constant."
-msgstr ""
-
-#: f-lang.c:557
-msgid "Malformed function STAB found in add_common_block()"
-msgstr ""
-
-#: f-lang.c:605
-msgid "Attempt to add COMMON entry with no block open!"
-msgstr ""
-
-#: f-lang.c:798
-msgid "cannot get .bf node off empty list"
-msgstr ""
-
-#: f-typeprint.c:386
-#, possible-c-format
-msgid "Invalid type code (%d) in symbol table."
-msgstr ""
-
-#: f-valprint.c:67
-msgid "Lower bound may not be '*' in F77"
-msgstr ""
-
-#: f-valprint.c:230
-#, possible-c-format
-msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)"
-msgstr ""
-
-#: f-valprint.c:491
-#, possible-c-format
-msgid "Invalid F77 type code %d in symbol table."
-msgstr ""
-
-#: f-valprint.c:504
-msgid ""
-"All COMMON blocks visible at this level:\n"
-"\n"
-msgstr ""
-
-#. We have been told to display the contents of F77 COMMON
-#. block supposedly visible in this function.  Let us
-#. first make sure that it is visible and if so, let
-#. us display its contents.
-#: f-valprint.c:533 f-valprint.c:623
-msgid "No frame selected"
-msgstr ""
-
-#. Got no 'funname', code below will fail.
-#: f-valprint.c:573
-msgid "No function found for frame."
-msgstr ""
-
-#: f-valprint.c:590
-msgid "Contents of blank COMMON block:\n"
-msgstr ""
-
-#: f-valprint.c:592
+#: expprint.c:514
 #, possible-c-format
-msgid "Contents of F77 COMMON block '%s':\n"
+msgid "<language %s has no 'this'>"
 msgstr ""
 
-#: f-valprint.c:604
+#: fbsd-nat.c:108
 #, possible-c-format
-msgid "Cannot locate the common block %s in function '%s'\n"
-msgstr ""
-
-#: f-valprint.c:621
-msgid "Cannot deal with NULL common name!"
-msgstr ""
-
-#: f-valprint.c:673 f-valprint.c:676
-msgid "Print out the values contained in a Fortran COMMON block."
+msgid "Couldn't open %s."
 msgstr ""
 
-#: fbsd-nat.c:109
-#, possible-c-format
-msgid "Couldn't open %s."
+#: f-exp.y:760 m2-exp.y:726
+msgid "Overflow on numeric constant."
 msgstr ""
 
 #: filesystem.c:67
@@ -8261,35 +8607,35 @@
 msgid "Invalid size granularity."
 msgstr ""
 
-#: findcmd.c:135
+#: findcmd.c:136
 msgid "Empty search range.\n"
 msgstr ""
 
-#: findcmd.c:139
+#: findcmd.c:140
 msgid "Invalid length."
 msgstr ""
 
-#: findcmd.c:143
+#: findcmd.c:144
 msgid "Search space too large."
 msgstr ""
 
-#: findcmd.c:153
-msgid "Invalid search space, end preceeds start."
+#: findcmd.c:154
+msgid "Invalid search space, end precedes start."
 msgstr ""
 
-#: findcmd.c:159
+#: findcmd.c:160
 msgid "Overflow in address range computation, choose smaller range."
 msgstr ""
 
-#: findcmd.c:226
+#: findcmd.c:227
 msgid "Missing search pattern."
 msgstr ""
 
-#: findcmd.c:231
+#: findcmd.c:232
 msgid "Search space too small to contain pattern."
 msgstr ""
 
-#: findcmd.c:325
+#: findcmd.c:326
 msgid ""
 "Search memory for a sequence of bytes.\n"
 "Usage:\n"
@@ -8307,369 +8653,438 @@
 "Convenience variable \"$numfound\" is set to the number of matches."
 msgstr ""
 
-#: findvar.c:61 findvar.c:96
+#: findvar.c:60 findvar.c:95
 #, possible-c-format
 msgid "That operation is not available on integers of more than %d bytes."
 msgstr ""
 
-#: findvar.c:177
+#: findvar.c:176
 msgid "extract_typed_address: type is not a pointer or reference"
 msgstr ""
 
-#: findvar.c:250
+#: findvar.c:249
 msgid "store_typed_address: type is not a pointer or reference"
 msgstr ""
 
-#: findvar.c:507
-msgid "Cannot look up value of a typedef"
+#: findvar.c:479 findvar.c:492
+#, possible-c-format
+msgid "Unknown argument list address for `%s'."
+msgstr ""
+
+#: findvar.c:508
+#, possible-c-format
+msgid "Cannot look up value of a typedef `%s'."
+msgstr ""
+
+#: findvar.c:535 findvar.c:546
+#, possible-c-format
+msgid "Value of register variable not available for `%s'."
+msgstr ""
+
+#: findvar.c:568
+#, possible-c-format
+msgid "No global symbol \"%s\"."
+msgstr ""
+
+#: findvar.c:587
+#, possible-c-format
+msgid "Cannot look up value of a botched symbol `%s'."
+msgstr ""
+
+#: f-lang.c:101
+msgid "unrecognized character type"
+msgstr ""
+
+#: f-lang.c:484
+msgid "Malformed function STAB found in add_common_block()"
 msgstr ""
 
-#: findvar.c:533 findvar.c:543
-msgid "Value of register variable not available."
+#: f-lang.c:532
+msgid "Attempt to add COMMON entry with no block open!"
 msgstr ""
 
-#: findvar.c:586
-msgid "Cannot look up value of a botched symbol."
+#: f-lang.c:725
+msgid "cannot get .bf node off empty list"
 msgstr ""
 
-#: fork-child.c:318
+#: fork-child.c:331
 msgid "setpgrp failed in child"
 msgstr ""
 
-#: fork-child.c:473
+#: fork-child.c:463
 #, possible-c-format
 msgid "During startup program terminated with signal %s, %s."
 msgstr ""
 
-#: fork-child.c:482
+#: fork-child.c:472
 #, possible-c-format
 msgid "During startup program exited with code %d."
 msgstr ""
 
-#: fork-child.c:485
+#: fork-child.c:475
 msgid "During startup program exited normally."
 msgstr ""
 
-#: fork-child.c:553
+#: fork-child.c:543
 msgid ""
 "Set a wrapper for running programs.\n"
 "The wrapper prepares the system and environment for the new program."
 msgstr ""
 
-#: fork-child.c:556
+#: fork-child.c:546
 msgid "Show the wrapper for running programs."
 msgstr ""
 
-#: fork-child.c:562
+#: fork-child.c:552
 msgid "Disable use of an execution wrapper."
 msgstr ""
 
-#: frame-unwind.c:133
-msgid "frame_unwind_find_by_frame failed"
-msgstr ""
-
-#: frame.c:174
+#: frame.c:173
 #, possible-c-format
 msgid "Frame debugging is %s.\n"
 msgstr ""
 
-#: frame.c:185
+#: frame.c:184
 #, possible-c-format
 msgid "Whether backtraces should continue past \"main\" is %s.\n"
 msgstr ""
 
-#: frame.c:195
+#: frame.c:194
 #, possible-c-format
 msgid ""
 "Whether backtraces should continue past the entry point of a program is %s.\n"
 msgstr ""
 
-#: frame.c:206
+#: frame.c:205
 #, possible-c-format
 msgid "An upper bound on the number of backtrace levels is %s.\n"
 msgstr ""
 
-#: frame.c:682
+#: frame.c:681
 msgid "No unwind_pc method"
 msgstr ""
 
-#: frame.c:702 frame.c:770
+#: frame.c:701 frame.c:769
 msgid "PC not available"
 msgstr ""
 
-#: frame.c:816
+#: frame.c:815
 msgid "Cannot pop the initial frame."
 msgstr ""
 
-#: frame.c:917
+#: frame.c:916
 #, possible-c-format
 msgid "Register %d was optimized out"
 msgstr ""
 
-#: frame.c:920
+#: frame.c:919
 #, possible-c-format
 msgid "Register %d is not available"
 msgstr ""
 
-#: frame.c:1049
+#: frame.c:1048
 msgid "Attempt to assign to a value that was optimized out."
 msgstr ""
 
-#: frame.c:1066
+#: frame.c:1065
 msgid "Attempt to assign to an unmodifiable value."
 msgstr ""
 
-#: frame.c:1123
+#: frame.c:1122
 #, possible-c-format
 msgid ""
 "Bad debug information detected: Attempt to read %d bytes from registers."
 msgstr ""
 
-#: frame.c:1289 ia64-tdep.c:1932 ia64-tdep.c:2309 libunwind-frame.c:335
+#: frame.c:1288 ia64-tdep.c:1931 ia64-tdep.c:2308 libunwind-frame.c:334
 msgid "No registers."
 msgstr ""
 
-#: frame.c:1291 stack.c:1315 stack.c:1928 thread.c:1288
+#: frame.c:1290 stack.c:1655 stack.c:2238 thread.c:1281
 msgid "No stack."
 msgstr ""
 
-#: frame.c:1293
+#: frame.c:1292
 msgid "No memory."
 msgstr ""
 
-#: frame.c:1298
+#: frame.c:1297
 msgid "No selected thread."
 msgstr ""
 
-#: frame.c:1300 infcmd.c:1744
+#: frame.c:1299 infcmd.c:1796
 msgid "Invalid selected thread."
 msgstr ""
 
-#: frame.c:1302
+#: frame.c:1301
 msgid "Target is executing."
 msgstr ""
 
-#: frame.c:2323
+#: frame.c:2328
 msgid "Missing unwind SP method"
 msgstr ""
 
-#: frame.c:2349
-msgid "unwinder did not report frame ID"
-msgstr ""
-
-#: frame.c:2352
-msgid "Not enough registers or memory available to unwind further"
-msgstr ""
-
-#: frame.c:2355
-msgid "previous frame inner to this frame (corrupt stack?)"
-msgstr ""
-
-#: frame.c:2358
-msgid "previous frame identical to this frame (corrupt stack?)"
-msgstr ""
-
-#: frame.c:2361
-msgid "frame did not save the PC"
-msgstr ""
-
-#: frame.c:2439
+#: frame.c:2432
 msgid ""
 "Set backtrace specific variables.\n"
 "Configure backtrace variables such as the backtrace limit"
 msgstr ""
 
 #. allow-unknown
-#: frame.c:2444
+#: frame.c:2437
 msgid ""
 "Show backtrace specific variables\n"
 "Show backtrace variables such as the backtrace limit"
 msgstr ""
 
-#: frame.c:2451
+#: frame.c:2444
 msgid "Set whether backtraces should continue past \"main\"."
 msgstr ""
 
-#: frame.c:2452
+#: frame.c:2445
 msgid "Show whether backtraces should continue past \"main\"."
 msgstr ""
 
-#: frame.c:2453
+#: frame.c:2446
 msgid ""
 "Normally the caller of \"main\" is not of interest, so GDB will terminate\n"
 "the backtrace at \"main\".  Set this variable if you need to see the rest\n"
 "of the stack trace."
 msgstr ""
 
-#: frame.c:2463
+#: frame.c:2456
 msgid ""
 "Set whether backtraces should continue past the entry point of a program."
 msgstr ""
 
-#: frame.c:2465
+#: frame.c:2458
 msgid ""
 "Show whether backtraces should continue past the entry point of a program."
 msgstr ""
 
-#: frame.c:2467
+#: frame.c:2460
 msgid ""
 "Normally there are no callers beyond the entry point of a program, so GDB\n"
 "will terminate the backtrace there.  Set this variable if you need to see\n"
 "the rest of the stack trace."
 msgstr ""
 
-#: frame.c:2477
-msgid "Set an upper bound on the number of backtrace levels."
+#: frame.c:2470
+msgid "Set an upper bound on the number of backtrace levels."
+msgstr ""
+
+#: frame.c:2471
+msgid "Show the upper bound on the number of backtrace levels."
+msgstr ""
+
+#: frame.c:2472
+msgid ""
+"No more than the specified number of frames can be displayed or examined.\n"
+"Zero is unlimited."
+msgstr ""
+
+#. Debug this files internals.
+#: frame.c:2481
+msgid "Set frame debugging."
+msgstr ""
+
+#: frame.c:2482
+msgid "Show frame debugging."
+msgstr ""
+
+#: frame.c:2483
+msgid "When non-zero, frame specific internal debugging is enabled."
+msgstr ""
+
+#: frame-unwind.c:132
+msgid "frame_unwind_find_by_frame failed"
+msgstr ""
+
+#: frv-linux-tdep.c:210
+msgid "Can't read realtime sigtramp frame."
+msgstr ""
+
+#: frv-linux-tdep.c:217
+msgid "not a signal trampoline"
+msgstr ""
+
+#: frv-tdep.c:427
+#, possible-c-format
+msgid "Bad register number %d"
+msgstr ""
+
+#: frv-tdep.c:1145
+#, possible-c-format
+msgid "Illegal return value length: %d"
+msgstr ""
+
+#: frv-tdep.c:1350
+#, possible-c-format
+msgid "Don't know how to return a %d-byte value."
+msgstr ""
+
+#: f-typeprint.c:381
+#, possible-c-format
+msgid "Invalid type code (%d) in symbol table."
+msgstr ""
+
+#: f-valprint.c:67
+msgid "Lower bound may not be '*' in F77"
 msgstr ""
 
-#: frame.c:2478
-msgid "Show the upper bound on the number of backtrace levels."
+#: f-valprint.c:230
+#, possible-c-format
+msgid "Type node corrupt! F77 arrays cannot have %d subscripts (%d Max)"
 msgstr ""
 
-#: frame.c:2479
-msgid ""
-"No more than the specified number of frames can be displayed or examined.\n"
-"Zero is unlimited."
+#: f-valprint.c:514
+#, possible-c-format
+msgid "Invalid F77 type code %d in symbol table."
 msgstr ""
 
-#. Debug this files internals.
-#: frame.c:2488
-msgid "Set frame debugging."
+#: f-valprint.c:527
+msgid ""
+"All COMMON blocks visible at this level:\n"
+"\n"
 msgstr ""
 
-#: frame.c:2489
-msgid "Show frame debugging."
+#. We have been told to display the contents of F77 COMMON
+#. block supposedly visible in this function.  Let us
+#. first make sure that it is visible and if so, let
+#. us display its contents.
+#: f-valprint.c:556 f-valprint.c:646
+msgid "No frame selected"
 msgstr ""
 
-#: frame.c:2490
-msgid "When non-zero, frame specific internal debugging is enabled."
+#. Got no 'funname', code below will fail.
+#: f-valprint.c:596
+msgid "No function found for frame."
 msgstr ""
 
-#: frv-linux-tdep.c:211
-msgid "Can't read realtime sigtramp frame."
+#: f-valprint.c:613
+msgid "Contents of blank COMMON block:\n"
 msgstr ""
 
-#: frv-linux-tdep.c:218
-msgid "not a signal trampoline"
+#: f-valprint.c:615
+#, possible-c-format
+msgid "Contents of F77 COMMON block '%s':\n"
 msgstr ""
 
-#: frv-tdep.c:428
+#: f-valprint.c:627
 #, possible-c-format
-msgid "Bad register number %d"
+msgid "Cannot locate the common block %s in function '%s'\n"
 msgstr ""
 
-#: frv-tdep.c:1146
-#, possible-c-format
-msgid "Illegal return value length: %d"
+#: f-valprint.c:644
+msgid "Cannot deal with NULL common name!"
 msgstr ""
 
-#: frv-tdep.c:1351
-#, possible-c-format
-msgid "Don't know how to return a %d-byte value."
+#: f-valprint.c:696 f-valprint.c:699
+msgid "Print out the values contained in a Fortran COMMON block."
 msgstr ""
 
-#: gcore.c:57
+#: gcore.c:56
 #, possible-c-format
 msgid "Failed to open '%s' for output."
 msgstr ""
 
-#: gcore.c:85
+#: gcore.c:84
 #, possible-c-format
 msgid "Failed to create 'note' section for corefile: %s"
 msgstr ""
 
-#: gcore.c:95
+#: gcore.c:94
 msgid "gcore: failed to get corefile memory sections from target."
 msgstr ""
 
-#: gcore.c:101
+#: gcore.c:100
 #, possible-c-format
 msgid "writing note section (%s)"
 msgstr ""
 
-#: gcore.c:171
+#: gcore.c:170
 msgid "Can't find default bfd machine type (need execfile)."
 msgstr ""
 
-#: gcore.c:185
+#: gcore.c:184
 msgid "Can't find bfd architecture for corefile (need execfile)."
 msgstr ""
 
-#: gcore.c:446
+#: gcore.c:445
 #, possible-c-format
 msgid "Couldn't make gcore segment: %s"
 msgstr ""
 
-#: gcore.c:540
+#: gcore.c:539
 #, possible-c-format
 msgid "Memory read failed for corefile section, %s bytes at %s."
 msgstr ""
 
-#: gcore.c:548
+#: gcore.c:547
 #, possible-c-format
 msgid "Failed to write corefile contents (%s)."
 msgstr ""
 
-#: gcore.c:581
+#: gcore.c:580
 msgid ""
 "Save a core file with the current state of the debugged process.\n"
 "Argument is optional filename.  Default filename is 'core.<process_id>'."
 msgstr ""
 
-#: gdb_assert.h:49
-#, possible-c-format
-msgid "%s: Assertion `%s' failed."
-msgstr ""
-
-#: gdb_assert.h:53
-#, possible-c-format
-msgid "Assertion `%s' failed."
-msgstr ""
-
 #: gdbarch.c:67
 #, possible-c-format
 msgid "Architecture debugging is %s.\n"
 msgstr ""
 
-#: gdbarch.c:711
+#: gdbarch.c:722
 #, possible-c-format
 msgid "verify_gdbarch: the following are invalid ...%s"
 msgstr ""
 
-#: gdbarch.c:3996
+#: gdbarch.c:4077
 msgid "gdbarch_architecture_names: multi-arch unknown"
 msgstr ""
 
-#: gdbarch.c:4022
+#: gdbarch.c:4103
 #, possible-c-format
 msgid "gdbarch: Attempt to register unknown architecture (%d)"
 msgstr ""
 
-#: gdbarch.c:4033
+#: gdbarch.c:4114
 #, possible-c-format
-msgid "gdbarch: Duplicate registraration of architecture (%s)"
+msgid "gdbarch: Duplicate registration of architecture (%s)"
 msgstr ""
 
-#: gdbarch.c:4222
+#: gdbarch.c:4303
 msgid "Set architecture debugging."
 msgstr ""
 
-#: gdbarch.c:4223
+#: gdbarch.c:4304
 msgid "Show architecture debugging."
 msgstr ""
 
-#: gdbarch.c:4224
+#: gdbarch.c:4305
 msgid "When non-zero, architecture debugging is enabled."
 msgstr ""
 
-#: gdbtypes.c:123
+#: gdb-dlfcn.c:82 gdb-dlfcn.c:96
+#, possible-c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: gdbserver/thread-db.c:725
+#, possible-c-format
+msgid "libthread-db-search-path component too long, ignored: %s."
+msgstr ""
+
+#: gdbtypes.c:121
 #, possible-c-format
 msgid ""
 "Resolution of opaque struct/class/union types (if set before loading "
 "symbols) is %s.\n"
 msgstr ""
 
-#: gdbtypes.c:133
+#: gdbtypes.c:131
 #, possible-c-format
 msgid "Debugging of C++ overloading is %s.\n"
 msgstr ""
@@ -8679,107 +9094,118 @@
 msgid "Unknown address space specifier: \"%s\""
 msgstr ""
 
-#: gdbtypes.c:1134
+#: gdbtypes.c:1130
+#, possible-c-format
+msgid "Invalid anonymous type %s [in module %s], GCC PR debug/47510 bug?"
+msgstr ""
+
+#: gdbtypes.c:1160
 #, possible-c-format
 msgid "No type named %s."
 msgstr ""
 
-#: gdbtypes.c:1179 objc-lang.c:97
+#: gdbtypes.c:1205 objc-lang.c:96
 #, possible-c-format
 msgid "No struct type named %s."
 msgstr ""
 
-#: gdbtypes.c:1183 gdbtypes.c:1259 objc-lang.c:104
+#: gdbtypes.c:1209 gdbtypes.c:1285 objc-lang.c:103
 #, possible-c-format
 msgid "This context has class, union or enum %s, not a struct."
 msgstr ""
 
-#: gdbtypes.c:1201
+#: gdbtypes.c:1227
 #, possible-c-format
 msgid "No union type named %s."
 msgstr ""
 
 #. If we get here, it's not a union.
-#: gdbtypes.c:1209
+#: gdbtypes.c:1235
 #, possible-c-format
 msgid "This context has class, struct or enum %s, not a union."
 msgstr ""
 
-#: gdbtypes.c:1225
+#: gdbtypes.c:1251
 #, possible-c-format
 msgid "No enum type named %s."
 msgstr ""
 
-#: gdbtypes.c:1229
+#: gdbtypes.c:1255
 #, possible-c-format
 msgid "This context has class, struct or union %s, not an enum."
 msgstr ""
 
-#: gdbtypes.c:1255
+#: gdbtypes.c:1281
 #, possible-c-format
 msgid "No template type named %s."
 msgstr ""
 
-#: gdbtypes.c:1297
+#: gdbtypes.c:1323
 #, possible-c-format
 msgid "Type %s is not a structure or union type."
 msgstr ""
 
-#: gdbtypes.c:1351
+#: gdbtypes.c:1377
 #, possible-c-format
 msgid "Type %s has no component named %s."
 msgstr ""
 
-#: gdbtypes.c:1413
+#: gdbtypes.c:1439
 msgid "stub type has NULL name"
 msgstr ""
 
-#: gdbtypes.c:1695
+#: gdbtypes.c:1725
 #, possible-c-format
 msgid "Internal: Cannot demangle mangled name `%s'."
 msgstr ""
 
-#: gdbtypes.c:2801
+#: gdbtypes.c:2841
 #, possible-c-format
 msgid ") length %d\n"
 msgstr ""
 
-#: gdbtypes.c:2941
+#: gdbtypes.c:2981
 msgid " <same as already seen type>\n"
 msgstr ""
 
-#: gdbtypes.c:3367
+#: gdbtypes.c:3408
 #, possible-c-format
 msgid "Unexpected type field location kind: %d"
 msgstr ""
 
-#: gdbtypes.c:3961
+#: gdbtypes.c:4005
 msgid "Set debugging of C++ overloading."
 msgstr ""
 
-#: gdbtypes.c:3962
+#: gdbtypes.c:4006
 msgid "Show debugging of C++ overloading."
 msgstr ""
 
-#: gdbtypes.c:3963
+#: gdbtypes.c:4007
 msgid "When enabled, ranking of the functions is displayed."
 msgstr ""
 
-#: gdbtypes.c:3972
+#: gdbtypes.c:4016
 msgid ""
 "Set resolution of opaque struct/class/union types (if set before loading "
 "symbols)."
 msgstr ""
 
-#: gdbtypes.c:3974
+#: gdbtypes.c:4018
 msgid ""
 "Show resolution of opaque struct/class/union types (if set before loading "
 "symbols)."
 msgstr ""
 
+#. A helper macro that returns the name of a type or "unnamed type" if the type
+#. has no name.
+#: gdbtypes.h:1208
+msgid "<unnamed type>"
+msgstr ""
+
 #. A helper macro that returns the name of an error type.  If the type
 #. has a name, it is used; otherwise, a default is used.
-#: gdbtypes.h:1117
+#: gdbtypes.h:1213
 msgid "<error type>"
 msgstr ""
 
@@ -8908,105 +9334,105 @@
 msgid "ptrace (PTRACE_TRACEME) failed!"
 msgstr ""
 
-#: gnu-nat.c:2256
+#: gnu-nat.c:2257
 msgid "to_stop target function not implemented"
 msgstr ""
 
-#: gnu-nat.c:2290
+#: gnu-nat.c:2291
 #, possible-c-format
 msgid "Read from inferior faulted: %s"
 msgstr ""
 
-#: gnu-nat.c:2296
+#: gnu-nat.c:2297
 #, possible-c-format
 msgid "gnu_read_inferior vm_deallocate failed: %s"
 msgstr ""
 
-#: gnu-nat.c:2382
+#: gnu-nat.c:2383
 #, possible-c-format
 msgid "No memory at 0x%x. Nothing written"
 msgstr ""
 
-#: gnu-nat.c:2391
+#: gnu-nat.c:2392
 #, possible-c-format
 msgid "Memory at address 0x%x is unwritable. Nothing written"
 msgstr ""
 
-#: gnu-nat.c:2466
+#: gnu-nat.c:2467
 #, possible-c-format
 msgid "%s: %s"
 msgstr ""
 
-#: gnu-nat.c:2542
+#: gnu-nat.c:2543
 #, possible-c-format
 msgid "vm_region failed: %s"
 msgstr ""
 
-#: gnu-nat.c:2697
+#: gnu-nat.c:2698
 #, possible-c-format
 msgid "Illegal argument for \"%s\" command, should be an integer."
 msgstr ""
 
-#: gnu-nat.c:2709
+#: gnu-nat.c:2710
 #, possible-c-format
 msgid "Illegal argument for \"%s\" command, should be \"%s\" or \"%s\"."
 msgstr ""
 
-#: gnu-nat.c:2721
+#: gnu-nat.c:2722
 #, possible-c-format
 msgid "Garbage after \"%s\" command: `%s'"
 msgstr ""
 
-#: gnu-nat.c:2732
+#: gnu-nat.c:2733
 msgid "No current thread."
 msgstr ""
 
-#: gnu-nat.c:2743
+#: gnu-nat.c:2744
 msgid "No current process."
 msgstr ""
 
-#: gnu-nat.c:2857
+#: gnu-nat.c:2858
 msgid "No inferior task."
 msgstr ""
 
-#: gnu-nat.c:2863
+#: gnu-nat.c:2864
 #, possible-c-format
 msgid "Couldn't extract send right %d from inferior: %s"
 msgstr ""
 
-#: gnu-nat.c:2879
+#: gnu-nat.c:2880
 #, possible-c-format
 msgid "Can't set exception port for %s: %s"
 msgstr ""
 
-#: gnu-nat.c:2890
+#: gnu-nat.c:2891
 msgid "No argument to \"set task exception-port\" command."
 msgstr ""
 
-#: gnu-nat.c:2916
+#: gnu-nat.c:2917
 msgid ""
 "Illegal argument to \"set signal-thread\" command.\n"
 "Should be an integer thread ID, or `none'."
 msgstr ""
 
-#: gnu-nat.c:2926
+#: gnu-nat.c:2927
 #, possible-c-format
 msgid ""
 "Thread ID %s not known.  Use the \"info threads\" command to\n"
 "see the IDs of currently known threads."
 msgstr ""
 
-#: gnu-nat.c:3062
+#: gnu-nat.c:3063
 #, possible-c-format
 msgid "%ld: %s."
 msgstr ""
 
-#: gnu-nat.c:3072 utils.c:1393
+#: gnu-nat.c:3073 utils.c:1193
 #, possible-c-format
 msgid "%s."
 msgstr ""
 
-#: gnu-nat.c:3112
+#: gnu-nat.c:3113
 msgid ""
 "Set whether the new threads are suspended while gdb has control.\n"
 "This property normally has no effect because the whole task is\n"
@@ -9014,79 +9440,79 @@
 "The default value is \"off\"."
 msgstr ""
 
-#: gnu-nat.c:3118
+#: gnu-nat.c:3119
 msgid "Show whether new threads are suspended while gdb has control."
 msgstr ""
 
-#: gnu-nat.c:3122
+#: gnu-nat.c:3123
 msgid ""
 "Set whether new threads are allowed to run (once gdb has noticed them)."
 msgstr ""
 
-#: gnu-nat.c:3125
+#: gnu-nat.c:3126
 msgid ""
 "Show whether new threads are allowed to run (once gdb has noticed them)."
 msgstr ""
 
-#: gnu-nat.c:3130
+#: gnu-nat.c:3131
 msgid "Set the default detach-suspend-count value for new threads."
 msgstr ""
 
-#: gnu-nat.c:3133
+#: gnu-nat.c:3134
 msgid "Show the default detach-suspend-count value for new threads."
 msgstr ""
 
-#: gnu-nat.c:3136
+#: gnu-nat.c:3137
 msgid ""
 "Set whether the inferior process's signals will be intercepted.\n"
 "Mach exceptions (such as breakpoint traps) are not affected."
 msgstr ""
 
-#: gnu-nat.c:3141
+#: gnu-nat.c:3142
 msgid "Show whether the inferior process's signals will be intercepted."
 msgstr ""
 
-#: gnu-nat.c:3146
+#: gnu-nat.c:3147
 msgid ""
 "Set the thread that gdb thinks is the libc signal thread.\n"
 "This thread is run when delivering a signal to a non-stopped process."
 msgstr ""
 
-#: gnu-nat.c:3151
+#: gnu-nat.c:3152
 msgid "Set the thread that gdb thinks is the libc signal thread."
 msgstr ""
 
-#: gnu-nat.c:3156
+#: gnu-nat.c:3157
 msgid ""
 "Set whether gdb thinks the inferior process is stopped as with SIGSTOP.\n"
 "Stopped process will be continued by sending them a signal."
 msgstr ""
 
-#: gnu-nat.c:3160
+#: gnu-nat.c:3161
 msgid ""
 "Show whether gdb thinks the inferior process is stopped as with SIGSTOP."
 msgstr ""
 
-#: gnu-nat.c:3164
+#: gnu-nat.c:3165
 msgid ""
 "Set whether exceptions in the inferior process will be trapped.\n"
 "When exceptions are turned off, neither breakpoints nor single-stepping\n"
 "will work."
 msgstr ""
 
-#: gnu-nat.c:3171
+#: gnu-nat.c:3172
 msgid "Show whether exceptions in the inferior process will be trapped."
 msgstr ""
 
-#: gnu-nat.c:3176
+#: gnu-nat.c:3177
 msgid "Command prefix for setting task attributes."
 msgstr ""
 
-#: gnu-nat.c:3179
+#: gnu-nat.c:3180
 msgid "Command prefix for showing task attributes."
 msgstr ""
 
-#: gnu-nat.c:3182
+#: gnu-nat.c:3183
 msgid ""
 "Set whether the task is suspended while gdb has control.\n"
 "A value of \"on\" takes effect immediately, otherwise nothing happens\n"
@@ -9095,19 +9521,19 @@
 "used to pause individual threads by default instead."
 msgstr ""
 
-#: gnu-nat.c:3190
+#: gnu-nat.c:3191
 msgid "Show whether the task is suspended while gdb has control."
 msgstr ""
 
-#: gnu-nat.c:3194
+#: gnu-nat.c:3195
 msgid "Set the suspend count will leave on the thread when detaching."
 msgstr ""
 
-#: gnu-nat.c:3197
+#: gnu-nat.c:3198
 msgid "Show the suspend count will leave on the thread when detaching."
 msgstr ""
 
-#: gnu-nat.c:3201
+#: gnu-nat.c:3202
 msgid ""
 "Set the task exception port to which we forward exceptions.\n"
 "The argument should be the value of the send right in the task."
@@ -9115,54 +9541,54 @@
 
 #. A convenient way of turning on all options require to noninvasively
 #. debug running tasks.
-#: gnu-nat.c:3211
+#: gnu-nat.c:3212
 msgid ""
 "Set task options so that we interfere as little as possible.\n"
 "This is the same as setting `task pause', `exceptions', and\n"
 "`signals' to the opposite value."
 msgstr ""
 
-#: gnu-nat.c:3219
+#: gnu-nat.c:3220
 msgid "Show information about the task's send rights"
 msgstr ""
 
-#: gnu-nat.c:3222
+#: gnu-nat.c:3223
 msgid "Show information about the task's receive rights"
 msgstr ""
 
-#: gnu-nat.c:3225
+#: gnu-nat.c:3226
 msgid "Show information about the task's port rights"
 msgstr ""
 
-#: gnu-nat.c:3228
+#: gnu-nat.c:3229
 msgid "Show information about the task's port sets"
 msgstr ""
 
-#: gnu-nat.c:3231
+#: gnu-nat.c:3232
 msgid "Show information about the task's dead names"
 msgstr ""
 
-#: gnu-nat.c:3309
+#: gnu-nat.c:3310
 msgid "No argument to \"set thread exception-port\" command."
 msgstr ""
 
-#: gnu-nat.c:3352
+#: gnu-nat.c:3353
 msgid "Command prefix for setting thread properties."
 msgstr ""
 
-#: gnu-nat.c:3355
+#: gnu-nat.c:3356
 msgid "Command prefix for setting default thread properties."
 msgstr ""
 
-#: gnu-nat.c:3359
+#: gnu-nat.c:3360
 msgid "Command prefix for showing thread properties."
 msgstr ""
 
-#: gnu-nat.c:3362
+#: gnu-nat.c:3363
 msgid "Command prefix for showing default thread properties."
 msgstr ""
 
-#: gnu-nat.c:3366
+#: gnu-nat.c:3367
 msgid ""
 "Set whether the current thread is suspended while gdb has control.\n"
 "A value of \"on\" takes effect immediately, otherwise nothing happens\n"
@@ -9172,90 +9598,90 @@
 "The default value is \"off\"."
 msgstr ""
 
-#: gnu-nat.c:3374
+#: gnu-nat.c:3375
 msgid "Show whether the current thread is suspended while gdb has control."
 msgstr ""
 
-#: gnu-nat.c:3379
+#: gnu-nat.c:3380
 msgid "Set whether the current thread is allowed to run."
 msgstr ""
 
-#: gnu-nat.c:3382
+#: gnu-nat.c:3383
 msgid "Show whether the current thread is allowed to run."
 msgstr ""
 
-#: gnu-nat.c:3385
+#: gnu-nat.c:3386
 msgid ""
 "Set the suspend count will leave on the thread when detaching.\n"
 "Note that this is relative to suspend count when gdb noticed the thread;\n"
 "use the `thread takeover-suspend-count' to force it to an absolute value."
 msgstr ""
 
-#: gnu-nat.c:3390
+#: gnu-nat.c:3391
 msgid ""
 "Show the suspend count will leave on the thread when detaching.\n"
 "Note that this is relative to suspend count when gdb noticed the thread;\n"
 "use the `thread takeover-suspend-count' to force it to an absolute value."
 msgstr ""
 
-#: gnu-nat.c:3396
+#: gnu-nat.c:3397
 msgid ""
 "Set the thread exception port to which we forward exceptions.\n"
 "This overrides the task exception port.\n"
 "The argument should be the value of the send right in the task."
 msgstr ""
 
-#: gnu-nat.c:3405
+#: gnu-nat.c:3406
 msgid ""
 "Force the threads absolute suspend-count to be gdb's.\n"
 "Prior to giving this command, gdb's thread suspend-counts are relative\n"
 "to the thread's initial suspend-count when gdb notices the threads."
 msgstr ""
 
-#: gnu-nat.c:3422
+#: gnu-nat.c:3423
 msgid "Set debugging output for the gnu backend."
 msgstr ""
 
-#: gnu-nat.c:3423
+#: gnu-nat.c:3424
 msgid "Show debugging output for the gnu backend."
 msgstr ""
 
-#: gnu-nat.c:3450
+#: gnu-nat.c:3451
 #, possible-c-format
 msgid "Error flushing inferior's cache : %s"
 msgstr ""
 
-#: gnu-v2-abi.c:178
+#: gnu-v2-abi.c:179
 msgid "I'm confused:  virtual function table has bad type"
 msgstr ""
 
-#: gnu-v2-abi.c:374
+#: gnu-v2-abi.c:375
 msgid "Virtual baseclass pointer is not available"
 msgstr ""
 
-#: gnu-v2-abi.c:396
+#: gnu-v2-abi.c:397
 msgid "Baseclass offset not found"
 msgstr ""
 
-#: gnu-v3-abi.c:317
+#: gnu-v3-abi.c:320
 #, possible-c-format
 msgid "can't find linker symbol for virtual table for `%s' value"
 msgstr ""
 
-#: gnu-v3-abi.c:320
+#: gnu-v3-abi.c:323
 #, possible-c-format
 msgid "  found `%s' instead"
 msgstr ""
 
-#: gnu-v3-abi.c:390
+#: gnu-v3-abi.c:393
 msgid "Only classes can have virtual functions."
 msgstr ""
 
-#: gnu-v3-abi.c:440
+#: gnu-v3-abi.c:443
 msgid "Expected a negative vbase offset (old compiler?)"
 msgstr ""
 
-#: gnu-v3-abi.c:444
+#: gnu-v3-abi.c:447
 msgid "Misaligned vbase offset."
 msgstr ""
 
@@ -9393,255 +9819,331 @@
 "the `info dos ldt' command."
 msgstr ""
 
-#: h8300-tdep.c:774 h8300-tdep.c:808
+#: h8300-tdep.c:773 h8300-tdep.c:807
 msgid "I don't know how this 8 byte value is returned."
 msgstr ""
 
 #. long long, double and long double
 #. are all defined as 4 byte types so
 #. far so this shouldn't happen.
-#: h8300-tdep.c:872
+#: h8300-tdep.c:871
 msgid "I don't know how to return an 8 byte value."
 msgstr ""
 
-#: h8300-tdep.c:957
+#: h8300-tdep.c:956
 #, possible-c-format
 msgid "h8300_register_name: illegal register number %d"
 msgstr ""
 
-#: h8300-tdep.c:975
+#: h8300-tdep.c:974
 #, possible-c-format
 msgid "h8300s_register_name: illegal register number %d"
 msgstr ""
 
-#: h8300-tdep.c:993
+#: h8300-tdep.c:992
 #, possible-c-format
 msgid "h8300sx_register_name: illegal register number %d"
 msgstr ""
 
-#: h8300-tdep.c:1129
+#: h8300-tdep.c:1128
 #, possible-c-format
 msgid "h8300_register_type: illegal register number %d"
 msgstr ""
 
-#: hppa-hpux-nat.c:112 hppa-hpux-nat.c:126
+#: hppa-hpux-nat.c:111 hppa-hpux-nat.c:125
 #, possible-c-format
 msgid "Couldn't read register %s (#%d): %s"
 msgstr ""
 
-#: hppa-hpux-nat.c:198 hppa-hpux-nat.c:212
+#: hppa-hpux-nat.c:197 hppa-hpux-nat.c:211
 #, possible-c-format
 msgid "Couldn't write register %s (#%d): %s"
 msgstr ""
 
 #. Should never happen.
-#: hppa-hpux-tdep.c:150 hppa-hpux-tdep.c:281
+#: hppa-hpux-tdep.c:149 hppa-hpux-tdep.c:280
 msgid "Unable to find branch in parameter relocation stub."
 msgstr ""
 
-#: hppa-hpux-tdep.c:426
+#: hppa-hpux-tdep.c:425
 msgid "Unable to find branch in linker stub"
 msgstr ""
 
-#: hppa-hpux-tdep.c:444
+#: hppa-hpux-tdep.c:443
 #, possible-c-format
 msgid "Unable to find ldil X,%%r1 before ble Y(%%sr4,%%r1)."
 msgstr ""
 
-#: hppa-hpux-tdep.c:481
+#: hppa-hpux-tdep.c:480
 #, possible-c-format
 msgid "Unable to find symbol for 0x%lx"
 msgstr ""
 
-#: hppa-hpux-tdep.c:489
+#: hppa-hpux-tdep.c:488
 #, possible-c-format
 msgid "Unable to find library symbol for %s."
 msgstr ""
 
-#: hppa-hpux-tdep.c:522
+#: hppa-hpux-tdep.c:521
 #, possible-c-format
 msgid "Unable to find restore of %%rp before bv (%%rp)."
 msgstr ""
 
-#: hppa-hpux-tdep.c:871 hppa-hpux-tdep.c:969
+#: hppa-hpux-tdep.c:870 hppa-hpux-tdep.c:968
 msgid "Internal error creating objfile private data."
 msgstr ""
 
-#: hppa-hpux-tdep.c:1122
+#: hppa-hpux-tdep.c:1121
 msgid ""
 "Cannot find suitable address to place dummy breakpoint; nested calls may "
 "fail."
 msgstr ""
 
-#: hppa-hpux-tdep.c:1226
+#: hppa-hpux-tdep.c:1225
 msgid ""
 "Cannot call external function not referenced by application (no import "
 "stub).\n"
 msgstr ""
 
-#: hppa-hpux-tdep.c:1237 hppa-hpux-tdep.c:1263
+#: hppa-hpux-tdep.c:1236 hppa-hpux-tdep.c:1262
 msgid "Cannot make interspace call from here."
 msgstr ""
 
-#: hppa-hpux-tdep.c:1372
+#: hppa-hpux-tdep.c:1371
 msgid "Register set contents too small"
 msgstr ""
 
-#: hppa-linux-nat.c:158 ia64-linux-nat.c:310
+#: hppa-linux-nat.c:157 ia64-linux-nat.c:309
 #, possible-c-format
 msgid "Invalid register number %d."
 msgstr ""
 
-#: hppa-linux-nat.c:235 i386-linux-nat.c:166 ia64-linux-nat.c:711
-#: inf-ptrace.c:692 m68klinux-nat.c:122
+#: hppa-linux-nat.c:234 i386-linux-nat.c:165 ia64-linux-nat.c:708
+#: inf-ptrace.c:691 m68klinux-nat.c:121
 #, possible-c-format
 msgid "Couldn't read register %s (#%d): %s."
 msgstr ""
 
-#: hppa-linux-nat.c:263 i386-linux-nat.c:195 ia64-linux-nat.c:770
-#: inf-ptrace.c:751 m68klinux-nat.c:180
+#: hppa-linux-nat.c:262 i386-linux-nat.c:194 ia64-linux-nat.c:767
+#: inf-ptrace.c:750 m68klinux-nat.c:179
 #, possible-c-format
 msgid "Couldn't write register %s (#%d): %s."
 msgstr ""
 
-#: hppa-linux-tdep.c:50 hppa-tdep.c:674
+#: hppa-linux-tdep.c:49 hppa-tdep.c:673
 #, possible-c-format
 msgid "Unmapped DWARF DBX Register #%d encountered."
 msgstr ""
 
-#: hppa-tdep.c:488
+#: hppa-tdep.c:487
 msgid "Internal error reading unwind information."
 msgstr ""
 
-#: hppa-tdep.c:1913
+#: hppa-tdep.c:1912
 #, possible-c-format
 msgid "Cannot read instruction at %s."
 msgstr ""
 
-#: hppa-tdep.c:2411
+#: hppa-tdep.c:2410
 msgid "Requesting registers from null frame."
 msgstr ""
 
-#: hppa-tdep.c:2940
+#: hppa-tdep.c:2939
 #, possible-c-format
 msgid "Cannot resolve PLT stub at %s."
 msgstr ""
 
-#: hppa-tdep.c:3047
+#: hppa-tdep.c:3046
 #, possible-c-format
 msgid "Unsupported address size: %d"
 msgstr ""
 
-#: hppa-tdep.c:3156
+#: hppa-tdep.c:3155
 msgid "Print unwind table entry at given address."
 msgstr ""
 
 #. Debug this files internals.
-#: hppa-tdep.c:3160
+#: hppa-tdep.c:3159
 msgid ""
 "Set whether hppa target specific debugging information should be displayed."
 msgstr ""
 
-#: hppa-tdep.c:3162
+#: hppa-tdep.c:3161
 msgid "Show whether hppa target specific debugging information is displayed."
 msgstr ""
 
-#: hppa-tdep.c:3163
+#: hppa-tdep.c:3162
 msgid ""
 "This flag controls whether hppa target specific debugging information is\n"
 "displayed.  This information is particularly useful for debugging frame\n"
 "unwinding problems."
 msgstr ""
 
-#: i386-darwin-nat.c:72 i386-darwin-nat.c:116
+#: i386bsd-nat.c:220
+msgid "Couldn't write XMM registers"
+msgstr ""
+
+#: i386bsd-nat.c:273
+msgid "Couldn't get debug registers"
+msgstr ""
+
+#: i386bsd-nat.c:284
+msgid "Couldn't write debug registers"
+msgstr ""
+
+#: i386bsd-nat.c:316
+msgid "Couldn't read debug registers"
+msgstr ""
+
+#: i386bsd-nat.c:363
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
+msgstr ""
+
+#: i386bsd-nat.c:376
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
+msgstr ""
+
+#: i386bsd-nat.c:389
+#, possible-c-format
+msgid ""
+"offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n"
+"Please report this to <bug-gdb@gnu.org>."
+msgstr ""
+
+#: i386-darwin-nat.c:71 i386-darwin-nat.c:115
 #, possible-c-format
 msgid "Error calling thread_get_state for GP registers for thread 0x%ulx"
 msgstr ""
 
-#: i386-darwin-nat.c:92 i386-darwin-nat.c:141
+#: i386-darwin-nat.c:91 i386-darwin-nat.c:140
 #, possible-c-format
 msgid "Error calling thread_get_state for float registers for thread 0x%ulx"
 msgstr ""
 
-#: i386-darwin-nat.c:153
+#: i386-darwin-nat.c:152
 #, possible-c-format
 msgid "unknown register %d"
 msgstr ""
 
-#: i386-darwin-nat.c:304 i386-darwin-nat.c:370
+#: i386-darwin-nat.c:303 i386-darwin-nat.c:369
 #, possible-c-format
 msgid "Error reading debug registers thread 0x%x via thread_get_state\n"
 msgstr ""
 
-#: i386-darwin-nat.c:343
+#: i386-darwin-nat.c:342
 #, possible-c-format
 msgid "Error writing debug registers thread 0x%x via thread_get_state\n"
 msgstr ""
 
-#: i386-darwin-nat.c:544
+#: i386-darwin-nat.c:543
 #, possible-c-format
 msgid "darwin_set_sstep: error %x, thread=%x\n"
 msgstr ""
 
-#: i386-darwin-nat.c:584
+#: i386-darwin-nat.c:583
 #, possible-c-format
 msgid "darwin_set_sstep: unknown flavour: %d"
 msgstr ""
 
-#: i386-linux-nat.c:387 i386-linux-nat.c:410
+#: i386gnu-nat.c:77 i386gnu-nat.c:185
+#, possible-c-format
+msgid "Couldn't fetch floating-point state from %s"
+msgstr ""
+
+#: i386gnu-nat.c:125
+#, possible-c-format
+msgid "Can't fetch registers from thread %s: No such thread"
+msgstr ""
+
+#: i386gnu-nat.c:136
+#, possible-c-format
+msgid "Couldn't fetch registers from %s"
+msgstr ""
+
+#: i386gnu-nat.c:198
+#, possible-c-format
+msgid "Couldn't store floating-point state into %s"
+msgstr ""
+
+#: i386gnu-nat.c:218
+#, possible-c-format
+msgid "Couldn't store registers into thread %s: No such thread"
+msgstr ""
+
+#: i386gnu-nat.c:235
+#, possible-c-format
+msgid "Couldn't store registers into %s"
+msgstr ""
+
+#: i386gnu-nat.c:256
+#, possible-c-format
+msgid "Register %s changed after the thread was aborted"
+msgstr ""
+
+#: i386gnu-nat.c:263
+msgid "... also writing this register!  Suspicious..."
+msgstr ""
+
+#: i386-linux-nat.c:386 i386-linux-nat.c:409
 msgid "Couldn't read extended state status"
 msgstr ""
 
-#: i386-linux-nat.c:443 i386-linux-nat.c:470
+#: i386-linux-nat.c:442 i386-linux-nat.c:469
 msgid "Couldn't read floating-point and SSE registers"
 msgstr ""
 
-#: i386-linux-nat.c:476
+#: i386-linux-nat.c:475
 msgid "Couldn't write floating-point and SSE registers"
 msgstr ""
 
-#: i386-linux-nat.c:579 m32r-linux-nat.c:218 m68klinux-nat.c:452
+#: i386-linux-nat.c:578 m32r-linux-nat.c:217 m68klinux-nat.c:451
 #, possible-c-format
 msgid "Got request for bad register number %d."
 msgstr ""
 
-#: i386-linux-nat.c:648 m32r-linux-nat.c:243 m68klinux-nat.c:500
+#: i386-linux-nat.c:647 m32r-linux-nat.c:242 m68klinux-nat.c:499
 #, possible-c-format
 msgid "Got request to store bad register number %d."
 msgstr ""
 
-#: i386-linux-tdep.c:606
+#: i386-linux-tdep.c:605
 msgid "Couldn't read `xcr0' bytes from `.reg-xstate' section in core file."
 msgstr ""
 
-#: i386-nat.c:272
+#: i386-nat.c:311
 msgid "The i386 doesn't support data-read watchpoints.\n"
 msgstr ""
 
-#: i386-nat.c:284
+#: i386-nat.c:323
 #, possible-c-format
 msgid "Invalid hardware breakpoint type %d in i386_length_and_rw_bits.\n"
 msgstr ""
 
-#: i386-nat.c:302
+#: i386-nat.c:341
 #, possible-c-format
 msgid "Invalid hardware breakpoint length %d in i386_length_and_rw_bits.\n"
 msgstr ""
 
-#: i386-nat.c:461
+#: i386-nat.c:491
 #, possible-c-format
 msgid "Invalid value %d of operation in i386_handle_nonaligned_watchpoint.\n"
 msgstr ""
 
-#: i386-nat.c:661
+#: i386-nat.c:755
 msgid "Set whether to show variables that mirror the x86 debug registers."
 msgstr ""
 
-#: i386-nat.c:662
+#: i386-nat.c:756
 msgid "Show whether to show variables that mirror the x86 debug registers."
 msgstr ""
 
-#: i386-nat.c:663 mips-linux-nat.c:1058
+#: i386-nat.c:757 mips-linux-nat.c:1056
 msgid ""
 "Use \"on\" to enable, \"off\" to disable.\n"
 "If enabled, the debug registers values are shown when GDB inserts\n"
@@ -9649,43 +10151,43 @@
 "triggers a breakpoint or watchpoint."
 msgstr ""
 
-#: i386-tdep.c:2276
+#: i386-tdep.c:2442
 msgid "Cannot find floating-point return value."
 msgstr ""
 
-#: i386-tdep.c:2307 m68k-tdep.c:313
+#: i386-tdep.c:2473 m68k-tdep.c:311
 #, possible-c-format
 msgid "Cannot extract return value of %d bytes long."
 msgstr ""
 
-#: i386-tdep.c:2329
+#: i386-tdep.c:2495
 msgid "Cannot set floating-point return value."
 msgstr ""
 
-#: i386-tdep.c:2372 m68k-tdep.c:355
+#: i386-tdep.c:2538 m68k-tdep.c:353
 #, possible-c-format
 msgid "Cannot store return value of %d bytes long."
 msgstr ""
 
-#: i386-tdep.c:3399 i386-tdep.c:3440 i386-tdep.c:3476 i386-tdep.c:3549
-#: i386-tdep.c:3818 i386-tdep.c:3916 i386-tdep.c:5619 i386-tdep.c:6095
-#: i386-tdep.c:6368
+#: i386-tdep.c:3593 i386-tdep.c:3634 i386-tdep.c:3670 i386-tdep.c:3743
+#: i386-tdep.c:4012 i386-tdep.c:4110 i386-tdep.c:5813 i386-tdep.c:6289
+#: i386-tdep.c:6562
 #, possible-c-format
 msgid "Process record: error reading memory at addr %s len = 1.\n"
 msgstr ""
 
-#: i386-tdep.c:3461 i386-tdep.c:3488
+#: i386-tdep.c:3655 i386-tdep.c:3682
 #, possible-c-format
 msgid "Process record: error reading memory at addr %s len = 4.\n"
 msgstr ""
 
-#: i386-tdep.c:3534 i386-tdep.c:3561
+#: i386-tdep.c:3728 i386-tdep.c:3755
 #, possible-c-format
 msgid "Process record: error reading memory at addr %s len = 2.\n"
 msgstr ""
 
-#: i386-tdep.c:3662 i386-tdep.c:4567 i386-tdep.c:5258 i386-tdep.c:5825
-#: i386-tdep.c:5882
+#: i386-tdep.c:3856 i386-tdep.c:4761 i386-tdep.c:5452 i386-tdep.c:6019
+#: i386-tdep.c:6076
 #, possible-c-format
 msgid ""
 "Process record ignores the memory change of instruction at address %s\n"
@@ -9693,206 +10195,130 @@
 "Do you want to stop the program?"
 msgstr ""
 
-#: i386-tdep.c:4588
+#: i386-tdep.c:4782
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 8.\n"
 msgstr ""
 
-#: i386-tdep.c:4601
+#: i386-tdep.c:4795
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 4.\n"
 msgstr ""
 
-#: i386-tdep.c:4614
+#: i386-tdep.c:4808
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 2.\n"
 msgstr ""
 
-#: i386-tdep.c:5593
+#: i386-tdep.c:5787
 #, possible-c-format
 msgid "Process record: error reading memory at addr 0x%s len = 1.\n"
 msgstr ""
 
 #. XXX
 #. int3
-#: i386-tdep.c:5605
+#: i386-tdep.c:5799
 msgid "Process record does not support instruction int3.\n"
 msgstr ""
 
-#: i386-tdep.c:5628
+#: i386-tdep.c:5822
 #, possible-c-format
 msgid "Process record does not support instruction int 0x%02x.\n"
 msgstr ""
 
 #. XXX
 #. into
-#: i386-tdep.c:5642
+#: i386-tdep.c:5836
 msgid "Process record does not support instruction into.\n"
 msgstr ""
 
 #. bound
-#: i386-tdep.c:5653
+#: i386-tdep.c:5847
 msgid "Process record does not support instruction bound.\n"
 msgstr ""
 
 #. wrmsr
-#: i386-tdep.c:5689
+#: i386-tdep.c:5883
 msgid "Process record does not support instruction wrmsr.\n"
 msgstr ""
 
 #. rdmsr
-#: i386-tdep.c:5696
+#: i386-tdep.c:5890
 msgid "Process record does not support instruction rdmsr.\n"
 msgstr ""
 
-#: i386-tdep.c:5717
+#: i386-tdep.c:5911
 msgid "Process record does not support instruction sysenter.\n"
 msgstr ""
 
 #. sysexit
-#: i386-tdep.c:5729
+#: i386-tdep.c:5923
 msgid "Process record does not support instruction sysexit.\n"
 msgstr ""
 
-#: i386-tdep.c:5740
+#: i386-tdep.c:5934
 msgid "Process record does not support instruction syscall.\n"
 msgstr ""
 
 #. sysret
-#: i386-tdep.c:5752
+#: i386-tdep.c:5946
 msgid "Process record does not support instruction sysret.\n"
 msgstr ""
 
 #. hlt
-#: i386-tdep.c:5766
+#: i386-tdep.c:5960
 msgid "Process record does not support instruction hlt.\n"
 msgstr ""
 
-#: i386-tdep.c:6902
+#: i386-tdep.c:7096
 #, possible-c-format
 msgid "Process record does not support instruction 0x%02x at address %s.\n"
 msgstr ""
 
-#: i386-tdep.c:6949
+#: i386-tdep.c:7164
 #, possible-c-format
 msgid ""
 "; instruction is only %d bytes long, need at least %d bytes for the jump"
 msgstr ""
 
-#: i386-tdep.c:7338
+#: i386-tdep.c:7560
 msgid "Set the disassembly flavor."
 msgstr ""
 
-#: i386-tdep.c:7339
+#: i386-tdep.c:7561
 msgid "Show the disassembly flavor."
 msgstr ""
 
-#: i386-tdep.c:7340
+#: i386-tdep.c:7562
 msgid ""
 "The valid values are \"att\" and \"intel\", and the default value is \"att\"."
 msgstr ""
 
-#: i386-tdep.c:7349
+#: i386-tdep.c:7571
 msgid "Set the convention for returning small structs."
 msgstr ""
 
-#: i386-tdep.c:7350
+#: i386-tdep.c:7572
 msgid "Show the convention for returning small structs."
 msgstr ""
 
-#: i386-tdep.c:7351
+#: i386-tdep.c:7573
 msgid ""
 "Valid values are \"default\", \"pcc\" and \"reg\", and the default value\n"
 "is \"default\"."
 msgstr ""
 
-#: i386bsd-nat.c:221
-msgid "Couldn't write XMM registers"
-msgstr ""
-
-#: i386bsd-nat.c:274
-msgid "Couldn't get debug registers"
-msgstr ""
-
-#: i386bsd-nat.c:285
-msgid "Couldn't write debug registers"
-msgstr ""
-
-#: i386bsd-nat.c:323
-msgid "Couldn't read debug registers"
-msgstr ""
-
-#: i386bsd-nat.c:373
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: i386bsd-nat.c:386
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: i386bsd-nat.c:399
-#, possible-c-format
-msgid ""
-"offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n"
-"Please report this to <bug-gdb@gnu.org>."
-msgstr ""
-
-#: i386gnu-nat.c:77 i386gnu-nat.c:185
-#, possible-c-format
-msgid "Couldn't fetch floating-point state from %s"
-msgstr ""
-
-#: i386gnu-nat.c:125
-#, possible-c-format
-msgid "Can't fetch registers from thread %s: No such thread"
-msgstr ""
-
-#: i386gnu-nat.c:136
-#, possible-c-format
-msgid "Couldn't fetch registers from %s"
-msgstr ""
-
-#: i386gnu-nat.c:198
-#, possible-c-format
-msgid "Couldn't store floating-point state into %s"
-msgstr ""
-
-#: i386gnu-nat.c:218
-#, possible-c-format
-msgid "Couldn't store registers into thread %s: No such thread"
-msgstr ""
-
-#: i386gnu-nat.c:235
-#, possible-c-format
-msgid "Couldn't store registers into %s"
-msgstr ""
-
-#: i386gnu-nat.c:256
-#, possible-c-format
-msgid "Register %s changed after the thread was aborted"
-msgstr ""
-
-#: i386gnu-nat.c:263
-msgid "... also writing this register!  Suspicious..."
-msgstr ""
-
-#: i387-tdep.c:323 m68k-tdep.c:218
+#: i387-tdep.c:322 m68k-tdep.c:216
 msgid ""
 "Cannot convert floating-point register value to non-floating-point type."
 msgstr ""
 
-#: i387-tdep.c:354 m68k-tdep.c:250
+#: i387-tdep.c:353 m68k-tdep.c:248
 msgid ""
 "Cannot convert non-floating-point type to floating-point register value."
 msgstr ""
 
-#: i387-tdep.c:1045 i387-tdep.c:1090
+#: i387-tdep.c:1044 i387-tdep.c:1089
 msgid "invalid i387 regclass"
 msgstr ""
 
@@ -9911,134 +10337,76 @@
 msgid "failed to write register value for %s."
 msgstr ""
 
-#: ia64-tdep.c:536
-msgid ""
-"Can't fetch instructions for slot numbers greater than 2.\n"
-"Using slot 0 instead"
-msgstr ""
-
-#: ia64-tdep.c:652 ia64-tdep.c:839
-msgid "Can't insert breakpoint for slot numbers greater than 2."
-msgstr ""
-
-#: ia64-tdep.c:685 ia64-tdep.c:867
-msgid "Can't insert breakpoint for non-existing slot X"
-msgstr ""
-
-#: ia64-tdep.c:723
-#, possible-c-format
-msgid "Address %s already contains a breakpoint."
-msgstr ""
-
-#: ia64-tdep.c:776
-#, possible-c-format
-msgid ""
-"Cannot remove breakpoint at address %s from non-existing X-type slot, memory "
-"has changed underneath"
-msgstr ""
-
-#: ia64-tdep.c:797
-#, possible-c-format
+#: ia64-tdep.c:535
 msgid ""
-"Cannot remove breakpoint at address %s, no break instruction at such address."
-msgstr ""
-
-#: inf-child.c:80 windows-nat.c:1923
-msgid "Use the \"run\" command to start a Unix child process."
-msgstr ""
-
-#: inf-loop.c:54
-msgid "error detected from target.\n"
-msgstr ""
-
-#: inf-loop.c:140
-msgid "completed.\n"
-msgstr ""
-
-#: inf-loop.c:162
-msgid "Event type not recognized.\n"
-msgstr ""
-
-#: inf-ptrace.c:236
-msgid "This system does not support attaching to a process"
-msgstr ""
-
-#: inf-ptrace.c:300
-msgid "This system does not support detaching from a process"
-msgstr ""
-
-#: inf-ptrace.c:407 rs6000-nat.c:549
-#, possible-c-format
-msgid "Child process unexpectedly missing: %s.\n"
-msgstr ""
-
-#: inf-ptrace.c:611 inf-ttrace.c:1244
-#, possible-c-format
-msgid "\tUsing the running image of %s %s.\n"
-msgstr ""
-
-#: inf-ttrace.c:465
-#, possible-c-format
-msgid "Attaching after fork to child process %ld.\n"
+"Can't fetch instructions for slot numbers greater than 2.\n"
+"Using slot 0 instead"
 msgstr ""
 
-#: inf-ttrace.c:475
-#, possible-c-format
-msgid "Detaching after fork from child process %ld.\n"
+#: ia64-tdep.c:651 ia64-tdep.c:838
+msgid "Can't insert breakpoint for slot numbers greater than 2."
 msgstr ""
 
-#: inf-ttrace.c:701
-msgid "TT_PROC_GET_FIRST_LWP_STATE ttrace call failed"
+#: ia64-tdep.c:684 ia64-tdep.c:866
+msgid "Can't insert breakpoint for non-existing slot X"
 msgstr ""
 
-#: inf-ttrace.c:722
-msgid "TT_PROC_GET_NEXT_LWP_STATE ttrace call failed"
+#: ia64-tdep.c:722
+#, possible-c-format
+msgid "Address %s already contains a breakpoint."
 msgstr ""
 
-#: inf-ttrace.c:1096 linux-nat.c:1302 procfs.c:3911 procfs.c:4049
+#: ia64-tdep.c:775
 #, possible-c-format
-msgid "[%s exited]\n"
+msgid ""
+"Cannot remove breakpoint at address %s from non-existing X-type slot, memory "
+"has changed underneath"
 msgstr ""
 
-#: inf-ttrace.c:1112
+#: ia64-tdep.c:796
 #, possible-c-format
-msgid "[%s has been terminated]\n"
+msgid ""
+"Cannot remove breakpoint at address %s, no break instruction at such address."
 msgstr ""
 
-#: infcall.c:81
+#: infcall.c:79
 #, possible-c-format
 msgid "Coercion of floats to doubles when calling functions is %s.\n"
 msgstr ""
 
-#: infcall.c:99
+#: infcall.c:97
 #, possible-c-format
 msgid ""
 "Unwinding of stack if a signal is received while in a call dummy is %s.\n"
 msgstr ""
 
-#: infcall.c:125
+#: infcall.c:123
 #, possible-c-format
 msgid ""
 "Unwind stack if a C++ exception is unhandled while in a call dummy is %s.\n"
 msgstr ""
 
-#: infcall.c:318
+#: infcall.c:316
 msgid "Invalid data type for function to be called."
 msgstr ""
 
-#: infcall.c:496
+#: infcall.c:492
 msgid "May not call functions while looking at trace frames."
 msgstr ""
 
-#: infcall.c:502
+#: infcall.c:495
+msgid "Cannot call functions in reverse mode."
+msgstr ""
+
+#: infcall.c:501
 msgid "This target does not support function calls."
 msgstr ""
 
-#: infcall.c:676
+#: infcall.c:675
 msgid "Too few arguments in function call."
 msgstr ""
 
-#: infcall.c:853
+#: infcall.c:852
 #, possible-c-format
 msgid ""
 "%s\n"
@@ -10051,7 +10419,7 @@
 #. We could discard the dummy frame here given that the program exited,
 #. but it will get garbage collected the next time the program is
 #. run anyway.
-#: infcall.c:881
+#: infcall.c:880
 #, possible-c-format
 msgid ""
 "The program being debugged exited while in a function called from GDB.\n"
@@ -10059,7 +10427,7 @@
 "(%s) will be abandoned."
 msgstr ""
 
-#: infcall.c:901
+#: infcall.c:900
 #, possible-c-format
 msgid ""
 "The program received a signal in another thread while\n"
@@ -10069,7 +10437,7 @@
 "When the function is done executing, GDB will silently stop."
 msgstr ""
 
-#: infcall.c:909
+#: infcall.c:908
 #, possible-c-format
 msgid ""
 "The program stopped in another thread while making a function call from "
@@ -10081,7 +10449,7 @@
 
 #. FIXME: Insert a bunch of wrap_here; name can be very
 #. long if it's a C++ name with arguments and stuff.
-#: infcall.c:942
+#: infcall.c:941
 #, possible-c-format
 msgid ""
 "The program being debugged was signaled while in a function called from "
@@ -10094,7 +10462,7 @@
 
 #. FIXME: Insert a bunch of wrap_here; name can be very
 #. long if it's a C++ name with arguments and stuff.
-#: infcall.c:960
+#: infcall.c:959
 #, possible-c-format
 msgid ""
 "The program being debugged was signaled while in a function called from "
@@ -10106,7 +10474,7 @@
 "When the function is done executing, GDB will silently stop."
 msgstr ""
 
-#: infcall.c:981
+#: infcall.c:980
 #, possible-c-format
 msgid ""
 "The program being debugged entered a std::terminate call, most likely\n"
@@ -10126,7 +10494,7 @@
 #. someday this will be implemented (it would not be easy).
 #. FIXME: Insert a bunch of wrap_here; name can be very long if it's
 #. a C++ name with arguments and stuff.
-#: infcall.c:1008
+#: infcall.c:1007
 #, possible-c-format
 msgid ""
 "The program being debugged stopped while in a function called from GDB.\n"
@@ -10136,19 +10504,19 @@
 msgstr ""
 
 #. The above code errors out, so ...
-#: infcall.c:1017
+#: infcall.c:1016
 msgid "... should not be here"
 msgstr ""
 
-#: infcall.c:1080
+#: infcall.c:1079
 msgid "Set coercion of floats to doubles when calling functions."
 msgstr ""
 
-#: infcall.c:1081
+#: infcall.c:1080
 msgid "Show coercion of floats to doubles when calling functions"
 msgstr ""
 
-#: infcall.c:1082
+#: infcall.c:1081
 msgid ""
 "Variables of type float should generally be converted to doubles before\n"
 "calling an unprototyped function, and left alone when calling a prototyped\n"
@@ -10159,16 +10527,16 @@
 "The default is to perform the conversion.\n"
 msgstr ""
 
-#: infcall.c:1095
+#: infcall.c:1094
 msgid "Set unwinding of stack if a signal is received while in a call dummy."
 msgstr ""
 
-#: infcall.c:1096
+#: infcall.c:1095
 msgid ""
 "Show unwinding of stack if a signal is received while in a call dummy."
 msgstr ""
 
-#: infcall.c:1097
+#: infcall.c:1096
 msgid ""
 "The unwindonsignal lets the user determine what gdb should do if a signal\n"
 "is received while in a function called from gdb (call dummy).  If set, gdb\n"
@@ -10177,17 +10545,17 @@
 "The default is to stop in the frame where the signal was received."
 msgstr ""
 
-#: infcall.c:1107
+#: infcall.c:1106
 msgid ""
 "Set unwinding of stack if std::terminate is called while in call dummy."
 msgstr ""
 
-#: infcall.c:1108
+#: infcall.c:1107
 msgid ""
 "Show unwinding of stack if std::terminate() is called while in a call dummy."
 msgstr ""
 
-#: infcall.c:1110
+#: infcall.c:1109
 msgid ""
 "The unwind on terminating exception flag lets the user determine\n"
 "what gdb should do if a std::terminate() call is made from the\n"
@@ -10197,281 +10565,287 @@
 "The default is to unwind the frame."
 msgstr ""
 
-#: infcmd.c:127 infcmd.c:2234 infcmd.c:2619 remote-sim.c:886
+#: inf-child.c:79 windows-nat.c:1907
+msgid "Use the \"run\" command to start a Unix child process."
+msgstr ""
+
+#: infcmd.c:128 infcmd.c:2286 infcmd.c:2674 linux-fork.c:658 remote-sim.c:888
 msgid "The program is not being run."
 msgstr ""
 
-#: infcmd.c:206
+#: infcmd.c:207
 #, possible-c-format
 msgid "Terminal for future runs of program being debugged is \"%s\".\n"
 msgstr ""
 
-#: infcmd.c:342
+#: infcmd.c:343
 msgid "can't handle command-line argument containing whitespace"
 msgstr ""
 
-#: infcmd.c:479
+#: infcmd.c:442
+msgid ""
+"platform-specific solib_create_inferior_hook did not load initial shared "
+"libraries."
+msgstr ""
+
+#: infcmd.c:488
 msgid ""
 "The program being debugged has been started already.\n"
 "Start it from the beginning? "
 msgstr ""
 
-#: infcmd.c:481
+#: infcmd.c:490
 msgid "Program not restarted."
 msgstr ""
 
-#: infcmd.c:525
+#: infcmd.c:535
 msgid "The target does not support running in non-stop mode."
 msgstr ""
 
-#: infcmd.c:547 infcmd.c:720 infcmd.c:863 infcmd.c:1092 infcmd.c:1196
-#: infcmd.c:1332 infcmd.c:1368 infcmd.c:1642 infcmd.c:2463
+#: infcmd.c:557 infcmd.c:730 infcmd.c:873 infcmd.c:1113 infcmd.c:1217
+#: infcmd.c:1366 infcmd.c:1402 infcmd.c:1698 infcmd.c:2518
 msgid "Asynchronous execution not supported on this target."
 msgstr ""
 
-#: infcmd.c:630
+#: infcmd.c:640
 msgid "No symbol table loaded.  Use the \"file\" command."
 msgstr ""
 
-#: infcmd.c:662
+#: infcmd.c:672
 msgid "Cannot execute this command without a live selected thread."
 msgstr ""
 
-#: infcmd.c:673
+#: infcmd.c:683
 msgid "Cannot execute this command while looking at trace frames."
 msgstr ""
 
-#: infcmd.c:742
+#: infcmd.c:752
 msgid "`-a' is meaningless in all-stop mode."
 msgstr ""
 
-#: infcmd.c:745
+#: infcmd.c:755
 msgid "Can't resume all threads and specify proceed count simultaneously."
 msgstr ""
 
-#: infcmd.c:791
+#: infcmd.c:801
 msgid "Continuing.\n"
 msgstr ""
 
-#: infcmd.c:1023
+#: infcmd.c:1044
 msgid "Cannot find bounds of current function"
 msgstr ""
 
-#: infcmd.c:1026
+#: infcmd.c:1047
 #, possible-c-format
 msgid ""
 "Single stepping until exit from function %s,\n"
 "which has no line number information.\n"
 msgstr ""
 
-#: infcmd.c:1095
+#: infcmd.c:1116
 msgid "starting address"
 msgstr ""
 
-#: infcmd.c:1100
+#: infcmd.c:1121
 msgid "Unreasonable jump request"
 msgstr ""
 
-#: infcmd.c:1107
+#: infcmd.c:1128
 msgid "No source file has been specified."
 msgstr ""
 
-#: infcmd.c:1116
+#: infcmd.c:1137
 #, possible-c-format
 msgid "Line %d is not in `%s'.  Jump anyway? "
 msgstr ""
 
-#: infcmd.c:1130
+#: infcmd.c:1151
 msgid "WARNING!!!  Destination is in unmapped overlay!  Jump anyway? "
 msgstr ""
 
-#: infcmd.c:1143
+#: infcmd.c:1164
 msgid "Continuing at "
 msgstr ""
 
-#: infcmd.c:1166
+#: infcmd.c:1187
 msgid "Usage: go <location>\n"
 msgstr ""
 
-#: infcmd.c:1207
+#: infcmd.c:1228
 msgid "signal number"
 msgstr ""
 
-#: infcmd.c:1228
+#: infcmd.c:1249
 msgid "Continuing with no signal.\n"
 msgstr ""
 
-#: infcmd.c:1230
+#: infcmd.c:1251
 #, possible-c-format
 msgid "Continuing with signal %s.\n"
 msgstr ""
 
-#: infcmd.c:1284
+#: infcmd.c:1313
 msgid "Execution is not within a known function."
 msgstr ""
 
-#: infcmd.c:1359
+#: infcmd.c:1393
 msgid "a location"
 msgstr ""
 
-#: infcmd.c:1482
+#: infcmd.c:1546
 msgid "finish_command: function has no target type"
 msgstr ""
 
-#: infcmd.c:1531
+#: infcmd.c:1595
 msgid "Finish: couldn't find function."
 msgstr ""
 
-#: infcmd.c:1646
-msgid "Asynchronous 'finish' not supported in reverse."
-msgstr ""
-
-#: infcmd.c:1657
+#: infcmd.c:1709
 msgid "The \"finish\" command does not take any arguments."
 msgstr ""
 
 #. Finishing from an inline frame is completely different.  We don't
 #. try to show the "return value" - no way to locate it.  So we do
 #. not need a completion.
-#: infcmd.c:1659 infcmd.c:1668
+#: infcmd.c:1711 infcmd.c:1720
 msgid "No selected frame."
 msgstr ""
 
-#: infcmd.c:1661
+#: infcmd.c:1713
 msgid "\"finish\" not meaningful in the outermost frame."
 msgstr ""
 
-#: infcmd.c:1689 infcmd.c:1708
+#: infcmd.c:1741 infcmd.c:1760
 msgid "Run till exit from "
 msgstr ""
 
-#: infcmd.c:1706
+#: infcmd.c:1758
 msgid "Run back to call of "
 msgstr ""
 
-#: infcmd.c:1730
+#: infcmd.c:1782
 msgid "The program being debugged is not being run.\n"
 msgstr ""
 
-#: infcmd.c:1746
+#: infcmd.c:1798 infrun.c:6500
 msgid "Selected thread is running."
 msgstr ""
 
-#: infcmd.c:1753
+#: infcmd.c:1805
 #, possible-c-format
 msgid "Program stopped at %s.\n"
 msgstr ""
 
-#: infcmd.c:1756
+#: infcmd.c:1808
 msgid "It stopped after being stepped.\n"
 msgstr ""
 
-#: infcmd.c:1765
+#: infcmd.c:1817
 msgid "It stopped at a breakpoint that has since been deleted.\n"
 msgstr ""
 
-#: infcmd.c:1769
+#: infcmd.c:1821
 #, possible-c-format
 msgid "It stopped at breakpoint %d.\n"
 msgstr ""
 
-#: infcmd.c:1775
+#: infcmd.c:1827
 #, possible-c-format
 msgid "It stopped with signal %s, %s.\n"
 msgstr ""
 
-#: infcmd.c:1782
+#: infcmd.c:1834
 msgid "Type \"info stack\" or \"info registers\" for more information.\n"
 msgstr ""
 
-#: infcmd.c:1827
+#: infcmd.c:1879
 msgid "environment variable and value"
 msgstr ""
 
-#: infcmd.c:1851
+#: infcmd.c:1903
 msgid "environment variable to set"
 msgstr ""
 
-#: infcmd.c:1873
+#: infcmd.c:1925
 #, possible-c-format
 msgid "Setting environment variable \"%s\" to null value.\n"
 msgstr ""
 
 #. If there is no argument, delete all environment variables.
 #. Ask for confirmation if reading from the terminal.
-#: infcmd.c:1890
+#: infcmd.c:1942
 msgid "Delete all environment variables? "
 msgstr ""
 
-#: infcmd.c:2068 infcmd.c:2219 infcmd.c:2739
+#: infcmd.c:2120 infcmd.c:2271 infcmd.c:2795
 msgid "The program has no registers now."
 msgstr ""
 
-#: infcmd.c:2096
+#: infcmd.c:2148
 msgid "Missing register name"
 msgstr ""
 
 #. Nothing matched.
-#: infcmd.c:2170
+#: infcmd.c:2222
 #, possible-c-format
 msgid "Invalid register `%.*s'"
 msgstr ""
 
-#: infcmd.c:2235
+#: infcmd.c:2287
 msgid "Kill the program being debugged? "
 msgstr ""
 
-#: infcmd.c:2249
+#: infcmd.c:2301
 #, possible-c-format
 msgid "In %s,\n"
 msgstr ""
 
-#: infcmd.c:2443 target.c:2428
+#: infcmd.c:2498 target.c:2522
 msgid "A program is being debugged already.  Kill it? "
 msgstr ""
 
-#: infcmd.c:2446
+#: infcmd.c:2501
 msgid "Not killed."
 msgstr ""
 
-#: infcmd.c:2454
+#: infcmd.c:2509
 msgid "Cannot attach to this target in non-stop mode"
 msgstr ""
 
-#: infcmd.c:2699
+#: infcmd.c:2755
 msgid "-a is meaningless in all-stop mode."
 msgstr ""
 
-#: infcmd.c:2747
+#: infcmd.c:2803
 msgid "\"unset\" must be followed by the name of an unset subcommand.\n"
 msgstr ""
 
-#: infcmd.c:2759
+#: infcmd.c:2815
 msgid "Set terminal for future runs of program being debugged."
 msgstr ""
 
-#: infcmd.c:2760
+#: infcmd.c:2816
 msgid "Show terminal for future runs of program being debugged."
 msgstr ""
 
-#: infcmd.c:2761
+#: infcmd.c:2817
 msgid "Usage: set inferior-tty /dev/pts/1"
 msgstr ""
 
-#: infcmd.c:2769
+#: infcmd.c:2825
 msgid "Set argument list to give program being debugged when it is started."
 msgstr ""
 
-#: infcmd.c:2770
+#: infcmd.c:2826
 msgid "Show argument list to give program being debugged when it is started."
 msgstr ""
 
-#: infcmd.c:2771
+#: infcmd.c:2827
 msgid ""
 "Follow this command with any number of args, to be passed to the program."
 msgstr ""
 
-#: infcmd.c:2777
+#: infcmd.c:2833
 msgid ""
 "The environment to give the program, or one variable's value.\n"
 "With an argument VAR, prints the value of environment variable VAR to\n"
@@ -10479,17 +10853,17 @@
 "environment to be given to the program."
 msgstr ""
 
-#: infcmd.c:2785
+#: infcmd.c:2841
 msgid "Complement to certain \"set\" commands."
 msgstr ""
 
-#: infcmd.c:2788
+#: infcmd.c:2844
 msgid ""
 "Cancel environment variable VAR for the program.\n"
 "This does not affect the program until the next \"run\" command."
 msgstr ""
 
-#: infcmd.c:2794
+#: infcmd.c:2850
 msgid ""
 "Set environment variable value to give the program.\n"
 "Arguments are VAR VALUE where VAR is variable name and VALUE is value.\n"
@@ -10497,7 +10871,7 @@
 "This does not affect the program until the next \"run\" command."
 msgstr ""
 
-#: infcmd.c:2802
+#: infcmd.c:2858
 msgid ""
 "Add directory DIR(s) to beginning of search path for object files.\n"
 "$cwd in the path means the current working directory.\n"
@@ -10506,7 +10880,7 @@
 "fully linked executable files and separately compiled object files as needed."
 msgstr ""
 
-#: infcmd.c:2811
+#: infcmd.c:2867
 msgid ""
 "Current search path for finding object files.\n"
 "$cwd in the path means the current working directory.\n"
@@ -10515,11 +10889,11 @@
 "fully linked executable files and separately compiled object files as needed."
 msgstr ""
 
-#: infcmd.c:2822
+#: infcmd.c:2878
 msgid "Kill execution of program being debugged."
 msgstr ""
 
-#: infcmd.c:2825
+#: infcmd.c:2881
 msgid ""
 "Attach to a process or file outside of GDB.\n"
 "This command attaches to another target, of the same type as your last\n"
@@ -10534,45 +10908,45 @@
 "to specify the program, and to load its symbol table."
 msgstr ""
 
-#: infcmd.c:2838
+#: infcmd.c:2894
 msgid ""
 "Detach a process or file previously attached.\n"
 "If a process, it is no longer traced, and it continues its execution.  If\n"
 "you were debugging a file, the file is closed and gdb no longer accesses it."
 msgstr ""
 
-#: infcmd.c:2844
+#: infcmd.c:2900
 msgid ""
 "Disconnect from a target.\n"
 "The target will wait for another debugger to connect.  Not available for\n"
 "all targets."
 msgstr ""
 
-#: infcmd.c:2849
+#: infcmd.c:2905
 msgid ""
 "Continue program giving it signal specified by the argument.\n"
 "An argument of \"0\" means continue program without giving it a signal."
 msgstr ""
 
-#: infcmd.c:2853
+#: infcmd.c:2909
 msgid ""
 "Step one instruction exactly.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2859
+#: infcmd.c:2915
 msgid ""
 "Step one instruction, but proceed through subroutine calls.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2865
+#: infcmd.c:2921
 msgid ""
 "Execute until selected stack frame returns.\n"
 "Upon return, the value returned is printed and put in the value history."
 msgstr ""
 
-#: infcmd.c:2870
+#: infcmd.c:2926
 msgid ""
 "Step program, proceeding through subroutine calls.\n"
 "Like the \"step\" command as long as subroutine calls do not happen;\n"
@@ -10580,34 +10954,34 @@
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2880
+#: infcmd.c:2936
 msgid ""
 "Step program until it reaches a different source line.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: infcmd.c:2886
+#: infcmd.c:2942
 msgid ""
 "Execute until the program reaches a source line greater than the current\n"
 "or a specified location (same args as break command) within the current "
 "frame."
 msgstr ""
 
-#: infcmd.c:2893
+#: infcmd.c:2949
 msgid ""
 "Continue the program up to the given location (same form as args for break "
 "command).\n"
 "Execution will also stop upon exit from the current stack frame."
 msgstr ""
 
-#: infcmd.c:2899
+#: infcmd.c:2955
 msgid ""
 "Continue program being debugged at specified line or address.\n"
 "Give as argument either LINENUM or *ADDR, where ADDR is an expression\n"
 "for an address to start at."
 msgstr ""
 
-#: infcmd.c:2907
+#: infcmd.c:2963
 msgid ""
 "Usage: go <location>\n"
 "Continue program being debugged, stopping at specified line or \n"
@@ -10617,7 +10991,7 @@
 "This command is a combination of tbreak and jump."
 msgstr ""
 
-#: infcmd.c:2920
+#: infcmd.c:2976
 msgid ""
 "Continue program being debugged, after signal or breakpoint.\n"
 "If proceeding from breakpoint, a number N may be used as an argument,\n"
@@ -10630,7 +11004,7 @@
 "Specifying -a and an ignore count simultaneously is an error."
 msgstr ""
 
-#: infcmd.c:2933
+#: infcmd.c:2989
 msgid ""
 "Start debugged program.  You may specify arguments to give it.\n"
 "Args may include \"*\", or \"[...]\"; they are expanded using \"sh\".\n"
@@ -10642,18 +11016,18 @@
 "use \"set args\" without arguments."
 msgstr ""
 
-#: infcmd.c:2946
+#: infcmd.c:3002
 msgid "Start debugged program with no arguments."
 msgstr ""
 
-#: infcmd.c:2948
+#: infcmd.c:3004
 msgid ""
 "Run the debugged program until the beginning of the main procedure.\n"
 "You may specify arguments to give to your program, just as with the\n"
 "\"run\" command."
 msgstr ""
 
-#: infcmd.c:2955
+#: infcmd.c:3011
 msgid ""
 "Interrupt the execution of the debugged program.\n"
 "If non-stop mode is enabled, interrupt only the current thread,\n"
@@ -10661,143 +11035,143 @@
 "interrupt all running threads in non-stop mode, use the -a option."
 msgstr ""
 
-#: infcmd.c:2960 infcmd.c:2966
+#: infcmd.c:3016 infcmd.c:3022
 msgid ""
 "List of integer registers and their contents, for selected stack frame.\n"
 "Register name as argument means describe only that register."
 msgstr ""
 
-#: infcmd.c:2969
+#: infcmd.c:3025
 msgid ""
 "List of all registers and their contents, for selected stack frame.\n"
 "Register name as argument means describe only that register."
 msgstr ""
 
-#: infcmd.c:2974
+#: infcmd.c:3030
 msgid "Execution status of the program."
 msgstr ""
 
-#: infcmd.c:2977
+#: infcmd.c:3033
 msgid "Print the status of the floating point unit\n"
 msgstr ""
 
-#: infcmd.c:2980
+#: infcmd.c:3036
 msgid "Print the status of the vector unit\n"
 msgstr ""
 
-#: inferior.c:153
+#: inferior.c:154
 #, possible-c-format
 msgid "[New inferior %d]\n"
 msgstr ""
 
-#: inferior.c:240 inferior.c:296
+#: inferior.c:241 inferior.c:297
 #, possible-c-format
 msgid "[Inferior %d exited]\n"
 msgstr ""
 
-#: inferior.c:323
+#: inferior.c:324
 #, possible-c-format
 msgid "[Inferior %d detached]\n"
 msgstr ""
 
-#: inferior.c:597
+#: inferior.c:598
 msgid ""
 "\n"
 "\tis vfork child of inferior "
 msgstr ""
 
-#: inferior.c:602
+#: inferior.c:603
 msgid ""
 "\n"
 "\tis vfork parent of inferior "
 msgstr ""
 
-#: inferior.c:621
+#: inferior.c:622
 msgid "Requires argument (inferior id(s) to detach)"
 msgstr ""
 
-#: inferior.c:630 inferior.c:666 inferior.c:697 inferior.c:770 inferior.c:914
+#: inferior.c:631 inferior.c:667 inferior.c:698 inferior.c:771 inferior.c:915
 #, possible-c-format
 msgid "Inferior ID %d not known."
 msgstr ""
 
-#: inferior.c:639 inferior.c:675
+#: inferior.c:640 inferior.c:676
 #, possible-c-format
 msgid "Inferior ID %d has no threads."
 msgstr ""
 
-#: inferior.c:657
+#: inferior.c:658
 msgid "Requires argument (inferior id(s) to kill)"
 msgstr ""
 
-#: inferior.c:699
+#: inferior.c:700
 #, possible-c-format
 msgid "[Switching to inferior %d [%s] (%s)]\n"
 msgstr ""
 
-#: inferior.c:704
+#: inferior.c:705
 msgid "<noexec>"
 msgstr ""
 
-#: inferior.c:714 mi/mi-main.c:374
+#: inferior.c:715 mi/mi-main.c:372
 msgid "Inferior has no threads."
 msgstr ""
 
-#: inferior.c:719
+#: inferior.c:720
 #, possible-c-format
 msgid "[Switching to thread %d (%s)] "
 msgstr ""
 
-#: inferior.c:760
+#: inferior.c:761
 msgid "Requires an argument (inferior id(s) to remove)"
 msgstr ""
 
-#: inferior.c:776
+#: inferior.c:777
 #, possible-c-format
 msgid "Can not remove current symbol inferior %d."
 msgstr ""
 
-#: inferior.c:782
+#: inferior.c:783
 #, possible-c-format
 msgid "Can not remove active inferior %d."
 msgstr ""
 
-#: inferior.c:832 inferior.c:895
+#: inferior.c:833 inferior.c:896
 msgid "No argument to -copies"
 msgstr ""
 
-#: inferior.c:839
+#: inferior.c:840
 msgid "No argument to -exec"
 msgstr ""
 
-#: inferior.c:844 inferior.c:918
+#: inferior.c:845 inferior.c:919
 msgid "Invalid argument"
 msgstr ""
 
-#: inferior.c:854
+#: inferior.c:855
 #, possible-c-format
 msgid "Added inferior %d\n"
 msgstr ""
 
-#: inferior.c:899
+#: inferior.c:900
 msgid "Invalid copies number"
 msgstr ""
 
-#: inferior.c:945
+#: inferior.c:946
 #, possible-c-format
 msgid "Added inferior %d.\n"
 msgstr ""
 
-#: inferior.c:960
+#: inferior.c:961
 #, possible-c-format
 msgid "Printing of inferior events is %s.\n"
 msgstr ""
 
-#: inferior.c:1078
+#: inferior.c:1079
 msgid "IDs of specified inferiors (all inferiors if no argument)."
 msgstr ""
 
-#: inferior.c:1080
+#: inferior.c:1081
 msgid ""
 "Add a new inferior.\n"
 "Usage: add-inferior [-copies <N>] [-exec <FILENAME>]\n"
@@ -10806,13 +11180,13 @@
 "as main program."
 msgstr ""
 
-#: inferior.c:1087
+#: inferior.c:1088
 msgid ""
 "Remove inferior ID (or list of IDs).\n"
 "Usage: remove-inferiors ID..."
 msgstr ""
 
-#: inferior.c:1091
+#: inferior.c:1092
 msgid ""
 "Clone inferior ID.\n"
 "Usage: clone-inferior [-copies <N>] [ID]\n"
@@ -10822,61 +11196,65 @@
 "that is cloned."
 msgstr ""
 
-#: inferior.c:1099
+#: inferior.c:1100
 msgid "Detach from inferior ID (or list of IDS)."
 msgstr ""
 
-#: inferior.c:1103
+#: inferior.c:1104
 msgid "Kill inferior ID (or list of IDs)."
 msgstr ""
 
-#: inferior.c:1107
+#: inferior.c:1108
 msgid ""
 "Use this command to switch between inferiors.\n"
 "The new inferior ID must be currently known."
 msgstr ""
 
-#: inferior.c:1113
+#: inferior.c:1114
 msgid "Set printing of inferior events (e.g., inferior start and exit)."
 msgstr ""
 
-#: inferior.c:1114
+#: inferior.c:1115
 msgid "Show printing of inferior events (e.g., inferior start and exit)."
 msgstr ""
 
-#: inflow.c:575
+#: inf-loop.c:137
+msgid "Event type not recognized.\n"
+msgstr ""
+
+#: inflow.c:573
 msgid "This GDB does not control a terminal.\n"
 msgstr ""
 
-#: inflow.c:585
+#: inflow.c:583
 msgid "Inferior's terminal status (currently saved by GDB):\n"
 msgstr ""
 
 #. Mention GDB in warning because it will appear in the inferior's
 #. terminal instead of GDB's.
-#: inflow.c:733
+#: inflow.c:731
 #, possible-c-format
 msgid "GDB: Failed to set controlling terminal: %s"
 msgstr ""
 
-#: inflow.c:822
+#: inflow.c:820
 #, possible-c-format
 msgid "Failed to create new terminal session: setsid: %s"
 msgstr ""
 
-#: inflow.c:884
+#: inflow.c:882
 msgid "Print inferior's saved terminal status."
 msgstr ""
 
-#: inflow.c:887
+#: inflow.c:885
 msgid "Set whether GDB's standard input is a terminal."
 msgstr ""
 
-#: inflow.c:888
+#: inflow.c:886
 msgid "Show whether GDB's standard input is a terminal."
 msgstr ""
 
-#: inflow.c:889
+#: inflow.c:887
 msgid ""
 "If on, GDB assumes that standard input is a terminal.  In practice, it\n"
 "means that GDB should wait for the user to answer queries associated to\n"
@@ -10886,60 +11264,78 @@
 "input settings."
 msgstr ""
 
-#: infrun.c:120
+#: inf-ptrace.c:235
+msgid "This system does not support attaching to a process"
+msgstr ""
+
+#: inf-ptrace.c:299
+msgid "This system does not support detaching from a process"
+msgstr ""
+
+#: inf-ptrace.c:406 rs6000-nat.c:548
+#, possible-c-format
+msgid "Child process unexpectedly missing: %s.\n"
+msgstr ""
+
+#: inf-ptrace.c:610 inf-ttrace.c:1243
+#, possible-c-format
+msgid "\tUsing the running image of %s %s.\n"
+msgstr ""
+
+#: infrun.c:117
 #, possible-c-format
 msgid "Mode of the step operation is %s.\n"
 msgstr ""
 
-#: infrun.c:141
+#: infrun.c:138
 #, possible-c-format
 msgid "Displace stepping debugging is %s.\n"
 msgstr ""
 
-#: infrun.c:149
+#: infrun.c:146
 #, possible-c-format
 msgid "Inferior debugging is %s.\n"
 msgstr ""
 
-#: infrun.c:163
+#: infrun.c:160
 #, possible-c-format
 msgid "Disabling randomization of debuggee's virtual address space is %s.\n"
 msgstr ""
 
-#: infrun.c:167
+#: infrun.c:164
 msgid ""
 "Disabling randomization of debuggee's virtual address space is unsupported "
 "on\n"
 "this platform.\n"
 msgstr ""
 
-#: infrun.c:177
+#: infrun.c:174
 msgid ""
 "Disabling randomization of debuggee's virtual address space is unsupported "
 "on\n"
 "this platform."
 msgstr ""
 
-#: infrun.c:252 infrun.c:6932 target.c:4108 target.c:4156
+#: infrun.c:249 infrun.c:7038 target.c:4273 target.c:4321
 msgid "Cannot change this setting while the inferior is running."
 msgstr ""
 
-#: infrun.c:278 infrun.c:308
+#: infrun.c:275 infrun.c:305
 #, possible-c-format
 msgid "Observer mode is now %s.\n"
 msgstr ""
 
-#: infrun.c:286
+#: infrun.c:283
 #, possible-c-format
 msgid "Observer mode is %s.\n"
 msgstr ""
 
-#: infrun.c:360
+#: infrun.c:357
 #, possible-c-format
 msgid "Stopping for shared library events is %s.\n"
 msgstr ""
 
-#: infrun.c:407
+#: infrun.c:404
 #, possible-c-format
 msgid "Debugger response to a program call of fork or vfork is \"%s\".\n"
 msgstr ""
@@ -10950,164 +11346,180 @@
 #. forked.  In that case, the resume command
 #. issued is most likely not applicable to the
 #. child, so just warn, and refuse to resume.
-#: infrun.c:548
+#: infrun.c:545
 msgid "Not resuming: switched threads before following fork child.\n"
 msgstr ""
 
-#: infrun.c:796
+#: infrun.c:793
 #, possible-c-format
 msgid "Follow exec mode is \"%s\".\n"
 msgstr ""
 
 #. What is this a.out's name?
-#: infrun.c:848
+#: infrun.c:845
 #, possible-c-format
 msgid "%s is executing new program: %s\n"
 msgstr ""
 
-#: infrun.c:1207
+#: infrun.c:1204
 #, possible-c-format
 msgid ""
 "Debugger's willingness to use displaced stepping to step over breakpoints is "
 "%s (currently %s).\n"
 msgstr ""
 
-#: infrun.c:1212
+#: infrun.c:1209
 #, possible-c-format
 msgid ""
 "Debugger's willingness to use displaced stepping to step over breakpoints is "
 "%s.\n"
 msgstr ""
 
-#: infrun.c:1590
+#: infrun.c:1594
 #, possible-c-format
 msgid "Mode for locking scheduler during execution is \"%s\".\n"
 msgstr ""
 
-#: infrun.c:1601
+#: infrun.c:1605
 #, possible-c-format
 msgid "Target '%s' cannot support this command."
 msgstr ""
 
-#: infrun.c:1690
+#: infrun.c:1735
 msgid ""
 "The program is stopped at a permanent breakpoint, but GDB does not know\n"
 "how to step past a permanent breakpoint on this architecture.  Try using\n"
 "a command like `return' or `jump' to continue execution."
 msgstr ""
 
-#: infrun.c:2629
+#: infrun.c:2654
 msgid "Program exited while detaching"
 msgstr ""
 
-#: infrun.c:3020
+#: infrun.c:2839
+msgid "completed.\n"
+msgstr ""
+
+#: infrun.c:3031
 msgid "Cannot execute this command while the selected thread is running."
 msgstr ""
 
-#: infrun.c:3840
+#: infrun.c:3966
 msgid "Cannot step over breakpoint hit in wrong thread"
 msgstr ""
 
-#: infrun.c:5725 linux-fork.c:375 linux-fork.c:407
+#: infrun.c:5882 linux-fork.c:374 linux-fork.c:406
 #, possible-c-format
 msgid "[Switching to %s]\n"
 msgstr ""
 
-#: infrun.c:5736
+#: infrun.c:5893
+msgid "No unwaited-for children left.\n"
+msgstr ""
+
+#: infrun.c:5901
 msgid ""
 "Cannot remove breakpoints because program is no longer writable.\n"
 "Further execution is probably impossible.\n"
 msgstr ""
 
-#: infrun.c:5847
+#: infrun.c:6001
 msgid "Unknown value."
 msgstr ""
 
-#: infrun.c:6016
+#: infrun.c:6172
 msgid "Signal        Stop\tPrint\tPass to program\tDescription\n"
 msgstr ""
 
-#: infrun.c:6053
+#: infrun.c:6209
 msgid "signal to handle"
 msgstr ""
 
 #. Not a number and not a recognized flag word => complain.
-#: infrun.c:6156
+#: infrun.c:6312
 #, possible-c-format
 msgid "Unrecognized or ambiguous flag word: \"%s\"."
 msgstr ""
 
-#: infrun.c:6171
+#: infrun.c:6327
 #, possible-c-format
 msgid ""
 "%s is used by the debugger.\n"
 "Are you sure you want to change it? "
 msgstr ""
 
-#: infrun.c:6179
+#: infrun.c:6335
 msgid "Not confirmed, unchanged.\n"
 msgstr ""
 
-#: infrun.c:6226
+#: infrun.c:6382
 msgid "xdb command"
 msgstr ""
 
-#: infrun.c:6277
+#: infrun.c:6433
 msgid "Invalid signal handling flag.\n"
 msgstr ""
 
-#: infrun.c:6324
+#: infrun.c:6480
 msgid ""
 "\n"
 "Use the \"handle\" command to change these tables.\n"
 msgstr ""
 
-#: infrun.c:6354
+#: infrun.c:6492
+msgid "No thread selected."
+msgstr ""
+
+#: infrun.c:6496
+msgid "The current thread has terminated"
+msgstr ""
+
+#: infrun.c:6531
 msgid "Unable to read siginfo"
 msgstr ""
 
-#: infrun.c:6373
+#: infrun.c:6552
 msgid "Unable to write siginfo"
 msgstr ""
 
-#: infrun.c:6601
+#: infrun.c:6780
 msgid "Unable to restore previously selected frame."
 msgstr ""
 
-#: infrun.c:6897
+#: infrun.c:7005
 msgid "Target does not support this operation."
 msgstr ""
 
-#: infrun.c:6907
+#: infrun.c:7015
 msgid "Forward.\n"
 msgstr ""
 
-#: infrun.c:6910
+#: infrun.c:7018
 msgid "Reverse.\n"
 msgstr ""
 
-#: infrun.c:6914
+#: infrun.c:7022
 #, possible-c-format
-msgid "Forward (target `%s' does not support exec-direction).\n"
+msgid "bogus execution_direction value: %d"
 msgstr ""
 
-#: infrun.c:6943
+#: infrun.c:7049
 #, possible-c-format
 msgid "Controlling the inferior in non-stop mode is %s.\n"
 msgstr ""
 
-#: infrun.c:6951
+#: infrun.c:7057
 #, possible-c-format
 msgid "Resuming the execution of threads of all processes is %s.\n"
 msgstr ""
 
-#: infrun.c:6961 infrun.c:6983
+#: infrun.c:7067 infrun.c:7089
 msgid ""
 "What debugger does when program gets various signals.\n"
 "Specify a signal as argument to print info on that signal only."
 msgstr ""
 
-#: infrun.c:6966
+#: infrun.c:7072
 msgid ""
 "Specify how to handle a signal.\n"
 "Args are signals and actions to apply to those signals.\n"
@@ -11125,7 +11537,7 @@
 "Pass and Stop may be combined."
 msgstr ""
 
-#: infrun.c:6986
+#: infrun.c:7092
 msgid ""
 "Specify how to handle a signal.\n"
 "Args are signals and actions to apply to those signals.\n"
@@ -11144,46 +11556,46 @@
 "Pass and Stop may be combined."
 msgstr ""
 
-#: infrun.c:7006
+#: infrun.c:7112
 msgid ""
 "There is no `stop' command, but you can set a hook on `stop'.\n"
 "This allows you to set a list of commands to be run each time execution\n"
 "of the program stops."
 msgstr ""
 
-#: infrun.c:7011
+#: infrun.c:7117
 msgid "Set inferior debugging."
 msgstr ""
 
-#: infrun.c:7012
+#: infrun.c:7118
 msgid "Show inferior debugging."
 msgstr ""
 
-#: infrun.c:7013
+#: infrun.c:7119
 msgid "When non-zero, inferior specific debugging is enabled."
 msgstr ""
 
-#: infrun.c:7020
+#: infrun.c:7126
 msgid "Set displaced stepping debugging."
 msgstr ""
 
-#: infrun.c:7021
+#: infrun.c:7127
 msgid "Show displaced stepping debugging."
 msgstr ""
 
-#: infrun.c:7022
+#: infrun.c:7128
 msgid "When non-zero, displaced stepping specific debugging is enabled."
 msgstr ""
 
-#: infrun.c:7029
+#: infrun.c:7135
 msgid "Set whether gdb controls the inferior in non-stop mode."
 msgstr ""
 
-#: infrun.c:7030
+#: infrun.c:7136
 msgid "Show whether gdb controls the inferior in non-stop mode."
 msgstr ""
 
-#: infrun.c:7031
+#: infrun.c:7137
 msgid ""
 "When debugging a multi-threaded program and this setting is\n"
 "off (the default, also called all-stop mode), when one thread stops\n"
@@ -11198,30 +11610,30 @@
 "leave it stopped or free to run as needed."
 msgstr ""
 
-#: infrun.c:7103
+#: infrun.c:7209
 msgid "Set stopping for shared library events."
 msgstr ""
 
-#: infrun.c:7104
+#: infrun.c:7210
 msgid "Show stopping for shared library events."
 msgstr ""
 
-#: infrun.c:7105
+#: infrun.c:7211
 msgid ""
 "If nonzero, gdb will give control to the user when the dynamic linker\n"
 "notifies gdb of shared library events.  The most common event of interest\n"
 "to the user would be loading/unloading of a new library."
 msgstr ""
 
-#: infrun.c:7115
+#: infrun.c:7221
 msgid "Set debugger response to a program call of fork or vfork."
 msgstr ""
 
-#: infrun.c:7116
+#: infrun.c:7222
 msgid "Show debugger response to a program call of fork or vfork."
 msgstr ""
 
-#: infrun.c:7117
+#: infrun.c:7223
 msgid ""
 "A fork or vfork creates a new process.  follow-fork-mode can be:\n"
 "  parent  - the original process is debugged after a fork\n"
@@ -11230,15 +11642,15 @@
 "By default, the debugger will follow the parent process."
 msgstr ""
 
-#: infrun.c:7129
+#: infrun.c:7235
 msgid "Set debugger response to a program call of exec."
 msgstr ""
 
-#: infrun.c:7130
+#: infrun.c:7236
 msgid "Show debugger response to a program call of exec."
 msgstr ""
 
-#: infrun.c:7131
+#: infrun.c:7237
 msgid ""
 "An exec call replaces the program image of a process.\n"
 "\n"
@@ -11257,15 +11669,15 @@
 "By default, the debugger will use the same inferior."
 msgstr ""
 
-#: infrun.c:7152
+#: infrun.c:7258
 msgid "Set mode for locking scheduler during execution."
 msgstr ""
 
-#: infrun.c:7153
+#: infrun.c:7259
 msgid "Show mode for locking scheduler during execution."
 msgstr ""
 
-#: infrun.c:7154
+#: infrun.c:7260
 msgid ""
 "off  == no locking (threads may preempt at any time)\n"
 "on   == full locking (no thread except the current thread may run)\n"
@@ -11274,15 +11686,15 @@
 "\tOther threads may run while stepping over a function call ('next')."
 msgstr ""
 
-#: infrun.c:7164
+#: infrun.c:7270
 msgid "Set mode for resuming threads of all processes."
 msgstr ""
 
-#: infrun.c:7165
+#: infrun.c:7271
 msgid "Show mode for resuming threads of all processes."
 msgstr ""
 
-#: infrun.c:7166
+#: infrun.c:7272
 msgid ""
 "When on, execution commands (such as 'continue' or 'next') resume all\n"
 "threads of all processes.  When off (which is the default), execution\n"
@@ -11291,30 +11703,30 @@
 "mode (see help set scheduler-locking)."
 msgstr ""
 
-#: infrun.c:7176
+#: infrun.c:7282
 msgid "Set mode of the step operation."
 msgstr ""
 
-#: infrun.c:7177
+#: infrun.c:7283
 msgid "Show mode of the step operation."
 msgstr ""
 
-#: infrun.c:7178
+#: infrun.c:7284
 msgid ""
 "When set, doing a step over a function without debug line information\n"
 "will stop at the first instruction of that function. Otherwise, the\n"
 "function is skipped and the step command stops at a different source line."
 msgstr ""
 
-#: infrun.c:7188
+#: infrun.c:7294
 msgid "Set debugger's willingness to use displaced stepping."
 msgstr ""
 
-#: infrun.c:7189
+#: infrun.c:7295
 msgid "Show debugger's willingness to use displaced stepping."
 msgstr ""
 
-#: infrun.c:7190
+#: infrun.c:7296
 msgid ""
 "If on, gdb will use displaced stepping to step over breakpoints if it is\n"
 "supported by the target architecture.  If off, gdb will not use displaced\n"
@@ -11326,57 +11738,57 @@
 "use it in all-stop mode (see help set non-stop)."
 msgstr ""
 
-#: infrun.c:7202
+#: infrun.c:7308
 msgid ""
 "Set direction of execution.\n"
 "Options are 'forward' or 'reverse'."
 msgstr ""
 
-#: infrun.c:7204
+#: infrun.c:7310
 msgid "Show direction of execution (forward/reverse)."
 msgstr ""
 
-#: infrun.c:7205
+#: infrun.c:7311
 msgid "Tells gdb whether to execute forward or backward."
 msgstr ""
 
 #. Set/show detach-on-fork: user-settable mode.
-#: infrun.c:7211
+#: infrun.c:7317
 msgid "Set whether gdb will detach the child of a fork."
 msgstr ""
 
-#: infrun.c:7212
+#: infrun.c:7318
 msgid "Show whether gdb will detach the child of a fork."
 msgstr ""
 
-#: infrun.c:7213
+#: infrun.c:7319
 msgid "Tells gdb whether to detach the child of a fork."
 msgstr ""
 
-#: infrun.c:7220
+#: infrun.c:7326
 msgid "Set disabling of debuggee's virtual address space randomization."
 msgstr ""
 
-#: infrun.c:7221
+#: infrun.c:7327
 msgid "Show disabling of debuggee's virtual address space randomization."
 msgstr ""
 
-#: infrun.c:7222
+#: infrun.c:7328
 msgid ""
 "When this mode is on (which is the default), randomization of the virtual\n"
 "address space is disabled.  Standalone programs run with the randomization\n"
 "enabled by default on some platforms."
 msgstr ""
 
-#: infrun.c:7248
+#: infrun.c:7352
 msgid "Set whether gdb controls the inferior in observer mode."
 msgstr ""
 
-#: infrun.c:7249
+#: infrun.c:7353
 msgid "Show whether gdb controls the inferior in observer mode."
 msgstr ""
 
-#: infrun.c:7250
+#: infrun.c:7354
 msgid ""
 "In observer mode, GDB can get data from the inferior, but not\n"
 "affect its execution.  Registers and memory may not be changed,\n"
@@ -11384,7 +11796,35 @@
 "or signalled."
 msgstr ""
 
-#: interps.c:158
+#: inf-ttrace.c:464
+#, possible-c-format
+msgid "Attaching after fork to child process %ld.\n"
+msgstr ""
+
+#: inf-ttrace.c:474
+#, possible-c-format
+msgid "Detaching after fork from child process %ld.\n"
+msgstr ""
+
+#: inf-ttrace.c:700
+msgid "TT_PROC_GET_FIRST_LWP_STATE ttrace call failed"
+msgstr ""
+
+#: inf-ttrace.c:721
+msgid "TT_PROC_GET_NEXT_LWP_STATE ttrace call failed"
+msgstr ""
+
+#: inf-ttrace.c:1095 linux-nat.c:1254 procfs.c:3909 procfs.c:4047
+#, possible-c-format
+msgid "[%s exited]\n"
+msgstr ""
+
+#: inf-ttrace.c:1111
+#, possible-c-format
+msgid "[%s has been terminated]\n"
+msgstr ""
+
+#: interps.c:157
 #, possible-c-format
 msgid "Could not suspend interpreter \"%s\"."
 msgstr ""
@@ -11394,30 +11834,30 @@
 msgid "Failed to initialize new interp \"%s\" %s"
 msgstr ""
 
-#: interps.c:376
+#: interps.c:392
 msgid "interpreter-exec command"
 msgstr ""
 
-#: interps.c:386
+#: interps.c:402
 msgid "usage: interpreter-exec <interpreter> [ <command> ... ]"
 msgstr ""
 
-#: interps.c:392
+#: interps.c:408
 #, possible-c-format
 msgid "Could not find interpreter \"%s\"."
 msgstr ""
 
-#: interps.c:399
+#: interps.c:415
 #, possible-c-format
 msgid "Could not switch to interpreter \"%s\"."
 msgstr ""
 
-#: interps.c:410
+#: interps.c:426
 #, possible-c-format
 msgid "error in command: \"%s\"."
 msgstr ""
 
-#: interps.c:491
+#: interps.c:507
 msgid ""
 "Execute a command in an interpreter.  It takes two arguments:\n"
 "The first argument is the name of the interpreter to use.\n"
@@ -11429,236 +11869,305 @@
 msgid "breakpoint_from_pc: invalid breakpoint address 0x%lx"
 msgstr ""
 
-#: jit.c:54
+#: jit.c:68
 #, possible-c-format
 msgid "JIT debugging is %s.\n"
 msgstr ""
 
+#: jit.c:154
+#, possible-c-format
+msgid "Opening shared object %s.\n"
+msgstr ""
+
+#: jit.c:161
+#, possible-c-format
+msgid "Could not locate initialization function: %s."
+msgstr ""
+
+#: jit.c:165
+msgid "Reader not GPL compatible."
+msgstr ""
+
+#: jit.c:169
+msgid "Reader version does not match GDB version."
+msgstr ""
+
+#: jit.c:189
+msgid "No reader name provided."
+msgstr ""
+
 #: jit.c:192
+msgid "JIT reader already loaded.  Run jit-reader-unload first."
+msgstr ""
+
+#: jit.c:207
+msgid "No JIT reader loaded."
+msgstr ""
+
+#: jit.c:305
 msgid "Unable to read JIT descriptor from remote memory!"
 msgstr ""
 
-#: jit.c:225
+#: jit.c:339
 msgid "Unable to read JIT code entry from remote memory!"
 msgstr ""
 
-#: jit.c:271
+#: jit.c:799
+msgid "Error opening JITed symbol file, ignoring it.\n"
+msgstr ""
+
+#: jit.c:807
 msgid "JITed symbol file is not an object file, ignoring it.\n"
 msgstr ""
 
-#: jit.c:280
+#: jit.c:816
 #, possible-c-format
 msgid ""
 "JITed object file architecture %s is not compatible with target architecture "
 "%s."
 msgstr ""
 
-#: jit.c:421
+#: jit.c:966
+#, possible-c-format
+msgid "Could not recognize DWARF regnum %d"
+msgstr ""
+
+#: jit.c:1069
+msgid "Successfully unwound frame using JIT reader.\n"
+msgstr ""
+
+#: jit.c:1074
+msgid "Could not unwind frame using JIT reader.\n"
+msgstr ""
+
+#: jit.c:1217
 msgid "Unsupported JIT protocol version in descriptor!"
 msgstr ""
 
-#: jit.c:531
+#: jit.c:1327
 #, possible-c-format
 msgid "Unable to find JITed code entry at address: %s\n"
 msgstr ""
 
-#: jit.c:539
+#: jit.c:1335
 msgid "Unknown action_flag value in JIT descriptor!"
 msgstr ""
 
-#: jit.c:552
+#: jit.c:1371
 msgid "Set JIT debugging."
 msgstr ""
 
-#: jit.c:553
+#: jit.c:1372
 msgid "Show JIT debugging."
 msgstr ""
 
-#: jit.c:554
+#: jit.c:1373
 msgid "When non-zero, JIT debugging is enabled."
 msgstr ""
 
-#: jv-exp.y:396
+#: jit.c:1388
+msgid ""
+"Load FILE as debug info reader and unwinder for JIT compiled code.\n"
+"Usage: jit-reader-load FILE\n"
+"Try to load file FILE as a debug info reader (and unwinder) for\n"
+"JIT compiled code.  The file is loaded from "
+msgstr ""
+
+#: jit.c:1392
+msgid ""
+",\n"
+"relocated relative to the GDB executable if required."
+msgstr ""
+
+#: jit.c:1394
+msgid ""
+"Unload the currently loaded JIT debug info reader.\n"
+"Usage: jit-reader-unload FILE\n"
+"\n"
+"Do \"help jit-reader-load\" for info on loading debug info readers."
+msgstr ""
+
+#: jv-exp.y:395
 msgid "FIXME - ClassInstanceCreationExpression"
 msgstr ""
 
-#: jv-exp.y:415 jv-exp.y:418
+#: jv-exp.y:414 jv-exp.y:417
 msgid "FIXME - ArrayCreationExpression"
 msgstr ""
 
-#: jv-exp.y:464 jv-exp.y:466
+#: jv-exp.y:463 jv-exp.y:465
 msgid "Form of method invocation not implemented"
 msgstr ""
 
-#: jv-exp.y:555
+#: jv-exp.y:554
 msgid "Invalid cast expression"
 msgstr ""
 
-#: jv-exp.y:795
+#: jv-exp.y:794
 msgid "Numeric constant too large"
 msgstr ""
 
-#: jv-exp.y:905
+#: jv-exp.y:904
 msgid "Empty character constant"
 msgstr ""
 
-#: jv-exp.y:918
+#: jv-exp.y:917
 msgid "Unmatched single quote"
 msgstr ""
 
-#: jv-exp.y:923
+#: jv-exp.y:922
 msgid "Invalid character constant"
 msgstr ""
 
-#: jv-exp.y:1008
+#: jv-exp.y:1007
 #, possible-c-format
 msgid "Invalid number \"%s\""
 msgstr ""
 
-#: jv-exp.y:1080
+#: jv-exp.y:1079
 msgid "Unterminated string in expression"
 msgstr ""
 
 #. We must have come across a bad character (e.g. ';').
-#: jv-exp.y:1092
+#: jv-exp.y:1091
 #, possible-c-format
 msgid "Invalid character '%c' in expression"
 msgstr ""
 
-#: jv-exp.y:1203
+#: jv-exp.y:1202
 #, possible-c-format
 msgid "%s: near `%s'"
 msgstr ""
 
-#: jv-exp.y:1205
+#: jv-exp.y:1204
 #, possible-c-format
 msgid "error in expression, near `%s'"
 msgstr ""
 
-#: jv-exp.y:1214
+#: jv-exp.y:1213
 #, possible-c-format
 msgid "No class named `%s'"
 msgstr ""
 
-#: jv-exp.y:1352
+#: jv-exp.y:1351
 #, possible-c-format
 msgid "unknown type `%.*s'"
 msgstr ""
 
-#: jv-exp.y:1395
+#: jv-exp.y:1394
 msgid "No symbol table is loaded.  Use the \"file\" command"
 msgstr ""
 
-#: jv-exp.y:1397
+#: jv-exp.y:1396
 #, possible-c-format
 msgid "No symbol \"%s\" in current context"
 msgstr ""
 
-#: jv-lang.c:609
+#: jv-lang.c:599
 msgid "cannot find java.lang.Object"
 msgstr ""
 
-#: jv-lang.c:679 jv-lang.c:755
+#: jv-lang.c:663 jv-lang.c:739
 #, possible-c-format
 msgid "unknown signature '%c' for primitive type"
 msgstr ""
 
-#: jv-lang.c:855
+#: jv-lang.c:839
 msgid "not implemented - java_value_string"
 msgstr ""
 
-#: jv-lang.c:968
+#: jv-lang.c:976
 #, possible-c-format
 msgid "array index (%ld) out of bounds (length: %ld)"
 msgstr ""
 
-#: language.c:132
+#: language.c:131
 #, possible-c-format
 msgid "The current source language is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:137
+#: language.c:136
 #, possible-c-format
 msgid "The current source language is \"%s\".\n"
 msgstr ""
 
-#: language.c:217
+#: language.c:216
 #, possible-c-format
 msgid "Type checking is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:221
+#: language.c:220
 #, possible-c-format
 msgid "Type checking is \"%s\".\n"
 msgstr ""
 
-#: language.c:225 language.c:259
+#: language.c:224 language.c:258
 msgid "the current type check setting does not match the language.\n"
 msgstr ""
 
-#: language.c:256
+#: language.c:255
 #, possible-c-format
 msgid "Unrecognized type check setting: \"%s\""
 msgstr ""
 
-#: language.c:290
+#: language.c:289
 #, possible-c-format
 msgid "Range checking is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:294
+#: language.c:293
 #, possible-c-format
 msgid "Range checking is \"%s\".\n"
 msgstr ""
 
-#: language.c:298 language.c:333
+#: language.c:297 language.c:332
 msgid "the current range check setting does not match the language.\n"
 msgstr ""
 
-#: language.c:330
+#: language.c:329
 #, possible-c-format
 msgid "Unrecognized range check setting: \"%s\""
 msgstr ""
 
-#: language.c:361
+#: language.c:360
 #, possible-c-format
 msgid "Case sensitivity in name search is \"auto; currently %s\".\n"
 msgstr ""
 
-#: language.c:367
+#: language.c:366
 #, possible-c-format
 msgid "Case sensitivity in name search is \"%s\".\n"
 msgstr ""
 
-#: language.c:371 language.c:404
+#: language.c:370 language.c:403
 msgid "the current case sensitivity setting does not match the language.\n"
 msgstr ""
 
-#: language.c:460
+#: language.c:459
 #, possible-c-format
 msgid "Current language:  %s\n"
 msgstr ""
 
-#: language.c:465
+#: language.c:464
 #, possible-c-format
 msgid "Type checking:     %s\n"
 msgstr ""
 
-#: language.c:467
+#: language.c:466
 #, possible-c-format
 msgid "Range checking:    %s\n"
 msgstr ""
 
-#: language.c:469
+#: language.c:468
 #, possible-c-format
 msgid "Case sensitivity:  %s\n"
 msgstr ""
 
-#: language.c:614 typeprint.c:66
+#: language.c:613 typeprint.c:65
 msgid "Language not supported."
 msgstr ""
 
-#: language.c:941
+#: language.c:940
 msgid ""
 "Set the current source language.\n"
 "The currently understood settings are:\n"
@@ -11666,284 +12175,273 @@
 "local or auto    Automatic setting based on source file\n"
 msgstr ""
 
-#: language.c:969
+#: language.c:968
 msgid "Show the current source language."
 msgstr ""
 
-#: language.c:1067
+#: language.c:1066
 msgid "Getting a string is unsupported in this language."
 msgstr ""
 
-#: language.c:1081
+#: language.c:1080
 msgid "Attempted to parse an expression with unknown language"
 msgstr ""
 
-#: language.c:1088
+#: language.c:1087
 msgid "internal error - unimplemented function unk_lang_emit_char called."
 msgstr ""
 
-#: language.c:1095
+#: language.c:1094
 msgid "internal error - unimplemented function unk_lang_printchar called."
 msgstr ""
 
-#: language.c:1105
+#: language.c:1104
 msgid "internal error - unimplemented function unk_lang_printstr called."
 msgstr ""
 
-#: language.c:1113
+#: language.c:1112
 msgid "internal error - unimplemented function unk_lang_print_type called."
 msgstr ""
 
-#: language.c:1124
+#: language.c:1123
 msgid "internal error - unimplemented function unk_lang_val_print called."
 msgstr ""
 
-#: language.c:1132
+#: language.c:1131
 msgid "internal error - unimplemented function unk_lang_value_print called."
 msgstr ""
 
-#: language.c:1385
+#: language.c:1390
 msgid "Set the status of the type/range checker."
 msgstr ""
 
-#: language.c:1391
+#: language.c:1396
 msgid "Show the status of the type/range checker."
 msgstr ""
 
-#: language.c:1397
+#: language.c:1402
 msgid "Set type checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1398
+#: language.c:1403
 msgid "Show type checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1405
+#: language.c:1410
 msgid "Set range checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1406
+#: language.c:1411
 msgid "Show range checking.  (on/warn/off/auto)"
 msgstr ""
 
-#: language.c:1412
+#: language.c:1417
 msgid "Set case sensitivity in name search.  (on/off/auto)"
 msgstr ""
 
-#: language.c:1413
+#: language.c:1418
 msgid "Show case sensitivity in name search.  (on/off/auto)"
 msgstr ""
 
-#: language.c:1414
+#: language.c:1419
 msgid ""
 "For Fortran the default is off; for other languages the default is on."
 msgstr ""
 
-#: libunwind-frame.c:212
+#: libunwind-frame.c:211
 msgid "Can't get libunwind sp register."
 msgstr ""
 
-#: linespec.c:577
+#: linespec.c:637
 msgid ""
 "[0] cancel\n"
 "[1] all\n"
 msgstr ""
 
-#: linespec.c:589
-#, possible-c-format
-msgid "[%d] %s at ?FILE:%d [No symtab? Probably broken debug info...]\n"
-msgstr ""
-
-#: linespec.c:597
-msgid "?HERE\n"
-msgstr ""
-
-#: linespec.c:621
-msgid "Arguments must be choice numbers."
-msgstr ""
-
-#: linespec.c:626
+#: linespec.c:659
 msgid "canceled"
 msgstr ""
 
-#: linespec.c:649
+#: linespec.c:675
 #, possible-c-format
 msgid "No choice number %d.\n"
 msgstr ""
 
-#: linespec.c:667
+#: linespec.c:687
 #, possible-c-format
 msgid "duplicate request for %d ignored.\n"
 msgstr ""
 
-#: linespec.c:1207 linespec.c:1458
+#. The error message doesn't really matter, because this case
+#. should only hit during breakpoint reset.
+#: linespec.c:1295
+msgid "cannot evaluate expressions while program space is in startup"
+msgstr ""
+
+#: linespec.c:1386 linespec.c:1591
 msgid "malformed template specification in command"
 msgstr ""
 
-#: linespec.c:1314
-#, possible-c-format
-msgid "debugging symbol \"%s\" does not match selector; ignoring"
+#. End if symbol found.
+#. We couldn't find a class, so we're in case 2 above.  We check the
+#. entire name as a symbol instead.  The simplest way to do this is
+#. to just throw an exception and let our caller fall through to
+#. decode_variable.
+#: linespec.c:1726
+msgid "see caller, this text doesn't matter"
 msgstr ""
 
-#: linespec.c:1771
+#: linespec.c:2135
 #, possible-c-format
-msgid "the class `%s' does not have any method instance named %s"
+msgid "No source file named %s."
 msgstr ""
 
-#: linespec.c:1825
+#: linespec.c:2432
 #, possible-c-format
-msgid "No source file named %s."
+msgid "No line %d in the current file."
 msgstr ""
 
-#: linespec.c:1994
+#: linespec.c:2481
 msgid "History values used in line specs must have integer values."
 msgstr ""
 
-#: linespec.c:2019
+#: linespec.c:2509
 msgid "Convenience variables used in line specs must have integer values."
 msgstr ""
 
-#: linespec.c:2110
-#, possible-c-format
-msgid "Function \"%s\" not defined."
-msgstr ""
-
-#. NOT_FOUND_ERROR is not correct but it ensures COPY will be
-#. searched also as a minimal symbol.
-#: linespec.c:2185
+#: linespec.c:2961
 #, possible-c-format
-msgid "\"%s\" is not a function"
+msgid "Function \"%s\" not defined in \"%s\"."
 msgstr ""
 
-#. This can happen if it is compiled with a compiler which doesn't
-#. put out line numbers for variables.
-#. FIXME: Shouldn't we just set .line and .symtab to zero
-#. and return?  For example, "info line foo" could print
-#. the address.
-#: linespec.c:2205
+#: linespec.c:2964
 #, possible-c-format
-msgid "Line number not known for symbol \"%s\""
+msgid "Function \"%s\" not defined."
 msgstr ""
 
-#: linux-fork.c:395 linux-fork.c:540
+#: linux-fork.c:394 linux-fork.c:539
 #, possible-c-format
 msgid "Unable to detach %s"
 msgstr ""
 
-#: linux-fork.c:489
+#: linux-fork.c:488
 msgid "Requires argument (checkpoint id to delete)"
 msgstr ""
 
-#: linux-fork.c:493 linux-fork.c:533
+#: linux-fork.c:492 linux-fork.c:532
 #, possible-c-format
 msgid "No such checkpoint id, %s"
 msgstr ""
 
-#: linux-fork.c:496
+#: linux-fork.c:495
 msgid "Please switch to another checkpoint before deleting the current one"
 msgstr ""
 
-#: linux-fork.c:500
+#: linux-fork.c:499
 #, possible-c-format
 msgid "Unable to kill pid %s"
 msgstr ""
 
-#: linux-fork.c:507
+#: linux-fork.c:506
 #, possible-c-format
 msgid "Killed %s\n"
 msgstr ""
 
-#: linux-fork.c:519
+#: linux-fork.c:518
 #, possible-c-format
 msgid "Unable to wait pid %s"
 msgstr ""
 
-#: linux-fork.c:529
+#: linux-fork.c:528
 msgid "Requires argument (checkpoint id to detach)"
 msgstr ""
 
-#: linux-fork.c:536
+#: linux-fork.c:535
 msgid "Please switch to another checkpoint before detaching the current one"
 msgstr ""
 
-#: linux-fork.c:543
+#: linux-fork.c:542
 #, possible-c-format
 msgid "Detached %s\n"
 msgstr ""
 
-#: linux-fork.c:581
+#: linux-fork.c:580
 msgid " (main process)"
 msgstr ""
 
-#: linux-fork.c:582
+#: linux-fork.c:581
 msgid " at "
 msgstr ""
 
-#: linux-fork.c:587
+#: linux-fork.c:586
 #, possible-c-format
 msgid ", file %s"
 msgstr ""
 
-#: linux-fork.c:589
+#: linux-fork.c:588
 #, possible-c-format
 msgid ", line %d"
 msgstr ""
 
-#: linux-fork.c:604
+#: linux-fork.c:603
 #, possible-c-format
 msgid "No checkpoint number %d.\n"
 msgstr ""
 
-#: linux-fork.c:606
+#: linux-fork.c:605
 msgid "No checkpoints.\n"
 msgstr ""
 
-#: linux-fork.c:639
+#: linux-fork.c:663
+msgid "checkpoint: can't checkpoint multiple threads."
+msgstr ""
+
+#: linux-fork.c:673
 msgid "checkpoint: can't find fork function in inferior."
 msgstr ""
 
 #. Probably can't happen.
-#: linux-fork.c:651
+#: linux-fork.c:685
 msgid "checkpoint: call_function_by_hand returned null."
 msgstr ""
 
-#: linux-fork.c:659
+#: linux-fork.c:693
 #, possible-c-format
 msgid "checkpoint: fork returned pid %ld.\n"
 msgstr ""
 
-#: linux-fork.c:666
+#: linux-fork.c:700
 #, possible-c-format
 msgid "   gdb says parent = %ld.\n"
 msgstr ""
 
-#: linux-fork.c:673
+#: linux-fork.c:707
 msgid "Failed to find new fork"
 msgstr ""
 
-#: linux-fork.c:694
+#: linux-fork.c:728
 #, possible-c-format
 msgid "Switching to %s\n"
 msgstr ""
 
-#: linux-fork.c:707
+#: linux-fork.c:741
 msgid "Requires argument (checkpoint id to restart)"
 msgstr ""
 
-#: linux-fork.c:710
+#: linux-fork.c:744
 #, possible-c-format
 msgid "Not found: checkpoint id %s"
 msgstr ""
 
 #. Checkpoint command: create a fork of the inferior process
 #. and set it aside for later debugging.
-#: linux-fork.c:723
+#: linux-fork.c:757
 msgid "Fork a duplicate process (experimental)."
 msgstr ""
 
 #. Restart command: restore the context of a specified checkpoint
 #. process.
-#: linux-fork.c:729
+#: linux-fork.c:763
 msgid ""
 "restart <n>: restore program context from a checkpoint.\n"
 "Argument 'n' is checkpoint ID, as displayed by 'info checkpoints'."
@@ -11951,63 +12449,58 @@
 
 #. Delete checkpoint command: kill the process and remove it from
 #. the fork list.
-#: linux-fork.c:736
+#: linux-fork.c:770
 msgid "Delete a checkpoint (experimental)."
 msgstr ""
 
 #. Detach checkpoint command: release the process to run independently,
 #. and remove it from the fork list.
-#: linux-fork.c:743
+#: linux-fork.c:777
 msgid "Detach from a checkpoint (experimental)."
 msgstr ""
 
-#: linux-fork.c:751
+#: linux-fork.c:785
 msgid "IDs of currently known checkpoints."
 msgstr ""
 
-#: linux-nat.c:234
+#: linux-nat.c:199
 #, possible-c-format
 msgid "Debugging of GNU/Linux lwp module is %s.\n"
 msgstr ""
 
-#: linux-nat.c:244
-#, possible-c-format
-msgid "Debugging of GNU/Linux async lwp module is %s.\n"
-msgstr ""
-
-#: linux-nat.c:450
+#: linux-nat.c:405
 #, possible-c-format
 msgid "linux_test_for_tracefork: waitpid: unexpected result %d."
 msgstr ""
 
-#: linux-nat.c:452
+#: linux-nat.c:407
 #, possible-c-format
 msgid "linux_test_for_tracefork: waitpid: unexpected status %d."
 msgstr ""
 
-#: linux-nat.c:461 linux-nat.c:513
+#: linux-nat.c:416 linux-nat.c:468
 msgid "linux_test_for_tracefork: failed to kill child"
 msgstr ""
 
-#: linux-nat.c:468
+#: linux-nat.c:423
 msgid "linux_test_for_tracefork: failed to wait for killed child"
 msgstr ""
 
-#: linux-nat.c:471
+#: linux-nat.c:426
 #, possible-c-format
 msgid ""
 "linux_test_for_tracefork: unexpected wait status 0x%x from killed child"
 msgstr ""
 
-#: linux-nat.c:485
+#: linux-nat.c:440
 msgid "linux_test_for_tracefork: failed to resume child"
 msgstr ""
 
-#: linux-nat.c:502
+#: linux-nat.c:457
 msgid "linux_test_for_tracefork: failed to kill second child"
 msgstr ""
 
-#: linux-nat.c:508
+#: linux-nat.c:463
 #, possible-c-format
 msgid ""
 "linux_test_for_tracefork: unexpected result from waitpid (%d, status 0x%x)"
@@ -12018,24 +12511,24 @@
 #. the parent stays blocked.  If we're telling the parent to run
 #. in the foreground, the user will not be able to ctrl-c to get
 #. back the terminal, effectively hanging the debug session.
-#: linux-nat.c:660
+#: linux-nat.c:613
 msgid ""
 "Can not resume the parent process over vfork in the foreground while\n"
 "holding the child stopped.  Try \"set detach-on-fork\" or \"set schedule-"
 "multiple\".\n"
 msgstr ""
 
-#: linux-nat.c:859
+#: linux-nat.c:810
 #, possible-c-format
 msgid "Attaching after process %d vfork to child process %d.\n"
 msgstr ""
 
-#: linux-nat.c:864
+#: linux-nat.c:815
 #, possible-c-format
 msgid "Attaching after process %d fork to child process %d.\n"
 msgstr ""
 
-#: linux-nat.c:1412
+#: linux-nat.c:1336
 #, possible-c-format
 msgid "%s is a cloned process"
 msgstr ""
@@ -12045,322 +12538,344 @@
 #. creation is interrupted; as of Linux kernel 2.6.19, a
 #. bug may place threads in the thread list and then fail
 #. to create them.
-#: linux-nat.c:1474
+#: linux-nat.c:1439
 #, possible-c-format
 msgid "Can't attach %s: %s"
 msgstr ""
 
-#: linux-nat.c:1550
+#: linux-nat.c:1519
 #, possible-c-format
 msgid "Error disabling address space randomization: %s"
 msgstr ""
 
-#: linux-nat.c:1566
+#: linux-nat.c:1535
 #, possible-c-format
 msgid "Error restoring address space randomization: %s"
 msgstr ""
 
-#: linux-nat.c:1603
+#: linux-nat.c:1572
 msgid "Unable to attach: program exited normally."
 msgstr ""
 
-#: linux-nat.c:1605
+#: linux-nat.c:1574
 #, possible-c-format
 msgid "Unable to attach: program exited with code %d."
 msgstr ""
 
-#: linux-nat.c:1616
+#: linux-nat.c:1585
 #, possible-c-format
 msgid "Unable to attach: program terminated with signal %s, %s."
 msgstr ""
 
-#: linux-nat.c:1623
+#: linux-nat.c:1592
 #, possible-c-format
 msgid "unexpected status %d for PID %ld"
 msgstr ""
 
-#: linux-nat.c:1760
+#: linux-nat.c:1729
 #, possible-c-format
 msgid "Can't detach %s: %s"
 msgstr ""
 
-#: linux-nat.c:2192
+#: linux-nat.c:2175
 msgid "waiting for new child"
 msgstr ""
 
-#: linux-nat.c:2195
+#: linux-nat.c:2178
 #, possible-c-format
 msgid "wait returned unexpected PID %d"
 msgstr ""
 
-#: linux-nat.c:2198
+#: linux-nat.c:2181
 #, possible-c-format
 msgid "wait returned unexpected status 0x%x"
 msgstr ""
 
-#: linux-nat.c:2371
+#: linux-nat.c:2383
 #, possible-c-format
 msgid "unknown ptrace event %d"
 msgstr ""
 
-#: linux-nat.c:4178
+#: linux-nat.c:2400 linux-nat.c:4827 linux-nat.c:4907 linux-nat.c:4921
+#: linux-nat.c:5019
+#, possible-c-format
+msgid "unable to open /proc file '%s'"
+msgstr ""
+
+#: linux-nat.c:4393
 #, possible-c-format
 msgid "Could not open %s."
 msgstr ""
 
-#: linux-nat.c:4605 procfs.c:5432
+#: linux-nat.c:4803
+#, possible-c-format
+msgid "Too many parameters: %s"
+msgstr ""
+
+#: linux-nat.c:4806 procfs.c:5435
 msgid "No current process: you must name one."
 msgstr ""
 
-#: linux-nat.c:4609
+#: linux-nat.c:4810
 #, possible-c-format
 msgid "No /proc directory: '%s'"
 msgstr ""
 
-#: linux-nat.c:4611
+#: linux-nat.c:4812
 #, possible-c-format
 msgid "process %ld\n"
 msgstr ""
 
-#: linux-nat.c:4622
+#: linux-nat.c:4823
 #, possible-c-format
 msgid "unable to read '%s'"
 msgstr ""
 
-#: linux-nat.c:4626 linux-nat.c:4706 linux-nat.c:4720 linux-nat.c:4818
-#, possible-c-format
-msgid "unable to open /proc file '%s'"
-msgstr ""
-
-#: linux-nat.c:4635 linux-nat.c:4644
+#: linux-nat.c:4836 linux-nat.c:4845
 #, possible-c-format
 msgid "unable to read link '%s'"
 msgstr ""
 
 #. No output for summary mode.
-#: linux-nat.c:4656 procfs.c:5367
+#: linux-nat.c:4857 procfs.c:5370
 msgid ""
 "Mapped address spaces:\n"
 "\n"
 msgstr ""
 
-#: linux-nat.c:4733
+#: linux-nat.c:4934
 #, possible-c-format
 msgid "Process: %d\n"
 msgstr ""
 
-#: linux-nat.c:4735
+#: linux-nat.c:4936
 #, possible-c-format
 msgid "Exec file: %s\n"
 msgstr ""
 
-#: linux-nat.c:4737
+#: linux-nat.c:4938
 #, possible-c-format
 msgid "State: %c\n"
 msgstr ""
 
-#: linux-nat.c:4739
+#: linux-nat.c:4940
 #, possible-c-format
 msgid "Parent process: %d\n"
 msgstr ""
 
-#: linux-nat.c:4741
+#: linux-nat.c:4942
 #, possible-c-format
 msgid "Process group: %d\n"
 msgstr ""
 
-#: linux-nat.c:4743
+#: linux-nat.c:4944
 #, possible-c-format
 msgid "Session id: %d\n"
 msgstr ""
 
-#: linux-nat.c:4745
+#: linux-nat.c:4946
 #, possible-c-format
 msgid "TTY: %d\n"
 msgstr ""
 
-#: linux-nat.c:4747
+#: linux-nat.c:4948
 #, possible-c-format
 msgid "TTY owner process group: %d\n"
 msgstr ""
 
-#: linux-nat.c:4749
+#: linux-nat.c:4950
 #, possible-c-format
 msgid "Flags: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4751
+#: linux-nat.c:4952
 #, possible-c-format
 msgid "Minor faults (no memory page): %lu\n"
 msgstr ""
 
-#: linux-nat.c:4754
+#: linux-nat.c:4955
 #, possible-c-format
 msgid "Minor faults, children: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4757
+#: linux-nat.c:4958
 #, possible-c-format
 msgid "Major faults (memory page faults): %lu\n"
 msgstr ""
 
-#: linux-nat.c:4760
+#: linux-nat.c:4961
 #, possible-c-format
 msgid "Major faults, children: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4763
+#: linux-nat.c:4964
 #, possible-c-format
 msgid "utime: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4765
+#: linux-nat.c:4966
 #, possible-c-format
 msgid "stime: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4767
+#: linux-nat.c:4968
 #, possible-c-format
 msgid "utime, children: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4769
+#: linux-nat.c:4970
 #, possible-c-format
 msgid "stime, children: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4771
+#: linux-nat.c:4972
 #, possible-c-format
 msgid "jiffies remaining in current time slice: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4774
+#: linux-nat.c:4975
 #, possible-c-format
 msgid "'nice' value: %ld\n"
 msgstr ""
 
-#: linux-nat.c:4776
+#: linux-nat.c:4977
 #, possible-c-format
 msgid "jiffies until next timeout: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4779
+#: linux-nat.c:4980
 #, possible-c-format
 msgid "jiffies until next SIGALRM: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4782
+#: linux-nat.c:4983
 #, possible-c-format
 msgid "start time (jiffies since system boot): %ld\n"
 msgstr ""
 
-#: linux-nat.c:4785
+#: linux-nat.c:4986
 #, possible-c-format
 msgid "Virtual memory size: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4788
+#: linux-nat.c:4989
 #, possible-c-format
 msgid "Resident set size: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4791
+#: linux-nat.c:4992
 #, possible-c-format
 msgid "rlim: %lu\n"
 msgstr ""
 
-#: linux-nat.c:4793
+#: linux-nat.c:4994
 #, possible-c-format
 msgid "Start of text: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4795
+#: linux-nat.c:4996
 #, possible-c-format
 msgid "End of text: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4797
+#: linux-nat.c:4998
 #, possible-c-format
 msgid "Start of stack: 0x%lx\n"
 msgstr ""
 
 #. FIXME arch?
-#: linux-nat.c:4801
+#: linux-nat.c:5002
 #, possible-c-format
 msgid "Kernel stack pointer: 0x%lx\n"
 msgstr ""
 
 #. FIXME arch?
-#: linux-nat.c:4803
+#: linux-nat.c:5004
 #, possible-c-format
 msgid "Kernel instr pointer: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4805
+#: linux-nat.c:5006
 #, possible-c-format
 msgid "Pending signals bitmap: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4807
+#: linux-nat.c:5008
 #, possible-c-format
 msgid "Blocked signals bitmap: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4809
+#: linux-nat.c:5010
 #, possible-c-format
 msgid "Ignored signals bitmap: 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4811
+#: linux-nat.c:5012
 #, possible-c-format
 msgid "Catched signals bitmap: 0x%lx\n"
 msgstr ""
 
 #. FIXME arch?
-#: linux-nat.c:4813
+#: linux-nat.c:5014
 #, possible-c-format
 msgid "wchan (system call): 0x%lx\n"
 msgstr ""
 
-#: linux-nat.c:4972 linux-nat.c:4985
+#: linux-nat.c:5237 linux-nat.c:5250
 #, possible-c-format
 msgid "Could not parse signal set: %s"
 msgstr ""
 
-#: linux-nat.c:5019
+#: linux-nat.c:5284
 #, possible-c-format
 msgid "Could not open %s"
 msgstr ""
 
-#: linux-nat.c:5804
+#: linux-nat.c:5883
 msgid ""
 "Show /proc process information about any running process.\n"
-"Specify any process id, or use the program being debugged by default.\n"
-"Specify any of the following keywords for detailed info:\n"
-"  mappings -- list of mapped memory regions.\n"
-"  stat     -- list a bunch of random process info.\n"
-"  status   -- list a different bunch of random process info.\n"
-"  all      -- list all available /proc info."
+"Specify any process id, or use the program being debugged by default."
 msgstr ""
 
-#: linux-nat.c:5814
-msgid "Set debugging of GNU/Linux lwp module."
+#. allow-unknown
+#: linux-nat.c:5889
+msgid "List of mapped memory regions."
 msgstr ""
 
-#: linux-nat.c:5815
-msgid "Show debugging of GNU/Linux lwp module."
+#: linux-nat.c:5893
+msgid "List process info from /proc/PID/stat."
 msgstr ""
 
-#: linux-nat.c:5816 linux-nat.c:5825
-msgid "Enables printf debugging output."
+#: linux-nat.c:5897
+msgid "List process info from /proc/PID/status."
+msgstr ""
+
+#: linux-nat.c:5901
+msgid "List current working directory of the process."
+msgstr ""
+
+#: linux-nat.c:5905
+msgid "List command line arguments of the process."
+msgstr ""
+
+#: linux-nat.c:5909
+msgid "List absolute filename for executable of the process."
+msgstr ""
+
+#: linux-nat.c:5913
+msgid "List all available /proc info."
+msgstr ""
+
+#: linux-nat.c:5918
+msgid "Set debugging of GNU/Linux lwp module."
 msgstr ""
 
-#: linux-nat.c:5823
-msgid "Set debugging of GNU/Linux async lwp module."
+#: linux-nat.c:5919
+msgid "Show debugging of GNU/Linux lwp module."
 msgstr ""
 
-#: linux-nat.c:5824
-msgid "Show debugging of GNU/Linux async lwp module."
+#: linux-nat.c:5920
+msgid "Enables printf debugging output."
 msgstr ""
 
 #: linux-record.c:245
@@ -12419,179 +12934,176 @@
 msgid "Process record and replay target doesn't support syscall number %d\n"
 msgstr ""
 
-#: linux-thread-db.c:86
+#: linux-thread-db.c:97
 #, possible-c-format
 msgid "libthread-db debugging is %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:388
+#: linux-thread-db.c:398
 #, possible-c-format
 msgid "thread_get_info_callback: cannot get thread info: %s"
 msgstr ""
 
-#: linux-thread-db.c:434
+#: linux-thread-db.c:447
 #, possible-c-format
 msgid "Cannot find user-level thread for LWP %ld: %s"
 msgstr ""
 
-#: linux-thread-db.c:493 linux-thread-db.c:1204
+#: linux-thread-db.c:506 linux-thread-db.c:1334
 #, possible-c-format
 msgid "Cannot get thread info: %s"
 msgstr ""
 
-#: linux-thread-db.c:506
+#: linux-thread-db.c:519
 #, possible-c-format
 msgid "Symbol \"%s\" not found in libthread_db: %s"
 msgstr ""
 
-#: linux-thread-db.c:580
+#: linux-thread-db.c:593
 #, possible-c-format
 msgid "Unable to set global thread event mask: %s"
 msgstr ""
 
-#: linux-thread-db.c:594
+#: linux-thread-db.c:607
 #, possible-c-format
 msgid "Unable to get location for thread creation breakpoint: %s"
 msgstr ""
 
-#: linux-thread-db.c:603
+#: linux-thread-db.c:616
 #, possible-c-format
 msgid "Unable to get location for thread death breakpoint: %s"
 msgstr ""
 
-#: linux-thread-db.c:663
+#: linux-thread-db.c:676
 #, possible-c-format
 msgid "Cannot initialize libthread_db: %s"
 msgstr ""
 
-#: linux-thread-db.c:680
+#: linux-thread-db.c:693
 #, possible-c-format
 msgid "td_ta_new failed: %s\n"
 msgstr ""
 
-#: linux-thread-db.c:694
+#: linux-thread-db.c:707
 #, possible-c-format
 msgid "td_ta_new failed: %s"
 msgstr ""
 
-#: linux-thread-db.c:728 sol-thread.c:675
+#: linux-thread-db.c:741 sol-thread.c:674
 msgid "[Thread debugging using libthread_db enabled]\n"
 msgstr ""
 
-#: linux-thread-db.c:738
+#: linux-thread-db.c:751
 #, possible-c-format
 msgid "Using host libthread_db library \"%s\".\n"
 msgstr ""
 
-#: linux-thread-db.c:770
+#: linux-thread-db.c:783
 #, possible-c-format
 msgid "Trying host libthread_db library: %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:776
+#: linux-thread-db.c:789
 #, possible-c-format
 msgid "dlopen failed: %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:790
+#: linux-thread-db.c:803
 #, possible-c-format
 msgid "Host %s resolved to: %s.\n"
 msgstr ""
 
-#: linux-thread-db.c:830 linux-thread-db.c:846
-#, possible-c-format
-msgid "libthread_db_search_path component too long, ignored: %s."
-msgstr ""
-
-#: linux-thread-db.c:907
+#: linux-thread-db.c:831
 #, possible-c-format
 msgid ""
 "Expected absolute pathname for libpthread in the inferior, but got %s."
 msgstr ""
 
-#: linux-thread-db.c:912
+#: linux-thread-db.c:966
 #, possible-c-format
-msgid "Unexpected: path to libpthread in the inferior is too long: %s"
+msgid "thread_db_load_search returning %d\n"
 msgstr ""
 
-#: linux-thread-db.c:921
+#: linux-thread-db.c:1013
 msgid ""
 "Unable to find libthread_db matching inferior's thread library, thread "
 "debugging will not be available."
 msgstr ""
 
-#: linux-thread-db.c:1080
+#: linux-thread-db.c:1210
 #, possible-c-format
 msgid "Cannot enable thread event reporting for %s: %s"
 msgstr ""
 
-#: linux-thread-db.c:1198
+#: linux-thread-db.c:1328
 #, possible-c-format
 msgid "Cannot get thread event message: %s"
 msgstr ""
 
-#: linux-thread-db.c:1220
+#: linux-thread-db.c:1350
 msgid "Spurious thread death event."
 msgstr ""
 
-#: linux-thread-db.c:1227
+#: linux-thread-db.c:1357
 msgid "Spurious thread event."
 msgstr ""
 
-#: linux-thread-db.c:1332
+#: linux-thread-db.c:1462
 #, possible-c-format
 msgid "find_new_threads_callback: cannot get thread info: %s"
 msgstr ""
 
-#: linux-thread-db.c:1352
+#: linux-thread-db.c:1484
 #, possible-c-format
 msgid "Cannot enable thread event reporting for LWP %d: %s"
 msgstr ""
 
-#: linux-thread-db.c:1420
+#: linux-thread-db.c:1553
 #, possible-c-format
 msgid "Found %d new threads in iteration %d.\n"
 msgstr ""
 
-#: linux-thread-db.c:1476
+#: linux-thread-db.c:1595
 #, possible-c-format
 msgid "Cannot find new threads: %s"
 msgstr ""
 
-#: linux-thread-db.c:1580
+#: linux-thread-db.c:1711
 msgid "No TLS library support"
 msgstr ""
 
-#: linux-thread-db.c:1600
+#: linux-thread-db.c:1731
 msgid "TLS not allocated yet"
 msgstr ""
 
-#: linux-thread-db.c:1621
+#: linux-thread-db.c:1752
 msgid "TLS not supported on this target"
 msgstr ""
 
-#: linux-thread-db.c:1715
+#: linux-thread-db.c:1846
 msgid "Set search path for libthread_db."
 msgstr ""
 
-#: linux-thread-db.c:1716
+#: linux-thread-db.c:1847
 msgid "Show the current search path or libthread_db."
 msgstr ""
 
-#: linux-thread-db.c:1717
+#: linux-thread-db.c:1848
 msgid ""
-"This path is used to search for libthread_db to be loaded into gdb itself."
+"This path is used to search for libthread_db to be loaded into gdb itself.\n"
+"Its value is a colon (':') separate list of directories to search.\n"
+"Setting the search path to an empty list resets it to its default value."
 msgstr ""
 
-#: linux-thread-db.c:1725
+#: linux-thread-db.c:1858
 msgid "Set libthread-db debugging."
 msgstr ""
 
-#: linux-thread-db.c:1726
+#: linux-thread-db.c:1859
 msgid "Show libthread-db debugging."
 msgstr ""
 
-#: linux-thread-db.c:1727
+#: linux-thread-db.c:1860
 msgid "When non-zero, libthread-db debugging is enabled."
 msgstr ""
 
@@ -12653,38 +13165,38 @@
 msgid "unbounded structure missing _m2_contents field"
 msgstr ""
 
-#: m2-typeprint.c:118
+#: m2-typeprint.c:117
 msgid "method"
 msgstr ""
 
 #. i18n: Do not translate the "struct" part!
-#: m2-typeprint.c:138
+#: m2-typeprint.c:137
 msgid "undef"
 msgstr ""
 
-#: m2-typeprint.c:142
+#: m2-typeprint.c:141
 msgid "error"
 msgstr ""
 
-#: m2-typeprint.c:264
+#: m2-typeprint.c:263
 msgid "is unknown"
 msgstr ""
 
-#: m2-typeprint.c:417
+#: m2-typeprint.c:416
 msgid "long_set failed to find discrete bounds for its subtype"
 msgstr ""
 
-#: m2-typeprint.c:420 m2-valprint.c:86
+#: m2-typeprint.c:419 m2-valprint.c:86
 msgid "expecting long_set"
 msgstr ""
 
 #. i18n: Do not translate the "SET OF" part!
-#: m2-typeprint.c:472
+#: m2-typeprint.c:471
 msgid "SET OF <unknown>"
 msgstr ""
 
 #. i18n: Do not translate "CASE" and "OF".
-#: m2-typeprint.c:559
+#: m2-typeprint.c:558
 msgid "CASE <variant> OF\n"
 msgstr ""
 
@@ -12705,26 +13217,26 @@
 msgid "Invalid m2 type code %d in symbol table."
 msgstr ""
 
-#: m32c-tdep.c:2251
+#: m32c-tdep.c:2250
 msgid ""
 "The return value is stored in memory at 'mem0', but GDB cannot find\n"
 "its address."
 msgstr ""
 
-#: m32c-tdep.c:2283
+#: m32c-tdep.c:2282
 msgid ""
 "The return value is stored in memory at 'mem0', but GDB cannot find\n"
 " its address."
 msgstr ""
 
-#: m32c-tdep.c:2464
+#: m32c-tdep.c:2463
 #, possible-c-format
 msgid ""
 "Cannot convert code address %s to function pointer:\n"
 "couldn't find a symbol at that address, to find trampoline."
 msgstr ""
 
-#: m32c-tdep.c:2498
+#: m32c-tdep.c:2497
 #, possible-c-format
 msgid ""
 "Cannot convert code address %s to function pointer:\n"
@@ -12798,198 +13310,253 @@
 msgid "Determine the IP address for M32R-EVA target board."
 msgstr ""
 
-#: m32r-rom.c:618
-msgid "Set IP address for download server (GDB's host computer)."
+#: m32r-rom.c:618
+msgid "Set IP address for download server (GDB's host computer)."
+msgstr ""
+
+#: m32r-rom.c:619
+msgid "Show IP address for download server (GDB's host computer)."
+msgstr ""
+
+#: m32r-rom.c:620
+msgid "Determine the IP address for download server (GDB's host computer)."
+msgstr ""
+
+#: m32r-rom.c:628
+msgid "Upload the srec file via the monitor's Ethernet upload capability."
+msgstr ""
+
+#: m32r-rom.c:631
+msgid "test upload command."
+msgstr ""
+
+#: m68hc11-tdep.c:255
+msgid ""
+"No frame soft register found in the symbol table.\n"
+"Stack backtrace will not work."
+msgstr ""
+
+#: m68hc11-tdep.c:1283
+msgid "return of value > 4 is not supported."
+msgstr ""
+
+#: m68hc11-tdep.c:1321 sh64-tdep.c:1277 sh-tdep.c:1322
+msgid "bad size for return value"
+msgstr ""
+
+#: m68k-tdep.c:179
+#, possible-c-format
+msgid "m68k_register_name: illegal register number %d"
+msgstr ""
+
+#: m68k-tdep.c:1029
+msgid "m68k_get_longjmp_target: not implemented"
+msgstr ""
+
+#: machoread.c:221
+msgid "Unexpected empty N_SO stab"
+msgstr ""
+
+#: machoread.c:240
+#, possible-c-format
+msgid "%s: Unexpected debug stab outside SO markers"
+msgstr ""
+
+#. Unexpected empty N_SO.
+#: machoread.c:257
+msgid "Empty SO section"
 msgstr ""
 
-#: m32r-rom.c:619
-msgid "Show IP address for download server (GDB's host computer)."
+#: machoread.c:268
+msgid "Three SO in a raw"
 msgstr ""
 
-#: m32r-rom.c:620
-msgid "Determine the IP address for download server (GDB's host computer)."
+#: machoread.c:277
+#, possible-c-format
+msgid "stabs debugging not supported for %s"
 msgstr ""
 
-#: m32r-rom.c:628
-msgid "Upload the srec file via the monitor's Ethernet upload capability."
+#: machoread.c:290
+msgid "Unexpected stab after SO"
 msgstr ""
 
-#: m32r-rom.c:631
-msgid "test upload command."
+#: machoread.c:307
+msgid "Missing nul SO"
 msgstr ""
 
-#: m68hc11-tdep.c:256
-msgid ""
-"No frame soft register found in the symbol table.\n"
-"Stack backtrace will not work."
+#: machoread.c:337
+msgid "unhandled stab for dwarf OSO file"
 msgstr ""
 
-#: m68hc11-tdep.c:1284
-msgid "return of value > 4 is not supported."
+#: machoread.c:344
+msgid "non-debugging symbol within SO"
 msgstr ""
 
-#: m68hc11-tdep.c:1322 sh-tdep.c:1324 sh64-tdep.c:1279
-msgid "bad size for return value"
+#: machoread.c:350
+msgid "missing nul SO"
 msgstr ""
 
-#: m68k-tdep.c:181
+#: machoread.c:438
 #, possible-c-format
-msgid "m68k_register_name: illegal register number %d"
+msgid "can't find symbol '%s' in minsymtab"
 msgstr ""
 
-#: m68k-tdep.c:1031
-msgid "m68k_get_longjmp_target: not implemented"
+#: machoread.c:463
+#, possible-c-format
+msgid "Loading debugging symbols from oso: %s\n"
 msgstr ""
 
-#: machoread.c:322
+#: machoread.c:467 symfile.c:1690 symfile.c:1740
 #, possible-c-format
-msgid "Loading symbols from oso: %s\n"
+msgid "`%s': can't read symbols: %s."
 msgstr ""
 
-#: machoread.c:326 symfile.c:1691 symfile.c:1741
+#: machoread.c:475
 #, possible-c-format
-msgid "`%s': can't read symbols: %s."
+msgid "`%s': file time stamp mismatch."
 msgstr ""
 
-#: machoread.c:359
+#: machoread.c:484
 #, possible-c-format
-msgid "resolve sect %s with %s\n"
+msgid "`%s': can't create hash table"
 msgstr ""
 
-#: machoread.c:365 machoread.c:763
+#: machoread.c:533
 #, possible-c-format
-msgid "can't find symbol '%s' in minsymtab"
+msgid "Duplicated symbol %s in symbol table"
 msgstr ""
 
-#: machoread.c:376
+#: machoread.c:540
 #, possible-c-format
-msgid "can't find section '%s' in OSO file %s"
+msgid "Adding symbol %s (addr: %s)\n"
 msgstr ""
 
-#: machoread.c:383
+#: machoread.c:614
 #, possible-c-format
-msgid "  %s: %s\n"
+msgid "resolve sect %s with %s (set to %s)\n"
 msgstr ""
 
-#: machoread.c:457
+#: machoread.c:692
 #, possible-c-format
 msgid "Could not open OSO archive file \"%s\""
 msgstr ""
 
-#: machoread.c:464
+#: machoread.c:699
 #, possible-c-format
 msgid "OSO archive file \"%s\" not an archive."
 msgstr ""
 
-#: machoread.c:474
+#: machoread.c:709
 #, possible-c-format
 msgid "Could not read archive members out of OSO archive \"%s\""
 msgstr ""
 
-#: machoread.c:518
+#: machoread.c:753
 #, possible-c-format
 msgid "Could not find specified archive member for OSO name \"%s\""
 msgstr ""
 
-#: machoread.c:529 symfile.c:1683 symfile.c:1729
+#: machoread.c:764 symfile.c:1682 symfile.c:1728
 #, possible-c-format
 msgid "`%s': can't open to read symbols: %s."
 msgstr ""
 
-#: machoread.c:578 machoread.c:601
+#: machoread.c:808 machoread.c:831
 #, possible-c-format
 msgid "can't find UUID in %s"
 msgstr ""
 
-#: machoread.c:585
+#: machoread.c:815
 #, possible-c-format
 msgid "can't open dsym file %s"
 msgstr ""
 
-#: machoread.c:593
+#: machoread.c:823
 #, possible-c-format
 msgid "bad dsym file format: %s"
 msgstr ""
 
-#: machoread.c:609
+#: machoread.c:839
 #, possible-c-format
 msgid "dsym file UUID doesn't match the one in %s"
 msgstr ""
 
-#: machoread.c:675
+#: machoread.c:907
 msgid "dsym file found\n"
 msgstr ""
 
-#: machoread.c:731
+#: machoread.c:955
 #, possible-c-format
 msgid "Relocate section '%s' of %s\n"
 msgstr ""
 
-#: machoread.c:862
+#: machoread.c:1045
 msgid "Set if printing Mach-O symbols processing."
 msgstr ""
 
-#: machoread.c:863
+#: machoread.c:1046
 msgid "Show if printing Mach-O symbols processing."
 msgstr ""
 
-#: macrocmd.c:63
+#: macrocmd.c:71
 msgid ""
 "You must follow the `macro expand' command with the expression you\n"
 "want to expand."
 msgstr ""
 
-#: macrocmd.c:99
+#: macrocmd.c:105
 msgid ""
 "You must follow the `macro expand-once' command with the expression\n"
 "you want to expand."
 msgstr ""
 
-#: macrocmd.c:146
+#: macrocmd.c:227
+#, possible-c-format
 msgid ""
-"You must follow the `info macro' command with the name of the macro\n"
-"whose definition you want to see."
+"Unrecognized option '%s' to info macro command.  Try \"help info macro\"."
 msgstr ""
 
-#: macrocmd.c:152
-msgid "GDB has no preprocessor macro information for that code."
+#: macrocmd.c:237
+msgid ""
+"You must follow the `info macro' command with the name of the macro\n"
+"whose definition you want to see."
 msgstr ""
 
-#: macrocmd.c:269
+#: macrocmd.c:370
 msgid "usage: macro define NAME[(ARGUMENT-LIST)] [REPLACEMENT-LIST]"
 msgstr ""
 
-#: macrocmd.c:279 macrocmd.c:354
+#: macrocmd.c:380 macrocmd.c:455
 msgid "Invalid macro name."
 msgstr ""
 
-#: macrocmd.c:307
+#: macrocmd.c:408
 msgid "Macro is missing an argument."
 msgstr ""
 
-#: macrocmd.c:313
+#: macrocmd.c:414
 msgid "Two macro arguments with identical names."
 msgstr ""
 
-#: macrocmd.c:323
+#: macrocmd.c:424
 msgid "',' or ')' expected at end of macro arguments."
 msgstr ""
 
-#: macrocmd.c:349
+#: macrocmd.c:450
 msgid "usage: macro undef NAME"
 msgstr ""
 
-#: macrocmd.c:397
+#: macrocmd.c:498
 msgid "Prefix for commands dealing with C preprocessor macros."
 msgstr ""
 
-#: macrocmd.c:400
+#: macrocmd.c:501
 msgid ""
 "Fully expand any C/C++ preprocessor macro invocations in EXPRESSION.\n"
 "Show the expanded expression."
 msgstr ""
 
-#: macrocmd.c:405
+#: macrocmd.c:506
 msgid ""
 "Expand C/C++ preprocessor macro invocations appearing directly in "
 "EXPRESSION.\n"
@@ -13004,11 +13571,24 @@
 "expression work together to yield a pre-processed expression."
 msgstr ""
 
-#: macrocmd.c:420
-msgid "Show the definition of MACRO, and its source location."
+#: macrocmd.c:521
+msgid ""
+"Show the definition of MACRO, and it's source location.\n"
+"Usage: info macro [-a|-all] [--] MACRO\n"
+"Options: \n"
+"  -a, --all    Output all definitions of MACRO in the current compilation "
+"unit.\n"
+"  --           Specify the end of arguments and the beginning of the MACRO."
+msgstr ""
+
+#: macrocmd.c:531
+msgid ""
+"Show the definitions of all macros at LINESPEC, or the current source "
+"location.\n"
+"Usage: info macros [LINESPEC]"
 msgstr ""
 
-#: macrocmd.c:423
+#: macrocmd.c:536
 msgid ""
 "Define a new C/C++ preprocessor macro.\n"
 "The GDB command `macro define DEFINITION' is equivalent to placing a\n"
@@ -13019,152 +13599,152 @@
 "  (gdb) macro define MIN(x,y) ((x) < (y) ? (x) : (y))"
 msgstr ""
 
-#: macrocmd.c:433
+#: macrocmd.c:546
 msgid ""
 "Remove the definition of the C/C++ preprocessor macro with the given name."
 msgstr ""
 
-#: macrocmd.c:438
+#: macrocmd.c:551
 msgid "List all the macros defined using the `macro define' command."
 msgstr ""
 
-#: macroexp.c:236
+#: macroexp.c:235
 msgid "Unterminated comment in macro expansion."
 msgstr ""
 
-#: macroexp.c:348
+#: macroexp.c:347
 msgid "A character constant must contain at least one character."
 msgstr ""
 
-#: macroexp.c:405
+#: macroexp.c:404
 msgid "Newline characters may not appear in string constants."
 msgstr ""
 
-#: macroexp.c:636
+#: macroexp.c:635
 msgid "unable to avoid splicing tokens during macro expansion"
 msgstr ""
 
-#: macroexp.c:812
+#: macroexp.c:811
 #, possible-c-format
 msgid "Malformed argument list for macro `%s'."
 msgstr ""
 
-#: macroexp.c:983
+#: macroexp.c:982
 msgid "Stringification operator requires an argument."
 msgstr ""
 
-#: macroexp.c:988
+#: macroexp.c:987
 msgid "Argument to stringification operator must name a macro parameter."
 msgstr ""
 
-#: macroexp.c:1002
+#: macroexp.c:1001
 msgid "Stray splicing operator"
 msgstr ""
 
-#: macroexp.c:1034
+#: macroexp.c:1033
 msgid "Splicing operator at end of macro"
 msgstr ""
 
-#: macroexp.c:1243
+#: macroexp.c:1242
 #, possible-c-format
 msgid "Wrong number of arguments to macro `%s' (expected %d, got %d)."
 msgstr ""
 
-#: macroexp.c:1277
+#: macroexp.c:1276
 msgid "bad macro definition kind"
 msgstr ""
 
-#: macroexp.c:1409
+#: macroexp.c:1408
 msgid "Expand-once not implemented yet."
 msgstr ""
 
-#: macroscope.c:79
+#: macroscope.c:78
 #, possible-c-format
 msgid ""
 "symtab found for `%s', but that file\n"
 "is not covered in the compilation unit's macro information"
 msgstr ""
 
-#: macrotab.c:474
+#: macrotab.c:473
 #, possible-c-format
 msgid "both `%s' and `%s' allegedly #included at %s:%d"
 msgstr ""
 
-#: macrotab.c:734
+#: macrotab.c:733
 #, possible-c-format
 msgid "macro `%s' redefined at %s:%d; original definition at %s:%d"
 msgstr ""
 
-#: macrotab.c:837
+#: macrotab.c:836
 #, possible-c-format
 msgid "macro '%s' is #undefined twice, at %s:%d and %s:%d"
 msgstr ""
 
-#: macrotab.c:857
+#: macrotab.c:856
 #, possible-c-format
 msgid "no definition for macro `%s' in scope to #undef at %s:%d"
 msgstr ""
 
-#: main.c:338
+#: main.c:345
 #, possible-c-format
 msgid "%s: warning: error finding working directory: %s\n"
 msgstr ""
 
-#: main.c:498
+#: main.c:504
 #, possible-c-format
 msgid "%s: TUI mode is not supported\n"
 msgstr ""
 
-#: main.c:573
+#: main.c:579
 #, possible-c-format
 msgid "%s: unable to load tclcommand file \"%s\""
 msgstr ""
 
-#: main.c:621
+#: main.c:627
 #, possible-c-format
 msgid "warning: could not set baud rate to `%s'.\n"
 msgstr ""
 
-#: main.c:638
+#: main.c:644
 #, possible-c-format
 msgid "warning: could not set timeout limit to `%s'.\n"
 msgstr ""
 
-#: main.c:647
+#: main.c:653
 #, possible-c-format
 msgid "Use `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: main.c:678
+#: main.c:684
 #, possible-c-format
 msgid "%s: `--args' specified but no program specified\n"
 msgstr ""
 
-#: main.c:715
+#: main.c:721
 #, possible-c-format
 msgid "Excess command line arguments ignored. (%s%s)\n"
 msgstr ""
 
-#: main.c:771
+#: main.c:777
 #, possible-c-format
 msgid "Interpreter `%s' unrecognized"
 msgstr ""
 
-#: main.c:802
+#: main.c:808
 msgid ""
 "\n"
 "warning: "
 msgstr ""
 
-#: main.c:858
+#: main.c:864
 msgid "Can't attach to process and specify a core file at the same time."
 msgstr ""
 
-#: main.c:891
+#: main.c:897
 msgid "warning: "
 msgstr ""
 
-#: main.c:965
+#: main.c:971
 msgid ""
 "This is the GNU debugger.  Usage:\n"
 "\n"
@@ -13175,12 +13755,12 @@
 "\n"
 msgstr ""
 
-#: main.c:971
+#: main.c:977
 msgid ""
 "  --args             Arguments after executable-file are passed to inferior\n"
 msgstr ""
 
-#: main.c:974
+#: main.c:980
 msgid ""
 "  -b BAUDRATE        Set serial port baud rate used for remote debugging.\n"
 "  --batch            Exit after processing options.\n"
@@ -13197,7 +13777,7 @@
 "  --pid=PID          Attach to running process PID.\n"
 msgstr ""
 
-#: main.c:989
+#: main.c:995
 msgid ""
 "  --dbx              DBX compatibility mode.\n"
 "  --directory=DIR    Search for source files in DIR.\n"
@@ -13207,27 +13787,27 @@
 "  --help             Print this message.\n"
 msgstr ""
 
-#: main.c:997
+#: main.c:1003
 msgid ""
 "  --interpreter=INTERP\n"
 "                     Select a specific interpreter / user interface\n"
 msgstr ""
 
-#: main.c:1001
+#: main.c:1007
 msgid ""
 "  -l TIMEOUT         Set timeout in seconds for remote debugging.\n"
 "  --nw\t\t     Do not use a window interface.\n"
 "  --nx               Do not read "
 msgstr ""
 
-#: main.c:1006
+#: main.c:1012
 msgid ""
 " file.\n"
 "  --quiet            Do not print version number on startup.\n"
 "  --readnow          Fully read symbol files on first access.\n"
 msgstr ""
 
-#: main.c:1010
+#: main.c:1016
 msgid ""
 "  --se=FILE          Use FILE as symbol file and executable file.\n"
 "  --symbols=SYMFILE  Read symbols from SYMFILE.\n"
@@ -13235,11 +13815,11 @@
 "debugged.\n"
 msgstr ""
 
-#: main.c:1016
+#: main.c:1022
 msgid "  --tui              Use a terminal user interface.\n"
 msgstr ""
 
-#: main.c:1020
+#: main.c:1026
 msgid ""
 "  --version          Print version information and then exit.\n"
 "  -w                 Use a window interface.\n"
@@ -13247,35 +13827,35 @@
 "  --xdb              XDB compatibility mode.\n"
 msgstr ""
 
-#: main.c:1026
+#: main.c:1032
 msgid ""
 "\n"
 "At startup, GDB reads the following init files and executes their commands:\n"
 msgstr ""
 
-#: main.c:1030
+#: main.c:1036
 #, possible-c-format
 msgid "   * system-wide init file: %s\n"
 msgstr ""
 
-#: main.c:1034
+#: main.c:1040
 #, possible-c-format
 msgid "   * user-specific init file: %s\n"
 msgstr ""
 
-#: main.c:1038
+#: main.c:1044
 #, possible-c-format
 msgid "   * local init file: ./%s\n"
 msgstr ""
 
-#: main.c:1041
+#: main.c:1047
 msgid ""
 "\n"
 "For more information, type \"help\" from within GDB, or consult the\n"
 "GDB manual (available as on-line info or a printed manual).\n"
 msgstr ""
 
-#: main.c:1046
+#: main.c:1052
 #, possible-c-format
 msgid "Report bugs to \"%s\".\n"
 msgstr ""
@@ -13285,126 +13865,126 @@
 msgid "Watchdog timer is %s.\n"
 msgstr ""
 
-#: maint.c:94
+#: maint.c:82
 msgid ""
 "\"maintenance\" must be followed by the name of a maintenance command.\n"
 msgstr ""
 
-#: maint.c:103
+#: maint.c:91
 msgid "Should GDB dump core? "
 msgstr ""
 
-#: maint.c:154
+#: maint.c:142
 msgid "\"maintenance demangle\" takes an argument to demangle.\n"
 msgstr ""
 
-#: maint.c:168
+#: maint.c:156
 #, possible-c-format
 msgid "Can't demangle \"%s\"\n"
 msgstr ""
 
-#: maint.c:177
+#: maint.c:165
 msgid "\"maintenance time\" takes a numeric argument.\n"
 msgstr ""
 
-#: maint.c:198
+#: maint.c:186
 msgid ""
 "\"maintenance info\" must be followed by the name of an info command.\n"
 msgstr ""
 
-#: maint.c:370
+#: maint.c:358
 msgid "Exec file:\n"
 msgstr ""
 
-#: maint.c:388
+#: maint.c:376
 #, possible-c-format
 msgid "  Object file: %s\n"
 msgstr ""
 
-#: maint.c:402
+#: maint.c:390
 msgid "Core file:\n"
 msgstr ""
 
-#: maint.c:430 regcache.c:1281
+#: maint.c:418 regcache.c:1363
 msgid "maintenance print architecture"
 msgstr ""
 
-#: maint.c:444
+#: maint.c:432
 msgid ""
 "\"maintenance print\" must be followed by the name of a print command.\n"
 msgstr ""
 
-#: maint.c:464
+#: maint.c:452
 msgid "requires argument (address or section + address)"
 msgstr ""
 
 #. End of command?
-#: maint.c:474
+#: maint.c:462
 msgid "Need to specify <section-name> and <address>"
 msgstr ""
 
-#: maint.c:486
+#: maint.c:474
 #, possible-c-format
 msgid "Unknown section %s."
 msgstr ""
 
-#: maint.c:515
+#: maint.c:503
 #, possible-c-format
 msgid "%s + %s in section %s of %s\n"
 msgstr ""
 
-#: maint.c:519
+#: maint.c:507
 #, possible-c-format
 msgid "%s + %s in section %s\n"
 msgstr ""
 
-#: maint.c:523
+#: maint.c:511
 #, possible-c-format
 msgid "%s + %s\n"
 msgstr ""
 
-#: maint.c:526
+#: maint.c:514
 #, possible-c-format
 msgid "no symbol at %s:%s\n"
 msgstr ""
 
-#: maint.c:529
+#: maint.c:517
 #, possible-c-format
 msgid "no symbol at %s\n"
 msgstr ""
 
-#: maint.c:544
+#: maint.c:532
 msgid ""
 "\"maintenance deprecate\" takes an argument,\n"
 "the command you want to deprecate, and optionally the replacement command\n"
 "enclosed in quotes.\n"
 msgstr ""
 
-#: maint.c:559
+#: maint.c:547
 msgid ""
 "\"maintenance undeprecate\" takes an argument, \n"
 "the command you want to undeprecate.\n"
 msgstr ""
 
-#: maint.c:591
+#: maint.c:579
 #, possible-c-format
 msgid "Can't find command '%s' to deprecate.\n"
 msgstr ""
 
-#: maint.c:658
+#: maint.c:646
 msgid "\"maintenance set\" must be followed by the name of a set command.\n"
 msgstr ""
 
-#: maint.c:676
+#: maint.c:664
 #, possible-c-format
 msgid "Internal profiling is %s.\n"
 msgstr ""
 
-#: maint.c:738
+#: maint.c:726
 msgid "Profiling support is not available on this system."
 msgstr ""
 
-#: maint.c:745
+#: maint.c:733
 msgid ""
 "Commands for use by GDB maintainers.\n"
 "Includes commands to dump specific internal GDB structures in\n"
@@ -13412,11 +13992,11 @@
 "to test internal functions such as the C++/ObjC demangler, etc."
 msgstr ""
 
-#: maint.c:755
+#: maint.c:743
 msgid "Commands for showing internal info about the program being debugged."
 msgstr ""
 
-#: maint.c:761
+#: maint.c:749
 msgid ""
 "List the BFD sections of the exec and core files. \n"
 "Arguments may be any combination of:\n"
@@ -13429,95 +14009,95 @@
 "lists all sections from all object files, including shared libraries."
 msgstr ""
 
-#: maint.c:774
+#: maint.c:762
 msgid "Maintenance command for printing GDB internal state."
 msgstr ""
 
-#: maint.c:778
+#: maint.c:766
 msgid ""
 "Set GDB internal variables used by the GDB maintainer.\n"
 "Configure variables internal to GDB that aid in GDB's maintenance"
 msgstr ""
 
-#: maint.c:785
+#: maint.c:773
 msgid ""
 "Show GDB internal variables used by the GDB maintainer.\n"
 "Configure variables internal to GDB that aid in GDB's maintenance"
 msgstr ""
 
-#: maint.c:793
+#: maint.c:781
 msgid ""
 "Get fatal error; make debugger dump its core.\n"
 "GDB sets its handling of SIGQUIT back to SIG_DFL and then sends\n"
 "itself a SIGQUIT signal."
 msgstr ""
 
-#: maint.c:801
+#: maint.c:789
 msgid ""
 "Give GDB an internal error.\n"
 "Cause GDB to behave as if an internal error was detected."
 msgstr ""
 
-#: maint.c:807
+#: maint.c:795
 msgid ""
 "Give GDB an internal warning.\n"
 "Cause GDB to behave as if an internal warning was reported."
 msgstr ""
 
-#: maint.c:812
+#: maint.c:800
 msgid ""
 "Demangle a C++/ObjC mangled name.\n"
 "Call internal GDB demangler routine to demangle a C++ link name\n"
 "and prints the result."
 msgstr ""
 
-#: maint.c:818
+#: maint.c:806
 msgid ""
 "Set the display of time usage.\n"
 "If nonzero, will cause the execution time for each command to be\n"
 "displayed, following the command's output."
 msgstr ""
 
-#: maint.c:824
+#: maint.c:812
 msgid ""
 "Set the display of space usage.\n"
 "If nonzero, will cause the execution space for each command to be\n"
 "displayed, following the command's output."
 msgstr ""
 
-#: maint.c:830
+#: maint.c:818
 msgid ""
 "Print a type chain for a given symbol.\n"
 "For each node in a type chain, print the raw data for each member of\n"
 "the type structure, and the interpretation of the data."
 msgstr ""
 
-#: maint.c:836
+#: maint.c:824
 msgid ""
 "Print dump of current symbol definitions.\n"
 "Entries in the full symbol table are dumped to file OUTFILE.\n"
 "If a SOURCE file is specified, dump only that file's symbols."
 msgstr ""
 
-#: maint.c:842
+#: maint.c:830
 msgid ""
 "Print dump of current minimal symbol definitions.\n"
 "Entries in the minimal symbol table are dumped to file OUTFILE.\n"
 "If a SOURCE file is specified, dump only that file's minimal symbols."
 msgstr ""
 
-#: maint.c:848
+#: maint.c:836
 msgid ""
 "Print dump of current partial symbol definitions.\n"
 "Entries in the partial symbol table are dumped to file OUTFILE.\n"
 "If a SOURCE file is specified, dump only that file's partial symbols."
 msgstr ""
 
-#: maint.c:855
+#: maint.c:843
 msgid "Print dump of current object file definitions."
 msgstr ""
 
-#: maint.c:858
+#: maint.c:846
 msgid ""
 "List the full symbol tables for all object files.\n"
 "This does not include information about individual symbols, blocks, or\n"
@@ -13525,32 +14105,32 @@
 "With an argument REGEXP, list the symbol tables whose names that match that."
 msgstr ""
 
-#: maint.c:865
+#: maint.c:853
 msgid ""
 "List the partial symbol tables for all object files.\n"
 "This does not include information about individual partial symbols,\n"
 "just the symbol table structures themselves."
 msgstr ""
 
-#: maint.c:872
+#: maint.c:860
 msgid "Print statistics about internal gdb state."
 msgstr ""
 
-#: maint.c:876
+#: maint.c:864
 msgid ""
 "Print the internal architecture configuration.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: maint.c:882
+#: maint.c:870
 msgid "Check consistency of psymtabs and symtabs."
 msgstr ""
 
-#: maint.c:887
+#: maint.c:875
 msgid "Translate a section name and address to a symbol."
 msgstr ""
 
-#: maint.c:890
+#: maint.c:878
 msgid ""
 "Deprecate a command.  Note that this is just in here so the \n"
 "testsuite can check the command deprecator. You probably shouldn't use "
@@ -13560,7 +14140,7 @@
 "replacement is optional."
 msgstr ""
 
-#: maint.c:897
+#: maint.c:885
 msgid ""
 "Undeprecate a command.  Note that this is just in here so the \n"
 "testsuite can check the command deprecator. You probably shouldn't use "
@@ -13568,278 +14148,274 @@
 "If you decide you want to use it: maintenance undeprecate 'commandname'"
 msgstr ""
 
-#: maint.c:903
+#: maint.c:891
 msgid "Set watchdog timer."
 msgstr ""
 
-#: maint.c:904
+#: maint.c:892
 msgid "Show watchdog timer."
 msgstr ""
 
-#: maint.c:905
+#: maint.c:893
 msgid ""
 "When non-zero, this timeout is used instead of waiting forever for a target\n"
 "to finish a low-level step or continue operation.  If the specified amount\n"
 "of time passes without a response from the target, an error occurs."
 msgstr ""
 
-#: maint.c:914
+#: maint.c:902
 msgid "Set internal profiling."
 msgstr ""
 
-#: maint.c:915
+#: maint.c:903
 msgid "Show internal profiling."
 msgstr ""
 
-#: maint.c:916
+#: maint.c:904
 msgid "When enabled GDB is profiled."
 msgstr ""
 
-#: mdebugread.c:127
+#: mdebugread.c:132
 #, possible-c-format
 msgid "bad aux index at symbol %s"
 msgstr ""
 
-#: mdebugread.c:133
+#: mdebugread.c:138
 #, possible-c-format
 msgid "unknown external symbol %s"
 msgstr ""
 
-#: mdebugread.c:139
+#: mdebugread.c:144
 #, possible-c-format
 msgid "cannot map ECOFF basic type 0x%x for %s"
 msgstr ""
 
-#: mdebugread.c:147
+#: mdebugread.c:152
 #, possible-c-format
 msgid "guessed tag type of %s incorrectly"
 msgstr ""
 
-#: mdebugread.c:153
+#: mdebugread.c:158
 #, possible-c-format
 msgid "bad rfd entry for %s: file %d, index %d"
 msgstr ""
 
-#: mdebugread.c:160
+#: mdebugread.c:165
 #, possible-c-format
 msgid "unexpected type code for %s"
 msgstr ""
 
-#: mdebugread.c:377
+#: mdebugread.c:382
 #, possible-c-format
 msgid ""
 "\n"
 "%s not compiled with -g, debugging support is limited.\n"
 msgstr ""
 
-#: mdebugread.c:380
+#: mdebugread.c:385
 msgid "You should compile with -g2 or -g3 for best debugging support.\n"
 msgstr ""
 
-#: mdebugread.c:725 mdebugread.c:1337
+#: mdebugread.c:730 mdebugread.c:1342
 #, possible-c-format
 msgid "unknown symbol type 0x%x"
 msgstr ""
 
-#: mdebugread.c:942
+#: mdebugread.c:947
 #, possible-c-format
 msgid "declaration block contains unhandled symbol type %d"
 msgstr ""
 
-#: mdebugread.c:1225
+#: mdebugread.c:1230
 #, possible-c-format
 msgid "stEnd with storage class %d not handled"
 msgstr ""
 
-#: mdebugread.c:1602
+#: mdebugread.c:1607
 #, possible-c-format
 msgid "can't handle TIR fBitfield for %s"
 msgstr ""
 
-#: mdebugread.c:1632
+#: mdebugread.c:1637
 #, possible-c-format
 msgid "unable to cross ref btIndirect for %s"
 msgstr ""
 
-#: mdebugread.c:1749
+#: mdebugread.c:1754
 #, possible-c-format
 msgid "unable to cross ref btTypedef for %s"
 msgstr ""
 
-#: mdebugread.c:1796
+#: mdebugread.c:1801
 #, possible-c-format
 msgid "illegal TIR continued for %s"
 msgstr ""
 
-#: mdebugread.c:1859
+#: mdebugread.c:1864
 #, possible-c-format
 msgid "illegal array index type for %s, assuming int"
 msgstr ""
 
-#: mdebugread.c:1907
+#: mdebugread.c:1912
 #, possible-c-format
 msgid "unknown type qualifier 0x%x"
 msgstr ""
 
-#: mdebugread.c:1942
+#: mdebugread.c:1947
 #, possible-c-format
 msgid "can't handle PDR for static proc at 0x%lx"
 msgstr ""
 
-#: mdebugread.c:2004
+#: mdebugread.c:2009
 #, possible-c-format
 msgid "PDR for %s, but no symbol"
 msgstr ""
 
-#: mdebugread.c:2129
+#: mdebugread.c:2134
 #, possible-c-format
 msgid "Warning: %s `%s' is undefined (in %s)\n"
 msgstr ""
 
-#: mdebugread.c:2231
+#: mdebugread.c:2236
 #, possible-c-format
 msgid "guessed size of linetable for %s incorrectly"
 msgstr ""
 
-#: mdebugread.c:2509
+#: mdebugread.c:2514
 #, possible-c-format
 msgid "bad ifd for external symbol: %d (max %ld)"
 msgstr ""
 
-#: mdebugread.c:2516
+#: mdebugread.c:2521
 #, possible-c-format
 msgid "bad iss for external symbol: %ld (max %ld)"
 msgstr ""
 
-#: mdebugread.c:3536
+#: mdebugread.c:3541
 #, possible-c-format
 msgid "bad proc end in aux found from symbol %s"
 msgstr ""
 
-#: mdebugread.c:3651
+#: mdebugread.c:3656
 #, possible-c-format
 msgid "bad aux index at block symbol %s"
 msgstr ""
 
 #. Both complaints are valid:  one gives symbol name,
 #. the other the offending symbol type.
-#: mdebugread.c:3671
+#: mdebugread.c:3676
 #, possible-c-format
 msgid "unknown local symbol %s"
 msgstr ""
 
-#: mdebugread.c:3673
+#: mdebugread.c:3678
 #, possible-c-format
 msgid "with type %d"
 msgstr ""
 
-#: mdebugread.c:3836
+#: mdebugread.c:3841
 #, possible-c-format
 msgid "bad file number %ld"
 msgstr ""
 
-#: mdebugread.c:4148
+#: mdebugread.c:4153
 #, possible-c-format
 msgid "unknown stabs symbol %s"
 msgstr ""
 
-#: mdebugread.c:4335
+#: mdebugread.c:4347
 #, possible-c-format
 msgid "File %s contains %d unresolved references:"
 msgstr ""
 
-#: mdebugread.c:4512
+#: mdebugread.c:4524
 #, possible-c-format
 msgid "illegal tq0 in forward typedef for %s"
 msgstr ""
 
-#: mdebugread.c:4550
+#: mdebugread.c:4562
 #, possible-c-format
 msgid "illegal bt %d in forward typedef for %s"
 msgstr ""
 
-#: mdebugread.c:4917
+#: mdebugread.c:4930
 #, possible-c-format
 msgid "Error reading ECOFF debugging information: %s"
 msgstr ""
 
-#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:211
-msgid "Software breakpoints not implemented for this target."
-msgstr ""
-
-#: memattr.c:78
+#: memattr.c:77
 msgid "Unknown memory addresses will be treated as inaccessible.\n"
 msgstr ""
 
-#: memattr.c:81
+#: memattr.c:80
 msgid "Unknown memory addresses will be treated as RAM.\n"
 msgstr ""
 
-#: memattr.c:148
+#: memattr.c:147
 msgid ""
 "Switching to manual control of memory regions; use \"mem auto\" to fetch "
 "regions from the target again."
 msgstr ""
 
-#: memattr.c:184
+#: memattr.c:183
 msgid "invalid memory region: low >= high\n"
 msgstr ""
 
-#: memattr.c:213
+#: memattr.c:212
 msgid "overlapping memory region\n"
 msgstr ""
 
-#: memattr.c:324
+#: memattr.c:323
 msgid "No mem"
 msgstr ""
 
-#: memattr.c:346
+#: memattr.c:345
 msgid "no lo address"
 msgstr ""
 
-#: memattr.c:351
+#: memattr.c:350
 msgid "no hi address"
 msgstr ""
 
-#: memattr.c:369
+#: memattr.c:368
 msgid "region bounds not 16 bit aligned"
 msgstr ""
 
-#: memattr.c:375
+#: memattr.c:374
 msgid "region bounds not 32 bit aligned"
 msgstr ""
 
-#: memattr.c:381
+#: memattr.c:380
 msgid "region bounds not 64 bit aligned"
 msgstr ""
 
-#: memattr.c:405
+#: memattr.c:404
 #, possible-c-format
 msgid "unknown attribute: %s"
 msgstr ""
 
-#: memattr.c:420
+#: memattr.c:419
 msgid "Using memory regions provided by the target.\n"
 msgstr ""
 
-#: memattr.c:422
+#: memattr.c:421
 msgid "Using user-defined memory regions.\n"
 msgstr ""
 
-#: memattr.c:428
+#: memattr.c:427
 msgid "There are no memory regions defined.\n"
 msgstr ""
 
-#: memattr.c:561 memattr.c:608 memattr.c:650 memattr.c:660
+#: memattr.c:560 memattr.c:607 memattr.c:649 memattr.c:659
 #, possible-c-format
 msgid "No memory region number %d.\n"
 msgstr ""
 
-#: memattr.c:679
+#: memattr.c:678
 msgid "Delete all memory regions? "
 msgstr ""
 
-#: memattr.c:708
+#: memattr.c:707
 msgid ""
 "Define attributes for memory region or reset memory region handling to\n"
 "target-based.\n"
@@ -13850,7 +14426,7 @@
 "      <cache> may be cache or nocache"
 msgstr ""
 
-#: memattr.c:717
+#: memattr.c:716
 msgid ""
 "Enable memory region.\n"
 "Arguments are the code numbers of the memory regions to enable.\n"
@@ -13858,7 +14434,7 @@
 "Do \"info mem\" to see current list of code numbers."
 msgstr ""
 
-#: memattr.c:723
+#: memattr.c:722
 msgid ""
 "Disable memory region.\n"
 "Arguments are the code numbers of the memory regions to disable.\n"
@@ -13866,7 +14442,7 @@
 "Do \"info mem\" to see current list of code numbers."
 msgstr ""
 
-#: memattr.c:729
+#: memattr.c:728
 msgid ""
 "Delete memory region.\n"
 "Arguments are the code numbers of the memory regions to delete.\n"
@@ -13874,198 +14450,223 @@
 "Do \"info mem\" to see current list of code numbers."
 msgstr ""
 
-#: memattr.c:736
+#: memattr.c:735
 msgid "Memory region attributes"
 msgstr ""
 
 #. allow-unknown
-#: memattr.c:738 memattr.c:742
+#: memattr.c:737 memattr.c:741
 msgid "Memory regions settings"
 msgstr ""
 
-#: memattr.c:748
+#: memattr.c:747
 msgid "Set handling of unknown memory regions."
 msgstr ""
 
-#: memattr.c:749
+#: memattr.c:748
 msgid "Show handling of unknown memory regions."
 msgstr ""
 
-#: memattr.c:750
+#: memattr.c:749
 msgid ""
 "If on, and some memory map is defined, debugger will emit errors on\n"
 "accesses to memory not defined in the memory map. If off, accesses to all\n"
 "memory addresses will be allowed."
 msgstr ""
 
-#: memory-map.c:38
+#: mem-break.c:54 microblaze-linux-tdep.c:53 ppc-linux-tdep.c:210
+msgid "Software breakpoints not implemented for this target."
+msgstr ""
+
+#: memory-map.c:37
 msgid ""
 "Can not parse XML memory map; XML support was disabled at compile time"
 msgstr ""
 
-#: memory-map.c:90
+#: memory-map.c:89
 msgid "Flash block size is not set"
 msgstr ""
 
-#: memory-map.c:125
+#: memory-map.c:124
 #, possible-c-format
 msgid "Unknown property \"%s\""
 msgstr ""
 
-#: memory-map.c:187
+#: memory-map.c:186
 msgid "target memory map"
 msgstr ""
 
 #. Return values larger than a single register are returned in
 #. memory, pointed to by R0.  Unfortunately, we can't count on R0
 #. pointing to the return buffer, so we raise an error here.
-#: mep-tdep.c:2191 mep-tdep.c:2218
+#: mep-tdep.c:2190 mep-tdep.c:2217
 msgid ""
 "GDB cannot set return values larger than four bytes; the Media Processor's\n"
 "calling conventions do not provide enough information to do this.\n"
 "Try using the 'return' command with no argument."
 msgstr ""
 
-#: mep-tdep.c:2434
+#: mep-tdep.c:2433
 #, possible-c-format
 msgid ""
 "the MeP module '%s' is %s-endian, but the executable\n"
 "%s is %s-endian."
 msgstr ""
 
-#: mep-tdep.c:2439
+#: mep-tdep.c:2438
 #, possible-c-format
 msgid ""
 "the selected MeP module is %s-endian, but the executable\n"
 "%s is %s-endian."
 msgstr ""
 
-#. mi_error_message = xstrprintf ("-var-create: Usage:
-#. ...."); return MI_CMD_ERROR;
-#: mi/mi-cmd-var.c:113
-msgid "-var-create: Usage: NAME FRAME EXPRESSION."
+#: mi/mi-cmd-break.c:140
+msgid "-break-insert: Missing <location>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:133
-msgid "-var-create: name of object must begin with a letter"
+#: mi/mi-cmd-break.c:142
+msgid "-break-insert: Garbage following <location>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:153
-msgid "-var-create: unable to create variable object"
+#: mi/mi-cmd-break.c:191
+msgid "Usage: tracepoint-number passcount"
 msgstr ""
 
-#: mi/mi-cmd-var.c:172
-msgid "-var-delete: Usage: [-c] EXPRESSION."
+#: mi/mi-cmd-break.c:204
+#, possible-c-format
+msgid "Could not find tracepoint %d"
 msgstr ""
 
-#: mi/mi-cmd-var.c:184
-msgid ""
-"-var-delete: Missing required argument after '-c': variable object name"
+#: mi/mi-cmd-break.c:252
+msgid "-break-watch: Missing <expression>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:187
-msgid "-var-delete: Illegal variable object name"
+#: mi/mi-cmd-break.c:254
+msgid "-break-watch: Garbage following <expression>"
 msgstr ""
 
-#: mi/mi-cmd-var.c:195
-msgid "-var-delete: Invalid option."
+#: mi/mi-cmd-break.c:270
+msgid "-break-watch: Unknown watchpoint type."
 msgstr ""
 
-#: mi/mi-cmd-var.c:237
-msgid ""
-"Must specify the format as: \"natural\", \"binary\", \"decimal\", "
-"\"hexadecimal\", or \"octal\""
+#: mi/mi-cmd-break.c:301
+#, possible-c-format
+msgid "USAGE: %s <BKPT> [<COMMAND> [<COMMAND>...]]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:249
-msgid "-var-set-format: Usage: NAME FORMAT."
+#: mi/mi-cmd-break.c:305
+#, possible-c-format
+msgid "breakpoint number argument \"%s\" is not a number."
 msgstr ""
 
-#: mi/mi-cmd-var.c:274
-msgid "Usage: NAME VISUALIZER_FUNCTION."
+#: mi/mi-cmd-break.c:308
+#, possible-c-format
+msgid "junk at the end of breakpoint number argument \"%s\"."
 msgstr ""
 
-#: mi/mi-cmd-var.c:279 varobj.c:704
-msgid "Variable object not found"
+#: mi/mi-cmd-break.c:313
+#, possible-c-format
+msgid "breakpoint %d not found."
 msgstr ""
 
-#: mi/mi-cmd-var.c:291
-msgid "-var-set-format: Usage: NAME FROZEN_FLAG."
+#: mi/mi-cmd-disas.c:136
+msgid ""
+"-data-disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s "
+"startaddr -e endaddr]) [--] mode."
 msgstr ""
 
-#: mi/mi-cmd-var.c:300
-msgid "Invalid flag value"
+#: mi/mi-cmd-disas.c:140
+msgid ""
+"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s "
+"startaddr -e endaddr] [--] mode."
 msgstr ""
 
-#: mi/mi-cmd-var.c:317
-msgid "-var-show-format: Usage: NAME."
+#: mi/mi-cmd-disas.c:145
+msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3."
 msgstr ""
 
-#: mi/mi-cmd-var.c:334
-msgid "-var-info-num-children: Usage: NAME."
+#: mi/mi-cmd-disas.c:162
+msgid "-data-disassemble: Invalid filename."
+msgstr ""
+
+#: mi/mi-cmd-disas.c:164
+msgid "-data-disassemble: Invalid line number"
+msgstr ""
+
+#: mi/mi-cmd-disas.c:166
+msgid "-data-disassemble: No function contains specified address"
+msgstr ""
+
+#: mi/mi-cmd-env.c:74
+msgid "-environment-pwd: No arguments required"
 msgstr ""
 
-#: mi/mi-cmd-var.c:357
+#: mi/mi-cmd-env.c:85
 #, possible-c-format
-msgid ""
-"Unknown value for PRINT_VALUES\n"
-"Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""
+msgid "-environment-pwd: error finding name of working directory: %s"
 msgstr ""
 
-#: mi/mi-cmd-var.c:406
-msgid "-var-list-children: Usage: [PRINT_VALUES] NAME [FROM TO]"
+#: mi/mi-cmd-env.c:96
+msgid "-environment-cd: Usage DIRECTORY"
 msgstr ""
 
-#: mi/mi-cmd-var.c:472
-msgid "-var-info-type: Usage: NAME."
+#: mi/mi-cmd-env.c:260
+msgid "-inferior-tty-show: Usage: No args"
 msgstr ""
 
-#: mi/mi-cmd-var.c:487
-msgid "Usage: NAME."
+#: mi/mi-cmd-file.c:39
+msgid "-file-list-exec-source-file: Usage: No args"
 msgstr ""
 
-#: mi/mi-cmd-var.c:504
-msgid "-var-info-expression: Usage: NAME."
+#: mi/mi-cmd-file.c:49
+msgid "-file-list-exec-source-file: No symtab"
 msgstr ""
 
-#: mi/mi-cmd-var.c:523
-msgid "-var-show-attributes: Usage: NAME."
+#: mi/mi-cmd-file.c:90
+msgid "-file-list-exec-source-files: Usage: No args"
 msgstr ""
 
-#: mi/mi-cmd-var.c:573
-msgid "Cannot specify format more than once"
+#: mi/mi-cmd-stack.c:57
+msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:582
-msgid "Usage: [-f FORMAT] NAME"
+#: mi/mi-cmd-stack.c:80
+msgid "-stack-list-frames: Not enough frames in stack."
 msgstr ""
 
-#: mi/mi-cmd-var.c:585
-msgid "Garbage at end of command"
+#: mi/mi-cmd-stack.c:107
+msgid "-stack-info-depth: Usage: [MAX_DEPTH]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:613
-msgid "-var-assign: Usage: NAME EXPRESSION."
+#: mi/mi-cmd-stack.c:137
+#, possible-c-format
+msgid ""
+"Unknown value for PRINT_VALUES: must be: 0 or \"%s\", 1 or \"%s\", 2 or "
+"\"%s\""
 msgstr ""
 
-#: mi/mi-cmd-var.c:619
-msgid "-var-assign: Variable object is not editable"
+#: mi/mi-cmd-stack.c:151
+msgid "-stack-list-locals: Usage: PRINT_VALUES"
 msgstr ""
 
-#: mi/mi-cmd-var.c:624
-msgid "-var-assign: Could not assign expression to variable object"
+#: mi/mi-cmd-stack.c:173
+msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]"
 msgstr ""
 
-#: mi/mi-cmd-var.c:675
-msgid "-var-update: Usage: [PRINT_VALUES] NAME."
+#: mi/mi-cmd-stack.c:199
+msgid "-stack-list-arguments: Not enough frames in stack."
 msgstr ""
 
-#: mi/mi-cmd-var.c:822
-msgid "-enable-pretty-printing: no arguments allowed"
+#: mi/mi-cmd-stack.c:232
+msgid "Usage: PRINT_VALUES"
 msgstr ""
 
-#: mi/mi-cmd-var.c:833
-msgid "-var-set-update-range: Usage: VAROBJ FROM TO"
+#: mi/mi-cmd-stack.c:440
+msgid "-stack-select-frame: Usage: FRAME_SPEC"
+msgstr ""
+
+#: mi/mi-cmd-stack.c:449
+msgid "-stack-info-frame: No arguments required"
 msgstr ""
 
 #: mi/mi-cmd-target.c:40
@@ -14080,512 +14681,482 @@
 msgid "-target-file-delete: Usage: REMOTE_FILE"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:56
-msgid "-stack-list-frames: Usage: [FRAME_LOW FRAME_HIGH]"
+#. mi_error_message = xstrprintf ("-var-create: Usage:
+#. ...."); return MI_CMD_ERROR;
+#: mi/mi-cmd-var.c:115
+msgid "-var-create: Usage: NAME FRAME EXPRESSION."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:79
-msgid "-stack-list-frames: Not enough frames in stack."
+#: mi/mi-cmd-var.c:135
+msgid "-var-create: name of object must begin with a letter"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:106
-msgid "-stack-info-depth: Usage: [MAX_DEPTH]"
+#: mi/mi-cmd-var.c:155
+msgid "-var-create: unable to create variable object"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:136
-#, possible-c-format
+#: mi/mi-cmd-var.c:175
+msgid "-var-delete: Usage: [-c] EXPRESSION."
+msgstr ""
+
+#: mi/mi-cmd-var.c:187
 msgid ""
-"Unknown value for PRINT_VALUES: must be: 0 or \"%s\", 1 or \"%s\", 2 or "
-"\"%s\""
+"-var-delete: Missing required argument after '-c': variable object name"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:150
-msgid "-stack-list-locals: Usage: PRINT_VALUES"
+#: mi/mi-cmd-var.c:190
+msgid "-var-delete: Illegal variable object name"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:171
-msgid "-stack-list-arguments: Usage: PRINT_VALUES [FRAME_LOW FRAME_HIGH]"
+#: mi/mi-cmd-var.c:198
+msgid "-var-delete: Invalid option."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:197
-msgid "-stack-list-arguments: Not enough frames in stack."
+#: mi/mi-cmd-var.c:240
+msgid ""
+"Must specify the format as: \"natural\", \"binary\", \"decimal\", "
+"\"hexadecimal\", or \"octal\""
 msgstr ""
 
-#: mi/mi-cmd-stack.c:230
-msgid "Usage: PRINT_VALUES"
+#: mi/mi-cmd-var.c:253
+msgid "-var-set-format: Usage: NAME FORMAT."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:354 mi/mi-cmd-stack.c:377 python/py-prettyprint.c:293
-#, possible-c-format
-msgid "<error reading variable: %s>"
+#: mi/mi-cmd-var.c:278
+msgid "Usage: NAME VISUALIZER_FUNCTION."
 msgstr ""
 
-#: mi/mi-cmd-stack.c:402
-msgid "-stack-select-frame: Usage: FRAME_SPEC"
+#: mi/mi-cmd-var.c:283 varobj.c:734
+msgid "Variable object not found"
 msgstr ""
 
-#: mi/mi-cmd-stack.c:411
-msgid "-stack-info-frame: No arguments required"
+#: mi/mi-cmd-var.c:295
+msgid "-var-set-format: Usage: NAME FROZEN_FLAG."
 msgstr ""
 
-#: mi/mi-cmd-disas.c:136
-msgid ""
-"-data-disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s "
-"startaddr -e endaddr]) [--] mode."
+#: mi/mi-cmd-var.c:304
+msgid "Invalid flag value"
 msgstr ""
 
-#: mi/mi-cmd-disas.c:140
+#: mi/mi-cmd-var.c:322
+msgid "-var-show-format: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:340
+msgid "-var-info-num-children: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:363
+#, possible-c-format
 msgid ""
-"-data-disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s "
-"startaddr -e endaddr] [--] mode."
+"Unknown value for PRINT_VALUES\n"
+"Must be: 0 or \"%s\", 1 or \"%s\", 2 or \"%s\""
 msgstr ""
 
-#: mi/mi-cmd-disas.c:145
-msgid "-data-disassemble: Mode argument must be 0, 1, 2, or 3."
+#: mi/mi-cmd-var.c:413
+msgid "-var-list-children: Usage: [PRINT_VALUES] NAME [FROM TO]"
 msgstr ""
 
-#: mi/mi-cmd-disas.c:162
-msgid "-data-disassemble: Invalid filename."
+#: mi/mi-cmd-var.c:480
+msgid "-var-info-type: Usage: NAME."
 msgstr ""
 
-#: mi/mi-cmd-disas.c:164
-msgid "-data-disassemble: Invalid line number"
+#: mi/mi-cmd-var.c:496
+msgid "Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:514
+msgid "-var-info-expression: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:534
+msgid "-var-show-attributes: Usage: NAME."
+msgstr ""
+
+#: mi/mi-cmd-var.c:585
+msgid "Cannot specify format more than once"
+msgstr ""
+
+#: mi/mi-cmd-var.c:594
+msgid "Usage: [-f FORMAT] NAME"
+msgstr ""
+
+#: mi/mi-cmd-var.c:597
+msgid "Garbage at end of command"
+msgstr ""
+
+#: mi/mi-cmd-var.c:626
+msgid "-var-assign: Usage: NAME EXPRESSION."
+msgstr ""
+
+#: mi/mi-cmd-var.c:632
+msgid "-var-assign: Variable object is not editable"
+msgstr ""
+
+#: mi/mi-cmd-var.c:637
+msgid "-var-assign: Could not assign expression to variable object"
+msgstr ""
+
+#: mi/mi-cmd-var.c:689
+msgid "-var-update: Usage: [PRINT_VALUES] NAME."
 msgstr ""
 
-#: mi/mi-cmd-disas.c:166
-msgid "-data-disassemble: No function contains specified address"
+#: mi/mi-cmd-var.c:837
+msgid "-enable-pretty-printing: no arguments allowed"
 msgstr ""
 
-#: mi/mi-cmd-env.c:73
-msgid "-environment-pwd: No arguments required"
+#: mi/mi-cmd-var.c:848
+msgid "-var-set-update-range: Usage: VAROBJ FROM TO"
 msgstr ""
 
-#: mi/mi-cmd-env.c:84
+#: mi/mi-cmds.c:218
 #, possible-c-format
-msgid "-environment-pwd: error finding name of working directory: %s"
+msgid "command `%s' appears to be duplicated"
 msgstr ""
 
-#: mi/mi-cmd-env.c:95
-msgid "-environment-cd: Usage DIRECTORY"
+#: mi/mi-console.c:68
+msgid "mi_console_file_delete: bad magic number"
 msgstr ""
 
-#: mi/mi-cmd-env.c:257
-msgid "-inferior-tty-show: Usage: No args"
+#: mi/mi-console.c:98
+msgid "mi_console_file_transform: bad magic number"
+msgstr ""
+
+#: mi/mi-console.c:126
+msgid "mi_console_file_flush: bad magic number"
 msgstr ""
 
-#: mi/mi-getopt.c:37
+#: mi/mi-getopt.c:36
 msgid "mi_getopt_long: optind out of bounds"
 msgstr ""
 
-#: mi/mi-getopt.c:63
+#: mi/mi-getopt.c:62
 #, possible-c-format
 msgid "%s: Option %s requires an argument"
 msgstr ""
 
-#: mi/mi-getopt.c:75
+#: mi/mi-getopt.c:74
 #, possible-c-format
 msgid "%s: Unknown option ``%s''"
 msgstr ""
 
-#: mi/mi-cmds.c:217
+#: mi/mi-interp.c:219
+msgid "-interpreter-exec: Usage: -interpreter-exec interp command"
+msgstr ""
+
+#: mi/mi-interp.c:224
 #, possible-c-format
-msgid "command `%s' appears to be duplicated"
+msgid "-interpreter-exec: could not find interpreter \"%s\""
 msgstr ""
 
-#: mi/mi-main.c:289 mi/mi-main.c:295 reverse.c:54 reverse.c:61
+#: mi/mi-interp.c:228
 #, possible-c-format
-msgid "Target %s does not support this command."
+msgid ""
+"-interpreter-exec: interpreter \"%s\" does not support command execution"
 msgstr ""
 
-#: mi/mi-main.c:292
+#: mi/mi-main.c:290
 msgid "Already in reverse mode."
 msgstr ""
 
-#: mi/mi-main.c:423
+#: mi/mi-main.c:293 reverse.c:57
+#, possible-c-format
+msgid "Target %s does not support this command."
+msgstr ""
+
+#: mi/mi-main.c:421
 msgid "Usage: -target-detach [pid | thread-group]"
 msgstr ""
 
-#: mi/mi-main.c:438
+#: mi/mi-main.c:436
 #, possible-c-format
 msgid "Invalid syntax of thread-group id '%s'"
 msgstr ""
 
-#: mi/mi-main.c:442
+#: mi/mi-main.c:440
 #, possible-c-format
 msgid "Non-existent thread-group id '%d'"
 msgstr ""
 
-#: mi/mi-main.c:452
+#: mi/mi-main.c:450
 #, possible-c-format
 msgid "Invalid identifier '%s'"
 msgstr ""
 
-#: mi/mi-main.c:459
+#: mi/mi-main.c:457
 msgid "Thread group is empty"
 msgstr ""
 
-#: mi/mi-main.c:474
+#: mi/mi-main.c:472
 msgid "-thread-select: USAGE: threadnum."
 msgstr ""
 
-#: mi/mi-main.c:492
+#: mi/mi-main.c:490
 msgid "-thread-list-ids: No arguments required."
 msgstr ""
 
-#: mi/mi-main.c:507
+#: mi/mi-main.c:505 mi/mi-main.c:2515
 msgid "Invalid MI command"
 msgstr ""
 
-#: mi/mi-main.c:830
+#: mi/mi-main.c:831
 msgid "only '0' and '1' are valid values for the '--recurse' option"
 msgstr ""
 
-#: mi/mi-main.c:842 mi/mi-main.c:847
+#: mi/mi-main.c:843 mi/mi-main.c:848
 #, possible-c-format
 msgid "invalid syntax of group id '%s'"
 msgstr ""
 
-#: mi/mi-main.c:868
+#: mi/mi-main.c:869
 #, possible-c-format
 msgid "Non-existent thread group id '%d'"
 msgstr ""
 
-#: mi/mi-main.c:930 mi/mi-main.c:1007 mi/mi-main.c:1106 mi/mi-main.c:1220
+#: mi/mi-main.c:932 mi/mi-main.c:1010 mi/mi-main.c:1110 mi/mi-main.c:1225
 msgid "bad register number"
 msgstr ""
 
-#: mi/mi-main.c:982 mi/mi-main.c:1001
+#: mi/mi-main.c:985 mi/mi-main.c:1004
 msgid "-data-list-changed-registers: Unable to read register contents."
 msgstr ""
 
-#: mi/mi-main.c:1063
+#: mi/mi-main.c:1067
 msgid ""
 "-data-list-register-values: Usage: -data-list-register-values <format> "
 "[<regnum1>...<regnumN>]"
 msgstr ""
 
-#: mi/mi-main.c:1129
+#: mi/mi-main.c:1134
 msgid "Optimized out"
 msgstr ""
 
-#: mi/mi-main.c:1188
+#: mi/mi-main.c:1193
 msgid ""
 "-data-write-register-values: Usage: -data-write-register-values <format> "
 "[<regnum1> <value1>...<regnumN> <valueN>]"
 msgstr ""
 
-#: mi/mi-main.c:1194
+#: mi/mi-main.c:1199
 msgid "-data-write-register-values: No registers."
 msgstr ""
 
-#: mi/mi-main.c:1197
+#: mi/mi-main.c:1202
 msgid "-data-write-register-values: No regs and values specified."
 msgstr ""
 
-#: mi/mi-main.c:1200
+#: mi/mi-main.c:1205
 msgid "-data-write-register-values: Regs and vals are not in pairs."
 msgstr ""
 
-#: mi/mi-main.c:1241
+#: mi/mi-main.c:1247
 msgid ""
 "-data-evaluate-expression: Usage: -data-evaluate-expression expression"
 msgstr ""
 
-#: mi/mi-main.c:1328
+#: mi/mi-main.c:1335
 msgid ""
 "-data-read-memory: Usage: ADDR WORD-FORMAT WORD-SIZE NR-ROWS NR-COLS "
 "[ASCHAR]."
 msgstr ""
 
-#: mi/mi-main.c:1365
+#: mi/mi-main.c:1372
 msgid "-data-read-memory: invalid number of rows."
 msgstr ""
 
-#: mi/mi-main.c:1370
+#: mi/mi-main.c:1377
 msgid "-data-read-memory: invalid number of columns."
 msgstr ""
 
-#: mi/mi-main.c:1389 mi/mi-main.c:1522
+#: mi/mi-main.c:1396 mi/mi-main.c:1530
 msgid "Unable to read memory."
 msgstr ""
 
-#: mi/mi-main.c:1512
+#: mi/mi-main.c:1520
 msgid "Usage: [ -o OFFSET ] ADDR LENGTH."
 msgstr ""
 
-#: mi/mi-main.c:1614
+#: mi/mi-main.c:1622
 msgid ""
 "-data-write-memory: Usage: [-o COLUMN_OFFSET] ADDR FORMAT WORD-SIZE VALUE."
 msgstr ""
 
-#: mi/mi-main.c:1655
+#: mi/mi-main.c:1663
 msgid "Usage: ADDR DATA."
 msgstr ""
 
-#: mi/mi-main.c:1673
+#: mi/mi-main.c:1681
 msgid "Could not write memory"
 msgstr ""
 
-#: mi/mi-main.c:1699
+#: mi/mi-main.c:1707
 #, possible-c-format
 msgid "-enable-timings: Usage: %s {yes|no}"
 msgstr ""
 
-#: mi/mi-main.c:1723
+#: mi/mi-main.c:1734
 msgid "-list-features should be passed no arguments"
 msgstr ""
 
-#: mi/mi-main.c:1743
+#: mi/mi-main.c:1755
 msgid "-list-target-features should be passed no arguments"
 msgstr ""
 
-#: mi/mi-main.c:1752
+#: mi/mi-main.c:1764
 msgid "-add-inferior should be passed no arguments"
 msgstr ""
 
-#: mi/mi-main.c:1778
+#: mi/mi-main.c:1790
 msgid "-remove-inferior should be passed a single argument"
 msgstr ""
 
-#: mi/mi-main.c:1781
+#: mi/mi-main.c:1793
 msgid "the thread group id is syntactically invalid"
 msgstr ""
 
-#: mi/mi-main.c:1785
+#: mi/mi-main.c:1797
 msgid "the specified thread group does not exist"
 msgstr ""
 
-#: mi/mi-main.c:1788
+#: mi/mi-main.c:1800
 msgid "cannot remove an active inferior"
 msgstr ""
 
-#: mi/mi-main.c:1797
+#: mi/mi-main.c:1809
 msgid "Cannot remove last inferior"
 msgstr ""
 
-#: mi/mi-main.c:2032
+#: mi/mi-main.c:2043
 msgid "Cannot specify --thread-group together with --all"
 msgstr ""
 
-#: mi/mi-main.c:2035
+#: mi/mi-main.c:2046
 msgid "Cannot specify --thread together with --all"
 msgstr ""
 
-#: mi/mi-main.c:2038
+#: mi/mi-main.c:2049
 msgid "Cannot specify --thread together with --thread-group"
 msgstr ""
 
-#: mi/mi-main.c:2041
+#: mi/mi-main.c:2052
 msgid "Cannot specify --frame without --thread"
 msgstr ""
 
-#: mi/mi-main.c:2049
+#: mi/mi-main.c:2060
 msgid "Invalid thread group for the --thread-group option"
 msgstr ""
 
-#: mi/mi-main.c:2067
+#: mi/mi-main.c:2078
 #, possible-c-format
 msgid "Invalid thread id: %d"
 msgstr ""
 
-#: mi/mi-main.c:2070
+#: mi/mi-main.c:2081
 #, possible-c-format
 msgid "Thread id: %d has terminated"
 msgstr ""
 
-#: mi/mi-main.c:2085
+#: mi/mi-main.c:2096
 #, possible-c-format
 msgid "Invalid frame id: %d"
 msgstr ""
 
-#: mi/mi-main.c:2329
+#: mi/mi-main.c:2342
 msgid "Usage: -trace-define-variable VARIABLE [VALUE]"
 msgstr ""
 
-#: mi/mi-main.c:2343
+#: mi/mi-main.c:2356
 msgid "Invalid name of trace variable"
 msgstr ""
 
-#: mi/mi-main.c:2361
+#: mi/mi-main.c:2374
 msgid "-trace-list-variables: no arguments are allowed"
 msgstr ""
 
-#: mi/mi-main.c:2372
+#: mi/mi-main.c:2385
 msgid "trace selection mode is required"
 msgstr ""
 
-#: mi/mi-main.c:2383 tracepoint.c:2084 tracepoint.c:2142 tracepoint.c:2160
-#: tracepoint.c:2199 tracepoint.c:2263 tracepoint.c:2296
+#: mi/mi-main.c:2396 tracepoint.c:2335 tracepoint.c:2393 tracepoint.c:2411
+#: tracepoint.c:2450 tracepoint.c:2514 tracepoint.c:2547
 msgid "May not look at trace frames while trace is running."
 msgstr ""
 
-#: mi/mi-main.c:2388
+#: mi/mi-main.c:2401
 msgid "frame number is required"
 msgstr ""
 
-#: mi/mi-main.c:2394
+#: mi/mi-main.c:2407
 msgid "tracepoint number is required"
 msgstr ""
 
-#: mi/mi-main.c:2400
+#: mi/mi-main.c:2413
 msgid "PC is required"
 msgstr ""
 
-#: mi/mi-main.c:2406 mi/mi-main.c:2413
+#: mi/mi-main.c:2419 mi/mi-main.c:2426
 msgid "Start and end PC are required"
 msgstr ""
 
-#: mi/mi-main.c:2425
+#: mi/mi-main.c:2438
 msgid "Line is required"
 msgstr ""
 
-#: mi/mi-main.c:2433 mi/mi-main.c:2438
+#: mi/mi-main.c:2446 mi/mi-main.c:2451
 msgid "Could not find the specified line"
 msgstr ""
 
-#: mi/mi-main.c:2443
+#: mi/mi-main.c:2456
 #, possible-c-format
 msgid "Invalid mode '%s'"
 msgstr ""
 
-#: mi/mi-main.c:2458
+#: mi/mi-main.c:2471
 msgid "Usage: -trace-save [-r] filename"
 msgstr ""
 
-#: mi/mi-main.c:2466
+#: mi/mi-main.c:2479
 #, possible-c-format
 msgid "Invalid option: %s"
 msgstr ""
 
-#: mi/mi-console.c:69
-msgid "mi_console_file_delete: bad magic number"
-msgstr ""
-
-#: mi/mi-console.c:99
-msgid "mi_console_file_transform: bad magic number"
-msgstr ""
-
-#: mi/mi-console.c:127
-msgid "mi_console_file_flush: bad magic number"
-msgstr ""
-
-#: mi/mi-cmd-break.c:140
-msgid "-break-insert: Missing <location>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:142
-msgid "-break-insert: Garbage following <location>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:193
-msgid "Usage: tracepoint-number passcount"
-msgstr ""
-
-#: mi/mi-cmd-break.c:206
-#, possible-c-format
-msgid "Cound not find tracepoint %d"
-msgstr ""
-
-#: mi/mi-cmd-break.c:254
-msgid "-break-watch: Missing <expression>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:256
-msgid "-break-watch: Garbage following <expression>"
-msgstr ""
-
-#: mi/mi-cmd-break.c:272
-msgid "-break-watch: Unknown watchpoint type."
-msgstr ""
-
-#: mi/mi-cmd-break.c:303
-#, possible-c-format
-msgid "USAGE: %s <BKPT> [<COMMAND> [<COMMAND>...]]"
-msgstr ""
-
-#: mi/mi-cmd-break.c:307
-#, possible-c-format
-msgid "breakpoint number argument \"%s\" is not a number."
-msgstr ""
-
-#: mi/mi-cmd-break.c:310
-#, possible-c-format
-msgid "junk at the end of breakpoint number argument \"%s\"."
-msgstr ""
-
-#: mi/mi-cmd-break.c:315
-#, possible-c-format
-msgid "breakpoint %d not found."
-msgstr ""
-
-#: mi/mi-common.c:54
-msgid "async_reason_string_lookup is inconsistent"
-msgstr ""
-
-#: mi/mi-interp.c:195
-msgid "-interpreter-exec: Usage: -interpreter-exec interp command"
-msgstr ""
-
-#: mi/mi-interp.c:200
-#, possible-c-format
-msgid "-interpreter-exec: could not find interpreter \"%s\""
-msgstr ""
-
-#: mi/mi-interp.c:204
-#, possible-c-format
-msgid ""
-"-interpreter-exec: interpreter \"%s\" does not support command execution"
-msgstr ""
-
-#: mi/mi-symbol-cmds.c:42
-msgid "-symbol-list-lines: Usage: SOURCE_FILENAME"
-msgstr ""
-
-#: mi/mi-symbol-cmds.c:48
-msgid "-symbol-list-lines: Unknown source file name."
-msgstr ""
-
-#: mi/mi-parse.c:287
+#: mi/mi-parse.c:286
 #, possible-c-format
 msgid "Undefined MI command: %s"
 msgstr ""
 
-#: mi/mi-parse.c:321
+#: mi/mi-parse.c:320
 msgid "Duplicate '--thread-group' option"
 msgstr ""
 
-#: mi/mi-parse.c:324
+#: mi/mi-parse.c:323
 msgid "Invalid thread group id"
 msgstr ""
 
-#: mi/mi-parse.c:332
+#: mi/mi-parse.c:331
 msgid "Duplicate '--thread' option"
 msgstr ""
 
-#: mi/mi-parse.c:340
+#: mi/mi-parse.c:339
 msgid "Duplicate '--frame' option"
 msgstr ""
 
-#: mi/mi-parse.c:348
+#: mi/mi-parse.c:347
 #, possible-c-format
 msgid "Invalid value for the '%s' option"
 msgstr ""
 
-#: mi/mi-parse.c:359
+#: mi/mi-parse.c:358
 #, possible-c-format
 msgid "Problem parsing arguments: %s %s"
 msgstr ""
 
-#: mi/mi-cmd-file.c:39
-msgid "-file-list-exec-source-file: Usage: No args"
-msgstr ""
-
-#: mi/mi-cmd-file.c:49
-msgid "-file-list-exec-source-file: No symtab"
+#: mi/mi-symbol-cmds.c:42
+msgid "-symbol-list-lines: Usage: SOURCE_FILENAME"
 msgstr ""
 
-#: mi/mi-cmd-file.c:87
-msgid "-file-list-exec-source-files: Usage: No args"
+#: mi/mi-symbol-cmds.c:48
+msgid "-symbol-list-lines: Unknown source file name."
 msgstr ""
 
 #: microblaze-tdep.c:145
@@ -14612,157 +15183,162 @@
 msgid "When non-zero, microblaze specific debugging is enabled."
 msgstr ""
 
-#: minsyms.c:716
+#: minsyms.c:759
 #, possible-c-format
 msgid ""
 "GDB cannot resolve STT_GNU_IFUNC symbol at address %s without the ELF "
 "support compiled in."
 msgstr ""
 
-#: minsyms.c:727
+#: minsyms.c:770
 #, possible-c-format
 msgid ""
 "GDB cannot resolve STT_GNU_IFUNC symbol \"%s\" without the ELF support "
 "compiled in."
 msgstr ""
 
-#: minsyms.c:738
+#: minsyms.c:781
 msgid "elf_gnu_ifunc_resolver_stop cannot be reached."
 msgstr ""
 
-#: minsyms.c:747
+#: minsyms.c:790
 msgid "elf_gnu_ifunc_resolver_return_stop cannot be reached."
 msgstr ""
 
-#: mips-linux-nat.c:77 mips-linux-nat.c:112
+#: mips-linux-nat.c:76 mips-linux-nat.c:111
 #, possible-c-format
 msgid "Bogon register number %d."
 msgstr ""
 
-#: mips-linux-nat.c:255 mips-linux-nat.c:307 ppcnbsd-nat.c:105
-#: ppcnbsd-nat.c:140
+#: mips-linux-nat.c:254 mips-linux-nat.c:306 ppcnbsd-nat.c:104
+#: ppcnbsd-nat.c:139
 msgid "Couldn't get FP registers"
 msgstr ""
 
-#: mips-linux-nat.c:298 shnbsd-nat.c:84
+#: mips-linux-nat.c:297 shnbsd-nat.c:83
 msgid "Couldn't set registers"
 msgstr ""
 
-#: mips-linux-nat.c:313 ppcnbsd-nat.c:147
+#: mips-linux-nat.c:312 ppcnbsd-nat.c:146
 msgid "Couldn't set FP registers"
 msgstr ""
 
-#: mips-linux-nat.c:481 mips-linux-nat.c:498 mips-linux-nat.c:515
-#: mips-linux-nat.c:532 mips-linux-nat.c:553 mips-linux-nat.c:570
-#: mips-linux-nat.c:589
+#: mips-linux-nat.c:480 mips-linux-nat.c:497 mips-linux-nat.c:514
+#: mips-linux-nat.c:531 mips-linux-nat.c:552 mips-linux-nat.c:569
+#: mips-linux-nat.c:588
 msgid "Unrecognized watch register style"
 msgstr ""
 
-#: mips-linux-nat.c:1056
+#: mips-linux-nat.c:1054
 msgid "Set whether to show variables that mirror the mips debug registers."
 msgstr ""
 
-#: mips-linux-nat.c:1057
+#: mips-linux-nat.c:1055
 msgid "Show whether to show variables that mirror the mips debug registers."
 msgstr ""
 
-#: mips-linux-tdep.c:648
+#: mips-linux-tdep.c:647
 msgid "wrong size fpregset struct in core file"
 msgstr ""
 
-#: mips-tdep.c:493
+#: mipsread.c:84
+#, possible-c-format
+msgid "Error reading symbol table: %s"
+msgstr ""
+
+#: mips-tdep.c:491
 #, possible-c-format
 msgid "mips_register_name: bad register number %d"
 msgstr ""
 
-#: mips-tdep.c:594 mips-tdep.c:623 mips-tdep.c:663
+#: mips-tdep.c:592 mips-tdep.c:621 mips-tdep.c:661
 msgid "bad register size"
 msgstr ""
 
-#: mips-tdep.c:695
+#: mips-tdep.c:693
 msgid "32-bit compatibility mode not supported"
 msgstr ""
 
-#: mips-tdep.c:778
+#: mips-tdep.c:776
 msgid "mips_register_to_value: unrecognized case"
 msgstr ""
 
-#: mips-tdep.c:826
+#: mips-tdep.c:824
 msgid "mips_value_to_register: unrecognized case"
 msgstr ""
 
-#: mips-tdep.c:954
+#: mips-tdep.c:952
 msgid "mips_mask_address_p: bad switch"
 msgstr ""
 
-#: mips-tdep.c:980
+#: mips-tdep.c:978
 msgid "show_mask_address: bad switch"
 msgstr ""
 
-#: mips-tdep.c:1863
+#: mips-tdep.c:1830
 msgid "Invalid number of argument registers encoded in SAVE."
 msgstr ""
 
-#: mips-tdep.c:1868
+#: mips-tdep.c:1835
 msgid "Invalid number of static registers encoded in SAVE."
 msgstr ""
 
-#: mips-tdep.c:2759
+#: mips-tdep.c:2727
 #, possible-c-format
 msgid "GDB can't find the start of the function at %s."
 msgstr ""
 
-#: mips-tdep.c:4557 mips-tdep.c:4594 mips-tdep.c:4830 sh64-tdep.c:2056
+#: mips-tdep.c:4525 mips-tdep.c:4562 mips-tdep.c:4798 sh64-tdep.c:2054
 #, possible-c-format
 msgid "can't read register %d (%s)"
 msgstr ""
 
-#: mips-tdep.c:4603
+#: mips-tdep.c:4571
 msgid "mips_read_fp_register_double: bad access to odd-numbered FP register"
 msgstr ""
 
-#: mips-tdep.c:4866 sh64-tdep.c:2216 sh64-tdep.c:2274
+#: mips-tdep.c:4834 sh64-tdep.c:2214 sh64-tdep.c:2272
 msgid "Not a valid register for the current processor type"
 msgstr ""
 
-#: mips-tdep.c:5136 mips-tdep.c:5150 mips-tdep.c:5164
+#: mips-tdep.c:5104 mips-tdep.c:5118 mips-tdep.c:5132
 msgid "set mipsfpu failed"
 msgstr ""
 
-#: mips-tdep.c:5615
+#: mips-tdep.c:5586
 #, possible-c-format
 msgid "unsupported ABI %s."
 msgstr ""
 
-#: mips-tdep.c:5629
+#: mips-tdep.c:5600
 msgid "unrecognized .gcc_compiled_longXX"
 msgstr ""
 
-#: mips-tdep.c:5641
+#: mips-tdep.c:5612
 msgid "unknown ABI string"
 msgstr ""
 
-#: mips-tdep.c:6153 mips-tdep.c:6202
+#: mips-tdep.c:6124 mips-tdep.c:6173
 msgid "unknown ABI in switch"
 msgstr ""
 
-#: mips-tdep.c:6481
+#: mips-tdep.c:6452
 msgid "mips_abi_strings out of sync"
 msgstr ""
 
-#: mips-tdep.c:6497 mips-tdep.c:6501
+#: mips-tdep.c:6468 mips-tdep.c:6472
 msgid "Various MIPS specific commands."
 msgstr ""
 
-#: mips-tdep.c:6506
+#: mips-tdep.c:6477
 msgid "Set the MIPS ABI used by this program."
 msgstr ""
 
-#: mips-tdep.c:6507
+#: mips-tdep.c:6478
 msgid "Show the MIPS ABI used by this program."
 msgstr ""
 
-#: mips-tdep.c:6508
+#: mips-tdep.c:6479
 msgid ""
 "This option can be set to one of:\n"
 "  auto  - the default ABI associated with the current binary\n"
@@ -14774,141 +15350,136 @@
 "  eabi64"
 msgstr ""
 
-#: mips-tdep.c:6525
+#: mips-tdep.c:6496
 msgid "Set use of MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6528
+#: mips-tdep.c:6499
 msgid "Select single-precision MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6531
+#: mips-tdep.c:6502
 msgid "Select double-precision MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6537
+#: mips-tdep.c:6508
 msgid "Select no MIPS floating-point coprocessor."
 msgstr ""
 
-#: mips-tdep.c:6542
+#: mips-tdep.c:6513
 msgid "Select MIPS floating-point coprocessor automatically."
 msgstr ""
 
-#: mips-tdep.c:6545
+#: mips-tdep.c:6516
 msgid "Show current use of MIPS floating-point coprocessor target."
 msgstr ""
 
-#: mips-tdep.c:6566
+#: mips-tdep.c:6537
 msgid "Set zeroing of upper 32 bits of 64-bit addresses."
 msgstr ""
 
-#: mips-tdep.c:6567
+#: mips-tdep.c:6538
 msgid "Show zeroing of upper 32 bits of 64-bit addresses."
 msgstr ""
 
-#: mips-tdep.c:6568
+#: mips-tdep.c:6539
 msgid ""
 "Use \"on\" to enable the masking, \"off\" to disable it and \"auto\" to\n"
 "allow GDB to determine the correct value."
 msgstr ""
 
-#: mips-tdep.c:6577
+#: mips-tdep.c:6548
 msgid ""
 "Set compatibility with 64-bit MIPS target that transfers 32-bit quantities."
 msgstr ""
 
-#: mips-tdep.c:6579
+#: mips-tdep.c:6550
 msgid ""
 "Show compatibility with 64-bit MIPS target that transfers 32-bit quantities."
 msgstr ""
 
-#: mips-tdep.c:6581
+#: mips-tdep.c:6552
 msgid ""
 "Use \"on\" to enable backward compatibility with older MIPS 64 GDB+target\n"
 "that would transfer 32 bits for some registers (e.g. SR, FSR) and\n"
 "64 bits for others.  Use \"off\" to disable compatibility mode"
 msgstr ""
 
-#: mips-tdep.c:6593
+#: mips-tdep.c:6564
 msgid "Set mips debugging."
 msgstr ""
 
-#: mips-tdep.c:6594
+#: mips-tdep.c:6565
 msgid "Show mips debugging."
 msgstr ""
 
-#: mips-tdep.c:6595
+#: mips-tdep.c:6566
 msgid "When non-zero, mips specific debugging is enabled."
 msgstr ""
 
-#: mipsread.c:85
-#, possible-c-format
-msgid "Error reading symbol table: %s"
-msgstr ""
-
-#: mn10300-tdep.c:195
+#: mn10300-tdep.c:194
 #, possible-c-format
 msgid "Cannot store return value %d bytes long."
 msgstr ""
 
-#: mn10300-tdep.c:227
+#: mn10300-tdep.c:226
 #, possible-c-format
 msgid "Cannot extract return value %d bytes long."
 msgstr ""
 
-#: mn10300-tdep.c:1377
+#: mn10300-tdep.c:1376
 #, possible-c-format
 msgid "Bogus register number in debug info: %d"
 msgstr ""
 
-#: mn10300-tdep.c:1420
+#: mn10300-tdep.c:1419
 msgid "mn10300_gdbarch_init: Unknown mn10300 variant"
 msgstr ""
 
-#: monitor.c:221
+#: monitor.c:219
 #, possible-c-format
 msgid "%s (%s): %s: %s%c"
 msgstr ""
 
-#: monitor.c:225
+#: monitor.c:223
 #, possible-c-format
 msgid "%s (%s): %s: %s"
 msgstr ""
 
-#: monitor.c:242
+#: monitor.c:240
 #, possible-c-format
 msgid "Invalid hex digit %d"
 msgstr ""
 
-#: monitor.c:414 monitor.c:490
+#: monitor.c:412 monitor.c:488
 msgid "Timeout reading from remote system."
 msgstr ""
 
-#: monitor.c:416 monitor.c:492
+#: monitor.c:414 monitor.c:490
 msgid "remote-monitor"
 msgstr ""
 
-#: monitor.c:486
+#: monitor.c:484
 msgid "GDB serial timeout has expired.  Target detached."
 msgstr ""
 
-#: monitor.c:704
+#: monitor.c:702
 #, possible-c-format
 msgid "compile_pattern: Can't compile pattern string `%s': %s!"
 msgstr ""
 
-#: monitor.c:722
+#: monitor.c:720
 msgid "Magic number of monitor_ops struct wrong."
 msgstr ""
 
-#: monitor.c:728
+#: monitor.c:726
 #, possible-c-format
 msgid ""
 "Use `target %s DEVICE-NAME' to use a serial port, or\n"
 "`target %s HOST-NAME:PORT-NUMBER' to use a network connection."
 msgstr ""
 
-#: monitor.c:829
+#: monitor.c:827
 #, possible-c-format
 msgid "Remote target %s connected to %s\n"
 msgstr ""
@@ -14923,7 +15494,7 @@
 msgid "monitor_supply_register (%d):  bad value from monitor: %s."
 msgstr ""
 
-#: monitor.c:1033 nto-procfs.c:694 remote-mips.c:2276 remote.c:4770
+#: monitor.c:1033 nto-procfs.c:693 remote.c:4850 remote-mips.c:2274
 msgid ""
 "Interrupted while waiting for the program.\n"
 "Give up (and stop debugging it)? "
@@ -15000,74 +15571,74 @@
 msgid "Process record: error reading memory at addr 0x%s len = %d.\n"
 msgstr ""
 
-#: mt-tdep.c:304
+#: mt-tdep.c:303
 #, possible-c-format
 msgid "mt_register_type: illegal register number %d"
 msgstr ""
 
-#: nto-procfs.c:102
+#: nto-procfs.c:101
 msgid "Lost the QNX node.  Debug session probably over."
 msgstr ""
 
-#: nto-procfs.c:168
+#: nto-procfs.c:167
 msgid "Invalid procfs arg"
 msgstr ""
 
-#: nto-procfs.c:177 nto-procfs.c:195
+#: nto-procfs.c:176 nto-procfs.c:194
 msgid "Devctl failed."
 msgstr ""
 
-#: nto-procfs.c:187
+#: nto-procfs.c:186
 msgid "alloca failed."
 msgstr ""
 
-#: nto-procfs.c:202
+#: nto-procfs.c:201
 msgid "Invalid target CPU."
 msgstr ""
 
-#: nto-procfs.c:626 procfs.c:3295
+#: nto-procfs.c:625 procfs.c:3293
 msgid "Attaching GDB to itself is not a good idea..."
 msgstr ""
 
-#: nto-procfs.c:668
+#: nto-procfs.c:667
 #, possible-c-format
 msgid "Couldn't open proc file %s, error %d (%s)"
 msgstr ""
 
-#: nto-procfs.c:671
+#: nto-procfs.c:670
 msgid "Couldn't stop process"
 msgstr ""
 
-#: nto-procfs.c:1010
+#: nto-procfs.c:1009
 msgid "run error!\n"
 msgstr ""
 
-#: nto-procfs.c:1184
+#: nto-procfs.c:1183
 #, possible-c-format
 msgid "Error spawning %s: %d (%s)"
 msgstr ""
 
-#: nto-procfs.c:1453
+#: nto-procfs.c:1452
 msgid "pidlist"
 msgstr ""
 
-#: nto-procfs.c:1454
+#: nto-procfs.c:1453
 msgid "memory information"
 msgstr ""
 
-#: nto-procfs.c:1484
+#: nto-procfs.c:1483
 msgid "Failed to set hardware watchpoint"
 msgstr ""
 
-#: nto-tdep.c:405
+#: nto-tdep.c:404
 msgid "Set QNX NTO internal debugging."
 msgstr ""
 
-#: nto-tdep.c:406
+#: nto-tdep.c:405
 msgid "Show QNX NTO internal debugging."
 msgstr ""
 
-#: nto-tdep.c:407
+#: nto-tdep.c:406
 msgid ""
 "When non-zero, nto specific debug info is\n"
 "displayed. Different information is displayed\n"
@@ -15097,118 +15668,118 @@
 msgid "A %s near end of expression."
 msgstr ""
 
-#: objc-lang.c:129
+#: objc-lang.c:128
 msgid "no way to lookup Objective-C classes"
 msgstr ""
 
-#: objc-lang.c:158
+#: objc-lang.c:157
 msgid "no way to lookup Objective-C selectors"
 msgstr ""
 
-#: objc-lang.c:206
+#: objc-lang.c:205
 msgid "NSString: internal error -- no way to create new NSString"
 msgstr ""
 
-#: objc-lang.c:628
+#: objc-lang.c:629
 #, possible-c-format
 msgid "Can't find selector \"%s\""
 msgstr ""
 
-#: objc-lang.c:675
+#: objc-lang.c:676
 msgid "internal: compare_selectors(1)"
 msgstr ""
 
-#: objc-lang.c:680
+#: objc-lang.c:681
 msgid "internal: compare_selectors(2)"
 msgstr ""
 
-#: objc-lang.c:725 objc-lang.c:876
+#: objc-lang.c:726 objc-lang.c:877
 #, possible-c-format
 msgid "Regexp is too long: %s"
 msgstr ""
 
-#: objc-lang.c:738 objc-lang.c:889 symtab.c:3093 thread.c:1327
+#: objc-lang.c:739 objc-lang.c:890 symtab.c:3283 thread.c:1320
 #, possible-c-format
 msgid "Invalid regexp (%s): %s"
 msgstr ""
 
-#: objc-lang.c:758
+#: objc-lang.c:759
 #, possible-c-format
 msgid "Bad method name '%s'"
 msgstr ""
 
-#: objc-lang.c:775
+#: objc-lang.c:776
 #, possible-c-format
 msgid ""
 "Selectors matching \"%s\":\n"
 "\n"
 msgstr ""
 
-#: objc-lang.c:822
+#: objc-lang.c:823
 #, possible-c-format
 msgid "No selectors matching \"%s\"\n"
 msgstr ""
 
-#: objc-lang.c:841
+#: objc-lang.c:842
 msgid "internal: compare_classes(1)"
 msgstr ""
 
-#: objc-lang.c:913
+#: objc-lang.c:914
 #, possible-c-format
 msgid ""
 "Classes matching \"%s\":\n"
 "\n"
 msgstr ""
 
-#: objc-lang.c:952
+#: objc-lang.c:953
 #, possible-c-format
 msgid "No classes matching \"%s\"\n"
 msgstr ""
 
-#: objc-lang.c:1469
+#: objc-lang.c:1354
 msgid "Unable to locate _NSPrintForDebugger in child process"
 msgstr ""
 
-#: objc-lang.c:1475
+#: objc-lang.c:1360
 msgid "object returns null description"
 msgstr ""
 
-#: objc-lang.c:1486
+#: objc-lang.c:1371
 msgid "<object returns empty description>"
 msgstr ""
 
 #. INFO SELECTORS command.
-#: objc-lang.c:1643
+#: objc-lang.c:1528
 msgid "All Objective-C selectors, or those matching REGEXP."
 msgstr ""
 
 #. INFO CLASSES   command.
-#: objc-lang.c:1645
+#: objc-lang.c:1530
 msgid "All Objective-C classes, or those matching REGEXP."
 msgstr ""
 
-#: objc-lang.c:1647
+#: objc-lang.c:1532
 msgid "Ask an Objective-C object to print itself."
 msgstr ""
 
-#: objfiles.c:231 solib.c:510 symfile.c:2541
+#: objfiles.c:222 solib.c:481 symfile.c:2540
 #, possible-c-format
 msgid "Can't find the file sections in `%s': %s"
 msgstr ""
 
-#: objfiles.c:353
+#: objfiles.c:340
 msgid "Entry point address is not known."
 msgstr ""
 
-#: objfiles.c:442
+#: objfiles.c:429
 msgid "put_objfile_before: before objfile not in list"
 msgstr ""
 
-#: objfiles.c:494
+#: objfiles.c:481
 msgid "unlink_objfile: objfile already unlinked"
 msgstr ""
 
-#: objfiles.c:1229
+#: objfiles.c:1217
 #, possible-c-format
 msgid ""
 "unexpected overlap between:\n"
@@ -15217,43 +15788,43 @@
 "Will ignore section B"
 msgstr ""
 
-#: objfiles.c:1514
+#: objfiles.c:1502
 #, possible-c-format
 msgid "cannot close \"%s\": %s"
 msgstr ""
 
-#: objfiles.h:669
+#: objfiles.h:641
 msgid "sect_index_data not initialized"
 msgstr ""
 
-#: objfiles.h:675
+#: objfiles.h:647
 msgid "sect_index_rodata not initialized"
 msgstr ""
 
-#: objfiles.h:681
+#: objfiles.h:653
 msgid "sect_index_text not initialized"
 msgstr ""
 
-#: observer.c:63
+#: observer.c:62
 #, possible-c-format
 msgid "Observer debugging is %s.\n"
 msgstr ""
 
 #. We should never reach this point.  However, this should not be
 #. a very serious error, so simply report a warning to the user.
-#: observer.c:155
+#: observer.c:154
 msgid "Failed to detach observer"
 msgstr ""
 
-#: observer.c:209
+#: observer.c:208
 msgid "Set observer debugging."
 msgstr ""
 
-#: observer.c:210
+#: observer.c:209
 msgid "Show observer debugging."
 msgstr ""
 
-#: observer.c:211
+#: observer.c:210
 msgid "When non-zero, observer debugging is enabled."
 msgstr ""
 
@@ -15262,113 +15833,113 @@
 msgid "Invalid OpenCL vector size: %d"
 msgstr ""
 
-#: opencl-lang.c:185 opencl-lang.c:214 opencl-lang.c:446 opencl-lang.c:563
-#: opencl-lang.c:656 opencl-lang.c:875 valarith.c:1418 valarith.c:1774
-#: valarith.c:1810 valops.c:556 valops.c:899
+#: opencl-lang.c:185 opencl-lang.c:214 opencl-lang.c:447 opencl-lang.c:564
+#: opencl-lang.c:657 opencl-lang.c:876 valarith.c:1410 valarith.c:1766
+#: valarith.c:1802 valops.c:554 valops.c:897
 msgid "Could not determine the vector bounds"
 msgstr ""
 
-#: opencl-lang.c:454
+#: opencl-lang.c:455
 msgid "Invalid OpenCL vector size"
 msgstr ""
 
-#: opencl-lang.c:501 opencl-lang.c:521 opencl-lang.c:526 opencl-lang.c:530
-#: opencl-lang.c:540
+#: opencl-lang.c:502 opencl-lang.c:522 opencl-lang.c:527 opencl-lang.c:531
+#: opencl-lang.c:541
 #, possible-c-format
 msgid "Invalid OpenCL vector component accessor %s"
 msgstr ""
 
-#: opencl-lang.c:625
+#: opencl-lang.c:626
 msgid "Attempt to perform an unsupported operation"
 msgstr ""
 
-#: opencl-lang.c:649
+#: opencl-lang.c:650
 msgid "Vector operations are not supported on scalar types"
 msgstr ""
 
-#: opencl-lang.c:663 opencl-lang.c:882 valarith.c:1428
+#: opencl-lang.c:664 opencl-lang.c:883 valarith.c:1420
 msgid "Cannot perform operation on vectors with different types"
 msgstr ""
 
-#: opencl-lang.c:718 valarith.c:1471
+#: opencl-lang.c:719 valarith.c:1463
 msgid "Argument to operation not a number or boolean."
 msgstr ""
 
 #. Throw an error if arg2 or arg3 aren't vectors.
-#: opencl-lang.c:865
+#: opencl-lang.c:866
 msgid "Cannot perform conditional operation on incompatible types"
 msgstr ""
 
-#: opencl-lang.c:888
+#: opencl-lang.c:889
 msgid "Cannot perform conditional operation on vectors with different sizes"
 msgstr ""
 
-#: osabi.c:140
+#: osabi.c:139
 #, possible-c-format
 msgid ""
 "gdbarch_register_osabi: An attempt to register a handler for OS ABI \"%s\" "
 "for architecture %s was made.  The handler will not be registered"
 msgstr ""
 
-#: osabi.c:158
+#: osabi.c:157
 #, possible-c-format
 msgid ""
 "gdbarch_register_osabi: A handler for OS ABI \"%s\" has already been "
 "registered for architecture %s"
 msgstr ""
 
-#: osabi.c:252
+#: osabi.c:251
 #, possible-c-format
 msgid ""
 "gdbarch_lookup_osabi: invalid OS ABI (%d) from sniffer for architecture %s "
 "flavour %d"
 msgstr ""
 
-#: osabi.c:271
+#: osabi.c:270
 #, possible-c-format
 msgid ""
 "gdbarch_lookup_osabi: multiple %sspecific OS ABI match for architecture %s "
 "flavour %d: first match \"%s\", second match \"%s\""
 msgstr ""
 
-#: osabi.c:462
+#: osabi.c:461
 #, possible-c-format
 msgid "generic_elf_osabi_sniff_abi_tag_sections: unknown OS number %d"
 msgstr ""
 
-#: osabi.c:602
+#: osabi.c:597
 #, possible-c-format
 msgid "Invalid OS ABI \"%s\" passed to command handler."
 msgstr ""
 
-#: osabi.c:610
+#: osabi.c:605
 msgid "Updating OS ABI failed."
 msgstr ""
 
-#: osabi.c:619
+#: osabi.c:614
 #, possible-c-format
 msgid "The current OS ABI is \"auto\" (currently \"%s\").\n"
 msgstr ""
 
-#: osabi.c:623
+#: osabi.c:618
 #, possible-c-format
 msgid "The current OS ABI is \"%s\".\n"
 msgstr ""
 
-#: osabi.c:627
+#: osabi.c:622
 #, possible-c-format
 msgid "The default OS ABI is \"%s\".\n"
 msgstr ""
 
-#: osabi.c:639
+#: osabi.c:634
 msgid "_initialize_gdb_osabi: gdb_osabi_names[] is inconsistent"
 msgstr ""
 
-#: osabi.c:649
+#: osabi.c:644
 msgid "Set OS ABI of target."
 msgstr ""
 
-#: osabi.c:650
+#: osabi.c:645
 msgid "Show OS ABI of target."
 msgstr ""
 
@@ -15396,466 +15967,454 @@
 msgid "Can not fetch data now."
 msgstr ""
 
-#: osdata.c:306
+#: osdata.c:307
 msgid "Available types of OS data not reported."
 msgstr ""
 
-#: osdata.c:372
+#: osdata.c:392
 msgid "Show OS data ARG."
 msgstr ""
 
-#: p-typeprint.c:301
-msgid "type not handled in pascal_type_print_varspec_prefix()"
-msgstr ""
-
-#: p-typeprint.c:420
-msgid "type not handled in pascal_type_print_varspec_suffix()"
-msgstr ""
-
-#: p-valprint.c:566
-#, possible-c-format
-msgid "Invalid pascal type code %d in symbol table."
-msgstr ""
-
-#: p-valprint.c:615
-#, possible-c-format
-msgid "Printing of pascal static members is %s.\n"
-msgstr ""
-
-#: p-valprint.c:1066
-msgid "Set printing of pascal static members."
-msgstr ""
-
-#: p-valprint.c:1067
-msgid "Show printing of pascal static members."
-msgstr ""
-
-#: parse.c:110
+#: parse.c:109
 #, possible-c-format
 msgid "Expression debugging is %s.\n"
 msgstr ""
 
-#: parse.c:121
+#: parse.c:120
 #, possible-c-format
 msgid "Parser debugging is %s.\n"
 msgstr ""
 
-#: parse.c:833
+#: parse.c:832
 msgid "?error in operator_length_standard"
 msgstr ""
 
-#: parse.c:1104
+#: parse.c:1103
 msgid "expression to compute"
 msgstr ""
 
-#: parse.c:1217
+#: parse.c:1216
 msgid "Junk after end of expression."
 msgstr ""
 
-#: parse.c:1653
+#: parse.c:1652
 msgid "Set expression debugging."
 msgstr ""
 
-#: parse.c:1654
+#: parse.c:1653
 msgid "Show expression debugging."
 msgstr ""
 
-#: parse.c:1655
+#: parse.c:1654
 msgid ""
 "When non-zero, the internal representation of expressions will be printed."
 msgstr ""
 
-#: parse.c:1662
+#: parse.c:1661
 msgid "Set parser debugging."
 msgstr ""
 
-#: parse.c:1663
+#: parse.c:1662
 msgid "Show parser debugging."
 msgstr ""
 
-#: parse.c:1664
+#: parse.c:1663
 msgid "When non-zero, expression parser tracing will be enabled."
 msgstr ""
 
-#: ppc-linux-nat.c:426 ppc-linux-nat.c:894
+#: ppc-linux-nat.c:425 ppc-linux-nat.c:893
 msgid "Unable to fetch VSX register"
 msgstr ""
 
-#: ppc-linux-nat.c:455 ppc-linux-nat.c:924
+#: ppc-linux-nat.c:454 ppc-linux-nat.c:923
 msgid "Unable to fetch AltiVec register"
 msgstr ""
 
 #. Anything else needs to be reported.
-#: ppc-linux-nat.c:493 ppc-linux-nat.c:2356
+#: ppc-linux-nat.c:492 ppc-linux-nat.c:2428
 msgid "Unable to fetch SPE registers"
 msgstr ""
 
-#: ppc-linux-nat.c:628
+#: ppc-linux-nat.c:627
 #, possible-c-format
 msgid "fetch_register: unexpected byte order: %d"
 msgstr ""
 
-#: ppc-linux-nat.c:686 ppc-linux-nat.c:2369
+#: ppc-linux-nat.c:685 ppc-linux-nat.c:2441
 msgid "Unable to fetch VSX registers"
 msgstr ""
 
-#: ppc-linux-nat.c:705 ppc-linux-nat.c:2382
+#: ppc-linux-nat.c:704 ppc-linux-nat.c:2454
 msgid "Unable to fetch AltiVec registers"
 msgstr ""
 
-#: ppc-linux-nat.c:732 ppc-linux-nat.c:1206
+#: ppc-linux-nat.c:731 ppc-linux-nat.c:1205
 msgid "Couldn't get general-purpose registers."
 msgstr ""
 
-#: ppc-linux-nat.c:784 ppc-linux-nat.c:1268
+#: ppc-linux-nat.c:783 ppc-linux-nat.c:1267
 msgid "Couldn't get floating-point registers."
 msgstr ""
 
-#: ppc-linux-nat.c:902
+#: ppc-linux-nat.c:901
 msgid "Unable to store VSX register"
 msgstr ""
 
-#: ppc-linux-nat.c:938
+#: ppc-linux-nat.c:937
 msgid "Unable to store AltiVec register"
 msgstr ""
 
 #. Anything else needs to be reported.
-#: ppc-linux-nat.c:965
+#: ppc-linux-nat.c:964
 msgid "Unable to set SPE registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1152
+#: ppc-linux-nat.c:1151
 msgid "Couldn't get VSX registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1158
+#: ppc-linux-nat.c:1157
 msgid "Couldn't write VSX registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1175
+#: ppc-linux-nat.c:1174
 msgid "Couldn't get AltiVec registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1181
+#: ppc-linux-nat.c:1180
 msgid "Couldn't write AltiVec registers"
 msgstr ""
 
-#: ppc-linux-nat.c:1218
+#: ppc-linux-nat.c:1217
 msgid "Couldn't set general-purpose registers."
 msgstr ""
 
-#: ppc-linux-nat.c:1280
+#: ppc-linux-nat.c:1279
 msgid "Couldn't set floating-point registers."
 msgstr ""
 
-#: ppc-linux-nat.c:1586
+#: ppc-linux-nat.c:1585
 msgid "Unexpected error setting breakpoint or watchpoint"
 msgstr ""
 
-#: ppc-linux-nat.c:1633
+#: ppc-linux-nat.c:1632
 msgid "Unexpected error deleting breakpoint or watchpoint"
 msgstr ""
 
-#: ppc-linux-tdep.c:1068
+#: ppc-linux-nat.c:2290
+msgid "The given mask covers kernel address space and cannot be used.\n"
+msgstr ""
+
+#: ppc-linux-tdep.c:1067
 msgid "Cannot find AT_ENTRY auxiliary vector entry."
 msgstr ""
 
 #. Can't happen.
-#: ppc-sysv-tdep.c:664
+#: ppc-sysv-tdep.c:672
 msgid "Unknown decimal float size."
 msgstr ""
 
-#: printcmd.c:114
+#: printcmd.c:110
 #, possible-c-format
 msgid ""
 "The largest offset that will be printed in <symbol+1234> form is %s.\n"
 msgstr ""
 
-#: printcmd.c:126
+#: printcmd.c:122
 #, possible-c-format
 msgid "Printing of source filename and line number with <symbol> is %s.\n"
 msgstr ""
 
-#: printcmd.c:451 printcmd.c:527
+#: printcmd.c:447 printcmd.c:523
 #, possible-c-format
 msgid "Undefined output size \"%c\"."
 msgstr ""
 
-#: printcmd.c:549
+#: printcmd.c:545
 #, possible-c-format
 msgid "Undefined output format \"%c\"."
 msgstr ""
 
-#: printcmd.c:862
+#: printcmd.c:858
 #, possible-c-format
 msgid "Unable to display strings with size '%c', using 'b' instead."
 msgstr ""
 
-#: printcmd.c:930
+#: printcmd.c:926
 #, possible-c-format
 msgid "Size letters are meaningless in \"%s\" command."
 msgstr ""
 
-#: printcmd.c:932
+#: printcmd.c:928
 #, possible-c-format
 msgid "Item count other than 1 is meaningless in \"%s\" command."
 msgstr ""
 
-#: printcmd.c:935
+#: printcmd.c:931
 #, possible-c-format
 msgid "Format letter \"%c\" is meaningless in \"%s\" command."
 msgstr ""
 
-#: printcmd.c:1102
+#: printcmd.c:1098
 msgid "address"
 msgstr ""
 
-#: printcmd.c:1124
+#: printcmd.c:1120
 msgid "mapped"
 msgstr ""
 
-#: printcmd.c:1124
+#: printcmd.c:1120
 msgid "unmapped"
 msgstr ""
 
-#: printcmd.c:1145
+#: printcmd.c:1141
 #, possible-c-format
 msgid "%s in load address range of %s overlay section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1149
+#: printcmd.c:1145
 #, possible-c-format
 msgid "%s in load address range of section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1154
+#: printcmd.c:1150
 #, possible-c-format
 msgid "%s in %s overlay section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1157
+#: printcmd.c:1153
 #, possible-c-format
 msgid "%s in section %s of %s\n"
 msgstr ""
 
-#: printcmd.c:1162
+#: printcmd.c:1158
 #, possible-c-format
 msgid "%s in load address range of %s overlay section %s\n"
 msgstr ""
 
-#: printcmd.c:1166
+#: printcmd.c:1162
 #, possible-c-format
 msgid "%s in load address range of section %s\n"
 msgstr ""
 
-#: printcmd.c:1170
+#: printcmd.c:1166
 #, possible-c-format
 msgid "%s in %s overlay section %s\n"
 msgstr ""
 
-#: printcmd.c:1173
+#: printcmd.c:1169
 #, possible-c-format
 msgid "%s in section %s\n"
 msgstr ""
 
-#: printcmd.c:1180
+#: printcmd.c:1176
 #, possible-c-format
 msgid "No symbol matches %s.\n"
 msgstr ""
 
-#: printcmd.c:1197
+#: printcmd.c:1193
 msgid "Argument required."
 msgstr ""
 
-#: printcmd.c:1294
+#: printcmd.c:1290
 #, possible-c-format
 msgid "an argument in register %s"
 msgstr ""
 
-#: printcmd.c:1297
+#: printcmd.c:1293
 #, possible-c-format
 msgid "a variable in register %s"
 msgstr ""
 
-#: printcmd.c:1302 printcmd.c:1372
+#: printcmd.c:1298 printcmd.c:1368
 msgid "static storage at address "
 msgstr ""
 
-#: printcmd.c:1308 printcmd.c:1345 printcmd.c:1377
+#: printcmd.c:1304 printcmd.c:1341 printcmd.c:1373
 msgid ""
 ",\n"
 " -- loaded at "
 msgstr ""
 
-#: printcmd.c:1310 printcmd.c:1347 printcmd.c:1379
+#: printcmd.c:1306 printcmd.c:1343 printcmd.c:1375
 #, possible-c-format
 msgid " in overlay section %s"
 msgstr ""
 
-#: printcmd.c:1318
+#: printcmd.c:1314
 #, possible-c-format
 msgid "address of an argument in register %s"
 msgstr ""
 
-#: printcmd.c:1323
+#: printcmd.c:1319
 #, possible-c-format
 msgid "an argument at offset %ld"
 msgstr ""
 
-#: printcmd.c:1327
+#: printcmd.c:1323
 #, possible-c-format
 msgid "a local variable at frame offset %ld"
 msgstr ""
 
-#: printcmd.c:1331
+#: printcmd.c:1327
 #, possible-c-format
 msgid "a reference argument at offset %ld"
 msgstr ""
 
-#: printcmd.c:1335
+#: printcmd.c:1331
 msgid "a typedef"
 msgstr ""
 
-#: printcmd.c:1339
+#: printcmd.c:1335
 msgid "a function at address "
 msgstr ""
 
-#: printcmd.c:1366
+#: printcmd.c:1362
 #, possible-c-format
 msgid ""
 "a thread-local variable at offset %s in the thread-local storage for `%s'"
 msgstr ""
 
-#: printcmd.c:1388
+#: printcmd.c:1384
 msgid "optimized out"
 msgstr ""
 
-#: printcmd.c:1392
+#: printcmd.c:1388
 msgid "of unknown (botched) type"
 msgstr ""
 
-#: printcmd.c:1446
+#: printcmd.c:1442
 msgid "starting display address"
 msgstr ""
 
-#: printcmd.c:1605
+#: printcmd.c:1601
 msgid "one or more display numbers"
 msgstr ""
 
-#: printcmd.c:1615
+#: printcmd.c:1611
 #, possible-c-format
 msgid "bad display number at or near '%s'"
 msgstr ""
 
-#: printcmd.c:1624 printcmd.c:1814
+#: printcmd.c:1620 printcmd.c:1827
 #, possible-c-format
 msgid "No display number %d.\n"
 msgstr ""
 
-#: printcmd.c:1649
+#: printcmd.c:1645
 msgid "Delete all auto-display expressions? "
 msgstr ""
 
-#: printcmd.c:1699
+#: printcmd.c:1696
 #, possible-c-format
 msgid "Unable to display \"%s\": %s"
 msgstr ""
 
-#: printcmd.c:1824
+#: printcmd.c:1759
 #, possible-c-format
-msgid "Disabling display %d to avoid infinite recursion.\n"
+msgid "<error: %s>\n"
+msgstr ""
+
+#: printcmd.c:1791 value.c:2118
+#, possible-c-format
+msgid "<error: %s>"
 msgstr ""
 
 #: printcmd.c:1837
+#, possible-c-format
+msgid "Disabling display %d to avoid infinite recursion.\n"
+msgstr ""
+
+#: printcmd.c:1850
 msgid "There are no auto-display expressions now.\n"
 msgstr ""
 
-#: printcmd.c:1839
+#: printcmd.c:1852
 msgid ""
 "Auto-display expressions now in effect:\n"
 "Num Enb Expression\n"
 msgstr ""
 
-#: printcmd.c:1852
+#: printcmd.c:1865
 msgid " (cannot be evaluated in the current context)"
 msgstr ""
 
-#: printcmd.c:1989
+#: printcmd.c:2003
 msgid "format-control string and values to print"
 msgstr ""
 
-#: printcmd.c:1995
+#: printcmd.c:2009
 msgid "Bad format string, missing '\"'."
 msgstr ""
 
-#: printcmd.c:2008
+#: printcmd.c:2022
 msgid "Bad format string, non-terminated '\"'."
 msgstr ""
 
 #. ??? TODO: handle other escape sequences.
-#: printcmd.c:2042
+#: printcmd.c:2056
 #, possible-c-format
 msgid "Unrecognized escape character \\%c in format string."
 msgstr ""
 
-#: printcmd.c:2058
+#: printcmd.c:2072
 msgid "Invalid argument syntax"
 msgstr ""
 
-#: printcmd.c:2248
+#: printcmd.c:2262
 msgid "`*' not supported for precision or width in printf"
 msgstr ""
 
-#: printcmd.c:2251
+#: printcmd.c:2265
 msgid "Format specifier `n' not supported in printf"
 msgstr ""
 
-#: printcmd.c:2254
+#: printcmd.c:2268
 msgid "Incomplete format specifier at end of format string"
 msgstr ""
 
-#: printcmd.c:2257
+#: printcmd.c:2271
 #, possible-c-format
 msgid "Unrecognized format specifier '%c' in printf"
 msgstr ""
 
-#: printcmd.c:2261
+#: printcmd.c:2275
 #, possible-c-format
 msgid "Inappropriate modifiers to format specifier '%c' in printf"
 msgstr ""
 
-#: printcmd.c:2320
+#: printcmd.c:2334
 msgid "Wrong number of arguments for specified format-string"
 msgstr ""
 
-#: printcmd.c:2416
+#: printcmd.c:2430
 #, possible-c-format
 msgid "expected wchar_t argument for %%lc"
 msgstr ""
 
-#: printcmd.c:2446 printcmd.c:2463 value.c:2123
+#: printcmd.c:2460 printcmd.c:2477 value.c:2152
 msgid "Invalid floating value found in program."
 msgstr ""
 
-#: printcmd.c:2470
+#: printcmd.c:2484
 msgid "long double not supported in printf"
 msgstr ""
 
-#: printcmd.c:2481
+#: printcmd.c:2495
 msgid "long long not supported in printf"
 msgstr ""
 
-#: printcmd.c:2716
+#: printcmd.c:2730
 msgid "Describe where symbol SYM is stored."
 msgstr ""
 
-#: printcmd.c:2718
+#: printcmd.c:2732
 msgid ""
 "Describe what symbol is at location ADDR.\n"
 "Only for symbols with fixed locations (global or static scope)."
 msgstr ""
 
-#: printcmd.c:2722
+#: printcmd.c:2736
 msgid ""
 "Examine memory: x/FMT ADDRESS.\n"
 "ADDRESS is an expression for the memory address to examine.\n"
@@ -15871,15 +16430,15 @@
 "with this command or \"print\"."
 msgstr ""
 
-#: printcmd.c:2737
+#: printcmd.c:2751
 msgid "Print line number and file of definition of variable."
 msgstr ""
 
-#: printcmd.c:2740
+#: printcmd.c:2754
 msgid "Expressions to display when program stops, with code numbers."
 msgstr ""
 
-#: printcmd.c:2743
+#: printcmd.c:2757
 msgid ""
 "Cancel some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to stop displaying.\n"
@@ -15888,7 +16447,7 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2751
+#: printcmd.c:2765
 msgid ""
 "Print value of expression EXP each time the program stops.\n"
 "/FMT may be used before EXP as in the \"print\" command.\n"
@@ -15900,7 +16459,7 @@
 "Use \"undisplay\" to cancel display requests previously made."
 msgstr ""
 
-#: printcmd.c:2760
+#: printcmd.c:2774
 msgid ""
 "Enable some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to resume displaying.\n"
@@ -15908,7 +16467,7 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2766
+#: printcmd.c:2780
 msgid ""
 "Disable some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to stop displaying.\n"
@@ -15916,7 +16475,7 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2772
+#: printcmd.c:2786
 msgid ""
 "Cancel some expressions to be displayed when program stops.\n"
 "Arguments are the code numbers of the expressions to stop displaying.\n"
@@ -15924,19 +16483,19 @@
 "Do \"info display\" to see current list of code numbers."
 msgstr ""
 
-#: printcmd.c:2778
+#: printcmd.c:2792
 msgid ""
 "printf \"printf format string\", arg1, arg2, arg3, ..., argn\n"
 "This is useful for formatted output in user-defined commands."
 msgstr ""
 
-#: printcmd.c:2782
+#: printcmd.c:2796
 msgid ""
 "Like \"print\" but don't put in value history and don't print newline.\n"
 "This is useful in user-defined commands."
 msgstr ""
 
-#: printcmd.c:2786 printcmd.c:2798
+#: printcmd.c:2800 printcmd.c:2812
 msgid ""
 "Evaluate expression EXP and assign result to variable VAR, using assignment\n"
 "syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n"
@@ -15950,7 +16509,7 @@
 msgstr ""
 
 #. "call" is the same as "set", but handy for dbx users to call fns.
-#: printcmd.c:2809
+#: printcmd.c:2823
 msgid ""
 "Call a function in the program.\n"
 "The argument is the function name and arguments, in the notation of the\n"
@@ -15958,7 +16517,7 @@
 "history, if it is not void."
 msgstr ""
 
-#: printcmd.c:2816
+#: printcmd.c:2830
 msgid ""
 "Evaluate expression EXP and assign result to variable VAR, using assignment\n"
 "syntax appropriate for the current language (VAR = EXP or VAR := EXP for\n"
@@ -15968,7 +16527,7 @@
 "This may usually be abbreviated to simply \"set\"."
 msgstr ""
 
-#: printcmd.c:2825
+#: printcmd.c:2839
 msgid ""
 "Print value of expression EXP.\n"
 "Variables accessible are those of the lexical environment of the selected\n"
@@ -15994,29 +16553,29 @@
 "but no count or size letter (see \"x\" command)."
 msgstr ""
 
-#: printcmd.c:2850
+#: printcmd.c:2864
 msgid ""
 "Same as \"print\" command, except that if you are running in the epoch\n"
 "environment, the value is printed in its own window."
 msgstr ""
 
-#: printcmd.c:2856
+#: printcmd.c:2870
 msgid "Set the largest offset that will be printed in <symbol+1234> form."
 msgstr ""
 
-#: printcmd.c:2857
+#: printcmd.c:2871
 msgid "Show the largest offset that will be printed in <symbol+1234> form."
 msgstr ""
 
-#: printcmd.c:2863
+#: printcmd.c:2877
 msgid "Set printing of source filename and line number with <symbol>."
 msgstr ""
 
-#: printcmd.c:2864
+#: printcmd.c:2878
 msgid "Show printing of source filename and line number with <symbol>."
 msgstr ""
 
-#: printcmd.c:2870
+#: printcmd.c:2884
 msgid ""
 "Convert \"printf format string\", arg1, arg2, arg3, ..., argn to\n"
 "a command line, and call it."
@@ -16038,12 +16597,12 @@
 msgid "Show filename for /proc tracefile."
 msgstr ""
 
-#: procfs.c:490
+#: procfs.c:489
 #, possible-c-format
 msgid "procfs: couldn't find pid %d (kernel thread %d) in procinfo list."
 msgstr ""
 
-#: procfs.c:494
+#: procfs.c:493
 #, possible-c-format
 msgid "procfs: couldn't find pid %d in procinfo list."
 msgstr ""
@@ -16053,177 +16612,177 @@
 msgid "load_syscalls: Can't open /proc/%d/sysent"
 msgstr ""
 
-#: procfs.c:896 procfs.c:911
+#: procfs.c:897 procfs.c:911
 #, possible-c-format
 msgid "load_syscalls: Error reading /proc/%d/sysent"
 msgstr ""
 
-#: procfs.c:901
+#: procfs.c:902
 #, possible-c-format
 msgid "load_syscalls: /proc/%d/sysent contains no syscalls!"
 msgstr ""
 
-#: procfs.c:1444
+#: procfs.c:1442
 #, possible-c-format
 msgid "procfs: modify_flag failed to turn %s %s"
 msgstr ""
 
-#: procfs.c:1721
+#: procfs.c:1719
 msgid "procfs: set_traced_signals failed"
 msgstr ""
 
-#: procfs.c:2813
+#: procfs.c:2811
 #, possible-c-format
 msgid "procfs_find_LDT_entry: could not find procinfo for %d:%ld."
 msgstr ""
 
-#: procfs.c:2820
+#: procfs.c:2818
 #, possible-c-format
 msgid "procfs_find_LDT_entry: could not read gregs for %d:%ld."
 msgstr ""
 
-#: procfs.c:3302
+#: procfs.c:3300
 #, possible-c-format
 msgid "Attaching to program `%s', %s\n"
 msgstr ""
 
-#: procfs.c:3352
+#: procfs.c:3350
 msgid "procfs: out of memory in 'attach'"
 msgstr ""
 
-#: procfs.c:3441
+#: procfs.c:3439
 msgid "Was stopped when attached, make it runnable again? "
 msgstr ""
 
-#: procfs.c:3484
+#: procfs.c:3482
 #, possible-c-format
 msgid "procfs: fetch_registers failed to find procinfo for %s"
 msgstr ""
 
-#: procfs.c:3533
+#: procfs.c:3531
 #, possible-c-format
 msgid "procfs: store_registers: failed to find procinfo for %s"
 msgstr ""
 
-#: procfs.c:3640
+#: procfs.c:3638
 msgid "Unable to remove __dbx_link breakpoint."
 msgstr ""
 
-#: procfs.c:3695
+#: procfs.c:3693
 #, possible-c-format
 msgid "Failed to create a bfd: %s."
 msgstr ""
 
-#: procfs.c:3716
+#: procfs.c:3714
 msgid "Failed to insert dbx_link breakpoint."
 msgstr ""
 
 #. /proc file not found; presumably child has terminated.
 #. "wait" for the child's exit.
 #. wrong child?
-#: procfs.c:3855
+#: procfs.c:3853
 #, possible-c-format
 msgid "procfs: couldn't stop process %d: wait returned %d."
 msgstr ""
 
-#: procfs.c:3963
+#: procfs.c:3961
 msgid "procfs: trapped on entry to "
 msgstr ""
 
-#: procfs.c:3973 procfs.c:4076
+#: procfs.c:3971 procfs.c:4074
 #, possible-c-format
 msgid "%ld syscall arguments:\n"
 msgstr ""
 
-#: procfs.c:4066
+#: procfs.c:4064
 msgid "procfs: trapped on exit from "
 msgstr ""
 
-#: procfs.c:4095
+#: procfs.c:4093
 #, possible-c-format
 msgid "Retry #%d:\n"
 msgstr ""
 
-#: procfs.c:4171 procfs.c:4179
+#: procfs.c:4169 procfs.c:4177
 msgid "child stopped for unknown reason:\n"
 msgstr ""
 
-#: procfs.c:4173 procfs.c:4181
+#: procfs.c:4171 procfs.c:4179
 msgid "... giving up..."
 msgstr ""
 
-#: procfs.c:4204
+#: procfs.c:4202
 msgid "procfs: ...giving up..."
 msgstr ""
 
-#: procfs.c:4459
+#: procfs.c:4457
 msgid ""
 "resume: target already running.  Pretend to resume, and hope for the best!"
 msgstr ""
 
-#: procfs.c:4495
+#: procfs.c:4493
 #, possible-c-format
 msgid "\tUsing the running image of %s %s via /proc.\n"
 msgstr ""
 
-#: procfs.c:4631
+#: procfs.c:4629
 msgid "procfs: out of memory in 'init_inferior'"
 msgstr ""
 
-#: procfs.c:4740
+#: procfs.c:4738
 msgid "procfs: create_procinfo failed in child."
 msgstr ""
 
 #. Not found.  This must be an error rather than merely passing
 #. the file to execlp(), because execlp() would try all the
 #. exec()s, causing GDB to get confused.
-#: procfs.c:4911
+#: procfs.c:4909
 #, possible-c-format
 msgid "procfs:%d -- Can't find shell %s in PATH"
 msgstr ""
 
-#: procfs.c:5453
+#: procfs.c:5456
 #, possible-c-format
 msgid "process %d flags:\n"
 msgstr ""
 
-#: procfs.c:5463
+#: procfs.c:5466
 #, possible-c-format
 msgid "thread %d flags:\n"
 msgstr ""
 
-#: procfs.c:5523
+#: procfs.c:5526
 msgid "you must be debugging a process to use this command."
 msgstr ""
 
-#: procfs.c:5526
+#: procfs.c:5529
 msgid "system call to trace"
 msgstr ""
 
-#: procfs.c:5567
+#: procfs.c:5570
 msgid ""
 "Show /proc process information about any running process.\n"
 "Specify process id, or use the program being debugged by default.\n"
 "Specify keyword 'mappings' for detailed info on memory mappings."
 msgstr ""
 
-#: procfs.c:5572
+#: procfs.c:5575
 msgid "Give a trace of entries into the syscall."
 msgstr ""
 
-#: procfs.c:5574
+#: procfs.c:5577
 msgid "Give a trace of exits from the syscall."
 msgstr ""
 
-#: procfs.c:5576
+#: procfs.c:5579
 msgid "Cancel a trace of entries into the syscall."
 msgstr ""
 
-#: procfs.c:5578
+#: procfs.c:5581
 msgid "Cancel a trace of exits from the syscall."
 msgstr ""
 
-#: procfs.c:5774
+#: procfs.c:5777
 msgid "gcore not implemented for this host."
 msgstr ""
 
@@ -16236,1023 +16795,1081 @@
 msgid "Info about currently known program spaces."
 msgstr ""
 
-#: psymtab.c:88 symfile.c:1118
+#: psymtab.c:88 symfile.c:1120
 #, possible-c-format
 msgid "Reading symbols from %s..."
 msgstr ""
 
-#: psymtab.c:98 symfile.c:1147
+#: psymtab.c:98 symfile.c:1149
 msgid "(no debugging symbols found)..."
 msgstr ""
 
-#: psymtab.c:197
-#, possible-c-format
-msgid "Internal: readin %s pst for `%s' found when no symtab found."
-msgstr ""
-
 #. Might want to error() here (in case symtab is corrupt and
 #. will cause a core dump), but maybe we can successfully
 #. continue, so let's not.
-#: psymtab.c:366
+#: psymtab.c:394
 #, possible-c-format
 msgid "(Internal error: pc %s in read in psymtab, but not in symtab.)\n"
 msgstr ""
 
-#: psymtab.c:806
+#: psymtab.c:842
 msgid "select_source_symtab: readin pst found and no symtabs."
 msgstr ""
 
-#: psymtab.c:1002
+#: psymtab.c:1040
 #, possible-c-format
 msgid "  Number of psym tables (not yet expanded): %d\n"
 msgstr ""
 
-#: psymtab.c:1676
+#: psymtab.c:1722
 msgid ""
 "print-psymbols takes an output file name and optional symbol file name"
 msgstr ""
 
-#: python/py-value.c:132
-msgid "Value object creation takes only 1 argument"
+#: p-typeprint.c:300
+msgid "type not handled in pascal_type_print_varspec_prefix()"
 msgstr ""
 
-#: python/py-value.c:140
-msgid "Could not allocate memory to create Value object."
+#: p-typeprint.c:419
+msgid "type not handled in pascal_type_print_varspec_suffix()"
 msgstr ""
 
-#: python/py-value.c:386
-msgid "Argument must be a type."
+#: p-valprint.c:575
+#, possible-c-format
+msgid "Invalid pascal type code %d in symbol table."
+msgstr ""
+
+#: p-valprint.c:624
+#, possible-c-format
+msgid "Printing of pascal static members is %s.\n"
+msgstr ""
+
+#: p-valprint.c:1075
+msgid "Set printing of pascal static members."
+msgstr ""
+
+#: p-valprint.c:1076
+msgid "Show printing of pascal static members."
+msgstr ""
+
+#: python/py-auto-load.c:260
+#, possible-c-format
+msgid "Invalid entry in %s section"
+msgstr ""
+
+#: python/py-auto-load.c:275
+#, possible-c-format
+msgid "Non-null-terminated path in %s: %s"
+msgstr ""
+
+#: python/py-auto-load.c:282
+#, possible-c-format
+msgid "Empty path in %s"
+msgstr ""
+
+#: python/py-auto-load.c:304
+#, possible-c-format
+msgid ""
+"Missing auto-load scripts referenced in section %s\n"
+"of file %s\n"
+"Use `info auto-load-scripts [REGEXP]' to list them."
+msgstr ""
+
+#: python/py-auto-load.c:345
+#, possible-c-format
+msgid "Couldn't read %s section of %s"
+msgstr ""
+
+#: python/py-auto-load.c:549 solib.c:882 solib.c:964 xcoffsolib.c:113
+#, possible-c-format
+msgid "Invalid regexp: %s"
+msgstr ""
+
+#: python/py-auto-load.c:613
+msgid "Set the debugger's behaviour regarding auto-loaded scripts."
+msgstr ""
+
+#: python/py-auto-load.c:614
+msgid "Show the debugger's behaviour regarding auto-loaded scripts."
 msgstr ""
 
-#: python/py-value.c:438 python/py-value.c:901 python/py-value.c:938
-msgid "Invalid operation on gdb.Value."
+#: python/py-auto-load.c:615
+msgid ""
+"If enabled, auto-loaded scripts are loaded when the debugger reads\n"
+"an executable or shared library."
 msgstr ""
 
-#: python/py-value.c:482
-msgid "Cannot subscript requested type."
+#: python/py-auto-load.c:624
+msgid ""
+"Print the list of automatically loaded scripts.\n"
+"Usage: info auto-load-scripts [REGEXP]"
 msgstr ""
 
-#: python/py-value.c:499
-msgid "Setting of struct elements is not currently supported."
+#. Require a valid block.  All access to block_object->block should be
+#. gated by this call.
+#: python/py-block.c:64
+msgid "Block is invalid."
 msgstr ""
 
-#: python/py-value.c:518
-msgid "Value is not callable (not TYPE_CODE_FUNC)."
+#. Require a valid block.  This macro is called during block iterator
+#. creation, and at each next call.
+#: python/py-block.c:76
+msgid "Source block for iterator is invalid."
 msgstr ""
 
-#: python/py-value.c:980
-msgid "Cannot convert value to int."
+#: python/py-block.c:322
+msgid "Symbol is null."
 msgstr ""
 
-#: python/py-value.c:1005
-msgid "Cannot convert value to long."
+#: python/py-block.c:391 python/py-frame.c:239
+msgid "Cannot locate object file for block."
 msgstr ""
 
-#: python/py-value.c:1031
-msgid "Cannot convert value to float."
+#: python/py-breakpoint.c:124
+msgid "Cannot delete `enabled' attribute."
 msgstr ""
 
-#: python/py-value.c:1171
-#, possible-c-format
-msgid "Could not convert Python object: %s."
+#: python/py-breakpoint.c:131
+msgid "The value of `enabled' must be a boolean."
 msgstr ""
 
-#: python/py-param.c:133
-msgid "String required for filename."
+#: python/py-breakpoint.c:163
+msgid "Cannot delete `silent' attribute."
 msgstr ""
 
-#: python/py-param.c:166
-msgid "ENUM arguments must be a string."
+#: python/py-breakpoint.c:169
+msgid "The value of `silent' must be a boolean."
 msgstr ""
 
-#: python/py-param.c:180
-msgid "The value must be member of an enumeration."
+#: python/py-breakpoint.c:194
+msgid "Cannot delete `thread' attribute."
 msgstr ""
 
-#: python/py-param.c:191
-msgid "A boolean argument is required."
+#: python/py-breakpoint.c:205
+msgid "Invalid thread ID."
 msgstr ""
 
-#: python/py-param.c:204
-msgid "A boolean or None is required"
+#: python/py-breakpoint.c:214
+msgid "The value of `thread' must be an integer or None."
 msgstr ""
 
-#: python/py-param.c:232
-msgid "The value must be integer."
+#: python/py-breakpoint.c:237
+msgid "Cannot delete `task' attribute."
 msgstr ""
 
-#: python/py-param.c:257
-msgid "Range exceeded."
+#: python/py-breakpoint.c:254
+msgid "Invalid task ID."
 msgstr ""
 
-#: python/py-param.c:267
-msgid "Unhandled type in parameter value."
+#: python/py-breakpoint.c:263
+msgid "The value of `task' must be an integer or None."
 msgstr ""
 
-#: python/py-param.c:284
-msgid "Cannot delete a parameter's value."
+#: python/py-breakpoint.c:308
+msgid "Cannot delete `ignore_count' attribute."
 msgstr ""
 
-#: python/py-param.c:314 python/py-cmd.c:505
-msgid "This command is not documented."
+#: python/py-breakpoint.c:314
+msgid "The value of `ignore_count' must be an integer."
 msgstr ""
 
-#: python/py-param.c:340
-msgid "Parameter must return a string value."
+#: python/py-breakpoint.c:344
+msgid "Cannot delete `hit_count' attribute."
 msgstr ""
 
-#: python/py-param.c:567
-msgid "An enumeration is required for PARAM_ENUM."
+#: python/py-breakpoint.c:357
+msgid "The value of `hit_count' must be zero."
 msgstr ""
 
-#: python/py-param.c:574
-msgid "The enumeration is not a sequence."
+#: python/py-breakpoint.c:439
+msgid "Cannot delete `condition' attribute."
 msgstr ""
 
-#: python/py-param.c:584
-msgid "The enumeration is empty."
+#: python/py-breakpoint.c:642
+msgid "Cannot understand watchpoint access type."
 msgstr ""
 
-#: python/py-param.c:605
-msgid "The enumeration item not a string."
+#: python/py-breakpoint.c:646
+msgid "Do not understand breakpoint type to set."
 msgstr ""
 
-#: python/py-param.c:667 python/py-cmd.c:441
-msgid "Invalid command class argument."
+#: python/py-breakpoint.c:826
+msgid "Error while creating breakpoint from GDB."
 msgstr ""
 
-#: python/py-param.c:679
-msgid "Invalid parameter class argument."
+#: python/py-breakpoint.c:921
+msgid ""
+"Cannot set 'stop' method.  There is an existing GDB condition attached to "
+"the breakpoint."
 msgstr ""
 
-#: python/py-param.c:686
-msgid "Only PARAM_ENUM accepts a fourth argument."
+#: python/py-cmd.c:125 python/py-cmd.c:220
+msgid "Invalid invocation of Python command object."
 msgstr ""
 
-#: python/py-function.c:48
-msgid "Could not convert value to Python object."
+#: python/py-cmd.c:134
+msgid "Python command object missing 'invoke' method."
 msgstr ""
 
-#: python/py-function.c:73
-msgid "No method named 'invoke' in object."
+#: python/py-cmd.c:143
+msgid "Could not convert arguments to Python string."
 msgstr ""
 
 #. An error occurred computing the string representation of the
 #. error message.  This is rare, but we should inform the user.
-#: python/py-function.c:99
+#: python/py-cmd.c:171
 msgid ""
-"An error occurred in a Python convenience function\n"
+"An error occurred in a Python command\n"
 "and then another occurred computing the error message.\n"
 msgstr ""
 
-#: python/py-function.c:119
+#: python/py-cmd.c:190
 #, possible-c-format
-msgid "Error occurred in Python convenience function: %s"
+msgid "Error occurred in Python command: %s"
 msgstr ""
 
-#: python/py-function.c:122
-msgid "Error occurred in Python convenience function."
+#: python/py-cmd.c:192
+msgid "Error occurred in Python command."
 msgstr ""
 
-#: python/py-function.c:138 python/py-prettyprint.c:642 python/python.c:187
-#: python/python.c:208
-msgid "Error while executing Python code."
+#: python/py-cmd.c:230 python/py-cmd.c:233
+msgid "Could not convert argument to Python string."
 msgstr ""
 
-#: python/py-function.c:173
-msgid "This function is not documented."
+#: python/py-cmd.c:331
+msgid "No command name found."
 msgstr ""
 
-#. Require a valid symbol.  All access to symbol_object->symbol should be
-#. gated by this call.
-#: python/py-symbol.c:48
-msgid "Symbol is invalid."
+#: python/py-cmd.c:363
+#, possible-c-format
+msgid "Could not find command prefix %s."
 msgstr ""
 
-#: python/py-type.c:293
-msgid "Array bound must be an integer"
+#: python/py-cmd.c:377
+#, possible-c-format
+msgid "'%s' is not a prefix command."
 msgstr ""
 
-#: python/py-type.c:309
-msgid "Array length must not be negative"
+#: python/py-cmd.c:425
+msgid "Command object already initialized."
 msgstr ""
 
-#: python/py-type.c:355
-msgid "This type does not have a range."
+#: python/py-cmd.c:441 python/py-param.c:669
+msgid "Invalid command class argument."
 msgstr ""
 
-#: python/py-type.c:428
-msgid "Type does not have a target."
+#: python/py-cmd.c:448
+msgid "Invalid completion type argument."
 msgstr ""
 
-#: python/py-type.c:585
-msgid "Null type name."
+#: python/py-cmd.c:505 python/py-param.c:314
+msgid "This command is not documented."
 msgstr ""
 
-#: python/py-type.c:604
-msgid "Type is not a template."
+#: python/py-finishbreakpoint.c:190
+msgid "\"FinishBreakpoint\" not meaningful in the outermost frame."
 msgstr ""
 
-#: python/py-type.c:616 python/py-type.c:669
-#, possible-c-format
-msgid "No argument %d in template."
+#: python/py-finishbreakpoint.c:196
+msgid "\"FinishBreakpoint\" cannot be set on a dummy frame."
 msgstr ""
 
-#: python/py-type.c:648 python/py-frame.c:429
-msgid "Second argument must be block."
+#: python/py-finishbreakpoint.c:204 python/py-finishbreakpoint.c:305
+msgid "Invalid ID for the `frame' object."
 msgstr ""
 
-#: python/py-type.c:680
-msgid "Template argument is optimized out"
+#: python/py-finishbreakpoint.c:219
+msgid "No thread currently selected."
 msgstr ""
 
-#: python/py-type.c:1038
-msgid "'block' argument must be a Block."
+#: python/py-finishbreakpoint.c:229
+msgid "The value of `internal' must be a boolean."
 msgstr ""
 
-#. Require a valid symbol table.  All access to symtab_object->symtab
-#. should be gated by this call.
-#: python/py-symtab.c:50
-msgid "Symbol Table is invalid."
+#. Require a valid frame.  This must be called inside a TRY_CATCH, or
+#. another context in which a gdb exception is allowed.
+#: python/py-frame.c:54
+msgid "Frame is invalid."
 msgstr ""
 
-#. Require a valid symbol table and line object.  All access to
-#. sal_object->sal should be gated by this call.
-#: python/py-symtab.c:80
-msgid "Symbol Table and Line is invalid."
+#: python/py-frame.c:292
+msgid "Could not allocate frame object."
 msgstr ""
 
-#: python/py-prettyprint.c:291 valprint.c:393
-msgid "<error reading variable>"
+#: python/py-frame.c:441 python/py-type.c:859
+msgid "Second argument must be block."
 msgstr ""
 
-#: python/py-prettyprint.c:815
-msgid "Argument must be a gdb.Value."
+#: python/py-frame.c:459
+#, possible-c-format
+msgid "Variable '%s' not found."
 msgstr ""
 
-#: python/py-objfile.c:101
-msgid "Cannot delete the pretty_printers attribute."
+#: python/py-frame.c:470
+msgid "Argument must be a symbol or string."
 msgstr ""
 
-#: python/py-objfile.c:108
-msgid "The pretty_printers attribute must be a list."
+#: python/py-frame.c:559
+msgid "Invalid frame stop reason."
 msgstr ""
 
-#: python/py-auto-load.c:200
-#, possible-c-format
-msgid "Invalid entry in %s section"
+#: python/py-function.c:86
+msgid "No method named 'invoke' in object."
 msgstr ""
 
-#: python/py-auto-load.c:215
-#, possible-c-format
-msgid "Non-null-terminated path in %s: %s"
+#. An error occurred computing the string representation of the
+#. error message.  This is rare, but we should inform the user.
+#: python/py-function.c:113
+msgid ""
+"An error occurred in a Python convenience function\n"
+"and then another occurred computing the error message.\n"
 msgstr ""
 
-#: python/py-auto-load.c:222
+#: python/py-function.c:133
 #, possible-c-format
-msgid "Empty path in %s"
+msgid "Error occurred in Python convenience function: %s"
 msgstr ""
 
-#: python/py-auto-load.c:272
-#, possible-c-format
-msgid "%s (referenced in %s): %s"
+#: python/py-function.c:136
+msgid "Error occurred in Python convenience function."
 msgstr ""
 
-#: python/py-auto-load.c:306
-#, possible-c-format
-msgid "Couldn't read %s section of %s"
+#: python/py-function.c:152 python/py-prettyprint.c:642 python/python.c:252
+#: python/python.c:274
+msgid "Error while executing Python code."
 msgstr ""
 
-#: python/py-auto-load.c:429
-#, possible-c-format
-msgid "Script name: %s\n"
+#: python/py-function.c:188
+msgid "This function is not documented."
 msgstr ""
 
-#: python/py-auto-load.c:430
-#, possible-c-format
-msgid "  Full name: %s\n"
+#. Require that INFERIOR be a valid inferior ID.
+#: python/py-inferior.c:75
+msgid "Inferior no longer exists."
 msgstr ""
 
-#: python/py-auto-load.c:451 solib.c:920 solib.c:1014 xcoffsolib.c:113
-#, possible-c-format
-msgid "Invalid regexp: %s"
+#: python/py-inferior.c:449
+msgid "Could not allocate memory buffer object."
 msgstr ""
 
-#: python/py-auto-load.c:453
+#: python/py-inferior.c:526
 #, possible-c-format
-msgid "Objfile scripts matching %s:\n"
+msgid "Memory buffer for address %s, which is %s bytes long."
 msgstr ""
 
-#: python/py-auto-load.c:458
-msgid "Objfile scripts:\n"
+#: python/py-inferior.c:540
+msgid "The memory buffer supports only one segment."
 msgstr ""
 
-#: python/py-auto-load.c:480
-msgid "Set the debugger's behaviour regarding auto-loaded scripts."
+#: python/py-inferior.c:607
+msgid "Search range is empty."
 msgstr ""
 
-#: python/py-auto-load.c:481
-msgid "Show the debugger's behaviour regarding auto-loaded scripts."
+#: python/py-inferior.c:615
+msgid "The search range is too large."
 msgstr ""
 
-#: python/py-auto-load.c:482
-msgid ""
-"If enabled, auto-loaded scripts are loaded when the debugger reads\n"
-"an executable or shared library."
+#: python/py-inferior.c:626
+msgid "The pattern is not a Python buffer."
 msgstr ""
 
-#: python/py-auto-load.c:491
-msgid "Print dump of auto-loaded section scripts matching REGEXP."
+#. Require that INFERIOR be a valid inferior ID.
+#: python/py-infthread.c:34 python/py-infthread.c:91
+msgid "Thread no longer exists."
 msgstr ""
 
-#: python/python.c:102
-msgid "internal error: Unhandled Python exception"
+#: python/py-infthread.c:98
+msgid "Cannot delete `name' attribute."
 msgstr ""
 
-#: python/python.c:177
-msgid "Invalid \"python\" block structure."
+#: python/py-infthread.c:106
+msgid "The value of `name' must be a string."
 msgstr ""
 
-#: python/python.c:283
-msgid "Programmer error: unhandled type."
+#: python/py-lazy-string.c:105
+msgid "Cannot create a value from NULL."
 msgstr ""
 
-#: python/python.c:310
-#, possible-c-format
-msgid "Could not find parameter `%s'."
+#: python/py-lazy-string.c:135
+msgid "Cannot create a lazy string with address 0x0, and a non-zero length."
 msgstr ""
 
-#: python/python.c:314
-#, possible-c-format
-msgid "`%s' is not a parameter."
+#: python/py-lazy-string.c:143
+msgid "A lazy string's type cannot be NULL."
 msgstr ""
 
-#: python/python.c:642
-msgid "Posted event is not callable"
+#: python/py-objfile.c:101
+msgid "Cannot delete the pretty_printers attribute."
 msgstr ""
 
-#: python/python.c:889 python/python.c:903 python/python.c:910
-msgid "Python scripting is not supported in this copy of GDB."
+#: python/py-objfile.c:108
+msgid "The pretty_printers attribute must be a list."
 msgstr ""
 
-#: python/python.c:917
-msgid "gdbpy_should_stop called when Python scripting is  not supported."
+#: python/py-param.c:133
+msgid "String required for filename."
 msgstr ""
 
-#: python/python.c:925
-msgid ""
-"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported."
+#: python/py-param.c:166
+msgid "ENUM arguments must be a string."
 msgstr ""
 
-#: python/python.c:964
-msgid ""
-"Evaluate a Python command.\n"
-"\n"
-"The command can be given as an argument, for instance:\n"
-"\n"
-"    python print 23\n"
-"\n"
-"If no argument is given, the following lines are read and used\n"
-"as the Python commands.  Type a line containing \"end\" to indicate\n"
-"the end of the command."
+#: python/py-param.c:180
+msgid "The value must be member of an enumeration."
 msgstr ""
 
-#: python/python.c:975
-msgid ""
-"Evaluate a Python command.\n"
-"\n"
-"Python scripting is not supported in this copy of GDB.\n"
-"This command is only a placeholder."
+#: python/py-param.c:191
+msgid "A boolean argument is required."
 msgstr ""
 
-#: python/python.c:984 python/python.c:988
-msgid "Prefix command for python maintenance settings."
+#: python/py-param.c:204
+msgid "A boolean or None is required"
 msgstr ""
 
-#: python/python.c:993
-msgid "Enable or disable printing of Python stack dump on error."
+#: python/py-param.c:232
+msgid "The value must be integer."
 msgstr ""
 
-#: python/python.c:994
-msgid "Show whether Python stack will be printed on error."
+#: python/py-param.c:257
+msgid "Range exceeded."
 msgstr ""
 
-#: python/python.c:995
-msgid "Enables or disables printing of Python stack traces."
+#: python/py-param.c:267
+msgid "Unhandled type in parameter value."
 msgstr ""
 
-#. Require that INFERIOR be a valid inferior ID.
-#: python/py-inferior.c:74
-msgid "Inferior no longer exists."
+#: python/py-param.c:284
+msgid "Cannot delete a parameter's value."
 msgstr ""
 
-#: python/py-inferior.c:407
-msgid "Could not allocate memory buffer object."
+#: python/py-param.c:341
+msgid "Parameter must return a string value."
 msgstr ""
 
-#: python/py-inferior.c:483
-#, possible-c-format
-msgid "Memory buffer for address %s, which is %s bytes long."
+#: python/py-param.c:569
+msgid "An enumeration is required for PARAM_ENUM."
 msgstr ""
 
-#: python/py-inferior.c:497
-msgid "The memory buffer supports only one segment."
+#: python/py-param.c:576
+msgid "The enumeration is not a sequence."
 msgstr ""
 
-#: python/py-inferior.c:564
-msgid "Search range is empty."
+#: python/py-param.c:586
+msgid "The enumeration is empty."
 msgstr ""
 
-#: python/py-inferior.c:572
-msgid "The search range is too large."
+#: python/py-param.c:607
+msgid "The enumeration item not a string."
+msgstr ""
+
+#: python/py-param.c:681
+msgid "Invalid parameter class argument."
+msgstr ""
+
+#: python/py-param.c:688
+msgid "Only PARAM_ENUM accepts a fourth argument."
+msgstr ""
+
+#: python/py-prettyprint.c:291 valprint.c:394
+msgid "<error reading variable>"
+msgstr ""
+
+#: python/py-prettyprint.c:815
+msgid "Argument must be a gdb.Value."
 msgstr ""
 
-#: python/py-inferior.c:583
-msgid "The pattern is not a Python buffer."
+#. Require a valid symbol.  All access to symbol_object->symbol should be
+#. gated by this call.
+#: python/py-symbol.c:48
+msgid "Symbol is invalid."
 msgstr ""
 
-#: python/py-utils.c:79
-msgid "Expected a string or unicode object."
+#. Require a valid symbol table.  All access to symtab_object->symtab
+#. should be gated by this call.
+#: python/py-symtab.c:50
+msgid "Symbol Table is invalid."
 msgstr ""
 
-#: python/py-utils.c:322
-msgid "Overflow converting to address."
+#. Require a valid symbol table and line object.  All access to
+#. sal_object->sal should be gated by this call.
+#: python/py-symtab.c:80
+msgid "Symbol Table and Line is invalid."
 msgstr ""
 
-#. Require that INFERIOR be a valid inferior ID.
-#: python/py-infthread.c:34 python/py-infthread.c:92
-msgid "Thread no longer exists."
+#: python/py-type.c:470
+msgid "Array bound must be an integer"
 msgstr ""
 
-#: python/py-infthread.c:99
-msgid "Cannot delete `name' attribute."
+#: python/py-type.c:486
+msgid "Array length must not be negative"
 msgstr ""
 
-#: python/py-infthread.c:107
-msgid "The value of `name' must be a string."
+#: python/py-type.c:532
+msgid "This type does not have a range."
 msgstr ""
 
-#. Require a valid frame.  This must be called inside a TRY_CATCH, or
-#. another context in which a gdb exception is allowed.
-#: python/py-frame.c:54
-msgid "Frame is invalid."
+#: python/py-type.c:605
+msgid "Type does not have a target."
 msgstr ""
 
-#: python/py-frame.c:232 python/py-block.c:314
-msgid "Cannot locate object file for block."
+#: python/py-type.c:786
+msgid "Null type name."
 msgstr ""
 
-#: python/py-frame.c:284
-msgid "Could not allocate frame object."
+#: python/py-type.c:813
+msgid "Type is not a template."
 msgstr ""
 
-#: python/py-frame.c:447
+#: python/py-type.c:826 python/py-type.c:880
 #, possible-c-format
-msgid "Variable '%s' not found."
+msgid "No argument %d in template."
 msgstr ""
 
-#: python/py-frame.c:458
-msgid "Argument must be a symbol or string."
+#: python/py-type.c:891
+msgid "Template argument is optimized out"
 msgstr ""
 
-#: python/py-frame.c:473
+#: python/py-type.c:1044
 #, possible-c-format
-msgid "Variable cannot be found for symbol '%s'."
+msgid "Unsupported field kind %d by check_types_equal"
 msgstr ""
 
-#: python/py-frame.c:556
-msgid "Invalid frame stop reason."
+#: python/py-type.c:1482
+msgid "'block' argument must be a Block."
 msgstr ""
 
-#. Require a valid block.  All access to block_object->block should be
-#. gated by this call.
-#: python/py-block.c:64
-msgid "Block is invalid."
+#: python/py-utils.c:79
+msgid "Expected a string or unicode object."
 msgstr ""
 
-#. Require a valid block.  This macro is called during block iterator
-#. creation, and at each next call.
-#: python/py-block.c:76
-msgid "Source block for iterator is invalid."
+#: python/py-utils.c:322
+msgid "Overflow converting to address."
 msgstr ""
 
-#: python/py-block.c:251
-msgid "Symbol is null."
+#: python/py-value.c:132
+msgid "Value object creation takes only 1 argument"
 msgstr ""
 
-#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
-#. exception if it is invalid.
-#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
-#. exception if it is invalid.  This macro is for use in setter functions.
-#: python/py-breakpoint.c:64 python/py-breakpoint.c:74
-#, possible-c-format
-msgid "Breakpoint %d is invalid."
+#: python/py-value.c:140
+msgid "Could not allocate memory to create Value object."
 msgstr ""
 
-#: python/py-breakpoint.c:159
-msgid "Cannot delete `enabled' attribute."
+#: python/py-value.c:391
+msgid "Argument must be a type."
 msgstr ""
 
-#: python/py-breakpoint.c:166
-msgid "The value of `enabled' must be a boolean."
+#: python/py-value.c:443 python/py-value.c:982 python/py-value.c:1019
+msgid "Invalid operation on gdb.Value."
 msgstr ""
 
-#: python/py-breakpoint.c:192
-msgid "Cannot delete `silent' attribute."
+#: python/py-value.c:487
+msgid "Cannot subscript requested type."
 msgstr ""
 
-#: python/py-breakpoint.c:198
-msgid "The value of `silent' must be a boolean."
+#: python/py-value.c:504
+msgid "Setting of struct elements is not currently supported."
 msgstr ""
 
-#: python/py-breakpoint.c:223
-msgid "Cannot delete `thread' attribute."
+#: python/py-value.c:529
+msgid "Value is not callable (not TYPE_CODE_FUNC)."
 msgstr ""
 
-#: python/py-breakpoint.c:234
-msgid "Invalid thread ID."
+#: python/py-value.c:536
+msgid "Inferior arguments must be provided in a tuple."
 msgstr ""
 
-#: python/py-breakpoint.c:243
-msgid "The value of `thread' must be an integer or None."
+#: python/py-value.c:1060
+msgid "Cannot convert value to int."
 msgstr ""
 
-#: python/py-breakpoint.c:264
-msgid "Cannot delete `task' attribute."
+#: python/py-value.c:1083
+msgid "Cannot convert value to long."
 msgstr ""
 
-#: python/py-breakpoint.c:275
-msgid "Invalid task ID."
+#: python/py-value.c:1106
+msgid "Cannot convert value to float."
 msgstr ""
 
-#: python/py-breakpoint.c:284
-msgid "The value of `task' must be an integer or None."
+#: python/py-value.c:1242
+#, possible-c-format
+msgid "Could not convert Python object: %s."
 msgstr ""
 
-#: python/py-breakpoint.c:323
-msgid "Cannot delete `ignore_count' attribute."
+#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
+#. exception if it is invalid.
+#. Require that BREAKPOINT be a valid breakpoint ID; throw a Python
+#. exception if it is invalid.  This macro is for use in setter functions.
+#: python/python-internal.h:146 python/python-internal.h:156
+#, possible-c-format
+msgid "Breakpoint %d is invalid."
 msgstr ""
 
-#: python/py-breakpoint.c:329
-msgid "The value of `ignore_count' must be an integer."
+#: python/python.c:121
+msgid "internal error: Unhandled Python exception"
 msgstr ""
 
-#: python/py-breakpoint.c:354
-msgid "Cannot delete `hit_count' attribute."
+#: python/python.c:195
+#, possible-c-format
+msgid "Error while opening file: %s"
 msgstr ""
 
-#: python/py-breakpoint.c:367
-msgid "The value of `hit_count' must be zero."
+#: python/python.c:244
+msgid "Invalid \"python\" block structure."
 msgstr ""
 
-#: python/py-breakpoint.c:449
-msgid "Cannot delete `condition' attribute."
+#: python/python.c:348
+msgid "Programmer error: unhandled type."
 msgstr ""
 
-#: python/py-breakpoint.c:648
-msgid "Cannot understand watchpoint access type."
+#: python/python.c:376
+#, possible-c-format
+msgid "Could not find parameter `%s'."
 msgstr ""
 
-#: python/py-breakpoint.c:652
-msgid "Do not understand breakpoint type to set."
+#: python/python.c:380
+#, possible-c-format
+msgid "`%s' is not a parameter."
 msgstr ""
 
-#: python/py-breakpoint.c:825
-msgid "Error while creating breakpoint from GDB."
+#: python/python.c:711
+msgid "Posted event is not callable"
 msgstr ""
 
-#: python/py-breakpoint.c:918
-msgid ""
-"Cannot set 'stop' method.  There is an existing GDB condition attached to "
-"the breakpoint."
+#: python/python.c:792
+msgid "Return from prompt_hook must be either a Python string, or None"
 msgstr ""
 
-#: python/py-lazy-string.c:104
-msgid "Cannot create a value from NULL."
+#: python/python.c:931
+msgid "Error occurred computing Python errormessage.\n"
 msgstr ""
 
-#: python/py-lazy-string.c:129
-msgid "Cannot create a lazy string with address 0x0, and a non-zero length."
+#: python/python.c:1064 python/python.c:1078 python/python.c:1085
+msgid "Python scripting is not supported in this copy of GDB."
 msgstr ""
 
-#: python/py-lazy-string.c:137
-msgid "A lazy string's type cannot be NULL."
+#: python/python.c:1092
+msgid "gdbpy_should_stop called when Python scripting is  not supported."
 msgstr ""
 
-#: python/py-cmd.c:126 python/py-cmd.c:220
-msgid "Invalid invocation of Python command object."
+#: python/python.c:1100
+msgid ""
+"gdbpy_breakpoint_has_py_cond called when Python scripting is not supported."
 msgstr ""
 
-#: python/py-cmd.c:135
-msgid "Python command object missing 'invoke' method."
+#: python/python.c:1152
+#, possible-c-format
+msgid "The mode of Python stack printing on error is \"%s\".\n"
 msgstr ""
 
-#: python/py-cmd.c:144
-msgid "Could not convert arguments to Python string."
+#: python/python.c:1195
+msgid ""
+"Evaluate a Python command.\n"
+"\n"
+"The command can be given as an argument, for instance:\n"
+"\n"
+"    python print 23\n"
+"\n"
+"If no argument is given, the following lines are read and used\n"
+"as the Python commands.  Type a line containing \"end\" to indicate\n"
+"the end of the command."
 msgstr ""
 
-#. An error occurred computing the string representation of the
-#. error message.  This is rare, but we should inform the user.
-#: python/py-cmd.c:172
+#: python/python.c:1206
 msgid ""
-"An error occurred in a Python command\n"
-"and then another occurred computing the error message.\n"
+"Evaluate a Python command.\n"
+"\n"
+"Python scripting is not supported in this copy of GDB.\n"
+"This command is only a placeholder."
 msgstr ""
 
-#: python/py-cmd.c:191
-#, possible-c-format
-msgid "Error occurred in Python command: %s"
+#: python/python.c:1215 python/python.c:1219
+msgid "Prefix command for python maintenance settings."
 msgstr ""
 
-#: python/py-cmd.c:193
-msgid "Error occurred in Python command."
+#: python/python.c:1224
+msgid "Enable or disable printing of Python stack dump on error."
 msgstr ""
 
-#: python/py-cmd.c:230 python/py-cmd.c:233
-msgid "Could not convert argument to Python string."
+#: python/python.c:1225
+msgid "Show whether Python stack will be printed on error."
 msgstr ""
 
-#: python/py-cmd.c:330
-msgid "No command name found."
+#: python/python.c:1226
+msgid "Enables or disables printing of Python stack traces."
 msgstr ""
 
-#: python/py-cmd.c:362
-#, possible-c-format
-msgid "Could not find command prefix %s."
+#: python/python.c:1244 python/python.c:1249
+msgid "Prefix command for python preference settings."
 msgstr ""
 
-#: python/py-cmd.c:376
-#, possible-c-format
-msgid "'%s' is not a prefix command."
+#: python/python.c:1254
+msgid "Set mode for Python stack dump on error."
 msgstr ""
 
-#: python/py-cmd.c:425
-msgid "Command object already initialized."
+#: python/python.c:1255
+msgid "Show the mode of Python stack printing on error."
 msgstr ""
 
-#: python/py-cmd.c:448
-msgid "Invalid completion type argument."
+#: python/python.c:1256
+msgid ""
+"none  == no stack or message will be printed.\n"
+"full == a message and a stack will be printed.\n"
+"message == an error message without a stack will be printed."
 msgstr ""
 
-#: ravenscar-thread.c:393
+#: ravenscar-thread.c:396
 msgid "\"set ravenscar\" must be followed by the name of a setting.\n"
 msgstr ""
 
-#: ravenscar-thread.c:414
+#: ravenscar-thread.c:417
 msgid "Support for Ravenscar task/thread switching is enabled\n"
 msgstr ""
 
-#: ravenscar-thread.c:417
+#: ravenscar-thread.c:420
 msgid "Support for Ravenscar task/thread switching is disabled\n"
 msgstr ""
 
-#: ravenscar-thread.c:437
+#: ravenscar-thread.c:440
 msgid "Prefix command for changing Ravenscar-specific settings"
 msgstr ""
 
-#: ravenscar-thread.c:441
+#: ravenscar-thread.c:444
 msgid "Prefix command for showing Ravenscar-specific settings"
 msgstr ""
 
-#: ravenscar-thread.c:445
+#: ravenscar-thread.c:448
 msgid "Enable or disable support for GNAT Ravenscar tasks"
 msgstr ""
 
-#: ravenscar-thread.c:446
+#: ravenscar-thread.c:449
 msgid "Show whether support for GNAT Ravenscar tasks is enabled"
 msgstr ""
 
-#: ravenscar-thread.c:448
+#: ravenscar-thread.c:451
 msgid ""
 "Enable or disable support for task/thread switching with the GNAT\n"
 "Ravenscar run-time library for bareboard configuration."
 msgstr ""
 
-#: record.c:554
+#: record.c:557
 msgid ""
 "Do you want to auto delete previous execution log entries when record/replay "
 "buffer becomes full (record stop-at-limit)?"
 msgstr ""
 
-#: record.c:562
+#: record.c:565
 msgid "Process record: stopped by user."
 msgstr ""
 
-#: record.c:632
+#: record.c:635
 msgid "Process record: inferior program stopped."
 msgstr ""
 
-#: record.c:634 record.c:1475 record.c:1484 record.c:1490
+#: record.c:637 record.c:1573 record.c:1582 record.c:1588
 msgid "Process record: failed to record execution log."
 msgstr ""
 
-#: record.c:742
+#: record.c:745
 #, possible-c-format
 msgid "Process record: error reading memory at addr = %s len = %d."
 msgstr ""
 
-#: record.c:755
+#: record.c:758
 #, possible-c-format
 msgid "Process record: error writing memory at addr = %s len = %d."
 msgstr ""
 
-#: record.c:851
+#: record.c:867
 msgid "Process record: the program is not being run."
 msgstr ""
 
-#: record.c:853
+#: record.c:869
 msgid ""
 "Process record target can't debug inferior in non-stop mode (non-stop)."
 msgstr ""
 
-#: record.c:856
-msgid ""
-"Process record target can't debug inferior in asynchronous mode (target-"
-"async)."
-msgstr ""
-
-#: record.c:860
+#: record.c:873
 msgid ""
 "Process record: the current architecture doesn't support record function."
 msgstr ""
 
-#: record.c:864
+#: record.c:877
 msgid "Could not find 'to_resume' method on the target stack."
 msgstr ""
 
-#: record.c:866
+#: record.c:879
 msgid "Could not find 'to_wait' method on the target stack."
 msgstr ""
 
-#: record.c:868
+#: record.c:881
 msgid "Could not find 'to_store_registers' method on the target stack."
 msgstr ""
 
-#: record.c:871
+#: record.c:884
 msgid "Could not find 'to_insert_breakpoint' method on the target stack."
 msgstr ""
 
-#: record.c:874
+#: record.c:887
 msgid "Could not find 'to_remove_breakpoint' method on the target stack."
 msgstr ""
 
-#: record.c:877
+#: record.c:890
 msgid "Could not find 'to_stopped_by_watchpoint' method on the target stack."
 msgstr ""
 
-#: record.c:880
+#: record.c:893
 msgid "Could not find 'to_stopped_data_address' method on the target stack."
 msgstr ""
 
-#: record.c:898
+#: record.c:911
 msgid ""
 "Process record target already running.  Use \"record stop\" to stop record "
 "target first."
 msgstr ""
 
-#: record.c:948
+#: record.c:964
 msgid "Could not find 'to_xfer_partial' method on the target stack."
 msgstr ""
 
-#: record.c:1517
+#: record.c:1615
 msgid ""
 "Because GDB is in replay mode, changing the value of a register will make "
 "the execution log unusable from this point onward.  Change all registers?"
 msgstr ""
 
-#: record.c:1523
+#: record.c:1621
 #, possible-c-format
 msgid ""
 "Because GDB is in replay mode, changing the value of a register will make "
 "the execution log unusable from this point onward.  Change register %s?"
 msgstr ""
 
-#: record.c:1545 record.c:1578
+#: record.c:1643 record.c:1676
 msgid "Process record canceled the operation."
 msgstr ""
 
 #. Let user choose if he wants to write memory or not.
-#: record.c:1574
+#: record.c:1672
 #, possible-c-format
 msgid ""
 "Because GDB is in replay mode, writing to memory will make the execution log "
 "unusable from this point onward.  Write memory at address %s?"
 msgstr ""
 
-#: record.c:1709 reverse.c:275
+#: record.c:1807 reverse.c:271
 #, possible-c-format
 msgid "Unbalanced quotes: %s"
 msgstr ""
 
-#: record.c:1811 record.c:1898 target.c:526
+#: record.c:1956 record.c:2043 target.c:524
 msgid "You can't do that without a process to debug."
 msgstr ""
 
-#: record.c:1967
+#: record.c:2116
 #, possible-c-format
 msgid "Debugging of process record target is %s.\n"
 msgstr ""
 
-#: record.c:1989
+#: record.c:2138
 msgid ""
 "Delete the log from this point forward and begin to record the running "
 "message at current PC?"
 msgstr ""
 
-#: record.c:1995
+#: record.c:2144
 msgid "Already at end of record list.\n"
 msgstr ""
 
-#: record.c:1999 record.c:2014
+#: record.c:2148 record.c:2163
 msgid "Process record is not started.\n"
 msgstr ""
 
-#: record.c:2010
+#: record.c:2159
 msgid "Process record is stopped and all execution logs are deleted.\n"
 msgstr ""
 
-#: record.c:2039
+#: record.c:2188
 msgid "\"set record\" must be followed by an apporpriate subcommand.\n"
 msgstr ""
 
-#: record.c:2060
+#: record.c:2209
 msgid "Replay mode:\n"
 msgstr ""
 
-#: record.c:2062
+#: record.c:2211
 msgid "Record mode:\n"
 msgstr ""
 
 #. Display instruction number for first instruction in the log.
-#: record.c:2074
+#: record.c:2223
 #, possible-c-format
 msgid "Lowest recorded instruction number is %s.\n"
 msgstr ""
 
-#: record.c:2079
+#: record.c:2228
 #, possible-c-format
 msgid "Current instruction number is %s.\n"
 msgstr ""
 
 #. Display instruction number for last instruction in the log.
-#: record.c:2083
+#: record.c:2232
 #, possible-c-format
 msgid "Highest recorded instruction number is %s.\n"
 msgstr ""
 
 #. Display log count.
-#: record.c:2087
+#: record.c:2236
 #, possible-c-format
 msgid "Log contains %d instructions.\n"
 msgstr ""
 
-#: record.c:2092
+#: record.c:2241
 msgid "No instructions have been logged.\n"
 msgstr ""
 
-#: record.c:2097
+#: record.c:2246
 msgid "target record is not active.\n"
 msgstr ""
 
 #. Display max log size.
-#: record.c:2101
+#: record.c:2250
 #, possible-c-format
 msgid "Max logged instructions is %d.\n"
 msgstr ""
 
-#: record.c:2157
+#: record.c:2306
 #, possible-c-format
 msgid "Failed to read %d bytes from core file %s ('%s')."
 msgstr ""
 
-#: record.c:2229
+#: record.c:2378
 #, possible-c-format
 msgid "Version mis-match or file format error in core file %s."
 msgstr ""
 
-#: record.c:2334
+#: record.c:2483
 #, possible-c-format
 msgid "Bad entry type in core file %s."
 msgstr ""
 
-#: record.c:2355
+#: record.c:2504
 #, possible-c-format
 msgid "Auto increase record/replay buffer limit to %d."
 msgstr ""
 
 #. Succeeded.
-#: record.c:2360
+#: record.c:2509
 #, possible-c-format
 msgid "Restored records from core file %s.\n"
 msgstr ""
 
-#: record.c:2376
+#: record.c:2525
 #, possible-c-format
 msgid "Failed to write %d bytes to core file %s ('%s')."
 msgstr ""
 
-#: record.c:2421
+#: record.c:2570
 msgid ""
 "This command can only be used with target 'record'.\n"
 "Use 'target record' first.\n"
 msgstr ""
 
-#: record.c:2488
+#: record.c:2637
 #, possible-c-format
 msgid "Failed to create 'precord' section for corefile %s: %s"
 msgstr ""
 
 #. Succeeded.
-#: record.c:2617
+#: record.c:2766
 #, possible-c-format
 msgid "Saved core file %s with execution log.\n"
 msgstr ""
 
-#: record.c:2662
+#: record.c:2811
 msgid "Command requires an argument (insn number to go to)."
 msgstr ""
 
-#: record.c:2696
+#: record.c:2845
 #, possible-c-format
 msgid "Target insn '%s' not found."
 msgstr ""
 
-#: record.c:2698
+#: record.c:2847
 #, possible-c-format
 msgid "Already at insn '%s'."
 msgstr ""
 
-#: record.c:2701
+#: record.c:2850
 #, possible-c-format
 msgid "Go forward to insn number %s\n"
 msgstr ""
 
-#: record.c:2707
+#: record.c:2856
 #, possible-c-format
 msgid "Go backward to insn number %s\n"
 msgstr ""
 
-#: record.c:2732
+#: record.c:2881
 msgid "Set debugging of record/replay feature."
 msgstr ""
 
-#: record.c:2733
+#: record.c:2882
 msgid "Show debugging of record/replay feature."
 msgstr ""
 
-#: record.c:2734
+#: record.c:2883
 msgid ""
 "When enabled, debugging output for record/replay feature is displayed."
 msgstr ""
 
-#: record.c:2740
+#: record.c:2889
 msgid "Abbreviated form of \"target record\" command."
 msgstr ""
 
-#: record.c:2746
+#: record.c:2895
 msgid "Set record options"
 msgstr ""
 
-#: record.c:2750
+#: record.c:2899
 msgid "Show record options"
 msgstr ""
 
-#: record.c:2754
+#: record.c:2903
 msgid "Info record options"
 msgstr ""
 
-#: record.c:2759
+#: record.c:2908
 msgid ""
 "Save the execution log to a file.\n"
 "Argument is optional filename.\n"
 "Default filename is 'gdb_record.<process_id>'."
 msgstr ""
 
-#: record.c:2766
+#: record.c:2915
 msgid ""
 "Restore the execution log from a file.\n"
 "Argument is filename.  File must be created with 'record save'."
 msgstr ""
 
-#: record.c:2772
+#: record.c:2921
 msgid "Delete the rest of execution log and start recording it anew."
 msgstr ""
 
-#: record.c:2778
+#: record.c:2927
 msgid "Stop the record/replay target."
 msgstr ""
 
-#: record.c:2784
+#: record.c:2933
 msgid ""
 "Set whether record/replay stops when record/replay buffer becomes full."
 msgstr ""
 
-#: record.c:2785
+#: record.c:2934
 msgid ""
 "Show whether record/replay stops when record/replay buffer becomes full."
 msgstr ""
 
-#: record.c:2787
+#: record.c:2936
 msgid ""
 "Default is ON.\n"
 "When ON, if the record/replay buffer becomes full, ask user what to do.\n"
@@ -17260,1588 +17877,1617 @@
 "delete the oldest recorded instruction to make room for each new one."
 msgstr ""
 
-#: record.c:2795
+#: record.c:2944
 msgid "Set record/replay buffer limit."
 msgstr ""
 
-#: record.c:2796
+#: record.c:2945
 msgid "Show record/replay buffer limit."
 msgstr ""
 
-#: record.c:2796
+#: record.c:2945
 msgid ""
 "Set the maximum number of instructions to be stored in the\n"
 "record/replay buffer.  Zero means unlimited.  Default is 200000."
 msgstr ""
 
-#: record.c:2802
+#: record.c:2951
 msgid ""
 "Restore the program to its state at instruction number N.\n"
 "Argument is instruction number, as shown by 'info record'."
 msgstr ""
 
-#: record.c:2808
+#: record.c:2957
 msgid ""
 "Set whether query if PREC cannot record memory change of next instruction."
 msgstr ""
 
-#: record.c:2810
+#: record.c:2959
 msgid ""
 "Show whether query if PREC cannot record memory change of next instruction."
 msgstr ""
 
-#: record.c:2812
+#: record.c:2961
 msgid ""
 "Default is OFF.\n"
 "When ON, query if PREC cannot record memory change of next instruction."
 msgstr ""
 
-#: regcache.c:993
+#: regcache.c:1057
 msgid "PC register is not available"
 msgstr ""
 
-#: regcache.c:999
+#: regcache.c:1063
 msgid "regcache_read_pc: Unable to find PC"
 msgstr ""
 
-#: regcache.c:1015
+#: regcache.c:1079
 msgid "regcache_write_pc: Unable to update PC"
 msgstr ""
 
-#: regcache.c:1029
+#: regcache.c:1093
 msgid "Register cache flushed.\n"
 msgstr ""
 
-#: regcache.c:1049
+#: regcache.c:1113
 msgid "Bad switch"
 msgstr ""
 
-#: regcache.c:1324
+#: regcache.c:1412
 msgid "Force gdb to flush its register cache (maintainer command)"
 msgstr ""
 
-#: regcache.c:1327
+#: regcache.c:1415
 msgid ""
 "Print the internal register configuration.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: regcache.c:1331
+#: regcache.c:1419
 msgid ""
 "Print the internal register configuration including raw values.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: regcache.c:1336
+#: regcache.c:1424
 msgid ""
 "Print the internal register configuration including cooked values.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: regcache.c:1341
+#: regcache.c:1429
 msgid ""
 "Print the internal register configuration including each register's group.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: reggroups.c:249
+#: regcache.c:1434
+msgid ""
+"Print the internal register configuration including each register's\n"
+"remote register number and buffer offset in the g/G packets.\n"
+"Takes an optional file parameter."
+msgstr ""
+
+#: reggroups.c:248
 msgid "maintenance print reggroups"
 msgstr ""
 
-#: reggroups.c:290
+#: reggroups.c:289
 msgid ""
 "Print the internal register group names.\n"
 "Takes an optional file parameter."
 msgstr ""
 
-#: remote-fileio.c:1460
-msgid "Illegal argument for \"set remote system-call-allowed\" command"
+#. malformed packet error
+#. general case:
+#: remote.c:425
+msgid "remote.c: error in outgoing packet."
 msgstr ""
 
-#: remote-fileio.c:1467
+#: remote.c:427
 #, possible-c-format
-msgid "Garbage after \"show remote system-call-allowed\" command: `%s'"
+msgid "remote.c: error in outgoing packet at field #%ld."
 msgstr ""
 
-#: remote-fileio.c:1482
-msgid "Set if the host system(3) call is allowed for the target."
+#: remote.c:430
+#, possible-c-format
+msgid "trace API error 0x%s."
 msgstr ""
 
-#: remote-fileio.c:1486
-msgid "Show if the host system(3) call is allowed for the target."
+#: remote.c:432
+#, possible-c-format
+msgid "Target returns error code '%s'."
 msgstr ""
 
-#: remote-m32r-sdi.c:331
-msgid "Cannot pass arguments to remote STDEBUG process"
+#: remote.c:461
+#, possible-c-format
+msgid "invalid qRelocInsn packet: %s"
 msgstr ""
 
-#: remote-m32r-sdi.c:334 remote-mips.c:2332
-msgid "No executable file specified"
+#: remote.c:495
+msgid "warning: relocating instruction: "
 msgstr ""
 
-#: remote-m32r-sdi.c:393
-msgid "Connection refused."
+#: remote.c:761
+msgid ""
+"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the "
+"execution of the program.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:396 remote-m32r-sdi.c:399
-msgid "Cannot connect to SDI target."
+#: remote.c:766
+msgid ""
+"send a break signal to the remote target to interrupt the execution of the "
+"program.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:726 remote-m32r-sdi.c:732 remote-m32r-sdi.c:748
-#: remote.c:6673
-msgid "Remote connection closed"
+#: remote.c:770
+msgid ""
+"Send a break signal and 'g' a.k.a. Magic SysRq g to the remote target to "
+"interrupt the execution of Linux kernel.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1190
-msgid "Too many breakpoints"
+#: remote.c:775 remote.c:3148
+#, possible-c-format
+msgid "Invalid value for interrupt_sequence_mode: %s."
+msgstr ""
+
+#: remote.c:919
+msgid "Argument required (integer, `fixed' or `limited')."
 msgstr ""
 
-#: remote-m32r-sdi.c:1259
+#: remote.c:932
 #, possible-c-format
-msgid "Unknown option `%s'"
+msgid "Invalid %s (bad syntax)."
 msgstr ""
 
-#: remote-m32r-sdi.c:1274 symfile.c:2085
+#: remote.c:939
 #, possible-c-format
-msgid "\"%s\" is not an object file: %s"
+msgid "Invalid %s (too large)."
 msgstr ""
 
-#: remote-m32r-sdi.c:1325
+#: remote.c:945
 #, possible-c-format
-msgid "Error while downloading %s section."
+msgid ""
+"The target may not be able to correctly handle a %s\n"
+"of %ld bytes. Change the packet size? "
 msgstr ""
 
-#: remote-m32r-sdi.c:1444
-msgid "Too many watchpoints"
+#: remote.c:948
+msgid "Packet size not changed."
 msgstr ""
 
-#: remote-m32r-sdi.c:1686
-msgid "Reset SDI connection."
+#: remote.c:958
+#, possible-c-format
+msgid "The %s is %ld. "
 msgstr ""
 
-#: remote-m32r-sdi.c:1689
-msgid "Show status of SDI connection."
+#: remote.c:960
+#, possible-c-format
+msgid "Packets are fixed at %ld bytes.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1692
-msgid "Debug M32R/Chaos."
+#: remote.c:963
+#, possible-c-format
+msgid "Packets are limited to %ld bytes.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1695
-msgid "Use debug DMA mem access."
+#: remote.c:1087
+#, possible-c-format
+msgid "Support for the `%s' packet is auto-detected, currently %s.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1697
-msgid "Use mon code mem access."
+#: remote.c:1093
+#, possible-c-format
+msgid "Support for the `%s' packet is currently %s.\n"
 msgstr ""
 
-#: remote-m32r-sdi.c:1700
-msgid "Set breakpoints by IB break."
+#: remote.c:1188
+msgid "packet_ok: attempt to use a disabled packet"
 msgstr ""
 
-#: remote-m32r-sdi.c:1702
-msgid "Set breakpoints by dbt."
+#. If the stub previously indicated that the packet was
+#. supported then there is a protocol error..
+#: remote.c:1202
+#, possible-c-format
+msgid "Protocol error: %s (%s) conflicting enabled responses."
 msgstr ""
 
-#: remote-mips.c:676
-msgid "Watchdog has expired.  Target detached."
+#. The user set it wrong.
+#: remote.c:1206
+#, possible-c-format
+msgid "Enabled packet %s (%s) not recognized by stub"
 msgstr ""
 
-#: remote-mips.c:680
-msgid "End of file from remote"
+#: remote.c:1295 remote.c:1316
+#, possible-c-format
+msgid "Could not find config for %s"
+msgstr ""
+
+#. Error of some sort.
+#. We're out of sync with the target now.  Did it continue
+#. or not?  We can't tell which thread it was in non-stop,
+#. so just ignore this.
+#. Error of some sort.
+#. We're out of sync with the target now.  Did it continue or
+#. not?  Not is more likely, so report a stop.
+#: remote.c:1433 remote.c:2827 remote.c:2867 remote.c:2984 remote.c:3886
+#: remote.c:5464 remote.c:5563 remote.c:6783
+#, possible-c-format
+msgid "Remote failure reply: %s"
 msgstr ""
 
-#: remote-mips.c:682
+#: remote.c:1912
 #, possible-c-format
-msgid "Error reading from remote: %s"
+msgid "invalid remote ptid: %s"
 msgstr ""
 
-#. At this point, about the only thing we can do is abort the command
-#. in progress and get back to command level as quickly as possible.
-#: remote-mips.c:717
-msgid "Remote board reset, debug protocol re-initialized."
+#: remote.c:2243
+msgid "Incomplete response to threadinfo request."
 msgstr ""
 
-#: remote-mips.c:775
-#, possible-c-format
-msgid "Debug protocol failure:  more than %d characters before a sync."
+#. This is an answer to a different request.
+#: remote.c:2246
+msgid "ERROR RMT Thread info mismatch."
 msgstr ""
 
-#: remote-mips.c:864
-#, possible-c-format
-msgid "MIPS protocol data packet too long: %s"
+#: remote.c:2260
+msgid "ERROR RMT: threadinfo tag mismatch."
 msgstr ""
 
-#: remote-mips.c:902 remote-mips.c:1163 remote-mips.c:1204
-#, possible-c-format
-msgid "write to target failed: %s"
+#: remote.c:2268
+msgid "ERROR RMT: length of threadid is not 16."
 msgstr ""
 
-#: remote-mips.c:1010
-msgid "Remote did not acknowledge packet"
+#: remote.c:2283
+msgid "ERROR RMT: 'exists' length too long."
 msgstr ""
 
-#: remote-mips.c:1041 remote-mips.c:1081
-msgid "Timed out waiting for remote packet"
+#: remote.c:2307
+msgid "ERROR RMT: unknown thread info tag."
 msgstr ""
 
-#: remote-mips.c:1103
-msgid "Timed out waiting for packet"
+#. FIXME: This is a good reason to drop the packet.
+#. Possably, there is a duplicate response.
+#. Possabilities :
+#. retransmit immediatly - race conditions
+#. retransmit after timeout - yes
+#. exit
+#. wait for packet, then exit
+#. 
+#: remote.c:2411
+msgid "HMM: threadlist did not echo arg thread, dropping it."
 msgstr ""
 
-#: remote-mips.c:1261
-msgid "mips_request: Trying to send command before reply"
+#: remote.c:2418
+msgid "RMT ERROR : failed to get remote thread list."
 msgstr ""
 
-#: remote-mips.c:1281
-msgid "mips_request: Trying to get reply before command"
+#: remote.c:2426
+msgid "RMT ERROR: threadlist response longer than requested."
 msgstr ""
 
-#: remote-mips.c:1292
-msgid "Bad response from remote board"
+#: remote.c:2463
+msgid "Remote fetch threadlist -infinite loop-."
 msgstr ""
 
-#: remote-mips.c:1368
-msgid "Failed to initialize (didn't receive packet)."
+#. paranoia
+#: remote.c:2628
+msgid "Command can only be used when connected to the remote target."
 msgstr ""
 
-#: remote-mips.c:1418
-msgid "internal error: mips_initialize called twice"
+#: remote.c:2645
+msgid "threads"
 msgstr ""
 
-#: remote-mips.c:1492
-msgid "Failed to initialize."
+#: remote.c:2744
+msgid "remote_threads_extra_info"
 msgstr ""
 
-#: remote-mips.c:1549
-msgid ""
-"To open a MIPS remote debugging connection, you need to specify what\n"
-"serial device is attached to the target board (e.g., /dev/ttya).\n"
-"If you want to use TFTP to download to the board, specify the name of a\n"
-"temporary file to be used by GDB for downloads as the second argument.\n"
-"This filename must be in the form host:filename, where host is the name\n"
-"of the host running the TFTP server, and the file must be readable by the\n"
-"world.  If the local name of the temporary file differs from the name as\n"
-"seen from the board via TFTP, specify that name as the third parameter.\n"
+#: remote.c:3019 remote.c:3046
+#, possible-c-format
+msgid "Target reported unsupported offsets: %s"
 msgstr ""
 
-#: remote-mips.c:1603
-msgid "Unable to open UDP port"
+#: remote.c:3044
+#, possible-c-format
+msgid "Malformed response to offset query, %s"
 msgstr ""
 
-#: remote-mips.c:1746 remote.c:4087
-msgid "Argument given to \"detach\" when remotely debugging."
+#: remote.c:3092
+msgid "Can not handle qOffsets TextSeg response with this symbol file"
 msgstr ""
 
-#: remote-mips.c:1853
-#, possible-c-format
-msgid "Remote failure: %s"
+#: remote.c:3224
+msgid "Non-stop mode requested, but remote does not support non-stop"
 msgstr ""
 
-#: remote-mips.c:2051
+#: remote.c:3231
 #, possible-c-format
-msgid "Can't read register %d: %s"
+msgid "Remote refused setting non-stop mode with: %s"
 msgstr ""
 
-#: remote-mips.c:2090
+#: remote.c:3247
 #, possible-c-format
-msgid "Can't write register %d: %s"
+msgid "Remote refused setting all-stop mode with: %s"
 msgstr ""
 
-#: remote-mips.c:2325
-msgid "Can't pass arguments to remote MIPS board; arguments ignored."
+#: remote.c:3259 remote.c:3365
+msgid "The target is not running (try extended-remote?)"
 msgstr ""
 
-#: remote-mips.c:2584
-#, possible-c-format
-msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s"
+#: remote.c:3380
+msgid "remote didn't report the current thread in non-stop mode"
 msgstr ""
 
-#: remote-mips.c:2599 remote-mips.c:2652 remote-mips.c:2724
-#, possible-c-format
-msgid "mips_common_breakpoint: Bad response from remote board: %s"
+#: remote.c:3407
+msgid "Trace is already running on the target.\n"
 msgstr ""
 
-#: remote-mips.c:2763
-msgid "Timeout during download."
+#: remote.c:3532
+msgid ""
+"The remote protocol may be unreliable over UDP.\n"
+"Some events may be lost, rendering further debugging impossible."
 msgstr ""
 
-#: remote-mips.c:2773
+#: remote.c:3568
 #, possible-c-format
-msgid "Download got unexpected ack char: 0x%x, retrying."
+msgid "Remote refused setting permissions with: %s"
 msgstr ""
 
-#: remote-mips.c:3516
-msgid "mips_load:  Couldn't get into monitor mode."
+#: remote.c:3605
+#, possible-c-format
+msgid "Remote qSupported response supplied an unexpected value for \"%s\"."
 msgstr ""
 
-#: remote-mips.c:3674
-msgid "Set timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3629
+#, possible-c-format
+msgid "Remote target reported \"%s\" without a size."
 msgstr ""
 
-#: remote-mips.c:3675
-msgid "Show timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3638
+#, possible-c-format
+msgid "Remote target reported \"%s\" with a bad size: \"%s\"."
 msgstr ""
 
-#: remote-mips.c:3682
-msgid "Set retransmit timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3645
+#, possible-c-format
+msgid "limiting remote suggested packet size (%d bytes) to %d"
 msgstr ""
 
-#: remote-mips.c:3683
-msgid "Show retransmit timeout in seconds for remote MIPS serial I/O."
+#: remote.c:3916
+msgid "empty item in \"qSupported\" response"
 msgstr ""
 
-#: remote-mips.c:3684
-msgid ""
-"This is the number of seconds to wait for an acknowledgement to a packet\n"
-"before resending the packet."
+#: remote.c:3947
+#, possible-c-format
+msgid "unrecognized item \"%s\" in \"qSupported\" response"
 msgstr ""
 
-#: remote-mips.c:3692
+#: remote.c:3995
 msgid ""
-"Set the maximum number of characters to ignore when scanning for a SYN."
+"To open a remote debug connection, you need to specify what\n"
+"serial device is attached to the remote system\n"
+"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)."
 msgstr ""
 
-#: remote-mips.c:3693
-msgid ""
-"Show the maximum number of characters to ignore when scanning for a SYN."
+#: remote.c:4010
+msgid "Already connected to a remote target.  Disconnect? "
 msgstr ""
 
-#: remote-mips.c:3694
-msgid ""
-"This is the maximum number of characters GDB will ignore when trying to\n"
-"synchronize with the remote system.  A value of -1 means that there is no\n"
-"limit. (Note that these characters are printed out even though they are\n"
-"ignored.)"
+#: remote.c:4013
+msgid "Still connected."
 msgstr ""
 
-#: remote-mips.c:3704
-msgid "Set the prompt that GDB expects from the monitor."
+#: remote.c:4167 remote-mips.c:1744
+msgid "Argument given to \"detach\" when remotely debugging."
 msgstr ""
 
-#: remote-mips.c:3705
-msgid "Show the prompt that GDB expects from the monitor."
+#: remote.c:4170
+msgid "No process to detach from."
 msgstr ""
 
-#: remote-mips.c:3712
-msgid "Set printing of monitor warnings."
+#: remote.c:4184
+msgid "Remote doesn't know how to detach"
 msgstr ""
 
-#: remote-mips.c:3713
-msgid "Show printing of monitor warnings."
+#: remote.c:4186
+msgid "Can't detach process."
 msgstr ""
 
-#: remote-mips.c:3714
-msgid ""
-"When enabled, monitor warnings about hardware breakpoints will be displayed."
+#: remote.c:4191
+#, possible-c-format
+msgid "Detached from remote %s.\n"
 msgstr ""
 
-#: remote-mips.c:3721
-msgid "Send a packet to PMON (must be in debug mode)."
+#: remote.c:4196
+msgid "Detached from remote process.\n"
 msgstr ""
 
-#: remote-mips.c:3723
-msgid ""
-"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
-"targets."
+#: remote.c:4198
+msgid "Ending remote debugging.\n"
 msgstr ""
 
-#: remote-mips.c:3724
-msgid ""
-"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
-"targets."
+#: remote.c:4224
+msgid "Argument given to \"disconnect\" when remotely debugging."
 msgstr ""
 
-#: remote-mips.c:3725
-msgid "Use \"on\" to enable the masking and \"off\" to disable it."
+#: remote.c:4251 remote.c:4276
+msgid "This target does not support attaching to a process"
 msgstr ""
 
-#: remote-sim.c:189
+#: remote.c:4261
 #, possible-c-format
-msgid "Unable to create simulator instance for inferior %d."
+msgid "Attached to %s\n"
 msgstr ""
 
-#: remote-sim.c:204
+#: remote.c:4271
 #, possible-c-format
-msgid ""
-"Inferior %d and inferior %d would have identical simulator state.\n"
-"(This simulator does not support the running of more than one inferior.)"
+msgid "Attaching to %s failed with: %s"
 msgstr ""
 
-#: remote-sim.c:531
-msgid "Register size different to expected"
+#: remote.c:4278
+#, possible-c-format
+msgid "Attaching to %s failed"
 msgstr ""
 
-#: remote-sim.c:534
+#: remote.c:4361
 #, possible-c-format
-msgid "Register %d not updated"
+msgid "Reply contains invalid hex digit %d"
 msgstr ""
 
-#: remote-sim.c:536
+#: remote.c:4577
 #, possible-c-format
-msgid "Register %s not updated"
+msgid "Unexpected vCont reply in non-stop mode: %s"
 msgstr ""
 
-#: remote-sim.c:575
-msgid "program to load"
+#: remote.c:4617
+#, possible-c-format
+msgid " - Can't pass signal %d to target in reverse: ignored."
 msgstr ""
 
-#: remote-sim.c:583
-msgid "GDB sim does not yet support a load offset."
+#: remote.c:4622
+msgid "Remote reverse-step not supported."
 msgstr ""
 
-#: remote-sim.c:592
-msgid "unable to load program"
+#: remote.c:4625
+msgid "Remote reverse-continue not supported."
 msgstr ""
 
-#: remote-sim.c:619
-msgid "No executable file specified."
+#: remote.c:4763
+msgid "Remote server does not support stopping threads"
 msgstr ""
 
-#: remote-sim.c:621 remote-sim.c:1083
-msgid "No program loaded."
+#: remote.c:4796
+#, possible-c-format
+msgid "Stopping %s failed: %s"
 msgstr ""
 
-#: remote-sim.c:726
-msgid "unable to create simulator instance"
+#: remote.c:5153
+#, possible-c-format
+msgid ""
+"Malformed packet(a) (missing colon): %s\n"
+"Packet: '%s'\n"
 msgstr ""
 
-#: remote-sim.c:853
+#: remote.c:5209
 #, possible-c-format
-msgid "gdbsim_resume: pid %d, step %d, signal %d\n"
+msgid ""
+"Malformed packet(b) (missing colon): %s\n"
+"Packet: '%s'\n"
 msgstr ""
 
-#: remote-sim.c:932
+#: remote.c:5215
 #, possible-c-format
-msgid "Can't stop pid %d.  No inferior found."
+msgid ""
+"Remote sent bad register number %s: %s\n"
+"Packet: '%s'\n"
 msgstr ""
 
-#: remote-sim.c:989
+#: remote.c:5227
 #, possible-c-format
-msgid "Unable to wait for pid %d.  Inferior not found."
+msgid "Remote reply is too short: %s"
 msgstr ""
 
-#. PREVIOUSLY: The user may give a command before the simulator
-#. is opened. [...] (??? assuming of course one wishes to
-#. continue to allow commands to be sent to unopened simulators,
-#. which isn't entirely unreasonable).
-#. The simulator is a builtin abstraction of a remote target.
-#. Consistent with that model, access to the simulator, via sim
-#. commands, is restricted to the period when the channel to the
-#. simulator is open.
-#: remote-sim.c:1186
-msgid "Not connected to the simulator target"
+#: remote.c:5233
+#, possible-c-format
+msgid ""
+"Remote register badly formatted: %s\n"
+"here: %s"
 msgstr ""
 
-#: remote-sim.c:1294
-msgid "Send a command to the simulator."
+#: remote.c:5295 remote.c:5298
+#, possible-c-format
+msgid "unknown stop reply packet: %s"
 msgstr ""
 
-#. malformed packet error
-#. general case:
-#: remote.c:418
-msgid "remote.c: error in outgoing packet."
+#: remote.c:5305
+#, possible-c-format
+msgid "No process or thread specified in stop reply: %s"
 msgstr ""
 
-#: remote.c:420
+#: remote.c:5470 remote.c:5612
 #, possible-c-format
-msgid "remote.c: error in outgoing packet at field #%ld."
+msgid "Invalid remote reply: %s"
 msgstr ""
 
-#: remote.c:423
+#: remote.c:5699
 #, possible-c-format
-msgid "trace API error 0x%s."
+msgid "Could not fetch register \"%s\"; remote failure reply '%s'"
 msgstr ""
 
-#: remote.c:425
+#: remote.c:5718
+msgid "fetch_register_using_p: early buf termination"
+msgstr ""
+
+#: remote.c:5756
 #, possible-c-format
-msgid "Target returns error code '%s'."
+msgid "Remote 'g' packet reply is of odd length: %s"
 msgstr ""
 
-#: remote.c:454
+#: remote.c:5775
 #, possible-c-format
-msgid "invalid qRelocInsn packet: %s"
+msgid "Remote 'g' packet reply is too long: %s"
 msgstr ""
 
-#: remote.c:488
-msgid "warning: relocating instruction: "
+#: remote.c:5818 remote.c:5836
+msgid "unexpected end of 'g' packet reply"
 msgstr ""
 
-#: remote.c:719
-msgid ""
-"Send the ASCII ETX character (Ctrl-c) to the remote target to interrupt the "
-"execution of the program.\n"
+#: remote.c:5877
+msgid "could not set remote traceframe"
 msgstr ""
 
-#: remote.c:724
-msgid ""
-"send a break signal to the remote target to interrupt the execution of the "
-"program.\n"
+#: remote.c:5985
+#, possible-c-format
+msgid "Could not write register \"%s\"; remote failure reply '%s'"
 msgstr ""
 
-#: remote.c:728
-msgid ""
-"Send a break signal and 'g' a.k.a. Magic SysRq g to the remote target to "
-"interrupt the execution of Linux kernel.\n"
+#: remote.c:5990
+msgid "Bad result from packet_ok"
 msgstr ""
 
-#: remote.c:733 remote.c:3116
+#: remote.c:6031
 #, possible-c-format
-msgid "Invalid value for interrupt_sequence_mode: %s."
+msgid "Could not write registers; remote failure reply '%s'"
 msgstr ""
 
-#: remote.c:877
-msgid "Argument required (integer, `fixed' or `limited')."
+#: remote.c:6211
+msgid "Received too much data from remote target; ignoring overflow."
 msgstr ""
 
-#: remote.c:890
-#, possible-c-format
-msgid "Invalid %s (bad syntax)."
+#: remote.c:6228
+msgid "Unmatched escape character in target response."
 msgstr ""
 
-#: remote.c:897
-#, possible-c-format
-msgid "Invalid %s (too large)."
+#: remote.c:6327
+msgid "remote_write_bytes_aux: bad packet format"
 msgstr ""
 
-#: remote.c:903
-#, possible-c-format
-msgid ""
-"The target may not be able to correctly handle a %s\n"
-"of %ld bytes. Change the packet size? "
+#: remote.c:6374
+msgid "minimum packet size too small to write data"
+msgstr ""
+
+#: remote.c:6490
+msgid "remote_write_bytes: bad internal state"
+msgstr ""
+
+#: remote.c:6640
+msgid "Too long remote packet."
+msgstr ""
+
+#: remote.c:6643 remote.c:8556
+msgid "Communication problem with target."
 msgstr ""
 
-#: remote.c:906
-msgid "Packet size not changed."
+#: remote.c:6682
+msgid "Remote target does not support flash erase"
 msgstr ""
 
-#: remote.c:916
-#, possible-c-format
-msgid "The %s is %ld. "
+#: remote.c:6684
+msgid "Error erasing flash with vFlashErase packet"
 msgstr ""
 
-#: remote.c:918
-#, possible-c-format
-msgid "Packets are fixed at %ld bytes.\n"
+#: remote.c:6724
+msgid "Remote target does not support vFlashDone"
 msgstr ""
 
-#: remote.c:921
-#, possible-c-format
-msgid "Packets are limited to %ld bytes.\n"
+#: remote.c:6726
+msgid "Error finishing flash operation"
 msgstr ""
 
-#: remote.c:1045
-#, possible-c-format
-msgid "Support for the `%s' packet is auto-detected, currently %s.\n"
+#: remote.c:6757 remote-m32r-sdi.c:725 remote-m32r-sdi.c:731
+#: remote-m32r-sdi.c:747
+msgid "Remote connection closed"
 msgstr ""
 
-#: remote.c:1051
-#, possible-c-format
-msgid "Support for the `%s' packet is currently %s.\n"
+#: remote.c:6761
+msgid "Remote communication error.  Target disconnected."
 msgstr ""
 
-#: remote.c:1146
-msgid "packet_ok: attempt to use a disabled packet"
+#: remote.c:6850
+msgid "Cannot execute this command while the target is running."
 msgstr ""
 
-#. If the stub previously indicated that the packet was
-#. supported then there is a protocol error..
-#: remote.c:1160
-#, possible-c-format
-msgid "Protocol error: %s (%s) conflicting enabled responses."
+#: remote.c:6890
+msgid "putpkt: write failed"
 msgstr ""
 
-#. The user set it wrong.
-#: remote.c:1164
+#: remote.c:7176
 #, possible-c-format
-msgid "Enabled packet %s (%s) not recognized by stub"
+msgid "Invalid run length encoding: %s\n"
 msgstr ""
 
-#: remote.c:1250 remote.c:1271
-#, possible-c-format
-msgid "Could not find config for %s"
+#: remote.c:7282
+msgid "Watchdog timeout has expired.  Target detached."
 msgstr ""
 
-#. Error of some sort.
-#. We're out of sync with the target now.  Did it continue
-#. or not?  We can't tell which thread it was in non-stop,
-#. so just ignore this.
-#. Error of some sort.
-#. We're out of sync with the target now.  Did it continue or
-#. not?  Not is more likely, so report a stop.
-#: remote.c:1388 remote.c:2782 remote.c:2822 remote.c:2939 remote.c:3804
-#: remote.c:5380 remote.c:5479 remote.c:6699
-#, possible-c-format
-msgid "Remote failure reply: %s"
+#. We have tried hard enough, and just can't receive the
+#. packet/notification.  Give up.
+#: remote.c:7303
+msgid "Ignoring packet error, continuing...\n"
 msgstr ""
 
-#: remote.c:1867
-#, possible-c-format
-msgid "invalid remote ptid: %s"
+#: remote.c:7439
+msgid "Can't kill process"
 msgstr ""
 
-#: remote.c:2198
-msgid "Incomplete response to threadinfo request."
+#: remote.c:7547
+msgid "Target does not support QDisableRandomization."
 msgstr ""
 
-#. This is an answer to a different request.
-#: remote.c:2201
-msgid "ERROR RMT Thread info mismatch."
+#: remote.c:7549
+#, possible-c-format
+msgid "Bogus QDisableRandomization reply from target: %s"
 msgstr ""
 
-#: remote.c:2215
-msgid "ERROR RMT: threadinfo tag mismatch."
+#: remote.c:7567
+msgid "Remote file name too long for run packet"
 msgstr ""
 
-#: remote.c:2223
-msgid "ERROR RMT: length of threadid is not 16."
+#: remote.c:7582
+msgid "Argument list too long for run packet"
 msgstr ""
 
-#: remote.c:2238
-msgid "ERROR RMT: 'exists' length too long."
+#: remote.c:7605
+msgid ""
+"Running the default executable on the remote target failed; try \"set remote "
+"exec-file\"?"
 msgstr ""
 
-#: remote.c:2262
-msgid "ERROR RMT: unknown thread info tag."
+#: remote.c:7608
+#, possible-c-format
+msgid "Running \"%s\" on the remote target failed"
 msgstr ""
 
-#. FIXME: This is a good reason to drop the packet.
-#. Possably, there is a duplicate response.
-#. Possabilities :
-#. retransmit immediatly - race conditions
-#. retransmit after timeout - yes
-#. exit
-#. wait for packet, then exit
-#. 
-#: remote.c:2366
-msgid "HMM: threadlist did not echo arg thread, dropping it."
+#: remote.c:7638
+msgid "Remote target does not support \"set remote exec-file\""
 msgstr ""
 
-#: remote.c:2373
-msgid "RMT ERROR : failed to get remote thread list."
+#: remote.c:7640
+msgid "Remote target does not support \"set args\" or run <ARGS>"
 msgstr ""
 
-#: remote.c:2381
-msgid "RMT ERROR: threadlist response longer than requested."
+#: remote.c:7772
+#, possible-c-format
+msgid "hw_bp_to_z: bad watchpoint type %d"
 msgstr ""
 
-#: remote.c:2418
-msgid "Remote fetch threadlist -infinite loop-."
+#: remote.c:7806
+msgid "remote_insert_watchpoint: reached end of function"
 msgstr ""
 
-#. paranoia
-#: remote.c:2583
-msgid "Command can only be used when connected to the remote target."
+#: remote.c:7838
+msgid "remote_remove_watchpoint: reached end of function"
 msgstr ""
 
-#: remote.c:2600
-msgid "threads"
+#: remote.c:7946
+msgid "remote_insert_hw_breakpoint: reached end of function"
 msgstr ""
 
-#: remote.c:2699
-msgid "remote_threads_extra_info"
+#: remote.c:7981
+msgid "remote_remove_hw_breakpoint: reached end of function"
 msgstr ""
 
-#: remote.c:2974 remote.c:3001
-#, possible-c-format
-msgid "Target reported unsupported offsets: %s"
+#: remote.c:8038
+msgid "remote target does not support this operation"
 msgstr ""
 
-#: remote.c:2999
-#, possible-c-format
-msgid "Malformed response to offset query, %s"
+#: remote.c:8066
+msgid "command cannot be used without an exec file"
 msgstr ""
 
-#: remote.c:3047
-msgid "Can not handle qOffsets TextSeg response with this symbol file"
+#: remote.c:8091
+#, possible-c-format
+msgid "target memory fault, section %s, range %s -- %s"
 msgstr ""
 
-#: remote.c:3193
-msgid "Non-stop mode requested, but remote does not support non-stop"
+#: remote.c:8109
+msgid ""
+"One or more sections of the remote executable does not match\n"
+"the loaded file\n"
 msgstr ""
 
-#: remote.c:3200
+#: remote.c:8112
 #, possible-c-format
-msgid "Remote refused setting non-stop mode with: %s"
+msgid "No loaded section named '%s'.\n"
 msgstr ""
 
-#: remote.c:3216
+#: remote.c:8212
 #, possible-c-format
-msgid "Remote refused setting all-stop mode with: %s"
+msgid "Unknown remote qXfer reply: %s"
 msgstr ""
 
-#: remote.c:3228 remote.c:3323
-msgid "The target is not running (try extended-remote?)"
+#: remote.c:8218
+msgid "Remote qXfer reply contained no data."
 msgstr ""
 
-#: remote.c:3338
-msgid "remote didn't report the current thread in non-stop mode"
+#: remote.c:8407
+msgid "remote query is only available after target open"
 msgstr ""
 
-#: remote.c:3365
-msgid "Trace is already running on the target.\n"
+#: remote.c:8498
+msgid "Pattern is too large to transmit to remote target."
 msgstr ""
 
-#: remote.c:3490
-msgid ""
-"The remote protocol may be unreliable over UDP.\n"
-"Some events may be lost, rendering further debugging impossible."
+#: remote.c:8520 remote.c:8525
+#, possible-c-format
+msgid "Unknown qSearch:memory reply: %s"
 msgstr ""
 
-#: remote.c:3526
-#, possible-c-format
-msgid "Remote refused setting permissions with: %s"
+#: remote.c:8538
+msgid "remote rcmd is only available after target open"
 msgstr ""
 
-#: remote.c:3563
+#: remote.c:8550
 #, possible-c-format
-msgid "Remote qSupported response supplied an unexpected value for \"%s\"."
+msgid "\"monitor\" command ``%s'' is too long."
 msgstr ""
 
-#: remote.c:3587
-#, possible-c-format
-msgid "Remote target reported \"%s\" without a size."
+#: remote.c:8568 remote.c:9811 remote.c:10084 remote.c:10174 remote.c:10274
+#: remote.c:10321 remote.c:10398 remote.c:10460 remote.c:10488
+msgid "Target does not support this command."
 msgstr ""
 
-#: remote.c:3596
-#, possible-c-format
-msgid "Remote target reported \"%s\" with a bad size: \"%s\"."
+#: remote.c:8579
+msgid "Protocol error with Rcmd"
 msgstr ""
 
-#: remote.c:3603
-#, possible-c-format
-msgid "limiting remote suggested packet size (%d bytes) to %d"
+#: remote.c:8615 remote.c:9514 remote.c:9602 remote.c:9653
+msgid "command can only be used with remote target"
 msgstr ""
 
-#: remote.c:3834
-msgid "empty item in \"qSupported\" response"
+#: remote.c:8618
+msgid "remote-packet command requires packet text as argument"
 msgstr ""
 
-#: remote.c:3865
-#, possible-c-format
-msgid "unrecognized item \"%s\" in \"qSupported\" response"
+#: remote.c:8659
+msgid "Remote threadset test\n"
 msgstr ""
 
-#: remote.c:3913
-msgid ""
-"To open a remote debug connection, you need to specify what\n"
-"serial device is attached to the remote system\n"
-"(e.g. /dev/ttyS0, /dev/ttya, COM1, etc.)."
+#: remote.c:8765
+msgid "Fetch and print the remote list of thread identifiers, one pkt only"
 msgstr ""
 
-#: remote.c:3928
-msgid "Already connected to a remote target.  Disconnect? "
+#: remote.c:8768
+msgid "Fetch and display info about one thread"
 msgstr ""
 
-#: remote.c:3931
-msgid "Still connected."
+#: remote.c:8770
+msgid "Test setting to a different thread"
 msgstr ""
 
-#: remote.c:4090
-msgid "No process to detach from."
+#: remote.c:8772
+msgid "Iterate through updating all remote thread info"
 msgstr ""
 
-#: remote.c:4104
-msgid "Remote doesn't know how to detach"
+#: remote.c:8774
+msgid " Remote thread alive test "
 msgstr ""
 
-#: remote.c:4106
-msgid "Can't detach process."
+#: remote.c:8859
+msgid "Remote target doesn't support qGetTLSAddr packet"
 msgstr ""
 
-#: remote.c:4111
-#, possible-c-format
-msgid "Detached from remote %s.\n"
+#: remote.c:8862
+msgid "Remote target failed to process qGetTLSAddr request"
 msgstr ""
 
-#: remote.c:4116
-msgid "Detached from remote process.\n"
+#: remote.c:8866
+msgid "TLS not supported or disabled on this target"
 msgstr ""
 
-#: remote.c:4118
-msgid "Ending remote debugging.\n"
+#: remote.c:8903
+msgid "Remote target doesn't support qGetTIBAddr packet"
 msgstr ""
 
-#: remote.c:4144
-msgid "Argument given to \"disconnect\" when remotely debugging."
+#: remote.c:8905
+msgid "Remote target failed to process qGetTIBAddr request"
 msgstr ""
 
-#: remote.c:4171 remote.c:4196
-msgid "This target does not support attaching to a process"
+#: remote.c:8908
+msgid "qGetTIBAddr not supported or disabled on this target"
 msgstr ""
 
-#: remote.c:4181
+#: remote.c:8956
 #, possible-c-format
-msgid "Attached to %s\n"
+msgid "Duplicate g packet description added for size %d"
 msgstr ""
 
-#: remote.c:4191
-#, possible-c-format
-msgid "Attaching to %s failed with: %s"
+#: remote.c:9023 remote.c:9044 remote.c:9066
+msgid "Packet too long for target."
 msgstr ""
 
-#: remote.c:4198
+#: remote.c:9298
 #, possible-c-format
-msgid "Attaching to %s failed"
+msgid "Read returned %d, but %d bytes."
 msgstr ""
 
-#: remote.c:4281
+#: remote.c:9397
 #, possible-c-format
-msgid "Reply contains invalid hex digit %d"
+msgid "Unknown remote I/O error %d"
 msgstr ""
 
-#: remote.c:4497
+#: remote.c:9399
 #, possible-c-format
-msgid "Unexpected vCont reply in non-stop mode: %s"
+msgid "Remote I/O error: %s"
 msgstr ""
 
-#: remote.c:4537
+#: remote.c:9548
 #, possible-c-format
-msgid " - Can't pass signal %d to target in reverse: ignored."
+msgid "Error reading %s."
 msgstr ""
 
-#: remote.c:4542
-msgid "Remote reverse-step not supported."
+#: remote.c:9571
+#, possible-c-format
+msgid "Remote write of %d bytes returned 0!"
 msgstr ""
 
-#: remote.c:4545
-msgid "Remote reverse-continue not supported."
+#: remote.c:9588
+#, possible-c-format
+msgid "Successfully sent file \"%s\".\n"
 msgstr ""
 
-#: remote.c:4683
-msgid "Remote server does not support stopping threads"
+#: remote.c:9643
+#, possible-c-format
+msgid "Successfully fetched file \"%s\".\n"
 msgstr ""
 
-#: remote.c:4716
+#: remote.c:9660
 #, possible-c-format
-msgid "Stopping %s failed: %s"
+msgid "Successfully deleted file \"%s\".\n"
 msgstr ""
 
-#: remote.c:5069
-#, possible-c-format
-msgid ""
-"Malformed packet(a) (missing colon): %s\n"
-"Packet: '%s'\n"
+#: remote.c:9670
+msgid "file to put"
 msgstr ""
 
-#: remote.c:5125
-#, possible-c-format
-msgid ""
-"Malformed packet(b) (missing colon): %s\n"
-"Packet: '%s'\n"
+#: remote.c:9675
+msgid "Invalid parameters to remote put"
 msgstr ""
 
-#: remote.c:5131
-#, possible-c-format
-msgid ""
-"Remote sent bad register number %s: %s\n"
-"Packet: '%s'\n"
+#: remote.c:9689
+msgid "file to get"
 msgstr ""
 
-#: remote.c:5143
-#, possible-c-format
-msgid "Remote reply is too short: %s"
+#: remote.c:9694
+msgid "Invalid parameters to remote get"
 msgstr ""
 
-#: remote.c:5149
-#, possible-c-format
-msgid ""
-"Remote register badly formatted: %s\n"
-"here: %s"
+#: remote.c:9708
+msgid "file to delete"
 msgstr ""
 
-#: remote.c:5211 remote.c:5214
-#, possible-c-format
-msgid "unknown stop reply packet: %s"
+#: remote.c:9713
+msgid "Invalid parameters to remote delete"
 msgstr ""
 
-#: remote.c:5221
-#, possible-c-format
-msgid "No process or thread specified in stop reply: %s"
+#: remote.c:9856 remote.c:9871 remote.c:10030 remote.c:10041
+msgid "Target does not support source download."
 msgstr ""
 
-#: remote.c:5386 remote.c:5528
-#, possible-c-format
-msgid "Invalid remote reply: %s"
+#: remote.c:9923
+msgid "Fast tracepoint not valid during download"
 msgstr ""
 
-#: remote.c:5615
+#. Fast tracepoints are functionally identical to regular
+#. tracepoints, so don't take lack of support as a reason to
+#. give up on the trace run.
+#: remote.c:9930
 #, possible-c-format
-msgid "Could not fetch register \"%s\"; remote failure reply '%s'"
+msgid ""
+"Target does not support fast tracepoints, downloading %d as regular "
+"tracepoint"
 msgstr ""
 
-#: remote.c:5634
-msgid "fetch_register_using_p: early buf termination"
+#: remote.c:9944
+msgid "Static tracepoint not valid during download"
 msgstr ""
 
-#: remote.c:5672
-#, possible-c-format
-msgid "Remote 'g' packet reply is of odd length: %s"
+#. Fast tracepoints are functionally identical to regular
+#. tracepoints, so don't take lack of support as a reason
+#. to give up on the trace run.
+#: remote.c:9950
+msgid "Target does not support static tracepoints"
 msgstr ""
 
-#: remote.c:5691
+#: remote.c:9970
 #, possible-c-format
-msgid "Remote 'g' packet reply is too long: %s"
-msgstr ""
-
-#: remote.c:5734 remote.c:5752
-msgid "unexpected end of 'g' packet reply"
+msgid "Target does not support conditional tracepoints, ignoring tp %d cond"
 msgstr ""
 
-#: remote.c:5793
-msgid "could not set remote traceframe"
+#: remote.c:9979
+msgid "Target does not support tracepoints."
 msgstr ""
 
-#: remote.c:5901
-#, possible-c-format
-msgid "Could not write register \"%s\"; remote failure reply '%s'"
+#: remote.c:9996 remote.c:10013
+msgid "Error on target while setting tracepoints."
 msgstr ""
 
-#: remote.c:5906
-msgid "Bad result from packet_ok"
+#: remote.c:10078
+msgid "Trace state variable name too long for tsv definition packet"
 msgstr ""
 
-#: remote.c:5947
-#, possible-c-format
-msgid "Could not write registers; remote failure reply '%s'"
+#: remote.c:10086
+msgid "Error on target while downloading trace state variable."
 msgstr ""
 
-#: remote.c:6127
-msgid "Received too much data from remote target; ignoring overflow."
+#: remote.c:10100
+msgid ""
+"Target does not support enabling tracepoints while a trace run is ongoing."
 msgstr ""
 
-#: remote.c:6144
-msgid "Unmatched escape character in target response."
+#: remote.c:10102
+msgid "Error on target while enabling tracepoint."
 msgstr ""
 
-#: remote.c:6243
-msgid "remote_write_bytes_aux: bad packet format"
+#: remote.c:10116
+msgid ""
+"Target does not support disabling tracepoints while a trace run is ongoing."
 msgstr ""
 
-#: remote.c:6290
-msgid "minumum packet size too small to write data"
+#: remote.c:10118
+msgid "Error on target while disabling tracepoint."
 msgstr ""
 
-#: remote.c:6406
-msgid "remote_write_bytes: bad internal state"
+#: remote.c:10154
+msgid "Too many sections for read-only sections definition packet."
 msgstr ""
 
-#: remote.c:6556
-msgid "Too long remote packet."
+#: remote.c:10176 remote.c:10276 remote.c:10346 remote.c:10349 remote.c:10400
+#: remote.c:10462 remote.c:10490 remote.c:10579
+#, possible-c-format
+msgid "Bogus reply from target: %s"
 msgstr ""
 
-#: remote.c:6559 remote.c:8441
-msgid "Communication problem with target."
+#: remote.c:10216
+#, possible-c-format
+msgid "Bogus trace status reply from target: %s"
 msgstr ""
 
-#: remote.c:6598
-msgid "Remote target does not support flash erase"
+#: remote.c:10315
+#, possible-c-format
+msgid "Unknown trace find type %d"
 msgstr ""
 
-#: remote.c:6600
-msgid "Error erasing flash with vFlashErase packet"
+#: remote.c:10330
+msgid "Unable to parse trace frame number"
 msgstr ""
 
-#: remote.c:6640
-msgid "Remote target does not support vFlashDone"
+#: remote.c:10340
+msgid "Unable to parse tracepoint number"
 msgstr ""
 
-#: remote.c:6642
-msgid "Error finishing flash operation"
+#: remote.c:10392
+msgid "Remote file name too long for trace save packet"
 msgstr ""
 
-#: remote.c:6677
-msgid "Remote communication error.  Target disconnected."
+#: remote.c:10465
+msgid "Target does not support disconnected tracing."
 msgstr ""
 
-#: remote.c:6766
-msgid "Cannot execute this command while the target is running."
+#. set/show remote ...
+#. allow-unknown
+#: remote.c:10918 remote.c:10924
+msgid ""
+"Remote protocol specific variables\n"
+"Configure various remote-protocol specific variables such as\n"
+"the packets being used"
 msgstr ""
 
-#: remote.c:6806
-msgid "putpkt: write failed"
+#. allow-unknown
+#: remote.c:10931
+msgid ""
+"Compare section data on target to the exec file.\n"
+"Argument is a single section name (default: all loaded sections)."
 msgstr ""
 
-#: remote.c:7092
-#, possible-c-format
-msgid "Invalid run length encoding: %s\n"
+#: remote.c:10936
+msgid ""
+"Send an arbitrary packet to a remote target.\n"
+"   maintenance packet TEXT\n"
+"If GDB is talking to an inferior via the GDB serial protocol, then\n"
+"this command sends the string TEXT to the inferior, and displays the\n"
+"response packet.  GDB supplies the initial `$' character, and the\n"
+"terminating `#' character and checksum."
 msgstr ""
 
-#: remote.c:7198
-msgid "Watchdog timeout has expired.  Target detached."
+#: remote.c:10945
+msgid "Set whether to send break if interrupted."
 msgstr ""
 
-#. We have tried hard enough, and just can't receive the
-#. packet/notification.  Give up.
-#: remote.c:7219
-msgid "Ignoring packet error, continuing...\n"
+#: remote.c:10946
+msgid "Show whether to send break if interrupted."
 msgstr ""
 
-#: remote.c:7347
-msgid "Can't kill process"
+#: remote.c:10947
+msgid "If set, a break, instead of a cntrl-c, is sent to the remote target."
 msgstr ""
 
-#: remote.c:7455
-msgid "Target does not support QDisableRandomization."
+#: remote.c:10960
+msgid "Set interrupt sequence to remote target."
 msgstr ""
 
-#: remote.c:7457
-#, possible-c-format
-msgid "Bogus QDisableRandomization reply from target: %s"
+#: remote.c:10961
+msgid "Show interrupt sequence to remote target."
 msgstr ""
 
-#: remote.c:7475
-msgid "Remote file name too long for run packet"
+#: remote.c:10962
+msgid ""
+"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-"
+"C\"."
 msgstr ""
 
-#: remote.c:7490
-msgid "Argument list too long for run packet"
+#: remote.c:10969
+msgid ""
+"Set whether interrupt-sequence is sent to remote target when gdb connects to."
 msgstr ""
 
-#: remote.c:7513
+#: remote.c:10970
 msgid ""
-"Running the default executable on the remote target failed; try \"set remote "
-"exec-file\"?"
+"\t\tShow whether interrupt-sequence is sent to remote target when gdb "
+"connects to."
 msgstr ""
 
-#: remote.c:7516
-#, possible-c-format
-msgid "Running \"%s\" on the remote target failed"
+#: remote.c:10971
+msgid "\t\tIf set, interrupt sequence is sent to remote target."
 msgstr ""
 
-#: remote.c:7546
-msgid "Remote target does not support \"set remote exec-file\""
+#. Install commands for configuring memory read/write packets.
+#: remote.c:10978
+msgid "Set the maximum number of bytes per memory write packet (deprecated)."
 msgstr ""
 
-#: remote.c:7548
-msgid "Remote target does not support \"set args\" or run <ARGS>"
+#: remote.c:10981
+msgid ""
+"Show the maximum number of bytes per memory write packet (deprecated)."
 msgstr ""
 
-#: remote.c:7680
-#, possible-c-format
-msgid "hw_bp_to_z: bad watchpoint type %d"
+#: remote.c:10985
+msgid ""
+"Set the maximum number of bytes per memory-write packet.\n"
+"Specify the number of bytes in a packet or 0 (zero) for the\n"
+"default packet size.  The actual limit is further reduced\n"
+"dependent on the target.  Specify ``fixed'' to disable the\n"
+"further restriction and ``limit'' to enable that restriction."
 msgstr ""
 
-#: remote.c:7714
-msgid "remote_insert_watchpoint: reached end of function"
+#: remote.c:10993
+msgid ""
+"Set the maximum number of bytes per memory-read packet.\n"
+"Specify the number of bytes in a packet or 0 (zero) for the\n"
+"default packet size.  The actual limit is further reduced\n"
+"dependent on the target.  Specify ``fixed'' to disable the\n"
+"further restriction and ``limit'' to enable that restriction."
 msgstr ""
 
-#: remote.c:7746
-msgid "remote_remove_watchpoint: reached end of function"
+#: remote.c:11002
+msgid "Show the maximum number of bytes per memory-write packet."
 msgstr ""
 
-#: remote.c:7840
-msgid "remote_insert_hw_breakpoint: reached end of function"
+#: remote.c:11006
+msgid "Show the maximum number of bytes per memory-read packet."
 msgstr ""
 
-#: remote.c:7875
-msgid "remote_remove_hw_breakpoint: reached end of function"
+#: remote.c:11010
+msgid "Set the maximum number of target hardware watchpoints."
 msgstr ""
 
-#: remote.c:7932
-msgid "remote target does not support this operation"
+#: remote.c:11011
+msgid "Show the maximum number of target hardware watchpoints."
 msgstr ""
 
-#: remote.c:7960
-msgid "command cannot be used without an exec file"
+#: remote.c:11012 remote.c:11021 remote.c:11030
+msgid "Specify a negative limit for unlimited."
 msgstr ""
 
-#: remote.c:7985
-#, possible-c-format
-msgid "target memory fault, section %s, range %s -- %s"
+#: remote.c:11019
+msgid "Set the maximum length (in bytes) of a target hardware watchpoint."
 msgstr ""
 
-#: remote.c:8003
-msgid ""
-"One or more sections of the remote executable does not match\n"
-"the loaded file\n"
+#: remote.c:11020
+msgid "Show the maximum length (in bytes) of a target hardware watchpoint."
 msgstr ""
 
-#: remote.c:8006
-#, possible-c-format
-msgid "No loaded section named '%s'.\n"
+#: remote.c:11028
+msgid "Set the maximum number of target hardware breakpoints."
 msgstr ""
 
-#: remote.c:8106
-#, possible-c-format
-msgid "Unknown remote qXfer reply: %s"
+#: remote.c:11029
+msgid "Show the maximum number of target hardware breakpoints."
 msgstr ""
 
-#: remote.c:8112
-msgid "Remote qXfer reply contained no data."
+#: remote.c:11038
+msgid "Set the maximum size of the address (in bits) in a memory packet."
 msgstr ""
 
-#: remote.c:8292
-msgid "remote query is only available after target open"
+#: remote.c:11039
+msgid "Show the maximum size of the address (in bits) in a memory packet."
 msgstr ""
 
-#: remote.c:8383
-msgid "Pattern is too large to transmit to remote target."
+#: remote.c:11197
+msgid "Set use of remote protocol `Z' packets"
 msgstr ""
 
-#: remote.c:8405 remote.c:8410
-#, possible-c-format
-msgid "Unknown qSearch:memory reply: %s"
+#: remote.c:11198
+msgid "Show use of remote protocol `Z' packets "
 msgstr ""
 
-#: remote.c:8423
-msgid "remote rcmd is only available after target open"
+#: remote.c:11199
+msgid ""
+"When set, GDB will attempt to use the remote breakpoint and watchpoint\n"
+"packets."
 msgstr ""
 
-#: remote.c:8435
-#, possible-c-format
-msgid "\"monitor\" command ``%s'' is too long."
+#: remote.c:11208
+msgid ""
+"Manipulate files on the remote system\n"
+"Transfer files to and from the remote target system."
 msgstr ""
 
-#: remote.c:8453 remote.c:9672 remote.c:9931 remote.c:9989 remote.c:10044
-#: remote.c:10091 remote.c:10168 remote.c:10230 remote.c:10258
-msgid "Target does not support this command."
+#: remote.c:11215
+msgid "Copy a local file to the remote system."
 msgstr ""
 
-#: remote.c:8464
-msgid "Protocol error with Rcmd"
+#: remote.c:11219
+msgid "Copy a remote file to the local system."
 msgstr ""
 
-#: remote.c:8500 remote.c:9399 remote.c:9487 remote.c:9538
-msgid "command can only be used with remote target"
+#: remote.c:11223
+msgid "Delete a remote file."
 msgstr ""
 
-#: remote.c:8503
-msgid "remote-packet command requires packet text as argument"
+#: remote.c:11228
+msgid "Set the remote pathname for \"run\""
 msgstr ""
 
-#: remote.c:8544
-msgid "Remote threadset test\n"
+#: remote.c:11229
+msgid "Show the remote pathname for \"run\""
 msgstr ""
 
-#: remote.c:8650
-msgid "Fetch and print the remote list of thread identifiers, one pkt only"
+#: remote-fileio.c:1451
+msgid "Illegal argument for \"set remote system-call-allowed\" command"
 msgstr ""
 
-#: remote.c:8653
-msgid "Fetch and display info about one thread"
+#: remote-fileio.c:1458
+#, possible-c-format
+msgid "Garbage after \"show remote system-call-allowed\" command: `%s'"
 msgstr ""
 
-#: remote.c:8655
-msgid "Test setting to a different thread"
+#: remote-fileio.c:1473
+msgid "Set if the host system(3) call is allowed for the target."
 msgstr ""
 
-#: remote.c:8657
-msgid "Iterate through updating all remote thread info"
+#: remote-fileio.c:1477
+msgid "Show if the host system(3) call is allowed for the target."
 msgstr ""
 
-#: remote.c:8659
-msgid " Remote thread alive test "
+#: remote-m32r-sdi.c:330
+msgid "Cannot pass arguments to remote STDEBUG process"
 msgstr ""
 
-#: remote.c:8744
-msgid "Remote target doesn't support qGetTLSAddr packet"
+#: remote-m32r-sdi.c:333 remote-mips.c:2330
+msgid "No executable file specified"
 msgstr ""
 
-#: remote.c:8747
-msgid "Remote target failed to process qGetTLSAddr request"
+#: remote-m32r-sdi.c:392
+msgid "Connection refused."
 msgstr ""
 
-#: remote.c:8751
-msgid "TLS not supported or disabled on this target"
+#: remote-m32r-sdi.c:395 remote-m32r-sdi.c:398
+msgid "Cannot connect to SDI target."
 msgstr ""
 
-#: remote.c:8788
-msgid "Remote target doesn't support qGetTIBAddr packet"
+#: remote-m32r-sdi.c:1189
+msgid "Too many breakpoints"
 msgstr ""
 
-#: remote.c:8790
-msgid "Remote target failed to process qGetTIBAddr request"
+#: remote-m32r-sdi.c:1258
+#, possible-c-format
+msgid "Unknown option `%s'"
 msgstr ""
 
-#: remote.c:8793
-msgid "qGetTIBAddr not supported or disabled on this target"
+#: remote-m32r-sdi.c:1273 symfile.c:2085
+#, possible-c-format
+msgid "\"%s\" is not an object file: %s"
 msgstr ""
 
-#: remote.c:8841
+#: remote-m32r-sdi.c:1324
 #, possible-c-format
-msgid "Duplicate g packet description added for size %d"
+msgid "Error while downloading %s section."
 msgstr ""
 
-#: remote.c:8908 remote.c:8929 remote.c:8951
-msgid "Packet too long for target."
+#: remote-m32r-sdi.c:1443
+msgid "Too many watchpoints"
 msgstr ""
 
-#: remote.c:9183
-#, possible-c-format
-msgid "Read returned %d, but %d bytes."
+#: remote-m32r-sdi.c:1685
+msgid "Reset SDI connection."
 msgstr ""
 
-#: remote.c:9282
-#, possible-c-format
-msgid "Unknown remote I/O error %d"
+#: remote-m32r-sdi.c:1688
+msgid "Show status of SDI connection."
 msgstr ""
 
-#: remote.c:9284
-#, possible-c-format
-msgid "Remote I/O error: %s"
+#: remote-m32r-sdi.c:1691
+msgid "Debug M32R/Chaos."
 msgstr ""
 
-#: remote.c:9433
-#, possible-c-format
-msgid "Error reading %s."
+#: remote-m32r-sdi.c:1694
+msgid "Use debug DMA mem access."
 msgstr ""
 
-#: remote.c:9456
-#, possible-c-format
-msgid "Remote write of %d bytes returned 0!"
+#: remote-m32r-sdi.c:1696
+msgid "Use mon code mem access."
 msgstr ""
 
-#: remote.c:9473
-#, possible-c-format
-msgid "Successfully sent file \"%s\".\n"
+#: remote-m32r-sdi.c:1699
+msgid "Set breakpoints by IB break."
 msgstr ""
 
-#: remote.c:9528
-#, possible-c-format
-msgid "Successfully fetched file \"%s\".\n"
+#: remote-m32r-sdi.c:1701
+msgid "Set breakpoints by dbt."
 msgstr ""
 
-#: remote.c:9545
-#, possible-c-format
-msgid "Successfully deleted file \"%s\".\n"
+#: remote-mips.c:674
+msgid "Watchdog has expired.  Target detached."
 msgstr ""
 
-#: remote.c:9555
-msgid "file to put"
+#: remote-mips.c:678
+msgid "End of file from remote"
 msgstr ""
 
-#: remote.c:9560
-msgid "Invalid parameters to remote put"
+#: remote-mips.c:680
+#, possible-c-format
+msgid "Error reading from remote: %s"
 msgstr ""
 
-#: remote.c:9574
-msgid "file to get"
+#. At this point, about the only thing we can do is abort the command
+#. in progress and get back to command level as quickly as possible.
+#: remote-mips.c:715
+msgid "Remote board reset, debug protocol re-initialized."
 msgstr ""
 
-#: remote.c:9579
-msgid "Invalid parameters to remote get"
+#: remote-mips.c:773
+#, possible-c-format
+msgid "Debug protocol failure:  more than %d characters before a sync."
 msgstr ""
 
-#: remote.c:9593
-msgid "file to delete"
+#: remote-mips.c:862
+#, possible-c-format
+msgid "MIPS protocol data packet too long: %s"
 msgstr ""
 
-#: remote.c:9598
-msgid "Invalid parameters to remote delete"
+#: remote-mips.c:900 remote-mips.c:1161 remote-mips.c:1202
+#, possible-c-format
+msgid "write to target failed: %s"
 msgstr ""
 
-#: remote.c:9717 remote.c:9732 remote.c:9894 remote.c:9905
-msgid "Target does not support source download."
+#: remote-mips.c:1008
+msgid "Remote did not acknowledge packet"
 msgstr ""
 
-#: remote.c:9787
-msgid "Fast tracepoint not valid during download"
+#: remote-mips.c:1039 remote-mips.c:1079
+msgid "Timed out waiting for remote packet"
 msgstr ""
 
-#. Fast tracepoints are functionally identical to regular
-#. tracepoints, so don't take lack of support as a reason to
-#. give up on the trace run.
-#: remote.c:9794
-#, possible-c-format
-msgid ""
-"Target does not support fast tracepoints, downloading %d as regular "
-"tracepoint"
+#: remote-mips.c:1101
+msgid "Timed out waiting for packet"
 msgstr ""
 
-#: remote.c:9808
-msgid "Static tracepoint not valid during download"
+#: remote-mips.c:1259
+msgid "mips_request: Trying to send command before reply"
 msgstr ""
 
-#. Fast tracepoints are functionally identical to regular
-#. tracepoints, so don't take lack of support as a reason
-#. to give up on the trace run.
-#: remote.c:9814
-msgid "Target does not support static tracepoints"
+#: remote-mips.c:1279
+msgid "mips_request: Trying to get reply before command"
 msgstr ""
 
-#: remote.c:9834
-#, possible-c-format
-msgid "Target does not support conditional tracepoints, ignoring tp %d cond"
+#: remote-mips.c:1290
+msgid "Bad response from remote board"
 msgstr ""
 
-#: remote.c:9843
-msgid "Target does not support tracepoints."
+#: remote-mips.c:1366
+msgid "Failed to initialize (didn't receive packet)."
 msgstr ""
 
-#: remote.c:9860 remote.c:9877
-msgid "Error on target while setting tracepoints."
+#: remote-mips.c:1416
+msgid "internal error: mips_initialize called twice"
 msgstr ""
 
-#: remote.c:9925
-msgid "Trace state variable name too long for tsv definition packet"
+#: remote-mips.c:1490
+msgid "Failed to initialize."
 msgstr ""
 
-#: remote.c:9933
-msgid "Error on target while downloading trace state variable."
+#: remote-mips.c:1547
+msgid ""
+"To open a MIPS remote debugging connection, you need to specify what\n"
+"serial device is attached to the target board (e.g., /dev/ttya).\n"
+"If you want to use TFTP to download to the board, specify the name of a\n"
+"temporary file to be used by GDB for downloads as the second argument.\n"
+"This filename must be in the form host:filename, where host is the name\n"
+"of the host running the TFTP server, and the file must be readable by the\n"
+"world.  If the local name of the temporary file differs from the name as\n"
+"seen from the board via TFTP, specify that name as the third parameter.\n"
 msgstr ""
 
-#: remote.c:9969
-msgid "Too many sections for read-only sections definition packet."
+#: remote-mips.c:1601
+msgid "Unable to open UDP port"
 msgstr ""
 
-#: remote.c:9991 remote.c:10046 remote.c:10116 remote.c:10119 remote.c:10170
-#: remote.c:10232 remote.c:10260
+#: remote-mips.c:1851
 #, possible-c-format
-msgid "Bogus reply from target: %s"
+msgid "Remote failure: %s"
 msgstr ""
 
-#: remote.c:10031
+#: remote-mips.c:2049
 #, possible-c-format
-msgid "Bogus trace status reply from target: %s"
+msgid "Can't read register %d: %s"
 msgstr ""
 
-#: remote.c:10085
+#: remote-mips.c:2088
 #, possible-c-format
-msgid "Unknown trace find type %d"
+msgid "Can't write register %d: %s"
 msgstr ""
 
-#: remote.c:10100
-msgid "Unable to parse trace frame number"
+#: remote-mips.c:2323
+msgid "Can't pass arguments to remote MIPS board; arguments ignored."
 msgstr ""
 
-#: remote.c:10110
-msgid "Unable to parse tracepoint number"
+#: remote-mips.c:2582
+#, possible-c-format
+msgid "mips_common_breakpoint: Attempt to clear bogus breakpoint at %s"
 msgstr ""
 
-#: remote.c:10162
-msgid "Remote file name too long for trace save packet"
+#: remote-mips.c:2597 remote-mips.c:2650 remote-mips.c:2722
+#, possible-c-format
+msgid "mips_common_breakpoint: Bad response from remote board: %s"
 msgstr ""
 
-#: remote.c:10235
-msgid "Target does not support disconnected tracing."
+#: remote-mips.c:2761
+msgid "Timeout during download."
 msgstr ""
 
-#: remote.c:10460
-msgid "Calling remote_async when async is masked"
+#: remote-mips.c:2771
+#, possible-c-format
+msgid "Download got unexpected ack char: 0x%x, retrying."
 msgstr ""
 
-#. set/show remote ...
-#. allow-unknown
-#: remote.c:10620 remote.c:10626
-msgid ""
-"Remote protocol specific variables\n"
-"Configure various remote-protocol specific variables such as\n"
-"the packets being used"
+#: remote-mips.c:3520
+msgid "mips_load:  Couldn't get into monitor mode."
 msgstr ""
 
-#. allow-unknown
-#: remote.c:10633
-msgid ""
-"Compare section data on target to the exec file.\n"
-"Argument is a single section name (default: all loaded sections)."
+#: remote-mips.c:3678
+msgid "Set timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10638
-msgid ""
-"Send an arbitrary packet to a remote target.\n"
-"   maintenance packet TEXT\n"
-"If GDB is talking to an inferior via the GDB serial protocol, then\n"
-"this command sends the string TEXT to the inferior, and displays the\n"
-"response packet.  GDB supplies the initial `$' character, and the\n"
-"terminating `#' character and checksum."
+#: remote-mips.c:3679
+msgid "Show timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10647
-msgid "Set whether to send break if interrupted."
+#: remote-mips.c:3686
+msgid "Set retransmit timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10648
-msgid "Show whether to send break if interrupted."
+#: remote-mips.c:3687
+msgid "Show retransmit timeout in seconds for remote MIPS serial I/O."
 msgstr ""
 
-#: remote.c:10649
-msgid "If set, a break, instead of a cntrl-c, is sent to the remote target."
+#: remote-mips.c:3688
+msgid ""
+"This is the number of seconds to wait for an acknowledgement to a packet\n"
+"before resending the packet."
 msgstr ""
 
-#: remote.c:10662
-msgid "Set interrupt sequence to remote target."
+#: remote-mips.c:3696
+msgid ""
+"Set the maximum number of characters to ignore when scanning for a SYN."
 msgstr ""
 
-#: remote.c:10663
-msgid "Show interrupt sequence to remote target."
+#: remote-mips.c:3697
+msgid ""
+"Show the maximum number of characters to ignore when scanning for a SYN."
 msgstr ""
 
-#: remote.c:10664
+#: remote-mips.c:3698
 msgid ""
-"Valid value is \"Ctrl-C\", \"BREAK\" or \"BREAK-g\". The default is \"Ctrl-"
-"C\"."
+"This is the maximum number of characters GDB will ignore when trying to\n"
+"synchronize with the remote system.  A value of -1 means that there is no\n"
+"limit. (Note that these characters are printed out even though they are\n"
+"ignored.)"
 msgstr ""
 
-#: remote.c:10671
-msgid ""
-"Set whether interrupt-sequence is sent to remote target when gdb connects to."
+#: remote-mips.c:3708
+msgid "Set the prompt that GDB expects from the monitor."
 msgstr ""
 
-#: remote.c:10672
-msgid ""
-"\t\tShow whether interrupt-sequence is sent to remote target when gdb "
-"connects to."
+#: remote-mips.c:3709
+msgid "Show the prompt that GDB expects from the monitor."
 msgstr ""
 
-#: remote.c:10673
-msgid "\t\tIf set, interrupt sequence is sent to remote target."
+#: remote-mips.c:3716
+msgid "Set printing of monitor warnings."
 msgstr ""
 
-#. Install commands for configuring memory read/write packets.
-#: remote.c:10680
-msgid "Set the maximum number of bytes per memory write packet (deprecated)."
+#: remote-mips.c:3717
+msgid "Show printing of monitor warnings."
 msgstr ""
 
-#: remote.c:10683
+#: remote-mips.c:3718
 msgid ""
-"Show the maximum number of bytes per memory write packet (deprecated)."
+"When enabled, monitor warnings about hardware breakpoints will be displayed."
 msgstr ""
 
-#: remote.c:10687
-msgid ""
-"Set the maximum number of bytes per memory-write packet.\n"
-"Specify the number of bytes in a packet or 0 (zero) for the\n"
-"default packet size.  The actual limit is further reduced\n"
-"dependent on the target.  Specify ``fixed'' to disable the\n"
-"further restriction and ``limit'' to enable that restriction."
+#: remote-mips.c:3725
+msgid "Send a packet to PMON (must be in debug mode)."
 msgstr ""
 
-#: remote.c:10695
+#: remote-mips.c:3727
 msgid ""
-"Set the maximum number of bytes per memory-read packet.\n"
-"Specify the number of bytes in a packet or 0 (zero) for the\n"
-"default packet size.  The actual limit is further reduced\n"
-"dependent on the target.  Specify ``fixed'' to disable the\n"
-"further restriction and ``limit'' to enable that restriction."
+"Set zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
+"targets."
 msgstr ""
 
-#: remote.c:10704
-msgid "Show the maximum number of bytes per memory-write packet."
+#: remote-mips.c:3728
+msgid ""
+"Show zeroing of upper 32 bits of 64-bit addresses when talking to PMON "
+"targets."
 msgstr ""
 
-#: remote.c:10708
-msgid "Show the maximum number of bytes per memory-read packet."
+#: remote-mips.c:3729
+msgid "Use \"on\" to enable the masking and \"off\" to disable it."
 msgstr ""
 
-#: remote.c:10712
-msgid "Set the maximum number of target hardware watchpoints."
+#: remote-sim.c:187
+#, possible-c-format
+msgid "Unable to create simulator instance for inferior %d."
 msgstr ""
 
-#: remote.c:10713
-msgid "Show the maximum number of target hardware watchpoints."
+#: remote-sim.c:202
+#, possible-c-format
+msgid ""
+"Inferior %d and inferior %d would have identical simulator state.\n"
+"(This simulator does not support the running of more than one inferior.)"
 msgstr ""
 
-#: remote.c:10714 remote.c:10723
-msgid "Specify a negative limit for unlimited."
+#: remote-sim.c:529
+msgid "Register size different to expected"
 msgstr ""
 
-#: remote.c:10721
-msgid "Set the maximum number of target hardware breakpoints."
+#: remote-sim.c:532
+#, possible-c-format
+msgid "Register %d not updated"
 msgstr ""
 
-#: remote.c:10722
-msgid "Show the maximum number of target hardware breakpoints."
+#: remote-sim.c:534
+#, possible-c-format
+msgid "Register %s not updated"
 msgstr ""
 
-#: remote.c:10731
-msgid "Set the maximum size of the address (in bits) in a memory packet."
+#: remote-sim.c:573
+msgid "program to load"
 msgstr ""
 
-#: remote.c:10732
-msgid "Show the maximum size of the address (in bits) in a memory packet."
+#: remote-sim.c:581
+msgid "GDB sim does not yet support a load offset."
 msgstr ""
 
-#: remote.c:10881
-msgid "Set use of remote protocol `Z' packets"
+#: remote-sim.c:590
+msgid "unable to load program"
 msgstr ""
 
-#: remote.c:10882
-msgid "Show use of remote protocol `Z' packets "
+#: remote-sim.c:617
+msgid "No executable file specified."
 msgstr ""
 
-#: remote.c:10883
-msgid ""
-"When set, GDB will attempt to use the remote breakpoint and watchpoint\n"
-"packets."
+#: remote-sim.c:619 remote-sim.c:1085
+msgid "No program loaded."
 msgstr ""
 
-#: remote.c:10892
-msgid ""
-"Manipulate files on the remote system\n"
-"Transfer files to and from the remote target system."
+#: remote-sim.c:728
+msgid "unable to create simulator instance"
 msgstr ""
 
-#: remote.c:10899
-msgid "Copy a local file to the remote system."
+#: remote-sim.c:855
+#, possible-c-format
+msgid "gdbsim_resume: pid %d, step %d, signal %d\n"
 msgstr ""
 
-#: remote.c:10903
-msgid "Copy a remote file to the local system."
+#: remote-sim.c:934
+#, possible-c-format
+msgid "Can't stop pid %d.  No inferior found."
 msgstr ""
 
-#: remote.c:10907
-msgid "Delete a remote file."
+#: remote-sim.c:991
+#, possible-c-format
+msgid "Unable to wait for pid %d.  Inferior not found."
 msgstr ""
 
-#: remote.c:10912
-msgid "Set the remote pathname for \"run\""
+#. PREVIOUSLY: The user may give a command before the simulator
+#. is opened. [...] (??? assuming of course one wishes to
+#. continue to allow commands to be sent to unopened simulators,
+#. which isn't entirely unreasonable).
+#. The simulator is a builtin abstraction of a remote target.
+#. Consistent with that model, access to the simulator, via sim
+#. commands, is restricted to the period when the channel to the
+#. simulator is open.
+#: remote-sim.c:1188
+msgid "Not connected to the simulator target"
 msgstr ""
 
-#: remote.c:10913
-msgid "Show the remote pathname for \"run\""
+#: remote-sim.c:1310
+msgid "Send a command to the simulator."
 msgstr ""
 
-#: reverse.c:57
+#: reverse.c:53
 #, possible-c-format
 msgid "Already in reverse mode.  Use '%s' or 'set exec-dir forward'."
 msgstr ""
 
-#: reverse.c:146
+#: reverse.c:142
 msgid "target_get_bookmark failed."
 msgstr ""
 
-#: reverse.c:170
+#: reverse.c:166
 #, possible-c-format
 msgid "Saved bookmark %d at %s\n"
 msgstr ""
 
-#: reverse.c:229
+#: reverse.c:225
 msgid "No bookmarks."
 msgstr ""
 
-#: reverse.c:235
+#: reverse.c:231
 msgid "Delete all bookmarks? "
 msgstr ""
 
 #. Not found.
-#: reverse.c:247
+#: reverse.c:243
 #, possible-c-format
 msgid "No bookmark #%d."
 msgstr ""
 
-#: reverse.c:260 thread.c:1323
+#: reverse.c:256 thread.c:1316
 msgid "Command requires an argument."
 msgstr ""
 
 #. Not found.
-#: reverse.c:293
+#: reverse.c:289
 #, possible-c-format
 msgid "goto-bookmark: no bookmark found for '%s'."
 msgstr ""
 
-#: reverse.c:329
+#: reverse.c:325
 msgid "No bookmarks.\n"
 msgstr ""
 
-#: reverse.c:352
+#: reverse.c:348
 msgid ""
 "Step program backward until it reaches the beginning of another source "
 "line.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:358
+#: reverse.c:354
 msgid ""
 "Step program backward, proceeding through subroutine calls.\n"
 "Like the \"reverse-step\" command as long as subroutine calls do not "
@@ -18850,19 +19496,19 @@
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:366
+#: reverse.c:362
 msgid ""
 "Step backward exactly one instruction.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:372
+#: reverse.c:368
 msgid ""
 "Step backward one instruction, but proceed through called subroutines.\n"
 "Argument N means do this N times (or till program stops for another reason)."
 msgstr ""
 
-#: reverse.c:378
+#: reverse.c:374
 msgid ""
 "Continue program being debugged but run it in reverse.\n"
 "If proceeding from breakpoint, a number N may be used as an argument,\n"
@@ -18870,18 +19516,18 @@
 "the breakpoint won't break until the Nth time it is reached)."
 msgstr ""
 
-#: reverse.c:385
+#: reverse.c:381
 msgid "Execute backward until just before selected stack frame is called."
 msgstr ""
 
-#: reverse.c:388
+#: reverse.c:384
 msgid ""
 "Set a bookmark in the program's execution history.\n"
 "A bookmark represents a point in the execution history \n"
 "that can be returned to at a later point in the debug session."
 msgstr ""
 
-#: reverse.c:392
+#: reverse.c:388
 msgid ""
 "Status of user-settable bookmarks.\n"
 "Bookmarks are user-settable markers representing a point in the \n"
@@ -18889,14 +19535,14 @@
 "session."
 msgstr ""
 
-#: reverse.c:397
+#: reverse.c:393
 msgid ""
 "Delete a bookmark from the bookmark list.\n"
 "Argument is a bookmark number or numbers,\n"
 " or no argument to delete all bookmarks.\n"
 msgstr ""
 
-#: reverse.c:402
+#: reverse.c:398
 msgid ""
 "Go to an earlier-bookmarked point in the program's execution history.\n"
 "Argument is the bookmark number of a bookmark saved earlier by using \n"
@@ -18906,34 +19552,34 @@
 msgstr ""
 
 #. FIXME: this happens 3 times at the start of each 64-bit program.
-#: rs6000-nat.c:262
+#: rs6000-nat.c:261
 msgid "ptrace read"
 msgstr ""
 
-#: rs6000-nat.c:330
+#: rs6000-nat.c:329
 msgid "ptrace write"
 msgstr ""
 
-#: rs6000-nat.c:613
+#: rs6000-nat.c:612
 msgid "pt_continue"
 msgstr ""
 
-#: rs6000-nat.c:757 solib.c:403
+#: rs6000-nat.c:756 solib.c:390
 #, possible-c-format
 msgid "Could not open `%s' as an executable file: %s"
 msgstr ""
 
-#: rs6000-nat.c:777
+#: rs6000-nat.c:776
 #, possible-c-format
 msgid "\"%s\": member \"%s\" missing."
 msgstr ""
 
-#: rs6000-nat.c:784
+#: rs6000-nat.c:783
 #, possible-c-format
 msgid "\"%s\": member \"%s\" not in executable format: %s."
 msgstr ""
 
-#: rs6000-nat.c:795
+#: rs6000-nat.c:794
 #, possible-c-format
 msgid "\"%s\": not in executable format: %s."
 msgstr ""
@@ -18941,17 +19587,17 @@
 #. The kernel sets ld_info to -1, if the process is still using the
 #. object, and the object is removed.  Keep the symbol info for the
 #. removed object and issue a warning.
-#: rs6000-nat.c:839
+#: rs6000-nat.c:838
 #, possible-c-format
 msgid "%s (fd=%d) has disappeared, keeping its symbols"
 msgstr ""
 
-#: rs6000-nat.c:868
+#: rs6000-nat.c:867
 #, possible-c-format
 msgid "Unable to stat %s, keeping its symbols"
 msgstr ""
 
-#: rs6000-nat.c:917
+#: rs6000-nat.c:916
 #, possible-c-format
 msgid ""
 "Symbol file %s\n"
@@ -18962,78 +19608,78 @@
 "symbols to the proper address)."
 msgstr ""
 
-#: rs6000-nat.c:951
+#: rs6000-nat.c:950
 msgid "vmap_exec: vmap or table->sections == 0."
 msgstr ""
 
-#: rs6000-nat.c:1025
+#: rs6000-nat.c:1024
 msgid "rs6000_create_inferior: failed to select architecture"
 msgstr ""
 
-#: rs6000-nat.c:1072
+#: rs6000-nat.c:1071
 msgid "ptrace ldinfo"
 msgstr ""
 
-#: rs6000-nat.c:1214
+#: rs6000-nat.c:1213
 #, possible-c-format
 msgid "Unable to find TOC entry for pc %s."
 msgstr ""
 
-#: rs6000-tdep.c:2804
+#: rs6000-tdep.c:2802
 #, possible-c-format
 msgid "rs6000_pseudo_register_read: called on unexpected register '%s' (%d)"
 msgstr ""
 
-#: rs6000-tdep.c:2829
+#: rs6000-tdep.c:2827
 #, possible-c-format
 msgid "rs6000_pseudo_register_write: called on unexpected register '%s' (%d)"
 msgstr ""
 
-#: rs6000-tdep.c:4184
+#: rs6000-tdep.c:4182
 msgid "\"set powerpc\" must be followed by an appropriate subcommand.\n"
 msgstr ""
 
-#: rs6000-tdep.c:4225
+#: rs6000-tdep.c:4223
 #, possible-c-format
 msgid "Invalid vector ABI accepted: %s."
 msgstr ""
 
-#: rs6000-tdep.c:4241
+#: rs6000-tdep.c:4239
 #, possible-c-format
 msgid "Use of exact watchpoints is %s.\n"
 msgstr ""
 
-#: rs6000-tdep.c:4279 rs6000-tdep.c:4283
+#: rs6000-tdep.c:4277 rs6000-tdep.c:4281
 msgid "Various PowerPC-specific commands."
 msgstr ""
 
-#: rs6000-tdep.c:4289
+#: rs6000-tdep.c:4287
 msgid "Set whether to use a soft-float ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4290
+#: rs6000-tdep.c:4288
 msgid "Show whether to use a soft-float ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4297
+#: rs6000-tdep.c:4295
 msgid "Set the vector ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4298
+#: rs6000-tdep.c:4296
 msgid "Show the vector ABI."
 msgstr ""
 
-#: rs6000-tdep.c:4304
+#: rs6000-tdep.c:4302
 msgid ""
 "Set whether to use just one debug register for watchpoints on scalars."
 msgstr ""
 
-#: rs6000-tdep.c:4306
+#: rs6000-tdep.c:4304
 msgid ""
 "Show whether to use just one debug register for watchpoints on scalars."
 msgstr ""
 
-#: rs6000-tdep.c:4308
+#: rs6000-tdep.c:4306
 msgid ""
 "If true, GDB will use only one debug register when watching a variable of\n"
 "scalar type, thus assuming that the variable is accessed through the "
@@ -19041,49 +19687,57 @@
 "of its first byte."
 msgstr ""
 
-#: s390-nat.c:277 s390-nat.c:318
+#: s390-nat.c:325 s390-nat.c:347
+msgid "Couldn't get register set"
+msgstr ""
+
+#: s390-nat.c:353
+msgid "Couldn't set register set"
+msgstr ""
+
+#: s390-nat.c:458 s390-nat.c:499
 msgid "Couldn't retrieve watchpoint status"
 msgstr ""
 
-#: s390-nat.c:287
+#: s390-nat.c:468
 msgid "Couldn't clear watchpoint status"
 msgstr ""
 
-#: s390-nat.c:334
+#: s390-nat.c:515
 msgid "Couldn't modify watchpoint status"
 msgstr ""
 
-#: s390-tdep.c:2408
+#: s390-tdep.c:2644
 msgid "Stack overflow"
 msgstr ""
 
-#: s390-tdep.c:2511
+#: s390-tdep.c:2747
 msgid "unknown argument type"
 msgstr ""
 
-#: s390-tdep.c:2610 s390-tdep.c:2643
+#: s390-tdep.c:2857 s390-tdep.c:2890
 msgid "invalid return type"
 msgstr ""
 
-#: s390-tdep.c:2614 spu-tdep.c:1484
+#: s390-tdep.c:2861 spu-tdep.c:1491
 msgid "Cannot set function return value."
 msgstr ""
 
-#: s390-tdep.c:2647 spu-tdep.c:1500
+#: s390-tdep.c:2894 spu-tdep.c:1507
 msgid "Function return value unknown."
 msgstr ""
 
-#: score-tdep.c:160 score-tdep.c:253 score-tdep.c:323 score-tdep.c:832
+#: score-tdep.c:159 score-tdep.c:252 score-tdep.c:322 score-tdep.c:831
 #, possible-c-format
 msgid "Error: target_read_memory in file:%s, line:%d!"
 msgstr ""
 
-#: score-tdep.c:441
+#: score-tdep.c:440
 #, possible-c-format
 msgid "Error: score_xfer_register in file:%s, line:%d!"
 msgstr ""
 
-#: score-tdep.c:820
+#: score-tdep.c:819
 #, possible-c-format
 msgid "Error: malloc size < 0 in file:%s, line:%d!"
 msgstr ""
@@ -19091,7 +19745,7 @@
 #. The sentinel frame is used as a starting point for creating the
 #. previous (inner most) frame.  That frame's THIS_ID method will be
 #. called to determine the inner most frame's ID.  Not this one.
-#: sentinel-frame.c:81
+#: sentinel-frame.c:66
 msgid "sentinel_frame_this_id called"
 msgstr ""
 
@@ -19167,60 +19821,120 @@
 msgid "Print DOS serial port status."
 msgstr ""
 
-#: ser-mingw.c:175
+#: serial.c:389
+msgid "serial_readchar: blocking read in async mode"
+msgstr ""
+
+#: serial.c:568
+msgid "serial: FD not valid"
+msgstr ""
+
+#: serial.c:701 serial.c:739
+msgid "connect"
+msgstr ""
+
+#: serial.c:774
+msgid ""
+"Connect the terminal directly up to the command monitor.\n"
+"Use <CR>~. or <CR>~^D to break out."
+msgstr ""
+
+#: serial.c:779
+msgid "Set default serial/parallel port configuration."
+msgstr ""
+
+#: serial.c:785
+msgid "Show default serial/parallel port configuration."
+msgstr ""
+
+#: serial.c:791
+msgid "Set filename for remote session recording."
+msgstr ""
+
+#: serial.c:792
+msgid "Show filename for remote session recording."
+msgstr ""
+
+#: serial.c:793
+msgid ""
+"This file is used to record the remote session for future playback\n"
+"by gdbserver."
+msgstr ""
+
+#: serial.c:801
+msgid "Set numerical base for remote session logging"
+msgstr ""
+
+#: serial.c:802
+msgid "Show numerical base for remote session logging"
+msgstr ""
+
+#: serial.c:809
+msgid "Set serial debugging."
+msgstr ""
+
+#: serial.c:810
+msgid "Show serial debugging."
+msgstr ""
+
+#: serial.c:811
+msgid "When non-zero, serial port debugging is enabled."
+msgstr ""
+
+#: ser-mingw.c:174
 msgid "SetCommState failed"
 msgstr ""
 
-#: ser-mingw.c:268
+#: ser-mingw.c:267
 msgid "ser_windows_wait_handle: reseting mask failed"
 msgstr ""
 
-#: ser-mingw.c:271
+#: ser-mingw.c:270
 msgid "ser_windows_wait_handle: reseting mask failed (2)"
 msgstr ""
 
-#: ser-mingw.c:846
+#: ser-mingw.c:845
 msgid "child command"
 msgstr ""
 
-#: ser-mingw.c:852
+#: ser-mingw.c:851
 msgid "missing child command"
 msgstr ""
 
-#: ser-mingw.c:879
+#: ser-mingw.c:878
 #, possible-c-format
 msgid "error starting child process '%s': %s: %s"
 msgstr ""
 
-#: ser-mingw.c:882
+#: ser-mingw.c:881
 #, possible-c-format
 msgid "error starting child process '%s': %s"
 msgstr ""
 
-#: ser-tcp.c:181
+#: ser-tcp.c:183
 msgid "net_open: No colon in host name!"
 msgstr ""
 
 #. allow-unknown
-#: ser-tcp.c:406 ser-tcp.c:411
+#: ser-tcp.c:408 ser-tcp.c:413
 msgid ""
 "TCP protocol specific variables\n"
 "Configure variables specific to remote TCP connections"
 msgstr ""
 
-#: ser-tcp.c:418
+#: ser-tcp.c:420
 msgid "Set auto-retry on socket connect"
 msgstr ""
 
-#: ser-tcp.c:419
+#: ser-tcp.c:421
 msgid "Show auto-retry on socket connect"
 msgstr ""
 
-#: ser-tcp.c:425
+#: ser-tcp.c:427
 msgid "Set timeout limit for socket connection"
 msgstr ""
 
-#: ser-tcp.c:426
+#: ser-tcp.c:428
 msgid "Show timeout limit for socket connection"
 msgstr ""
 
@@ -19259,311 +19973,449 @@
 "when debugging using remote targets."
 msgstr ""
 
-#: serial.c:391
-msgid "serial_readchar: blocking read in async mode"
+#: sh64-tdep.c:1591
+msgid "sh64_register_convert_to_virtual called with non DR register number"
 msgstr ""
 
-#: serial.c:570
-msgid "serial: FD not valid"
+#: sh64-tdep.c:1616
+msgid "sh64_register_convert_to_raw called with non DR register number"
 msgstr ""
 
-#: serial.c:703 serial.c:741
-msgid "connect"
+#: sh64-tdep.c:2096
+#, possible-c-format
+msgid "Invalid pseudo register number %d\n"
+msgstr ""
+
+#: sh64-tdep.c:2191
+#, possible-c-format
+msgid "Invalid register number %d\n"
+msgstr ""
+
+#: sh64-tdep.c:2275
+msgid "Not a valid register for the current processor mode."
+msgstr ""
+
+#: sh-tdep.c:2276
+msgid "sh_register_convert_to_raw called with non DR register number"
+msgstr ""
+
+#: sh-tdep.c:3097
+msgid "Print all registers"
+msgstr ""
+
+#: sh-tdep.c:3106
+msgid "Set calling convention used when calling target functions from GDB."
+msgstr ""
+
+#: sh-tdep.c:3108
+msgid "Show calling convention used when calling target functions from GDB."
 msgstr ""
 
-#: serial.c:776
+#: sh-tdep.c:3110
 msgid ""
-"Connect the terminal directly up to the command monitor.\n"
-"Use <CR>~. or <CR>~^D to break out."
+"gcc       - Use GCC calling convention (default).\n"
+"renesas   - Enforce Renesas calling convention."
 msgstr ""
 
-#: serial.c:781
-msgid "Set default serial/parallel port configuration."
+#: skip.c:99
+msgid "No default file now."
 msgstr ""
 
-#: serial.c:787
-msgid "Show default serial/parallel port configuration."
+#: skip.c:108
+#, possible-c-format
+msgid "No source file named %s.\n"
 msgstr ""
 
-#: serial.c:793
-msgid "Set filename for remote session recording."
+#: skip.c:109
+msgid "Ignore file pending future shared library load? "
+msgstr ""
+
+#: skip.c:129
+#, possible-c-format
+msgid "File %s will be skipped when stepping.\n"
+msgstr ""
+
+#: skip.c:143
+msgid "No default function now."
+msgstr ""
+
+#: skip.c:148
+#, possible-c-format
+msgid "No function found containing current program point %s."
+msgstr ""
+
+#: skip.c:176
+#, possible-c-format
+msgid "No function found named %s.\n"
+msgstr ""
+
+#: skip.c:178
+msgid "Ignore function pending future shared library load? "
+msgstr ""
+
+#: skip.c:189
+msgid "Specify just one function at a time."
+msgstr ""
+
+#: skip.c:204
+#, possible-c-format
+msgid "No function found containing program point %s."
 msgstr ""
 
-#: serial.c:794
-msgid "Show filename for remote session recording."
+#: skip.c:237
+msgid "Not skipping any files or functions.\n"
 msgstr ""
 
-#: serial.c:795
-msgid ""
-"This file is used to record the remote session for future playback\n"
-"by gdbserver."
+#: skip.c:241
+#, possible-c-format
+msgid "No skiplist entries found with number %s.\n"
 msgstr ""
 
-#: serial.c:803
-msgid "Set numerical base for remote session logging"
+#: skip.c:284
+msgid "Skiplist entry should have either a filename or a function name."
 msgstr ""
 
-#: serial.c:804
-msgid "Show numerical base for remote session logging"
+#: skip.c:347 skip.c:364 skip.c:393
+#, possible-c-format
+msgid "No skiplist entries found with number %s."
 msgstr ""
 
-#: serial.c:811
-msgid "Set serial debugging."
+#: skip.c:414
+#, possible-c-format
+msgid "Function %s at %s will be skipped when stepping.\n"
 msgstr ""
 
-#: serial.c:812
-msgid "Show serial debugging."
+#: skip.c:417
+#, possible-c-format
+msgid ""
+"Function %s will be skipped when stepping, pending shared library load.\n"
 msgstr ""
 
-#: serial.c:813
-msgid "When non-zero, serial port debugging is enabled."
+#: skip.c:553
+msgid ""
+"Ignore a function while stepping.\n"
+"Usage: skip [FUNCTION NAME]\n"
+"If no function name is given, ignore the current function."
 msgstr ""
 
-#: sh-tdep.c:2278
-msgid "sh_register_convert_to_raw called with non DR register number"
+#: skip.c:559
+msgid ""
+"Ignore a file while stepping.\n"
+"Usage: skip file [FILENAME]\n"
+"If no filename is given, ignore the current file."
 msgstr ""
 
-#: sh-tdep.c:3099
-msgid "Print all registers"
+#: skip.c:566
+msgid ""
+"Ignore a function while stepping.\n"
+"Usage: skip function [FUNCTION NAME]\n"
+"If no function name is given, skip the current function."
 msgstr ""
 
-#: sh-tdep.c:3108
-msgid "Set calling convention used when calling target functions from GDB."
+#: skip.c:573
+msgid ""
+"Enable skip entries.  You can specify numbers (e.g. \"skip enable 1 3\"), "
+"ranges (e.g. \"skip enable 4-8\"), or both (e.g. \"skip enable 1 3 4-8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll enable all skip entries.\n"
+"\n"
+"Usage: skip enable [NUMBERS AND/OR RANGES]"
 msgstr ""
 
-#: sh-tdep.c:3110
-msgid "Show calling convention used when calling target functions from GDB."
+#: skip.c:580
+msgid ""
+"Disable skip entries.  You can specify numbers (e.g. \"skip disable 1 3\"), "
+"ranges (e.g. \"skip disable 4-8\"), or both (e.g. \"skip disable 1 3 4-"
+"8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll disable all skip entries.\n"
+"\n"
+"Usage: skip disable [NUMBERS AND/OR RANGES]"
 msgstr ""
 
-#: sh-tdep.c:3112
+#: skip.c:587
 msgid ""
-"gcc       - Use GCC calling convention (default).\n"
-"renesas   - Enforce Renesas calling convention."
+"Delete skip entries.  You can specify numbers (e.g. \"skip delete 1 3\"), "
+"ranges (e.g. \"skip delete 4-8\"), or both (e.g. \"skip delete 1 3 4-8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll delete all skip entries.\n"
+"\n"
+"Usage: skip delete [NUMBERS AND/OR RANGES]"
 msgstr ""
 
-#: sh64-tdep.c:1593
-msgid "sh64_register_convert_to_virtual called with non DR register number"
+#: skip.c:594
+msgid ""
+"Display the status of skips.  You can specify numbers (e.g. \"skip info 1 "
+"3\"), ranges (e.g. \"skip info 4-8\"), or both (e.g. \"skip info 1 3 4-"
+"8\").\n"
+"\n"
+"If you don't specify any numbers or ranges, we'll show all skips.\n"
+"\n"
+"Usage: skip info [NUMBERS AND/OR RANGES]\n"
+"The \"Type\" column indicates one of:\n"
+"\tfile        - ignored file\n"
+"\tfunction    - ignored function"
 msgstr ""
 
-#: sh64-tdep.c:1618
-msgid "sh64_register_convert_to_raw called with non DR register number"
+#: solib.c:103
+#, possible-c-format
+msgid ""
+"The search path for loading non-absolute shared library symbol files is %s.\n"
 msgstr ""
 
-#: sh64-tdep.c:2098
+#: solib.c:427
 #, possible-c-format
-msgid "Invalid pseudo register number %d\n"
+msgid "`%s': not in executable format: %s"
 msgstr ""
 
-#: sh64-tdep.c:2193
+#: solib.c:434
 #, possible-c-format
-msgid "Invalid register number %d\n"
+msgid ""
+"`%s': Shared library architecture %s is not compatible with target "
+"architecture %s."
 msgstr ""
 
-#: sh64-tdep.c:2277
-msgid "Not a valid register for the current processor mode."
+#: solib.c:476
+msgid "Shared library file name is too long."
 msgstr ""
 
-#: sol-thread.c:261
+#: solib.c:619
 #, possible-c-format
-msgid "thread_to_lwp: td_ta_map_id2thr %s"
+msgid "Error while reading shared library symbols for %s:\n"
 msgstr ""
 
-#: sol-thread.c:267
+#: solib.c:625
 #, possible-c-format
-msgid "thread_to_lwp: td_thr_get_info: %s"
+msgid "Loaded symbols for %s\n"
 msgstr ""
 
-#: sol-thread.c:273
-#, possible-c-format
-msgid "thread_to_lwp: thread state not active: %s"
+#: solib.c:810 solib.c:1261
+msgid "Error while mapping shared library sections:\n"
 msgstr ""
 
-#: sol-thread.c:304
+#: solib.c:826
 #, possible-c-format
-msgid "lwp_to_thread: td_ta_map_lwp2thr: %s."
+msgid ""
+"Could not load shared library symbols for %s.\n"
+"Do you need \"set solib-search-path\" or \"set sysroot\"?"
 msgstr ""
 
-#: sol-thread.c:310
+#: solib.c:831
 #, possible-c-format
-msgid "lwp_to_thread: td_thr_validate: %s."
+msgid ""
+"Could not load shared library symbols for %d libraries, e.g. %s.\n"
+"Use the \"info sharedlibrary\" command to see the complete listing.\n"
+"Do you need \"set solib-search-path\" or \"set sysroot\"?"
 msgstr ""
 
-#: sol-thread.c:316
+#: solib.c:915
 #, possible-c-format
-msgid "lwp_to_thread: td_thr_get_info: %s."
+msgid "Symbols already loaded for %s\n"
 msgstr ""
 
-#. Inactive thread.
-#: sol-thread.c:368 sol-thread.c:404
-msgid "This version of Solaris can't start inactive threads."
+#: solib.c:1044
+msgid "No shared libraries matched.\n"
 msgstr ""
 
-#: sol-thread.c:370 sol-thread.c:406
-#, possible-c-format
-msgid "Specified thread %ld seems to have terminated"
+#: solib.c:1047
+msgid "No shared libraries loaded at this time.\n"
 msgstr ""
 
-#: sol-thread.c:464
-msgid "sol_thread_fetch_registers: thread == 0"
+#: solib.c:1053
+msgid "(*): Shared library is missing debugging information.\n"
 msgstr ""
 
-#: sol-thread.c:468
+#: solib.c:1333
 #, possible-c-format
-msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s"
+msgid "Autoloading of shared library symbols is %s.\n"
 msgstr ""
 
-#: sol-thread.c:475
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getgregs %s"
+#: solib.c:1458 xcoffsolib.c:165
+msgid "Load shared object library symbols for files matching REGEXP."
 msgstr ""
 
-#: sol-thread.c:485
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getfpregs %s"
+#: solib.c:1460
+msgid "Status of loaded shared object libraries."
 msgstr ""
 
-#: sol-thread.c:499
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getxregsize %s"
+#: solib.c:1462
+msgid "Unload all shared object library symbols."
 msgstr ""
 
-#: sol-thread.c:507
-#, possible-c-format
-msgid "sol_thread_fetch_registers: td_thr_getxregs %s"
+#: solib.c:1465 xcoffsolib.c:170
+msgid "Set autoloading of shared library symbols."
 msgstr ""
 
-#: sol-thread.c:541
-#, possible-c-format
-msgid "sol_thread_store_registers: td_ta_map_id2thr %s"
+#: solib.c:1466 xcoffsolib.c:171
+msgid "Show autoloading of shared library symbols."
 msgstr ""
 
-#: sol-thread.c:554
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getgregs %s"
+#: solib.c:1467 xcoffsolib.c:172
+msgid ""
+"If \"on\", symbols from all shared object libraries will be loaded\n"
+"automatically when the inferior begins execution, when the dynamic linker\n"
+"informs gdb that a new library has been loaded, or when attaching to the\n"
+"inferior.  Otherwise, symbols must be loaded manually, using `sharedlibrary'."
 msgstr ""
 
-#: sol-thread.c:558
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getfpregs %s"
+#: solib.c:1478
+msgid "Set an alternate system root."
 msgstr ""
 
-#: sol-thread.c:568 sol-thread.c:598
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getxregsize %s"
+#: solib.c:1479
+msgid "Show the current system root."
 msgstr ""
 
-#: sol-thread.c:576
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_getxregs %s"
+#: solib.c:1480
+msgid ""
+"The system root is used to load absolute shared library symbol files.\n"
+"For other (relative) files, you can add directories using\n"
+"`set solib-search-path'."
 msgstr ""
 
-#: sol-thread.c:587
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_setgregs %s"
+#: solib.c:1494
+msgid ""
+"Set the search path for loading non-absolute shared library symbol files."
 msgstr ""
 
-#: sol-thread.c:591
-#, possible-c-format
-msgid "sol_thread_store_registers: td_thr_setfpregs %s"
+#: solib.c:1496
+msgid ""
+"Show the search path for loading non-absolute shared library symbol files."
+msgstr ""
+
+#: solib.c:1498
+msgid ""
+"This takes precedence over the environment variables PATH and "
+"LD_LIBRARY_PATH."
 msgstr ""
 
-#: sol-thread.c:662
+#: solib-darwin.c:456
 #, possible-c-format
-msgid "sol_thread_new_objfile: td_init: %s"
+msgid "`%s': not a shared-library: %s"
 msgstr ""
 
-#: sol-thread.c:690
+#: solib-dsbt.c:207
 #, possible-c-format
-msgid "Cannot initialize thread debugging library: %s"
+msgid "Unsupported map version: %d\n"
 msgstr ""
 
-#: sol-thread.c:1275
-msgid "info sol-thread: failed to get info for thread."
+#: solib-dsbt.c:303
+msgid "Error reading DSBT exec loadmap"
 msgstr ""
 
-#: sol-thread.c:1388
-msgid "Show info on Solaris user threads."
+#: solib-dsbt.c:313
+msgid "Error reading DSBT interp loadmap"
 msgstr ""
 
-#: solib-darwin.c:436
-#, possible-c-format
-msgid "`%s': not a shared-library: %s"
+#: solib-dsbt.c:679
+msgid ""
+"dsbt_current_sos: Unable to read link map entry.  Shared object chain may be "
+"incomplete."
 msgstr ""
 
-#: solib-frv.c:479
+#: solib-dsbt.c:693
 msgid ""
-"frv_current_sos: Unable to read link map entry.  Shared object chain may be "
+"dsbt_current_sos: Unable to read dsbt index.  Shared object chain may be "
 "incomplete."
 msgstr ""
 
-#: solib-frv.c:506
+#: solib-dsbt.c:714
 msgid ""
-"frv_current_sos: Unable to fetch load map.  Shared object chain may be "
+"dsbt_current_sos: Unable to fetch load map.  Shared object chain may be "
 "incomplete."
 msgstr ""
 
-#: solib-frv.c:528
+#: solib-dsbt.c:730 solib-frv.c:409
 #, possible-c-format
 msgid "Can't read pathname for link map entry: %s."
 msgstr ""
 
-#: solib-frv.c:599 solib-svr4.c:1589
+#: solib-dsbt.c:780 solib-frv.c:480 solib-svr4.c:1680
 msgid ""
 "Unable to find dynamic linker breakpoint function.\n"
 "GDB will be unable to debug shared library initializers\n"
 "and track explicitly loaded dynamic code."
 msgstr ""
 
-#: solib-frv.c:698
-msgid "Unable to determine dynamic linker loadmap address."
-msgstr ""
-
-#: solib-frv.c:712
-#, possible-c-format
-msgid "Unable to load dynamic linker loadmap at address %s."
-msgstr ""
-
-#: solib-frv.c:745
+#: solib-dsbt.c:901 solib-frv.c:623
 msgid "Could not find symbol _dl_debug_addr in dynamic linker"
 msgstr ""
 
-#: solib-frv.c:769
+#: solib-dsbt.c:922 solib-frv.c:647
 #, possible-c-format
 msgid ""
 "Unable to fetch contents of _dl_debug_addr (at address %s) from dynamic "
 "linker"
 msgstr ""
 
-#: solib-frv.c:795
+#: solib-dsbt.c:948 solib-frv.c:673
 #, possible-c-format
 msgid ""
 "Unable to fetch _dl_debug_addr->r_brk (at address %s) from dynamic linker"
 msgstr ""
 
-#: solib-frv.c:807
+#: solib-dsbt.c:1110 solib-frv.c:863 solib-irix.c:408 solib-sunos.c:654
+msgid "shared library handler failed to enable breakpoint"
+msgstr ""
+
+#: solib-dsbt.c:1164
+#, possible-c-format
+msgid "solib-dsbt debugging is %s.\n"
+msgstr ""
+
+#: solib-dsbt.c:1190
+msgid "Set internal debugging of shared library code for DSBT ELF."
+msgstr ""
+
+#: solib-dsbt.c:1191
+msgid "Show internal debugging of shared library code for DSBT ELF."
+msgstr ""
+
+#: solib-dsbt.c:1192
+msgid "When non-zero, DSBT solib specific internal debugging is enabled."
+msgstr ""
+
+#: solib-frv.c:360
+msgid ""
+"frv_current_sos: Unable to read link map entry.  Shared object chain may be "
+"incomplete."
+msgstr ""
+
+#: solib-frv.c:387
+msgid ""
+"frv_current_sos: Unable to fetch load map.  Shared object chain may be "
+"incomplete."
+msgstr ""
+
+#: solib-frv.c:575
+msgid "Unable to determine dynamic linker loadmap address."
+msgstr ""
+
+#: solib-frv.c:589
+#, possible-c-format
+msgid "Unable to load dynamic linker loadmap at address %s."
+msgstr ""
+
+#: solib-frv.c:685
 #, possible-c-format
 msgid ""
 "Unable to fetch _dl_debug_addr->.r_brk entry point (at address %s) from "
 "dynamic linker"
 msgstr ""
 
-#: solib-frv.c:934
+#: solib-frv.c:796
 msgid "Unable to load the executable's loadmap."
 msgstr ""
 
-#: solib-frv.c:1017 solib-irix.c:459 solib-sunos.c:758
-msgid "shared library handler failed to enable breakpoint"
-msgstr ""
-
-#: solib-frv.c:1343
+#: solib-frv.c:1189
 msgid "Set internal debugging of shared library code for FR-V."
 msgstr ""
 
-#: solib-frv.c:1344
+#: solib-frv.c:1190
 msgid "Show internal debugging of shared library code for FR-V."
 msgstr ""
 
-#: solib-frv.c:1345
+#: solib-frv.c:1191
 msgid "When non-zero, FR-V solib specific internal debugging is enabled."
 msgstr ""
 
@@ -19622,26 +20474,26 @@
 msgid "Unable to fetch shared library obj_info or obj_list info."
 msgstr ""
 
-#: solib-irix.c:489 solib-sunos.c:805
+#: solib-irix.c:438 solib-sunos.c:701
 msgid "shared library handler failed to disable breakpoint"
 msgstr ""
 
-#: solib-irix.c:575
+#: solib-irix.c:507
 #, possible-c-format
 msgid "current_sos: truncating name of %d characters to only %d characters"
 msgstr ""
 
-#: solib-irix.c:583 solib-som.c:605 solib-sunos.c:444 solib-svr4.c:1178
+#: solib-irix.c:515 solib-som.c:604 solib-sunos.c:405 solib-svr4.c:1224
 #, possible-c-format
 msgid "Can't read pathname for load map: %s."
 msgstr ""
 
-#: solib-irix.c:642 solib-osf.c:589 solib-pa64.c:532 solib-som.c:702
-#: solib-svr4.c:1012
+#: solib-irix.c:559 solib-osf.c:589 solib-pa64.c:495 solib-som.c:701
+#: solib-svr4.c:898
 msgid "Attempt to reload symbols from process? "
 msgstr ""
 
-#: solib-irix.c:665 solib-som.c:724 solib-svr4.c:1043
+#: solib-irix.c:582 solib-som.c:723 solib-svr4.c:938
 #, possible-c-format
 msgid "failed to read exec filename from attached file: %s"
 msgstr ""
@@ -19651,31 +20503,31 @@
 msgid "unable to read shared sec name at 0x%lx"
 msgstr ""
 
-#: solib-pa64.c:144
+#: solib-pa64.c:143
 msgid "No object file symbols."
 msgstr ""
 
-#: solib-pa64.c:154
+#: solib-pa64.c:153
 msgid "Unable to read in .dynamic section information."
 msgstr ""
 
-#: solib-pa64.c:163
+#: solib-pa64.c:162
 msgid "Error while reading in load map pointer."
 msgstr ""
 
-#: solib-pa64.c:178
+#: solib-pa64.c:177
 msgid "Error trying to get information about dynamic linker."
 msgstr ""
 
-#: solib-pa64.c:234 solib-pa64.c:248
+#: solib-pa64.c:233 solib-pa64.c:247
 msgid "Error while reading in .dynamic section of the program."
 msgstr ""
 
-#: solib-pa64.c:356
+#: solib-pa64.c:318
 msgid "Unable to read the .dynamic section."
 msgstr ""
 
-#: solib-pa64.c:361 solib-som.c:323
+#: solib-pa64.c:323 solib-som.c:322
 msgid ""
 "Private mapping of shared library text was not specified\n"
 "by the executable; setting a breakpoint in a shared library which\n"
@@ -19683,74 +20535,74 @@
 "manpage for methods to privately map shared library text."
 msgstr ""
 
-#: solib-pa64.c:373
+#: solib-pa64.c:335
 msgid "Unable to modify dynamic linker flags."
 msgstr ""
 
-#: solib-pa64.c:410
+#: solib-pa64.c:372
 #, possible-c-format
 msgid "Unable to grok dynamic linker %s as an object file"
 msgstr ""
 
 #. For a SOM-only target, there is no pa64 solib support.  This is needed
 #. for hppa-hpux-tdep.c to build.
-#: solib-pa64.c:690
+#: solib-pa64.c:653
 msgid "Cannot select pa64 solib support for this configuration."
 msgstr ""
 
-#: solib-som.c:226
+#: solib-som.c:225
 msgid ""
 "Unable to write __d_pid.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:247
+#: solib-som.c:246
 msgid ""
 "Unable to find _DLD_HOOK symbol in object file.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:270
+#: solib-som.c:269
 msgid ""
 "Unable to find __dld_hook symbol in object file.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:284
+#: solib-som.c:283
 msgid ""
 "Unable to find __dld_d_trap symbol in object file.\n"
 "Suggest linking with /opt/langtools/lib/end.o.\n"
 "GDB will be unable to track shl_load/shl_unload calls"
 msgstr ""
 
-#: solib-som.c:304 solib-som.c:535
+#: solib-som.c:303 solib-som.c:534
 msgid "Unable to find __dld_flags symbol in object file."
 msgstr ""
 
-#: solib-som.c:312
+#: solib-som.c:311
 msgid "Unable to read __dld_flags."
 msgstr ""
 
-#: solib-som.c:337
+#: solib-som.c:336
 msgid "Unable to write __dld_flags."
 msgstr ""
 
-#: solib-som.c:350
+#: solib-som.c:349
 msgid "Unable to find _start symbol in object file."
 msgstr ""
 
-#: solib-som.c:540
+#: solib-som.c:539
 msgid "__dld_list is not valid according to __dld_flags."
 msgstr ""
 
-#: solib-som.c:550
+#: solib-som.c:549
 msgid "Unable to find dynamic library list."
 msgstr ""
 
-#: solib-som.c:856
+#: solib-som.c:855
 msgid "Unable to find $PRIVATE$ in shared library!"
 msgstr ""
 
@@ -19759,344 +20611,353 @@
 msgid "Cannot read SPE executable at %s"
 msgstr ""
 
-#: solib-sunos.c:543
+#: solib-sunos.c:492
 msgid "stopped at unknown breakpoint while handling shared libraries"
 msgstr ""
 
-#: solib-svr4.c:246
+#: solib-svr4.c:156
+#, possible-c-format
+msgid "Error reading shared library list entry at %s"
+msgstr ""
+
+#: solib-svr4.c:264
 #, possible-c-format
 msgid ""
 "Using PIC (Position Independent Code) prelink displacement %s for \"%s\".\n"
 msgstr ""
 
-#: solib-svr4.c:252
+#. There is no way to verify the library file matches.  prelink
+#. can during prelinking of an unprelinked file (or unprelinking
+#. of a prelinked file) shift the DYNAMIC segment by arbitrary
+#. offset without any page size alignment.  There is no way to
+#. find out the ELF header and/or Program Headers for a limited
+#. verification if it they match.  One could do a verification
+#. of the DYNAMIC segment.  Still the found address is the best
+#. one GDB could find.
+#: solib-svr4.c:280
 #, possible-c-format
 msgid ""
 ".dynamic section for \"%s\" is not at the expected address (wrong library or "
 "version mismatch?)"
 msgstr ""
 
-#: solib-svr4.c:1154
-msgid "Corrupted shared library list"
+#: solib-svr4.c:1033
+#, possible-c-format
+msgid "SVR4 Library list has unsupported version \"%s\""
+msgstr ""
+
+#: solib-svr4.c:1090 solib-target.c:232
+msgid "target library list"
+msgstr ""
+
+#: solib-svr4.c:1198
+#, possible-c-format
+msgid "Corrupted shared library list: %s != %s"
 msgstr ""
 
 #. It can be printed repeatedly as there is no easy way to check
 #. the executable symbols/file has been already relocated to
 #. displacement.
-#: solib-svr4.c:2038
+#: solib-svr4.c:2107
 #, possible-c-format
 msgid ""
 "Using PIE (Position Independent Executable) displacement %s for \"%s\".\n"
 msgstr ""
 
-#: solib-target.c:69
+#: solib-target.c:67
 msgid ""
 "Can not parse XML library list; XML support was disabled at compile time"
 msgstr ""
 
-#: solib-target.c:94 solib-target.c:111
+#: solib-target.c:92 solib-target.c:109
 msgid "Library list with both segments and sections"
 msgstr ""
 
-#: solib-target.c:142
+#: solib-target.c:140
 msgid "No segment or section bases defined"
 msgstr ""
 
-#: solib-target.c:157
+#: solib-target.c:155
 #, possible-c-format
 msgid "Library list has unsupported version \"%s\""
 msgstr ""
 
-#: solib-target.c:234
-msgid "target library list"
-msgstr ""
-
-#: solib-target.c:356
+#: solib-target.c:354
 #, possible-c-format
 msgid ""
 "Could not relocate shared library \"%s\": wrong number of ALLOC sections"
 msgstr ""
 
-#: solib-target.c:405
+#: solib-target.c:403
 #, possible-c-format
 msgid "Could not relocate shared library \"%s\": no segments"
 msgstr ""
 
-#: solib-target.c:421
+#: solib-target.c:419
 #, possible-c-format
 msgid "Could not relocate shared library \"%s\": bad offsets"
 msgstr ""
 
-#: solib.c:105
+#: sol-thread.c:260
 #, possible-c-format
-msgid ""
-"The search path for loading non-absolute shared library symbol files is %s.\n"
+msgid "thread_to_lwp: td_ta_map_id2thr %s"
 msgstr ""
 
-#: solib.c:440
+#: sol-thread.c:266
 #, possible-c-format
-msgid "`%s': not in executable format: %s"
+msgid "thread_to_lwp: td_thr_get_info: %s"
 msgstr ""
 
-#: solib.c:447
+#: sol-thread.c:272
 #, possible-c-format
-msgid ""
-"`%s': Shared library architecture %s is not compatible with target "
-"architecture %s."
+msgid "thread_to_lwp: thread state not active: %s"
 msgstr ""
 
-#: solib.c:505
-msgid "Shared library file name is too long."
+#: sol-thread.c:303
+#, possible-c-format
+msgid "lwp_to_thread: td_ta_map_lwp2thr: %s."
 msgstr ""
 
-#: solib.c:657
+#: sol-thread.c:309
 #, possible-c-format
-msgid "Error while reading shared library symbols for %s:\n"
+msgid "lwp_to_thread: td_thr_validate: %s."
 msgstr ""
 
-#: solib.c:663
+#: sol-thread.c:315
 #, possible-c-format
-msgid "Loaded symbols for %s\n"
+msgid "lwp_to_thread: td_thr_get_info: %s."
 msgstr ""
 
-#: solib.c:839 solib.c:1363
-msgid "Error while mapping shared library sections:\n"
+#. Inactive thread.
+#: sol-thread.c:367 sol-thread.c:403
+msgid "This version of Solaris can't start inactive threads."
 msgstr ""
 
-#: solib.c:855
+#: sol-thread.c:369 sol-thread.c:405
 #, possible-c-format
-msgid ""
-"Could not load shared library symbols for %s.\n"
-"Do you need \"set solib-search-path\" or \"set sysroot\"?"
+msgid "Specified thread %ld seems to have terminated"
 msgstr ""
 
-#: solib.c:860
-#, possible-c-format
-msgid ""
-"Could not load shared library symbols for %d libraries, e.g. %s.\n"
-"Use the \"info sharedlibrary\" command to see the complete listing.\n"
-"Do you need \"set solib-search-path\" or \"set sysroot\"?"
+#: sol-thread.c:463
+msgid "sol_thread_fetch_registers: thread == 0"
 msgstr ""
 
-#: solib.c:953
+#: sol-thread.c:467
 #, possible-c-format
-msgid "Symbols already loaded for %s\n"
-msgstr ""
-
-#: solib.c:1094
-msgid "No shared libraries matched.\n"
+msgid "sol_thread_fetch_registers: td_ta_map_id2thr: %s"
 msgstr ""
 
-#: solib.c:1097
-msgid "No shared libraries loaded at this time.\n"
+#: sol-thread.c:474
+#, possible-c-format
+msgid "sol_thread_fetch_registers: td_thr_getgregs %s"
 msgstr ""
 
-#: solib.c:1103
-msgid "(*): Shared library is missing debugging information.\n"
+#: sol-thread.c:484
+#, possible-c-format
+msgid "sol_thread_fetch_registers: td_thr_getfpregs %s"
 msgstr ""
 
-#: solib.c:1435
+#: sol-thread.c:498
 #, possible-c-format
-msgid "Autoloading of shared library symbols is %s.\n"
+msgid "sol_thread_fetch_registers: td_thr_getxregsize %s"
 msgstr ""
 
-#: solib.c:1464 xcoffsolib.c:165
-msgid "Load shared object library symbols for files matching REGEXP."
+#: sol-thread.c:506
+#, possible-c-format
+msgid "sol_thread_fetch_registers: td_thr_getxregs %s"
 msgstr ""
 
-#: solib.c:1466
-msgid "Status of loaded shared object libraries."
+#: sol-thread.c:540
+#, possible-c-format
+msgid "sol_thread_store_registers: td_ta_map_id2thr %s"
 msgstr ""
 
-#: solib.c:1468
-msgid "Unload all shared object library symbols."
+#: sol-thread.c:553
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getgregs %s"
 msgstr ""
 
-#: solib.c:1471 xcoffsolib.c:170
-msgid "Set autoloading of shared library symbols."
+#: sol-thread.c:557
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getfpregs %s"
 msgstr ""
 
-#: solib.c:1472 xcoffsolib.c:171
-msgid "Show autoloading of shared library symbols."
+#: sol-thread.c:567 sol-thread.c:597
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getxregsize %s"
 msgstr ""
 
-#: solib.c:1473 xcoffsolib.c:172
-msgid ""
-"If \"on\", symbols from all shared object libraries will be loaded\n"
-"automatically when the inferior begins execution, when the dynamic linker\n"
-"informs gdb that a new library has been loaded, or when attaching to the\n"
-"inferior.  Otherwise, symbols must be loaded manually, using `sharedlibrary'."
+#: sol-thread.c:575
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_getxregs %s"
 msgstr ""
 
-#: solib.c:1484
-msgid "Set an alternate system root."
+#: sol-thread.c:586
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_setgregs %s"
 msgstr ""
 
-#: solib.c:1485
-msgid "Show the current system root."
+#: sol-thread.c:590
+#, possible-c-format
+msgid "sol_thread_store_registers: td_thr_setfpregs %s"
 msgstr ""
 
-#: solib.c:1486
-msgid ""
-"The system root is used to load absolute shared library symbol files.\n"
-"For other (relative) files, you can add directories using\n"
-"`set solib-search-path'."
+#: sol-thread.c:661
+#, possible-c-format
+msgid "sol_thread_new_objfile: td_init: %s"
 msgstr ""
 
-#: solib.c:1500
-msgid ""
-"Set the search path for loading non-absolute shared library symbol files."
+#: sol-thread.c:689
+#, possible-c-format
+msgid "Cannot initialize thread debugging library: %s"
 msgstr ""
 
-#: solib.c:1502
-msgid ""
-"Show the search path for loading non-absolute shared library symbol files."
+#: sol-thread.c:1274
+msgid "info sol-thread: failed to get info for thread."
 msgstr ""
 
-#: solib.c:1504
-msgid ""
-"This takes precedence over the environment variables PATH and "
-"LD_LIBRARY_PATH."
+#: sol-thread.c:1387
+msgid "Show info on Solaris user threads."
 msgstr ""
 
-#: somread.c:86
+#: somread.c:74
 msgid "Couldn't read symbol dictionary!"
 msgstr ""
 
-#: somread.c:97
+#: somread.c:85
 msgid "Can't read in HP string table."
 msgstr ""
 
-#: somread.c:281
+#: somread.c:269
 #, possible-c-format
 msgid "Invalid symbol data; bad HP string table offset: %d"
 msgstr ""
 
-#: source.c:109
+#: source.c:107
 #, possible-c-format
 msgid "Number of source lines gdb will list by default is %s.\n"
 msgstr ""
 
-#: source.c:292
+#: source.c:290
 msgid "Can't find a default source file"
 msgstr ""
 
-#: source.c:392
+#: source.c:400
 msgid "Reinitialize source path to empty? "
 msgstr ""
 
-#: source.c:562
+#: source.c:570
 #, possible-c-format
 msgid "%s is not a directory."
 msgstr ""
 
-#: source.c:637
+#: source.c:645
 msgid "No current source file.\n"
 msgstr ""
 
-#: source.c:640
+#: source.c:648
 #, possible-c-format
 msgid "Current source file is %s\n"
 msgstr ""
 
-#: source.c:642
+#: source.c:650
 #, possible-c-format
 msgid "Compilation directory is %s\n"
 msgstr ""
 
-#: source.c:644
+#: source.c:652
 #, possible-c-format
 msgid "Located in %s\n"
 msgstr ""
 
-#: source.c:646
+#: source.c:654
 #, possible-c-format
 msgid "Contains %d line%s.\n"
 msgstr ""
 
-#: source.c:649
+#: source.c:657
 #, possible-c-format
 msgid "Source language is %s.\n"
 msgstr ""
 
-#: source.c:650
+#: source.c:658
 #, possible-c-format
 msgid "Compiled with %s debugging format.\n"
 msgstr ""
 
-#: source.c:651
+#: source.c:659
 #, possible-c-format
 msgid "%s preprocessor macro info.\n"
 msgstr ""
 
-#: source.c:1146
+#: source.c:1159
 msgid "Source file is more recent than executable."
 msgstr ""
 
-#: source.c:1389
+#: source.c:1341
 #, possible-c-format
 msgid "Line number %d out of range; %s has %d lines."
 msgstr ""
 
-#: source.c:1493
+#: source.c:1451
 msgid "No line number information available"
 msgstr ""
 
 #. Is there any case in which we get here, and have an address
 #. which the user would want to see?  If we have debugging symbols
 #. and no line numbers?
-#: source.c:1550
+#: source.c:1508
 #, possible-c-format
 msgid "Line number %d is out of range for \"%s\".\n"
 msgstr ""
 
-#: source.c:1586 source.c:1675
+#: source.c:1544 source.c:1633
 msgid "Expression not found"
 msgstr ""
 
-#: source.c:1643 source.c:1726
+#: source.c:1601 source.c:1684
 msgid "Expression not found\n"
 msgstr ""
 
-#: source.c:1836
+#: source.c:1794
 msgid "Too many arguments in command"
 msgstr ""
 
-#: source.c:1845
+#: source.c:1803
 #, possible-c-format
 msgid "Source path substitution rule matching `%s':\n"
 msgstr ""
 
-#: source.c:1847
+#: source.c:1805
 msgid "List of all source path substitution rules:\n"
 msgstr ""
 
-#: source.c:1871 source.c:1924
+#: source.c:1829 source.c:1882
 msgid "Incorrect usage, too many arguments in command"
 msgstr ""
 
-#: source.c:1881
+#: source.c:1839
 msgid "Delete all source path substitution rules? "
 msgstr ""
 
-#: source.c:1882
+#: source.c:1840
 msgid "Canceled"
 msgstr ""
 
-#: source.c:1904
+#: source.c:1862
 #, possible-c-format
 msgid "No substitution rule defined for `%s'"
 msgstr ""
 
-#: source.c:1921
+#: source.c:1879
 msgid "Incorrect usage, too few arguments in command"
 msgstr ""
 
-#: source.c:1927
+#: source.c:1885
 msgid "First argument must be at least one character long"
 msgstr ""
 
-#: source.c:1962
+#: source.c:1920
 msgid ""
 "Add directory DIR to beginning of search path for source files.\n"
 "Forget cached info on source file locations and line positions.\n"
@@ -20105,15 +20966,15 @@
 "With no argument, reset the search path to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1978
+#: source.c:1936
 msgid "Set the search path for finding source files."
 msgstr ""
 
-#: source.c:1980
+#: source.c:1938
 msgid "Show the search path for finding source files."
 msgstr ""
 
-#: source.c:1982
+#: source.c:1940
 msgid ""
 "$cwd in the path means the current working directory.\n"
 "$cdir in the path means the compilation directory of the source file.\n"
@@ -20122,18 +20983,18 @@
 "Setting the value to an empty string sets it to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1995
+#: source.c:1953
 msgid ""
 "Current search path for finding source files.\n"
 "$cwd in the path means the current working directory.\n"
 "$cdir in the path means the compilation directory of the source file."
 msgstr ""
 
-#: source.c:2003
+#: source.c:1961
 msgid "Information about the current source file."
 msgstr ""
 
-#: source.c:2005
+#: source.c:1963
 msgid ""
 "Core addresses of the code for a source line.\n"
 "Line can be specified as\n"
@@ -20148,28 +21009,28 @@
 "The address is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:2017
+#: source.c:1975
 msgid ""
 "Search for regular expression (see regex(3)) from last line listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:2022
+#: source.c:1980
 msgid ""
 "Search backward for regular expression (see regex(3)) from last line "
 "listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:2033
+#: source.c:1991
 msgid "Set number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:2034
+#: source.c:1992
 msgid "Show number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:2041
+#: source.c:1999
 msgid ""
 "Usage: set substitute-path FROM TO\n"
 "Add a substitution rule replacing FROM into TO in source file names.\n"
@@ -20177,7 +21038,7 @@
 "is replaced by the new one."
 msgstr ""
 
-#: source.c:2049
+#: source.c:2007
 msgid ""
 "Usage: unset substitute-path [FROM]\n"
 "Delete the rule for substituting FROM in source file names.  If FROM\n"
@@ -20185,329 +21046,329 @@
 "If the debugger cannot find a rule for FROM, it will display a warning."
 msgstr ""
 
-#: source.c:2057
+#: source.c:2015
 msgid ""
 "Usage: show substitute-path [FROM]\n"
 "Print the rule for substituting FROM in source file names. If FROM\n"
 "is not specified, print all substitution rules."
 msgstr ""
 
-#: sparc-nat.c:233
+#: sparc-nat.c:234
 msgid "Couldn't get floating-point registers"
 msgstr ""
 
-#: sparc-nat.c:246
+#: sparc-nat.c:247
 msgid "Couldn't write floating-point registers"
 msgstr ""
 
-#: sparc-nat.c:294
+#: sparc-nat.c:295
 msgid "Couldn't get StackGhost cookie"
 msgstr ""
 
-#: spu-linux-nat.c:460
+#: spu-linux-nat.c:459
 #, possible-c-format
 msgid "Child process unexpectedly missing: %s"
 msgstr ""
 
-#: spu-tdep.c:1607 spu-tdep.c:1611
+#: spu-tdep.c:1614 spu-tdep.c:1618
 msgid "Could not determine address of single-step breakpoint."
 msgstr ""
 
-#: spu-tdep.c:2029 spu-tdep.c:2086 spu-tdep.c:2207 spu-tdep.c:2448
-#: spu-tdep.c:2527
+#: spu-tdep.c:2036 spu-tdep.c:2093 spu-tdep.c:2214 spu-tdep.c:2456
+#: spu-tdep.c:2535
 msgid "\"info spu\" is only supported on the SPU architecture."
 msgstr ""
 
-#: spu-tdep.c:2037
+#: spu-tdep.c:2044
 msgid "Could not read event_status."
 msgstr ""
 
-#: spu-tdep.c:2045
+#: spu-tdep.c:2052
 msgid "Could not read event_mask."
 msgstr ""
 
-#: spu-tdep.c:2060
+#: spu-tdep.c:2067
 #, possible-c-format
 msgid "Event Status 0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2061
+#: spu-tdep.c:2068
 #, possible-c-format
 msgid "Event Mask   0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2093
+#: spu-tdep.c:2100
 msgid "Could not read signal1."
 msgstr ""
 
-#: spu-tdep.c:2104
+#: spu-tdep.c:2111
 msgid "Could not read signal1_type."
 msgstr ""
 
-#: spu-tdep.c:2111
+#: spu-tdep.c:2118
 msgid "Could not read signal2."
 msgstr ""
 
-#: spu-tdep.c:2122
+#: spu-tdep.c:2129
 msgid "Could not read signal2_type."
 msgstr ""
 
-#: spu-tdep.c:2140
+#: spu-tdep.c:2147
 #, possible-c-format
 msgid "Signal 1 control word 0x%s "
 msgstr ""
 
-#: spu-tdep.c:2142
+#: spu-tdep.c:2149
 msgid "Signal 1 not pending "
 msgstr ""
 
-#: spu-tdep.c:2145 spu-tdep.c:2155
+#: spu-tdep.c:2152 spu-tdep.c:2162
 msgid "(Type Or)\n"
 msgstr ""
 
-#: spu-tdep.c:2147 spu-tdep.c:2157
+#: spu-tdep.c:2154 spu-tdep.c:2164
 msgid "(Type Overwrite)\n"
 msgstr ""
 
-#: spu-tdep.c:2150
+#: spu-tdep.c:2157
 #, possible-c-format
 msgid "Signal 2 control word 0x%s "
 msgstr ""
 
-#: spu-tdep.c:2152
+#: spu-tdep.c:2159
 msgid "Signal 2 not pending "
 msgstr ""
 
-#: spu-tdep.c:2217
+#: spu-tdep.c:2224
 msgid "Could not read mbox_info."
 msgstr ""
 
-#: spu-tdep.c:2226
+#: spu-tdep.c:2233
 msgid "Could not read ibox_info."
 msgstr ""
 
-#: spu-tdep.c:2235
+#: spu-tdep.c:2242
 msgid "Could not read wbox_info."
 msgstr ""
 
-#: spu-tdep.c:2456
+#: spu-tdep.c:2464
 msgid "Could not read dma_info."
 msgstr ""
 
-#: spu-tdep.c:2486 spu-tdep.c:2558
+#: spu-tdep.c:2494 spu-tdep.c:2567
 msgid "no query pending"
 msgstr ""
 
-#: spu-tdep.c:2491 spu-tdep.c:2559
+#: spu-tdep.c:2499 spu-tdep.c:2568
 msgid "'any' query pending"
 msgstr ""
 
-#: spu-tdep.c:2492 spu-tdep.c:2560
+#: spu-tdep.c:2500 spu-tdep.c:2569
 msgid "'all' query pending"
 msgstr ""
 
-#: spu-tdep.c:2493 spu-tdep.c:2561
+#: spu-tdep.c:2501 spu-tdep.c:2570
 msgid "undefined query type"
 msgstr ""
 
-#: spu-tdep.c:2496 spu-tdep.c:2564
+#: spu-tdep.c:2504 spu-tdep.c:2573
 #, possible-c-format
 msgid "Tag-Group Status  0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2498 spu-tdep.c:2566
+#: spu-tdep.c:2506 spu-tdep.c:2575
 #, possible-c-format
 msgid "Tag-Group Mask    0x%s (%s)\n"
 msgstr ""
 
-#: spu-tdep.c:2500
+#: spu-tdep.c:2508
 #, possible-c-format
 msgid "Stall-and-Notify  0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2502
+#: spu-tdep.c:2510
 #, possible-c-format
 msgid "Atomic Cmd Status 0x%s\n"
 msgstr ""
 
-#: spu-tdep.c:2535
+#: spu-tdep.c:2543
 msgid "Could not read proxydma_info."
 msgstr ""
 
-#: spu-tdep.c:2578
+#: spu-tdep.c:2587
 msgid "\"info spu\" must be followed by the name of an SPU facility.\n"
 msgstr ""
 
-#: spu-tdep.c:2602
+#: spu-tdep.c:2611
 #, possible-c-format
 msgid "Stopping for new SPE threads is %s.\n"
 msgstr ""
 
-#: spu-tdep.c:2610
+#: spu-tdep.c:2619
 #, possible-c-format
 msgid "Automatic software-cache flush is %s.\n"
 msgstr ""
 
-#: spu-tdep.c:2751 spu-tdep.c:2754 spu-tdep.c:2789
+#: spu-tdep.c:2760 spu-tdep.c:2763 spu-tdep.c:2798
 msgid "Various SPU specific commands."
 msgstr ""
 
-#: spu-tdep.c:2760
+#: spu-tdep.c:2769
 msgid "Set whether to stop for new SPE threads."
 msgstr ""
 
-#: spu-tdep.c:2762
+#: spu-tdep.c:2771
 msgid "Show whether to stop for new SPE threads."
 msgstr ""
 
-#: spu-tdep.c:2764
+#: spu-tdep.c:2773
 msgid ""
 "Use \"on\" to give control to the user when a new SPE thread\n"
 "enters its \"main\" function.\n"
 "Use \"off\" to disable stopping for new SPE threads."
 msgstr ""
 
-#: spu-tdep.c:2775
+#: spu-tdep.c:2784
 msgid "Set whether to automatically flush the software-managed cache."
 msgstr ""
 
-#: spu-tdep.c:2777
+#: spu-tdep.c:2786
 msgid "Show whether to automatically flush the software-managed cache."
 msgstr ""
 
-#: spu-tdep.c:2779
+#: spu-tdep.c:2788
 msgid ""
 "Use \"on\" to automatically flush the software-managed cache\n"
 "whenever SPE execution stops.\n"
 "Use \"off\" to never automatically flush the software-managed cache."
 msgstr ""
 
-#: spu-tdep.c:2794
+#: spu-tdep.c:2803
 msgid "Display SPU event facility status.\n"
 msgstr ""
 
-#: spu-tdep.c:2797
+#: spu-tdep.c:2806
 msgid "Display SPU signal notification facility status.\n"
 msgstr ""
 
-#: spu-tdep.c:2800
+#: spu-tdep.c:2809
 msgid "Display SPU mailbox facility status.\n"
 msgstr ""
 
-#: spu-tdep.c:2803
+#: spu-tdep.c:2812
 msgid "Display MFC DMA status.\n"
 msgstr ""
 
-#: spu-tdep.c:2806
+#: spu-tdep.c:2815
 msgid "Display MFC Proxy-DMA status.\n"
 msgstr ""
 
-#: stabsread.c:167
+#: stabsread.c:166
 #, possible-c-format
 msgid "invalid C++ abbreviation `%s'"
 msgstr ""
 
-#: stabsread.c:174
+#: stabsread.c:173
 #, possible-c-format
 msgid "register number %d too large (max %d) in symbol %s"
 msgstr ""
 
-#: stabsread.c:236
+#: stabsread.c:235
 #, possible-c-format
 msgid ""
 "Invalid symbol data: type number (%d,%d) out of range at symtab pos %d."
 msgstr ""
 
-#: stabsread.c:288
+#: stabsread.c:287
 msgid "GDB internal error: bad real_filenum"
 msgstr ""
 
-#: stabsread.c:642
+#: stabsread.c:641
 #, possible-c-format
 msgid "Bad stabs string '%s'"
 msgstr ""
 
-#: stabsread.c:706
+#: stabsread.c:705
 #, possible-c-format
 msgid "Unknown C++ symbol name `%s'"
 msgstr ""
 
-#: stabsread.c:1477
+#: stabsread.c:1476
 msgid "couldn't parse type; debugger out of date?"
 msgstr ""
 
-#: stabsread.c:1598
+#: stabsread.c:1597
 #, possible-c-format
 msgid "Unrecognized cross-reference type `%c'"
 msgstr ""
 
-#: stabsread.c:1826
+#: stabsread.c:1825
 #, possible-c-format
 msgid ""
 "Prototyped function type didn't end arguments with `#':\n"
 "%s"
 msgstr ""
 
-#: stabsread.c:1939
+#: stabsread.c:1938
 #, possible-c-format
 msgid "invalid (minimal) member type data format at symtab pos %d."
 msgstr ""
 
-#: stabsread.c:2045
+#: stabsread.c:2044
 msgid "GDB internal error, type is NULL in stabsread.c."
 msgstr ""
 
-#: stabsread.c:2073
+#: stabsread.c:2072
 #, possible-c-format
 msgid "Unknown builtin type %d"
 msgstr ""
 
-#: stabsread.c:2248
+#: stabsread.c:2247
 #, possible-c-format
 msgid "Method has bad physname %s\n"
 msgstr ""
 
-#: stabsread.c:2447
+#: stabsread.c:2446
 #, possible-c-format
 msgid "const/volatile indicator missing, got '%c'"
 msgstr ""
 
-#: stabsread.c:2531
+#: stabsread.c:2530
 #, possible-c-format
 msgid "member function type missing, got '%c'"
 msgstr ""
 
-#: stabsread.c:2800
+#: stabsread.c:2799
 #, possible-c-format
 msgid "C++ abbreviated type name unknown at symtab pos %d"
 msgstr ""
 
-#: stabsread.c:3161
+#: stabsread.c:3160
 #, possible-c-format
 msgid "Unknown virtual character `%c' for baseclass"
 msgstr ""
 
-#: stabsread.c:3179
+#: stabsread.c:3178
 #, possible-c-format
 msgid "Unknown visibility `%c' for baseclass"
 msgstr ""
 
-#: stabsread.c:3288
+#: stabsread.c:3287
 #, possible-c-format
 msgid "virtual function table pointer not found when defining class `%s'"
 msgstr ""
 
-#: stabsread.c:3401
+#: stabsread.c:3400
 #, possible-c-format
 msgid "Unknown visibility `%c' for field"
 msgstr ""
 
-#: stabsread.c:3443
+#: stabsread.c:3442
 #, possible-c-format
 msgid "struct/union type gets multiply defined: %s%s"
 msgstr ""
 
-#: stabsread.c:4246
+#: stabsread.c:4245
 #, possible-c-format
 msgid "base type %d of range type is not defined"
 msgstr ""
@@ -20516,102 +21377,102 @@
 #. output contained `(0,41),(0,42)=@s8;-16;,(0,43),(0,1);' where should
 #. have been present ";-16,(0,43)" reference instead.  This way the
 #. excessive ";" marker prematurely stops the parameters parsing.
-#: stabsread.c:4286
+#: stabsread.c:4285
 msgid "Invalid (empty) method arguments"
 msgstr ""
 
-#: stabsread.c:4330
+#: stabsread.c:4329
 msgid "Invalid symbol data: common block within common block"
 msgstr ""
 
-#: stabsread.c:4356
+#: stabsread.c:4355
 msgid "ECOMM symbol unmatched by BCOMM"
 msgstr ""
 
-#: stabsread.c:4560
+#: stabsread.c:4559
 msgid "need a type name"
 msgstr ""
 
-#: stabsread.c:4587
+#: stabsread.c:4586
 #, possible-c-format
 msgid "forward-referenced types left unresolved, type code %d."
 msgstr ""
 
-#: stabsread.c:4738
+#: stabsread.c:4737
 #, possible-c-format
 msgid "%s: common block `%s' from global_sym_chain unresolved"
 msgstr ""
 
-#: stabsread.c:4819 stabsread.c:4824
+#: stabsread.c:4818 stabsread.c:4823
 #, possible-c-format
 msgid "invalid symbol name \"%s\""
 msgstr ""
 
-#: stack.c:470
+#: stack.c:717
 #, possible-c-format
 msgid "Debugger's willingness to use disassemble-next-line is %s.\n"
 msgstr ""
 
-#: stack.c:927 stack.c:1007
+#: stack.c:1265 stack.c:1345
 msgid "Too many args in frame specification"
 msgstr ""
 
-#: stack.c:1094
+#: stack.c:1432
 #, possible-c-format
 msgid "Stack level %d, frame at "
 msgstr ""
 
-#: stack.c:1099
+#: stack.c:1437
 msgid "Stack frame at "
 msgstr ""
 
-#: stack.c:1134
+#: stack.c:1472
 #, possible-c-format
 msgid " Outermost frame: %s\n"
 msgstr ""
 
-#: stack.c:1392
+#: stack.c:1732
 msgid "(More stack frames follow...)\n"
 msgstr ""
 
-#: stack.c:1402
+#: stack.c:1742
 #, possible-c-format
 msgid "Backtrace stopped: %s\n"
 msgstr ""
 
-#: stack.c:1637
+#: stack.c:1947
 msgid "PC unavailable, cannot determine locals.\n"
 msgstr ""
 
-#: stack.c:1658
+#: stack.c:1968
 msgid "No locals.\n"
 msgstr ""
 
-#: stack.c:1694
+#: stack.c:2004
 msgid "blockvector blotch"
 msgstr ""
 
-#: stack.c:1696
+#: stack.c:2006
 msgid "blockvector botch"
 msgstr ""
 
-#: stack.c:1733
+#: stack.c:2043
 msgid "No catches.\n"
 msgstr ""
 
-#: stack.c:1796
+#: stack.c:2106
 msgid "PC unavailable, cannot determine args.\n"
 msgstr ""
 
-#: stack.c:1803
+#: stack.c:2113
 msgid "No symbol table info available.\n"
 msgstr ""
 
-#: stack.c:1816
+#: stack.c:2126
 msgid "No arguments.\n"
 msgstr ""
 
-#: stack.c:1945
+#: stack.c:2255
 msgid "Initial frame selected; you cannot go up."
 msgstr ""
 
@@ -20619,40 +21480,40 @@
 #. "down" means to really go down (and let me know if that is
 #. impossible), but "down 9999" can be used to mean go all the
 #. way down without getting an error.
-#: stack.c:1982
+#: stack.c:2292
 msgid "Bottom (innermost) frame selected; you cannot go down."
 msgstr ""
 
-#: stack.c:2016
+#: stack.c:2326
 msgid "Can not force return from an inlined function."
 msgstr ""
 
-#: stack.c:2039
+#: stack.c:2349
 msgid ""
 "Return value type not available for selected stack frame.\n"
 "Please use an explicit cast of the value to return."
 msgstr ""
 
-#: stack.c:2080
+#: stack.c:2390
 #, possible-c-format
 msgid "%sMake selected stack frame return now? "
 msgstr ""
 
-#: stack.c:2083
+#: stack.c:2393
 #, possible-c-format
 msgid "%sMake %s return now? "
 msgstr ""
 
-#: stack.c:2086
+#: stack.c:2396
 msgid "Not confirmed"
 msgstr ""
 
-#: stack.c:2172
+#: stack.c:2486
 #, possible-c-format
 msgid "'%s' not within current stack frame.\n"
 msgstr ""
 
-#: stack.c:2226
+#: stack.c:2540
 msgid ""
 "Make selected stack frame return to its caller.\n"
 "Control remains in the debugger, but when you continue\n"
@@ -20660,31 +21521,31 @@
 "If an argument is given, it is an expression for the value to return."
 msgstr ""
 
-#: stack.c:2232
+#: stack.c:2546
 msgid ""
 "Select and print stack frame that called this one.\n"
 "An argument says how many frames up to go."
 msgstr ""
 
-#: stack.c:2235
+#: stack.c:2549
 msgid ""
 "Same as the `up' command, but does not print anything.\n"
 "This is useful in command scripts."
 msgstr ""
 
-#: stack.c:2239
+#: stack.c:2553
 msgid ""
 "Select and print stack frame called by this one.\n"
 "An argument says how many frames down to go."
 msgstr ""
 
-#: stack.c:2244
+#: stack.c:2558
 msgid ""
 "Same as the `down' command, but does not print anything.\n"
 "This is useful in command scripts."
 msgstr ""
 
-#: stack.c:2248
+#: stack.c:2562
 msgid ""
 "Select and print a stack frame.\n"
 "With no argument, print the selected stack frame.  (See also \"info "
@@ -20695,25 +21556,25 @@
 "a command file or a user-defined command."
 msgstr ""
 
-#: stack.c:2261
+#: stack.c:2575
 msgid "Print the current stack frame.\n"
 msgstr ""
 
-#: stack.c:2264
+#: stack.c:2578
 msgid ""
 "Select a stack frame without printing anything.\n"
 "An argument specifies the frame to select.\n"
 "It can be a stack frame number or the address of the frame.\n"
 msgstr ""
 
-#: stack.c:2269
+#: stack.c:2583
 msgid ""
 "Print backtrace of all stack frames, or innermost COUNT frames.\n"
 "With a negative argument, print outermost -COUNT frames.\n"
 "Use of the 'full' qualifier also prints the values of the local variables.\n"
 msgstr ""
 
-#: stack.c:2277
+#: stack.c:2591
 msgid ""
 "Print backtrace of all stack frames, or innermost COUNT frames\n"
 "and the values of the local variables.\n"
@@ -20721,55 +21582,55 @@
 "Usage: T <count>\n"
 msgstr ""
 
-#: stack.c:2286
+#: stack.c:2600
 msgid "Backtrace of the stack, or innermost COUNT frames."
 msgstr ""
 
-#: stack.c:2289
+#: stack.c:2603
 msgid "All about selected stack frame, or frame at ADDR."
 msgstr ""
 
-#: stack.c:2292
+#: stack.c:2606
 msgid "Local variables of current stack frame."
 msgstr ""
 
-#: stack.c:2294
+#: stack.c:2608
 msgid "Argument variables of current stack frame."
 msgstr ""
 
-#: stack.c:2297
+#: stack.c:2611
 msgid "Argument and local variables of current stack frame."
 msgstr ""
 
-#: stack.c:2300
+#: stack.c:2614
 msgid ""
 "Select the stack frame that contains <func>.\n"
 "Usage: func <name>\n"
 msgstr ""
 
-#: stack.c:2305
+#: stack.c:2619
 msgid "Exceptions that can be caught in the current stack frame."
 msgstr ""
 
-#: stack.c:2309
+#: stack.c:2623
 msgid "Set printing of non-scalar frame arguments"
 msgstr ""
 
-#: stack.c:2310
+#: stack.c:2624
 msgid "Show printing of non-scalar frame arguments"
 msgstr ""
 
-#: stack.c:2314
+#: stack.c:2628
 msgid ""
 "Set whether to disassemble next source line or insn when execution stops."
 msgstr ""
 
-#: stack.c:2316
+#: stack.c:2630
 msgid ""
 "Show whether to disassemble next source line or insn when execution stops."
 msgstr ""
 
-#: stack.c:2318
+#: stack.c:2632
 msgid ""
 "If ON, GDB will display disassembly of the next source line, in addition\n"
 "to displaying the source line itself.  If the next source line cannot\n"
@@ -20782,121 +21643,104 @@
 "source line."
 msgstr ""
 
-#: std-regs.c:83
-msgid "Standard register ``$sp'' is not available for this target"
-msgstr ""
-
-#: std-regs.c:93
-msgid "Standard register ``$ps'' is not available for this target"
-msgstr ""
-
-#: symfile-mem.c:77
-msgid "add-symbol-file-from-memory not supported for this target"
-msgstr ""
-
-#: symfile-mem.c:82
-msgid "Failed to read a valid object file image from memory."
-msgstr ""
-
-#: symfile-mem.c:95
-#, possible-c-format
-msgid "Got object file from memory but can't read symbols: %s."
+#: stack.c:2649
+msgid "Set printing of function arguments at function entry"
 msgstr ""
 
-#: symfile-mem.c:128
-msgid "add-symbol-file-from-memory requires an expression argument"
+#: stack.c:2651
+msgid "Show printing of function arguments at function entry"
 msgstr ""
 
-#: symfile-mem.c:138
-msgid "Must use symbol-file or exec-file before add-symbol-file-from-memory."
+#: stack.c:2653
+msgid ""
+"GDB can sometimes determine the values of function arguments at entry,\n"
+"in addition to their current values.  This option tells GDB whether\n"
+"to print the current value, the value at entry (marked as val@entry),\n"
+"or both.  Note that one or both of these values may be <optimized out>."
 msgstr ""
 
-#: symfile-mem.c:193
-msgid ""
-"Could not load vsyscall page because no executable was specified\n"
-"try using the \"file\" command first."
+#: std-regs.c:82
+msgid "Standard register ``$sp'' is not available for this target"
 msgstr ""
 
-#: symfile-mem.c:221
-msgid ""
-"Load the symbols out of memory from a dynamically loaded object file.\n"
-"Give an expression for the address of the file's shared object file header."
+#: std-regs.c:92
+msgid "Standard register ``$ps'' is not available for this target"
 msgstr ""
 
-#: symfile.c:163
+#: symfile.c:162
 #, possible-c-format
 msgid "Dynamic symbol table reloading multiple times in one run is %s.\n"
 msgstr ""
 
-#: symfile.c:618
+#: symfile.c:614
 #, possible-c-format
 msgid "no loadable sections found in added symbol-file %s"
 msgstr ""
 
-#: symfile.c:733
+#: symfile.c:729
 #, possible-c-format
 msgid "section %s not found in %s"
 msgstr ""
 
-#: symfile.c:1103
+#: symfile.c:1102
 #, possible-c-format
 msgid "Load new symbol table from \"%s\"? "
 msgstr ""
 
-#: symfile.c:1135
+#: symfile.c:1137
 msgid "expanding to full symbols..."
 msgstr ""
 
-#: symfile.c:1266
+#: symfile.c:1265
 #, possible-c-format
 msgid "Discard symbol table from `%s'? "
 msgstr ""
 
-#: symfile.c:1268
+#: symfile.c:1267
 msgid "Discard symbol table? "
 msgstr ""
 
-#: symfile.c:1279
+#: symfile.c:1278
 msgid "No symbol file now.\n"
 msgstr ""
 
-#: symfile.c:1323 symfile.c:1336
+#: symfile.c:1322 symfile.c:1335
 #, possible-c-format
 msgid "Problem reading \"%s\" for CRC: %s"
 msgstr ""
 
-#: symfile.c:1420
+#: symfile.c:1419
 #, possible-c-format
 msgid ""
 "the debug information found in \"%s\" does not match \"%s\" (CRC mismatch).\n"
 msgstr ""
 
-#: symfile.c:1436
+#: symfile.c:1435
 #, possible-c-format
 msgid ""
 "The directory where separate debug symbols are searched for is \"%s\".\n"
 msgstr ""
 
-#: symfile.c:1597 tracepoint.c:2863
+#: symfile.c:1596 tracepoint.c:3127
 #, possible-c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: symfile.c:1608
+#: symfile.c:1607
 msgid "no symbol file name was specified"
 msgstr ""
 
-#: symfile.c:1796
+#: symfile.c:1795
 #, possible-c-format
 msgid "I'm sorry, Dave, I can't do that.  Symbol format `%s' unknown."
 msgstr ""
 
-#: symfile.c:1943
+#: symfile.c:1942
 #, possible-c-format
 msgid "Download verify read failed at %s"
 msgstr ""
 
-#: symfile.c:1946
+#: symfile.c:1945
 #, possible-c-format
 msgid "Download verify compare failed at %s"
 msgstr ""
@@ -20918,17 +21762,17 @@
 msgid "Load failed"
 msgstr ""
 
-#: symfile.c:2246
+#: symfile.c:2247
 msgid "add-symbol-file takes a file name and an address"
 msgstr ""
 
-#: symfile.c:2313
+#: symfile.c:2314
 msgid ""
-"USAGE: add-symbol-file <filename> <textaddress> [-mapped] [-readnow] [-s "
-"<secname> <addr>]*"
+"USAGE: add-symbol-file <filename> <textaddress> [-readnow] [-s <secname> "
+"<addr>]*"
 msgstr ""
 
-#: symfile.c:2324
+#: symfile.c:2325
 #, possible-c-format
 msgid "The address where %s has been loaded is missing"
 msgstr ""
@@ -20938,125 +21782,125 @@
 #. functions.  We have to split this up into separate print
 #. statements because hex_string returns a local static
 #. string.
-#: symfile.c:2332
+#: symfile.c:2333
 #, possible-c-format
 msgid "add symbol table from file \"%s\" at\n"
 msgstr ""
 
 #. FIXME, should use print_sys_errmsg but it's not filtered.
-#: symfile.c:2408
+#: symfile.c:2409
 #, possible-c-format
 msgid "`%s' has disappeared; keeping its symbols.\n"
 msgstr ""
 
-#: symfile.c:2420
+#: symfile.c:2421
 #, possible-c-format
 msgid "`%s' has changed; re-reading symbols.\n"
 msgstr ""
 
-#: symfile.c:2451
+#: symfile.c:2475
 #, possible-c-format
 msgid "Can't close BFD for %s: %s"
 msgstr ""
 
-#: symfile.c:2455
+#: symfile.c:2479
 #, possible-c-format
 msgid "Can't open %s to read symbols."
 msgstr ""
 
-#: symfile.c:2460
+#: symfile.c:2484
 #, possible-c-format
 msgid "Can't read symbols from %s: %s."
 msgstr ""
 
-#: symfile.c:2577
+#: symfile.c:2576
 msgid "(no debugging symbols found)\n"
 msgstr ""
 
-#: symfile.c:2647
+#: symfile.c:2646
 #, possible-c-format
 msgid "Mapping between filename extension and source language is \"%s\".\n"
 msgstr ""
 
-#: symfile.c:2661
+#: symfile.c:2660
 #, possible-c-format
 msgid "'%s': Filename extension must begin with '.'"
 msgstr ""
 
-#: symfile.c:2668 symfile.c:2680
+#: symfile.c:2667 symfile.c:2679
 #, possible-c-format
 msgid "'%s': two arguments required -- filename extension and language"
 msgstr ""
 
-#: symfile.c:2716
+#: symfile.c:2715
 msgid "Filename extensions and the languages they represent:"
 msgstr ""
 
-#: symfile.c:3197
+#: symfile.c:3196
 msgid "No sections are mapped.\n"
 msgstr ""
 
-#: symfile.c:3210 symfile.c:3255
+#: symfile.c:3209 symfile.c:3254
 msgid ""
 "Overlay debugging not enabled.  Use either the 'overlay auto' or\n"
 "the 'overlay manual' command."
 msgstr ""
 
-#: symfile.c:3215 symfile.c:3260
+#: symfile.c:3214 symfile.c:3259
 msgid "Argument required: name of an overlay section"
 msgstr ""
 
-#: symfile.c:3234
+#: symfile.c:3233
 #, possible-c-format
 msgid "Note: section %s unmapped by overlap\n"
 msgstr ""
 
-#: symfile.c:3241 symfile.c:3271
+#: symfile.c:3240 symfile.c:3270
 #, possible-c-format
 msgid "No overlay section called %s"
 msgstr ""
 
-#: symfile.c:3267
+#: symfile.c:3266
 #, possible-c-format
 msgid "Section %s is not mapped"
 msgstr ""
 
-#: symfile.c:3284
+#: symfile.c:3283
 msgid "Automatic overlay debugging enabled."
 msgstr ""
 
-#: symfile.c:3297
+#: symfile.c:3296
 msgid "Overlay debugging enabled."
 msgstr ""
 
-#: symfile.c:3310
+#: symfile.c:3309
 msgid "Overlay debugging disabled."
 msgstr ""
 
-#: symfile.c:3321
+#: symfile.c:3320
 msgid "This target does not know how to read its overlay state."
 msgstr ""
 
-#: symfile.c:3421
+#: symfile.c:3420
 msgid ""
 "Error reading inferior's overlay table: couldn't find `_novlys' variable\n"
 "in inferior.  Use `overlay manual' mode."
 msgstr ""
 
-#: symfile.c:3430 symfile.c:3516
+#: symfile.c:3429 symfile.c:3515
 msgid ""
 "Error reading inferior's overlay table: couldn't find `_ovly_table' array\n"
 "in inferior.  Use `overlay manual' mode."
 msgstr ""
 
-#: symfile.c:3735
+#: symfile.c:3734
 msgid ""
 "Load symbol table from executable file FILE.\n"
 "The `file' command can also load symbol tables, as well as setting the file\n"
 "to execute."
 msgstr ""
 
-#: symfile.c:3741
+#: symfile.c:3740
 msgid ""
 "Load symbols from FILE, assuming FILE has been dynamically loaded.\n"
 "Usage: add-symbol-file FILE ADDR [-s <SECT> <SECT_ADDR> -s <SECT> "
@@ -21067,179 +21911,219 @@
 "with the text.  SECT is a section name to be loaded at SECT_ADDR."
 msgstr ""
 
-#: symfile.c:3751
+#: symfile.c:3750
 msgid ""
 "Dynamically load FILE into the running program, and record its symbols\n"
 "for access from GDB.\n"
 "A load OFFSET may also be given."
 msgstr ""
 
-#: symfile.c:3758
+#: symfile.c:3757
 msgid "Set dynamic symbol table reloading multiple times in one run."
 msgstr ""
 
-#: symfile.c:3759
+#: symfile.c:3758
 msgid "Show dynamic symbol table reloading multiple times in one run."
 msgstr ""
 
-#: symfile.c:3766
+#: symfile.c:3765
 msgid "Commands for debugging overlays."
 msgstr ""
 
-#: symfile.c:3773
+#: symfile.c:3772
 msgid "Assert that an overlay section is mapped."
 msgstr ""
 
-#: symfile.c:3776
+#: symfile.c:3775
 msgid "Assert that an overlay section is unmapped."
 msgstr ""
 
-#: symfile.c:3779
+#: symfile.c:3778
 msgid "List mappings of overlay sections."
 msgstr ""
 
-#: symfile.c:3782
+#: symfile.c:3781
 msgid "Enable overlay debugging."
 msgstr ""
 
-#: symfile.c:3784
+#: symfile.c:3783
 msgid "Disable overlay debugging."
 msgstr ""
 
-#: symfile.c:3786
+#: symfile.c:3785
 msgid "Enable automatic overlay debugging."
 msgstr ""
 
-#: symfile.c:3788
+#: symfile.c:3787
 msgid "Read the overlay mapping state from the target."
 msgstr ""
 
-#: symfile.c:3793
+#: symfile.c:3792
 msgid "Set mapping between filename extension and source language."
 msgstr ""
 
-#: symfile.c:3794
+#: symfile.c:3793
 msgid "Show mapping between filename extension and source language."
 msgstr ""
 
-#: symfile.c:3795
+#: symfile.c:3794
 msgid "Usage: set extension-language .foo bar"
 msgstr ""
 
-#: symfile.c:3802
+#: symfile.c:3801
 msgid "All filename extensions associated with a source language."
 msgstr ""
 
-#: symfile.c:3805
+#: symfile.c:3804
 msgid "Set the directories where separate debug symbols are searched for."
 msgstr ""
 
-#: symfile.c:3806
+#: symfile.c:3805
 msgid "Show the directories where separate debug symbols are searched for."
 msgstr ""
 
-#: symfile.c:3807
+#: symfile.c:3806
 msgid ""
 "Separate debug symbols are first searched for in the same\n"
 "directory as the binary, then in the `"
 msgstr ""
 
-#: symmisc.c:133
+#: symfile.c:3808
+msgid ""
+"' subdirectory,\n"
+"and lastly at the path of the directory of the binary with\n"
+"each global debug-file-directory component prepended."
+msgstr ""
+
+#: symfile-mem.c:77
+msgid "add-symbol-file-from-memory not supported for this target"
+msgstr ""
+
+#: symfile-mem.c:82
+msgid "Failed to read a valid object file image from memory."
+msgstr ""
+
+#: symfile-mem.c:95
+#, possible-c-format
+msgid "Got object file from memory but can't read symbols: %s."
+msgstr ""
+
+#: symfile-mem.c:129
+msgid "add-symbol-file-from-memory requires an expression argument"
+msgstr ""
+
+#: symfile-mem.c:139
+msgid "Must use symbol-file or exec-file before add-symbol-file-from-memory."
+msgstr ""
+
+#: symfile-mem.c:194
+msgid ""
+"Could not load vsyscall page because no executable was specified\n"
+"try using the \"file\" command first."
+msgstr ""
+
+#: symfile-mem.c:222
+msgid ""
+"Load the symbols out of memory from a dynamically loaded object file.\n"
+"Give an expression for the address of the file's shared object file header."
+msgstr ""
+
+#: symmisc.c:92
 #, possible-c-format
 msgid "Byte cache statistics for '%s':\n"
 msgstr ""
 
-#: symmisc.c:154
+#: symmisc.c:113
 #, possible-c-format
 msgid "Statistics for '%s':\n"
 msgstr ""
 
-#: symmisc.c:156
+#: symmisc.c:115
 #, possible-c-format
 msgid "  Number of \"stab\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:159
+#: symmisc.c:118
 #, possible-c-format
 msgid "  Number of \"minimal\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:162
+#: symmisc.c:121
 #, possible-c-format
 msgid "  Number of \"partial\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:165
+#: symmisc.c:124
 #, possible-c-format
 msgid "  Number of \"full\" symbols read: %d\n"
 msgstr ""
 
-#: symmisc.c:168
+#: symmisc.c:127
 #, possible-c-format
 msgid "  Number of \"types\" defined: %d\n"
 msgstr ""
 
-#: symmisc.c:181
+#: symmisc.c:140
 #, possible-c-format
 msgid "  Number of symbol tables: %d\n"
 msgstr ""
 
-#: symmisc.c:182
+#: symmisc.c:141
 #, possible-c-format
 msgid "  Number of symbol tables with line tables: %d\n"
 msgstr ""
 
-#: symmisc.c:184
+#: symmisc.c:143
 #, possible-c-format
 msgid "  Number of symbol tables with blockvectors: %d\n"
 msgstr ""
 
-#: symmisc.c:188
+#: symmisc.c:147
 #, possible-c-format
 msgid "  Space used by a.out string tables: %d\n"
 msgstr ""
 
-#: symmisc.c:190
+#: symmisc.c:149
 #, possible-c-format
 msgid "  Total memory used for objfile obstack: %d\n"
 msgstr ""
 
-#: symmisc.c:192
+#: symmisc.c:151
 #, possible-c-format
 msgid "  Total memory used for psymbol cache: %d\n"
 msgstr ""
 
-#: symmisc.c:195
+#: symmisc.c:154
 #, possible-c-format
 msgid "  Total memory used for macro cache: %d\n"
 msgstr ""
 
-#: symmisc.c:197
+#: symmisc.c:156
 #, possible-c-format
 msgid "  Total memory used for file name cache: %d\n"
 msgstr ""
 
-#: symmisc.c:315
+#: symmisc.c:274
 #, possible-c-format
 msgid "internal error:  minimal symbol count %d != %d"
 msgstr ""
 
-#: symmisc.c:456
+#: symmisc.c:415
 msgid ""
 "Arguments missing: an output file name and an optional symbol file name"
 msgstr ""
 
-#: symmisc.c:676
+#: symmisc.c:635
 msgid ""
 "print-msymbols takes an output file name and optional symbol file name"
 msgstr ""
 
-#: symtab.c:1156
+#: symtab.c:1249
 #, possible-c-format
 msgid "Internal error: `%s' is not an aggregate"
 msgstr ""
 
-#: symtab.c:1408
+#: symtab.c:1501
 #, possible-c-format
 msgid ""
 "Internal: %s symbol `%s' found in %s psymtab but not in symtab.\n"
@@ -21248,7 +22132,7 @@
 msgstr ""
 
 #. FIXME; error is wrong in one case.
-#: symtab.c:1577
+#: symtab.c:1670
 #, possible-c-format
 msgid ""
 "Internal: global symbol `%s' found in %s psymtab but not in symtab.\n"
@@ -21256,181 +22140,104 @@
 "(if a template, try specifying an instantiation: %s<type>)."
 msgstr ""
 
-#: symtab.c:2672
+#: symtab.c:2844
 msgid "mismatched quoting on brackets, try 'operator\\[\\]'"
 msgstr ""
 
-#: symtab.c:2680
+#: symtab.c:2852
 msgid "nothing is allowed between '[' and ']'"
 msgstr ""
 
-#: symtab.c:2736
+#: symtab.c:2908
 msgid "`operator ()' must be specified without whitespace in `()'"
 msgstr ""
 
-#: symtab.c:2742
+#: symtab.c:2914
 msgid "`operator ?:' must be specified without whitespace in `?:'"
 msgstr ""
 
-#: symtab.c:2748
+#: symtab.c:2920
 msgid "`operator []' must be specified without whitespace in `[]'"
 msgstr ""
 
-#: symtab.c:2753
+#: symtab.c:2925
 #, possible-c-format
 msgid "`operator %s' not supported"
 msgstr ""
 
-#: symtab.c:3046
-msgid "must search on specific domain"
-msgstr ""
-
-#: symtab.c:4774 symtab.c:4777 symtab.c:4804
+#: symtab.c:4805 symtab.c:4808 symtab.c:4835
 msgid "All global and static variable names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:4781
+#: symtab.c:4812
 msgid "All function names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:4792
+#: symtab.c:4823
 msgid "All type names, or those matching REGEXP."
 msgstr ""
 
-#: symtab.c:4795
+#: symtab.c:4826
 msgid "Source files in the program."
 msgstr ""
 
-#: symtab.c:4798
+#: symtab.c:4829
 msgid "Set a breakpoint for all functions matching REGEXP."
 msgstr ""
 
-#: symtab.c:4803
+#: symtab.c:4834
 msgid "Source files in the program"
 msgstr ""
 
-#: symtab.c:4810
+#: symtab.c:4841
 msgid ""
 "Set the debugger behavior when more than one symbol are possible matches\n"
 "in an expression."
 msgstr ""
 
-#: symtab.c:4812
+#: symtab.c:4843
 msgid "Show how the debugger handles ambiguities in expressions."
 msgstr ""
 
-#: symtab.c:4813
+#: symtab.c:4844
 msgid ""
 "Valid values are \"ask\", \"all\", \"cancel\", and the default is \"all\"."
 msgstr ""
 
-#: symtab.h:734
-msgid "Section index is uninitialized"
-msgstr ""
-
-#: target-descriptions.c:307
-msgid "Architecture rejected target-supplied description"
-msgstr ""
-
-#: target-descriptions.c:315
-msgid ""
-"Target-supplied registers are not supported by the current architecture"
-msgstr ""
-
-#: target-descriptions.c:342
-msgid "Could not remove target-supplied description"
-msgstr ""
-
-#: target-descriptions.c:933 target-descriptions.c:955
-#, possible-c-format
-msgid "Register \"%s\" has an unsupported size (%d bits)"
-msgstr ""
-
-#: target-descriptions.c:1446
-#, possible-c-format
-msgid "Attempted to add duplicate compatible architecture \"%s\""
-msgstr ""
-
-#: target-descriptions.c:1466
-#, possible-c-format
-msgid "Attempted to add duplicate property \"%s\""
-msgstr ""
-
-#: target-descriptions.c:1524
-#, possible-c-format
-msgid "The target description will be read from \"%s\".\n"
-msgstr ""
-
-#: target-descriptions.c:1527
-msgid "The target description will be read from the target.\n"
-msgstr ""
-
-#: target-descriptions.c:1561
-msgid "There is no target description to print."
-msgstr ""
-
-#: target-descriptions.c:1564
-msgid "The current target description did not come from an XML file."
-msgstr ""
-
-#: target-descriptions.c:1680
-#, possible-c-format
-msgid "C output is not supported type \"%s\"."
-msgstr ""
-
-#: target-descriptions.c:1713
-msgid "Set target description specific variables."
-msgstr ""
-
-#. allow-unknown
-#: target-descriptions.c:1717
-msgid "Show target description specific variables."
-msgstr ""
-
-#. allow-unknown
-#: target-descriptions.c:1721
-msgid "Unset target description specific variables."
-msgstr ""
-
-#: target-descriptions.c:1728
-msgid "Set the file to read for an XML target description"
-msgstr ""
-
-#: target-descriptions.c:1729
-msgid "Show the file to read for an XML target description"
+#: symtab.c:4849
+msgid "Set whether a source file may have multiple base names."
 msgstr ""
 
-#: target-descriptions.c:1730
-msgid ""
-"When set, GDB will read the target description from a local\n"
-"file instead of querying the remote target."
+#: symtab.c:4850
+msgid "Show whether a source file may have multiple base names."
 msgstr ""
 
-#: target-descriptions.c:1737
+#: symtab.c:4851
 msgid ""
-"Unset the file to read for an XML target description.  When unset,\n"
-"GDB will read the description from the target."
-msgstr ""
-
-#: target-descriptions.c:1742
-msgid "Print the current target description as a C source file."
+"(A \"base name\" is the name of a file with the directory part removed.\n"
+"Example: The base name of \"/home/user/hello.c\" is \"hello.c\".)\n"
+"If set, GDB will canonicalize file names (e.g., expand symlinks)\n"
+"before comparing them.  Canonicalization is an expensive operation,\n"
+"but it allows the same file be known by more than one base name.\n"
+"If not set (the default), all source files are assumed to have just\n"
+"one base name, and gdb will do file name comparisons more efficiently."
 msgstr ""
 
-#: target-memory.c:431
-msgid "Error writing data to flash"
+#: symtab.h:747
+msgid "Section index is uninitialized"
 msgstr ""
 
-#: target.c:214
+#: target.c:212
 #, possible-c-format
 msgid "Target debugging is %s.\n"
 msgstr ""
 
-#: target.c:245
+#: target.c:243
 #, possible-c-format
 msgid "Cache use for stack accesses is %s.\n"
 msgstr ""
 
-#: target.c:428
+#: target.c:426
 msgid ""
 "Connect to a target machine or process.\n"
 "The first argument is the type or protocol of the target machine.\n"
@@ -21439,42 +22246,42 @@
 "`help target ' followed by the protocol name."
 msgstr ""
 
-#: target.c:490
+#: target.c:488
 msgid "could not find a target to create inferior"
 msgstr ""
 
-#: target.c:519
+#: target.c:517
 #, possible-c-format
 msgid "You can't do that when your target is `%s'"
 msgstr ""
 
-#: target.c:532
+#: target.c:530
 msgid "No saved terminal information.\n"
 msgstr ""
 
-#: target.c:958
+#: target.c:1002
 msgid "Attempt to unpush the dummy target"
 msgstr ""
 
-#: target.c:1085
+#: target.c:1129
 msgid "TLS load module not found"
 msgstr ""
 
-#: target.c:1099
+#: target.c:1143
 msgid "Cannot find thread-local variables in this thread library."
 msgstr ""
 
-#: target.c:1104
+#: target.c:1148
 #, possible-c-format
 msgid "Cannot find shared library `%s' in dynamic linker's load module list"
 msgstr ""
 
-#: target.c:1107
+#: target.c:1151
 #, possible-c-format
 msgid "Cannot find executable file `%s' in dynamic linker's load module list"
 msgstr ""
 
-#: target.c:1112
+#: target.c:1156
 #, possible-c-format
 msgid ""
 "The inferior has not yet allocated storage for thread-local variables in\n"
@@ -21482,7 +22289,7 @@
 "for %s"
 msgstr ""
 
-#: target.c:1118
+#: target.c:1162
 #, possible-c-format
 msgid ""
 "The inferior has not yet allocated storage for thread-local variables in\n"
@@ -21490,90 +22297,90 @@
 "for %s"
 msgstr ""
 
-#: target.c:1126
+#: target.c:1170
 #, possible-c-format
 msgid ""
 "Cannot find thread-local storage for %s, shared library %s:\n"
 "%s"
 msgstr ""
 
-#: target.c:1131
+#: target.c:1175
 #, possible-c-format
 msgid ""
 "Cannot find thread-local storage for %s, executable file %s:\n"
 "%s"
 msgstr ""
 
-#: target.c:1145
+#: target.c:1189
 msgid "Cannot find thread-local variables on this target"
 msgstr ""
 
-#: target.c:1475
+#: target.c:1515
 msgid "Writing to flash memory forbidden in this context"
 msgstr ""
 
-#: target.c:1592
+#: target.c:1667
 #, possible-c-format
 msgid "Writing to memory is not allowed (addr %s, len %s)"
 msgstr ""
 
-#: target.c:1756
+#: target.c:1850
 msgid "Overlapping regions in memory map: ignoring"
 msgstr ""
 
-#: target.c:1806
+#: target.c:1900
 #, possible-c-format
 msgid "Mode for reading from readonly sections is %s.\n"
 msgstr ""
 
-#: target.c:2266
+#: target.c:2360
 #, possible-c-format
 msgid "target object %d, annex %s, contained unexpected null characters"
 msgstr ""
 
-#: target.c:2305
+#: target.c:2399
 msgid "May not insert breakpoints"
 msgstr ""
 
-#: target.c:2322
+#: target.c:2416
 msgid "May not remove breakpoints"
 msgstr ""
 
-#: target.c:2336
+#: target.c:2430
 #, possible-c-format
 msgid "Symbols from \"%s\".\n"
 msgstr ""
 
-#: target.c:2346
+#: target.c:2440
 msgid "\tWhile running this, GDB does not access memory from...\n"
 msgstr ""
 
-#: target.c:2431
+#: target.c:2525
 msgid "Program not killed."
 msgstr ""
 
-#: target.c:2473
+#: target.c:2567
 msgid "could not find a target to detach"
 msgstr ""
 
-#: target.c:2639
+#: target.c:2733
 msgid "could not find a target to follow fork"
 msgstr ""
 
-#: target.c:2665
+#: target.c:2759
 msgid "could not find a target to follow mourn inferior"
 msgstr ""
 
-#: target.c:2716
+#: target.c:2810
 msgid "Unable to allocate memory to perform the search."
 msgstr ""
 
-#: target.c:2724 target.c:2778
+#: target.c:2818 target.c:2872
 #, possible-c-format
 msgid "Unable to access target memory at %s, halting search."
 msgstr ""
 
-#: target.c:2867
+#: target.c:2961
 #, possible-c-format
 msgid ""
 "The \"%s\" target does not support \"run\".  Try \"help target\" or "
@@ -21583,297 +22390,389 @@
 #. This function is only called if the target is running.  In that
 #. case there should have been a process_stratum target and it
 #. should either know how to create inferiors, or not...
-#: target.c:2875
+#: target.c:2969
 msgid "No targets found"
 msgstr ""
 
-#: target.c:2907
+#: target.c:3001
 #, possible-c-format
 msgid "Don't know how to %s.  Try \"help target\"."
 msgstr ""
 
-#: target.c:3062
+#: target.c:3156
 #, possible-c-format
 msgid "Can't determine the current address space of thread %s\n"
 msgstr ""
 
-#: target.c:3213 target.c:3221
+#: target.c:3307 target.c:3315
 msgid "Command not implemented for this target."
 msgstr ""
 
-#: target.c:3315
+#: target.c:3409
 msgid "could not find a target to attach"
 msgstr ""
 
-#: target.c:3364
+#: target.c:3458
 msgid "May not interrupt or stop the target, ignoring attempt"
 msgstr ""
 
-#: target.c:3481
+#: target.c:3577
 #, possible-c-format
 msgid "Writing to registers is not allowed (regno %d)"
 msgstr ""
 
-#: target.c:4075
+#: target.c:4240
 msgid "\"monitor\" command not supported by this target."
 msgstr ""
 
-#: target.c:4086
+#: target.c:4251
 msgid "The current target stack is:\n"
 msgstr ""
 
-#: target.c:4120
+#: target.c:4285
 #, possible-c-format
 msgid "Controlling the inferior in asynchronous mode is %s.\n"
 msgstr ""
 
-#: target.c:4189
+#: target.c:4354
 msgid "Set target debugging."
 msgstr ""
 
-#: target.c:4190
+#: target.c:4355
 msgid "Show target debugging."
 msgstr ""
 
-#: target.c:4191
+#: target.c:4356
 msgid ""
 "When non-zero, target debugging is enabled.  Higher numbers are more\n"
 "verbose.  Changes do not take effect until the next \"run\" or \"target\"\n"
 "command."
 msgstr ""
 
-#: target.c:4200
+#: target.c:4365
 msgid "Set mode for reading from readonly sections."
 msgstr ""
 
-#: target.c:4201
+#: target.c:4366
 msgid "Show mode for reading from readonly sections."
 msgstr ""
 
-#: target.c:4202
+#: target.c:4367
 msgid ""
 "When this mode is on, memory reads from readonly sections (such as .text)\n"
 "will be read from the object file instead of from the target.  This will\n"
 "result in significant performance improvement for remote targets."
 msgstr ""
 
-#: target.c:4211
+#: target.c:4376
 msgid "Send a command to the remote monitor (remote targets only)."
 msgstr ""
 
-#: target.c:4214
+#: target.c:4379
 msgid "Print the name of each layer of the internal target stack."
 msgstr ""
 
-#: target.c:4218
+#: target.c:4383
 msgid "Set whether gdb controls the inferior in asynchronous mode."
 msgstr ""
 
-#: target.c:4219
+#: target.c:4384
 msgid "Show whether gdb controls the inferior in asynchronous mode."
 msgstr ""
 
-#: target.c:4220
+#: target.c:4385
 msgid "Tells gdb whether to control the inferior in asynchronous mode."
 msgstr ""
 
-#: target.c:4228
+#: target.c:4393
 msgid "Set cache use for stack access."
 msgstr ""
 
-#: target.c:4229
+#: target.c:4394
 msgid "Show cache use for stack access."
 msgstr ""
 
-#: target.c:4230
+#: target.c:4395
 msgid ""
 "When on, use the data cache for all stack access, regardless of any\n"
 "configured memory regions.  This improves remote performance significantly.\n"
 "By default, caching for stack access is on."
 msgstr ""
 
-#: target.c:4239
+#: target.c:4404
 msgid "Set permission to write into registers."
 msgstr ""
 
-#: target.c:4240
+#: target.c:4405
 msgid "Show permission to write into registers."
 msgstr ""
 
-#: target.c:4241
+#: target.c:4406
 msgid ""
 "When this permission is on, GDB may write into the target's registers.\n"
 "Otherwise, any sort of write attempt will result in an error."
 msgstr ""
 
-#: target.c:4248
+#: target.c:4413
 msgid "Set permission to write into target memory."
 msgstr ""
 
-#: target.c:4249
+#: target.c:4414
 msgid "Show permission to write into target memory."
 msgstr ""
 
-#: target.c:4250
+#: target.c:4415
 msgid ""
 "When this permission is on, GDB may write into the target's memory.\n"
 "Otherwise, any sort of write attempt will result in an error."
 msgstr ""
 
-#: target.c:4257
+#: target.c:4422
 msgid "Set permission to insert breakpoints in the target."
 msgstr ""
 
-#: target.c:4258
+#: target.c:4423
 msgid "Show permission to insert breakpoints in the target."
 msgstr ""
 
-#: target.c:4259
+#: target.c:4424
 msgid ""
 "When this permission is on, GDB may insert breakpoints in the program.\n"
 "Otherwise, any sort of insertion attempt will result in an error."
 msgstr ""
 
-#: target.c:4266
+#: target.c:4431
 msgid "Set permission to insert tracepoints in the target."
 msgstr ""
 
-#: target.c:4267
+#: target.c:4432
 msgid "Show permission to insert tracepoints in the target."
 msgstr ""
 
-#: target.c:4268
+#: target.c:4433
 msgid ""
 "When this permission is on, GDB may insert tracepoints in the program.\n"
 "Otherwise, any sort of insertion attempt will result in an error."
 msgstr ""
 
-#: target.c:4275
-msgid "Set permission to insert fast tracepoints in the target."
+#: target.c:4440
+msgid "Set permission to insert fast tracepoints in the target."
+msgstr ""
+
+#: target.c:4441
+msgid "Show permission to insert fast tracepoints in the target."
+msgstr ""
+
+#: target.c:4442
+msgid ""
+"When this permission is on, GDB may insert fast tracepoints.\n"
+"Otherwise, any sort of insertion attempt will result in an error."
+msgstr ""
+
+#: target.c:4449
+msgid "Set permission to interrupt or signal the target."
+msgstr ""
+
+#: target.c:4450
+msgid "Show permission to interrupt or signal the target."
+msgstr ""
+
+#: target.c:4451
+msgid ""
+"When this permission is on, GDB may interrupt/stop the target's execution.\n"
+"Otherwise, any attempt to interrupt or stop will be ignored."
+msgstr ""
+
+#: target-descriptions.c:306
+msgid "Architecture rejected target-supplied description"
+msgstr ""
+
+#: target-descriptions.c:314
+msgid ""
+"Target-supplied registers are not supported by the current architecture"
+msgstr ""
+
+#: target-descriptions.c:341
+msgid "Could not remove target-supplied description"
+msgstr ""
+
+#: target-descriptions.c:932 target-descriptions.c:954
+#, possible-c-format
+msgid "Register \"%s\" has an unsupported size (%d bits)"
+msgstr ""
+
+#: target-descriptions.c:1445
+#, possible-c-format
+msgid "Attempted to add duplicate compatible architecture \"%s\""
+msgstr ""
+
+#: target-descriptions.c:1465
+#, possible-c-format
+msgid "Attempted to add duplicate property \"%s\""
+msgstr ""
+
+#: target-descriptions.c:1523
+#, possible-c-format
+msgid "The target description will be read from \"%s\".\n"
+msgstr ""
+
+#: target-descriptions.c:1526
+msgid "The target description will be read from the target.\n"
+msgstr ""
+
+#: target-descriptions.c:1560
+msgid "There is no target description to print."
+msgstr ""
+
+#: target-descriptions.c:1563
+msgid "The current target description did not come from an XML file."
+msgstr ""
+
+#: target-descriptions.c:1679
+#, possible-c-format
+msgid "C output is not supported type \"%s\"."
+msgstr ""
+
+#: target-descriptions.c:1712
+msgid "Set target description specific variables."
+msgstr ""
+
+#. allow-unknown
+#: target-descriptions.c:1716
+msgid "Show target description specific variables."
+msgstr ""
+
+#. allow-unknown
+#: target-descriptions.c:1720
+msgid "Unset target description specific variables."
+msgstr ""
+
+#: target-descriptions.c:1727
+msgid "Set the file to read for an XML target description"
 msgstr ""
 
-#: target.c:4276
-msgid "Show permission to insert fast tracepoints in the target."
+#: target-descriptions.c:1728
+msgid "Show the file to read for an XML target description"
 msgstr ""
 
-#: target.c:4277
+#: target-descriptions.c:1729
 msgid ""
-"When this permission is on, GDB may insert fast tracepoints.\n"
-"Otherwise, any sort of insertion attempt will result in an error."
+"When set, GDB will read the target description from a local\n"
+"file instead of querying the remote target."
 msgstr ""
 
-#: target.c:4284
-msgid "Set permission to interrupt or signal the target."
+#: target-descriptions.c:1736
+msgid ""
+"Unset the file to read for an XML target description.  When unset,\n"
+"GDB will read the description from the target."
 msgstr ""
 
-#: target.c:4285
-msgid "Show permission to interrupt or signal the target."
+#: target-descriptions.c:1741
+msgid "Print the current target description as a C source file."
 msgstr ""
 
-#: target.c:4286
-msgid ""
-"When this permission is on, GDB may interrupt/stop the target's execution.\n"
-"Otherwise, any attempt to interrupt or stop will be ignored."
+#: target-memory.c:430
+msgid "Error writing data to flash"
 msgstr ""
 
-#: thread.c:250
+#: thread.c:239
 #, possible-c-format
 msgid "[New %s]\n"
 msgstr ""
 
-#: thread.c:810
+#: thread.c:803
 msgid "No threads.\n"
 msgstr ""
 
-#: thread.c:812
+#: thread.c:805
 #, possible-c-format
 msgid "No threads match '%s'.\n"
 msgstr ""
 
-#: thread.c:838
+#: thread.c:831
 msgid "Requested thread not found in requested process"
 msgstr ""
 
-#: thread.c:1065
+#: thread.c:1058
 #, possible-c-format
 msgid "Couldn't restore frame #%d in current thread, at reparsed frame #0\n"
 msgstr ""
 
-#: thread.c:1186 thread.c:1225
+#: thread.c:1179 thread.c:1218
 msgid "Please specify a command following the thread ID list"
 msgstr ""
 
-#: thread.c:1201 thread.c:1253
+#: thread.c:1194 thread.c:1246
 #, possible-c-format
 msgid ""
 "\n"
 "Thread %d (%s):\n"
 msgstr ""
 
-#: thread.c:1220
+#: thread.c:1213
 msgid "Please specify a thread ID list"
 msgstr ""
 
-#: thread.c:1248
+#: thread.c:1241
 #, possible-c-format
 msgid "Thread %d has terminated."
 msgstr ""
 
-#: thread.c:1274 thread.c:1303
+#: thread.c:1267 thread.c:1296
 msgid "No thread selected"
 msgstr ""
 
-#: thread.c:1279
+#: thread.c:1272
 #, possible-c-format
 msgid "[Current thread is %d (%s) (exited)]\n"
 msgstr ""
 
-#: thread.c:1283
+#: thread.c:1276
 #, possible-c-format
 msgid "[Current thread is %d (%s)]\n"
 msgstr ""
 
-#: thread.c:1334
+#: thread.c:1327
 #, possible-c-format
 msgid "Thread %d has name '%s'\n"
 msgstr ""
 
-#: thread.c:1342
+#: thread.c:1335
 #, possible-c-format
 msgid "Thread %d has target name '%s'\n"
 msgstr ""
 
-#: thread.c:1350
+#: thread.c:1343
 #, possible-c-format
 msgid "Thread %d has target id '%s'\n"
 msgstr ""
 
-#: thread.c:1358
+#: thread.c:1351
 #, possible-c-format
 msgid "Thread %d has extra info '%s'\n"
 msgstr ""
 
-#: thread.c:1364
+#: thread.c:1357
 #, possible-c-format
 msgid "No threads match '%s'\n"
 msgstr ""
 
-#: thread.c:1374
+#: thread.c:1367
 #, possible-c-format
 msgid "Printing of thread events is %s.\n"
 msgstr ""
 
-#: thread.c:1389 windows-tdep.c:373
+#: thread.c:1382 windows-tdep.c:373
 #, possible-c-format
 msgid "Thread ID %d not known."
 msgstr ""
 
-#: thread.c:1392 windows-tdep.c:376
+#: thread.c:1385 windows-tdep.c:376
 #, possible-c-format
 msgid "Thread ID %d has terminated."
 msgstr ""
 
-#: thread.c:1458
+#: thread.c:1451
 msgid ""
 "Display currently known threads.\n"
 "Usage: info threads [ID]...\n"
@@ -21881,139 +22780,154 @@
 "If no arguments, all threads are displayed."
 msgstr ""
 
-#: thread.c:1463
+#: thread.c:1456
 msgid ""
 "Use this command to switch between threads.\n"
 "The new thread ID must be currently known."
 msgstr ""
 
-#: thread.c:1469
+#: thread.c:1462
 msgid "Apply a command to a list of threads."
 msgstr ""
 
-#: thread.c:1473
+#: thread.c:1466
 msgid "Apply a command to all threads."
 msgstr ""
 
-#: thread.c:1476
+#: thread.c:1469
 msgid ""
 "Set the current thread's name.\n"
 "Usage: thread name [NAME]\n"
 "If NAME is not given, then any existing name is removed."
 msgstr ""
 
-#: thread.c:1480
+#: thread.c:1473
 msgid ""
 "Find threads that match a regular expression.\n"
 "Usage: thread find REGEXP\n"
 "Will display thread ids whose name, target ID, or extra info matches REGEXP."
 msgstr ""
 
-#: thread.c:1490
+#: thread.c:1483
 msgid "Set printing of thread events (such as thread start and exit)."
 msgstr ""
 
-#: thread.c:1491
+#: thread.c:1484
 msgid "Show printing of thread events (such as thread start and exit)."
 msgstr ""
 
-#: top.c:105
+#: tic6x-tdep.c:894
+#, possible-c-format
+msgid "unexpected length %d of type"
+msgstr ""
+
+#: tic6x-tdep.c:1152
+#, possible-c-format
+msgid "unexpected type %d of arg %d"
+msgstr ""
+
+#: tic6x-tdep.c:1157
+#, possible-c-format
+msgid "unexpected length %d of arg %d"
+msgstr ""
+
+#: top.c:108
 #, possible-c-format
 msgid "Whether to confirm potentially dangerous operations is %s.\n"
 msgstr ""
 
-#: top.c:424
+#: top.c:437
 msgid "That is not a command, just a help topic."
 msgstr ""
 
-#: top.c:660
+#: top.c:693
 #, possible-c-format
 msgid "Saving of the history record on exit is %s.\n"
 msgstr ""
 
-#: top.c:669
+#: top.c:702
 #, possible-c-format
 msgid "The size of the command history is %s.\n"
 msgstr ""
 
-#: top.c:678
+#: top.c:711
 #, possible-c-format
 msgid "The filename in which to record the command history is \"%s\".\n"
 msgstr ""
 
-#: top.c:1107
+#: top.c:1139
 msgid ""
 "\n"
 "For bug reporting instructions, please see:\n"
 msgstr ""
 
-#: top.c:1182
+#: top.c:1219
 #, possible-c-format
 msgid "\tInferior %d [%s] will be detached.\n"
 msgstr ""
 
-#: top.c:1186
+#: top.c:1223
 #, possible-c-format
 msgid "\tInferior %d [%s] will be killed.\n"
 msgstr ""
 
-#: top.c:1215
+#: top.c:1252
 msgid ""
 "A debugging session is active.\n"
 "Do you still want to close the debugger?"
 msgstr ""
 
-#: top.c:1219
+#: top.c:1256
 msgid ""
 "A debugging session is active.\n"
 "\n"
 msgstr ""
 
-#: top.c:1221
+#: top.c:1258
 msgid ""
 "\n"
 "Quit anyway? "
 msgstr ""
 
-#: top.c:1400
+#: top.c:1438
 msgid "History size must be non-negative"
 msgstr ""
 
-#: top.c:1407
+#: top.c:1445
 msgid ""
 "\"set history\" must be followed by the name of a history subcommand.\n"
 msgstr ""
 
-#: top.c:1484
+#: top.c:1522
 #, possible-c-format
 msgid "Gdb's prompt is \"%s\".\n"
 msgstr ""
 
-#: top.c:1491
+#: top.c:1529
 #, possible-c-format
 msgid "Editing of command lines as they are typed is %s.\n"
 msgstr ""
 
-#: top.c:1500
+#: top.c:1538
 #, possible-c-format
 msgid "Annotation_level is %s.\n"
 msgstr ""
 
-#: top.c:1507
+#: top.c:1545
 #, possible-c-format
 msgid ""
 "Notification of completion for asynchronous execution commands is %s.\n"
 msgstr ""
 
-#: top.c:1551
+#: top.c:1579
 msgid "Set gdb's prompt"
 msgstr ""
 
-#: top.c:1552
+#: top.c:1580
 msgid "Show gdb's prompt"
 msgstr ""
 
-#: top.c:1557
+#: top.c:1585
 msgid ""
 "Don't repeat this command.\n"
 "Primarily used inside of user-defined commands that should not be repeated "
@@ -22021,620 +22935,668 @@
 "hitting return."
 msgstr ""
 
-#: top.c:1563
+#: top.c:1591
 msgid "Set editing of command lines as they are typed."
 msgstr ""
 
-#: top.c:1564
+#: top.c:1592
 msgid "Show editing of command lines as they are typed."
 msgstr ""
 
-#: top.c:1565
+#: top.c:1593
 msgid ""
 "Use \"on\" to enable the editing, and \"off\" to disable it.\n"
 "Without an argument, command line editing is enabled.  To edit, use\n"
 "EMACS-like or VI-like commands like control-P or ESC."
 msgstr ""
 
-#: top.c:1573
+#: top.c:1601
 msgid "Set saving of the history record on exit."
 msgstr ""
 
-#: top.c:1574
+#: top.c:1602
 msgid "Show saving of the history record on exit."
 msgstr ""
 
-#: top.c:1575
+#: top.c:1603
 msgid ""
 "Use \"on\" to enable the saving, and \"off\" to disable it.\n"
 "Without an argument, saving is enabled."
 msgstr ""
 
-#: top.c:1582
+#: top.c:1610
 msgid "Set the size of the command history,"
 msgstr ""
 
-#: top.c:1583
+#: top.c:1611
 msgid "Show the size of the command history,"
 msgstr ""
 
-#: top.c:1584
+#: top.c:1612
 msgid "ie. the number of previous commands to keep a record of."
 msgstr ""
 
-#: top.c:1590
+#: top.c:1618
 msgid "Set the filename in which to record the command history"
 msgstr ""
 
-#: top.c:1591
+#: top.c:1619
 msgid "Show the filename in which to record the command history"
 msgstr ""
 
-#: top.c:1592
+#: top.c:1620
 msgid "(the list of previous commands of which a record is kept)."
 msgstr ""
 
-#: top.c:1598
+#: top.c:1626
 msgid "Set whether to confirm potentially dangerous operations."
 msgstr ""
 
-#: top.c:1599
+#: top.c:1627
 msgid "Show whether to confirm potentially dangerous operations."
 msgstr ""
 
-#: top.c:1605
+#: top.c:1633
 msgid "Set annotation_level."
 msgstr ""
 
-#: top.c:1606
+#: top.c:1634
 msgid "Show annotation_level."
 msgstr ""
 
-#: top.c:1607
+#: top.c:1635
 msgid ""
 "0 == normal;     1 == fullname (for use when running under emacs)\n"
 "2 == output annotated suitably for use by programs that control GDB."
 msgstr ""
 
-#: top.c:1615
+#: top.c:1643
 msgid "Set notification of completion for asynchronous execution commands."
 msgstr ""
 
-#: top.c:1616
+#: top.c:1644
 msgid "Show notification of completion for asynchronous execution commands."
 msgstr ""
 
-#: top.c:1617
+#: top.c:1645
 msgid "Use \"on\" to enable the notification, and \"off\" to disable it."
 msgstr ""
 
-#: top.c:1624
+#: top.c:1652
 msgid "Set GDB's data directory."
 msgstr ""
 
-#: top.c:1625
+#: top.c:1653
 msgid "Show GDB's data directory."
 msgstr ""
 
-#: top.c:1626
+#: top.c:1654
 msgid "When set, GDB uses the specified path to search for data files."
 msgstr ""
 
-#: tracepoint.c:354
+#: tracepoint.c:364
 #, possible-c-format
 msgid "No trace variable named \"$%s\", not deleting"
 msgstr ""
 
-#: tracepoint.c:370
+#: tracepoint.c:380
 msgid "trace state variable name"
 msgstr ""
 
-#: tracepoint.c:377
+#: tracepoint.c:387
 msgid "No expression?"
 msgstr ""
 
-#: tracepoint.c:391
+#: tracepoint.c:401
 msgid "Syntax must be $NAME [ = EXPR ]"
 msgstr ""
 
-#: tracepoint.c:394
+#: tracepoint.c:404
 msgid "No name given"
 msgstr ""
 
-#: tracepoint.c:397
+#: tracepoint.c:407
 msgid "Must supply a non-empty variable name"
 msgstr ""
 
-#: tracepoint.c:404
+#: tracepoint.c:414
 #, possible-c-format
 msgid "Trace state variable $%s now has initial value %s.\n"
 msgstr ""
 
-#: tracepoint.c:415
+#: tracepoint.c:425
 #, possible-c-format
 msgid "Trace state variable $%s created, with initial value %s.\n"
 msgstr ""
 
-#: tracepoint.c:431
+#: tracepoint.c:441
 msgid "Delete all trace state variables? "
 msgstr ""
 
-#: tracepoint.c:445
+#: tracepoint.c:455
 #, possible-c-format
 msgid "Name \"%s\" not prefixed with '$', ignoring"
 msgstr ""
 
-#: tracepoint.c:463
+#: tracepoint.c:474
 msgid "No trace state variables.\n"
 msgstr ""
 
-#: tracepoint.c:555
+#: tracepoint.c:566
 msgid "This command cannot be used at the top level."
 msgstr ""
 
-#: tracepoint.c:561 tracepoint.c:567 tracepoint.c:573
+#: tracepoint.c:572 tracepoint.c:578 tracepoint.c:584
 msgid "This command can only be used in a tracepoint actions list."
 msgstr ""
 
-#: tracepoint.c:608
+#: tracepoint.c:617
+msgid "Target does not support \"/s\" option for string tracing."
+msgstr ""
+
+#: tracepoint.c:620
+#, possible-c-format
+msgid "Undefined collection format \"%c\"."
+msgstr ""
+
+#: tracepoint.c:659
 msgid "expression is malformed"
 msgstr ""
 
-#: tracepoint.c:614
+#: tracepoint.c:665
 msgid "expression has min height < 0"
 msgstr ""
 
-#: tracepoint.c:623 tracepoint.c:707 tracepoint.c:742
+#: tracepoint.c:674 tracepoint.c:764 tracepoint.c:799
 msgid "Expression is too complicated."
 msgstr ""
 
-#: tracepoint.c:653
+#: tracepoint.c:705
 #, possible-c-format
 msgid "`%s' is not a tracepoint action, or is ambiguous."
 msgstr ""
 
-#: tracepoint.c:686
+#: tracepoint.c:743
 #, possible-c-format
 msgid "constant `%s' (value %ld) will not be collected."
 msgstr ""
 
-#: tracepoint.c:694
+#: tracepoint.c:751
 #, possible-c-format
 msgid "`%s' is optimized away and cannot be collected."
 msgstr ""
 
-#: tracepoint.c:762
+#: tracepoint.c:819
 #, possible-c-format
 msgid "while-stepping step count `%s' is malformed."
 msgstr ""
 
-#: tracepoint.c:769
+#: tracepoint.c:826
 #, possible-c-format
 msgid "`%s' is not a supported tracepoint action."
 msgstr ""
 
-#: tracepoint.c:868
+#: tracepoint.c:925
 #, possible-c-format
 msgid "Internal: register number %d too large for tracepoint"
 msgstr ""
 
-#: tracepoint.c:1111
+#: tracepoint.c:1168
 msgid "Can't collect locals; no symbol table info available.\n"
 msgstr ""
 
-#: tracepoint.c:1118
+#: tracepoint.c:1175
 msgid "No locals found in scope."
 msgstr ""
 
-#: tracepoint.c:1126
+#: tracepoint.c:1183
 msgid "Can't collect args; no symbol table info available."
 msgstr ""
 
-#: tracepoint.c:1132
+#: tracepoint.c:1189
 msgid "No args found in scope."
 msgstr ""
 
-#: tracepoint.c:1309 tracepoint.c:2512
+#: tracepoint.c:1366 tracepoint.c:2763
 #, possible-c-format
 msgid "Bad action list item: %s"
 msgstr ""
 
-#: tracepoint.c:1477
+#: tracepoint.c:1575
 #, possible-c-format
 msgid "Invalid tracepoint command '%s'"
 msgstr ""
 
-#: tracepoint.c:1572
+#: tracepoint.c:1692
+msgid "Pending tracepoints will not be resolved while GDB is disconnected\n"
+msgstr ""
+
+#: tracepoint.c:1713
 msgid "No tracepoints defined, not starting trace"
 msgstr ""
 
-#: tracepoint.c:1585
+#: tracepoint.c:1728
 #, possible-c-format
 msgid "May not insert %stracepoints, skipping tracepoint %d"
 msgstr ""
 
-#: tracepoint.c:1593
+#: tracepoint.c:1735
+msgid "No tracepoints enabled"
+msgstr ""
+
+#: tracepoint.c:1741
 msgid "No tracepoints enabled, not starting trace"
 msgstr ""
 
-#: tracepoint.c:1599
+#: tracepoint.c:1748
 msgid "No tracepoints that may be downloaded, not starting trace"
 msgstr ""
 
-#: tracepoint.c:1655
+#: tracepoint.c:1828
 msgid "A trace is running already.  Start a new run? "
 msgstr ""
 
-#: tracepoint.c:1656
+#: tracepoint.c:1829
 msgid "New trace run not started."
 msgstr ""
 
-#: tracepoint.c:1667
+#: tracepoint.c:1844
 msgid "Trace is not running."
 msgstr ""
 
-#: tracepoint.c:1692
+#: tracepoint.c:1881
 msgid "Using a trace file.\n"
 msgstr ""
 
-#: tracepoint.c:1695
+#: tracepoint.c:1884
 msgid "Trace can not be run on this target.\n"
 msgstr ""
 
-#: tracepoint.c:1702
+#: tracepoint.c:1891
 msgid "Run/stop status is unknown.\n"
 msgstr ""
 
-#: tracepoint.c:1706
+#: tracepoint.c:1895
 msgid "Trace is running on the target.\n"
 msgstr ""
 
-#: tracepoint.c:1713
+#: tracepoint.c:1902
 msgid "No trace has been run on the target.\n"
 msgstr ""
 
-#: tracepoint.c:1716
+#: tracepoint.c:1906
+#, possible-c-format
+msgid "Trace stopped by a tstop command (%s).\n"
+msgstr ""
+
+#: tracepoint.c:1909
 msgid "Trace stopped by a tstop command.\n"
 msgstr ""
 
-#: tracepoint.c:1719
+#: tracepoint.c:1912
 msgid "Trace stopped because the buffer was full.\n"
 msgstr ""
 
-#: tracepoint.c:1722
+#: tracepoint.c:1915
 msgid "Trace stopped because of disconnection.\n"
 msgstr ""
 
-#: tracepoint.c:1725
+#: tracepoint.c:1918
 #, possible-c-format
 msgid "Trace stopped by tracepoint %d.\n"
 msgstr ""
 
-#: tracepoint.c:1730
+#: tracepoint.c:1923
 #, possible-c-format
 msgid "Trace stopped by an error (%s, tracepoint %d).\n"
 msgstr ""
 
-#: tracepoint.c:1734
+#: tracepoint.c:1927
 #, possible-c-format
 msgid "Trace stopped by an error (%s).\n"
 msgstr ""
 
-#: tracepoint.c:1738
+#: tracepoint.c:1931
 msgid "Trace stopped for an unknown reason.\n"
 msgstr ""
 
-#: tracepoint.c:1741
+#: tracepoint.c:1934
 #, possible-c-format
 msgid "Trace stopped for some other reason (%d).\n"
 msgstr ""
 
-#: tracepoint.c:1750
+#: tracepoint.c:1943
 #, possible-c-format
 msgid "Buffer contains %d trace frames (of %d created total).\n"
 msgstr ""
 
-#: tracepoint.c:1756
+#: tracepoint.c:1949
 #, possible-c-format
 msgid "Collected %d trace frames.\n"
 msgstr ""
 
-#: tracepoint.c:1764
+#: tracepoint.c:1957
 #, possible-c-format
 msgid "Trace buffer has %d bytes of %d bytes free"
 msgstr ""
 
-#: tracepoint.c:1767
+#: tracepoint.c:1960
 #, possible-c-format
 msgid " (%d%% full)"
 msgstr ""
 
-#: tracepoint.c:1771
+#: tracepoint.c:1964
 msgid ".\n"
 msgstr ""
 
-#: tracepoint.c:1774
+#: tracepoint.c:1967
 #, possible-c-format
 msgid "Trace buffer has %d bytes free.\n"
 msgstr ""
 
-#: tracepoint.c:1779
+#: tracepoint.c:1972
 msgid "Trace will continue if GDB disconnects.\n"
 msgstr ""
 
-#: tracepoint.c:1781
+#: tracepoint.c:1974
 msgid "Trace will stop if GDB disconnects.\n"
 msgstr ""
 
-#: tracepoint.c:1784
+#: tracepoint.c:1977
 msgid "Trace buffer is circular.\n"
 msgstr ""
 
-#: tracepoint.c:1788
+#: tracepoint.c:1980
+#, possible-c-format
+msgid "Trace user is %s.\n"
+msgstr ""
+
+#: tracepoint.c:1983
+#, possible-c-format
+msgid "Trace notes: %s.\n"
+msgstr ""
+
+#: tracepoint.c:1987
 #, possible-c-format
 msgid "Looking at trace frame %d, tracepoint %d.\n"
 msgstr ""
 
-#: tracepoint.c:1791
+#: tracepoint.c:1990
 msgid "Not looking at any trace frame.\n"
 msgstr ""
 
-#: tracepoint.c:1913
+#. Reporting a run time is more readable than two long numbers.
+#: tracepoint.c:2000
+#, possible-c-format
+msgid "Trace started at %ld.%06ld secs, stopped %ld.%06ld secs later.\n"
+msgstr ""
+
+#: tracepoint.c:2007
+#, possible-c-format
+msgid "Trace started at %ld.%06ld secs.\n"
+msgstr ""
+
+#: tracepoint.c:2012
+#, possible-c-format
+msgid "Trace stopped at %ld.%06ld secs.\n"
+msgstr ""
+
+#: tracepoint.c:2163
 msgid "Trace is running and will continue after detach; detach anyway? "
 msgstr ""
 
-#: tracepoint.c:1919
+#: tracepoint.c:2169
 msgid "Trace is running but will stop on detach; detach anyway? "
 msgstr ""
 
-#: tracepoint.c:1986
+#: tracepoint.c:2237
 msgid "Target failed to find requested trace frame."
 msgstr ""
 
-#: tracepoint.c:2024
+#: tracepoint.c:2275
 #, possible-c-format
 msgid "Found trace frame %d, tracepoint %d\n"
 msgstr ""
 
-#: tracepoint.c:2033
+#: tracepoint.c:2284
 msgid "No longer looking at any trace frame\n"
 msgstr ""
 
 #. This case may never occur, check.
-#: tracepoint.c:2035
+#: tracepoint.c:2286
 msgid "No trace frame found\n"
 msgstr ""
 
-#: tracepoint.c:2096
+#: tracepoint.c:2347
 msgid "not debugging trace buffer"
 msgstr ""
 
-#: tracepoint.c:2098
+#: tracepoint.c:2349
 msgid "already at start of trace buffer"
 msgstr ""
 
-#: tracepoint.c:2109
+#: tracepoint.c:2360
 #, possible-c-format
 msgid "invalid input (%d is less than zero)"
 msgstr ""
 
-#: tracepoint.c:2165
+#: tracepoint.c:2416
 msgid "No current tracepoint -- please supply an argument."
 msgstr ""
 
-#: tracepoint.c:2217
+#: tracepoint.c:2468
 msgid "No line number information available."
 msgstr ""
 
-#: tracepoint.c:2237
+#: tracepoint.c:2488
 msgid "Cannot find a good line."
 msgstr ""
 
 #. Is there any case in which we get here, and have an address
 #. which the user would want to see?  If we have debugging
 #. symbols and no line numbers?
-#: tracepoint.c:2244
+#: tracepoint.c:2495
 #, possible-c-format
 msgid "Line number %d is out of range for \"%s\"."
 msgstr ""
 
-#: tracepoint.c:2336
+#: tracepoint.c:2587
 msgid "requires an argument (function, line or *addr) to define a scope"
 msgstr ""
 
-#: tracepoint.c:2584
+#: tracepoint.c:2840
 msgid "No current trace frame."
 msgstr ""
 
-#: tracepoint.c:2591
+#: tracepoint.c:2847
 #, possible-c-format
 msgid "No known tracepoint matches 'current' tracepoint #%d."
 msgstr ""
 
-#: tracepoint.c:2647
+#: tracepoint.c:2903
 msgid "Buffer too small for source encoding"
 msgstr ""
 
-#: tracepoint.c:2652
+#: tracepoint.c:2908
 msgid "Source string too long for buffer"
 msgstr ""
 
-#: tracepoint.c:2687
+#: tracepoint.c:2943
 #, possible-c-format
 msgid "Target failed to save trace data to '%s'."
 msgstr ""
 
-#: tracepoint.c:2701
+#: tracepoint.c:2957
 #, possible-c-format
 msgid "Unable to open file '%s' for saving trace data (%s)"
 msgstr ""
 
-#: tracepoint.c:2826
+#: tracepoint.c:3090
 msgid "Failure to get requested trace buffer data"
 msgstr ""
 
-#: tracepoint.c:2853 tracepoint.c:2869
+#: tracepoint.c:3117 tracepoint.c:3133
 msgid "file in which to save trace data"
 msgstr ""
 
-#: tracepoint.c:2874
+#: tracepoint.c:3138
 #, possible-c-format
 msgid "Trace data saved to file '%s'.\n"
 msgstr ""
 
-#: tracepoint.c:2950
+#: tracepoint.c:3244
 msgid "could not change traceframe"
 msgstr ""
 
-#: tracepoint.c:3127
+#: tracepoint.c:3443
 #, possible-c-format
 msgid "Assuming tracepoint %d is same as target's tracepoint %d at %s.\n"
 msgstr ""
 
-#: tracepoint.c:3135
+#: tracepoint.c:3452
 #, possible-c-format
 msgid "Created tracepoint %d for target's tracepoint %d at %s.\n"
 msgstr ""
 
-#: tracepoint.c:3140
+#: tracepoint.c:3457
 #, possible-c-format
 msgid ""
 "Failed to create tracepoint for target's tracepoint %d at %s, skipping it.\n"
 msgstr ""
 
-#: tracepoint.c:3221
+#: tracepoint.c:3546
 #, possible-c-format
 msgid "Assuming trace state variable $%s is same as target's variable %d.\n"
 msgstr ""
 
-#: tracepoint.c:3229
+#: tracepoint.c:3554
 #, possible-c-format
 msgid "Created trace state variable $%s for target's variable %d.\n"
 msgstr ""
 
-#: tracepoint.c:3287
+#: tracepoint.c:3612
 msgid "Premature end of file while reading trace file"
 msgstr ""
 
-#: tracepoint.c:3308
+#: tracepoint.c:3633
 msgid "No trace file specified."
 msgstr ""
 
-#: tracepoint.c:3341
+#: tracepoint.c:3666
 msgid "File is not a valid trace file."
 msgstr ""
 
-#: tracepoint.c:3381
+#: tracepoint.c:3706
 msgid "Excessively long lines in trace file"
 msgstr ""
 
-#: tracepoint.c:3390
+#: tracepoint.c:3715
 msgid "No register block size recorded in trace file"
 msgstr ""
 
-#: tracepoint.c:3404
+#: tracepoint.c:3729
 msgid "No traceframes present in this file."
 msgstr ""
 
-#: tracepoint.c:3447
+#: tracepoint.c:3772
 #, possible-c-format
 msgid "Ignoring trace file definition \"%s\""
 msgstr ""
 
-#: tracepoint.c:3475
+#: tracepoint.c:3806
 #, possible-c-format
 msgid ""
 "Malformed trace status, at %s\n"
 "Status line: '%s'\n"
 msgstr ""
 
-#: tracepoint.c:3622
+#: tracepoint.c:4015
 #, possible-c-format
 msgid "Unrecognized char '%c' in tracepoint definition, skipping rest"
 msgstr ""
 
 #. Don't error out, the target might be sending us optional
 #. info that we don't care about.
-#: tracepoint.c:3670
+#: tracepoint.c:4069
 #, possible-c-format
 msgid "Unrecognized tracepoint piece '%c', ignoring"
 msgstr ""
 
-#: tracepoint.c:3793
+#: tracepoint.c:4199
 msgid "could not set tfile's traceframe"
 msgstr ""
 
-#: tracepoint.c:3868
+#: tracepoint.c:4274
 msgid "unknown tfind type"
 msgstr ""
 
-#: tracepoint.c:3956
+#: tracepoint.c:4362
 #, possible-c-format
 msgid "Unknown block type '%c' (0x%x) in trace frame"
 msgstr ""
 
-#: tracepoint.c:4044
+#: tracepoint.c:4450
 #, possible-c-format
 msgid "Tracepoint %d has multiple locations, cannot infer $pc"
 msgstr ""
 
-#: tracepoint.c:4052
+#: tracepoint.c:4458
 #, possible-c-format
 msgid "Tracepoint %d does while-stepping, cannot infer $pc"
 msgstr ""
 
-#: tracepoint.c:4076
+#: tracepoint.c:4482
 msgid "tfile_xfer_partial: trace file is read-only"
 msgstr ""
 
-#: tracepoint.c:4251
+#: tracepoint.c:4657
 #, possible-c-format
 msgid ""
 "Unhandled trace block type (%d) '%c ' while building trace frame info."
 msgstr ""
 
-#: tracepoint.c:4317
+#: tracepoint.c:4724
 #, possible-c-format
 msgid "bad marker definition: %s"
 msgstr ""
 
-#: tracepoint.c:4430
+#: tracepoint.c:4838
 msgid "Data: \""
 msgstr ""
 
-#: tracepoint.c:4444
+#: tracepoint.c:4852
 msgid "Probed by static tracepoints: "
 msgstr ""
 
-#: tracepoint.c:4553
+#: tracepoint.c:4962
 msgid ""
 "Can not parse XML trace frame info; XML support was disabled at compile time"
 msgstr ""
 
-#: tracepoint.c:4624
+#: tracepoint.c:5033
 msgid "trace frame info"
 msgstr ""
 
-#: tracepoint.c:4740
+#: tracepoint.c:5149
 msgid "List the variables local to a scope"
 msgstr ""
 
-#: tracepoint.c:4743
+#: tracepoint.c:5152
 msgid "Tracing of program execution without stopping the program."
 msgstr ""
 
-#: tracepoint.c:4747
+#: tracepoint.c:5156
 msgid "Print everything collected at the current tracepoint."
 msgstr ""
 
-#: tracepoint.c:4749
+#: tracepoint.c:5158
 msgid ""
 "Save the trace data to a file.\n"
 "Use the '-r' option to direct the target to save directly to the file,\n"
 "using its own filesystem."
 msgstr ""
 
-#: tracepoint.c:4754
+#: tracepoint.c:5163
 msgid ""
 "Define a trace state variable.\n"
 "Argument is a $-prefixed name, optionally followed\n"
@@ -22642,7 +23604,7 @@
 "at the start of tracing."
 msgstr ""
 
-#: tracepoint.c:4761
+#: tracepoint.c:5170
 msgid ""
 "Delete one or more trace state variables.\n"
 "Arguments are the names of the variables to delete.\n"
@@ -22650,33 +23612,33 @@
 msgstr ""
 
 #. FIXME add a trace variable completer.
-#: tracepoint.c:4767
+#: tracepoint.c:5176
 msgid "Status of trace state variables and their values.\n"
 msgstr ""
 
-#: tracepoint.c:4772
+#: tracepoint.c:5181
 msgid "List target static tracepoints markers.\n"
 msgstr ""
 
-#: tracepoint.c:4776
+#: tracepoint.c:5185
 msgid ""
 "Select a trace frame;\n"
 "No argument means forward by one frame; '-' means backward by one frame."
 msgstr ""
 
-#: tracepoint.c:4781
+#: tracepoint.c:5190
 msgid ""
 "Select a trace frame whose PC is outside the given range (exclusive).\n"
 "Usage: tfind outside addr1, addr2"
 msgstr ""
 
-#: tracepoint.c:4786
+#: tracepoint.c:5195
 msgid ""
 "Select a trace frame whose PC is in the given range (inclusive).\n"
 "Usage: tfind range addr1,addr2"
 msgstr ""
 
-#: tracepoint.c:4791
+#: tracepoint.c:5200
 msgid ""
 "Select a trace frame by source line.\n"
 "Argument can be a line number (with optional source file),\n"
@@ -22684,45 +23646,53 @@
 "Default argument is 'the next source line that was traced'."
 msgstr ""
 
-#: tracepoint.c:4798
+#: tracepoint.c:5207
 msgid ""
 "Select a trace frame by tracepoint number.\n"
 "Default is the tracepoint for the current trace frame."
 msgstr ""
 
-#: tracepoint.c:4803
+#: tracepoint.c:5212
 msgid ""
 "Select a trace frame by PC.\n"
 "Default is the current PC, or the PC of the current trace frame."
 msgstr ""
 
-#: tracepoint.c:4808
+#: tracepoint.c:5217
 msgid ""
 "Synonym for 'none'.\n"
 "De-select any trace frame and resume 'live' debugging."
 msgstr ""
 
-#: tracepoint.c:4814
+#: tracepoint.c:5223
 msgid "De-select any trace frame and resume 'live' debugging."
 msgstr ""
 
-#: tracepoint.c:4818
+#: tracepoint.c:5227
 msgid "Select the first trace frame in the trace buffer."
 msgstr ""
 
-#: tracepoint.c:4822
+#: tracepoint.c:5231
 msgid "Display the status of the current trace data collection."
 msgstr ""
 
-#: tracepoint.c:4825
-msgid "Stop trace data collection."
+#: tracepoint.c:5233
+msgid ""
+"Stop trace data collection.\n"
+"Usage: tstop [ <notes> ... ]\n"
+"Any arguments supplied are recorded with the trace as a stop reason and\n"
+"reported by tstatus (if the target supports trace notes)."
 msgstr ""
 
-#: tracepoint.c:4828
-msgid "Start trace data collection."
+#: tracepoint.c:5239
+msgid ""
+"Start trace data collection.\n"
+"Usage: tstart [ <notes> ... ]\n"
+"Any arguments supplied are recorded with the trace as a note and\n"
+"reported by tstatus (if the target supports trace notes)."
 msgstr ""
 
-#: tracepoint.c:4830
+#: tracepoint.c:5245
 msgid ""
 "Ends a list of commands or actions.\n"
 "Several GDB commands allow you to enter a list of commands or actions.\n"
@@ -22732,7 +23702,7 @@
 "Note: the \"end\" command cannot be used at the gdb prompt."
 msgstr ""
 
-#: tracepoint.c:4837
+#: tracepoint.c:5252
 msgid ""
 "Specify single-stepping behavior at a tracepoint.\n"
 "Argument is number of instructions to trace in single-step mode\n"
@@ -22743,7 +23713,7 @@
 "Note: this command can only be used in a tracepoint \"actions\" list."
 msgstr ""
 
-#: tracepoint.c:4848
+#: tracepoint.c:5263
 msgid ""
 "Specify one or more data items to be collected at a tracepoint.\n"
 "Accepts a comma-separated list of (one or more) expressions.  GDB will\n"
@@ -22756,7 +23726,7 @@
 "Note: this command can only be used in a tracepoint \"actions\" list."
 msgstr ""
 
-#: tracepoint.c:4859
+#: tracepoint.c:5274
 msgid ""
 "Specify one or more expressions to be evaluated at a tracepoint.\n"
 "Accepts a comma-separated list of (one or more) expressions.\n"
@@ -22764,7 +23734,7 @@
 "Note: this command can only be used in a tracepoint \"actions\" list."
 msgstr ""
 
-#: tracepoint.c:4865
+#: tracepoint.c:5280
 msgid ""
 "Specify the actions to be taken at a tracepoint.\n"
 "Tracepoint actions may include collecting of specified data,\n"
@@ -22772,49 +23742,109 @@
 "depending on target's capabilities."
 msgstr ""
 
-#: tracepoint.c:4873
+#: tracepoint.c:5288
 msgid "Set the list of expressions to collect by default"
 msgstr ""
 
-#: tracepoint.c:4874
+#: tracepoint.c:5289
 msgid "Show the list of expressions to collect by default"
 msgstr ""
 
-#: tracepoint.c:4880
+#: tracepoint.c:5295
 msgid "Set whether tracing continues after GDB disconnects."
 msgstr ""
 
-#: tracepoint.c:4881
+#: tracepoint.c:5296
 msgid "Show whether tracing continues after GDB disconnects."
 msgstr ""
 
-#: tracepoint.c:4882
+#: tracepoint.c:5297
 msgid ""
 "Use this to continue a tracing run even if GDB disconnects\n"
 "or detaches from the target.  You can reconnect later and look at\n"
 "trace data collected in the meantime."
 msgstr ""
 
-#: tracepoint.c:4892
+#: tracepoint.c:5307
 msgid "Set target's use of circular trace buffer."
 msgstr ""
 
-#: tracepoint.c:4893
+#: tracepoint.c:5308
 msgid "Show target's use of circular trace buffer."
 msgstr ""
 
-#: tracepoint.c:4894
+#: tracepoint.c:5309
 msgid ""
 "Use this to make the trace buffer into a circular buffer,\n"
 "which will discard traceframes (oldest first) instead of filling\n"
 "up and stopping the trace run."
 msgstr ""
 
-#: tui/tui.c:369
-msgid "TUI mode not allowed"
+#: tracepoint.c:5319
+msgid "Set the user name to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5320
+msgid "Show the user name to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5326
+msgid "Set notes string to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5327
+msgid "Show the notes string to use for current and future trace runs"
+msgstr ""
+
+#: tracepoint.c:5333
+msgid "Set notes string to use for future tstop commands"
+msgstr ""
+
+#: tracepoint.c:5334
+msgid "Show the notes string to use for future tstop commands"
+msgstr ""
+
+#: tui/tui-file.c:80
+msgid "tui_file_delete: bad magic number"
 msgstr ""
 
-#: tui/tui-layout.c:389
+#: tui/tui-file.c:130
+msgid "tui_file_isatty: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:144
+msgid "tui_file_rewind: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:157
+msgid "tui_file_put: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:194
+msgid "tui_file_get_strbuf: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:209
+msgid "tui_file_adjust_strbuf: bad magic number"
+msgstr ""
+
+#: tui/tui-file.c:237
+msgid "tui_file_flush: bad magic number"
+msgstr ""
+
+#: tui/tui-hooks.c:80
+msgid "(y or n) "
+msgstr ""
+
+#: tui/tui-hooks.c:113
+msgid "Please answer y or n.\n"
+msgstr ""
+
+#: tui/tui-interp.c:140
+msgid "tui_exec called"
+msgstr ""
+
+#: tui/tui-layout.c:388
 msgid ""
 "Change the layout of windows.\n"
 "Usage: layout prev | next | <layout_name> \n"
@@ -22830,108 +23860,120 @@
 "           the window that has current logical focus.\n"
 msgstr ""
 
-#: tui/tui-layout.c:404
+#: tui/tui-layout.c:403
 msgid "Toggle between Source/Command and Disassembly/Command layouts.\n"
 msgstr ""
 
-#: tui/tui-layout.c:406
+#: tui/tui-layout.c:405
 msgid ""
 "Toggle between Source/Command or Disassembly/Command and \n"
 "Source/Disassembly/Command layouts.\n"
 msgstr ""
 
-#: tui/tui-layout.c:441
+#: tui/tui-layout.c:440
 msgid "Ambiguous command input."
 msgstr ""
 
-#: tui/tui-layout.c:614
+#: tui/tui-layout.c:613
 #, possible-c-format
 msgid ""
 "Invalid layout specified.\n"
 "%s"
 msgstr ""
 
-#: tui/tui-stack.c:360 valprint.c:305
-msgid "<unavailable>"
+#: tui/tui-regs.c:624
+msgid "\"tui reg\" must be followed by the name of a tui reg command.\n"
 msgstr ""
 
-#: tui/tui-stack.c:452
-msgid ""
-"Update the source window and locator to display the current execution "
-"point.\n"
+#: tui/tui-regs.c:640
+msgid "TUI commands to control the register window."
 msgstr ""
 
-#: tui/tui-file.c:81
-msgid "tui_file_delete: bad magic number"
+#: tui/tui-regs.c:645
+msgid "Display only floating point registers."
 msgstr ""
 
-#: tui/tui-file.c:131
-msgid "tui_file_isatty: bad magic number"
+#: tui/tui-regs.c:648
+msgid "Display only general registers."
 msgstr ""
 
-#: tui/tui-file.c:145
-msgid "tui_file_rewind: bad magic number"
+#: tui/tui-regs.c:651
+msgid "Display only system registers."
 msgstr ""
 
-#: tui/tui-file.c:158
-msgid "tui_file_put: bad magic number"
+#: tui/tui-regs.c:654
+msgid "Display next register group."
 msgstr ""
 
-#: tui/tui-file.c:195
-msgid "tui_file_get_strbuf: bad magic number"
+#: tui/tui-regs.c:660
+msgid "Display only floating point registers\n"
 msgstr ""
 
-#: tui/tui-file.c:210
-msgid "tui_file_adjust_strbuf: bad magic number"
+#: tui/tui-regs.c:662
+msgid "Display only general registers\n"
 msgstr ""
 
-#: tui/tui-file.c:238
-msgid "tui_file_flush: bad magic number"
+#: tui/tui-regs.c:664
+msgid "Display only special registers\n"
 msgstr ""
 
-#: tui/tui-interp.c:132
-msgid "tui_exec called"
+#: tui/tui-regs.c:666
+msgid "Scroll the registers window forward\n"
+msgstr ""
+
+#: tui/tui-regs.c:668
+msgid "Scroll the register window backward\n"
+msgstr ""
+
+#: tui/tui-stack.c:360 valprint.c:306
+msgid "<unavailable>"
+msgstr ""
+
+#: tui/tui-stack.c:455
+msgid ""
+"Update the source window and locator to display the current execution "
+"point.\n"
 msgstr ""
 
-#: tui/tui-win.c:212
+#: tui/tui-win.c:211
 #, possible-c-format
 msgid ""
 "The attribute mode to use for the active TUI window border is \"%s\".\n"
 msgstr ""
 
-#: tui/tui-win.c:224
+#: tui/tui-win.c:223
 #, possible-c-format
 msgid "The attribute mode to use for the TUI window borders is \"%s\".\n"
 msgstr ""
 
-#: tui/tui-win.c:236
+#: tui/tui-win.c:235
 #, possible-c-format
 msgid "The kind of border for TUI windows is \"%s\".\n"
 msgstr ""
 
-#: tui/tui-win.c:335
+#: tui/tui-win.c:334
 msgid "\"tui\" must be followed by the name of a tui command.\n"
 msgstr ""
 
-#: tui/tui-win.c:345
+#: tui/tui-win.c:344
 msgid "Text User Interface commands."
 msgstr ""
 
-#: tui/tui-win.c:365 tui/tui-win.c:369
+#: tui/tui-win.c:364 tui/tui-win.c:368
 msgid "TUI configuration variables"
 msgstr ""
 
-#: tui/tui-win.c:374
+#: tui/tui-win.c:373
 msgid "Refresh the terminal display.\n"
 msgstr ""
 
-#: tui/tui-win.c:377
+#: tui/tui-win.c:376
 msgid ""
 "Set the width (in characters) of tab stops.\n"
 "Usage: tabset <n>\n"
 msgstr ""
 
-#: tui/tui-win.c:380
+#: tui/tui-win.c:379
 msgid ""
 "Set the height of a specified window.\n"
 "Usage: winheight <win_name> [+ | -] <#lines>\n"
@@ -22942,11 +23984,11 @@
 "regs : the register display\n"
 msgstr ""
 
-#: tui/tui-win.c:390
+#: tui/tui-win.c:389
 msgid "List of all displayed windows.\n"
 msgstr ""
 
-#: tui/tui-win.c:391
+#: tui/tui-win.c:390
 msgid ""
 "Set focus to named window or next/prev window.\n"
 "Usage: focus {<win> | next | prev}\n"
@@ -22957,45 +23999,45 @@
 "cmd  : the command window\n"
 msgstr ""
 
-#: tui/tui-win.c:400
+#: tui/tui-win.c:399
 msgid ""
 "Scroll window forward.\n"
 "Usage: + [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:403
+#: tui/tui-win.c:402
 msgid ""
 "Scroll window backward.\n"
 "Usage: - [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:406
+#: tui/tui-win.c:405
 msgid ""
 "Scroll window forward.\n"
 "Usage: < [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:409
+#: tui/tui-win.c:408
 msgid ""
 "Scroll window backward.\n"
 "Usage: > [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:413
+#: tui/tui-win.c:412
 msgid ""
 "XDB compatibility command for setting the height of a command window.\n"
 "Usage: w <#lines>\n"
 msgstr ""
 
-#: tui/tui-win.c:419
+#: tui/tui-win.c:418
 msgid "Set the kind of border for TUI windows."
 msgstr ""
 
-#: tui/tui-win.c:420
+#: tui/tui-win.c:419
 msgid "Show the kind of border for TUI windows."
 msgstr ""
 
-#: tui/tui-win.c:421
+#: tui/tui-win.c:420
 msgid ""
 "This variable controls the border of TUI windows:\n"
 "space           use a white space\n"
@@ -23003,15 +24045,15 @@
 "acs             use the Alternate Character Set"
 msgstr ""
 
-#: tui/tui-win.c:431
+#: tui/tui-win.c:430
 msgid "Set the attribute mode to use for the TUI window borders."
 msgstr ""
 
-#: tui/tui-win.c:432
+#: tui/tui-win.c:431
 msgid "Show the attribute mode to use for the TUI window borders."
 msgstr ""
 
-#: tui/tui-win.c:433
+#: tui/tui-win.c:432
 msgid ""
 "This variable controls the attributes to use for the window borders:\n"
 "normal          normal display\n"
@@ -23023,15 +24065,15 @@
 "bold-standout   use extra bright or bold with standout mode"
 msgstr ""
 
-#: tui/tui-win.c:447
+#: tui/tui-win.c:446
 msgid "Set the attribute mode to use for the active TUI window border."
 msgstr ""
 
-#: tui/tui-win.c:448
+#: tui/tui-win.c:447
 msgid "Show the attribute mode to use for the active TUI window border."
 msgstr ""
 
-#: tui/tui-win.c:449
+#: tui/tui-win.c:448
 msgid ""
 "This variable controls the attributes to use for the active window border:\n"
 "normal          normal display\n"
@@ -23043,165 +24085,120 @@
 "bold-standout   use extra bright or bold with standout mode"
 msgstr ""
 
-#: tui/tui-win.c:930 tui/tui-win.c:1036 tui/tui-win.c:1598
+#: tui/tui-win.c:929 tui/tui-win.c:1035 tui/tui-win.c:1597
 msgid ""
 "Invalid window specified. \n"
 "The window name specified must be valid and visible.\n"
 msgstr ""
 
-#: tui/tui-win.c:941
+#: tui/tui-win.c:940
 #, possible-c-format
 msgid "Focus set to %s window.\n"
 msgstr ""
 
-#: tui/tui-win.c:946
+#: tui/tui-win.c:945
 #, possible-c-format
 msgid ""
 "Incorrect Number of Arguments.\n"
 "%s"
 msgstr ""
 
-#: tui/tui-win.c:1004
+#: tui/tui-win.c:1003
 msgid "Tab widths greater than 0 must be specified."
 msgstr ""
 
-#: tui/tui-win.c:1071 tui/tui-win.c:1077 tui/tui-win.c:1121 tui/tui-win.c:1125
-#: tui/tui-win.c:1129
+#: tui/tui-win.c:1070 tui/tui-win.c:1076 tui/tui-win.c:1120 tui/tui-win.c:1124
+#: tui/tui-win.c:1128
 #, possible-c-format
 msgid ""
 "Invalid window height specified.\n"
 "%s"
 msgstr ""
 
-#: tui/tui-regs.c:625
-msgid "\"tui reg\" must be followed by the name of a tui reg command.\n"
-msgstr ""
-
-#: tui/tui-regs.c:641
-msgid "TUI commands to control the register window."
-msgstr ""
-
-#: tui/tui-regs.c:646
-msgid "Display only floating point registers."
-msgstr ""
-
-#: tui/tui-regs.c:649
-msgid "Display only general registers."
-msgstr ""
-
-#: tui/tui-regs.c:652
-msgid "Display only system registers."
-msgstr ""
-
-#: tui/tui-regs.c:655
-msgid "Display next register group."
-msgstr ""
-
-#: tui/tui-regs.c:661
-msgid "Display only floating point registers\n"
-msgstr ""
-
-#: tui/tui-regs.c:663
-msgid "Display only general registers\n"
-msgstr ""
-
-#: tui/tui-regs.c:665
-msgid "Display only special registers\n"
-msgstr ""
-
-#: tui/tui-regs.c:667
-msgid "Scroll the registers window forward\n"
-msgstr ""
-
-#: tui/tui-regs.c:669
-msgid "Scroll the register window backward\n"
-msgstr ""
-
-#: tui/tui-hooks.c:81
-msgid "(y or n) "
-msgstr ""
-
-#: tui/tui-hooks.c:114
-msgid "Please answer y or n.\n"
+#: tui/tui.c:368
+msgid "TUI mode not allowed"
 msgstr ""
 
-#: typeprint.c:266
+#: typeprint.c:265
 msgid "internal error: unhandled type in print_type_scalar"
 msgstr ""
 
-#: typeprint.c:315
+#: typeprint.c:314
 msgid ""
 "Print definition of type TYPE.\n"
 "Argument may be a type name defined by typedef, or \"struct STRUCT-TAG\"\n"
 "or \"class CLASS-NAME\" or \"union UNION-TAG\" or \"enum ENUM-TAG\".\n"
-"The selected stack frame's lexical context is used to look up the name."
+"The selected stack frame's lexical context is used to look up the name.\n"
+"Contrary to \"whatis\", \"ptype\" always unrolls any typedefs."
 msgstr ""
 
 #: typeprint.c:322
-msgid "Print data type of expression EXP."
+msgid ""
+"Print data type of expression EXP.\n"
+"Only one level of typedefs is unrolled.  See also \"ptype\"."
 msgstr ""
 
-#: ui-file.c:168
+#: ui-file.c:178
 msgid "ui_file_data: bad magic number"
 msgstr ""
 
-#: ui-file.c:368
+#: ui-file.c:393
 msgid "mem_file_delete: bad magic number"
 msgstr ""
 
-#: ui-file.c:387
+#: ui-file.c:412
 msgid "mem_file_rewind: bad magic number"
 msgstr ""
 
-#: ui-file.c:400
+#: ui-file.c:425
 msgid "mem_file_put: bad magic number"
 msgstr ""
 
-#: ui-file.c:414
+#: ui-file.c:439
 msgid "mem_file_write: bad magic number"
 msgstr ""
 
-#: ui-file.c:481
+#: ui-file.c:512
 msgid "stdio_file_delete: bad magic number"
 msgstr ""
 
-#: ui-file.c:496
+#: ui-file.c:527
 msgid "stdio_file_flush: bad magic number"
 msgstr ""
 
-#: ui-file.c:507
+#: ui-file.c:538
 msgid "stdio_file_read: bad magic number"
 msgstr ""
 
-#: ui-file.c:532
+#: ui-file.c:561
 msgid "stdio_file_write: bad magic number"
 msgstr ""
 
-#: ui-file.c:545
+#: ui-file.c:596
 msgid "stdio_file_fputs: bad magic number"
 msgstr ""
 
-#: ui-file.c:558
+#: ui-file.c:609
 msgid "stdio_file_isatty: bad magic number"
 msgstr ""
 
-#: ui-file.c:624
+#: ui-file.c:675
 msgid "tee_file_delete: bad magic number"
 msgstr ""
 
-#: ui-file.c:640
+#: ui-file.c:691
 msgid "tee_file_flush: bad magic number"
 msgstr ""
 
-#: ui-file.c:652
+#: ui-file.c:703
 msgid "tee_file_write: bad magic number"
 msgstr ""
 
-#: ui-file.c:664
+#: ui-file.c:715
 msgid "tee_file_fputs: bad magic number"
 msgstr ""
 
-#: ui-file.c:676
+#: ui-file.c:727
 msgid "tee_file_isatty: bad magic number"
 msgstr ""
 
@@ -23240,65 +24237,55 @@
 "table_body."
 msgstr ""
 
-#: ui-out.c:1088
+#: ui-out.c:1090
 msgid ""
 "table_body missing; table fields must be specified after table_body and "
 "inside a list."
 msgstr ""
 
-#: ui-out.c:1105
+#: ui-out.c:1107
 msgid "ui-out internal error in handling headers."
 msgstr ""
 
-#: utils.c:147
-#, possible-c-format
-msgid "Demangling of encoded C++/ObjC names when displaying symbols is %s.\n"
-msgstr ""
-
-#: utils.c:162
-#, possible-c-format
-msgid "Demangling of C++/ObjC names in disassembly listings is %s.\n"
-msgstr ""
-
-#: utils.c:176
+#: utils.c:148
 #, possible-c-format
 msgid "Printing of 8-bit characters in strings as \\nnn is %s.\n"
 msgstr ""
 
-#: utils.c:198
+#: utils.c:170
 #, possible-c-format
 msgid "State of pagination is %s.\n"
 msgstr ""
 
-#: utils.c:325
+#: utils.c:309
 msgid "Cannot restore redirection of the current output protocol"
 msgstr ""
 
-#: utils.c:575
+#: utils.c:628
 msgid "free_current_contents: NULL pointer"
 msgstr ""
 
-#: utils.c:646
+#: utils.c:705
 #, possible-c-format
-msgid "Startup time: %ld.%06ld\n"
+msgid "Startup time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"
 msgstr ""
 
-#: utils.c:647
+#: utils.c:706
 #, possible-c-format
-msgid "Command execution time: %ld.%06ld\n"
+msgid "Command execution time: %ld.%06ld (cpu), %ld.%06ld (wall)\n"
 msgstr ""
 
-#: utils.c:660
+#: utils.c:721
 #, possible-c-format
 msgid "Space used: %ld (%s%ld during startup)\n"
 msgstr ""
 
-#: utils.c:661
+#: utils.c:722
 #, possible-c-format
 msgid "Space used: %ld (%s%ld for this command)\n"
 msgstr ""
 
-#: utils.c:1072
+#: utils.c:872
 #, possible-c-format
 msgid ""
 "%s\n"
@@ -23306,7 +24293,7 @@
 "time.\n"
 msgstr ""
 
-#: utils.c:1180
+#: utils.c:980
 #, possible-c-format
 msgid ""
 "%s\n"
@@ -23316,74 +24303,70 @@
 #. Default (yes/batch case) is to dump core.  This leaves a GDB
 #. `dropping' so that it is easier to see that something went
 #. wrong in GDB.
-#: utils.c:1198
+#: utils.c:998
 #, possible-c-format
 msgid ""
 "%s\n"
 "Create a core file of GDB? "
 msgstr ""
 
-#: utils.c:1310
+#: utils.c:1110
 #, possible-c-format
 msgid "Configure what GDB does when %s is detected."
 msgstr ""
 
-#: utils.c:1313
+#: utils.c:1113
 #, possible-c-format
 msgid "Show what GDB does when %s is detected."
 msgstr ""
 
 #. allow-unknown
-#: utils.c:1330
+#: utils.c:1130
 #, possible-c-format
 msgid "Set whether GDB should quit when an %s is detected"
 msgstr ""
 
-#: utils.c:1333
+#: utils.c:1133
 #, possible-c-format
 msgid "Show whether GDB will quit when an %s is detected"
 msgstr ""
 
-#: utils.c:1350
+#: utils.c:1150
 #, possible-c-format
 msgid "Set whether GDB should create a core file of GDB when %s is detected"
 msgstr ""
 
-#: utils.c:1353
+#: utils.c:1153
 #, possible-c-format
 msgid "Show whether GDB will create a core file of GDB when %s is detected"
 msgstr ""
 
-#: utils.c:1447
+#: utils.c:1247
 #, possible-c-format
 msgid "virtual memory exhausted: can't allocate %ld bytes."
 msgstr ""
 
-#: utils.c:1452
+#: utils.c:1252
 msgid "virtual memory exhausted."
 msgstr ""
 
-#: utils.c:1578
-msgid "vasprintf call failed"
-msgstr ""
-
-#: utils.c:1738
+#: utils.c:1398
 #, possible-c-format
 msgid "(%s or %s) [answered %c; input not from terminal]\n"
 msgstr ""
 
-#: utils.c:1763
+#: utils.c:1423
 #, possible-c-format
 msgid "(%s or %s) "
 msgstr ""
 
 #. Invalid entries are not defaulted and require another selection.
-#: utils.c:1827
+#: utils.c:1487
 #, possible-c-format
 msgid "Please answer %s or %s.\n"
 msgstr ""
 
-#: utils.c:2004
+#: utils.c:1664
 #, possible-c-format
 msgid ""
 "The escape sequence `\\%c' is equivalent to plain `%c', which has no "
@@ -23391,410 +24374,393 @@
 "in the `%s' character set."
 msgstr ""
 
-#: utils.c:2109
+#: utils.c:1769
 #, possible-c-format
 msgid "Number of lines gdb thinks are in a page is %s.\n"
 msgstr ""
 
-#: utils.c:2120
+#: utils.c:1780
 #, possible-c-format
 msgid "Number of characters gdb thinks are in a line is %s.\n"
 msgstr ""
 
-#: utils.c:3116
+#: utils.c:2813
 #, possible-c-format
 msgid "Timestamping debugging messages is %s.\n"
 msgstr ""
 
-#: utils.c:3124
+#: utils.c:2821
 msgid "Set number of characters gdb thinks are in a line."
 msgstr ""
 
-#: utils.c:3125
+#: utils.c:2822
 msgid "Show number of characters gdb thinks are in a line."
 msgstr ""
 
-#: utils.c:3131
+#: utils.c:2828
 msgid "Set number of lines gdb thinks are in a page."
 msgstr ""
 
-#: utils.c:3132
+#: utils.c:2829
 msgid "Show number of lines gdb thinks are in a page."
 msgstr ""
 
-#: utils.c:3140
-msgid "Set demangling of encoded C++/ObjC names when displaying symbols."
-msgstr ""
-
-#: utils.c:3141
-msgid "Show demangling of encoded C++/ObjC names when displaying symbols."
-msgstr ""
-
-#: utils.c:3148
+#: utils.c:2838
 msgid "Set state of pagination."
 msgstr ""
 
-#: utils.c:3149
+#: utils.c:2839
 msgid "Show state of pagination."
 msgstr ""
 
-#: utils.c:3158
+#: utils.c:2848
 msgid "Enable pagination"
 msgstr ""
 
-#: utils.c:3160
+#: utils.c:2850
 msgid "Disable pagination"
 msgstr ""
 
-#: utils.c:3164
+#: utils.c:2854
 msgid "Set printing of 8-bit characters in strings as \\nnn."
 msgstr ""
 
-#: utils.c:3165
+#: utils.c:2855
 msgid "Show printing of 8-bit characters in strings as \\nnn."
 msgstr ""
 
-#: utils.c:3171
-msgid "Set demangling of C++/ObjC names in disassembly listings."
-msgstr ""
-
-#: utils.c:3172
-msgid "Show demangling of C++/ObjC names in disassembly listings."
-msgstr ""
-
-#: utils.c:3179
+#: utils.c:2862
 msgid "Set timestamping of debugging messages."
 msgstr ""
 
-#: utils.c:3180
+#: utils.c:2863
 msgid "Show timestamping of debugging messages."
 msgstr ""
 
-#: utils.c:3181
+#: utils.c:2864
 msgid ""
 "When set, debugging messages will be marked with seconds and microseconds."
 msgstr ""
 
-#: utils.c:3441
+#: utils.c:3145
 msgid "hex_string_custom: insufficient space to store result"
 msgstr ""
 
-#: utils.c:3536
+#: utils.c:3240
 #, possible-c-format
 msgid "invalid hex \"%s\""
 msgstr ""
 
-#: utils.c:3549
+#: utils.c:3253
 #, possible-c-format
 msgid "invalid decimal \"%s\""
 msgstr ""
 
-#: utils.c:3998
+#: utils.c:3713
 msgid "process-id to attach"
 msgstr ""
 
-#: utils.c:4004
+#: utils.c:3719
 #, possible-c-format
 msgid "Illegal process-id: %s."
 msgstr ""
 
-#: valarith.c:74
+#: valarith.c:73
 msgid ""
 "Cannot perform pointer math on incomplete types, try casting to a known "
 "type, or void *."
 msgstr ""
 
-#: valarith.c:77
+#: valarith.c:76
 #, possible-c-format
 msgid ""
 "Cannot perform pointer math on incomplete type \"%s\", try casting to a "
 "known type, or void *."
 msgstr ""
 
-#: valarith.c:124
+#: valarith.c:123
 msgid ""
 "First argument of `-' is a pointer and second argument is neither\n"
 "an integer nor a pointer of the same type."
 msgstr ""
 
-#: valarith.c:131
+#: valarith.c:130
 msgid ""
 "Type size unknown, assuming 1. Try casting to a known type, or void *."
 msgstr ""
 
-#: valarith.c:176
+#: valarith.c:175
 msgid "array or string index out of range"
 msgstr ""
 
-#: valarith.c:188
+#: valarith.c:187
 msgid "not an array or string"
 msgstr ""
 
-#: valarith.c:206
+#: valarith.c:205
 msgid "no such vector element"
 msgstr ""
 
-#: valarith.c:243
+#: valarith.c:242
 msgid "bitstring index out of range"
 msgstr ""
 
-#: valarith.c:363
+#: valarith.c:355
 #, possible-c-format
 msgid "Could not find %s."
 msgstr ""
 
-#: valarith.c:409
+#: valarith.c:401
 msgid "Can't do that binary op on that type"
 msgstr ""
 
-#: valarith.c:495 valarith.c:521
+#: valarith.c:487 valarith.c:513
 msgid "Invalid binary operation specified."
 msgstr ""
 
-#: valarith.c:546 valarith.c:650
+#: valarith.c:538 valarith.c:642
 #, possible-c-format
 msgid "member function %s not found"
 msgstr ""
 
-#: valarith.c:573
+#: valarith.c:565
 msgid "Can't do that unary op on that type"
 msgstr ""
 
-#: valarith.c:625
+#: valarith.c:617
 msgid "Invalid unary operation specified."
 msgstr ""
 
-#: valarith.c:749
+#: valarith.c:741
 msgid "unimplemented support for bitstring/boolean repeats"
 msgstr ""
 
-#: valarith.c:753
+#: valarith.c:745
 msgid "can't repeat values of that type"
 msgstr ""
 
-#: valarith.c:763
+#: valarith.c:755
 msgid "Strings can only be concatenated with other strings."
 msgstr ""
 
-#: valarith.c:798
+#: valarith.c:790
 msgid ""
 "Bitstrings or booleans can only be concatenated with other bitstrings or "
 "booleans."
 msgstr ""
 
-#: valarith.c:801
+#: valarith.c:793
 msgid "unimplemented support for bitstring/boolean concatenation."
 msgstr ""
 
 #. We don't know how to concatenate these operands.
-#: valarith.c:806
+#: valarith.c:798
 msgid "illegal operands for concatenation."
 msgstr ""
 
-#: valarith.c:820 valarith.c:851
+#: valarith.c:812 valarith.c:843
 msgid "Attempt to raise 0 to negative power."
 msgstr ""
 
 #. The DFP extension to the C language does not allow mixing of
 #. * decimal float types with other float types in expressions
 #. * (see WDTR 24732, page 12).
-#: valarith.c:894
+#: valarith.c:886
 msgid ""
 "Mixing decimal floating types with other floating types is not allowed."
 msgstr ""
 
-#: valarith.c:913 valarith.c:932
+#: valarith.c:905 valarith.c:924
 #, possible-c-format
 msgid "Don't know how to convert from %s to %s."
 msgstr ""
 
-#: valarith.c:1000
+#: valarith.c:992
 msgid "Operation not valid for decimal floating point number."
 msgstr ""
 
-#: valarith.c:1038
+#: valarith.c:1030
 #, possible-c-format
 msgid "Cannot perform exponentiation: %s"
 msgstr ""
 
-#: valarith.c:1051
+#: valarith.c:1043
 msgid "Integer-only operation on floating point number."
 msgstr ""
 
-#: valarith.c:1099
+#: valarith.c:1091
 msgid "Invalid operation on booleans."
 msgstr ""
 
-#: valarith.c:1249 valarith.c:1379
+#: valarith.c:1151 valarith.c:1162 valarith.c:1277 valarith.c:1288
+msgid "Division by zero"
+msgstr ""
+
+#: valarith.c:1241 valarith.c:1371
 msgid "Invalid binary operation on numbers."
 msgstr ""
 
-#: valarith.c:1414
+#: valarith.c:1406
 msgid "Vector operations are only supported among vectors"
 msgstr ""
 
-#: valarith.c:1616
+#: valarith.c:1608
 msgid "Invalid type combination in equality test."
 msgstr ""
 
-#: valarith.c:1698
+#: valarith.c:1690
 msgid "Invalid type combination in ordering comparison."
 msgstr ""
 
-#: valarith.c:1731
+#: valarith.c:1723
 msgid "Argument to positive operation not a number."
 msgstr ""
 
-#: valarith.c:1786
+#: valarith.c:1778
 msgid "Argument to negate operation not a number."
 msgstr ""
 
-#: valarith.c:1821
+#: valarith.c:1813
 msgid "Argument to complement operation not an integer, boolean."
 msgstr ""
 
-#: valarith.c:1862
+#: valarith.c:1854
 msgid "Second argument of 'IN' has wrong type"
 msgstr ""
 
-#: valarith.c:1867
+#: valarith.c:1859
 msgid "First argument of 'IN' has wrong type"
 msgstr ""
 
-#: valarith.c:1871
+#: valarith.c:1863
 msgid "First argument of 'IN' not in range"
 msgstr ""
 
-#: valops.c:125
+#: valops.c:123
 #, possible-c-format
 msgid "Overload resolution in evaluating C++ functions is %s.\n"
 msgstr ""
 
-#: valops.c:144
+#: valops.c:142
 #, possible-c-format
 msgid "\"%s\" exists in this program but is not a function."
 msgstr ""
 
-#: valops.c:178
+#: valops.c:176
 msgid ""
 "evaluation of this expression requires the target program to be active"
 msgstr ""
 
-#: valops.c:181
+#: valops.c:179
 #, possible-c-format
 msgid ""
 "evaluation of this expression requires the program to have a function \"%s\"."
 msgstr ""
 
-#: valops.c:205
+#: valops.c:203
 msgid ""
 "No memory available to program now: you need to start the target first"
 msgstr ""
 
-#: valops.c:208
+#: valops.c:206
 msgid "No memory available to program: call to malloc failed"
 msgstr ""
 
-#: valops.c:413
+#: valops.c:411
 msgid "array element type size does not divide object size in cast"
 msgstr ""
 
-#: valops.c:528
+#: valops.c:526
 msgid "value truncated"
 msgstr ""
 
-#: valops.c:589
+#: valops.c:587
 msgid "Invalid cast."
 msgstr ""
 
-#: valops.c:640
+#: valops.c:638
 msgid "Invalid reinterpret_cast"
 msgstr ""
 
-#: valops.c:754
+#: valops.c:752
 msgid "Argument to dynamic_cast must be a pointer or reference type"
 msgstr ""
 
-#: valops.c:757
+#: valops.c:755
 msgid "Argument to dynamic_cast must be pointer to class or `void *'"
 msgstr ""
 
-#: valops.c:765
+#: valops.c:763
 msgid "Argument to dynamic_cast does not have pointer type"
 msgstr ""
 
-#: valops.c:770
+#: valops.c:768
 msgid "Argument to dynamic_cast does not have pointer to class type"
 msgstr ""
 
-#: valops.c:783
+#: valops.c:781
 msgid "Argument to dynamic_cast does not have class type"
 msgstr ""
 
-#: valops.c:796
+#: valops.c:794
 msgid "Ambiguous dynamic_cast"
 msgstr ""
 
-#: valops.c:801
+#: valops.c:799
 msgid "Couldn't determine value's most derived type for dynamic_cast"
 msgstr ""
 
-#: valops.c:853
+#: valops.c:851
 msgid "dynamic_cast failed"
 msgstr ""
 
-#: valops.c:911
+#: valops.c:909
 msgid "Not a numeric type."
 msgstr ""
 
-#: valops.c:998 valops.c:1351 value.c:813
+#: valops.c:998 valops.c:1352 value.c:826
 msgid "value has been optimized out"
 msgstr ""
 
-#: valops.c:1116
+#: valops.c:1117
 msgid "Unexpected lazy value type."
 msgstr ""
 
-#: valops.c:1281 valops.c:1342
+#: valops.c:1282 valops.c:1343
 #, possible-c-format
 msgid "Can't handle bitfields which don't fit in a %d bit word."
 msgstr ""
 
-#: valops.c:1314
+#: valops.c:1315
 msgid "Value being assigned to is no longer active."
 msgstr ""
 
-#: valops.c:1354 value.c:820
+#: valops.c:1355 value.c:833
 msgid "value is not available"
 msgstr ""
 
-#: valops.c:1387
+#: valops.c:1392
 msgid "Left operand of assignment is not an lvalue."
 msgstr ""
 
-#: valops.c:1470
+#: valops.c:1475
 msgid "Only values in memory can be extended with '@'."
 msgstr ""
 
-#: valops.c:1472
+#: valops.c:1477
 #, possible-c-format
 msgid "Invalid number %d of repetitions."
 msgstr ""
 
-#: valops.c:1503
+#: valops.c:1507
 #, possible-c-format
 msgid "No frame is currently executing in block %s."
 msgstr ""
 
-#: valops.c:1506
+#: valops.c:1510
 msgid "No frame is currently executing in specified block"
 msgstr ""
 
-#: valops.c:1512
-#, possible-c-format
-msgid "Address of symbol \"%s\" is unknown."
-msgstr ""
-
 #: valops.c:1551
 #, possible-c-format
 msgid "Address requested for identifier \"%s\" which is in register $%s"
@@ -23864,7 +24830,7 @@
 "Attempt to extract a component of a value that is not a struct or union"
 msgstr ""
 
-#: valops.c:2599
+#: valops.c:2601
 #, possible-c-format
 msgid "Couldn't find method %s%s%s"
 msgstr ""
@@ -23873,97 +24839,91 @@
 #. FIXME: GDB does not support the general ambiguous case.
 #. All candidates should be collected and presented the
 #. user.
-#: valops.c:2707
+#: valops.c:2711
 msgid "Ambiguous overload resolution"
 msgstr ""
 
 #. Incomparable top contenders.
 #. This is an error incompatible candidates
 #. should not have been proposed.
-#: valops.c:2712
+#: valops.c:2716
 msgid "Internal error: incompatible overload candidates proposed"
 msgstr ""
 
-#: valops.c:2724
+#: valops.c:2728
 msgid "Internal error: unexpected overload comparison result"
 msgstr ""
 
-#: valops.c:2740
+#: valops.c:2744
 #, possible-c-format
 msgid "Cannot resolve method %s%s%s to any overloaded instance"
 msgstr ""
 
-#: valops.c:2745
+#: valops.c:2749
 #, possible-c-format
 msgid "Cannot resolve function %s to any overloaded instance"
 msgstr ""
 
-#: valops.c:2751
+#: valops.c:2755
 #, possible-c-format
 msgid ""
 "Using non-standard conversion to match method %s%s%s to supplied arguments"
 msgstr ""
 
-#: valops.c:2757
+#: valops.c:2761
 #, possible-c-format
 msgid ""
 "Using non-standard conversion to match function %s to supplied arguments"
 msgstr ""
 
-#: valops.c:3117
+#: valops.c:3136
 msgid "name of destructor must equal name of class"
 msgstr ""
 
-#: valops.c:3183
+#: valops.c:3202
 msgid "non-aggregate type in value_aggregate_elt"
 msgstr ""
 
-#: valops.c:3259
+#: valops.c:3278
 msgid "Internal error: non-aggregate type to value_struct_elt_for_reference"
 msgstr ""
 
-#: valops.c:3272
+#: valops.c:3291
 #, possible-c-format
 msgid "static field %s has been optimized out"
 msgstr ""
 
-#: valops.c:3334
+#: valops.c:3353
 msgid "no member function matches that type instantiation"
 msgstr ""
 
-#: valops.c:3360
+#: valops.c:3379
 #, possible-c-format
 msgid "non-unique member `%s' requires type instantiation"
 msgstr ""
 
-#: valops.c:3367
+#: valops.c:3386
 msgid "no matching member function"
 msgstr ""
 
-#: valops.c:3398
+#: valops.c:3417
 #, possible-c-format
 msgid "Cannot reference virtual member function \"%s\""
 msgstr ""
 
-#: valops.c:3576
+#: valops.c:3602
 #, possible-c-format
 msgid ""
 "Couldn't retrieve complete object of RTTI type %s; object may be in "
 "register(s)."
 msgstr ""
 
-#: valops.c:3610
-msgid "no frame selected"
-msgstr ""
-
-#: valops.c:3622
-#, possible-c-format
-msgid "no `%s' in nameless context"
+#: valops.c:3634
+msgid "no `this' in current language"
 msgstr ""
 
-#: valops.c:3631
-#, possible-c-format
-msgid "no args, no `%s'"
+#: valops.c:3636
+msgid "no frame selected"
 msgstr ""
 
 #: valops.c:3642
@@ -23971,240 +24931,235 @@
 msgid "current stack frame does not contain a variable named `%s'"
 msgstr ""
 
-#: valops.c:3650
-#, possible-c-format
-msgid "`%s' argument unreadable"
-msgstr ""
-
-#: valops.c:3686
+#: valops.c:3685
 msgid "slice from bad array or bitstring"
 msgstr ""
 
-#: valops.c:3690
+#: valops.c:3689
 msgid "slice out of range"
 msgstr ""
 
-#: valops.c:3714
+#: valops.c:3713
 msgid "internal error accessing bitstring"
 msgstr ""
 
-#: valops.c:3808
+#: valops.c:3807
 msgid "cannot cast non-number to complex"
 msgstr ""
 
-#: valops.c:3815
+#: valops.c:3814
 msgid "Set overload resolution in evaluating C++ functions."
 msgstr ""
 
-#: valops.c:3816
+#: valops.c:3815
 msgid "Show overload resolution in evaluating C++ functions."
 msgstr ""
 
-#: valprint.c:121
+#: valprint.c:122
 #, possible-c-format
 msgid "Limit on string chars or array elements to print is %s.\n"
 msgstr ""
 
-#: valprint.c:135
+#: valprint.c:136
 #, possible-c-format
 msgid "Default input radix for entering numbers is %s.\n"
 msgstr ""
 
-#: valprint.c:145
+#: valprint.c:146
 #, possible-c-format
 msgid "Default output radix for printing of values is %s.\n"
 msgstr ""
 
-#: valprint.c:156
+#: valprint.c:157
 #, possible-c-format
 msgid "Printing of array indexes is %s.\n"
 msgstr ""
 
-#: valprint.c:167
+#: valprint.c:168
 #, possible-c-format
 msgid "Threshold for repeated print elements is %s.\n"
 msgstr ""
 
-#: valprint.c:178
+#: valprint.c:179
 #, possible-c-format
 msgid "Printing of char arrays to stop at first null char is %s.\n"
 msgstr ""
 
-#: valprint.c:189
+#: valprint.c:190
 #, possible-c-format
 msgid "Prettyprinting of structures is %s.\n"
 msgstr ""
 
-#: valprint.c:198
+#: valprint.c:199
 #, possible-c-format
 msgid "Prettyprinting of arrays is %s.\n"
 msgstr ""
 
-#: valprint.c:209
+#: valprint.c:210
 #, possible-c-format
 msgid "Printing of unions interior to structures is %s.\n"
 msgstr ""
 
-#: valprint.c:219
+#: valprint.c:220
 #, possible-c-format
 msgid "Printing of addresses is %s.\n"
 msgstr ""
 
-#: valprint.c:299
+#: valprint.c:300
 msgid "<optimized out>"
 msgstr ""
 
-#: valprint.c:311
+#: valprint.c:312
 msgid "<invalid address>"
 msgstr ""
 
-#: valprint.c:407
+#: valprint.c:409
 msgid "<address of value unknown>"
 msgstr ""
 
-#: valprint.c:419
+#: valprint.c:424
 #, possible-c-format
 msgid "<internal function %s>"
 msgstr ""
 
-#: valprint.c:656
+#: valprint.c:661
 msgid "Value out of range."
 msgstr ""
 
-#: valprint.c:899 valprint.c:949
+#: valprint.c:904 valprint.c:954
 msgid "Internal error in octal conversion;"
 msgstr ""
 
-#: valprint.c:1223
+#: valprint.c:1228
 msgid "unable to get bounds of array, assuming null array"
 msgstr ""
 
-#: valprint.c:1605
+#: valprint.c:2054
 #, possible-c-format
 msgid "Nonsense input radix ``decimal %u''; input radix unchanged."
 msgstr ""
 
-#: valprint.c:1611
+#: valprint.c:2060
 #, possible-c-format
 msgid "Input radix now set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1647
+#: valprint.c:2096
 #, possible-c-format
 msgid "Unsupported output radix ``decimal %u''; output radix unchanged."
 msgstr ""
 
-#: valprint.c:1654
+#: valprint.c:2103
 #, possible-c-format
 msgid "Output radix now set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1678
+#: valprint.c:2127
 #, possible-c-format
 msgid "Input and output radices now set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1693
+#: valprint.c:2142
 #, possible-c-format
 msgid "Input and output radices set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1699
+#: valprint.c:2148
 #, possible-c-format
 msgid "Input radix set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1702
+#: valprint.c:2151
 #, possible-c-format
 msgid "Output radix set to decimal %u, hex %x, octal %o.\n"
 msgstr ""
 
-#: valprint.c:1728
+#: valprint.c:2177
 msgid "Generic command for setting how things print."
 msgstr ""
 
-#: valprint.c:1735
+#: valprint.c:2184
 msgid "Generic command for showing print settings."
 msgstr ""
 
-#: valprint.c:1741
+#: valprint.c:2190
 msgid "Set limit on string chars or array elements to print."
 msgstr ""
 
-#: valprint.c:1742
+#: valprint.c:2191
 msgid "Show limit on string chars or array elements to print."
 msgstr ""
 
-#: valprint.c:1743
+#: valprint.c:2192
 msgid "\"set print elements 0\" causes there to be no limit."
 msgstr ""
 
-#: valprint.c:1750
+#: valprint.c:2199
 msgid "Set printing of char arrays to stop at first null char."
 msgstr ""
 
-#: valprint.c:1751
+#: valprint.c:2200
 msgid "Show printing of char arrays to stop at first null char."
 msgstr ""
 
-#: valprint.c:1758
+#: valprint.c:2207
 msgid "Set threshold for repeated print elements."
 msgstr ""
 
-#: valprint.c:1759
+#: valprint.c:2208
 msgid "Show threshold for repeated print elements."
 msgstr ""
 
-#: valprint.c:1760
+#: valprint.c:2209
 msgid ""
 "\"set print repeats 0\" causes all elements to be individually printed."
 msgstr ""
 
-#: valprint.c:1767
+#: valprint.c:2216
 msgid "Set prettyprinting of structures."
 msgstr ""
 
-#: valprint.c:1768
+#: valprint.c:2217
 msgid "Show prettyprinting of structures."
 msgstr ""
 
-#: valprint.c:1775
+#: valprint.c:2224
 msgid "Set printing of unions interior to structures."
 msgstr ""
 
-#: valprint.c:1776
+#: valprint.c:2225
 msgid "Show printing of unions interior to structures."
 msgstr ""
 
-#: valprint.c:1783
+#: valprint.c:2232
 msgid "Set prettyprinting of arrays."
 msgstr ""
 
-#: valprint.c:1784
+#: valprint.c:2233
 msgid "Show prettyprinting of arrays."
 msgstr ""
 
-#: valprint.c:1791
+#: valprint.c:2240
 msgid "Set printing of addresses."
 msgstr ""
 
-#: valprint.c:1792
+#: valprint.c:2241
 msgid "Show printing of addresses."
 msgstr ""
 
-#: valprint.c:1799
+#: valprint.c:2248
 msgid "Set default input radix for entering numbers."
 msgstr ""
 
-#: valprint.c:1800
+#: valprint.c:2249
 msgid "Show default input radix for entering numbers."
 msgstr ""
 
-#: valprint.c:1807
+#: valprint.c:2256
 msgid "Set default output radix for printing of values."
 msgstr ""
 
-#: valprint.c:1808
+#: valprint.c:2257
 msgid "Show default output radix for printing of values."
 msgstr ""
 
@@ -24215,104 +25170,104 @@
 #. add_show_from_set() commands aren't really appropriate.
 #. FIXME: i18n: With the new add_setshow_integer command, that is no
 #. longer true - show can display anything.
-#: valprint.c:1821
+#: valprint.c:2270
 msgid ""
 "Set default input and output number radices.\n"
 "Use 'set input-radix' or 'set output-radix' to independently set each.\n"
 "Without an argument, sets both radices back to the default value of 10."
 msgstr ""
 
-#: valprint.c:1826
+#: valprint.c:2275
 msgid ""
 "Show the default input and output number radices.\n"
 "Use 'show input-radix' or 'show output-radix' to independently show each."
 msgstr ""
 
-#: valprint.c:1832
+#: valprint.c:2281
 msgid "Set printing of array indexes."
 msgstr ""
 
-#: valprint.c:1833
+#: valprint.c:2282
 msgid "Show printing of array indexes"
 msgstr ""
 
-#: value.c:1420
+#: value.c:1439
 msgid "The history is empty."
 msgstr ""
 
-#: value.c:1422
+#: value.c:1441
 msgid "There is only one value in the history."
 msgstr ""
 
-#: value.c:1424
+#: value.c:1443
 #, possible-c-format
 msgid "History does not go back to $$%d."
 msgstr ""
 
-#: value.c:1427
+#: value.c:1446
 #, possible-c-format
 msgid "History has not yet reached $%d."
 msgstr ""
 
-#: value.c:1576
+#: value.c:1595
 msgid "Init-if-undefined requires an assignment expression."
 msgstr ""
 
-#: value.c:1581
+#: value.c:1600
 msgid "The first parameter to init-if-undefined should be a GDB variable."
 msgstr ""
 
-#: value.c:1720
+#: value.c:1739
 msgid "bad kind"
 msgstr ""
 
 #. We can never get a component of any other kind.
-#: value.c:1809
+#: value.c:1828
 msgid "set_internalvar_component"
 msgstr ""
 
-#: value.c:1820
+#: value.c:1839
 #, possible-c-format
 msgid "Cannot overwrite convenience function %s"
 msgstr ""
 
-#: value.c:2093
+#: value.c:2122
 msgid ""
 "No debugger convenience variables now defined.\n"
 "Convenience variables have names starting with \"$\";\n"
 "use \"set\" as in \"set $foo = 5\" to define them.\n"
 msgstr ""
 
-#: value.c:2287
+#: value.c:2316
 msgid "Value can't be converted to integer."
 msgstr ""
 
 #. FIXME: would like to include fieldval in the message, but
 #. we don't have a sprintf_longest.
-#: value.c:2814
+#: value.c:2846
 #, possible-c-format
 msgid "Value does not fit in %d bits."
 msgstr ""
 
-#: value.c:2865
+#: value.c:2897
 #, possible-c-format
 msgid "Unexpected type (%d) encountered for integer constant."
 msgstr ""
 
-#: value.c:2901
+#: value.c:2933
 #, possible-c-format
 msgid "Unexpected type (%d) encountered for unsigned integer constant."
 msgstr ""
 
-#: value.c:2980
+#: value.c:3025
 msgid "Unexpected type encountered for floating constant."
 msgstr ""
 
-#: value.c:3092
+#: value.c:3161
 msgid "Function return type unknown."
 msgstr ""
 
-#: value.c:3124
+#: value.c:3193
 msgid ""
 "Debugger convenience (\"$foo\") variables.\n"
 "These variables are created when you assign them values;\n"
@@ -24323,11 +25278,11 @@
 "\"$__\" holds the contents of the last address examined with \"x\"."
 msgstr ""
 
-#: value.c:3134
+#: value.c:3203
 msgid "Elements of value history around item number IDX (or last ten)."
 msgstr ""
 
-#: value.c:3138
+#: value.c:3207
 msgid ""
 "Initialize a convenience variable if necessary.\n"
 "init-if-undefined VARIABLE = EXPRESSION\n"
@@ -24336,103 +25291,103 @@
 "VARIABLE is already initialized."
 msgstr ""
 
-#: value.c:3145
+#: value.c:3214
 msgid "Placeholder command for showing help on convenience functions."
 msgstr ""
 
-#: varobj.c:53
+#: varobj.c:52
 #, possible-c-format
 msgid "Varobj debugging is %s.\n"
 msgstr ""
 
-#: varobj.c:612
+#: varobj.c:642
 msgid "Failed to find the specified frame"
 msgstr ""
 
-#: varobj.c:764
+#: varobj.c:794
 #, possible-c-format
 msgid "varobj_delete: assertion failed - mycount(=%d) <> 0"
 msgstr ""
 
-#: varobj.c:1000
+#: varobj.c:1030
 msgid "Null value returned for children"
 msgstr ""
 
-#: varobj.c:1006
+#: varobj.c:1036
 msgid "Returned value is not iterable"
 msgstr ""
 
-#: varobj.c:1013
+#: varobj.c:1043
 msgid "Could not get children iterator"
 msgstr ""
 
-#: varobj.c:1098
+#: varobj.c:1128
 msgid "Invalid item from the child list"
 msgstr ""
 
-#: varobj.c:1414
+#: varobj.c:1444
 msgid "Cannot instantiate printer for default visualizer"
 msgstr ""
 
-#: varobj.c:1714
+#: varobj.c:1744
 #, possible-c-format
 msgid "Could not evaluate visualizer expression: %s"
 msgstr ""
 
-#: varobj.c:1726
+#: varobj.c:1756
 msgid "Python support required"
 msgstr ""
 
-#: varobj.c:2037
+#: varobj.c:2067
 msgid "Duplicate variable object name"
 msgstr ""
 
-#: varobj.c:2120
+#: varobj.c:2150
 #, possible-c-format
 msgid "Assertion failed: Could not find varobj \"%s\" in root list"
 msgstr ""
 
-#: varobj.c:3622
+#: varobj.c:3725
 msgid "Set varobj debugging."
 msgstr ""
 
-#: varobj.c:3623
+#: varobj.c:3726
 msgid "Show varobj debugging."
 msgstr ""
 
-#: varobj.c:3624
+#: varobj.c:3727
 msgid "When non-zero, varobj debugging is enabled."
 msgstr ""
 
-#: vax-nat.c:81
+#: vax-nat.c:80
 msgid "Unable to determine location of registers"
 msgstr ""
 
-#: windows-nat.c:315
+#: windows-nat.c:299
 #, possible-c-format
 msgid "SuspendThread failed. (winerr %d)"
 msgstr ""
 
-#: windows-nat.c:562
+#: windows-nat.c:546
 msgid "Can't get module info"
 msgstr ""
 
-#: windows-nat.c:572
+#: windows-nat.c:556
 #, possible-c-format
 msgid "Error getting dll name: %lu."
 msgstr ""
 
-#: windows-nat.c:575
+#: windows-nat.c:559
 #, possible-c-format
 msgid "Error converting dll name to POSIX: %d."
 msgstr ""
 
-#: windows-nat.c:580
+#: windows-nat.c:564
 #, possible-c-format
 msgid "Error getting dll name: %u."
 msgstr ""
 
-#: windows-nat.c:739
+#: windows-nat.c:723
 msgid "dll path too long"
 msgstr ""
 
@@ -24443,147 +25398,147 @@
 #. 4 mysterious UNLOAD_DLL_DEBUG_EVENTs during the startup phase (these
 #. events are apparently caused by the WOW layer, the interface between
 #. 32bit and 64bit worlds).
-#: windows-nat.c:893
+#: windows-nat.c:877
 #, possible-c-format
 msgid "dll starting at %s not found."
 msgstr ""
 
-#: windows-nat.c:915
+#: windows-nat.c:899
 msgid "dll-symbols requires a file name"
 msgstr ""
 
-#: windows-nat.c:1293
+#: windows-nat.c:1277
 #, possible-c-format
 msgid "OpenProcess call failed, GetLastError = %lud"
 msgstr ""
 
-#: windows-nat.c:1418
+#: windows-nat.c:1402
 msgid "Could not interrupt program.  Press Ctrl-c in the program console."
 msgstr ""
 
-#: windows-nat.c:1526
+#: windows-nat.c:1510
 #, possible-c-format
 msgid "During startup program exited with code 0x%x."
 msgstr ""
 
-#: windows-nat.c:1829
+#: windows-nat.c:1813
 msgid "Can't attach to process."
 msgstr ""
 
-#: windows-nat.c:1861
+#: windows-nat.c:1845
 #, possible-c-format
 msgid "Can't detach process %lu (error %lu)"
 msgstr ""
 
-#: windows-nat.c:2004
+#: windows-nat.c:2030
 msgid "No executable specified, use `target exec'."
 msgstr ""
 
-#: windows-nat.c:2021 windows-nat.c:2026
+#: windows-nat.c:2047 windows-nat.c:2052
 #, possible-c-format
 msgid "Error starting executable: %d"
 msgstr ""
 
-#: windows-nat.c:2039
+#: windows-nat.c:2065
 #, possible-c-format
 msgid "Error starting executable via shell: %d"
 msgstr ""
 
-#: windows-nat.c:2133
+#: windows-nat.c:2186
 #, possible-c-format
 msgid "Warning: Failed to open TTY %s, error %#x."
 msgstr ""
 
-#: windows-nat.c:2160
+#: windows-nat.c:2238
 #, possible-c-format
 msgid "Error creating process %s, (error %d)."
 msgstr ""
 
-#: windows-nat.c:2446
+#: windows-nat.c:2524
 msgid "Load dll library symbols from FILE."
 msgstr ""
 
-#: windows-nat.c:2456
+#: windows-nat.c:2534
 msgid "Set use of shell to start subprocess."
 msgstr ""
 
-#: windows-nat.c:2457
+#: windows-nat.c:2535
 msgid "Show use of shell to start subprocess."
 msgstr ""
 
-#: windows-nat.c:2464
+#: windows-nat.c:2542
 msgid "Break when an exception is detected in the Cygwin DLL itself."
 msgstr ""
 
-#: windows-nat.c:2465
+#: windows-nat.c:2543
 msgid "Show whether gdb breaks on exceptions in the Cygwin DLL itself."
 msgstr ""
 
-#: windows-nat.c:2472
+#: windows-nat.c:2550
 msgid "Set creation of new console when creating child process."
 msgstr ""
 
-#: windows-nat.c:2473
+#: windows-nat.c:2551
 msgid "Show creation of new console when creating child process."
 msgstr ""
 
-#: windows-nat.c:2479
+#: windows-nat.c:2557
 msgid "Set creation of new group when creating child process."
 msgstr ""
 
-#: windows-nat.c:2480
+#: windows-nat.c:2558
 msgid "Show creation of new group when creating child process."
 msgstr ""
 
-#: windows-nat.c:2486
+#: windows-nat.c:2564
 msgid "Set whether to display execution in child process."
 msgstr ""
 
-#: windows-nat.c:2487
+#: windows-nat.c:2565
 msgid "Show whether to display execution in child process."
 msgstr ""
 
-#: windows-nat.c:2493
+#: windows-nat.c:2571
 msgid "Set whether to display kernel events in child process."
 msgstr ""
 
-#: windows-nat.c:2494
+#: windows-nat.c:2572
 msgid "Show whether to display kernel events in child process."
 msgstr ""
 
-#: windows-nat.c:2500
+#: windows-nat.c:2578
 msgid "Set whether to display memory accesses in child process."
 msgstr ""
 
-#: windows-nat.c:2501
+#: windows-nat.c:2579
 msgid "Show whether to display memory accesses in child process."
 msgstr ""
 
-#: windows-nat.c:2508
+#: windows-nat.c:2586
 msgid "Set whether to display kernel exceptions in child process."
 msgstr ""
 
-#: windows-nat.c:2509
+#: windows-nat.c:2587
 msgid "Show whether to display kernel exceptions in child process."
 msgstr ""
 
-#: windows-nat.c:2518
+#: windows-nat.c:2596
 msgid "Display selectors infos."
 msgstr ""
 
-#: windows-nat.c:2534
+#: windows-nat.c:2612
 #, possible-c-format
 msgid "Invalid register %d in cygwin_set_dr.\n"
 msgstr ""
 
-#: windows-nat.c:2599
+#: windows-nat.c:2677
 #, possible-c-format
 msgid "obsolete '%s' found. Rename to '%s'."
 msgstr ""
 
 #. This will probably fail on Windows 9x/Me.  Let the user know
 #. that we're missing some functionality.
-#: windows-nat.c:2726
+#: windows-nat.c:2804
 msgid ""
 "cannot automatically find executable file or library to read symbols.\n"
 "Use \"file\" or \"dll\" command to load executable/libraries directly."
@@ -24652,11 +25607,11 @@
 "even if their meaning is unknown."
 msgstr ""
 
-#: xcoffread.c:159
+#: xcoffread.c:175
 msgid "line numbers off, `.bf' symbol not found"
 msgstr ""
 
-#: xcoffread.c:166
+#: xcoffread.c:182
 #, possible-c-format
 msgid "Mismatched .ef symbol ignored starting at symnum %d"
 msgstr ""
@@ -24666,70 +25621,70 @@
 #. This can happen with old versions of GCC.
 #. GCC 2.3.3-930426 does not exhibit this on a test case which
 #. a user said produced the message for him.
-#: xcoffread.c:500
+#: xcoffread.c:516
 msgid "Nested C_BINCL symbols"
 msgstr ""
 
-#: xcoffread.c:517
+#: xcoffread.c:533
 msgid "Mismatched C_BINCL/C_EINCL pair"
 msgstr ""
 
-#: xcoffread.c:803
+#: xcoffread.c:823
 msgid "Bad line table offset in C_EINCL directive"
 msgstr ""
 
-#: xcoffread.c:910 xcoffread.c:926
+#: xcoffread.c:930 xcoffread.c:946
 msgid "Unexpected symbol continuation"
 msgstr ""
 
-#: xcoffread.c:1373
+#: xcoffread.c:1393
 #, possible-c-format
 msgid "Unrecognized storage class %d."
 msgstr ""
 
-#: xcoffread.c:1558
+#: xcoffread.c:1578
 #, possible-c-format
 msgid "Unexpected storage class: %d"
 msgstr ""
 
-#: xcoffread.c:1642
+#: xcoffread.c:1666
 msgid "Invalid symbol offset"
 msgstr ""
 
-#: xcoffread.c:1924
+#: xcoffread.c:1950
 #, possible-c-format
 msgid "cannot seek to string table in %s: %s"
 msgstr ""
 
-#: xcoffread.c:1952
+#: xcoffread.c:1978
 #, possible-c-format
 msgid "cannot read string table from %s: %s"
 msgstr ""
 
-#: xcoffread.c:1955
+#: xcoffread.c:1981
 msgid "bad symbol file: string table does not end with null character"
 msgstr ""
 
-#: xcoffread.c:2339
+#: xcoffread.c:2365
 msgid "More than one XMC_TC0 symbol found."
 msgstr ""
 
-#: xcoffread.c:2492
+#: xcoffread.c:2518
 #, possible-c-format
 msgid "Storage class %d not recognized during scan"
 msgstr ""
 
-#: xcoffread.c:2967
+#: xcoffread.c:2993
 #, possible-c-format
 msgid "Error reading .debug section of `%s': %s"
 msgstr ""
 
-#: xcoffread.c:2982
+#: xcoffread.c:3008
 #, possible-c-format
 msgid "Error reading symbols from %s: %s"
 msgstr ""
 
-#: xcoffread.c:2995
+#: xcoffread.c:3021
 msgid "reading symbol table"
 msgstr ""
 
@@ -24737,136 +25692,136 @@
 msgid "Status of loaded shared object libraries"
 msgstr ""
 
-#: xml-support.c:196
+#: xml-support.c:195
 #, possible-c-format
 msgid "Entering element <%s>"
 msgstr ""
 
-#: xml-support.c:223
+#: xml-support.c:222
 #, possible-c-format
 msgid "Element <%s> unknown"
 msgstr ""
 
-#: xml-support.c:228
+#: xml-support.c:227
 #, possible-c-format
 msgid "Element <%s> only expected once"
 msgstr ""
 
-#: xml-support.c:252
+#: xml-support.c:251
 #, possible-c-format
 msgid "Attribute \"%s\" missing a value"
 msgstr ""
 
-#: xml-support.c:259
+#: xml-support.c:258
 #, possible-c-format
 msgid "Required attribute \"%s\" of <%s> not specified"
 msgstr ""
 
-#: xml-support.c:268
+#: xml-support.c:267
 #, possible-c-format
 msgid "Parsing attribute %s=\"%s\""
 msgstr ""
 
-#: xml-support.c:295
+#: xml-support.c:294
 #, possible-c-format
 msgid "Ignoring unknown attribute %s"
 msgstr ""
 
-#: xml-support.c:348
+#: xml-support.c:347
 #, possible-c-format
 msgid "Leaving element <%s>"
 msgstr ""
 
-#: xml-support.c:355
+#: xml-support.c:354
 #, possible-c-format
 msgid "Required element <%s> is missing"
 msgstr ""
 
-#: xml-support.c:521
+#: xml-support.c:520
 #, possible-c-format
 msgid "could not locate built-in DTD %s"
 msgstr ""
 
-#: xml-support.c:566
+#: xml-support.c:565
 #, possible-c-format
 msgid "XML_UseForeignDTD failed: %s"
 msgstr ""
 
-#: xml-support.c:583
+#: xml-support.c:582
 #, possible-c-format
 msgid ""
 "Starting:\n"
 "%s"
 msgstr ""
 
-#: xml-support.c:609
+#: xml-support.c:608
 #, possible-c-format
 msgid "while parsing %s (at line %d): %s"
 msgstr ""
 
-#: xml-support.c:612
+#: xml-support.c:611
 #, possible-c-format
 msgid "while parsing %s: %s"
 msgstr ""
 
-#: xml-support.c:669
+#: xml-support.c:668
 #, possible-c-format
 msgid "Can't convert \"%s\" to an integer"
 msgstr ""
 
-#: xml-support.c:685
+#: xml-support.c:684
 #, possible-c-format
 msgid "Can't convert %s=\"%s\" to an integer"
 msgstr ""
 
-#: xml-support.c:719
+#: xml-support.c:718
 #, possible-c-format
 msgid "Unknown attribute value %s=\"%s\""
 msgstr ""
 
-#: xml-support.c:781
+#: xml-support.c:780
 #, possible-c-format
 msgid "Processing XInclude of \"%s\""
 msgstr ""
 
-#: xml-support.c:784
+#: xml-support.c:783
 #, possible-c-format
 msgid "Maximum XInclude depth (%d) exceeded"
 msgstr ""
 
-#: xml-support.c:789
+#: xml-support.c:788
 #, possible-c-format
 msgid "Could not load XML document \"%s\""
 msgstr ""
 
-#: xml-support.c:796
+#: xml-support.c:795
 #, possible-c-format
 msgid "Parsing \"%s\" failed"
 msgstr ""
 
-#: xml-support.c:929
+#: xml-support.c:928
 msgid "XInclude processing succeeded."
 msgstr ""
 
-#: xml-support.c:990
+#: xml-support.c:989
 #, possible-c-format
 msgid "XML debugging is %s.\n"
 msgstr ""
 
-#: xml-support.c:1135
+#: xml-support.c:1072
 #, possible-c-format
 msgid "Read error from \"%s\""
 msgstr ""
 
-#: xml-support.c:1162
+#: xml-support.c:1099
 msgid "Set XML parser debugging."
 msgstr ""
 
-#: xml-support.c:1163
+#: xml-support.c:1100
 msgid "Show XML parser debugging."
 msgstr ""
 
-#: xml-support.c:1164
+#: xml-support.c:1101
 msgid "When set, debugging messages for XML parsers are displayed."
 msgstr ""
 
@@ -24989,7 +25944,7 @@
 msgid "Could not open \"%s\""
 msgstr ""
 
-#: xstormy16-tdep.c:117
+#: xstormy16-tdep.c:116
 #, possible-c-format
 msgid "xstormy16_register_name: illegal register number %d"
 msgstr ""
@@ -25002,128 +25957,128 @@
 msgid "Couldn't write extended registers"
 msgstr ""
 
-#: xtensa-tdep.c:255
+#: xtensa-tdep.c:254
 #, possible-c-format
 msgid "invalid register %d"
 msgstr ""
 
-#: xtensa-tdep.c:362
+#: xtensa-tdep.c:360
 #, possible-c-format
 msgid "invalid dwarf/stabs register number %d"
 msgstr ""
 
-#: xtensa-tdep.c:425 xtensa-tdep.c:504
+#: xtensa-tdep.c:423 xtensa-tdep.c:502
 msgid "size of all masks is larger than the register"
 msgstr ""
 
-#: xtensa-tdep.c:610
+#: xtensa-tdep.c:608
 #, possible-c-format
 msgid "cannot read register %s"
 msgstr ""
 
-#: xtensa-tdep.c:622 xtensa-tdep.c:629
+#: xtensa-tdep.c:620 xtensa-tdep.c:627
 msgid "cannot read register"
 msgstr ""
 
-#: xtensa-tdep.c:705
+#: xtensa-tdep.c:703
 #, possible-c-format
 msgid "cannot write register %s"
 msgstr ""
 
-#: xtensa-tdep.c:717 xtensa-tdep.c:725
+#: xtensa-tdep.c:715 xtensa-tdep.c:723
 msgid "cannot write register"
 msgstr ""
 
-#: xtensa-tdep.c:1436
+#: xtensa-tdep.c:1435
 msgid ""
 "\n"
 "Unrecognised function prologue. Stack trace cannot be resolved. This message "
 "will not be repeated in this session.\n"
 msgstr ""
 
-#: xtensa-tdep.c:1603
+#: xtensa-tdep.c:1602
 #, possible-c-format
 msgid "cannot extract return value of %d bytes long"
 msgstr ""
 
-#: xtensa-tdep.c:1658
+#: xtensa-tdep.c:1657
 #, possible-c-format
 msgid "unimplemented for this length: %d"
 msgstr ""
 
-#: xtensa-tdep.c:2463
+#: xtensa-tdep.c:2462
 msgid "Unable to read target memory ..."
 msgstr ""
 
-#: xtensa-tdep.c:2961
+#: xtensa-tdep.c:2960
 msgid "Unable to decode Xtensa Window Interrupt Handler's code."
 msgstr ""
 
-#: xtensa-tdep.c:2992
+#: xtensa-tdep.c:2991
 msgid "Unable to read Xtensa register EPC1"
 msgstr ""
 
-#: xtensa-tdep.c:3095
+#: xtensa-tdep.c:3094
 #, possible-c-format
 msgid ""
 "\n"
 "\tnum_aregs: Number of AR registers (%d) is not a power of two!"
 msgstr ""
 
-#: xtensa-tdep.c:3102
+#: xtensa-tdep.c:3101
 msgid ""
 "\n"
 "\tpc_regnum: No PC register"
 msgstr ""
 
-#: xtensa-tdep.c:3104
+#: xtensa-tdep.c:3103
 msgid ""
 "\n"
 "\tps_regnum: No PS register"
 msgstr ""
 
-#: xtensa-tdep.c:3109
+#: xtensa-tdep.c:3108
 msgid ""
 "\n"
 "\twb_regnum: No WB register"
 msgstr ""
 
-#: xtensa-tdep.c:3111
+#: xtensa-tdep.c:3110
 msgid ""
 "\n"
 "\tws_regnum: No WS register"
 msgstr ""
 
-#: xtensa-tdep.c:3113
+#: xtensa-tdep.c:3112
 msgid ""
 "\n"
 "\tar_base: No AR registers"
 msgstr ""
 
-#: xtensa-tdep.c:3117
+#: xtensa-tdep.c:3116
 msgid ""
 "\n"
 "\ta0_base: No Ax registers"
 msgstr ""
 
-#: xtensa-tdep.c:3123
+#: xtensa-tdep.c:3122
 #, possible-c-format
 msgid "the following are invalid: %s"
 msgstr ""
 
-#: xtensa-tdep.c:3300
+#: xtensa-tdep.c:3299
 msgid "xtensa_dump_tdep(): not implemented"
 msgstr ""
 
-#: xtensa-tdep.c:3317
+#: xtensa-tdep.c:3316
 msgid "Set Xtensa debugging."
 msgstr ""
 
-#: xtensa-tdep.c:3318
+#: xtensa-tdep.c:3317
 msgid "Show Xtensa debugging."
 msgstr ""
 
-#: xtensa-tdep.c:3318
+#: xtensa-tdep.c:3317
 msgid ""
 "When non-zero, Xtensa-specific debugging is enabled. Can be 1, 2, 3, or 4 "
 "indicating the level of debugging."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gettext-runtime.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gettext-runtime.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gettext-runtime.po	2012-01-02 17:50:40.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gettext-runtime.po	2012-02-23 06:55:29.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:57+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: gnulib-lib/closeout.c:66
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gettext-tools.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gettext-tools.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gettext-tools.po	2012-01-02 17:50:40.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gettext-tools.po	2012-02-23 06:55:29.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:57+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: gnulib-lib/argmatch.c:133
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gnupg2.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gnupg2.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gnupg2.po	2012-01-02 17:50:48.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gnupg2.po	2012-02-23 06:55:37.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:20+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: agent/call-pinentry.c:244
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gnupg.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gnupg.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gnupg.po	2012-01-02 17:50:41.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gnupg.po	2012-02-23 06:55:31.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:18+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: cipher/primegen.c:119
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gODBCConfig.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gODBCConfig.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gODBCConfig.po	2012-01-02 17:50:42.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gODBCConfig.po	2012-02-23 06:55:31.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/main.c:25
 msgid "gODBCConfig - ODBC Data Source Administrator"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/grep.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/grep.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/grep.po	2012-01-02 17:50:41.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/grep.po	2012-02-23 06:55:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:19+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/grub.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/grub.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/grub.po	2012-01-02 17:50:48.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/grub.po	2012-02-23 06:55:37.000000000 +0000
@@ -14,47 +14,47 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:22+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: grub-core/commands/acpi.c:40
+#: commands/acpi.c:40
 msgid "Don't load host tables specified by comma-separated list."
 msgstr ""
 "Nenačíta tabuľky hostiteľa určené zoznamom s položkami oddelenými čiarkami"
 
-#: grub-core/commands/acpi.c:43
+#: commands/acpi.c:43
 msgid "Load only tables specified by comma-separated list."
 msgstr "Načíta len tabuľky určené zoznamom s položkami oddelenými čiarkami"
 
-#: grub-core/commands/acpi.c:44
+#: commands/acpi.c:44
 msgid "Expose v1 tables."
 msgstr "Ukáže tabuľky z verzie 1"
 
-#: grub-core/commands/acpi.c:45
+#: commands/acpi.c:45
 msgid "Expose v2 and v3 tables."
 msgstr "Ukáže tabuľky z verzií 2 a 3"
 
-#: grub-core/commands/acpi.c:46
+#: commands/acpi.c:46
 msgid "Set OEMID of RSDP, XSDT and RSDT."
 msgstr "Nastaví identifikátor OEMID štruktúr RSDP, XSDT a RSDT."
 
-#: grub-core/commands/acpi.c:48
+#: commands/acpi.c:48
 msgid "Set OEMTABLE ID of RSDP, XSDT and RSDT."
 msgstr "Nastaví identifikátor OEMTABLE ID štruktúr RSDP, XSDT a RSDT."
 
-#: grub-core/commands/acpi.c:50
+#: commands/acpi.c:50
 msgid "Set OEMTABLE revision of RSDP, XSDT and RSDT."
 msgstr "Nastaví číslo revízie OEMTABLE štruktúr RSDP, XSDT a RSDT."
 
-#: grub-core/commands/acpi.c:52
+#: commands/acpi.c:52
 msgid "Set creator field of RSDP, XSDT and RSDT."
 msgstr "Nastaví pole creator (tvorca) štruktúr RSDP, XSDT a RSDT."
 
-#: grub-core/commands/acpi.c:54
+#: commands/acpi.c:54
 msgid "Set creator revision of RSDP, XSDT and RSDT."
 msgstr "Nastaví číslo revízie tvorcu štruktúr RSDP, XSDT a RSDT."
 
-#: grub-core/commands/acpi.c:55
+#: commands/acpi.c:55
 msgid ""
 "Don't update EBDA. May fix failures or hangs on some. BIOSes but makes it "
 "ineffective with OS not receiving RSDP from GRUB."
@@ -63,7 +63,7 @@
 "BIOS-och,  pre operačný systém je však neefektívne, keď štruktúru RSDP "
 "neprevezme od zavádzača GRUB."
 
-#: grub-core/commands/acpi.c:763
+#: commands/acpi.c:763
 msgid ""
 "[-1|-2] [--exclude=TABLE1,TABLE2|--load-only=table1,table2] FILE1 [FILE2] "
 "[...]"
@@ -71,28 +71,22 @@
 "[-1|-2] [--exclude=TABUĽKA1,TABUĽKA2|--load-only=tabuľka1,tabuľka2] SÚBOR1 "
 "[SÚBOR2] [...]"
 
-#: grub-core/commands/acpi.c:766
+#: commands/acpi.c:766
 msgid "Load host ACPI tables and tables specified by arguments."
 msgstr "Načíta ACPI tabuľky hostiteľa a tabuľky určené parametrami."
 
-#: grub-core/commands/blocklist.c:116 grub-core/commands/cat.c:97
-#: grub-core/commands/configfile.c:65 grub-core/commands/configfile.c:68
-#: grub-core/commands/configfile.c:74 grub-core/commands/configfile.c:80
-#: grub-core/commands/configfile.c:86 grub-core/commands/hashsum.c:33
-#: grub-core/commands/legacycfg.c:763 grub-core/commands/legacycfg.c:768
-#: grub-core/commands/legacycfg.c:773 grub-core/commands/legacycfg.c:778
-#: grub-core/commands/minicmd.c:204 grub-core/commands/testload.c:150
-#: grub-core/efiemu/main.c:318 grub-core/loader/i386/bsd.c:1947
-#: grub-core/loader/i386/bsd.c:1950 grub-core/loader/i386/bsd.c:1953
-#: util/grub-setup.c:686 util/grub-setup.c:688 util/grub-setup.c:692
+#: commands/blocklist.c:114 commands/cat.c:82 commands/configfile.c:57
+#: commands/configfile.c:60 commands/configfile.c:65 commands/crc.c:64
+#: commands/minicmd.c:357 loader/i386/bsd.c:1297 loader/i386/bsd.c:1301
+#: loader/i386/bsd.c:1305
 msgid "FILE"
 msgstr "SÚBOR"
 
-#: grub-core/commands/blocklist.c:116
+#: commands/blocklist.c:114
 msgid "Print a block list."
 msgstr "Vypíše zoznam blokov."
 
-#: grub-core/commands/boot.c:192
+#: commands/boot.c:190
 msgid "Boot an operating system."
 msgstr "Zavedie operačný systém"
 
@@ -100,23 +94,23 @@
 msgid "Accept DOS-style CR/NL line endings."
 msgstr "Prijme ukončenia riadkov CR/NL v štýle DOS-u."
 
-#: grub-core/commands/cat.c:97 grub-core/commands/minicmd.c:204
+#: commands/cat.c:82 commands/minicmd.c:357
 msgid "Show the contents of a file."
 msgstr "Zobrazí obsah súboru."
 
-#: grub-core/commands/cmp.c:114
+#: commands/cmp.c:113
 msgid "FILE1 FILE2"
 msgstr "SÚBOR1 SÚBOR2"
 
-#: grub-core/commands/cmp.c:114
+#: commands/cmp.c:113
 msgid "Compare two files."
 msgstr "Porovná dva súbory."
 
-#: grub-core/commands/configfile.c:65
+#: commands/configfile.c:57
 msgid "Load another config file."
 msgstr "Načíta iný konfiguračný súbor."
 
-#: grub-core/commands/configfile.c:69 grub-core/commands/configfile.c:87
+#: commands/configfile.c:61 commands/configfile.c:66
 msgid "Load another config file without changing context."
 msgstr "Načíta iný konfiguračný súbor bez zmeny kontextu."
 
@@ -127,43 +121,43 @@
 "Načíta iný konfiguračný súbor bez zmeny kontextu, avšak vyberie len položky "
 "ponuky."
 
-#: grub-core/commands/date.c:141
+#: commands/date.c:139
 msgid "[[year-]month-day] [hour:minute[:second]]"
 msgstr "[[rok-]mesiac-deň] [hodina:minúta[:sekunda]]"
 
-#: grub-core/commands/date.c:142
+#: commands/date.c:140
 msgid "Command to display/set current datetime."
 msgstr "Príkaz pre zobrazenie alebo nastavenie aktuálneho času a dátumu."
 
-#: grub-core/commands/echo.c:30
+#: commands/echo.c:27
 msgid "Do not output the trailing newline."
 msgstr "Nebude vypisovať koncový prázdny riadok."
 
-#: grub-core/commands/echo.c:31
+#: commands/echo.c:28
 msgid "Enable interpretation of backslash escapes."
 msgstr "Povolí interpretáciu úvodných spätných lomítok."
 
-#: grub-core/commands/echo.c:134
+#: commands/echo.c:117
 msgid "[-e|-n] STRING"
 msgstr "[-e|-n] REŤAZEC"
 
-#: grub-core/commands/echo.c:134
+#: commands/echo.c:117
 msgid "Display a line of text."
 msgstr "Zobrazí riadok textu."
 
-#: grub-core/commands/efi/fixvideo.c:105
+#: commands/efi/fixvideo.c:103
 msgid "Fix video problem."
 msgstr "Opraví video problém."
 
-#: grub-core/commands/efi/loadbios.c:209
+#: commands/efi/loadbios.c:207
 msgid "Fake BIOS."
 msgstr "Falošný BIOS."
 
-#: grub-core/commands/efi/loadbios.c:213
+#: commands/efi/loadbios.c:211
 msgid "Load BIOS dump."
 msgstr "Načítať výpis BIOS-u."
 
-#: grub-core/commands/gptsync.c:246
+#: commands/gptsync.c:244
 msgid "DEVICE [PARTITION[+/-[TYPE]]] ..."
 msgstr "ZARIADENIE [ODDIEL[+/-[TYP]]] ..."
 
@@ -177,7 +171,7 @@
 "súčasťou hybridného záznamu MBR s limitom  3 oddielov. TYP je MBR a + "
 "znamená, že oddiel je aktívny. Aktívny však môže byť len jeden oddiel."
 
-#: grub-core/commands/halt.c:41
+#: commands/halt.c:39
 msgid ""
 "Halts the computer.  This command does not work on all firmware "
 "implementations."
@@ -225,7 +219,7 @@
 msgid "[-c FILE [-p PREFIX]] [FILE1 [FILE2 ...]]"
 msgstr "[-c SÚBOR [-p PREDPONA]] [SÚBOR1 [SÚBOR2 ...]]"
 
-#: grub-core/commands/hdparm.c:32
+#: commands/hdparm.c:30
 msgid ""
 "Set Advanced Power Management\n"
 "(1=low, ..., 254=high, 255=off)."
@@ -233,19 +227,19 @@
 "Nastaví Pokročilú správu napájania (APM)\n"
 "(1=nízka, ..., 254=vysoká, 255=vypnutá)."
 
-#: grub-core/commands/hdparm.c:35
+#: commands/hdparm.c:33
 msgid "Check power mode."
 msgstr "Skontroluje režim napájania."
 
-#: grub-core/commands/hdparm.c:36
+#: commands/hdparm.c:34
 msgid "Freeze ATA security settings until reset."
 msgstr "Do reštartu zmrazí nastavenia zabezpečenia ATA"
 
-#: grub-core/commands/hdparm.c:38
+#: commands/hdparm.c:36
 msgid "Check SMART health status."
 msgstr "Skontroluje stav pomocou technológie SMART"
 
-#: grub-core/commands/hdparm.c:39
+#: commands/hdparm.c:37
 msgid ""
 "Set Automatic Acoustic Management\n"
 "(0=off, 128=quiet, ..., 254=fast)."
@@ -253,7 +247,7 @@
 "Nastaví Automatickú správu zvukového prejavu (AAM)\n"
 "(0=vypnutá, 128=tichá, ..., 254=rýchla)"
 
-#: grub-core/commands/hdparm.c:42
+#: commands/hdparm.c:40
 msgid ""
 "Set standby timeout\n"
 "(0=off, 1=5s, 2=10s, ..., 240=20m, 241=30m, ...)."
@@ -261,99 +255,99 @@
 "Nastaví časový limit pre prechod do pohotovostného režimu\n"
 "(0=vypnutý, 1=5s, 2=10s, ..., 240=20min, 241=30min, ...)."
 
-#: grub-core/commands/hdparm.c:45
+#: commands/hdparm.c:43
 msgid "Set drive to standby mode."
 msgstr "Prepne disk do pohotovostného režimu."
 
-#: grub-core/commands/hdparm.c:46
+#: commands/hdparm.c:44
 msgid "Set drive to sleep mode."
 msgstr "Prepne disk do režimu spánku."
 
-#: grub-core/commands/hdparm.c:47
+#: commands/hdparm.c:45
 msgid "Print drive identity and settings."
 msgstr "Vypíše identifikáciu a nastavenia disku."
 
-#: grub-core/commands/hdparm.c:49
+#: commands/hdparm.c:47
 msgid "Dump contents of ATA IDENTIFY sector."
 msgstr "Vypíše obsah sektoru ATA IDENTIFY."
 
-#: grub-core/commands/hdparm.c:51
+#: commands/hdparm.c:49
 msgid "Disable/enable SMART (0/1)."
 msgstr "Zakáže alebo povolí technológiu SMART (0/1)."
 
-#: grub-core/commands/hdparm.c:52
+#: commands/hdparm.c:50
 msgid "Do not print messages."
 msgstr "Nebude vypisovať správy."
 
-#: grub-core/commands/hdparm.c:415
+#: commands/hdparm.c:414
 msgid "[OPTIONS] DISK"
 msgstr "[VOĽBY] DISK"
 
-#: grub-core/commands/hdparm.c:416
+#: commands/hdparm.c:415
 msgid "Get/set ATA disk parameters."
 msgstr "Získa alebo nastaví parametre ATA disku."
 
-#: grub-core/commands/help.c:120 grub-core/lib/arg.c:110
+#: commands/help.c:103 lib/arg.c:110
 msgid "Usage:"
 msgstr "Použitie:"
 
-#: grub-core/commands/help.c:136
+#: commands/help.c:136
 msgid "[PATTERN ...]"
 msgstr "[VZOR ...]"
 
-#: grub-core/commands/help.c:137
+#: commands/help.c:137
 msgid "Show a help message."
 msgstr "Zobrazí správu s pomocníkom."
 
-#: grub-core/commands/hexdump.c:31
+#: commands/hexdump.c:30
 msgid "Skip offset bytes from the beginning of file."
 msgstr "Preskočí offset bajty zo začiatku súboru."
 
-#: grub-core/commands/hexdump.c:33
+#: commands/hexdump.c:32
 msgid "Read only LENGTH bytes."
 msgstr "Prečíta len počet bajtov zadaný parametrom DĹŽKA"
 
-#: grub-core/commands/hexdump.c:125
+#: commands/hexdump.c:125
 msgid "[OPTIONS] FILE_OR_DEVICE"
 msgstr "[VOĽBY] SÚBOR_ALEBO_ZARIADENIE"
 
-#: grub-core/commands/hexdump.c:126
+#: commands/hexdump.c:126
 msgid "Dump the contents of a file or memory."
 msgstr "Vypíše obsah súboru alebo pamäte."
 
-#: grub-core/commands/i386/cpuid.c:39
+#: commands/i386/cpuid.c:37
 msgid "Check for long mode flag (default)."
 msgstr "Skontroluje príznak dlhého režimu (predvolené)."
 
-#: grub-core/commands/i386/cpuid.c:94
+#: commands/i386/cpuid.c:92
 msgid "Check for CPU features."
 msgstr "Skontroluje funkcie CPU."
 
-#: grub-core/commands/i386/pc/drivemap.c:39
+#: commands/i386/pc/drivemap.c:37
 msgid "Show the current mappings."
 msgstr "Zobrazí aktuálne mapovania."
 
-#: grub-core/commands/i386/pc/drivemap.c:40
+#: commands/i386/pc/drivemap.c:38
 msgid "Reset all mappings to the default values."
 msgstr "Nastaví všetky mapovania na predvolené hodnoty."
 
-#: grub-core/commands/i386/pc/drivemap.c:41
+#: commands/i386/pc/drivemap.c:39
 msgid "Perform both direct and reverse mappings."
 msgstr "Vykoná priame i reverzné mapovania."
 
-#: grub-core/commands/i386/pc/drivemap.c:407
+#: commands/i386/pc/drivemap.c:407
 msgid "-l | -r | [-s] grubdev osdisk."
 msgstr "-l | -r | [-s] grub_zariadenie disk_os."
 
-#: grub-core/commands/i386/pc/drivemap.c:408
+#: commands/i386/pc/drivemap.c:408
 msgid "Manage the BIOS drive mappings."
 msgstr "Spravuje mapovania diskov systému BIOS."
 
-#: grub-core/commands/i386/pc/halt.c:31
+#: commands/i386/pc/halt.c:27
 msgid "Do not use APM to halt the computer."
 msgstr "Nepoužije správu napájania APM na vypnutie počítača."
 
-#: grub-core/commands/i386/pc/halt.c:120
+#: commands/i386/pc/halt.c:51
 msgid "Halt the system, if possible using APM."
 msgstr "Vypne systém, ak je to možné pomocou správy napájania APM."
 
@@ -361,23 +355,23 @@
 msgid "Show APM information."
 msgstr "Zobrazí informácie správy napájania APM."
 
-#: grub-core/commands/i386/pc/play.c:268
+#: commands/i386/pc/play.c:262
 msgid "FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... "
 msgstr "SÚBOR | TEMPO [VÝŠKA1 TRVANIE1] [VÝŠKA2 TRVANIE2] ... "
 
-#: grub-core/commands/i386/pc/play.c:269
+#: commands/i386/pc/play.c:263
 msgid "Play a tune."
 msgstr "Prehrá melódiu."
 
-#: grub-core/commands/i386/pc/pxecmd.c:48
+#: commands/i386/pc/pxecmd.c:46
 msgid "Unload PXE environment."
 msgstr "Uvoľní prostredie PXE."
 
-#: grub-core/commands/ieee1275/suspend.c:45
+#: commands/ieee1275/suspend.c:43
 msgid "Return to Open Firmware prompt."
 msgstr "Vráti sa do príkazového riadka rozhrania Open Firmware."
 
-#: grub-core/commands/iorw.c:34 grub-core/commands/memrw.c:33
+#: commands/memrw.c:31
 msgid "Save read value into variable VARNAME."
 msgstr "Uloží načítanú hodnotu do premennej PREMENNÁ."
 
@@ -414,8 +408,7 @@
 msgid "Write word VALUE to PORT."
 msgstr "Zapíše slovo HODNOTA do portu PORT."
 
-#: grub-core/commands/iorw.c:140 grub-core/commands/memrw.c:134
-#: grub-core/commands/memrw.c:137 grub-core/commands/memrw.c:140
+#: commands/memrw.c:132 commands/memrw.c:135 commands/memrw.c:138
 msgid "ADDR VALUE [MASK]"
 msgstr "ADRESA HODNOTA [MASKA]"
 
@@ -427,23 +420,23 @@
 msgid "Load a keyboard layout."
 msgstr "Načíta rozloženie klávesnice."
 
-#: grub-core/commands/keystatus.c:30
+#: commands/keystatus.c:28
 msgid "Check Shift key."
 msgstr "Skontroluje kláves Shift."
 
-#: grub-core/commands/keystatus.c:31
+#: commands/keystatus.c:29
 msgid "Check Control key."
 msgstr "Skontroluje kláves Ctrl."
 
-#: grub-core/commands/keystatus.c:32
+#: commands/keystatus.c:30
 msgid "Check Alt key."
 msgstr "Skontroluje kláves Alt."
 
-#: grub-core/commands/keystatus.c:102
+#: commands/keystatus.c:85
 msgid "[--shift] [--ctrl] [--alt]"
 msgstr "[--shift] [--ctrl] [--alt]"
 
-#: grub-core/commands/keystatus.c:103
+#: commands/keystatus.c:86
 msgid "Check key modifier status."
 msgstr "Skontroluje stav modifikačných kláves."
 
@@ -500,39 +493,39 @@
 msgstr ""
 "Simuluje príkaz password starého zavádzača grub v režime položky ponuky"
 
-#: grub-core/commands/loadenv.c:35
+#: commands/loadenv.c:33
 msgid "Specify filename."
 msgstr "Určí názov súboru."
 
-#: grub-core/commands/loadenv.c:380 grub-core/commands/loadenv.c:384
+#: commands/loadenv.c:383 commands/loadenv.c:389
 msgid "[-f FILE]"
 msgstr "[-f SÚBOR]"
 
-#: grub-core/commands/loadenv.c:381
+#: commands/loadenv.c:384
 msgid "Load variables from environment block file."
 msgstr "Načíta premenné zo súboru s blokom prostredia"
 
-#: grub-core/commands/loadenv.c:385
+#: commands/loadenv.c:390
 msgid "List variables from environment block file."
 msgstr "Vypíše zoznam premenných zo súboru s blokom prostredia."
 
-#: grub-core/commands/loadenv.c:389
+#: commands/loadenv.c:395
 msgid "[-f FILE] variable_name [...]"
 msgstr "[-f SÚBOR] názov_premennej [...]"
 
-#: grub-core/commands/loadenv.c:390
+#: commands/loadenv.c:396
 msgid "Save variables to environment block file."
 msgstr "Uloží premenné do súboru s blokom prostredia."
 
-#: grub-core/commands/ls.c:39
+#: commands/ls.c:37
 msgid "Show a long list with more detailed information."
 msgstr "Zobrazí dlhší zoznam s podrobnejšími informáciami."
 
-#: grub-core/commands/ls.c:40
+#: commands/ls.c:38
 msgid "Print sizes in a human readable format."
 msgstr "Vypíše veľkosti v tvare zrozumiteľnom pre človeka."
 
-#: grub-core/commands/ls.c:41
+#: commands/ls.c:39
 msgid "List all files."
 msgstr "Vypíše zoznam všetkých súborov."
 
@@ -540,7 +533,7 @@
 msgid "[-l|-h|-a] [FILE ...]"
 msgstr "[-l|-h|-a] [SÚBOR ...]"
 
-#: grub-core/commands/ls.c:276
+#: commands/ls.c:270
 msgid "List devices and files."
 msgstr "Vypíše zoznam zariadení a súborov."
 
@@ -560,40 +553,40 @@
 msgid "Show ACPI information."
 msgstr "Zobrazí informácie z rozhrania ACPI."
 
-#: grub-core/commands/lsmmap.c:68
+#: commands/lsmmap.c:47
 msgid "List memory map provided by firmware."
 msgstr "Vypíše mapovanie pamäte poskytnuté firmvérom."
 
-#: grub-core/commands/lspci.c:230
+#: commands/lspci.c:228
 msgid "List PCI devices."
 msgstr "Vypíše zoznam zariadení zbernice PCI."
 
-#: grub-core/commands/memrw.c:125 grub-core/commands/memrw.c:128
-#: grub-core/commands/memrw.c:131 grub-core/commands/minicmd.c:210
+#: commands/memrw.c:123 commands/memrw.c:126 commands/memrw.c:129
+#: commands/minicmd.c:366
 msgid "ADDR"
 msgstr "ADRESA"
 
-#: grub-core/commands/memrw.c:125
+#: commands/memrw.c:123
 msgid "Read byte from ADDR."
 msgstr "Prečíta bajt z adresy ADRESA."
 
-#: grub-core/commands/memrw.c:128
+#: commands/memrw.c:126
 msgid "Read word from ADDR."
 msgstr "Prečíta slovo z adresy ADRESA."
 
-#: grub-core/commands/memrw.c:131
+#: commands/memrw.c:129
 msgid "Read dword from ADDR."
 msgstr "Prečíta dvojté slovo z adresy ADRESA."
 
-#: grub-core/commands/memrw.c:134
+#: commands/memrw.c:132
 msgid "Write byte VALUE to ADDR."
 msgstr "Zapíše bajt HODNOTA do adresy ADRESA."
 
-#: grub-core/commands/memrw.c:137
+#: commands/memrw.c:135
 msgid "Write word VALUE to ADDR."
 msgstr "Zapíše slovo HODNOTA do adresy ADRESA."
 
-#: grub-core/commands/memrw.c:140
+#: commands/memrw.c:138
 msgid "Write dword VALUE to ADDR."
 msgstr "Zapíše dvojité slovo HODNOTA do adresy ADRESA."
 
@@ -626,39 +619,39 @@
 msgid "Define a submenu."
 msgstr "Definuje podponuku."
 
-#: grub-core/commands/minicmd.c:207
+#: commands/minicmd.c:360
 msgid "Show this message."
 msgstr "Zobrazí túto správu."
 
-#: grub-core/commands/minicmd.c:210
+#: commands/minicmd.c:366
 msgid "Dump memory."
 msgstr "Vypíše obsah pamäte."
 
-#: grub-core/commands/minicmd.c:213 grub-core/kern/corecmd.c:193
+#: commands/minicmd.c:369
 msgid "MODULE"
 msgstr "MODUL"
 
-#: grub-core/commands/minicmd.c:213
+#: commands/minicmd.c:369
 msgid "Remove a module."
 msgstr "Odstráni modul."
 
-#: grub-core/commands/minicmd.c:216
+#: commands/minicmd.c:372
 msgid "Show loaded modules."
 msgstr "Zobrazí načítané moduly."
 
-#: grub-core/commands/minicmd.c:219
+#: commands/minicmd.c:375
 msgid "Exit from GRUB."
 msgstr "Opustí príkazový riadok zavádzača GRUB."
 
-#: grub-core/commands/parttool.c:326
+#: commands/parttool.c:325
 msgid "PARTITION COMMANDS"
 msgstr "PRÍKAZY PRE ODDIELY"
 
-#: grub-core/commands/password.c:85
+#: commands/password.c:78
 msgid "USER PASSWORD"
 msgstr "POUŽÍVATEĽSKÉ HESLO"
 
-#: grub-core/commands/password.c:86
+#: commands/password.c:79
 msgid "Set user password (plaintext). Unrecommended and insecure."
 msgstr ""
 "Nastaví používateľské heslo (bežný text). Neodporúčané a nebezpečené."
@@ -671,48 +664,47 @@
 msgid "Set user password (PBKDF2). "
 msgstr "Nastaví používateľké heslo (funkcia PBKDF2). "
 
-#: grub-core/commands/probe.c:40
+#: commands/probe.c:38
 msgid "Set a variable to return value."
 msgstr "Nastaví premennú pre návratovú hodnotu."
 
-#: grub-core/commands/probe.c:41
+#: commands/probe.c:39
 msgid "Determine driver."
 msgstr "Určí ovládač."
 
-#: grub-core/commands/probe.c:42
+#: commands/probe.c:40
 msgid "Determine partition map type."
 msgstr "Určí typ mapovania oddielov."
 
-#: grub-core/commands/probe.c:43
+#: commands/probe.c:41
 msgid "Determine filesystem type."
 msgstr "Určí typ súborového systému."
 
-#: grub-core/commands/probe.c:44
+#: commands/probe.c:42
 msgid "Determine filesystem UUID."
 msgstr "Určí identifikátor UUID súborového systému."
 
-#: grub-core/commands/probe.c:45
+#: commands/probe.c:43
 msgid "Determine filesystem label."
 msgstr "Určí menovku súborového systému."
 
-#: grub-core/commands/probe.c:155 grub-core/loader/i386/bsd.c:159
-#: util/grub-setup.c:840
+#: loader/i386/bsd.c:124
 msgid "DEVICE"
 msgstr "ZARIADENIE"
 
-#: grub-core/commands/probe.c:156
+#: commands/probe.c:155
 msgid "Retrieve device info."
 msgstr "Získa informácie o zariadení."
 
-#: grub-core/commands/read.c:85
+#: commands/read.c:83
 msgid "[ENVVAR]"
 msgstr "[PREMENNÁ_PROSTREDIA]"
 
-#: grub-core/commands/read.c:86
+#: commands/read.c:84
 msgid "Set variable with user input."
 msgstr "Nastaví premennú pomocou používateľského vstupu."
 
-#: grub-core/commands/reboot.c:41
+#: commands/reboot.c:39
 msgid "Reboot the computer."
 msgstr "Reštartuje počítač."
 
@@ -736,7 +728,7 @@
 msgid "NAME [VARIABLE] [HINTS]"
 msgstr "NÁZOV [PREMENNÁ] [POKYNY]"
 
-#: grub-core/commands/search_file.c:5
+#: commands/search_file.c:5
 msgid ""
 "Search devices by file. If VARIABLE is specified, the first device found is "
 "set to a variable."
@@ -744,7 +736,7 @@
 "Vyhľadá zariadenia podľa súboru. Ak je zadaná premenná PREMENNÁ, nastaví sa "
 "do nej prvé nájdené zariadenie."
 
-#: grub-core/commands/search_label.c:5
+#: commands/search_label.c:5
 msgid ""
 "Search devices by label. If VARIABLE is specified, the first device found is "
 "set to a variable."
@@ -752,7 +744,7 @@
 "Vyhľadá zariadenia podľa menovky. Ak je zadaná premenná PREMENNÁ, nastaví sa "
 "do nej prvé nájdené zariadenie."
 
-#: grub-core/commands/search_uuid.c:5
+#: commands/search_uuid.c:5
 msgid ""
 "Search devices by UUID. If VARIABLE is specified, the first device found is "
 "set to a variable."
@@ -814,19 +806,19 @@
 msgid "Manipulate PCI devices."
 msgstr "Pracuje so zariadeniami zbernice PCI."
 
-#: grub-core/commands/sleep.c:32
+#: commands/sleep.c:31
 msgid "Verbose countdown."
 msgstr "Podrobné odpočítavanie."
 
-#: grub-core/commands/sleep.c:33
+#: commands/sleep.c:32
 msgid "Interruptible with ESC."
 msgstr "Prerušiteľné klávesom ESC."
 
-#: grub-core/commands/sleep.c:106
+#: commands/sleep.c:106
 msgid "NUMBER_OF_SECONDS"
 msgstr "POČET_SEKÚND"
 
-#: grub-core/commands/sleep.c:107
+#: commands/sleep.c:107
 msgid "Wait for a specified number of seconds."
 msgstr "Počká stanovený počet sekúnd."
 
@@ -862,15 +854,15 @@
 msgid "List or select an output terminal."
 msgstr "Vyberie výstupný terminál alebo vypíše ich zoznam"
 
-#: grub-core/commands/test.c:427
+#: commands/test.c:424
 msgid "EXPRESSION ]"
 msgstr "VÝRAZ ]"
 
-#: grub-core/commands/test.c:427 grub-core/commands/test.c:430
+#: commands/test.c:424 commands/test.c:426
 msgid "Evaluate an expression."
 msgstr "Vyhodnotí výraz"
 
-#: grub-core/commands/test.c:430
+#: commands/test.c:426
 msgid "EXPRESSION"
 msgstr "VÝRAZ"
 
@@ -878,15 +870,15 @@
 msgid "Load the same file in multiple ways."
 msgstr "Načíta ten istý súbor viacerými spôsobmi."
 
-#: grub-core/commands/true.c:49
+#: commands/true.c:47
 msgid "Do nothing, successfully."
 msgstr "Neurobí nič, úspešne."
 
-#: grub-core/commands/true.c:52
+#: commands/true.c:50
 msgid "Do nothing, unsuccessfully."
 msgstr "Neurobí nič, neúspešene."
 
-#: grub-core/commands/usbtest.c:212
+#: commands/usbtest.c:199
 msgid "Test USB support."
 msgstr "Otestuje podporu zbernice USB."
 
@@ -902,20 +894,20 @@
 msgid "Test video subsystem in mode WxH."
 msgstr "Otestuje video podsystém v režime ŠxV."
 
-#: grub-core/commands/videotest.c:208
+#: commands/videotest.c:180
 msgid "Test video subsystem."
 msgstr "Otestuje video podsystém."
 
-#: grub-core/commands/xnu_uuid.c:94
+#: commands/xnu_uuid.c:92
 msgid "GRUBUUID [VARNAME]"
 msgstr "GRUBUUID [PREMENNÁ]"
 
-#: grub-core/commands/xnu_uuid.c:95
+#: commands/xnu_uuid.c:93
 msgid "Transform 64-bit UUID to format suitable for XNU."
 msgstr ""
 "Prevedie 64 bitový identifikátor UUID do formátu vhodného pre jadro XNU."
 
-#: grub-core/disk/loopback.c:41
+#: disk/loopback.c:40
 msgid "Delete the loopback device entry."
 msgstr "Odstráni záznam so zariadením loopback."
 
@@ -923,7 +915,7 @@
 msgid "[-d] DEVICENAME FILE."
 msgstr "[-d] NÁZOV_ZARIADENIA SÚBOR."
 
-#: grub-core/disk/loopback.c:224
+#: disk/loopback.c:250
 msgid "Make a device of a file."
 msgstr "Vytvorí zariadenie zo súboru."
 
@@ -959,7 +951,7 @@
 msgid "Translates the string with the current settings."
 msgstr "Preloží reťazec s aktuálnymi nastaveniami."
 
-#: grub-core/gfxmenu/gui_progress_bar.c:281 grub-core/normal/menu_text.c:365
+#: normal/menu_text.c:363
 #, c-format
 msgid "The highlighted entry will be executed automatically in %ds."
 msgstr "Zvýraznený záznam bude spustený automaticky o %d s."
@@ -980,7 +972,7 @@
 msgid "%ds"
 msgstr "%d s"
 
-#: grub-core/hello/hello.c:45
+#: hello/hello.c:43
 msgid "Say \"Hello World\"."
 msgstr "Povie \"Hello World\"."
 
@@ -1012,7 +1004,7 @@
 msgid "Insert a module."
 msgstr "Vloží modul."
 
-#: grub-core/kern/emu/hostdisk.c:1015 util/grub-setup.c:662
+#: util/i386/pc/grub-setup.c:562
 #, c-format
 msgid "cannot open `%s'"
 msgstr "nedá sa otvoriť „%s“"
@@ -1041,85 +1033,79 @@
 msgid "error: %s.\n"
 msgstr "chyba: %s.\n"
 
-#: grub-core/lib/arg.c:34
+#: lib/arg.c:34
 msgid "Display this help and exit."
 msgstr "Zobrazí tohto pomocníka a skončí."
 
-#: grub-core/lib/arg.c:36
+#: lib/arg.c:36
 msgid "Display the usage of this command and exit."
 msgstr "Zobrazí použitie tohto príkazu a skončí."
 
-#: grub-core/loader/efi/appleloader.c:223
+#: loader/efi/appleloader.c:325
 msgid "Boot legacy system."
 msgstr "Zavedie zdedený systém."
 
-#: grub-core/loader/efi/chainloader.c:348
-#: grub-core/loader/i386/pc/chainloader.c:170
+#: loader/efi/chainloader.c:340 loader/i386/pc/chainloader.c:153
 msgid "Load another boot loader."
 msgstr "Načíta iný zavádzač."
 
-#: grub-core/loader/i386/bsd.c:97
+#: loader/i386/bsd.c:65
 msgid "Display output on all consoles."
 msgstr "Zobrazí výstup na všetkých konzolách."
 
-#: grub-core/loader/i386/bsd.c:98 grub-core/loader/i386/bsd.c:132
-#: grub-core/loader/i386/bsd.c:161
+#: loader/i386/bsd.c:66
 msgid "Use serial console."
 msgstr "Použije sériovú konzolu."
 
-#: grub-core/loader/i386/bsd.c:99 grub-core/loader/i386/bsd.c:125
-#: grub-core/loader/i386/bsd.c:149
+#: loader/i386/bsd.c:67 loader/i386/bsd.c:93 loader/i386/bsd.c:114
 msgid "Ask for file name to reboot from."
 msgstr "Opýta sa na názov súboru, z ktorého sa má začať opätovné zavádzanie."
 
-#: grub-core/loader/i386/bsd.c:100
+#: loader/i386/bsd.c:68
 msgid "Use CDROM as root."
 msgstr "Použije CDROM ako koreňový adresár."
 
-#: grub-core/loader/i386/bsd.c:101
+#: loader/i386/bsd.c:69
 msgid "Invoke user configuration routing."
 msgstr "Vyvolá používateľskú konfiguráciu smerovania."
 
-#: grub-core/loader/i386/bsd.c:102 grub-core/loader/i386/bsd.c:129
-#: grub-core/loader/i386/bsd.c:152
+#: loader/i386/bsd.c:70 loader/i386/bsd.c:97 loader/i386/bsd.c:117
 msgid "Enter in KDB on boot."
 msgstr "Vstúpi do odlaďovača KDB pri zavádzaní."
 
-#: grub-core/loader/i386/bsd.c:103
+#: loader/i386/bsd.c:71
 msgid "Use GDB remote debugger instead of DDB."
 msgstr "Použije vzdialený odlaďovač GDB namiesto odlaďovača DDB"
 
-#: grub-core/loader/i386/bsd.c:104
+#: loader/i386/bsd.c:72
 msgid "Disable all boot output."
 msgstr "Zakáže všetky výstupy zavádzania."
 
-#: grub-core/loader/i386/bsd.c:106
+#: loader/i386/bsd.c:74
 msgid "Wait for keypress after every line of output."
 msgstr "Počká na stlačenie klávesu po každom vypísanom riadku."
 
-#: grub-core/loader/i386/bsd.c:108
+#: loader/i386/bsd.c:76
 msgid "Use compiled-in rootdev."
 msgstr "Použije koreňové zariadenie nastavené pri preklade."
 
-#: grub-core/loader/i386/bsd.c:109 grub-core/loader/i386/bsd.c:128
-#: grub-core/loader/i386/bsd.c:155
+#: loader/i386/bsd.c:77 loader/i386/bsd.c:96 loader/i386/bsd.c:120
 msgid "Boot into single mode."
 msgstr "Zavedie jednopoužívateľský režim."
 
-#: grub-core/loader/i386/bsd.c:110 grub-core/loader/i386/bsd.c:156
+#: loader/i386/bsd.c:78 loader/i386/bsd.c:121
 msgid "Boot with verbose messages."
 msgstr "Pri zavádzaní bude zobrazovať podrobné správy."
 
-#: grub-core/loader/i386/bsd.c:126 grub-core/loader/i386/bsd.c:150
+#: loader/i386/bsd.c:94 loader/i386/bsd.c:115
 msgid "Don't reboot, just halt."
 msgstr "Nereštartuje, iba vypne."
 
-#: grub-core/loader/i386/bsd.c:127 grub-core/loader/i386/bsd.c:151
+#: loader/i386/bsd.c:95 loader/i386/bsd.c:116
 msgid "Change configured devices."
 msgstr "Zmení nakonfigurované zariadenia."
 
-#: grub-core/loader/i386/bsd.c:130 grub-core/loader/i386/bsd.c:159
-#: util/grub-fstest.c:364
+#: loader/i386/bsd.c:98 loader/i386/bsd.c:124
 msgid "Set root device."
 msgstr "Nastaví koreňové zariadenie."
 
@@ -1127,23 +1113,23 @@
 msgid "comUNIT[,SPEED]"
 msgstr "comJEDNOTKA[,RÝCHLOSŤ]"
 
-#: grub-core/loader/i386/bsd.c:147
+#: loader/i386/bsd.c:112
 msgid "Disable SMP."
 msgstr "Zakáže architektúru SMP."
 
-#: grub-core/loader/i386/bsd.c:148
+#: loader/i386/bsd.c:113
 msgid "Disable ACPI."
 msgstr "Zakáže rozhranie ACPI."
 
-#: grub-core/loader/i386/bsd.c:154
+#: loader/i386/bsd.c:119
 msgid "Don't display boot diagnostic messages."
 msgstr "Nebude pri zavádzaní zobrazovať diagnostické správy."
 
-#: grub-core/loader/i386/bsd.c:157
+#: loader/i386/bsd.c:122
 msgid "Boot with debug messages."
 msgstr "Pri zavádzaní bude zobrazovať správy pre ladenie."
 
-#: grub-core/loader/i386/bsd.c:158
+#: loader/i386/bsd.c:123
 msgid "Supress normal output (warnings remain)."
 msgstr "Potlačí bežné výstupy (zostanú len upozornenia)."
 
@@ -1151,23 +1137,23 @@
 msgid "[ADDR|comUNIT][,SPEED]"
 msgstr "[ADRESA|comJEDNOTKA][,RÝCHLOSŤ]"
 
-#: grub-core/loader/i386/bsd.c:1947
+#: loader/i386/bsd.c:1297
 msgid "Load kernel of FreeBSD."
 msgstr "Načíta jadro systému FreeBSD."
 
-#: grub-core/loader/i386/bsd.c:1950
+#: loader/i386/bsd.c:1301
 msgid "Load kernel of OpenBSD."
 msgstr "Načíta jadro systému OpenBSD."
 
-#: grub-core/loader/i386/bsd.c:1953
+#: loader/i386/bsd.c:1305
 msgid "Load kernel of NetBSD."
 msgstr "Načíta jadro systému NetBSD."
 
-#: grub-core/loader/i386/bsd.c:1957
+#: loader/i386/bsd.c:1309
 msgid "Load FreeBSD env."
 msgstr "Načíta prostredie FreeBSD."
 
-#: grub-core/loader/i386/bsd.c:1960
+#: loader/i386/bsd.c:1312
 msgid "Load FreeBSD kernel module."
 msgstr "Načíta modul jadra FreeBSD."
 
@@ -1179,21 +1165,19 @@
 msgid "Load NetBSD kernel module (ELF)."
 msgstr "Načíta modul jadra NetBSD (vo formáte ELF)."
 
-#: grub-core/loader/i386/bsd.c:1969
+#: loader/i386/bsd.c:1315
 msgid "Load FreeBSD kernel module (ELF)."
 msgstr "Načíta modul jadra FreeBSD (vo formáte ELF)."
 
-#: grub-core/loader/i386/linux.c:1006 grub-core/loader/i386/pc/linux.c:439
-#: grub-core/loader/mips/linux.c:433
-#: grub-core/loader/powerpc/ieee1275/linux.c:375
-#: grub-core/loader/sparc64/ieee1275/linux.c:515
+#: loader/i386/efi/linux.c:1011 loader/i386/ieee1275/linux.c:301
+#: loader/i386/linux.c:1012 loader/i386/pc/linux.c:399
+#: loader/powerpc/ieee1275/linux.c:353 loader/sparc64/ieee1275/linux.c:514
 msgid "Load Linux."
 msgstr "Načíta Linux."
 
-#: grub-core/loader/i386/linux.c:1008 grub-core/loader/i386/pc/linux.c:442
-#: grub-core/loader/mips/linux.c:435
-#: grub-core/loader/powerpc/ieee1275/linux.c:377
-#: grub-core/loader/sparc64/ieee1275/linux.c:517
+#: loader/i386/efi/linux.c:1013 loader/i386/ieee1275/linux.c:303
+#: loader/i386/linux.c:1014 loader/i386/pc/linux.c:402
+#: loader/powerpc/ieee1275/linux.c:355 loader/sparc64/ieee1275/linux.c:516
 msgid "Load initrd."
 msgstr "Načíta initrd."
 
@@ -1201,11 +1185,11 @@
 msgid "Load NTLDR or BootMGR."
 msgstr "Načíta zavádzač NTLDR alebo BootMGR."
 
-#: grub-core/loader/i386/xnu.c:1130
+#: loader/i386/xnu.c:1032
 msgid "Load device-properties dump."
 msgstr "Načíta výpis vlastností zariadenia."
 
-#: grub-core/loader/multiboot.c:339
+#: loader/multiboot_loader.c:133
 msgid "Load a multiboot 2 kernel."
 msgstr "Načíta jadro systému multiboot 2."
 
@@ -1213,43 +1197,43 @@
 msgid "Load a multiboot 2 module."
 msgstr "Načíta modul systému multiboot 2."
 
-#: grub-core/loader/multiboot.c:345
+#: loader/multiboot_loader.c:136
 msgid "Load a multiboot kernel."
 msgstr "Načíta jadro systému multiboot."
 
-#: grub-core/loader/multiboot.c:348
+#: loader/multiboot_loader.c:141
 msgid "Load a multiboot module."
 msgstr "Načíta modul systému multiboot."
 
-#: grub-core/loader/xnu.c:1456
+#: loader/xnu.c:1428
 msgid "Load XNU image."
 msgstr "Načíta obraz jadra XNU."
 
-#: grub-core/loader/xnu.c:1458
+#: loader/xnu.c:1430
 msgid "Load 64-bit XNU image."
 msgstr "Načíta obraz 64 bitového jadra XNU."
 
-#: grub-core/loader/xnu.c:1460
+#: loader/xnu.c:1432
 msgid "Load XNU extension package."
 msgstr "Načíta rozširujúci balík jadra XNU."
 
-#: grub-core/loader/xnu.c:1462
+#: loader/xnu.c:1434
 msgid "Load XNU extension."
 msgstr "Načíta rozšírenie jadra XNU."
 
-#: grub-core/loader/xnu.c:1464
+#: loader/xnu.c:1436
 msgid "DIRECTORY [OSBundleRequired]"
 msgstr "ADRESÁR [OSBundleRequired]"
 
-#: grub-core/loader/xnu.c:1465
+#: loader/xnu.c:1437
 msgid "Load XNU extension directory."
 msgstr "Načítať adresár s rozšíreniami pre jadro XNU."
 
-#: grub-core/loader/xnu.c:1471
+#: loader/xnu.c:1444
 msgid "Load a splash image for XNU."
 msgstr "Načíta úvodný obrázok pre jadro XNU."
 
-#: grub-core/loader/xnu.c:1476
+#: loader/xnu.c:1449
 msgid "Load XNU hibernate image."
 msgstr "Načíta obraz hibernovaného jadra XNU."
 
@@ -1269,11 +1253,11 @@
 msgid "Remove any memory regions in specified range."
 msgstr "Odstráni oblasti pamäte v zadanom rozsahu."
 
-#: grub-core/normal/auth.c:216
+#: normal/auth.c:233
 msgid "Enter username: "
 msgstr "Zadajte používateľské meno: "
 
-#: grub-core/normal/auth.c:221
+#: normal/auth.c:238
 msgid "Enter password: "
 msgstr "Zadajte heslo: "
 
@@ -1285,41 +1269,41 @@
 msgid "Authenticate users"
 msgstr "Overí totožnosť používateľov"
 
-#: grub-core/normal/cmdline.c:174 grub-core/normal/menu_entry.c:1074
+#: normal/menu_entry.c:1060
 msgid "Possible commands are:"
 msgstr "Možné príkazy sú:"
 
-#: grub-core/normal/cmdline.c:177 grub-core/normal/menu_entry.c:1078
+#: normal/menu_entry.c:1064
 msgid "Possible devices are:"
 msgstr "Možné zariadenia sú:"
 
-#: grub-core/normal/cmdline.c:180 grub-core/normal/menu_entry.c:1082
+#: normal/menu_entry.c:1068
 msgid "Possible files are:"
 msgstr "Možné súbory sú:"
 
-#: grub-core/normal/cmdline.c:183 grub-core/normal/menu_entry.c:1086
+#: normal/menu_entry.c:1072
 msgid "Possible partitions are:"
 msgstr "Možné oddiely sú:"
 
-#: grub-core/normal/cmdline.c:186 grub-core/normal/menu_entry.c:1090
+#: normal/menu_entry.c:1076
 msgid "Possible arguments are:"
 msgstr "Možné parametre sú:"
 
-#: grub-core/normal/cmdline.c:189 grub-core/normal/menu_entry.c:1094
+#: normal/menu_entry.c:1080
 msgid "Possible things are:"
 msgstr "Možné položky sú:"
 
-#: grub-core/normal/color.c:81
+#: normal/color.c:80
 #, c-format
 msgid "Warning: syntax error (missing slash) in `%s'\n"
 msgstr "Upozornenie: syntaktická chyba (chýba lomítko) v „%s“\n"
 
-#: grub-core/normal/color.c:90
+#: normal/color.c:89
 #, c-format
 msgid "Warning: invalid foreground color `%s'\n"
 msgstr "Upozornenie: neplatná farba popredia „%s“'\n"
 
-#: grub-core/normal/color.c:96
+#: normal/color.c:95
 #, c-format
 msgid "Warning: invalid background color `%s'\n"
 msgstr "Upozornenie: neplatná farba pozadia „%s“\n"
@@ -1332,16 +1316,16 @@
 msgid "Export variables."
 msgstr "Exportuje premenné."
 
-#: grub-core/normal/dyncmd.c:159
+#: normal/dyncmd.c:147
 msgid "not loaded"
 msgstr "nenačítané"
 
-#: grub-core/normal/main.c:214
+#: normal/main.c:408
 #, c-format
 msgid "GNU GRUB  version %s"
 msgstr "GNU GRUB  verzia %s"
 
-#: grub-core/normal/main.c:359
+#: normal/main.c:539
 #, c-format
 msgid ""
 "Minimal BASH-like line editing is supported. For the first word, TAB lists "
@@ -1352,11 +1336,11 @@
 "prvom slove sa pomocou klávesu TAB doplní príkaz. Všade inde sa zobrazí "
 "výpis možných zariadení alebo sa doplní názov súboru. %s"
 
-#: grub-core/normal/main.c:362
+#: normal/main.c:542
 msgid "ESC at any time exits."
 msgstr "Klávesom ESC sa dá kedykoľvek ísť von."
 
-#: grub-core/normal/main.c:496
+#: commands/minicmd.c:378
 msgid "Clear the screen."
 msgstr "Vyčistí obrazovku."
 
@@ -1368,7 +1352,7 @@
 msgid "Exit from normal mode."
 msgstr "Opustí normálny režim."
 
-#: grub-core/normal/menu.c:50 grub-core/normal/menu_entry.c:1445
+#: normal/menu_entry.c:1397
 msgid "Press any key to continue..."
 msgstr "Pokračujte stlačením ľubovoľného klávesu..."
 
@@ -1386,7 +1370,7 @@
 msgid "Failed to boot both default and fallback entries.\n"
 msgstr "Zavedenie základnej aj záložnej položky zlyhalo.\n"
 
-#: grub-core/normal/menu_entry.c:1199
+#: normal/menu_entry.c:1184
 msgid "Booting a command list"
 msgstr "Zavádza sa zoznam príkazov"
 
@@ -1401,12 +1385,12 @@
 "kombinácie Ctrl-c alebo klávesu F2 sa zobrazí príkazový riadok a stlačením "
 "ESC sa zahodia zmeny a opäť sa zobrazí ponuka zavádzača GRUB."
 
-#: grub-core/normal/menu_text.c:159
+#: normal/menu_text.c:186
 #, c-format
 msgid "Use the %C and %C keys to select which entry is highlighted.\n"
 msgstr "Pomocou kláves %C a %C nastavte, ktorá položka má byť zvýraznená.\n"
 
-#: grub-core/normal/menu_text.c:179
+#: normal/menu_text.c:203
 msgid ""
 "Press enter to boot the selected OS, 'e' to edit the commands before booting "
 "or 'c' for a command-line. ESC to return previous menu.\n"
@@ -1415,7 +1399,7 @@
 "pre úpravu príkazov pred zavádzaním a klávesom „c“ otvoríte príkazový "
 "riadok. Klávesom ESC sa vrátite do predchádzajúcej ponuky.\n"
 
-#: grub-core/normal/menu_text.c:187
+#: normal/menu_text.c:211
 msgid ""
 "Press enter to boot the selected OS, 'e' to edit the commands before booting "
 "or 'c' for a command-line.\n"
@@ -1424,31 +1408,31 @@
 "pre úpravu príkazov pred zavádzaním a klávesom „c“ otvoríte príkazový "
 "riadok.\n"
 
-#: grub-core/normal/misc.c:42
+#: normal/misc.c:41
 #, c-format
 msgid "Partition %s:"
 msgstr "Oddiel %s:"
 
-#: grub-core/normal/misc.c:47
+#: normal/misc.c:46
 #, c-format
 msgid "Device %s:"
 msgstr "Zariadenie %s:"
 
-#: grub-core/normal/misc.c:53
+#: normal/misc.c:52
 msgid "Filesystem cannot be accessed"
 msgstr "Súborový systém je neprístupný"
 
-#: grub-core/normal/misc.c:64
+#: normal/misc.c:63
 #, c-format
 msgid "Filesystem type %s"
 msgstr "Súborový systém typu %s"
 
-#: grub-core/normal/misc.c:74
+#: normal/misc.c:73
 #, c-format
 msgid "- Label \"%s\""
 msgstr "- Menovka „%s“"
 
-#: grub-core/normal/misc.c:89
+#: normal/misc.c:88
 #, c-format
 msgid "- Last modification time %d-%02d-%02d %02d:%02d:%02d %s"
 msgstr "- Čas poslednej zmeny %7$s %3$d. %2$d. %1$d, %4$d:%5$02d:%6$02d"
@@ -1504,27 +1488,27 @@
 msgid "Load background image for active terminal."
 msgstr "Načíta obrázok pozadia pre aktívny terminál."
 
-#: grub-core/term/serial.c:37
+#: term/serial.c:46
 msgid "Set the serial unit."
 msgstr "Nastaví sériovú jednotku."
 
-#: grub-core/term/serial.c:38
+#: term/serial.c:47
 msgid "Set the serial port address."
 msgstr "Nastaví adresu sériového portu."
 
-#: grub-core/term/serial.c:39
+#: term/serial.c:48
 msgid "Set the serial port speed."
 msgstr "Nastaví rýchlosť sériového portu."
 
-#: grub-core/term/serial.c:40
+#: term/serial.c:49
 msgid "Set the serial port word length."
 msgstr "Nastaví dlžku slova sériového portu."
 
-#: grub-core/term/serial.c:41
+#: term/serial.c:50
 msgid "Set the serial port parity."
 msgstr "Nastaví paritu sériového portu."
 
-#: grub-core/term/serial.c:42
+#: term/serial.c:51
 msgid "Set the serial port stop bits."
 msgstr "Nastaví počet stop bitov sériového portu."
 
@@ -1793,33 +1777,33 @@
 msgid "Debug tool for filesystem driver."
 msgstr "ladiaci nástroj pre ovládač súborového systému."
 
-#: util/grub-mkimage.c:494 util/grub-mkimage.c:535
+#: util/grub-mkrawimage.c:69
 msgid "the core image is too small"
 msgstr "obraz jadra je príliš malý"
 
-#: util/grub-mkimage.c:505 util/grub-mkimage.c:539 util/grub-mkimage.c:557
+#: util/grub-mkrawimage.c:81
 msgid "cannot compress the kernel image"
 msgstr "nedá sa skomprimovať obraz jadra"
 
-#: util/grub-mkimage.c:672
+#: util/grub-mkrawimage.c:156
 msgid "prefix is too long"
 msgstr "predpona je príliš dlhá"
 
-#: util/grub-mkimage.c:836
+#: util/grub-mkrawimage.c:330
 #, c-format
 msgid "core image is too big (%p > %p)"
 msgstr "obraz jadra je príliš veľký (%p > %p)"
 
-#: util/grub-mkimage.c:842
+#: util/grub-mkrawimage.c:242
 msgid "the core image is too big"
 msgstr "obraz jadra je príliš veľký"
 
-#: util/grub-mkimage.c:861
+#: util/grub-mkrawimage.c:247
 #, c-format
 msgid "diskboot.img size must be %u bytes"
 msgstr "veľkosť diskboot.img musí byť %u bajtov"
 
-#: util/grub-mkimage.c:1402
+#: util/grub-mkrawimage.c:434 util/i386/pc/grub-setup.c:602
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Viac informácií získate príkazom „%s --help“.\n"
@@ -1869,34 +1853,34 @@
 "\n"
 "Chyby hláste na adrese <%s>.\n"
 
-#: util/grub-mkimage.c:1577
+#: util/grub-mkrawimage.c:580
 #, c-format
 msgid "cannot open %s"
 msgstr "nedá sa otvoriť %s"
 
-#: util/grub-setup.c:215
+#: util/i386/pc/grub-setup.c:160
 msgid "the first sector of the core file is not sector-aligned"
 msgstr "prvý sektor súboru s jadrom nie je sektorovo zarovnaný"
 
-#: util/grub-setup.c:229
+#: util/i386/pc/grub-setup.c:174
 msgid "non-sector-aligned data is found in the core file"
 msgstr "v súbore s jadrom boli nájdené sektorovo nezarovnané údaje"
 
-#: util/grub-setup.c:245
+#: util/i386/pc/grub-setup.c:188
 msgid "the sectors of the core file are too fragmented"
 msgstr "sektory súboru s jadrom sú príliš fragmentované"
 
-#: util/grub-setup.c:258
+#: util/i386/pc/grub-setup.c:199
 #, c-format
 msgid "the size of `%s' is not %u"
 msgstr "veľkosť „%s“ nie je %u"
 
-#: util/grub-setup.c:268
+#: util/i386/pc/grub-setup.c:216
 #, c-format
 msgid "the size of `%s' is too small"
 msgstr "veľkosť „%s“  je príliš malá"
 
-#: util/grub-setup.c:271
+#: util/i386/pc/grub-setup.c:218
 #, c-format
 msgid "the size of `%s' is too large"
 msgstr "veľkosť „%s“  je príliš veľká"
@@ -1910,7 +1894,7 @@
 "alebo s menovkou oddielu aj súborovým systémom. Toto nie je zatiaľ "
 "podporované."
 
-#: util/grub-setup.c:379
+#: util/i386/pc/grub-setup.c:255
 #, c-format
 msgid ""
 "unable to identify a filesystem in %s; safety check can't be performed"
@@ -1918,7 +1902,7 @@
 "nepodarilo sa rozpoznať súborový systém v %s; bezpečnostná kontrola sa nedá "
 "vykonať"
 
-#: util/grub-setup.c:382
+#: util/i386/pc/grub-setup.c:259
 #, c-format
 msgid ""
 "%s appears to contain a %s filesystem which isn't known to reserve space for "
@@ -1954,7 +1938,7 @@
 "Pokus o inštaláciu zavádzača GRUB na disk bez oddielov alebo na oddiel. Toto "
 "je ZLÝ nápad."
 
-#: util/grub-setup.c:499
+#: util/i386/pc/grub-setup.c:419
 msgid ""
 "embedding is not possible, but this is required when the root device is on a "
 "RAID array or LVM volume"
@@ -1982,30 +1966,30 @@
 msgid "will not proceed with blocklists"
 msgstr "zoznam blokov sa nepoužije"
 
-#: util/grub-setup.c:529
+#: util/i386/pc/grub-setup.c:445
 #, c-format
 msgid "attempting to read the core image `%s' from GRUB"
 msgstr "prebieha pokus o čítanie obrazu jadra „%s“ zo zavádzača GRUB"
 
-#: util/grub-setup.c:530
+#: util/i386/pc/grub-setup.c:446
 #, c-format
 msgid "attempting to read the core image `%s' from GRUB again"
 msgstr "znova prebieha pokus o čítanie obrazu jadra „%s“ zo zavádzača GRUB"
 
-#: util/grub-setup.c:589
+#: util/i386/pc/grub-setup.c:513
 #, c-format
 msgid "cannot read `%s' correctly"
 msgstr "nedá sa správne prečítať „%s“"
 
-#: util/grub-setup.c:604
+#: util/i386/pc/grub-setup.c:526
 msgid "no terminator in the core image"
 msgstr "v obraze jadra chýba ukončenie"
 
-#: util/grub-setup.c:616
+#: util/i386/pc/grub-setup.c:537
 msgid "failed to read the first sector of the core image"
 msgstr "zlyhalo čítanie prvého sektoru obrazu jadra"
 
-#: util/grub-setup.c:622
+#: util/i386/pc/grub-setup.c:543
 msgid "failed to read the rest sectors of the core image"
 msgstr "zlyhalo čítanie zvyšku sektorov obrazu jadra"
 
@@ -2057,12 +2041,13 @@
 "Urobí disk zavádzacím ako disketu (predvolené pre zariadenia fdX). Pri "
 "niektorých BIOSoch to nemusí fungovať."
 
-#: util/grub-setup.c:822
+#: util/i386/pc/grub-setup.c:740
 #, c-format
 msgid "Unknown extra argument `%s'.\n"
 msgstr "Neznámy prebytočný parameter „%s“\n"
 
-#: util/grub-setup.c:828
+#: util/i386/pc/grub-setup.c:734
+#, c-format
 msgid "No device is specified.\n"
 msgstr "Nebolo zadané žiadne zariadenie.\n"
 
@@ -2081,17 +2066,17 @@
 msgid "DEVICE must be an OS device (e.g. /dev/sda)."
 msgstr "Zariadenie ZARIADENIE musí byť zariadením OS (napr. /dev/sda)."
 
-#: util/grub-setup.c:915
+#: util/i386/pc/grub-setup.c:757
 #, c-format
 msgid "Invalid device `%s'.\n"
 msgstr "Neplatné zariadenie „%s“.\n"
 
-#: util/grub-setup.c:935
+#: util/i386/pc/grub-setup.c:770
 #, c-format
 msgid "invalid root device `%s'"
 msgstr "neplatné koreňové zariadenie „%s“"
 
-#: util/grub-setup.c:949
+#: util/i386/pc/grub-setup.c:783
 msgid "cannot guess the root device. Specify the option `--root-device'"
 msgstr ""
 "nedá sa odhadnúť koreňové zariadenie. Zadajte ho voľbou „--root-device“"
@@ -2108,27 +2093,27 @@
 msgid "%s, with kFreeBSD %s (recovery mode)"
 msgstr "%s, s jadrom kFreeBSD %s (režim pre obnovu)"
 
-#: util/grub.d/10_kfreebsd.in:76
+#: util/grub.d/10_kfreebsd.in:47
 msgid "%s, with kFreeBSD %s"
 msgstr "%s, s jadrom kFreeBSD %s"
 
-#: util/grub.d/10_kfreebsd.in:87
+#: util/grub.d/10_kfreebsd.in:55
 msgid "Loading kernel of FreeBSD %s ..."
 msgstr "Načítava sa jadro FreeBSD %s ..."
 
-#: util/grub.d/10_linux.in:69
+#: util/grub.d/10_linux.in:60
 msgid "%s, with Linux %s (recovery mode)"
 msgstr "%s, s jadrom Linux %s (režim pre obnovu)"
 
-#: util/grub.d/10_linux.in:71
+#: util/grub.d/10_linux.in:62
 msgid "%s, with Linux %s"
 msgstr "%s, s jadrom Linux %s"
 
-#: util/grub.d/10_linux.in:116 util/grub.d/20_linux_xen.in:85
+#: util/grub.d/10_linux.in:87
 msgid "Loading Linux %s ..."
 msgstr "Načítava sa Linux %s ..."
 
-#: util/grub.d/10_linux.in:122 util/grub.d/20_linux_xen.in:93
+#: util/grub.d/10_linux.in:92
 msgid "Loading initial ramdisk ..."
 msgstr "Načítava sa počiatočný ramdisk ..."
 
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gutenprint.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gutenprint.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/gutenprint.po	2012-01-02 17:51:03.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/gutenprint.po	2012-02-23 06:55:50.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: GIMP Print\n"
 "Report-Msgid-Bugs-To: gimp-print-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-05-01 21:33-0400\n"
-"PO-Revision-Date: 2011-08-20 00:45+0000\n"
+"PO-Revision-Date: 2012-02-15 08:12+0000\n"
 "Last-Translator: Zdenko Podobný <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: src/main/dither-main.c:44 src/main/print-color.c:49
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/hello-debhelper.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/hello-debhelper.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/hello-debhelper.po	2012-01-02 17:50:48.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/hello-debhelper.po	2012-02-23 06:55:37.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: src/hello.c:100
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/hello.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/hello.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/hello.po	2012-01-02 17:50:48.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/hello.po	2012-02-23 06:55:37.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: src/hello.c:100
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/help2man.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/help2man.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/help2man.po	2012-01-02 17:50:42.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/help2man.po	2012-02-23 06:55:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: help2man:69
 #, perl-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/human-theme.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/human-theme.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/human-theme.po	2012-01-02 17:51:04.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/human-theme.po	2012-02-23 06:55:50.000000000 +0000
@@ -9,13 +9,13 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-06-23 11:36+0000\n"
 "PO-Revision-Date: 2010-09-16 12:51+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:37+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:39+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../index.theme.in.h:1
 msgid "Ubuntu default theme"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/hunspell.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/hunspell.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/hunspell.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/hunspell.po	2012-02-23 06:55:47.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/tools/hunspell.cxx:205 src/tools/hunspell.cxx:313
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/indent.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/indent.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/indent.po	2012-01-02 17:50:42.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/indent.po	2012-02-23 06:55:31.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:24+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/args.c:611
 msgid ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/jade.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/jade.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/jade.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/jade.po	2012-02-23 06:55:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 msgid "cannot open output file %1 (%2)"
 msgstr "nemôžem otvoriť výstupný súbor %1 (%2)"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/jockey.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/jockey.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/jockey.po	2012-01-02 17:51:10.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/jockey.po	2012-02-23 06:55:56.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: jockey\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-12-08 12:01+0000\n"
-"PO-Revision-Date: 2011-09-26 09:15+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"PO-Revision-Date: 2012-01-17 22:57+0000\n"
+"Last-Translator: Laco Gubík <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: ../text/jockey-text.py:72
@@ -102,7 +102,7 @@
 
 #: ../examples/handlers/sl_modem.py:15 ../data/handlers/sl_modem.py:15
 msgid "Software modem"
-msgstr "Sofvér modemu"
+msgstr "Sofvérový modem"
 
 #: ../examples/handlers/sl_modem.py:17 ../data/handlers/sl_modem.py:17
 msgid ""
@@ -133,6 +133,10 @@
 "\n"
 "This should help you use Ubuntu in your VM."
 msgstr ""
+"Nainštalovať klientské ovládače VMWare pre Vašu inštaláciu Ubuntu vo "
+"VMWare.\n"
+"\n"
+"Toto vám pomôže používať Ubuntu vo vašom VM."
 
 #: ../backend/jockey-backend.py:32
 msgid "Enable debugging messages."
@@ -188,6 +192,8 @@
 "no-dbus option as root to\"+                            \" use jockey "
 "without it."
 msgstr ""
+"Nedá sa spojiť s D-BUS,\"+ \" prosím, použite voľbu --no-dbus ako správca\"+ "
+"\" aby ste použili program jockey bez D-BUS."
 
 #: ../jockey/ui.py:132 ../jockey/ui.py:145
 msgid "Searching for available drivers..."
@@ -249,7 +255,7 @@
 
 #: ../jockey/ui.py:185
 msgid "Download in progress"
-msgstr "Sťahovanie prebieha"
+msgstr "Prebieha sťahovanie"
 
 #: ../jockey/ui.py:186
 msgid "Unknown driver"
@@ -371,16 +377,17 @@
 #: ../jockey/ui.py:362
 msgid "Check for newly used or usable drivers and notify the user."
 msgstr ""
-"Kontrolovať pre znovu používané a užitočné ovládače a upozorniť používateľa."
+"Kontrolovať pre novšie používané a užitočné ovládače a upozorniť používateľa."
 
 #: ../jockey/ui.py:365
 msgid "Query driver databases for newly available or updated drivers."
 msgstr ""
-"Dopyt databázy ovládačov pre znovu dostupné alebo aktualizované ovládače."
+"Prehľadať databázy ovládačov pre nanovo dostupné alebo aktualizované "
+"ovládače."
 
 #: ../jockey/ui.py:368
 msgid "List available drivers and their status."
-msgstr "Zoznam dostupných ovládačov a ich stav."
+msgstr "Uviesť dostupné ovládače a ich stav."
 
 #: ../jockey/ui.py:371
 msgid "Enable drivers that can be automatically installed."
@@ -392,11 +399,11 @@
 
 #: ../jockey/ui.py:377
 msgid "Enable a driver"
-msgstr "Zapnúť ovládač"
+msgstr "Povoliť ovládač"
 
 #: ../jockey/ui.py:380
 msgid "Disable a driver"
-msgstr "Vypnúť ovládač"
+msgstr "Zakázať ovládač"
 
 #: ../jockey/ui.py:383
 msgid "Ask for confirmation for --enable/--disable"
@@ -439,7 +446,7 @@
 
 #: ../jockey/ui.py:539 ../jockey/ui.py:1022
 msgid "Restricted drivers available"
-msgstr "Dostupné uzavreté ovládače"
+msgstr "Dostupné neslobodné ovládače"
 
 #: ../jockey/ui.py:540
 msgid ""
@@ -455,11 +462,11 @@
 
 #: ../jockey/ui.py:544
 msgid "There are new or updated drivers available for your hardware."
-msgstr "Nachádzajú sa tu nové alebo aktualizované ovládače pre váš hardvér."
+msgstr "K dispozícii sú nové alebo aktualizované ovládače pre váš hardvér."
 
 #: ../jockey/ui.py:548
 msgid "New restricted drivers in use"
-msgstr "Používajú sa nové uzavreté ovládače"
+msgstr "Používajú sa nové neslobodné ovládače"
 
 #. %(os)s stands for the OS name. Prefix it or suffix it,
 #. but do not replace it.
@@ -469,7 +476,8 @@
 "In order for this computer to function properly, %(os)s is using driver "
 "software that cannot be supported by %(os)s."
 msgstr ""
-"%(os)s používa nepodporované ovládače, aby tento počítač pracoval správne."
+"Aby tento počítač pracoval správne, %(os)s používa ovládače, ktoré %(os)s "
+"nemôže podporovať."
 
 #: ../jockey/ui.py:577
 msgid ""
@@ -481,7 +489,7 @@
 
 #: ../jockey/ui.py:583
 msgid "Downloading and installing driver..."
-msgstr "Ovládač sa práve preberá a inštaluje..."
+msgstr "Ovládač sa práve sťahuje a inštaluje..."
 
 #: ../jockey/ui.py:591
 msgid "Removing driver..."
@@ -493,7 +501,7 @@
 
 #: ../jockey/ui.py:621
 msgid "Use --list to see available drivers"
-msgstr "Použiť --list k zobrazeniu dostupných ovládačov"
+msgstr "Použite --list k zobrazeniu dostupných ovládačov"
 
 #: ../jockey/ui.py:638
 msgid "Cannot change driver"
@@ -501,11 +509,11 @@
 
 #: ../jockey/ui.py:651
 msgid "Enable driver?"
-msgstr "Zapnúť ovládač?"
+msgstr "Povoliť ovládač?"
 
 #: ../jockey/ui.py:654
 msgid "Disable driver?"
-msgstr "Vypnúť ovládač?"
+msgstr "Zakázať ovládač?"
 
 #: ../jockey/ui.py:683
 msgid "Sorry, the Jockey backend crashed. Please file a bug at:"
@@ -586,6 +594,7 @@
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:2
 msgid "To query the device drivers, you need to authenticate."
 msgstr ""
+"Overenie totožnosti je potrebné na získanie ovládačov pre zariadenia."
 
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:3
 msgid ""
@@ -594,7 +603,7 @@
 
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:4
 msgid "To check the driver status, you need to authenticate."
-msgstr ""
+msgstr "Overenie totožnosti je potrebné na skontrolovanie stavu ovládačov."
 
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:5
 msgid ""
@@ -606,6 +615,7 @@
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:6
 msgid "To query the driver databases for updates, you need to authenticate."
 msgstr ""
+"Overenie totožnosti je potrebné na získanie aktualizácií databázy ovládačov."
 
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:7
 msgid "Install or remove device drivers"
@@ -614,6 +624,8 @@
 #: ../backend/com.ubuntu.devicedriver.policy.in.h:8
 msgid "To install or remove device drivers, you need to authenticate."
 msgstr ""
+"Overenie totožnosti je potrebné na inštaláciu alebo odstránenie ovládačov "
+"zariadenia."
 
 #: ../examples/handlers/nvidia.py:27
 msgid "3D-accelerated proprietary graphics driver for NVIDIA cards."
@@ -631,9 +643,9 @@
 "such as some games."
 msgstr ""
 "Tento ovládač je potrebný k plnému využitiu 3D potenciálu grafických kariet "
-"NVIDIA ako aj 2D akcelerácie na novších kartách.\n"
+"NVIDIA ako aj k poskytnutiu 2D akcelerácie na novších kartách.\n"
 "\n"
-"Ak chcete zapnúť efekty prostredia, je potrebné použiť tento ovládač.\n"
+"Ak chcete povoliť efekty prostredia, je potrebné použiť tento ovládač.\n"
 "\n"
-"Ak nezapnete tento ovládač, nebude možné použiť efekty prostredia a používať "
-"programy vyžadujúce 3D akceleráciu ako sú napr. niektoré hry."
+"Ak zakážete tento ovládač, nebude možné použiť efekty prostredia a používať "
+"programy vyžadujúce 3D akceleráciu napr. niektoré hry."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/kcm_gtk.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/kcm_gtk.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/kcm_gtk.po	2012-01-02 17:51:13.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/kcm_gtk.po	2012-02-23 06:55:58.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: kcm-gtk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-08-18 16:55+0000\n"
-"PO-Revision-Date: 2011-08-18 22:13+0000\n"
+"PO-Revision-Date: 2012-02-14 14:16+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:31+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:16+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: kcmgtk.cpp:67
 msgid "kcm_gtk"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/kubuntu-docs-directory.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/kubuntu-docs-directory.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/kubuntu-docs-directory.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/kubuntu-docs-directory.po	2012-02-23 06:55:48.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:02+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../directory.desktop.in.h:1
 msgid "Kubuntu Documentation"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/kubuntu-docs-kubuntu-docs.po	2012-02-23 06:55:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:02+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../kubuntu-docs.desktop.in.h:1
 msgid "Kubuntu System Documentation Index"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/language-selector.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/language-selector.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/language-selector.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/language-selector.po	2012-02-23 06:55:47.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: language-selector\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-19 09:41+0000\n"
+"POT-Creation-Date: 2012-02-15 06:50+0000\n"
 "PO-Revision-Date: 2011-06-28 16:48+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -15,28 +15,28 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:55+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #. Hack for Chinese langpack split
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
-#: ../LanguageSelector/LocaleInfo.py:51
+#: ../LanguageSelector/LocaleInfo.py:50
 msgid "Chinese (simplified)"
 msgstr "čínština (zjednodušená)"
 
 #. Translators: please translate 'Chinese (simplified)' and 'Chinese (traditional)' so that they appear next to each other when sorted alphabetically.
-#: ../LanguageSelector/LocaleInfo.py:53
+#: ../LanguageSelector/LocaleInfo.py:52
 msgid "Chinese (traditional)"
 msgstr "čínština (tradičná)"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:229
-#: ../LanguageSelector/qt/QtLanguageSelector.py:84
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:225
+#: ../LanguageSelector/qt/QtLanguageSelector.py:85
 msgid "No language information available"
 msgstr "Informácia o jazyku nie je dostupná"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230
-#: ../LanguageSelector/qt/QtLanguageSelector.py:85
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:226
+#: ../LanguageSelector/qt/QtLanguageSelector.py:86
 msgid ""
 "The system does not have information about the available languages yet. Do "
 "you want to perform a network update to get them now? "
@@ -44,24 +44,24 @@
 "Systém zatiaľ nemá informácie o dostupných jazykoch. Chcete teraz "
 "aktualizovať zoznam dostupných jazykov zo siete? "
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:234
-#: ../LanguageSelector/qt/QtLanguageSelector.py:79
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:230
+#: ../LanguageSelector/qt/QtLanguageSelector.py:80
 msgid "_Update"
 msgstr "Akt_ualizovať"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:319
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:357
-#: ../data/LanguageSelector.ui.h:24
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:314
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:351
+#: ../data/LanguageSelector.ui.h:23
 msgid "Language"
 msgstr "Jazyk"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:326
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:321
 msgid "Installed"
 msgstr "Nainštalované"
 
 #. print "%(INSTALL)d to install, %(REMOVE)d to remove" % (countInstall, countRemove)
 #. Translators: %(INSTALL)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "INSTALL".
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:395
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:389
 #, python-format
 msgid "%(INSTALL)d to install"
 msgid_plural "%(INSTALL)d to install"
@@ -70,7 +70,7 @@
 msgstr[2] "%(INSTALL)d sa má inštalovať"
 
 #. Translators: %(REMOVE)d is parsed; either keep it exactly as is or remove it entirely, but don't translate "REMOVE".
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:397
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:391
 #, python-format
 msgid "%(REMOVE)d to remove"
 msgid_plural "%(REMOVE)d to remove"
@@ -79,26 +79,24 @@
 msgstr[2] "%(REMOVE)d sa má odstrániť"
 
 #. Translators: this string will concatenate the "%n to install" and "%n to remove" strings, you can replace the comma if you need to.
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:406
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:400
 #, python-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:468
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:462
 msgid "none"
 msgstr "žiadna"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:518
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:714
-#: ../LanguageSelector/qt/QtLanguageSelector.py:68
-#: ../LanguageSelector/qt/QtLanguageSelector.py:337
-#: ../check-language-support:52
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:512
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:716
+#: ../LanguageSelector/qt/QtLanguageSelector.py:69
+#: ../LanguageSelector/qt/QtLanguageSelector.py:328
 msgid "Software database is broken"
 msgstr "Databáza softvéru je poškodená"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:519
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:715
-#: ../check-language-support:53
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:513
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:717
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -108,11 +106,11 @@
 "Na odstránenie tohto problému použite správcu balíkov „Synaptic“ alebo "
 "spustite „sudo apt-get install -f“ v termáli."
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:564
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:554
 msgid "Could not install the selected language support"
 msgstr "Nepodarilo sa nainštalovať zvolenú jazykovú podporu"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:565
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:555
 msgid ""
 "This is perhaps a bug of this application. Please file a bug report at "
 "https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug"
@@ -120,25 +118,35 @@
 "Toto je pravdepodobne chyba tejto aplikácie. Prosím, ohláste chybu na "
 "stránke https://bugs.launchpad.net/ubuntu/+source/language-selector/+filebug"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:589
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:579
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:614
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:618
 msgid "Could not install the full language support"
 msgstr "Nepodarilo sa nainštalovať úplnú jazykovú podporu"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:590
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:580
 msgid ""
 "Usually this is related to an error in your software archive or software "
 "manager. Check your preferences in Software Sources (click the icon at the "
 "very right of the top bar and select \"System Settings... -> Software "
 "Sources\")."
 msgstr ""
+"To zvyčajne súvisí s chybou vo vašom archíve softvéru alebo správcovi "
+"softvéru. Skontrolujte svoje nastavenia v Zdrojoch softvéru (kliknite na "
+"ikonu celkom vpravo v hornom paneli a vyberte „Nastavenia systému... -> "
+"Zdroje softvéru“)."
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:671
-#: ../LanguageSelector/qt/QtLanguageSelector.py:161
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:615
+msgid "Failed to authorize to install packages."
+msgstr ""
+
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:673
+#: ../LanguageSelector/qt/QtLanguageSelector.py:162
 msgid "The language support is not installed completely"
 msgstr "Jazyková podpora nie je úplne nainštalovaná"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:672
-#: ../LanguageSelector/qt/QtLanguageSelector.py:162
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:674
+#: ../LanguageSelector/qt/QtLanguageSelector.py:163
 msgid ""
 "Some translations or writing aids available for your chosen languages are "
 "not installed yet. Do you want to install them now?"
@@ -146,29 +154,29 @@
 "Nie všetky preklady či pomôcky pri písaní, ktoré sú dostupné pre podporované "
 "jazyky vo vašom systéme, sú nainštalované. Chcete ich teraz nainštalovať?"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:675
-#: ../LanguageSelector/qt/QtLanguageSelector.py:80
-#: ../LanguageSelector/qt/QtLanguageSelector.py:157
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:677
+#: ../LanguageSelector/qt/QtLanguageSelector.py:81
+#: ../LanguageSelector/qt/QtLanguageSelector.py:158
 msgid "_Remind Me Later"
 msgstr "P_ripomenúť neskôr"
 
 #. FIXME: add "details"
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:676
-#: ../LanguageSelector/qt/QtLanguageSelector.py:156
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:678
+#: ../LanguageSelector/qt/QtLanguageSelector.py:157
 msgid "_Install"
 msgstr "Na_inštalovať"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:679
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:681
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../LanguageSelector/gtk/GtkLanguageSelector.py:937
+#: ../LanguageSelector/gtk/GtkLanguageSelector.py:935
 #, python-format
 msgid "Failed to apply the '%s' format choice:"
 msgstr "Nepodarilo sa aplikovať výber formátu „%s“:"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:69
-#: ../LanguageSelector/qt/QtLanguageSelector.py:338
+#: ../LanguageSelector/qt/QtLanguageSelector.py:70
+#: ../LanguageSelector/qt/QtLanguageSelector.py:329
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Adept\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -178,82 +186,82 @@
 "tento problém pomocou správcu balíkov „Adept“ alebo spustite v termináli "
 "„sudo apt-get install -f“."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:113
+#: ../LanguageSelector/qt/QtLanguageSelector.py:114
 msgid "Set System Language"
 msgstr "Nastaviť jazyk systému"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:114
+#: ../LanguageSelector/qt/QtLanguageSelector.py:115
 msgid "Default system language:"
 msgstr "Predvolený jazyk systému:"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:115
+#: ../LanguageSelector/qt/QtLanguageSelector.py:116
 msgid "Keyboard input method:"
 msgstr "Metóda vstupu z klávesnice"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:116
+#: ../LanguageSelector/qt/QtLanguageSelector.py:117
 msgid "Select language to install:"
 msgstr "Vyberte jazyk, ktorý chcete nainštalovať:"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:117
+#: ../LanguageSelector/qt/QtLanguageSelector.py:118
 msgid "Select language to uninstall:"
 msgstr "Vyberte jazyk, ktorý chcete odinštalovať:"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:118
+#: ../LanguageSelector/qt/QtLanguageSelector.py:119
 msgid "Translations"
 msgstr "Preklady"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:119
+#: ../LanguageSelector/qt/QtLanguageSelector.py:120
 msgid "Input methods"
 msgstr "Metódy vstupu"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:120
+#: ../LanguageSelector/qt/QtLanguageSelector.py:121
 msgid "Spellchecking and writing aids"
 msgstr "Kontrola pravopisu a pomôcky pri písaní"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:121
+#: ../LanguageSelector/qt/QtLanguageSelector.py:122
 msgid "Extra fonts"
 msgstr "Ďalšie písma"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:122
+#: ../LanguageSelector/qt/QtLanguageSelector.py:123
 msgid "Components:"
 msgstr "Súčasti:"
 
 #. not sure how to unset all flags, but this disables the item
-#: ../LanguageSelector/qt/QtLanguageSelector.py:201
+#: ../LanguageSelector/qt/QtLanguageSelector.py:202
 msgid "Already installed"
 msgstr "Už nainštalované"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:204
+#: ../LanguageSelector/qt/QtLanguageSelector.py:205
 msgid "Partially Installed"
 msgstr "Čiastočne nainštalované"
 
 #. not sure how to unset all flags, but this disables the item
-#: ../LanguageSelector/qt/QtLanguageSelector.py:207
+#: ../LanguageSelector/qt/QtLanguageSelector.py:208
 msgid "Not installed"
 msgstr "Nenainštalované"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:246
+#: ../LanguageSelector/qt/QtLanguageSelector.py:243
 msgid "Component already installed"
 msgstr "Komponent už je nainštalovaný"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:248
+#: ../LanguageSelector/qt/QtLanguageSelector.py:245
 msgid "Component not available"
 msgstr "Komponent nie je dostupný"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:250
+#: ../LanguageSelector/qt/QtLanguageSelector.py:247
 msgid "Component not installed"
 msgstr "Komponent nie je nainštalovaný"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:292
+#: ../LanguageSelector/qt/QtLanguageSelector.py:288
 #, python-format
 msgid "Default system Language now set to %s."
 msgstr "Predvolený jazyk systému je teraz %s."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:292
+#: ../LanguageSelector/qt/QtLanguageSelector.py:288
 msgid "Language Set"
 msgstr "Jazyková sada"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:363
+#: ../LanguageSelector/qt/QtLanguageSelector.py:354
 #, python-format
 msgid ""
 "All selected components have now been installed for %s.  Select them from "
@@ -262,32 +270,32 @@
 "Všetky vybrané komponenty už boli nainštalované pre %s. Vyberte ich v "
 "Krajina/Oblasť a jazyk."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:363
+#: ../LanguageSelector/qt/QtLanguageSelector.py:354
 msgid "Language Installed"
 msgstr "Jazyk nainštalovaný"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:365
+#: ../LanguageSelector/qt/QtLanguageSelector.py:356
 #, python-format
 msgid "Translations and support have now been uninstalled for %s."
 msgstr "Preklady a podpora jazyka %s boli odinštalované."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:365
+#: ../LanguageSelector/qt/QtLanguageSelector.py:356
 msgid "Language Uninstalled"
 msgstr "Jazyk odinštalovaný"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:373
+#: ../LanguageSelector/qt/QtLanguageSelector.py:364
 msgid "Failed to set system language."
 msgstr "Nepodarilo sa nastaviť jazyk systému"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:373
+#: ../LanguageSelector/qt/QtLanguageSelector.py:364
 msgid "Language Not Set"
 msgstr "Jazyk nebol nastavený"
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:442
+#: ../LanguageSelector/qt/QtLanguageSelector.py:433
 msgid "Please run this software with administrative rights."
 msgstr "Tento program musíte spustiť s právami správcu."
 
-#: ../LanguageSelector/qt/QtLanguageSelector.py:442
+#: ../LanguageSelector/qt/QtLanguageSelector.py:433
 msgid "Not Root User"
 msgstr "Nebeží s právami používateľa root"
 
@@ -364,22 +372,19 @@
 
 #: ../data/LanguageSelector.ui.h:16
 msgid ""
-"<small>Use the same language choices for startup and the login screen.\n"
-"Changes take effect only after a restart of the system.</small>"
+"<small>Use the same language choices for startup and the login "
+"screen.</small>"
 msgstr ""
-"<small>Použiť rovnaké voľby jazyka pre štartovaciu a prihlasovaciu "
-"obrazovku.\n"
-"Zmeny sa prejavia po reštarte systému.</small>"
 
-#: ../data/LanguageSelector.ui.h:18
+#: ../data/LanguageSelector.ui.h:17
 msgid "Install / Remove Languages..."
 msgstr "Nainštalovať/odstrániť jazyky..."
 
-#: ../data/LanguageSelector.ui.h:19
+#: ../data/LanguageSelector.ui.h:18
 msgid "Keyboard input method system:"
 msgstr "Metóda vstupu z klávesnice:"
 
-#: ../data/LanguageSelector.ui.h:20
+#: ../data/LanguageSelector.ui.h:19
 msgid ""
 "If you need to type in languages, which require more complex input methods "
 "than just a simple key to letter mapping, you may want to enable this "
@@ -398,11 +403,11 @@
 "Ak chcete použiť alternatívne metódy vstupu, nainštalujte si najprv "
 "zodpovedajúce balíky a potom tu zvoľte požadovaný systém."
 
-#: ../data/LanguageSelector.ui.h:25
+#: ../data/LanguageSelector.ui.h:24
 msgid "Display numbers, dates and currency amounts in the usual format for:"
 msgstr "Zobrazovať čísla, dátumy a peniaze v zvyčajnom formáte:"
 
-#: ../data/LanguageSelector.ui.h:26
+#: ../data/LanguageSelector.ui.h:25
 msgid ""
 "This will set the system environment like shown below and will also affect "
 "the preferred paper format and other region specific settings.\n"
@@ -418,36 +423,32 @@
 "Mali by ste teda túto voľbu nastaviť na vhodnú hodnotu pre oblasť, kde sa "
 "nachádzate."
 
-#: ../data/LanguageSelector.ui.h:29
+#: ../data/LanguageSelector.ui.h:28
 msgid "<small>Changes take effect next time you log in.</small>"
 msgstr "<small>Zmeny sa prejavia po ďalšom prihlásení.</small>"
 
-#: ../data/LanguageSelector.ui.h:30
+#: ../data/LanguageSelector.ui.h:29
 msgid ""
-"<small>Use the same format choice for startup and the login screen.\n"
-"Changes take effect only after a restart of the system.</small>"
+"<small>Use the same format choice for startup and the login screen.</small>"
 msgstr ""
-"<small>Použiť rovnaký formát výberu pre štartovaciu a prihlasovaciu "
-"obrazovku.\n"
-"Zmeny sa prejavia po reštarte systému.</small>"
 
-#: ../data/LanguageSelector.ui.h:32
+#: ../data/LanguageSelector.ui.h:30
 msgid "Number:"
 msgstr "Číslo:"
 
-#: ../data/LanguageSelector.ui.h:33
+#: ../data/LanguageSelector.ui.h:31
 msgid "Date:"
 msgstr "Dátum:"
 
-#: ../data/LanguageSelector.ui.h:34
+#: ../data/LanguageSelector.ui.h:32
 msgid "Currency:"
 msgstr "Mena:"
 
-#: ../data/LanguageSelector.ui.h:35
+#: ../data/LanguageSelector.ui.h:33
 msgid "<b>Example</b>"
 msgstr "Príklad"
 
-#: ../data/LanguageSelector.ui.h:36
+#: ../data/LanguageSelector.ui.h:34
 msgid "Regional Formats"
 msgstr "Regionálne formáty"
 
@@ -479,6 +480,12 @@
 "Support instead (click the icon at the very right of the top bar and select "
 "\"System Settings... -> Language Support\")."
 msgstr ""
+"Zdá sa, že súbory na podporu vybraného jazyka sú neúplné. Chýbajúce súčasti "
+"môžete nainštalovať kliknutím na „Spustiť túto operáciu teraz“ a "
+"nasledovaním inštrukcií. Vyžaduje sa aktívne pripojenie k internetu. Ak tak "
+"chcete urobiť neskôr, prosím, použite Jazykovú podporu (kliknite na ikonu "
+"celkom vpravo v hornom paneli a vyberte „Nastavenia systému... -> Jazyková "
+"podpora“)."
 
 #. Description
 #: ../data/incomplete-language-support-kde.note.in:6
@@ -513,27 +520,27 @@
 msgid "System policy prevented setting default language"
 msgstr ""
 
-#: ../gnome-language-selector:20
+#: ../gnome-language-selector:17
 msgid "don't verify installed language support"
 msgstr "nekontrolovať nainštalovanú podporu jazyka"
 
-#: ../gnome-language-selector:23 ../check-language-support:22
+#: ../gnome-language-selector:20 ../check-language-support:25
 msgid "alternative datadir"
 msgstr "alternatívny priečinok s údajmi"
 
-#: ../fontconfig-voodoo:18
+#: ../fontconfig-voodoo:17
 msgid "Aborting"
 msgstr "Ruší sa"
 
-#: ../fontconfig-voodoo:26
+#: ../fontconfig-voodoo:25
 msgid "Force even when a configuration exists"
 msgstr "Vnútiť, aj keď konfigurácia už existuje"
 
-#: ../fontconfig-voodoo:28
+#: ../fontconfig-voodoo:27
 msgid "Set fontconfig voodoo for the selected language"
 msgstr "Nastaviť voodoo fontconfig na vybraný jazyk"
 
-#: ../fontconfig-voodoo:32
+#: ../fontconfig-voodoo:31
 msgid ""
 "Guess a configuration based on the LANGUAGE environment. Sets the config to "
 "'none' if nothing suitable was found"
@@ -541,49 +548,49 @@
 "Odhadnúť konfiguráciu na základe premennej LANGUAGE. Nastaví konfiguráciu na "
 "„žiadny“, ak sa nenašiel vhodný"
 
-#: ../fontconfig-voodoo:37
+#: ../fontconfig-voodoo:36
 msgid "List the available fontconfig-voodoo configs"
 msgstr "Zoznam dostupných konfigurácií fontconfig-voodoo"
 
-#: ../fontconfig-voodoo:40
+#: ../fontconfig-voodoo:39
 msgid "Show the current fontconfig-voodoo config"
 msgstr "Zobraziť aktuálnu konfiguráciu fontconfig-voodoo"
 
-#: ../fontconfig-voodoo:43
+#: ../fontconfig-voodoo:42
 msgid "Remove the current fontconfig-voodoo config"
 msgstr "Odstrániť aktuálnu konfiguráciu fontconfig-voodoo"
 
-#: ../fontconfig-voodoo:65
+#: ../fontconfig-voodoo:64
 msgid "Unconfigured"
 msgstr "Nenakonfigurované"
 
-#: ../fontconfig-voodoo:81
+#: ../fontconfig-voodoo:80
 msgid "A configuration exists already. Use '--force' to overwrite it. "
 msgstr "Konfigurácia už existuje. Použite „--force“ ak ju chcete prepísať. "
 
-#: ../fontconfig-voodoo:90
+#: ../fontconfig-voodoo:89
 msgid "No fontconfig-voodoo configuration found for the current LANGUAGE"
 msgstr ""
 "Žiadna konfigurácia fontconfig-voodoo nebola nájdený pre aktuálny JAZYK"
 
-#: ../fontconfig-voodoo:97
+#: ../fontconfig-voodoo:96
 msgid "No fontconfig-voodoo configuration found for the selected locale"
 msgstr ""
 "Pre vybrané locale nebola nájdená žiadna konfigurácia fontconfig-voodoo"
 
-#: ../check-language-support:19
+#: ../check-language-support:22
 msgid "target language code"
 msgstr "kód cieľového jazyka"
 
-#: ../check-language-support:23
+#: ../check-language-support:26
 msgid "check for the given package(s) only -- separate packagenames by comma"
 msgstr ""
 "skontrolovať iba uvedené balík(y) -- oddeľovač názvov balíkov je čiarka"
 
-#: ../check-language-support:25
-msgid "check all available languages"
-msgstr "skontrolovať všetky dostupné jazyky"
-
 #: ../check-language-support:28
+msgid "output all available language support packages for all languages"
+msgstr ""
+
+#: ../check-language-support:31
 msgid "show installed packages as well as missing ones"
 msgstr "zobraziť nainštalované balíky rovnako ako tie chýbajúce"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/launchpad-integration.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/launchpad-integration.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/launchpad-integration.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/launchpad-integration.po	2012-02-23 06:55:48.000000000 +0000
@@ -9,13 +9,13 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-06-10 08:33+0200\n"
 "PO-Revision-Date: 2011-11-13 19:04+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/launchpad-integration.c:71
 msgid "The Launchpad helper application failed"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ldm.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ldm.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ldm.po	2012-01-02 17:51:09.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ldm.po	2012-02-23 06:55:55.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #: ../src/plugin.c:20
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ld.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ld.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ld.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ld.po	2012-02-23 06:55:26.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: emultempl/armcoff.em:73
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/lftp.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/lftp.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/lftp.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/lftp.po	2012-02-23 06:55:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:34+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:29+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/argmatch.c:133
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-inst1.3.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-inst1.3.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-inst1.3.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-inst1.3.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,301 +0,0 @@
-# Slovak translation of APT
-#
-# initial sk.po made from Czech translation (cs.po)
-# thanks to Miroslav Kure <kurem@debian.cz>
-#
-# Peter Mann <Peter.Mann@tuke.sk>, 2006.
-# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 08:33+0000\n"
-"Last-Translator: helix84 <Unknown>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-"Language: sk\n"
-
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Vytvorenie rúry zlyhalo"
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Spustenie gzip zlyhalo "
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
-msgid "Corrupted archive"
-msgstr "Porušený archív"
-
-#: apt-inst/contrib/extracttar.cc:193
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
-
-#: apt-inst/contrib/extracttar.cc:300
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Neznáma TAR hlavička typu %u, člen %s"
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Neplatný podpis archívu"
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Chyba pri čítaní záhlavia prvku archívu"
-
-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "Neplatná hlavička prvku archívu %s"
-
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "Neplatné záhlavie prvku archívu"
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "Archív je príliš krátky"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Chyba pri čítaní hlavičiek archívu"
-
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Hašovací prvok sa nedá nájsť!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Nedá sa alokovať diverzia"
-
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Vnútorná chyba pri AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
-
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dvojité pridanie diverzie %s -> %s"
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Duplicitný konfiguračný súbor %s/%s"
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:47 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed to write file %s"
-msgstr "Zápis súboru %s zlyhal"
-
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Zatvorenie súboru %s zlyhalo"
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr "Cesta %s je príliš dlhá"
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "%s sa rozbaľuje viackrát"
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "Adresár %s je divertovaný"
-
-#: apt-inst/extract.cc:144
-#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr "Diverzná cesta je príliš dlhá"
-
-#: apt-inst/extract.cc:178 apt-inst/extract.cc:190 apt-inst/extract.cc:207
-#: apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
-msgstr "%s sa nedá vyhodnotiť"
-
-#: apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Premenovanie %s na %s zlyhalo"
-
-#: apt-inst/extract.cc:240
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Adresár %s sa nahradí neadresárom"
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Cesta je príliš dlhá"
-
-#: apt-inst/extract.cc:412
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
-
-#: apt-inst/extract.cc:429
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Súbor %s/%s prepisuje ten z balíka %s"
-
-#: apt-inst/extract.cc:462
-#, c-format
-msgid "Unable to read %s"
-msgstr "Nedá sa načítať %s"
-
-#: apt-inst/extract.cc:489
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Nedá sa vyhodnotiť %s"
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, c-format
-msgid "Failed to remove %s"
-msgstr "Odstránenie %s zlyhalo"
-
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, c-format
-msgid "Unable to create %s"
-msgstr "Nedá sa vytvoriť %s"
-
-#: apt-inst/deb/dpkgdb.cc:114
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Vyhodnotenie %sinfo zlyhalo"
-
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
-
-#: apt-inst/deb/dpkgdb.cc:135
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "Nedá sa zmeniť na admin adresár %sinfo"
-
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-msgid "Internal error getting a package name"
-msgstr "Vnútorná chyba pri získavaní názvu balíka"
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-msgid "Reading file listing"
-msgstr "Načítava sa zoznam súborov"
-
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
-msgstr ""
-"Otvorenie súboru zoznamov „%sinfo/%s“ zlyhalo. Ak nemôžete obnoviť tento "
-"súbor, vytvorte nový prázdny a ihneď znovu nainštalujte tú istú verziu "
-"balíka!"
-
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s"
-
-#: apt-inst/deb/dpkgdb.cc:262
-msgid "Internal error getting a node"
-msgstr "Vnútorná chyba pri získavaní uzla"
-
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions"
-
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "Diverzný súbor je porušený"
-
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "Neplatný riadok v diverznom súbore: %s"
-
-#: apt-inst/deb/dpkgdb.cc:358
-msgid "Internal error adding a diversion"
-msgstr "Vnútorná chyba pri pridávaní diverzie"
-
-#: apt-inst/deb/dpkgdb.cc:379
-msgid "The pkg cache must be initialized first"
-msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr "Chyba pri hľadaní Balíka: hlavička, pozícia %lu"
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu"
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr "Chyba pri spracovaní MD5. Pozícia %lu"
-
-#: apt-inst/deb/debfile.cc:39 apt-inst/deb/debfile.cc:44
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Toto nie je platný DEB archív, chýba časť „%s“"
-
-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:53
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Toto nie je platný DEB archív, chýba časť „%s“, „%s“ alebo „%s“"
-
-#: apt-inst/deb/debfile.cc:113
-#, c-format
-msgid "Couldn't change to %s"
-msgstr "Nedá sa prejsť do %s"
-
-#: apt-inst/deb/debfile.cc:154
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
-
-#: apt-inst/deb/debfile.cc:189
-msgid "Failed to locate a valid control file"
-msgstr "Nedá sa nájsť platný riadiaci súbor"
-
-#: apt-inst/deb/debfile.cc:274
-msgid "Unparsable control file"
-msgstr "Nespracovateľný riadiaci súbor"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-inst1.4.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-inst1.4.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-inst1.4.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-inst1.4.po	2012-02-23 06:55:25.000000000 +0000
@@ -0,0 +1,301 @@
+# Slovak translation of APT
+#
+# initial sk.po made from Czech translation (cs.po)
+# thanks to Miroslav Kure <kurem@debian.cz>
+#
+# Peter Mann <Peter.Mann@tuke.sk>, 2006.
+# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 13:17+0000\n"
+"Last-Translator: helix84 <Unknown>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: sk\n"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Vytvorenie rúry zlyhalo"
+
+#: apt-inst/contrib/extracttar.cc:144
+msgid "Failed to exec gzip "
+msgstr "Spustenie gzip zlyhalo "
+
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
+msgid "Corrupted archive"
+msgstr "Porušený archív"
+
+#: apt-inst/contrib/extracttar.cc:196
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Kontrolný súčet pre tar zlyhal, archív je poškodený"
+
+#: apt-inst/contrib/extracttar.cc:303
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Neznáma TAR hlavička typu %u, člen %s"
+
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"
+msgstr "Neplatný podpis archívu"
+
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"
+msgstr "Chyba pri čítaní záhlavia prvku archívu"
+
+#: apt-inst/contrib/arfile.cc:94
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr "Neplatná hlavička prvku archívu %s"
+
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"
+msgstr "Neplatné záhlavie prvku archívu"
+
+#: apt-inst/contrib/arfile.cc:132
+msgid "Archive is too short"
+msgstr "Archív je príliš krátky"
+
+#: apt-inst/contrib/arfile.cc:136
+msgid "Failed to read the archive headers"
+msgstr "Chyba pri čítaní hlavičiek archívu"
+
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"
+msgstr "Pokus o uvoľnenie uzla (DropNode) na stále prepojenom uzle"
+
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"
+msgstr "Hašovací prvok sa nedá nájsť!"
+
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"
+msgstr "Nedá sa alokovať diverzia"
+
+#: apt-inst/filelist.cc:466
+msgid "Internal error in AddDiversion"
+msgstr "Vnútorná chyba pri AddDiversion"
+
+#: apt-inst/filelist.cc:479
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Pokus o prepísanie diverzie, %s -> %s a %s/%s"
+
+#: apt-inst/filelist.cc:508
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Dvojité pridanie diverzie %s -> %s"
+
+#: apt-inst/filelist.cc:551
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Duplicitný konfiguračný súbor %s/%s"
+
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Zápis súboru %s zlyhal"
+
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Zatvorenie súboru %s zlyhalo"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "Cesta %s je príliš dlhá"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "%s sa rozbaľuje viackrát"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Adresár %s je divertovaný"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Balík sa pokúša zapisovať do diverzného cieľa %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "Diverzná cesta je príliš dlhá"
+
+#: apt-inst/extract.cc:181 apt-inst/extract.cc:193 apt-inst/extract.cc:210
+#: apt-inst/deb/dpkgdb.cc:121
+#, c-format
+msgid "Failed to stat %s"
+msgstr "%s sa nedá vyhodnotiť"
+
+#: apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Premenovanie %s na %s zlyhalo"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Adresár %s sa nahradí neadresárom"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Nedá sa nájsť uzol na adrese jeho hašu"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "Cesta je príliš dlhá"
+
+#: apt-inst/extract.cc:415
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Prepísať zodpovedajúci balík bez udania verzie pre %s"
+
+#: apt-inst/extract.cc:432
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Súbor %s/%s prepisuje ten z balíka %s"
+
+#: apt-inst/extract.cc:465
+#, c-format
+msgid "Unable to read %s"
+msgstr "Nedá sa načítať %s"
+
+#: apt-inst/extract.cc:492
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Nedá sa vyhodnotiť %s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Odstránenie %s zlyhalo"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Nedá sa vytvoriť %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Vyhodnotenie %sinfo zlyhalo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
+
+#: apt-inst/deb/dpkgdb.cc:139
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Nedá sa zmeniť na admin adresár %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "Vnútorná chyba pri získavaní názvu balíka"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "Načítava sa zoznam súborov"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Otvorenie súboru zoznamov „%sinfo/%s“ zlyhalo. Ak nemôžete obnoviť tento "
+"súbor, vytvorte nový prázdny a ihneď znovu nainštalujte tú istú verziu "
+"balíka!"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "Vnútorná chyba pri získavaní uzla"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Diverzný súbor je porušený"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Neplatný riadok v diverznom súbore: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "Vnútorná chyba pri pridávaní diverzie"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Chyba pri hľadaní Balíka: hlavička, pozícia %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Chyba pri spracovaní MD5. Pozícia %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Toto nie je platný DEB archív, chýba časť „%s“"
+
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:56
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "Toto nie je platný DEB archív, chýba časť „%s“, „%s“ alebo „%s“"
+
+#: apt-inst/deb/debfile.cc:116
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Nedá sa prejsť do %s"
+
+#: apt-inst/deb/debfile.cc:157
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Vnútorná chyba, nedá sa nájsť časť %s"
+
+#: apt-inst/deb/debfile.cc:192
+msgid "Failed to locate a valid control file"
+msgstr "Nedá sa nájsť platný riadiaci súbor"
+
+#: apt-inst/deb/debfile.cc:277
+msgid "Unparsable control file"
+msgstr "Nespracovateľný riadiaci súbor"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-pkg4.11.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-pkg4.11.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-pkg4.11.po	2012-01-02 17:50:36.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-pkg4.11.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1676 +0,0 @@
-# Slovak translation of APT
-#
-# initial sk.po made from Czech translation (cs.po)
-# thanks to Miroslav Kure <kurem@debian.cz>
-#
-# Peter Mann <Peter.Mann@tuke.sk>, 2006.
-# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: apt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-29 19:46+0000\n"
-"PO-Revision-Date: 2011-12-06 07:54+0000\n"
-"Last-Translator: helix84 <Unknown>\n"
-"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-"Language: sk\n"
-
-#: methods/bzip2.cc:60 methods/gzip.cc:52
-msgid "Empty files can't be valid archives"
-msgstr ""
-
-#: methods/bzip2.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Nedá sa otvoriť rúra pre %s"
-
-#: methods/bzip2.cc:108
-#, c-format
-msgid "Read error from %s process"
-msgstr "Chyba pri čítaní z procesu %s"
-
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:527
-#: methods/rred.cc:536
-msgid "Failed to stat"
-msgstr "Vyhodnotenie zlyhalo"
-
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:533
-msgid "Failed to set modification time"
-msgstr "Zlyhalo nastavenie času zmeny"
-
-#: methods/cdrom.cc:200
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Nedá sa čítať databáza na CD-ROM %s"
-
-#: methods/cdrom.cc:209
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na "
-"pridávanie nových CD."
-
-#: methods/cdrom.cc:219
-msgid "Wrong CD-ROM"
-msgstr "Chybné CD"
-
-#: methods/cdrom.cc:246
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
-
-#: methods/cdrom.cc:251
-msgid "Disk not found."
-msgstr "Disk sa nenašiel."
-
-#: methods/cdrom.cc:259 methods/file.cc:79 methods/rsh.cc:265
-msgid "File not found"
-msgstr "Súbor sa nenašiel"
-
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "Neplatné URI, lokálne URI nesmie začínať s //"
-
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:169
-msgid "Logging in"
-msgstr "Prihlasovanie"
-
-#: methods/ftp.cc:175
-msgid "Unable to determine the peer name"
-msgstr "Nedá sa zistiť názov druhej strany"
-
-#: methods/ftp.cc:180
-msgid "Unable to determine the local name"
-msgstr "Nedá sa zistiť lokálny názov"
-
-#: methods/ftp.cc:211 methods/ftp.cc:239
-#, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Server zamietol naše spojenie s chybou: %s"
-
-#: methods/ftp.cc:217
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
-
-#: methods/ftp.cc:224
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
-
-#: methods/ftp.cc:244
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"Bol zadaný proxy server, ale nie prihlasovací skript. "
-"Acquire::ftp::ProxyLogin je prázdny."
-
-#: methods/ftp.cc:272
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
-
-#: methods/ftp.cc:298
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
-
-#: methods/ftp.cc:336 methods/ftp.cc:447 methods/rsh.cc:184 methods/rsh.cc:227
-msgid "Connection timeout"
-msgstr "Uplynul čas spojenia"
-
-#: methods/ftp.cc:342
-msgid "Server closed the connection"
-msgstr "Server ukončil spojenie"
-
-#: methods/ftp.cc:345 apt-pkg/contrib/fileutl.cc:831 methods/rsh.cc:191
-msgid "Read error"
-msgstr "Chyba pri čítaní"
-
-#: methods/ftp.cc:352 methods/rsh.cc:198
-msgid "A response overflowed the buffer."
-msgstr "Odpoveď preplnila zásobník."
-
-#: methods/ftp.cc:369 methods/ftp.cc:381
-msgid "Protocol corruption"
-msgstr "Narušenie protokolu"
-
-#: methods/ftp.cc:453 apt-pkg/contrib/fileutl.cc:873 methods/rsh.cc:233
-msgid "Write error"
-msgstr "Chyba pri zápise"
-
-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
-msgid "Could not create a socket"
-msgstr "Nedá sa vytvoriť socket"
-
-#: methods/ftp.cc:704
-msgid "Could not connect data socket, connection timed out"
-msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
-
-#: methods/ftp.cc:708 methods/connect.cc:111
-msgid "Failed"
-msgstr "Chyba"
-
-#: methods/ftp.cc:710
-msgid "Could not connect passive socket."
-msgstr "Nedá sa pripojiť pasívny socket."
-
-#: methods/ftp.cc:728
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo nezískal počúvajúci socket"
-
-#: methods/ftp.cc:742
-msgid "Could not bind a socket"
-msgstr "Nedá sa nadviazať socket"
-
-#: methods/ftp.cc:746
-msgid "Could not listen on the socket"
-msgstr "Na sockete sa nedá počúvať"
-
-#: methods/ftp.cc:753
-msgid "Could not determine the socket's name"
-msgstr "Názov socketu sa nedá zistiť"
-
-#: methods/ftp.cc:785
-msgid "Unable to send PORT command"
-msgstr "Príkaz PORT sa nedá odoslať"
-
-#: methods/ftp.cc:795
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Neznáma rodina adries %u (AF_*)"
-
-#: methods/ftp.cc:804
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
-
-#: methods/ftp.cc:824
-msgid "Data socket connect timed out"
-msgstr "Uplynulo spojenie dátového socketu"
-
-#: methods/ftp.cc:831
-msgid "Unable to accept connection"
-msgstr "Spojenie sa nedá prijať"
-
-#: methods/ftp.cc:870 methods/http.cc:1023 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr "Problém s hašovaním súboru"
-
-#: methods/ftp.cc:883
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
-
-#: methods/ftp.cc:898 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr "Uplynula doba dátového socketu"
-
-#: methods/ftp.cc:928
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Prenos dát zlyhal, server odpovedal „%s“"
-
-#. Get the files information
-#: methods/ftp.cc:1005
-msgid "Query"
-msgstr "Dotaz"
-
-#: methods/ftp.cc:1117
-msgid "Unable to invoke "
-msgstr "Nedá sa vyvolať "
-
-#: methods/connect.cc:71
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Pripája sa k %s (%s)"
-
-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
-
-#: methods/connect.cc:89
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
-
-#: methods/connect.cc:95
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
-
-#: methods/connect.cc:103
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
-
-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Nedá sa pripojiť k %s:%s (%s)."
-
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "Pripája sa k %s"
-
-#: methods/connect.cc:168 methods/connect.cc:187
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Nie je možné preložiť „%s“"
-
-#: methods/connect.cc:193
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Dočasné zlyhanie pri preklade „%s“"
-
-#: methods/connect.cc:196
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
-
-#: methods/connect.cc:243
-#, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Nedá sa pripojiť k %s:%s:"
-
-#: methods/gpgv.cc:166
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-"Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
-
-#: methods/gpgv.cc:171
-msgid "At least one invalid signature was encountered."
-msgstr "Bola zistená aspoň jedna nesprávna signatúra."
-
-#: methods/gpgv.cc:175
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
-"Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)"
-
-#: methods/gpgv.cc:180
-msgid "Unknown error executing gpgv"
-msgstr "Neznáma chyba pri spustení gpgv"
-
-#: methods/gpgv.cc:214 methods/gpgv.cc:221
-msgid "The following signatures were invalid:\n"
-msgstr "Nasledovné signatúry sú neplatné:\n"
-
-#: methods/gpgv.cc:228
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-"Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
-"kľúč:\n"
-
-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr "Čaká sa na hlavičky"
-
-#: methods/http.cc:531
-#, c-format
-msgid "Got a single header line over %u chars"
-msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
-
-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr "Chybná hlavička"
-
-#: methods/http.cc:564 methods/http.cc:571
-msgid "The HTTP server sent an invalid reply header"
-msgstr "HTTP server poslal neplatnú hlavičku odpovede"
-
-#: methods/http.cc:600
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
-
-#: methods/http.cc:615
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
-
-#: methods/http.cc:617
-msgid "This HTTP server has broken range support"
-msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-
-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr "Neznámy formát dátumu"
-
-#: methods/http.cc:800
-msgid "Select failed"
-msgstr "Výber zlyhal"
-
-#: methods/http.cc:805
-msgid "Connection timed out"
-msgstr "Uplynul čas spojenia"
-
-#: methods/http.cc:828
-msgid "Error writing to output file"
-msgstr "Chyba zápisu do výstupného súboru"
-
-#: methods/http.cc:859
-msgid "Error writing to file"
-msgstr "Chyba zápisu do súboru"
-
-#: methods/http.cc:887
-msgid "Error writing to the file"
-msgstr "Chyba zápisu do tohto súboru"
-
-#: methods/http.cc:901
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
-
-#: methods/http.cc:903
-msgid "Error reading from server"
-msgstr "Chyba pri čítaní zo servera"
-
-#: methods/http.cc:1008 apt-pkg/contrib/mmap.cc:291
-msgid "Failed to truncate file"
-msgstr "Nepodarilo sa skrátiť súbor"
-
-#: methods/http.cc:1183
-msgid "Bad header data"
-msgstr "Zlé dátové záhlavie"
-
-#: methods/http.cc:1200 methods/http.cc:1255
-msgid "Connection failed"
-msgstr "Spojenie zlyhalo"
-
-#: methods/http.cc:1347
-msgid "Internal error"
-msgstr "Vnútorná chyba"
-
-#: apt-pkg/contrib/mmap.cc:77
-msgid "Can't mmap an empty file"
-msgstr "Nedá sa vykonať mmap prázdneho súboru"
-
-#: apt-pkg/contrib/mmap.cc:89
-#, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nedá sa duplikovať popisovač súboru %i"
-
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:258
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Nedá sa urobiť mmap %lu bajtov"
-
-#: apt-pkg/contrib/mmap.cc:124
-msgid "Unable to close mmap"
-msgstr "Nedá sa zatvoriť mmap"
-
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-msgid "Unable to synchronize mmap"
-msgstr "Nedá sa synchronizovať mmap"
-
-#: apt-pkg/contrib/mmap.cc:310
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
-"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
-
-#: apt-pkg/contrib/mmap.cc:409
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
-"Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý."
-
-#: apt-pkg/contrib/mmap.cc:412
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
-"Napodarilo sa zväčšiť veľkosť MMap, pretože automatické zväčovanie vypol "
-"používateľ."
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr "%li d %li h %li min %li s"
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
-#, c-format
-msgid "%lih %limin %lis"
-msgstr "%li h %li min %li s"
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
-#, c-format
-msgid "%limin %lis"
-msgstr "%li min %li s"
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
-#, c-format
-msgid "%lis"
-msgstr "%li s"
-
-#: apt-pkg/contrib/strutl.cc:1138
-#, c-format
-msgid "Selection %s not found"
-msgstr "Voľba %s nenájdená"
-
-#: apt-pkg/contrib/configuration.cc:465
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Nerozpoznaná skratka typu: „%c“"
-
-#: apt-pkg/contrib/configuration.cc:523
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Otvára sa konfiguračný súbor %s"
-
-#: apt-pkg/contrib/configuration.cc:691
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
-
-#: apt-pkg/contrib/configuration.cc:710
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaktická chyba %s:%u: Skomolená značka"
-
-#: apt-pkg/contrib/configuration.cc:727
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
-
-#: apt-pkg/contrib/configuration.cc:767
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
-
-#: apt-pkg/contrib/configuration.cc:774
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
-
-#: apt-pkg/contrib/configuration.cc:778 apt-pkg/contrib/configuration.cc:783
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
-
-#: apt-pkg/contrib/configuration.cc:787
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
-
-#: apt-pkg/contrib/configuration.cc:790
-#, c-format
-msgid ""
-"Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
-"Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb"
-
-#: apt-pkg/contrib/configuration.cc:840
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
-
-#: apt-pkg/contrib/progress.cc:144
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Chyba!"
-
-#: apt-pkg/contrib/progress.cc:146
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Hotovo"
-
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
-
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
-
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
-
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Voľba %s vyžaduje argument."
-
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
-
-#: apt-pkg/contrib/cmndline.cc:236
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
-
-#: apt-pkg/contrib/cmndline.cc:267
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Voľba „%s“ je príliš dlhá"
-
-#: apt-pkg/contrib/cmndline.cc:300
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Nezrozumiteľný význam %s, skúste true alebo false."
-
-#: apt-pkg/contrib/cmndline.cc:350
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Neplatná operácia %s"
-
-#: apt-pkg/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Prípojný bod %s sa nedá vyhodnotiť"
-
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:98
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Nedá sa prejsť do %s"
-
-#. Only warn if there are no sources.list.d.
-#. Only warn if there is no sources.list file.
-#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/fileutl.cc:343
-#: apt-pkg/sourcelist.cc:204 apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450
-#: apt-pkg/init.cc:108 apt-pkg/init.cc:116 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:356 methods/mirror.cc:92
-#, c-format
-msgid "Unable to read %s"
-msgstr "Nedá sa načítať %s"
-
-#: apt-pkg/contrib/cdromutl.cc:220
-msgid "Failed to stat the cdrom"
-msgstr "Nedá sa vykonať stat() CD-ROM"
-
-#: apt-pkg/contrib/fileutl.cc:168
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva"
-
-#: apt-pkg/contrib/fileutl.cc:173
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Súbor zámku %s sa nedá otvoriť"
-
-#: apt-pkg/contrib/fileutl.cc:191
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
-
-#: apt-pkg/contrib/fileutl.cc:195
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Zámok %s sa nedá získať"
-
-#: apt-pkg/contrib/fileutl.cc:335
-#, c-format
-msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:362
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:380
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:389
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:690
-#, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Čakalo sa na %s, ale nebolo to tam"
-
-#: apt-pkg/contrib/fileutl.cc:702
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Podproces %s obdržal chybu segmentácie."
-
-#: apt-pkg/contrib/fileutl.cc:704
-#, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Podproces %s dostal signál %u."
-
-#: apt-pkg/contrib/fileutl.cc:708
-#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Podproces %s vrátil chybový kód (%u)"
-
-#: apt-pkg/contrib/fileutl.cc:710
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Podproces %s neočakávane skončil"
-
-#: apt-pkg/contrib/fileutl.cc:775 apt-pkg/indexcopy.cc:673
-#, c-format
-msgid "Could not open file %s"
-msgstr "Nedá sa otvoriť súbor %s"
-
-#: apt-pkg/contrib/fileutl.cc:792
-#, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Nedá sa otvoriť popisovač súboru %d"
-
-#: apt-pkg/contrib/fileutl.cc:852
-#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva"
-
-#: apt-pkg/contrib/fileutl.cc:885
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
-
-#: apt-pkg/contrib/fileutl.cc:1021
-#, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Problém pri zatváraní gzip súboru %s"
-
-#: apt-pkg/contrib/fileutl.cc:1024
-#, c-format
-msgid "Problem closing the file %s"
-msgstr "Problém pri zatváraní súboru %s"
-
-#: apt-pkg/contrib/fileutl.cc:1029
-#, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Problém pri synchronizovaní súboru %s na %s"
-
-#: apt-pkg/contrib/fileutl.cc:1040
-#, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Problém pri odstraňovaní súboru %s"
-
-#: apt-pkg/contrib/fileutl.cc:1053
-msgid "Problem syncing the file"
-msgstr "Problém pri synchronizovaní súboru"
-
-#: apt-pkg/pkgcache.cc:147
-msgid "Empty package cache"
-msgstr "Vyrovnávacia pamäť balíkov je prázdna"
-
-#: apt-pkg/pkgcache.cc:153
-msgid "The package cache file is corrupted"
-msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
-
-#: apt-pkg/pkgcache.cc:158
-msgid "The package cache file is an incompatible version"
-msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted, it is too small"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:166
-#, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
-
-#: apt-pkg/pkgcache.cc:171
-msgid "The package cache was built for a different architecture"
-msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "Depends"
-msgstr "Závisí na"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "PreDepends"
-msgstr "Predzávisí na"
-
-#: apt-pkg/pkgcache.cc:304
-msgid "Suggests"
-msgstr "Navrhuje"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Recommends"
-msgstr "Odporúča"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Conflicts"
-msgstr "Koliduje s"
-
-#: apt-pkg/pkgcache.cc:305
-msgid "Replaces"
-msgstr "Nahrádza"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Obsoletes"
-msgstr "Zneplatňuje"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Breaks"
-msgstr "Kazí"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "Enhances"
-msgstr "Rozširuje"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "important"
-msgstr "dôležitý"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "required"
-msgstr "požadovaný"
-
-#: apt-pkg/pkgcache.cc:317
-msgid "standard"
-msgstr "štandardný"
-
-#: apt-pkg/pkgcache.cc:318
-msgid "optional"
-msgstr "voliteľný"
-
-#: apt-pkg/pkgcache.cc:318
-msgid "extra"
-msgstr "extra"
-
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
-msgid "Building dependency tree"
-msgstr "Vytvára sa strom závislostí"
-
-#: apt-pkg/depcache.cc:126
-msgid "Candidate versions"
-msgstr "Kandidátske verzie"
-
-#: apt-pkg/depcache.cc:155
-msgid "Dependency generation"
-msgstr "Generovanie závislostí"
-
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
-msgid "Reading state information"
-msgstr "Načítavajú sa stavové informácie"
-
-#: apt-pkg/depcache.cc:237
-#, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Nie je možné otvoriť StateFile %s"
-
-#: apt-pkg/depcache.cc:243
-#, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Nie je možné zapísať dočasný StateFile %s"
-
-#: apt-pkg/tagfile.cc:123
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Súbor %s sa nedá spracovať (1)"
-
-#: apt-pkg/tagfile.cc:210
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Súbor %s sa nedá spracovať (2)"
-
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
-
-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-"Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
-
-#: apt-pkg/sourcelist.cc:106
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
-
-#: apt-pkg/sourcelist.cc:112
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
-
-#: apt-pkg/sourcelist.cc:115
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
-
-#: apt-pkg/sourcelist.cc:128
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
-
-#: apt-pkg/sourcelist.cc:130
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
-
-#: apt-pkg/sourcelist.cc:133
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
-
-#: apt-pkg/sourcelist.cc:139
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
-
-#: apt-pkg/sourcelist.cc:146
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
-
-#: apt-pkg/sourcelist.cc:244
-#, c-format
-msgid "Opening %s"
-msgstr "Otvára sa %s"
-
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:444
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
-
-#: apt-pkg/sourcelist.cc:281
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
-
-#: apt-pkg/sourcelist.cc:285
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
-
-#: apt-pkg/packagemanager.cc:335 apt-pkg/packagemanager.cc:645
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
-"man 5 apt.conf pod APT::Immediate-Configure (%d)"
-
-#: apt-pkg/packagemanager.cc:456
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Tento beh inštalácie si vyžiada dočasné odstránenie kľúčového balíka %s "
-"kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
-"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
-
-#: apt-pkg/packagemanager.cc:501
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-"Nebolo možné vykonať okamžitú konfiguráciu už rozbaleného „%s“. Pozri prosím "
-"podrobnosti v man 5 apt.conf pod APT::Immediate-Configure"
-
-#: apt-pkg/pkgrecords.cc:32
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indexový súbor typu „%s“ nie je podporovaný"
-
-#: apt-pkg/algorithms.cc:250
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív."
-
-#: apt-pkg/algorithms.cc:1186
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
-"pridržanými balíkmi."
-
-#: apt-pkg/algorithms.cc:1188
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
-
-#: apt-pkg/algorithms.cc:1481
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Zlyhalo stiahnutie %s  %s\n"
-
-#: apt-pkg/algorithms.cc:1507 apt-pkg/algorithms.cc:1509
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/acquire.cc:79
-#, c-format
-msgid "List directory %spartial is missing."
-msgstr "Adresár zoznamov %spartial chýba."
-
-#: apt-pkg/acquire.cc:83
-#, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Archívny adresár %spartial chýba."
-
-#: apt-pkg/acquire.cc:91
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr "Adresár %s sa nedá zamknúť"
-
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:858
-#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
-
-#: apt-pkg/acquire.cc:860
-#, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Sťahuje sa %li. súbor z %li"
-
-#: apt-pkg/acquire-worker.cc:110
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Nedá sa nájsť ovládač spôsobu %s."
-
-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Spôsob %s nebol správne spustený"
-
-#: apt-pkg/acquire-worker.cc:423
-#, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
-
-#: apt-pkg/init.cc:151
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Systém balíkov „%s“ nie je podporovaný"
-
-#: apt-pkg/init.cc:167
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Nedá sa určiť vhodný typ systému balíkov"
-
-#: apt-pkg/clean.cc:56
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Nie je možné vykonať stat %s."
-
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
-
-#: apt-pkg/cachefile.cc:84
-msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
-"Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť."
-
-#: apt-pkg/cachefile.cc:88
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
-
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "Nedá sa načítať zoznam zdrojov."
-
-#: apt-pkg/policy.cc:71
-#, c-format
-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-#: apt-pkg/policy.cc:393
-#, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
-
-#: apt-pkg/policy.cc:415
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Nezrozumiteľné pridržanie typu %s"
-
-#: apt-pkg/policy.cc:423
-msgid "No priority (or zero) specified for pin"
-msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
-
-#: apt-pkg/pkgcachegen.cc:83
-msgid "Cache has an incompatible versioning system"
-msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
-#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
-#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
-#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
-#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:439
-#: apt-pkg/pkgcachegen.cc:470 apt-pkg/pkgcachegen.cc:484
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:232
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:235
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:238
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-"Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:241
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
-
-#: apt-pkg/pkgcachegen.cc:491
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
-
-#: apt-pkg/pkgcachegen.cc:1057
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
-
-#: apt-pkg/pkgcachegen.cc:1145 apt-pkg/pkgcachegen.cc:1249
-#: apt-pkg/pkgcachegen.cc:1255 apt-pkg/pkgcachegen.cc:1417
-msgid "Reading package lists"
-msgstr "Načítavajú sa zoznamy balíkov"
-
-#: apt-pkg/pkgcachegen.cc:1162
-msgid "Collecting File Provides"
-msgstr "Collecting File poskytuje"
-
-#: apt-pkg/pkgcachegen.cc:1246
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Do %s sa nedá zapisovať"
-
-#: apt-pkg/pkgcachegen.cc:1356 apt-pkg/pkgcachegen.cc:1363
-msgid "IO Error saving source cache"
-msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
-
-#: apt-pkg/acquire-item.cc:135
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "premenovanie zlyhalo, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:636
-msgid "MD5Sum mismatch"
-msgstr "Nezhoda kontrolných MD5 súčtov"
-
-#: apt-pkg/acquire-item.cc:900 apt-pkg/acquire-item.cc:1851
-#: apt-pkg/acquire-item.cc:1994
-msgid "Hash Sum mismatch"
-msgstr "Nezhoda kontrolných haš súčtov"
-
-#: apt-pkg/acquire-item.cc:1387
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1403
-#, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1438
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
-
-#: apt-pkg/acquire-item.cc:1476
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1498
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
-
-#: apt-pkg/acquire-item.cc:1531
-#, c-format
-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
-"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a "
-"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
-
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1541 apt-pkg/acquire-item.cc:1546
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr "Chyba GPG: %s: %s"
-
-#: apt-pkg/acquire-item.cc:1638
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
-"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
-
-#: apt-pkg/acquire-item.cc:1697
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
-msgstr ""
-"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
-"manuálne."
-
-#: apt-pkg/acquire-item.cc:1756
-#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
-
-#: apt-pkg/acquire-item.cc:1843
-msgid "Size mismatch"
-msgstr "Veľkosti sa nezhodujú"
-
-#: apt-pkg/indexrecords.cc:53
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Nedá spracovať súbor Release %s"
-
-#: apt-pkg/indexrecords.cc:63
-#, c-format
-msgid "No sections in Release file %s"
-msgstr "Žiadne sekcie v Release súbore %s"
-
-#: apt-pkg/indexrecords.cc:97
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr "Chýba položka „Hash“ v súbore Release %s"
-
-#: apt-pkg/indexrecords.cc:110
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
-
-#: apt-pkg/indexrecords.cc:129
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Chýba položka „Date“ v súbore Release %s"
-
-#: apt-pkg/vendorlist.cc:71
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
-
-#: apt-pkg/cdrom.cc:525
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Použije sa CD-ROM prípojný bod %s\n"
-"Pripája sa CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:631
-msgid "Identifying.. "
-msgstr "Identifikuje sa.. "
-
-#: apt-pkg/cdrom.cc:562
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Uložená menovka: %s\n"
-
-#: apt-pkg/cdrom.cc:571 apt-pkg/cdrom.cc:847
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM sa odpája...\n"
-
-#: apt-pkg/cdrom.cc:591
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr "Použije sa prípojný bod CD-ROM %s\n"
-
-#: apt-pkg/cdrom.cc:609
-msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM sa odpája\n"
-
-#: apt-pkg/cdrom.cc:614
-msgid "Waiting for disc...\n"
-msgstr "Čaká sa na disk...\n"
-
-#: apt-pkg/cdrom.cc:623
-msgid "Mounting CD-ROM...\n"
-msgstr "Pripája sa CD-ROM...\n"
-
-#: apt-pkg/cdrom.cc:642
-msgid "Scanning disc for index files..\n"
-msgstr "Na disku sa hľadajú indexové súbory..\n"
-
-#: apt-pkg/cdrom.cc:684
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
-"Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov "
-"prekladov a %zu signatúr\n"
-
-#: apt-pkg/cdrom.cc:695
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
-"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
-"alebo je pre nesprávnu architektúru?"
-
-#: apt-pkg/cdrom.cc:722
-#, c-format
-msgid "Found label '%s'\n"
-msgstr "Nájdená menovka: „%s“\n"
-
-#: apt-pkg/cdrom.cc:751
-msgid "That is not a valid name, try again.\n"
-msgstr "Neplatný názov, skúste znova.\n"
-
-#: apt-pkg/cdrom.cc:768
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
-"Názov tohto disku je: \n"
-"„%s“\n"
-
-#: apt-pkg/cdrom.cc:770
-msgid "Copying package lists..."
-msgstr "Kopírujú sa zoznamy balíkov..."
-
-#: apt-pkg/cdrom.cc:797
-msgid "Writing new source list\n"
-msgstr "Zapisuje sa nový zoznam zdrojov\n"
-
-#: apt-pkg/cdrom.cc:805
-msgid "Source list entries for this disc are:\n"
-msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
-
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:927
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Zapísaných %i záznamov.\n"
-
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:929
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
-
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
-
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
-
-#: apt-pkg/indexcopy.cc:537
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "Preskakuje sa neexistujúci súbor %s"
-
-#: apt-pkg/indexcopy.cc:543
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
-
-#: apt-pkg/indexcopy.cc:549
-#, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Nezhoda kontrolných haš súčtov: %s"
-
-#: apt-pkg/indexcopy.cc:677
-#, c-format
-msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
-
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:708
-#, c-format
-msgid "No keyring installed in %s."
-msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
-
-#: apt-pkg/cachefilter.cc:29
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Chyba pri preklade regulárneho výrazu - %s"
-
-#: apt-pkg/cacheset.cc:337
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
-
-#: apt-pkg/cacheset.cc:340
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Nebola nájdená verzia „%s“ pre „%s“"
-
-#: apt-pkg/cacheset.cc:440
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nedá sa nájsť balík %s"
-
-#: apt-pkg/cacheset.cc:447
-#, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nebolo možné nájsť úlohu „%s“"
-
-#: apt-pkg/cacheset.cc:454
-#, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
-
-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
-
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
-"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
-"pretože nemá žiadnu z nich"
-
-#: apt-pkg/cacheset.cc:491
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
-"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
-"virtuálny"
-
-#: apt-pkg/cacheset.cc:499
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
-"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
-
-#: apt-pkg/cacheset.cc:507
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
-"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
-"nainštalovaný"
-
-#: apt-pkg/edsp.cc:32 apt-pkg/edsp.cc:52
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:204
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:272
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:279
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:550 apt-pkg/edsp.cc:553 apt-pkg/edsp.cc:558
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:68
-#, c-format
-msgid "Installing %s"
-msgstr "Inštaluje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:69 apt-pkg/deb/dpkgpm.cc:863
-#, c-format
-msgid "Configuring %s"
-msgstr "Nastavuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:70 apt-pkg/deb/dpkgpm.cc:870
-#, c-format
-msgid "Removing %s"
-msgstr "Odstraňuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:71
-#, c-format
-msgid "Completely removing %s"
-msgstr "Úplne sa odstraňuje %s"
-
-#: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr "Zaznamenali sme zmiznutie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:73
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr "Vykonáva sa spúšťač post-installation %s"
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:669
-#, c-format
-msgid "Directory '%s' missing"
-msgstr "Adresár „%s“ chýba"
-
-#: apt-pkg/deb/dpkgpm.cc:684 apt-pkg/deb/dpkgpm.cc:704
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Nedá sa otvoriť súbor „%s“"
-
-#: apt-pkg/deb/dpkgpm.cc:856
-#, c-format
-msgid "Preparing %s"
-msgstr "Pripravuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:857
-#, c-format
-msgid "Unpacking %s"
-msgstr "Rozbaľuje sa %s"
-
-#: apt-pkg/deb/dpkgpm.cc:862
-#, c-format
-msgid "Preparing to configure %s"
-msgstr "Pripravuje sa nastavenie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:864
-#, c-format
-msgid "Installed %s"
-msgstr "Nainštalovaný balík %s"
-
-#: apt-pkg/deb/dpkgpm.cc:869
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr "Pripravuje sa odstránenie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:871
-#, c-format
-msgid "Removed %s"
-msgstr "Odstránený balík %s"
-
-#: apt-pkg/deb/dpkgpm.cc:876
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Pripravuje sa úplné odstránenie %s"
-
-#: apt-pkg/deb/dpkgpm.cc:877
-#, c-format
-msgid "Completely removed %s"
-msgstr "Balík „%s“ je úplne odstránený"
-
-#: apt-pkg/deb/dpkgpm.cc:1097
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
-"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
-"pripojený?)\n"
-
-#: apt-pkg/deb/dpkgpm.cc:1128
-msgid "Running dpkg"
-msgstr "Spúšťa sa dpkg"
-
-#: apt-pkg/deb/dpkgpm.cc:1353
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-"Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1358
-msgid "dependency problems - leaving unconfigured"
-msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
-
-#: apt-pkg/deb/dpkgpm.cc:1360
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
-"nadväznosti na predošlé zlyhanie."
-
-#: apt-pkg/deb/dpkgpm.cc:1366
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
-"zaplnený"
-
-#: apt-pkg/deb/dpkgpm.cc:1373
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
-"pamäte"
-
-#: apt-pkg/deb/dpkgpm.cc:1380 apt-pkg/deb/dpkgpm.cc:1386
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1407
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
-"Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
-
-#: apt-pkg/deb/debsystem.cc:79
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
-
-#: apt-pkg/deb/debsystem.cc:82
-#, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:98
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. "
-
-#: apt-pkg/deb/debsystem.cc:116
-msgid "Not locked"
-msgstr "Nie je zamknuté"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:276
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr "Na zrkadle nebol nájdený súbor „%s“ "
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:283
-#, c-format
-msgid "Can not read mirror file '%s'"
-msgstr ""
-
-#: methods/mirror.cc:438
-#, c-format
-msgid "[Mirror: %s]"
-msgstr "[Zrkadlo: %s]"
-
-#: methods/rred.cc:506
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá "
-"sa, že záplata je poškodená."
-
-#: methods/rred.cc:511
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-"Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca "
-"sa mmap) - zdá sa, že záplata je poškodená."
-
-#: methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Spojenie bolo predčasne ukončené"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-pkg4.12.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-pkg4.12.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libapt-pkg4.12.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libapt-pkg4.12.po	2012-02-23 06:55:25.000000000 +0000
@@ -0,0 +1,1700 @@
+# Slovak translation of APT
+#
+# initial sk.po made from Czech translation (cs.po)
+# thanks to Miroslav Kure <kurem@debian.cz>
+#
+# Peter Mann <Peter.Mann@tuke.sk>, 2006.
+# Ivan Masár <helix84@centrum.sk>, 2008, 2009, 2010, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-14 10:00+0000\n"
+"PO-Revision-Date: 2012-02-14 13:48+0000\n"
+"Last-Translator: helix84 <Unknown>\n"
+"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:26+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
+"Language: sk\n"
+
+#: methods/bzip2.cc:63 methods/gzip.cc:54
+msgid "Empty files can't be valid archives"
+msgstr "Prázdne súbory nemôžu byť platné archívy"
+
+#: methods/bzip2.cc:67
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Nedá sa otvoriť rúra pre %s"
+
+#: methods/bzip2.cc:111
+#, c-format
+msgid "Read error from %s process"
+msgstr "Chyba pri čítaní z procesu %s"
+
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:498
+#: methods/rred.cc:507
+msgid "Failed to stat"
+msgstr "Vyhodnotenie zlyhalo"
+
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:504
+msgid "Failed to set modification time"
+msgstr "Zlyhalo nastavenie času zmeny"
+
+#: methods/cdrom.cc:203
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Nedá sa čítať databáza na CD-ROM %s"
+
+#: methods/cdrom.cc:212
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Pre pridanie CD do APT použije apt-cdrom. apt-get update sa nedá využiť na "
+"pridávanie nových CD."
+
+#: methods/cdrom.cc:222
+msgid "Wrong CD-ROM"
+msgstr "Chybné CD"
+
+#: methods/cdrom.cc:249
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
+
+#: methods/cdrom.cc:254
+msgid "Disk not found."
+msgstr "Disk sa nenašiel."
+
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
+msgid "File not found"
+msgstr "Súbor sa nenašiel"
+
+#: methods/file.cc:47
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Neplatné URI, lokálne URI nesmie začínať s //"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:172
+msgid "Logging in"
+msgstr "Prihlasovanie"
+
+#: methods/ftp.cc:178
+msgid "Unable to determine the peer name"
+msgstr "Nedá sa zistiť názov druhej strany"
+
+#: methods/ftp.cc:183
+msgid "Unable to determine the local name"
+msgstr "Nedá sa zistiť lokálny názov"
+
+#: methods/ftp.cc:214 methods/ftp.cc:242
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Server zamietol naše spojenie s chybou: %s"
+
+#: methods/ftp.cc:220
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Zlyhalo zadanie používateľa, server odpovedal: %s"
+
+#: methods/ftp.cc:227
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Zlyhalo zadanie hesla, server odpovedal: %s"
+
+#: methods/ftp.cc:247
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Bol zadaný proxy server, ale nie prihlasovací skript. "
+"Acquire::ftp::ProxyLogin je prázdny."
+
+#: methods/ftp.cc:275
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Príkaz „%s“ prihlasovacieho skriptu zlyhal, server odpovedal: %s"
+
+#: methods/ftp.cc:301
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Zlyhalo zadanie typu, server odpovedal: %s"
+
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
+msgid "Connection timeout"
+msgstr "Uplynul čas spojenia"
+
+#: methods/ftp.cc:345
+msgid "Server closed the connection"
+msgstr "Server ukončil spojenie"
+
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1077
+#: apt-pkg/contrib/fileutl.cc:1080 methods/rsh.cc:197
+msgid "Read error"
+msgstr "Chyba pri čítaní"
+
+#: methods/ftp.cc:355 methods/rsh.cc:204
+msgid "A response overflowed the buffer."
+msgstr "Odpoveď preplnila zásobník."
+
+#: methods/ftp.cc:372 methods/ftp.cc:384
+msgid "Protocol corruption"
+msgstr "Narušenie protokolu"
+
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1154 methods/rsh.cc:239
+msgid "Write error"
+msgstr "Chyba pri zápise"
+
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
+msgid "Could not create a socket"
+msgstr "Nedá sa vytvoriť socket"
+
+#: methods/ftp.cc:707
+msgid "Could not connect data socket, connection timed out"
+msgstr "Nedá sa pripojiť dátový socket, uplynul čas spojenia"
+
+#: methods/ftp.cc:711 methods/connect.cc:115
+msgid "Failed"
+msgstr "Chyba"
+
+#: methods/ftp.cc:713
+msgid "Could not connect passive socket."
+msgstr "Nedá sa pripojiť pasívny socket."
+
+#: methods/ftp.cc:731
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo nezískal počúvajúci socket"
+
+#: methods/ftp.cc:745
+msgid "Could not bind a socket"
+msgstr "Nedá sa nadviazať socket"
+
+#: methods/ftp.cc:749
+msgid "Could not listen on the socket"
+msgstr "Na sockete sa nedá počúvať"
+
+#: methods/ftp.cc:756
+msgid "Could not determine the socket's name"
+msgstr "Názov socketu sa nedá zistiť"
+
+#: methods/ftp.cc:788
+msgid "Unable to send PORT command"
+msgstr "Príkaz PORT sa nedá odoslať"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Neznáma rodina adries %u (AF_*)"
+
+#: methods/ftp.cc:807
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Zlyhalo zadanie EPRT, server odpovedal: %s"
+
+#: methods/ftp.cc:827
+msgid "Data socket connect timed out"
+msgstr "Uplynulo spojenie dátového socketu"
+
+#: methods/ftp.cc:834
+msgid "Unable to accept connection"
+msgstr "Spojenie sa nedá prijať"
+
+#: methods/ftp.cc:873 methods/http.cc:1034 methods/rsh.cc:309
+msgid "Problem hashing file"
+msgstr "Problém s hašovaním súboru"
+
+#: methods/ftp.cc:886
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Súbor sa nedá stiahnuť, server odpovedal „%s“"
+
+#: methods/ftp.cc:901 methods/rsh.cc:328
+msgid "Data socket timed out"
+msgstr "Uplynula doba dátového socketu"
+
+#: methods/ftp.cc:931
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Prenos dát zlyhal, server odpovedal „%s“"
+
+#. Get the files information
+#: methods/ftp.cc:1008
+msgid "Query"
+msgstr "Dotaz"
+
+#: methods/ftp.cc:1120
+msgid "Unable to invoke "
+msgstr "Nedá sa vyvolať "
+
+#: methods/connect.cc:75
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Pripája sa k %s (%s)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Nedá sa vytvoriť socket pre %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:99
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
+
+#: methods/connect.cc:107
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
+
+#: methods/connect.cc:125
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Nedá sa pripojiť k %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:153 methods/rsh.cc:431
+#, c-format
+msgid "Connecting to %s"
+msgstr "Pripája sa k %s"
+
+#: methods/connect.cc:172 methods/connect.cc:191
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Nie je možné preložiť „%s“"
+
+#: methods/connect.cc:197
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Dočasné zlyhanie pri preklade „%s“"
+
+#: methods/connect.cc:200
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
+
+#: methods/connect.cc:247
+#, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Nedá sa pripojiť k %s:%s:"
+
+#: methods/gpgv.cc:180
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
+
+#: methods/gpgv.cc:185
+msgid "At least one invalid signature was encountered."
+msgstr "Bola zistená aspoň jedna nesprávna signatúra."
+
+#: methods/gpgv.cc:189
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr ""
+"Nedá sa spustiť „gpgv“ kvôli overeniu podpisu (je nainštalované gpgv?)"
+
+#: methods/gpgv.cc:194
+msgid "Unknown error executing gpgv"
+msgstr "Neznáma chyba pri spustení gpgv"
+
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
+msgid "The following signatures were invalid:\n"
+msgstr "Nasledovné signatúry sú neplatné:\n"
+
+#: methods/gpgv.cc:242
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Nasledovné signatúry sa nedajú overiť, pretože nie je dostupný verejný "
+"kľúč:\n"
+
+#: methods/http.cc:393
+msgid "Waiting for headers"
+msgstr "Čaká sa na hlavičky"
+
+#: methods/http.cc:539
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
+
+#: methods/http.cc:547
+msgid "Bad header line"
+msgstr "Chybná hlavička"
+
+#: methods/http.cc:572 methods/http.cc:579
+msgid "The HTTP server sent an invalid reply header"
+msgstr "HTTP server poslal neplatnú hlavičku odpovede"
+
+#: methods/http.cc:608
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
+
+#: methods/http.cc:623
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
+
+#: methods/http.cc:625
+msgid "This HTTP server has broken range support"
+msgstr "Tento HTTP server má poškodenú podporu rozsahov"
+
+#: methods/http.cc:649
+msgid "Unknown date format"
+msgstr "Neznámy formát dátumu"
+
+#: methods/http.cc:820
+msgid "Select failed"
+msgstr "Výber zlyhal"
+
+#: methods/http.cc:825
+msgid "Connection timed out"
+msgstr "Uplynul čas spojenia"
+
+#: methods/http.cc:848
+msgid "Error writing to output file"
+msgstr "Chyba zápisu do výstupného súboru"
+
+#: methods/http.cc:879
+msgid "Error writing to file"
+msgstr "Chyba zápisu do súboru"
+
+#: methods/http.cc:907
+msgid "Error writing to the file"
+msgstr "Chyba zápisu do tohto súboru"
+
+#: methods/http.cc:921
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
+
+#: methods/http.cc:923
+msgid "Error reading from server"
+msgstr "Chyba pri čítaní zo servera"
+
+#: methods/http.cc:1193
+msgid "Bad header data"
+msgstr "Zlé dátové záhlavie"
+
+#: methods/http.cc:1210 methods/http.cc:1265
+msgid "Connection failed"
+msgstr "Spojenie zlyhalo"
+
+#: methods/http.cc:1357
+msgid "Internal error"
+msgstr "Vnútorná chyba"
+
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Nedá sa vykonať mmap prázdneho súboru"
+
+#: apt-pkg/contrib/mmap.cc:109
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Nedá sa duplikovať popisovač súboru %i"
+
+#: apt-pkg/contrib/mmap.cc:117
+#, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:144
+msgid "Unable to close mmap"
+msgstr "Nedá sa zatvoriť mmap"
+
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200
+msgid "Unable to synchronize mmap"
+msgstr "Nedá sa synchronizovať mmap"
+
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Nedá sa urobiť mmap %lu bajtov"
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr "Nepodarilo sa skrátiť súbor"
+
+#: apt-pkg/contrib/mmap.cc:330
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+"Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
+"Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+
+#: apt-pkg/contrib/mmap.cc:429
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+"Napodarilo sa zväčšiť veľkosť MMap, pretože limit %lu už bol dosiahnutý."
+
+#: apt-pkg/contrib/mmap.cc:432
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+"Napodarilo sa zväčšiť veľkosť MMap, pretože automatické zväčovanie vypol "
+"používateľ."
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:371
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr "%li d %li h %li min %li s"
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:378
+#, c-format
+msgid "%lih %limin %lis"
+msgstr "%li h %li min %li s"
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:385
+#, c-format
+msgid "%limin %lis"
+msgstr "%li min %li s"
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:390
+#, c-format
+msgid "%lis"
+msgstr "%li s"
+
+#: apt-pkg/contrib/strutl.cc:1165
+#, c-format
+msgid "Selection %s not found"
+msgstr "Voľba %s nenájdená"
+
+#: apt-pkg/contrib/configuration.cc:474
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Nerozpoznaná skratka typu: „%c“"
+
+#: apt-pkg/contrib/configuration.cc:532
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Otvára sa konfiguračný súbor %s"
+
+#: apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaktická chyba %s:%u: Blok začína bez názvu."
+
+#: apt-pkg/contrib/configuration.cc:719
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaktická chyba %s:%u: Skomolená značka"
+
+#: apt-pkg/contrib/configuration.cc:736
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaktická chyba %s:%u: Za hodnotou nasledujú chybné údaje"
+
+#: apt-pkg/contrib/configuration.cc:776
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Syntaktická chyba %s:%u: Direktívy sa dajú vykonať len na najvyššej úrovni"
+
+#: apt-pkg/contrib/configuration.cc:783
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaktická chyba %s:%u: Príliš mnoho vnorených prepojení (include)"
+
+#: apt-pkg/contrib/configuration.cc:787 apt-pkg/contrib/configuration.cc:792
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaktická chyba %s:%u: Zahrnuté odtiaľ"
+
+#: apt-pkg/contrib/configuration.cc:796
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktíva „%s“"
+
+#: apt-pkg/contrib/configuration.cc:799
+#, c-format
+msgid ""
+"Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Syntaktická chyba %s:%u: direktíva clear vyžaduje ako argument strom volieb"
+
+#: apt-pkg/contrib/configuration.cc:849
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaktická chyba %s:%u: Na konci súboru sú chybné údaje"
+
+#: apt-pkg/contrib/progress.cc:146
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Chyba!"
+
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Hotovo"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Parameter príkazového riadka „%c“ [z %s] je neznámy"
+
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Nezrozumiteľný parameter %s na príkazovom riadku"
+
+#: apt-pkg/contrib/cmndline.cc:125
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Parameter príkazového riadku %s nie je pravdivostná hodnota"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Voľba %s vyžaduje argument."
+
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Parameter %s: Zadanie konfiguračnej položky musí obsahovať =<hodn>."
+
+#: apt-pkg/contrib/cmndline.cc:235
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Voľba %s vyžaduje ako argument celé číslo (integer), nie „%s“"
+
+#: apt-pkg/contrib/cmndline.cc:266
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Voľba „%s“ je príliš dlhá"
+
+#: apt-pkg/contrib/cmndline.cc:298
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Nezrozumiteľný význam %s, skúste true alebo false."
+
+#: apt-pkg/contrib/cmndline.cc:348
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Neplatná operácia %s"
+
+#: apt-pkg/contrib/cdromutl.cc:56
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Prípojný bod %s sa nedá vyhodnotiť"
+
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Nedá sa prejsť do %s"
+
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:372
+#: apt-pkg/sourcelist.cc:208 apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456
+#: apt-pkg/init.cc:109 apt-pkg/init.cc:117 apt-pkg/clean.cc:36
+#: apt-pkg/policy.cc:359 methods/mirror.cc:95
+#, c-format
+msgid "Unable to read %s"
+msgstr "Nedá sa načítať %s"
+
+#: apt-pkg/contrib/cdromutl.cc:224
+msgid "Failed to stat the cdrom"
+msgstr "Nedá sa vykonať stat() CD-ROM"
+
+#: apt-pkg/contrib/fileutl.cc:197
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Zamykanie pre súbor zámku %s, ktorý je iba na čítanie, sa nepoužíva"
+
+#: apt-pkg/contrib/fileutl.cc:202
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Súbor zámku %s sa nedá otvoriť"
+
+#: apt-pkg/contrib/fileutl.cc:220
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Zamykanie pre súbor zámku %s pripojený cez NFS sa nepoužíva"
+
+#: apt-pkg/contrib/fileutl.cc:224
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Zámok %s sa nedá získať"
+
+#: apt-pkg/contrib/fileutl.cc:364
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr "Zoznam súborov nemožno vytvoriť, pretože „%s“ nie je adresár"
+
+#: apt-pkg/contrib/fileutl.cc:391
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože to nie je obyčajný súbor"
+
+#: apt-pkg/contrib/fileutl.cc:409
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr "Ignoruje sa „%s“ v adresári „%s“, pretože nemá príponu názvu súboru"
+
+#: apt-pkg/contrib/fileutl.cc:418
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+"Ignoruje sa „%s“ v adresári „%s“, pretože má neplatnú príponu názvu súboru"
+
+#: apt-pkg/contrib/fileutl.cc:719 apt-pkg/deb/dpkgpm.cc:996
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Čakalo sa na %s, ale nebolo to tam"
+
+#: apt-pkg/contrib/fileutl.cc:731
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Podproces %s obdržal chybu segmentácie."
+
+#: apt-pkg/contrib/fileutl.cc:733
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Podproces %s dostal signál %u."
+
+#: apt-pkg/contrib/fileutl.cc:737
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Podproces %s vrátil chybový kód (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:739
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Podproces %s neočakávane skončil"
+
+#: apt-pkg/contrib/fileutl.cc:878 apt-pkg/indexcopy.cc:655
+#, c-format
+msgid "Could not open file %s"
+msgstr "Nedá sa otvoriť súbor %s"
+
+#: apt-pkg/contrib/fileutl.cc:929
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Nedá sa otvoriť popisovač súboru %d"
+
+#: apt-pkg/contrib/fileutl.cc:975
+msgid "Failed to create subprocess IPC"
+msgstr "Nedá sa vytvoriť podproces IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1024
+msgid "Failed to exec compressor "
+msgstr "Nepodarilo sa spustiť kompresor "
+
+#: apt-pkg/contrib/fileutl.cc:1102
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1167
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1427
+#, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problém pri zatváraní gzip súboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1431
+#, c-format
+msgid "Problem closing the file %s"
+msgstr "Problém pri zatváraní súboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1436
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problém pri synchronizovaní súboru %s na %s"
+
+#: apt-pkg/contrib/fileutl.cc:1447
+#, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Problém pri odstraňovaní súboru %s"
+
+#: apt-pkg/contrib/fileutl.cc:1467
+msgid "Problem syncing the file"
+msgstr "Problém pri synchronizovaní súboru"
+
+#: apt-pkg/pkgcache.cc:148
+msgid "Empty package cache"
+msgstr "Vyrovnávacia pamäť balíkov je prázdna"
+
+#: apt-pkg/pkgcache.cc:154
+msgid "The package cache file is corrupted"
+msgstr "Súbor vyrovnávacej pamäti balíkov je poškodený"
+
+#: apt-pkg/pkgcache.cc:159
+msgid "The package cache file is an incompatible version"
+msgstr "Súbor vyrovnávacej pamäti balíkov je nezlučiteľnej verzie"
+
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Tento APT nepodporuje systém na správu verzií „%s“"
+
+#: apt-pkg/pkgcache.cc:172
+msgid "The package cache was built for a different architecture"
+msgstr "Súbor vyrovnávacej pamäti balíkov bol vytvorený pre inú architektúru"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "Depends"
+msgstr "Závisí na"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "PreDepends"
+msgstr "Predzávisí na"
+
+#: apt-pkg/pkgcache.cc:305
+msgid "Suggests"
+msgstr "Navrhuje"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Recommends"
+msgstr "Odporúča"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Conflicts"
+msgstr "Koliduje s"
+
+#: apt-pkg/pkgcache.cc:306
+msgid "Replaces"
+msgstr "Nahrádza"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Obsoletes"
+msgstr "Zneplatňuje"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Breaks"
+msgstr "Kazí"
+
+#: apt-pkg/pkgcache.cc:307
+msgid "Enhances"
+msgstr "Rozširuje"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "important"
+msgstr "dôležitý"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "required"
+msgstr "požadovaný"
+
+#: apt-pkg/pkgcache.cc:318
+msgid "standard"
+msgstr "štandardný"
+
+#: apt-pkg/pkgcache.cc:319
+msgid "optional"
+msgstr "voliteľný"
+
+#: apt-pkg/pkgcache.cc:319
+msgid "extra"
+msgstr "extra"
+
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+msgid "Building dependency tree"
+msgstr "Vytvára sa strom závislostí"
+
+#: apt-pkg/depcache.cc:133
+msgid "Candidate versions"
+msgstr "Kandidátske verzie"
+
+#: apt-pkg/depcache.cc:162
+msgid "Dependency generation"
+msgstr "Generovanie závislostí"
+
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+msgid "Reading state information"
+msgstr "Načítavajú sa stavové informácie"
+
+#: apt-pkg/depcache.cc:244
+#, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Nie je možné otvoriť StateFile %s"
+
+#: apt-pkg/depcache.cc:250
+#, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Nie je možné zapísať dočasný StateFile %s"
+
+#: apt-pkg/tagfile.cc:126
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Súbor %s sa nedá spracovať (1)"
+
+#: apt-pkg/tagfile.cc:213
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Súbor %s sa nedá spracovať (2)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Skomolený riadok %lu v zozname zdrojov %s (nie je možné spracovať [option])"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+"Skomolený riadok %lu v zozname zdrojov %s ([option] je príliš krátke)"
+
+#: apt-pkg/sourcelist.cc:110
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nie je priradenie)"
+
+#: apt-pkg/sourcelist.cc:116
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s ([%s] nemá kľúč)"
+
+#: apt-pkg/sourcelist.cc:119
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Skomolený riadok %lu v zozname zdrojov %s ([%s] kľúč %s nemá hodnotu)"
+
+#: apt-pkg/sourcelist.cc:132
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (URI)"
+
+#: apt-pkg/sourcelist.cc:134
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (dist)"
+
+#: apt-pkg/sourcelist.cc:137
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie URI)"
+
+#: apt-pkg/sourcelist.cc:143
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (absolútny dist)"
+
+#: apt-pkg/sourcelist.cc:150
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Skomolený riadok %lu v zozname zdrojov %s (spracovanie dist)"
+
+#: apt-pkg/sourcelist.cc:248
+#, c-format
+msgid "Opening %s"
+msgstr "Otvára sa %s"
+
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Riadok %u v zozname zdrojov %s je príliš dlhý."
+
+#: apt-pkg/sourcelist.cc:285
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
+
+#: apt-pkg/sourcelist.cc:289
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typ „%s“ je neznámy na riadku %u v zozname zdrojov %s"
+
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:780
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+"Nebolo možné vykonať okamžitú konfiguráciu „%s“. Pozri prosím podrobnosti v "
+"man 5 apt.conf pod APT::Immediate-Configure (%d)"
+
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, c-format
+msgid "Could not configure '%s'. "
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:507
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Tento beh inštalácie si vyžiada dočasné odstránenie kľúčového balíka %s "
+"kvôli slučke v Conflicts/Pre-Depends. Často je to nevhodné, ale ak to chcete "
+"naozaj urobiť, aktivujte možnosť APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:34
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Indexový súbor typu „%s“ nie je podporovaný"
+
+#: apt-pkg/algorithms.cc:255
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Je nutné preinštalovať balík %s, ale nedá sa nájsť jeho archív."
+
+#: apt-pkg/algorithms.cc:1190
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Chyba, pkgProblemResolver::Resolve vytvára poruchy, čo môže být spôsobené "
+"pridržanými balíkmi."
+
+#: apt-pkg/algorithms.cc:1192
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Problémy sa nedajú opraviť, niektoré balíky držíte v poškodenom stave."
+
+#: apt-pkg/algorithms.cc:1491
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Zlyhalo stiahnutie %s  %s\n"
+
+#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Niektoré indexové súbory sa nepodarilo stiahnuť. Boli ignorované alebo sa "
+"použili staršie verzie."
+
+#: apt-pkg/acquire.cc:81
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr "Adresár zoznamov %spartial chýba."
+
+#: apt-pkg/acquire.cc:85
+#, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Archívny adresár %spartial chýba."
+
+#: apt-pkg/acquire.cc:93
+#, c-format
+msgid "Unable to lock directory %s"
+msgstr "Adresár %s sa nedá zamknúť"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:864
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
+
+#: apt-pkg/acquire.cc:866
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Sťahuje sa %li. súbor z %li"
+
+#: apt-pkg/acquire-worker.cc:112
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Nedá sa nájsť ovládač spôsobu %s."
+
+#: apt-pkg/acquire-worker.cc:161
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Spôsob %s nebol správne spustený"
+
+#: apt-pkg/acquire-worker.cc:425
+#, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Vložte disk nazvaný „%s“ do mechaniky „%s“ a stlačte Enter."
+
+#: apt-pkg/init.cc:152
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Systém balíkov „%s“ nie je podporovaný"
+
+#: apt-pkg/init.cc:168
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Nedá sa určiť vhodný typ systému balíkov"
+
+#: apt-pkg/clean.cc:59
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Nie je možné vykonať stat %s."
+
+#: apt-pkg/srcrecords.cc:47
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Do sources.list musíte zadať nejaký „source“ (zdrojový) URI"
+
+#: apt-pkg/cachefile.cc:87
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Zoznamy balíkov alebo stavový súbor sa nedajú spracovať alebo otvoriť."
+
+#: apt-pkg/cachefile.cc:91
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Na opravu týchto problémov môžete skúsiť spustiť apt-get update"
+
+#: apt-pkg/cachefile.cc:109
+msgid "The list of sources could not be read."
+msgstr "Nedá sa načítať zoznam zdrojov."
+
+#: apt-pkg/policy.cc:74
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+"„%s“ nie je platná hodnota pre APT::Default-Release, pretože také vydanie "
+"nie je dostupné v zdrojoch"
+
+#: apt-pkg/policy.cc:396
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Neplatný záznam v súbore nastavení %s, chýba hlavička Package"
+
+#: apt-pkg/policy.cc:418
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Nezrozumiteľné pridržanie typu %s"
+
+#: apt-pkg/policy.cc:426
+msgid "No priority (or zero) specified for pin"
+msgstr "Nebola zadaná žiadna (alebo nulová) priorita na pridržanie"
+
+#: apt-pkg/pkgcachegen.cc:85
+msgid "Cache has an incompatible versioning system"
+msgstr "Vyrovnávacia pamäť má nezlučiteľný systém na správu verzií"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:234
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Fíha, prekročili ste počet názvov balíkov, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:237
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Fíha, prekročili ste počet verzií, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:240
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+"Fíha, prekročili ste počet popisov, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:243
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
+
+#: apt-pkg/pkgcachegen.cc:517
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Pri spracovaní závislostí nebol nájdený balík %s %s"
+
+#: apt-pkg/pkgcachegen.cc:1082
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Nedá sa vyhodnotiť zoznam zdrojových balíkov %s"
+
+#: apt-pkg/pkgcachegen.cc:1170 apt-pkg/pkgcachegen.cc:1274
+#: apt-pkg/pkgcachegen.cc:1280 apt-pkg/pkgcachegen.cc:1436
+msgid "Reading package lists"
+msgstr "Načítavajú sa zoznamy balíkov"
+
+#: apt-pkg/pkgcachegen.cc:1187
+msgid "Collecting File Provides"
+msgstr "Collecting File poskytuje"
+
+#: apt-pkg/pkgcachegen.cc:1271
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Do %s sa nedá zapisovať"
+
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
+msgid "IO Error saving source cache"
+msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäti"
+
+#: apt-pkg/acquire-item.cc:139
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "premenovanie zlyhalo, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:640
+msgid "MD5Sum mismatch"
+msgstr "Nezhoda kontrolných MD5 súčtov"
+
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
+msgid "Hash Sum mismatch"
+msgstr "Nezhoda kontrolných haš súčtov"
+
+#: apt-pkg/acquire-item.cc:1399
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+"Nepodarilo sa nájsť očakávanú položku „%s“ v súbore Release (Nesprávna "
+"položka sources.list alebo chybný formát súboru)"
+
+#: apt-pkg/acquire-item.cc:1415
+#, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Nepodarilo sa nájsť haš „%s“ v súbore Release"
+
+#: apt-pkg/acquire-item.cc:1450
+msgid "There is no public key available for the following key IDs:\n"
+msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
+
+#: apt-pkg/acquire-item.cc:1488
+#, c-format
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
+"Súbor Release pre %s vypršal (neplatný od %s). Aktualizácie tohto zdroja "
+"softvéru sa nepoužijú."
+
+#: apt-pkg/acquire-item.cc:1510
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
+
+#: apt-pkg/acquire-item.cc:1543
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+"Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a "
+"použijú sa predošlé indexové súbory. Chyba GPG: %s: %s\n"
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr "Chyba GPG: %s: %s"
+
+#: apt-pkg/acquire-item.cc:1650
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Nedá sa nájsť súbor s balíkom %s. To by mohlo znamenať, že tento balík je "
+"potrebné opraviť manuálne (kvôli chýbajúcej architektúre)."
+
+#: apt-pkg/acquire-item.cc:1709
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package."
+msgstr ""
+"Nedá sa nájsť súbor s balíkom %s. Asi budete musieť opraviť tento balík "
+"manuálne."
+
+#: apt-pkg/acquire-item.cc:1768
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Indexové súbory balíka sú narušené. Chýba pole Filename: pre balík %s."
+
+#: apt-pkg/acquire-item.cc:1855
+msgid "Size mismatch"
+msgstr "Veľkosti sa nezhodujú"
+
+#: apt-pkg/indexrecords.cc:61
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Nedá spracovať súbor Release %s"
+
+#: apt-pkg/indexrecords.cc:71
+#, c-format
+msgid "No sections in Release file %s"
+msgstr "Žiadne sekcie v Release súbore %s"
+
+#: apt-pkg/indexrecords.cc:105
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr "Chýba položka „Hash“ v súbore Release %s"
+
+#: apt-pkg/indexrecords.cc:118
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Chýba položka „Valid-Until“ v súbore Release %s"
+
+#: apt-pkg/indexrecords.cc:137
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Chýba položka „Date“ v súbore Release %s"
+
+#: apt-pkg/vendorlist.cc:78
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Blok výrobcu %s neobsahuje otlačok (fingerprint)"
+
+#: apt-pkg/cdrom.cc:566
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Použije sa CD-ROM prípojný bod %s\n"
+"Pripája sa CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672
+msgid "Identifying.. "
+msgstr "Identifikuje sa.. "
+
+#: apt-pkg/cdrom.cc:603
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Uložená menovka: %s\n"
+
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD-ROM sa odpája...\n"
+
+#: apt-pkg/cdrom.cc:632
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Použije sa prípojný bod CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:650
+msgid "Unmounting CD-ROM\n"
+msgstr "CD-ROM sa odpája\n"
+
+#: apt-pkg/cdrom.cc:655
+msgid "Waiting for disc...\n"
+msgstr "Čaká sa na disk...\n"
+
+#: apt-pkg/cdrom.cc:664
+msgid "Mounting CD-ROM...\n"
+msgstr "Pripája sa CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:683
+msgid "Scanning disc for index files..\n"
+msgstr "Na disku sa hľadajú indexové súbory..\n"
+
+#: apt-pkg/cdrom.cc:731
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""
+"Nájdených %zu indexov balíkov, %zu indexov zdrojových balíkov, %zu indexov "
+"prekladov a %zu signatúr\n"
+
+#: apt-pkg/cdrom.cc:742
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+"Nepodarilo sa nájsť žiadne súbory balíkov, možno toto nie je disk s Debianom "
+"alebo je pre nesprávnu architektúru?"
+
+#: apt-pkg/cdrom.cc:769
+#, c-format
+msgid "Found label '%s'\n"
+msgstr "Nájdená menovka: „%s“\n"
+
+#: apt-pkg/cdrom.cc:798
+msgid "That is not a valid name, try again.\n"
+msgstr "Neplatný názov, skúste znova.\n"
+
+#: apt-pkg/cdrom.cc:815
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Názov tohto disku je: \n"
+"„%s“\n"
+
+#: apt-pkg/cdrom.cc:817
+msgid "Copying package lists..."
+msgstr "Kopírujú sa zoznamy balíkov..."
+
+#: apt-pkg/cdrom.cc:844
+msgid "Writing new source list\n"
+msgstr "Zapisuje sa nový zoznam zdrojov\n"
+
+#: apt-pkg/cdrom.cc:852
+msgid "Source list entries for this disc are:\n"
+msgstr "Položky zoznamu zdrojov pre tento disk sú:\n"
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "Zapísaných %i záznamov.\n"
+
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Zapísaných %i záznamov s %i chýbajúcimi súbormi.\n"
+
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Zapísaných %i záznamov s %i chybnými súbormi\n"
+
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
+
+#: apt-pkg/indexcopy.cc:503
+#, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Preskakuje sa neexistujúci súbor %s"
+
+#: apt-pkg/indexcopy.cc:509
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr "Nebolo možné nájsť autentifikačný záznam pre: %s"
+
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Nezhoda kontrolných haš súčtov: %s"
+
+#: apt-pkg/indexcopy.cc:659
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:690
+#, c-format
+msgid "No keyring installed in %s."
+msgstr "V %s nie je nainštalovaný žiaden zväzok kľúčov."
+
+#: apt-pkg/cachefilter.cc:31
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Chyba pri preklade regulárneho výrazu - %s"
+
+#: apt-pkg/cacheset.cc:352
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Nebolo nájdené vydanie „%s“ pre „%s“"
+
+#: apt-pkg/cacheset.cc:355
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Nebola nájdená verzia „%s“ pre „%s“"
+
+#: apt-pkg/cacheset.cc:459
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nedá sa nájsť balík %s"
+
+#: apt-pkg/cacheset.cc:466
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nebolo možné nájsť úlohu „%s“"
+
+#: apt-pkg/cacheset.cc:472
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Nebol nájdený žiaden balík zodpovedajúci regulárnemu výrazu „%s“"
+
+#: apt-pkg/cacheset.cc:483
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr "Nie je možné vybrať verzie z balíka „%s“, pretože je čisto virtuálny"
+
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+"Nie je možné vybrať nainštalované ani kandidátske verzie z balíka „%s“, "
+"pretože nemá žiadnu z nich"
+
+#: apt-pkg/cacheset.cc:504
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+"Nie je možné vybrať najnovšiu verziu z balíka „%s“, pretože je čisto "
+"virtuálny"
+
+#: apt-pkg/cacheset.cc:512
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+"Nie je možné vybrať kandidátsku verziu z balíka „%s“, pretože nemá kandidáta"
+
+#: apt-pkg/cacheset.cc:520
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+"Nie je možné vybrať nainštalovanú verziu z balíka „%s“, pretože nie je "
+"nainštalovaný"
+
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:70
+#, c-format
+msgid "Installing %s"
+msgstr "Inštaluje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:946
+#, c-format
+msgid "Configuring %s"
+msgstr "Nastavuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:953
+#, c-format
+msgid "Removing %s"
+msgstr "Odstraňuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:73
+#, c-format
+msgid "Completely removing %s"
+msgstr "Úplne sa odstraňuje %s"
+
+#: apt-pkg/deb/dpkgpm.cc:74
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr "Zaznamenali sme zmiznutie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:75
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr "Vykonáva sa spúšťač post-installation %s"
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:702
+#, c-format
+msgid "Directory '%s' missing"
+msgstr "Adresár „%s“ chýba"
+
+#: apt-pkg/deb/dpkgpm.cc:717 apt-pkg/deb/dpkgpm.cc:737
+#, c-format
+msgid "Could not open file '%s'"
+msgstr "Nedá sa otvoriť súbor „%s“"
+
+#: apt-pkg/deb/dpkgpm.cc:939
+#, c-format
+msgid "Preparing %s"
+msgstr "Pripravuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:940
+#, c-format
+msgid "Unpacking %s"
+msgstr "Rozbaľuje sa %s"
+
+#: apt-pkg/deb/dpkgpm.cc:945
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Pripravuje sa nastavenie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:947
+#, c-format
+msgid "Installed %s"
+msgstr "Nainštalovaný balík %s"
+
+#: apt-pkg/deb/dpkgpm.cc:952
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Pripravuje sa odstránenie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:954
+#, c-format
+msgid "Removed %s"
+msgstr "Odstránený balík %s"
+
+#: apt-pkg/deb/dpkgpm.cc:959
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Pripravuje sa úplné odstránenie %s"
+
+#: apt-pkg/deb/dpkgpm.cc:960
+#, c-format
+msgid "Completely removed %s"
+msgstr "Balík „%s“ je úplne odstránený"
+
+#: apt-pkg/deb/dpkgpm.cc:1202
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+"Nedá sa zapísať záznam, volanie openpty() zlyhalo (/dev/pts nie je "
+"pripojený?)\n"
+
+#: apt-pkg/deb/dpkgpm.cc:1232
+msgid "Running dpkg"
+msgstr "Spúšťa sa dpkg"
+
+#: apt-pkg/deb/dpkgpm.cc:1404
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1461
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+"Nezapíše sa správa apport, pretože už bol dosiahnutý limit MaxReports"
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1466
+msgid "dependency problems - leaving unconfigured"
+msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
+
+#: apt-pkg/deb/dpkgpm.cc:1468
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je to chyba v "
+"nadväznosti na predošlé zlyhanie."
+
+#: apt-pkg/deb/dpkgpm.cc:1474
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje, že je disk "
+"zaplnený"
+
+#: apt-pkg/deb/dpkgpm.cc:1481
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje chybu nedostatku "
+"pamäte"
+
+#: apt-pkg/deb/dpkgpm.cc:1488 apt-pkg/deb/dpkgpm.cc:1494
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1515
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+"Nezapíše sa správa apport, pretože chybová správa indikuje V/V chybu dpkg"
+
+#: apt-pkg/deb/debsystem.cc:84
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr "Nedá sa zamknúť adresár na správu (%s), používa ho iný proces?"
+
+#: apt-pkg/deb/debsystem.cc:87
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Nedá sa zamknúť adresár na správu (%s), ste root?"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:103
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s“. "
+
+#: apt-pkg/deb/debsystem.cc:121
+msgid "Not locked"
+msgstr "Nie je zamknuté"
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:279
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr "Na zrkadle nebol nájdený súbor „%s“ "
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:286
+#, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "Nepodarilo sa prečítať súbor „%s“ na zrkadle"
+
+#: methods/mirror.cc:441
+#, c-format
+msgid "[Mirror: %s]"
+msgstr "[Zrkadlo: %s]"
+
+#: methods/rred.cc:477
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+"Nepodarilo sa záplatovať %s pomocou mmap a pomocou operácie so súborom - zdá "
+"sa, že záplata je poškodená."
+
+#: methods/rred.cc:482
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
+"Nepodarilo sa záplatovať %s pomocou mmap (ale nevyskytla sa chyba týkajúca "
+"sa mmap) - zdá sa, že záplata je poškodená."
+
+#: methods/rsh.cc:97
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Zlyhalo vytvorenie IPC rúry k podprocesu"
+
+#: methods/rsh.cc:336
+msgid "Connection closed prematurely"
+msgstr "Spojenie bolo predčasne ukončené"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libc.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libc.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libc.po	2012-01-02 17:51:13.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libc.po	2012-02-23 06:55:58.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: libc 2.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-06 12:40-0800\n"
-"PO-Revision-Date: 2011-12-15 10:57+0000\n"
+"POT-Creation-Date: 2011-05-31 00:06-0400\n"
+"PO-Revision-Date: 2012-02-10 01:38+0000\n"
 "Last-Translator: Marcel Telka <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:28+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: argp/argp-help.c:228
 #, c-format
@@ -95,15 +95,17 @@
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(CHYBA PROGRAMU) Voľba by mala byť rozpoznaná!?"
 
-#: assert/assert-perr.c:57
+#: assert/assert-perr.c:37
 #, c-format
 msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr "%s%s%s:%u: %s%sNeočakávaná chyba: %s.\n"
 
-#: assert/assert.c:57
+#: assert/assert.c:105
 #, c-format
-msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
-msgstr "%s%s%s:%u: %s%sPredpoklad `%s' nesplnený.\n"
+msgid ""
+"%s%s%s:%u: %s%sAssertion `%s' failed.\n"
+"%n"
+msgstr ""
 
 #: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61
 msgid "NAME"
@@ -140,25 +142,24 @@
 "[VÝSTUPNÝ_SÚBOR [VSTUPNÝ_SÚBOR]...]"
 
 #: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58
-#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sprof.c:360
-#: iconv/iconv_prog.c:408 iconv/iconvconfig.c:380 locale/programs/locale.c:278
-#: locale/programs/localedef.c:371 login/programs/pt_chown.c:88
-#: malloc/memusage.sh:65 malloc/memusagestat.c:533 nscd/nscd.c:415
-#: nss/getent.c:842 nss/makedb.c:231 posix/getconf.c:1030
-#: sunrpc/rpc_main.c:1494 sunrpc/rpcinfo.c:699
+#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sotruss.ksh:49
+#: elf/sprof.c:371 iconv/iconv_prog.c:408 iconv/iconvconfig.c:380
+#: locale/programs/locale.c:278 locale/programs/localedef.c:371
+#: login/programs/pt_chown.c:92 malloc/memusage.sh:65
+#: malloc/memusagestat.c:539 nscd/nscd.c:415 nss/getent.c:918 nss/makedb.c:231
+#: posix/getconf.c:1122 sunrpc/rpc_main.c:1492 sunrpc/rpcinfo.c:691
 #: sysdeps/unix/sysv/linux/lddlibc4.c:62
-#, c-format
 msgid ""
 "For bug reporting instructions, please see:\n"
 "<http://www.gnu.org/software/libc/bugs.html>.\n"
 msgstr ""
 
 #: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66
-#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sprof.c:375
+#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sotruss.ksh:76 elf/sprof.c:386
 #: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293
-#: locale/programs/localedef.c:387 login/programs/pt_chown.c:59
-#: malloc/memusage.sh:73 malloc/memusagestat.c:551 nscd/nscd.c:429
-#: nss/getent.c:81 nss/makedb.c:245 posix/getconf.c:1012
+#: locale/programs/localedef.c:387 login/programs/pt_chown.c:63
+#: malloc/memusage.sh:73 malloc/memusagestat.c:557 nscd/nscd.c:429
+#: nss/getent.c:87 nss/makedb.c:245 posix/getconf.c:1104
 #: sysdeps/unix/sysv/linux/lddlibc4.c:69
 #, c-format
 msgid ""
@@ -174,11 +175,11 @@
 "NA KONKRÉTNY ÚČEL.\n"
 
 #: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70
-#: elf/ldconfig.c:321 elf/sprof.c:381 iconv/iconv_prog.c:428
+#: elf/ldconfig.c:321 elf/sprof.c:392 iconv/iconv_prog.c:428
 #: iconv/iconvconfig.c:400 locale/programs/locale.c:298
 #: locale/programs/localedef.c:392 malloc/memusage.sh:77
-#: malloc/memusagestat.c:556 nscd/nscd.c:434 nss/getent.c:86 nss/makedb.c:250
-#: posix/getconf.c:1017
+#: malloc/memusagestat.c:562 nscd/nscd.c:434 nss/getent.c:92 nss/makedb.c:250
+#: posix/getconf.c:1109
 #, c-format
 msgid "Written by %s.\n"
 msgstr "Autor: %s.\n"
@@ -298,12 +299,12 @@
 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 msgstr ""
 
-#: debug/xtrace.sh:33
-msgid "Try \\`xtrace --help' for more information.\\n"
+#: debug/xtrace.sh:33 malloc/memusage.sh:27
+msgid "Try \\`%s --help' or `%s --usage' for more information.\\n"
 msgstr ""
 
 #: debug/xtrace.sh:39
-msgid "xtrace: option \\`$1' requires an argument.\\n"
+msgid "%s: option '%s' requires an argument.\\n"
 msgstr ""
 
 #: debug/xtrace.sh:46
@@ -374,7 +375,7 @@
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:134 elf/ldconfig.c:1289
+#: elf/cache.c:134 elf/ldconfig.c:1305
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "Nie je možné otvoriť cache súbor %s\n"
@@ -414,11 +415,11 @@
 msgid "Renaming of %s to %s failed"
 msgstr "Premenovanie %s na %s zlyhalo"
 
-#: elf/dl-close.c:378 elf/dl-open.c:460
+#: elf/dl-close.c:387 elf/dl-open.c:397
 msgid "cannot create scope list"
 msgstr "nie je možné vytvoriť zoznam pôsobnosti"
 
-#: elf/dl-close.c:725
+#: elf/dl-close.c:767
 msgid "shared object not open"
 msgstr "zdieľaný objekt nie je otvorený"
 
@@ -426,7 +427,7 @@
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST nie je pre SUID/SGID programy povolené"
 
-#: elf/dl-deps.c:127 elf/dl-open.c:282
+#: elf/dl-deps.c:127
 msgid "empty dynamic string token substitution"
 msgstr "prázdna substitúcia tokenu dynamického reťazca"
 
@@ -443,11 +444,11 @@
 msgid "cannot allocate dependency list"
 msgstr "nie je možné prideliť pamäť pre zoznam závislostí"
 
-#: elf/dl-deps.c:510 elf/dl-deps.c:565
+#: elf/dl-deps.c:514 elf/dl-deps.c:574
 msgid "cannot allocate symbol search list"
 msgstr "nie je možné prideliť pamäť pre vyhľadávací zoznam symbolov"
 
-#: elf/dl-deps.c:550
+#: elf/dl-deps.c:554
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "Filtre nie sú podporované s LD_TRACE_PRELINKING"
 
@@ -471,206 +472,214 @@
 msgid "internal error: symidx out of range of fptr table"
 msgstr ""
 
-#: elf/dl-load.c:372
+#: elf/dl-load.c:471
 msgid "cannot allocate name record"
 msgstr "nie je možné prideliť pamäť pre záznam názvu"
 
-#: elf/dl-load.c:474 elf/dl-load.c:582 elf/dl-load.c:667 elf/dl-load.c:780
+#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862
 msgid "cannot create cache for search path"
 msgstr "Nie je možné vytvoriť cache pre hľadanie v ceste"
 
-#: elf/dl-load.c:565
+#: elf/dl-load.c:639
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "nie je možné vytvoriť kópiu RUNPATH/RPATH"
 
-#: elf/dl-load.c:653
+#: elf/dl-load.c:735
 msgid "cannot create search path array"
 msgstr "nie je možné vytvoriť pole ciest"
 
-#: elf/dl-load.c:864
+#: elf/dl-load.c:931
 msgid "cannot stat shared object"
 msgstr "nepodarilo sa zistiť stav zdieľaného objektu"
 
-#: elf/dl-load.c:934
+#: elf/dl-load.c:1009
 msgid "cannot open zero fill device"
 msgstr "nie je možné otvoriť zariadenie pre naplnenie nulami"
 
-#: elf/dl-load.c:979 elf/dl-load.c:2215
+#: elf/dl-load.c:1055 elf/dl-load.c:2313
 msgid "cannot create shared object descriptor"
 msgstr "nie je možné vytvoriť deskriptor zdieľaného objektu"
 
-#: elf/dl-load.c:998 elf/dl-load.c:1647 elf/dl-load.c:1739
+#: elf/dl-load.c:1074 elf/dl-load.c:1730 elf/dl-load.c:1833
 msgid "cannot read file data"
 msgstr "nie je možné načítať údaje súboru"
 
-#: elf/dl-load.c:1042
+#: elf/dl-load.c:1120
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF zarovnanie príkazu nie je zarovnané na stránku"
 
-#: elf/dl-load.c:1049
+#: elf/dl-load.c:1127
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF zavádzacia adresa/posunutie nie je správne zarovnaná"
 
-#: elf/dl-load.c:1132
+#: elf/dl-load.c:1210
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr "nie je možné prideliť dátové štruktúry TLS pre počiatočné vlákno"
 
-#: elf/dl-load.c:1155
+#: elf/dl-load.c:1233
 msgid "cannot handle TLS data"
 msgstr "nie je možné spracovať TLS dáta"
 
-#: elf/dl-load.c:1174
+#: elf/dl-load.c:1252
 msgid "object file has no loadable segments"
 msgstr "objektový súbor neobsahuje žiadny nahrateľný segment"
 
-#: elf/dl-load.c:1210
+#: elf/dl-load.c:1288
 msgid "failed to map segment from shared object"
 msgstr "nepodarilo sa namapovať segment zo zdieľaného objektu"
 
-#: elf/dl-load.c:1236
+#: elf/dl-load.c:1314
 msgid "cannot dynamically load executable"
 msgstr "nie je možné dynamicky načítať spustiteľný súbor"
 
-#: elf/dl-load.c:1298
+#: elf/dl-load.c:1376
 msgid "cannot change memory protections"
 msgstr "nie je možné zmeniť ochranu pamäti"
 
-#: elf/dl-load.c:1317
+#: elf/dl-load.c:1395
 msgid "cannot map zero-fill pages"
 msgstr "nie je možné namapovať stránky vyplnené nulami"
 
-#: elf/dl-load.c:1331
+#: elf/dl-load.c:1409
 msgid "object file has no dynamic section"
 msgstr "objektový súbor neobsahuje žiadnu dynamickú sekciu"
 
-#: elf/dl-load.c:1354
+#: elf/dl-load.c:1432
 msgid "shared object cannot be dlopen()ed"
 msgstr "zdieľaný objekt nemôže byť otvorený pomocou dlopen()"
 
-#: elf/dl-load.c:1367
+#: elf/dl-load.c:1445
 msgid "cannot allocate memory for program header"
 msgstr "nie je možné prideliť pamäť pre hlavičku programu"
 
-#: elf/dl-load.c:1384 elf/dl-open.c:218
+#: elf/dl-load.c:1462 elf/dl-open.c:180
 msgid "invalid caller"
 msgstr ""
 
-#: elf/dl-load.c:1423
+#: elf/dl-load.c:1501
 msgid "cannot enable executable stack as shared object requires"
 msgstr ""
 "nie je možné povoliť spustiteľný zásobník ako vyžaduje zdieľaný objekt"
 
-#: elf/dl-load.c:1436
+#: elf/dl-load.c:1514
 msgid "cannot close file descriptor"
 msgstr ""
 
-#: elf/dl-load.c:1647
+#: elf/dl-load.c:1730
 msgid "file too short"
 msgstr "súbor je príliš krátky"
 
-#: elf/dl-load.c:1676
+#: elf/dl-load.c:1766
 msgid "invalid ELF header"
 msgstr "neprípustná ELF hlavička"
 
-#: elf/dl-load.c:1688
+#: elf/dl-load.c:1778
 msgid "ELF file data encoding not big-endian"
 msgstr "Kódovanie dát v ELF súbore nie je big-endian"
 
-#: elf/dl-load.c:1690
+#: elf/dl-load.c:1780
 msgid "ELF file data encoding not little-endian"
 msgstr "Kódovanie dát v ELF súbore nie je little-endian"
 
-#: elf/dl-load.c:1694
+#: elf/dl-load.c:1784
 msgid "ELF file version ident does not match current one"
 msgstr "Identifikácia verzie ELF súboru sa nezhoduje s aktuálnou"
 
-#: elf/dl-load.c:1698
+#: elf/dl-load.c:1788
 msgid "ELF file OS ABI invalid"
 msgstr "Neplatný OS ABI ELF súboru"
 
-#: elf/dl-load.c:1700
+#: elf/dl-load.c:1791
 msgid "ELF file ABI version invalid"
 msgstr "Neplatná verzia ABI ELF súboru"
 
-#: elf/dl-load.c:1703
+#: elf/dl-load.c:1794
+msgid "nonzero padding in e_ident"
+msgstr ""
+
+#: elf/dl-load.c:1797
 msgid "internal error"
 msgstr "interná chyba"
 
-#: elf/dl-load.c:1710
+#: elf/dl-load.c:1804
 msgid "ELF file version does not match current one"
 msgstr "Verzia súboru ELF sa nezhoduje s aktuálnou"
 
-#: elf/dl-load.c:1718
+#: elf/dl-load.c:1812
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "iba ET_DYN a ET_EXEC môžu byť načítané"
 
-#: elf/dl-load.c:1724
+#: elf/dl-load.c:1818
 msgid "ELF file's phentsize not the expected size"
 msgstr "phentsize ELF súboru nie je očakávaná"
 
-#: elf/dl-load.c:2231
+#: elf/dl-load.c:2332
 msgid "wrong ELF class: ELFCLASS64"
 msgstr ""
 
-#: elf/dl-load.c:2232
+#: elf/dl-load.c:2333
 msgid "wrong ELF class: ELFCLASS32"
 msgstr ""
 
-#: elf/dl-load.c:2235
+#: elf/dl-load.c:2336
 msgid "cannot open shared object file"
 msgstr "nie je možné otvoriť súbor zdieľaného objektu"
 
-#: elf/dl-lookup.c:356
+#: elf/dl-lookup.c:757
 msgid "relocation error"
 msgstr "chyba relokácie"
 
-#: elf/dl-lookup.c:384
+#: elf/dl-lookup.c:785
 msgid "symbol lookup error"
 msgstr ""
 
-#: elf/dl-open.c:114
+#: elf/dl-open.c:115
 msgid "cannot extend global scope"
 msgstr "nie je možné rozšíriť globálny rozsah"
 
-#: elf/dl-open.c:512
+#: elf/dl-open.c:440
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr ""
 
-#: elf/dl-open.c:549
+#: elf/dl-open.c:462
+msgid "cannot load any more object with static TLS"
+msgstr ""
+
+#: elf/dl-open.c:511
 msgid "invalid mode for dlopen()"
 msgstr "neprípustný mód pre dlopen()"
 
-#: elf/dl-open.c:566
+#: elf/dl-open.c:528
 msgid "no more namespaces available for dlmopen()"
 msgstr ""
 
-#: elf/dl-open.c:579
+#: elf/dl-open.c:547
 msgid "invalid target namespace in dlmopen()"
 msgstr ""
 
-#: elf/dl-reloc.c:121
+#: elf/dl-reloc.c:120
 msgid "cannot allocate memory in static TLS block"
 msgstr "nie je možné prideliť pamäť v statickom bloku TLS"
 
-#: elf/dl-reloc.c:211
+#: elf/dl-reloc.c:212
 msgid "cannot make segment writable for relocation"
 msgstr "nie je možné zmeniť segment na zapisovateľný pre relokáciu"
 
-#: elf/dl-reloc.c:277
+#: elf/dl-reloc.c:275
 #, c-format
 msgid "%s: no PLTREL found in object %s\n"
 msgstr ""
 
-#: elf/dl-reloc.c:288
+#: elf/dl-reloc.c:286
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr ""
 
-#: elf/dl-reloc.c:304
+#: elf/dl-reloc.c:302
 msgid "cannot restore segment prot after reloc"
 msgstr "nie je možné obnoviť segment prot po reloc"
 
-#: elf/dl-reloc.c:329
+#: elf/dl-reloc.c:331
 msgid "cannot apply additional memory protection after relocation"
 msgstr ""
 
@@ -678,14 +687,18 @@
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "RTLD_NEXT je použité pre kód, ktorý nie je dynamicky zavedený"
 
-#: elf/dl-sysdep.c:481 elf/dl-sysdep.c:493
+#: elf/dl-sysdep.c:488 elf/dl-sysdep.c:500
 msgid "cannot create capability list"
 msgstr "nie je možné vytvoriť zoznam zlučiteľnosti"
 
-#: elf/dl-tls.c:864
+#: elf/dl-tls.c:861
 msgid "cannot create TLS data structures"
 msgstr "nie je možné dátové štruktúry TLS"
 
+#: elf/dl-version.c:172
+msgid "version lookup error"
+msgstr ""
+
 #: elf/dl-version.c:303
 msgid "cannot allocate version reference table"
 msgstr "nie je možné prideliť pamäť pre referenčnú tabuľku verzií"
@@ -768,147 +781,147 @@
 msgid "%s is not a known library type"
 msgstr "%s nie je známy typ knižnice"
 
-#: elf/ldconfig.c:404
+#: elf/ldconfig.c:407
 #, c-format
 msgid "Can't stat %s"
 msgstr "Zlyhal stat %s"
 
-#: elf/ldconfig.c:478
+#: elf/ldconfig.c:481
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "Zlyhal stat %s\n"
 
-#: elf/ldconfig.c:488
+#: elf/ldconfig.c:491
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s nie je symbolický odkaz\n"
 
-#: elf/ldconfig.c:507
+#: elf/ldconfig.c:510
 #, c-format
 msgid "Can't unlink %s"
 msgstr "Nie je možné odstrániť %s"
 
-#: elf/ldconfig.c:513
+#: elf/ldconfig.c:516
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "Nie je možné vytvoriť odkaz %s na %s"
 
-#: elf/ldconfig.c:519
+#: elf/ldconfig.c:522
 msgid " (changed)\n"
 msgstr " (zmenené)\n"
 
-#: elf/ldconfig.c:521
+#: elf/ldconfig.c:524
 msgid " (SKIPPED)\n"
 msgstr " (VYNECHANÉ)\n"
 
-#: elf/ldconfig.c:576
+#: elf/ldconfig.c:579
 #, c-format
 msgid "Can't find %s"
 msgstr "Nie je možné nájsť %s"
 
-#: elf/ldconfig.c:592 elf/ldconfig.c:765 elf/ldconfig.c:813 elf/ldconfig.c:847
+#: elf/ldconfig.c:595 elf/ldconfig.c:768 elf/ldconfig.c:827 elf/ldconfig.c:861
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "Zlyhal lstat %s"
 
-#: elf/ldconfig.c:599
+#: elf/ldconfig.c:602
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "Súbor %s ignorovaný, keďže nie je regulérnym súborom."
 
-#: elf/ldconfig.c:608
+#: elf/ldconfig.c:611
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "Odkaz nebol vytvorený, keďže pre %s nebolo možné nájsť soname"
 
-#: elf/ldconfig.c:691
+#: elf/ldconfig.c:694
 #, c-format
 msgid "Can't open directory %s"
 msgstr "Nie je možné otvoriť adresár %s"
 
-#: elf/ldconfig.c:779
-#, c-format
-msgid "Cannot stat %s"
-msgstr "Zlyhal stat %s"
-
-#: elf/ldconfig.c:834 elf/readlib.c:91
+#: elf/ldconfig.c:786 elf/ldconfig.c:848 elf/readlib.c:91
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "Vstupný súbor %s nebol nájdený.\n"
 
-#: elf/ldconfig.c:908
+#: elf/ldconfig.c:793
+#, c-format
+msgid "Cannot stat %s"
+msgstr "Zlyhal stat %s"
+
+#: elf/ldconfig.c:922
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 knižnica %s je v nesprávnom adresári"
 
-#: elf/ldconfig.c:911
+#: elf/ldconfig.c:925
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 knižnica %s je v nesprávnom adresári"
 
-#: elf/ldconfig.c:914
+#: elf/ldconfig.c:928
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 knižnica %s je v nesprávnom adresári"
 
-#: elf/ldconfig.c:942
+#: elf/ldconfig.c:956
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
 msgstr "knižnice %s a %s v adresári %s majú rovnaké soname, ale odlišný typ."
 
-#: elf/ldconfig.c:1051
+#: elf/ldconfig.c:1065
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "Nie je možné otvoriť konfiguračný súbor %s"
 
-#: elf/ldconfig.c:1115
+#: elf/ldconfig.c:1129
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr ""
 
-#: elf/ldconfig.c:1121
+#: elf/ldconfig.c:1135
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr ""
 
-#: elf/ldconfig.c:1128 elf/ldconfig.c:1136
+#: elf/ldconfig.c:1142 elf/ldconfig.c:1150
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr ""
 
-#: elf/ldconfig.c:1139
+#: elf/ldconfig.c:1153
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr ""
 
-#: elf/ldconfig.c:1161
+#: elf/ldconfig.c:1175
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr ""
 
-#: elf/ldconfig.c:1168 locale/programs/xmalloc.c:70 malloc/obstack.c:434
-#: malloc/obstack.c:436 posix/getconf.c:985 posix/getconf.c:1177
+#: elf/ldconfig.c:1182 locale/programs/xmalloc.c:70 malloc/obstack.c:434
+#: malloc/obstack.c:436 posix/getconf.c:1077 posix/getconf.c:1297
 #, c-format
 msgid "memory exhausted"
 msgstr "nedostatok pamäti"
 
-#: elf/ldconfig.c:1198
+#: elf/ldconfig.c:1214
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr ""
 
-#: elf/ldconfig.c:1242
+#: elf/ldconfig.c:1258
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "relatívna cesta `%s' použitá na vytvorenie cache"
 
-#: elf/ldconfig.c:1268
+#: elf/ldconfig.c:1284
 #, c-format
 msgid "Can't chdir to /"
 msgstr "Nie je možné zmeniť adresár na /"
 
-#: elf/ldconfig.c:1310
+#: elf/ldconfig.c:1325
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "Nie je možné otvoriť adresár cache súboru %s\n"
@@ -951,7 +964,7 @@
 msgid "No such file or directory"
 msgstr "Adresár alebo súbor neexistuje"
 
-#: elf/ldd.bash.in:153 inet/rcmd.c:483
+#: elf/ldd.bash.in:153 inet/rcmd.c:488
 msgid "not regular file"
 msgstr "nie je regulérny súbor"
 
@@ -1063,6 +1076,55 @@
 msgid "Invalid link from \"%s\" to \"%s\": %s\n"
 msgstr ""
 
+#: elf/sotruss.ksh:33
+#, sh-format
+msgid ""
+"Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n"
+"  -F, --from FROMLIST     trace calls from objects on FORMLIST\n"
+"  -T, --to TOLIST         trace calls to objects on TOLIST\n"
+"\n"
+"  -e, --exit              also show exits from the function calls\n"
+"  -f, --follow            trace child processes\n"
+"  -o, --output FILENAME   write output to FILENAME (or FILENAME.$PID in "
+"case\n"
+"\t\t\t  -f is also used) instead of standard error\n"
+"\n"
+"      --help              print this help and exit\n"
+"      --version           print version information and exit"
+msgstr ""
+
+#: elf/sotruss.ksh:46
+msgid ""
+"Mandatory arguments to long options are also mandatory for any "
+"corresponding\\nshort options.\\n"
+msgstr ""
+
+#: elf/sotruss.ksh:56
+msgid "%s: option requires an argument -- '%s'\\n"
+msgstr ""
+
+#: elf/sotruss.ksh:57 elf/sotruss.ksh:68 elf/sotruss.ksh:134
+msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
+msgstr ""
+
+#: elf/sotruss.ksh:62
+msgid "%s: option is ambiguous; possibilities:"
+msgstr ""
+
+#: elf/sotruss.ksh:80
+msgid "Written by %s.\\n"
+msgstr ""
+
+#: elf/sotruss.ksh:87
+msgid ""
+"Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
+"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n"
+msgstr ""
+
+#: elf/sotruss.ksh:133
+msgid "%s: unrecognized option '%c%s'\\n"
+msgstr ""
+
 #: elf/sprof.c:77
 msgid "Output selection:"
 msgstr "Výber výstupu:"
@@ -1087,94 +1149,94 @@
 msgid "SHOBJ [PROFDATA]"
 msgstr "ZDIEĽ_OBJEKT [PROF_ÚDAJE]"
 
-#: elf/sprof.c:420
+#: elf/sprof.c:431
 #, c-format
 msgid "failed to load shared object `%s'"
 msgstr "nepodarilo sa načítať zdieľaný objekt `%s'"
 
-#: elf/sprof.c:429
+#: elf/sprof.c:440
 #, c-format
 msgid "cannot create internal descriptors"
 msgstr "nie je možné vytvoriť interné deskriptory"
 
-#: elf/sprof.c:548
+#: elf/sprof.c:559
 #, c-format
 msgid "Reopening shared object `%s' failed"
 msgstr "Znovuotvorenie zdieľaného objektu `%s' zlyhalo"
 
-#: elf/sprof.c:555 elf/sprof.c:649
+#: elf/sprof.c:566 elf/sprof.c:660
 #, c-format
 msgid "reading of section headers failed"
 msgstr ""
 
-#: elf/sprof.c:563 elf/sprof.c:657
+#: elf/sprof.c:574 elf/sprof.c:668
 #, c-format
 msgid "reading of section header string table failed"
 msgstr ""
 
-#: elf/sprof.c:589
+#: elf/sprof.c:600
 #, c-format
 msgid "*** Cannot read debuginfo file name: %m\n"
 msgstr ""
 
-#: elf/sprof.c:609
+#: elf/sprof.c:620
 #, c-format
 msgid "cannot determine file name"
 msgstr ""
 
-#: elf/sprof.c:642
+#: elf/sprof.c:653
 #, c-format
 msgid "reading of ELF header failed"
 msgstr ""
 
-#: elf/sprof.c:678
+#: elf/sprof.c:689
 #, c-format
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr ""
 "*** Zo súboru `%s' boli odstránené ladiace informácie: podrobná analýza nie "
 "je možná\n"
 
-#: elf/sprof.c:708
+#: elf/sprof.c:719
 #, c-format
 msgid "failed to load symbol data"
 msgstr "nepodarilo sa načítať symbolické údaje"
 
-#: elf/sprof.c:775
+#: elf/sprof.c:784
 #, c-format
 msgid "cannot load profiling data"
 msgstr "nie je možné načítať profilovacie údaje"
 
-#: elf/sprof.c:784
+#: elf/sprof.c:793
 #, c-format
 msgid "while stat'ing profiling data file"
 msgstr "počas stat-u súboru profilovacích informácií"
 
-#: elf/sprof.c:792
+#: elf/sprof.c:801
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
 msgstr "profilovacie údaje `%s' nesúhlasia so zdieľanýmobjektom `%s'"
 
-#: elf/sprof.c:803
+#: elf/sprof.c:812
 #, c-format
 msgid "failed to mmap the profiling data file"
 msgstr "nepodarilo sa mmap-ovať súbor profilovacích údajov"
 
-#: elf/sprof.c:811
+#: elf/sprof.c:820
 #, c-format
 msgid "error while closing the profiling data file"
 msgstr "chyba počas zatvárania súboru profilovacích údajov"
 
-#: elf/sprof.c:820 elf/sprof.c:890
+#: elf/sprof.c:829 elf/sprof.c:927
 #, c-format
 msgid "cannot create internal descriptor"
 msgstr "nie je možné vytvoriť interný deskriptor"
 
-#: elf/sprof.c:866
+#: elf/sprof.c:903
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "`%s' nie sú správne profilovacie údaje pre `%s'"
 
-#: elf/sprof.c:1047 elf/sprof.c:1105
+#: elf/sprof.c:1084 elf/sprof.c:1142
 #, c-format
 msgid "cannot allocate symbol data"
 msgstr "nie je možné prideliť pamäť pre symbolické údaje"
@@ -1366,68 +1428,68 @@
 msgid "cannot generate output file"
 msgstr "nie je možné vygenerovať výstupný súbor"
 
-#: inet/rcmd.c:157
+#: inet/rcmd.c:163
 msgid "rcmd: Cannot allocate memory\n"
 msgstr "rcmd: Nie je možné prideliť pamäť\n"
 
-#: inet/rcmd.c:172
+#: inet/rcmd.c:178
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd: socket: Všetky porty sú použité\n"
 
-#: inet/rcmd.c:200
+#: inet/rcmd.c:206
 #, c-format
 msgid "connect to address %s: "
 msgstr "spojiť sa s adresou %s: "
 
-#: inet/rcmd.c:213
+#: inet/rcmd.c:219
 #, c-format
 msgid "Trying %s...\n"
 msgstr "Skúšam %s...\n"
 
-#: inet/rcmd.c:249
+#: inet/rcmd.c:255
 #, c-format
 msgid "rcmd: write (setting up stderr): %m\n"
 msgstr "rcmd: write (nastavenie stderr): %m\n"
 
-#: inet/rcmd.c:265
+#: inet/rcmd.c:271
 #, c-format
 msgid "rcmd: poll (setting up stderr): %m\n"
 msgstr "rcmd: poll (nastavenie stderr): %m\n"
 
-#: inet/rcmd.c:268
+#: inet/rcmd.c:274
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll: chyba protokolu počas prípravy okruhu\n"
 
-#: inet/rcmd.c:301
+#: inet/rcmd.c:306
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: chyba protokolu pri príprave okruhu\n"
 
-#: inet/rcmd.c:325
+#: inet/rcmd.c:330
 #, c-format
 msgid "rcmd: %s: short read"
 msgstr "rcmd: %s: krátke čítanie"
 
-#: inet/rcmd.c:481
+#: inet/rcmd.c:486
 msgid "lstat failed"
 msgstr "lstat zlyhal"
 
-#: inet/rcmd.c:488
+#: inet/rcmd.c:493
 msgid "cannot open"
 msgstr "nie je možné otvoriť"
 
-#: inet/rcmd.c:490
+#: inet/rcmd.c:495
 msgid "fstat failed"
 msgstr "fstat sa nepodaril"
 
-#: inet/rcmd.c:492
+#: inet/rcmd.c:497
 msgid "bad owner"
 msgstr "chybný vlastník"
 
-#: inet/rcmd.c:494
+#: inet/rcmd.c:499
 msgid "writeable by other than owner"
 msgstr "zapisovateľný nielen pre vlastníka"
 
-#: inet/rcmd.c:496
+#: inet/rcmd.c:501
 msgid "hard linked somewhere"
 msgstr "niekde existuje pevný odkaz"
 
@@ -1549,8 +1611,8 @@
 msgstr "nebolo zadané žiadne symbolické meno pre koniec rozsahu"
 
 #: locale/programs/charmap.c:610 locale/programs/ld-address.c:602
-#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3924
-#: locale/programs/ld-ctype.c:2232 locale/programs/ld-ctype.c:2984
+#: locale/programs/ld-collate.c:2769 locale/programs/ld-collate.c:3927
+#: locale/programs/ld-ctype.c:2257 locale/programs/ld-ctype.c:3009
 #: locale/programs/ld-identification.c:452
 #: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
 #: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
@@ -1576,8 +1638,8 @@
 msgstr "%s: chyba v stavovom automate"
 
 #: locale/programs/charmap.c:850 locale/programs/ld-address.c:618
-#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4117
-#: locale/programs/ld-ctype.c:2229 locale/programs/ld-ctype.c:3001
+#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:4120
+#: locale/programs/ld-ctype.c:2254 locale/programs/ld-ctype.c:3026
 #: locale/programs/ld-identification.c:468
 #: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
 #: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
@@ -1602,7 +1664,7 @@
 "počet bajtov pre postupnosť bajtov začiatku a konca rozsahu nie sú rovnaké: "
 "%d a %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3044
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3046
 #: locale/programs/repertoire.c:419
 msgid "invalid names for character range"
 msgstr "neprípustné mená pre rozsah znakov"
@@ -1624,8 +1686,8 @@
 msgid "resulting bytes for range not representable."
 msgstr "výsledné bajty rozsahu nie sú zobraziteľné"
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1556
-#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:133
+#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1558
+#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:133
 #: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
 #: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
@@ -1689,7 +1751,7 @@
 msgstr "%s: číselný kód krajiny `%d' nie je platný"
 
 #: locale/programs/ld-address.c:510 locale/programs/ld-address.c:547
-#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2608
+#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2633
 #: locale/programs/ld-identification.c:364
 #: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
 #: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736
@@ -1711,8 +1773,8 @@
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: neznámy znak v poli `%s'"
 
-#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3922
-#: locale/programs/ld-ctype.c:2981 locale/programs/ld-identification.c:449
+#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3925
+#: locale/programs/ld-ctype.c:3006 locale/programs/ld-identification.c:449
 #: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
 #: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
@@ -1721,12 +1783,12 @@
 msgid "%s: incomplete `END' line"
 msgstr "%s: nekompletný riadok `END'"
 
-#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:542
-#: locale/programs/ld-collate.c:594 locale/programs/ld-collate.c:890
-#: locale/programs/ld-collate.c:903 locale/programs/ld-collate.c:2733
-#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4107
-#: locale/programs/ld-ctype.c:1960 locale/programs/ld-ctype.c:2219
-#: locale/programs/ld-ctype.c:2806 locale/programs/ld-ctype.c:2992
+#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:544
+#: locale/programs/ld-collate.c:596 locale/programs/ld-collate.c:892
+#: locale/programs/ld-collate.c:905 locale/programs/ld-collate.c:2735
+#: locale/programs/ld-collate.c:2756 locale/programs/ld-collate.c:4110
+#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2244
+#: locale/programs/ld-ctype.c:2831 locale/programs/ld-ctype.c:3017
 #: locale/programs/ld-identification.c:459
 #: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
@@ -1736,93 +1798,93 @@
 msgid "%s: syntax error"
 msgstr "%s: chyba syntaxe"
 
-#: locale/programs/ld-collate.c:417
+#: locale/programs/ld-collate.c:419
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' bol už definovaný v znakovej mape"
 
-#: locale/programs/ld-collate.c:426
+#: locale/programs/ld-collate.c:428
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' bol už definovaný v repertoári"
 
-#: locale/programs/ld-collate.c:433
+#: locale/programs/ld-collate.c:435
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' bol už definovaný ako symbol triedenia"
 
-#: locale/programs/ld-collate.c:440
+#: locale/programs/ld-collate.c:442
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' bol už definovaný ako element triedenia"
 
-#: locale/programs/ld-collate.c:471 locale/programs/ld-collate.c:497
+#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' a `backward' sa navzájom vylučujú"
 
-#: locale/programs/ld-collate.c:481 locale/programs/ld-collate.c:507
-#: locale/programs/ld-collate.c:523
+#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509
+#: locale/programs/ld-collate.c:525
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' spomenuté viac ako raz v definícii váhy %d"
 
-#: locale/programs/ld-collate.c:579
+#: locale/programs/ld-collate.c:581
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: priveľa pravidiel; prvý záznam mal iba %d"
 
-#: locale/programs/ld-collate.c:615
+#: locale/programs/ld-collate.c:617
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: nedostatočný počet pravidiel triedenia"
 
-#: locale/programs/ld-collate.c:780
+#: locale/programs/ld-collate.c:782
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: prázdny reťazec váhy nie je povolený"
 
-#: locale/programs/ld-collate.c:875
+#: locale/programs/ld-collate.c:877
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: váhy musia ako názov použiť rovnaký symbol pokračovania"
 
-#: locale/programs/ld-collate.c:931
+#: locale/programs/ld-collate.c:933
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: priveľa hodnôt"
 
-#: locale/programs/ld-collate.c:1051 locale/programs/ld-collate.c:1226
+#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "poradie pre `%.*s' je už definované na %s:%Zu"
 
-#: locale/programs/ld-collate.c:1101
+#: locale/programs/ld-collate.c:1103
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: počiatočný a koncový symbol rozsahu musia zastupovať znaky"
 
-#: locale/programs/ld-collate.c:1128
+#: locale/programs/ld-collate.c:1130
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr ""
 "%s: bajtové sekvencie prvého a posledného znaku musia mať rovnakú dĺžku"
 
-#: locale/programs/ld-collate.c:1170
+#: locale/programs/ld-collate.c:1172
 #, c-format
 msgid ""
 "%s: byte sequence of first character of range is not lower than that of the "
 "last character"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1295
+#: locale/programs/ld-collate.c:1297
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 "%s: pokračovanie symbolického rozsahu nesmie priamo nasledoť `order_start'"
 
-#: locale/programs/ld-collate.c:1299
+#: locale/programs/ld-collate.c:1301
 #, c-format
 msgid ""
 "%s: symbolic range ellipsis must not be directly followed by `order_end'"
@@ -1830,22 +1892,22 @@
 "%s: pokračovanie symbolického rozsahu nesmie byť priamo nasledované "
 "`order_end'"
 
-#: locale/programs/ld-collate.c:1319 locale/programs/ld-ctype.c:1477
+#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' a `%.*s' sú neprípustné názvy pre symbolický rozsah"
 
-#: locale/programs/ld-collate.c:1369 locale/programs/ld-collate.c:3858
+#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3861
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: poradie pre `%.*s' je už definované na %s:%Zu"
 
-#: locale/programs/ld-collate.c:1378
+#: locale/programs/ld-collate.c:1380
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' musí byť znak"
 
-#: locale/programs/ld-collate.c:1573
+#: locale/programs/ld-collate.c:1575
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
@@ -1853,354 +1915,354 @@
 "%s: `position' musí byť pre danú úroveň použitá vo všetkých sekciách, alebo "
 "v žiadnej"
 
-#: locale/programs/ld-collate.c:1598
+#: locale/programs/ld-collate.c:1600
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "symbol `%s' nie je definovaný"
 
-#: locale/programs/ld-collate.c:1674 locale/programs/ld-collate.c:1780
+#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "symbol `%s' má rovnaké kódovanie ako"
 
-#: locale/programs/ld-collate.c:1678 locale/programs/ld-collate.c:1784
+#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786
 #, c-format
 msgid "symbol `%s'"
 msgstr "symbol `%s'"
 
-#: locale/programs/ld-collate.c:1826
+#: locale/programs/ld-collate.c:1828
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "neexistuje definícia pre `UNDEFINED'"
 
-#: locale/programs/ld-collate.c:1855
+#: locale/programs/ld-collate.c:1857
 #, c-format
 msgid "too many errors; giving up"
 msgstr "príliš veľa chýb; vzdávam to"
 
-#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4046
+#: locale/programs/ld-collate.c:2661 locale/programs/ld-collate.c:4049
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2677
+#: locale/programs/ld-collate.c:2679
 #, c-format
 msgid "%s: more then one 'else'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2852
+#: locale/programs/ld-collate.c:2854
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: duplicitná definícia `%s'"
 
-#: locale/programs/ld-collate.c:2888
+#: locale/programs/ld-collate.c:2890
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: duplicitná deklarácia sekcie `%s'"
 
-#: locale/programs/ld-collate.c:3024
+#: locale/programs/ld-collate.c:3026
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: neznámy znak v názve symbolu triedenia"
 
-#: locale/programs/ld-collate.c:3153
+#: locale/programs/ld-collate.c:3155
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: neznámy znak v názve ekvivalentnej definície"
 
-#: locale/programs/ld-collate.c:3164
+#: locale/programs/ld-collate.c:3166
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: neznámy znak v hodnote ekvivalentnej definície"
 
-#: locale/programs/ld-collate.c:3174
+#: locale/programs/ld-collate.c:3176
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: neznámy symbol `%s' v ekvivalentnej definícii"
 
-#: locale/programs/ld-collate.c:3183
+#: locale/programs/ld-collate.c:3185
 msgid "error while adding equivalent collating symbol"
 msgstr "chyba pri pridávaní ekvivalentného symbolu triedenia"
 
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3223
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "duplicitná definícia skriptu `%s'"
 
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3271
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3298
+#: locale/programs/ld-collate.c:3300
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: viacnásobná definícia poradia pre sekciu `%s'"
 
-#: locale/programs/ld-collate.c:3326
+#: locale/programs/ld-collate.c:3328
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: chybný počet pravidiel triedenia"
 
-#: locale/programs/ld-collate.c:3353
+#: locale/programs/ld-collate.c:3355
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: viacnásobná definícia poradia pre sekciu bez mena"
 
-#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
-#: locale/programs/ld-collate.c:3900
+#: locale/programs/ld-collate.c:3410 locale/programs/ld-collate.c:3540
+#: locale/programs/ld-collate.c:3903
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: chýbajúce kľúčové slovo `order_end'"
 
-#: locale/programs/ld-collate.c:3470
+#: locale/programs/ld-collate.c:3473
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: poradie pre symbol triedenia `%.*s' ešte nebolo definované"
 
-#: locale/programs/ld-collate.c:3488
+#: locale/programs/ld-collate.c:3491
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: poradie pre element triedenia `%.*s' ešte nebolo definované"
 
-#: locale/programs/ld-collate.c:3499
+#: locale/programs/ld-collate.c:3502
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: nie je možné preradiť za %.*s: neznámy symbol"
 
-#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
+#: locale/programs/ld-collate.c:3554 locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: chýbajúce kľúčové slovo `reorder-end'"
 
-#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
+#: locale/programs/ld-collate.c:3588 locale/programs/ld-collate.c:3786
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: neznáma sekcia `%.*s'"
 
-#: locale/programs/ld-collate.c:3650
+#: locale/programs/ld-collate.c:3653
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: zlý symbol <%.*s>"
 
-#: locale/programs/ld-collate.c:3846
+#: locale/programs/ld-collate.c:3849
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: `%s' nemôže byť koncovým znakom rozsahu pokračovania"
 
-#: locale/programs/ld-collate.c:3896
+#: locale/programs/ld-collate.c:3899
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: prázdny popis kategórie nie je povolený"
 
-#: locale/programs/ld-collate.c:3915
+#: locale/programs/ld-collate.c:3918
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: chýbajúce kľúčové slovo `reorder-sections-end'"
 
-#: locale/programs/ld-collate.c:4079
+#: locale/programs/ld-collate.c:4082
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:4097
+#: locale/programs/ld-collate.c:4100
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:439
+#: locale/programs/ld-ctype.c:440
 #, c-format
 msgid "No character set name specified in charmap"
 msgstr "V znakovej mape nie je zadaný názov znakovej sady"
 
-#: locale/programs/ld-ctype.c:468
+#: locale/programs/ld-ctype.c:469
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "znak L'\\u%0*x' v triede `%s' musí byť v triede `%s'"
 
-#: locale/programs/ld-ctype.c:483
+#: locale/programs/ld-ctype.c:484
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "znak L'\\u%0*x' v triede `%s' nesmie byť v triede `%s'"
 
-#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555
+#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "vnútorná chyba %s na riadku %u"
 
-#: locale/programs/ld-ctype.c:526
+#: locale/programs/ld-ctype.c:527
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "znak '%s' v triede `%s' musí byť v triede `%s'"
 
-#: locale/programs/ld-ctype.c:542
+#: locale/programs/ld-ctype.c:543
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "znak '%s' v triede `%s' nesmie byť v triede `%s'"
 
-#: locale/programs/ld-ctype.c:572 locale/programs/ld-ctype.c:610
+#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> znak nie je v triede `%s'"
 
-#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621
+#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> znak nesmie byť v triede `%s'"
 
-#: locale/programs/ld-ctype.c:599
+#: locale/programs/ld-ctype.c:600
 #, c-format
 msgid "character <SP> not defined in character map"
 msgstr "znak <SP> nie je definovaný v znakovej sade"
 
-#: locale/programs/ld-ctype.c:714
+#: locale/programs/ld-ctype.c:736
 #, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr "kategória `digit' neobsahuje záznamy v skupinách po desiatich"
 
-#: locale/programs/ld-ctype.c:763
+#: locale/programs/ld-ctype.c:785
 #, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 "neboli definované žiadne vstupné číslice a v znakovej mape nie je žiadne zo "
 "štandardných mien"
 
-#: locale/programs/ld-ctype.c:828
+#: locale/programs/ld-ctype.c:850
 #, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "nie všetky znaky použité v `outdigit' sú dostupné v znakovej mape"
 
-#: locale/programs/ld-ctype.c:845
+#: locale/programs/ld-ctype.c:867
 #, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "nie všetky znaky použité v `outdigit' sú dostupné v repertoári"
 
-#: locale/programs/ld-ctype.c:1245
+#: locale/programs/ld-ctype.c:1270
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "trieda znakov `%s' je už definovaná"
 
-#: locale/programs/ld-ctype.c:1251
+#: locale/programs/ld-ctype.c:1276
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "limit implementácie: maximálne množstvo tried znakov je %Zd"
 
-#: locale/programs/ld-ctype.c:1277
+#: locale/programs/ld-ctype.c:1302
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "znaková sada `%s' je už definovaná"
 
-#: locale/programs/ld-ctype.c:1283
+#: locale/programs/ld-ctype.c:1308
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "limit implementácie: maximálne množstvo sád znakov je %d"
 
-#: locale/programs/ld-ctype.c:1548 locale/programs/ld-ctype.c:1673
-#: locale/programs/ld-ctype.c:1779 locale/programs/ld-ctype.c:2471
-#: locale/programs/ld-ctype.c:3467
+#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698
+#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2496
+#: locale/programs/ld-ctype.c:3492
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: pole `%s' neobsahuje presne desať položiek"
 
-#: locale/programs/ld-ctype.c:1576 locale/programs/ld-ctype.c:2150
+#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "to-value <U%0*X> rozsahu je menšia ako from-value <U%0*X>"
 
-#: locale/programs/ld-ctype.c:1703
+#: locale/programs/ld-ctype.c:1728
 msgid "start and end character sequence of range must have the same length"
 msgstr "úvodná a koncová znaková sekvencia rozsahu musia mať rovnakú dĺžku"
 
-#: locale/programs/ld-ctype.c:1710
+#: locale/programs/ld-ctype.c:1735
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "to-value sekvencia znakov je menšia ako sekvencia from-value"
 
-#: locale/programs/ld-ctype.c:2070 locale/programs/ld-ctype.c:2121
+#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146
 msgid "premature end of `translit_ignore' definition"
 msgstr "predčasný koniec definície `translit_ignore'"
 
-#: locale/programs/ld-ctype.c:2076 locale/programs/ld-ctype.c:2127
-#: locale/programs/ld-ctype.c:2169
+#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152
+#: locale/programs/ld-ctype.c:2194
 msgid "syntax error"
 msgstr "chyba syntaxe"
 
-#: locale/programs/ld-ctype.c:2303
+#: locale/programs/ld-ctype.c:2328
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: chyba syntaxe v definícii novej triedy znakov"
 
-#: locale/programs/ld-ctype.c:2318
+#: locale/programs/ld-ctype.c:2343
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: chyba syntaxe v definícii novej znakovej mapy"
 
-#: locale/programs/ld-ctype.c:2493
+#: locale/programs/ld-ctype.c:2518
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 "rozsah pokračovania musí byť označený dvomi operandami rovnakého typu"
 
-#: locale/programs/ld-ctype.c:2502
+#: locale/programs/ld-ctype.c:2527
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
 "v symbolickom rozsahu hodnôt nesmie byť použité absolútne pokračovanie `...'"
 
-#: locale/programs/ld-ctype.c:2517
+#: locale/programs/ld-ctype.c:2542
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 "v rozsahu hodnôt UCS treba použiť hexadecimálne symbolické pokračovanie `..'"
 
-#: locale/programs/ld-ctype.c:2531
+#: locale/programs/ld-ctype.c:2556
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 "v rozsahu hodnôt kódov znakov treba použiť absolútne pokračovanie `...'"
 
-#: locale/programs/ld-ctype.c:2682
+#: locale/programs/ld-ctype.c:2707
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "duplicitná definícia mapovania `%s'"
 
-#: locale/programs/ld-ctype.c:2768 locale/programs/ld-ctype.c:2912
+#: locale/programs/ld-ctype.c:2793 locale/programs/ld-ctype.c:2937
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: sekcia `translit_start' nekončí `translit_end'"
 
-#: locale/programs/ld-ctype.c:2863
+#: locale/programs/ld-ctype.c:2888
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: duplicitná definícia `default_missing'"
 
-#: locale/programs/ld-ctype.c:2868
+#: locale/programs/ld-ctype.c:2893
 msgid "previous definition was here"
 msgstr "predchádzajúca definícia bola tu"
 
-#: locale/programs/ld-ctype.c:2890
+#: locale/programs/ld-ctype.c:2915
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: nenájdená zobraziteľná definícia `default_missing'"
 
-#: locale/programs/ld-ctype.c:3043 locale/programs/ld-ctype.c:3127
-#: locale/programs/ld-ctype.c:3147 locale/programs/ld-ctype.c:3168
-#: locale/programs/ld-ctype.c:3189 locale/programs/ld-ctype.c:3210
-#: locale/programs/ld-ctype.c:3231 locale/programs/ld-ctype.c:3271
-#: locale/programs/ld-ctype.c:3292 locale/programs/ld-ctype.c:3359
-#: locale/programs/ld-ctype.c:3401 locale/programs/ld-ctype.c:3426
+#: locale/programs/ld-ctype.c:3068 locale/programs/ld-ctype.c:3152
+#: locale/programs/ld-ctype.c:3172 locale/programs/ld-ctype.c:3193
+#: locale/programs/ld-ctype.c:3214 locale/programs/ld-ctype.c:3235
+#: locale/programs/ld-ctype.c:3256 locale/programs/ld-ctype.c:3296
+#: locale/programs/ld-ctype.c:3317 locale/programs/ld-ctype.c:3384
+#: locale/programs/ld-ctype.c:3426 locale/programs/ld-ctype.c:3451
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: znak `%s' nie je definovaný a je potrebný ako implicitná hodnota"
 
-#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3132
-#: locale/programs/ld-ctype.c:3152 locale/programs/ld-ctype.c:3173
-#: locale/programs/ld-ctype.c:3194 locale/programs/ld-ctype.c:3215
-#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3276
-#: locale/programs/ld-ctype.c:3297 locale/programs/ld-ctype.c:3364
+#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3157
+#: locale/programs/ld-ctype.c:3177 locale/programs/ld-ctype.c:3198
+#: locale/programs/ld-ctype.c:3219 locale/programs/ld-ctype.c:3240
+#: locale/programs/ld-ctype.c:3261 locale/programs/ld-ctype.c:3301
+#: locale/programs/ld-ctype.c:3322 locale/programs/ld-ctype.c:3389
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: znak `%s' v znakovej mape nie je vyjadriteľný jedným bajtom"
 
-#: locale/programs/ld-ctype.c:3408 locale/programs/ld-ctype.c:3433
+#: locale/programs/ld-ctype.c:3433 locale/programs/ld-ctype.c:3458
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
@@ -2208,7 +2270,7 @@
 "%s: znak `%s' je potrebný ako prednastavená hodnota nevyjadriteľná jedným "
 "bajtom"
 
-#: locale/programs/ld-ctype.c:3489
+#: locale/programs/ld-ctype.c:3514
 #, c-format
 msgid ""
 "no output digits defined and none of the standard names in the charmap"
@@ -2216,22 +2278,22 @@
 "neboli definované žiadne výstupné číslice a v znakovej mape nie je žiadne zo "
 "štandardných mien"
 
-#: locale/programs/ld-ctype.c:3780
+#: locale/programs/ld-ctype.c:3805
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: transliteračné údaje prostredia `%s' nie sú dostupné"
 
-#: locale/programs/ld-ctype.c:3881
+#: locale/programs/ld-ctype.c:3906
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: tabuľka triedy \"%s\": %lu bajtov\n"
 
-#: locale/programs/ld-ctype.c:3950
+#: locale/programs/ld-ctype.c:3975
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: tabuľka mapy \"%s\": %lu bajtov\n"
 
-#: locale/programs/ld-ctype.c:4083
+#: locale/programs/ld-ctype.c:4108
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: tabuľka šírky: %lu bajtov\n"
@@ -2429,6 +2491,11 @@
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "symbol `%.*s' nie je v mape repertoáru"
 
+#: locale/programs/locale-spec.c:131
+#, c-format
+msgid "unknown name \"%s\""
+msgstr ""
+
 #: locale/programs/locale.c:74
 msgid "System information:"
 msgstr "Systémové informácie:"
@@ -2601,14 +2668,10 @@
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
-"                       repertoire maps: %s\n"
-"                       locale path    : %s\n"
+"\t\t       repertoire maps: %s\n"
+"\t\t       locale path    : %s\n"
 "%s"
 msgstr ""
-"Systémový adresár pre mapy znakov:    : %s\n"
-"                      mapy repertoárov: %s\n"
-"                      cestu locale    : %s\n"
-"%s"
 
 #: locale/programs/localedef.c:567
 #, c-format
@@ -2620,131 +2683,136 @@
 msgid "cannot add already read locale `%s' a second time"
 msgstr "nie je možné znovu pridať už načítané prostredie `%s'"
 
-#: locale/programs/locarchive.c:88 locale/programs/locarchive.c:261
+#: locale/programs/locarchive.c:92 locale/programs/locarchive.c:338
 #, c-format
 msgid "cannot create temporary file"
 msgstr "nie je možné vytvoriť dočasný súbor"
 
-#: locale/programs/locarchive.c:118 locale/programs/locarchive.c:307
+#: locale/programs/locarchive.c:122 locale/programs/locarchive.c:384
 #, c-format
 msgid "cannot initialize archive file"
 msgstr "nie je možné inicializovať archívny súbor"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:314
+#: locale/programs/locarchive.c:129 locale/programs/locarchive.c:391
 #, c-format
 msgid "cannot resize archive file"
 msgstr "nie je možné zmeniť veľkosť archívneho súboru"
 
-#: locale/programs/locarchive.c:134 locale/programs/locarchive.c:323
-#: locale/programs/locarchive.c:527
+#: locale/programs/locarchive.c:152 locale/programs/locarchive.c:414
+#: locale/programs/locarchive.c:633
 #, c-format
 msgid "cannot map archive header"
 msgstr "nie je možné namapovať hlavičku archívu"
 
-#: locale/programs/locarchive.c:156
+#: locale/programs/locarchive.c:174
 #, c-format
 msgid "failed to create new locale archive"
 msgstr "zlyhalo vytvorenie nového archívu národného prostredia"
 
-#: locale/programs/locarchive.c:168
+#: locale/programs/locarchive.c:186
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr "nie je možné zmeniť mód nového archívu národného prostredia"
 
-#: locale/programs/locarchive.c:255
+#: locale/programs/locarchive.c:285
+#, c-format
+msgid "cannot read data from locale archive"
+msgstr ""
+
+#: locale/programs/locarchive.c:318
 #, c-format
 msgid "cannot map locale archive file"
 msgstr "nie je možné namapovať súbor archívu národného prostredia"
 
-#: locale/programs/locarchive.c:331
+#: locale/programs/locarchive.c:422
 #, c-format
 msgid "cannot lock new archive"
 msgstr "nie je možné uzamknúť nový archív"
 
-#: locale/programs/locarchive.c:396
+#: locale/programs/locarchive.c:488
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr "nie je možné rozšíriť súbor archívu národného prostredia"
 
-#: locale/programs/locarchive.c:405
+#: locale/programs/locarchive.c:497
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr ""
 "nie je možné zmeniť mód archívu národného prostredia s upravenou veľkosťou"
 
-#: locale/programs/locarchive.c:413
+#: locale/programs/locarchive.c:505
 #, c-format
 msgid "cannot rename new archive"
 msgstr "nie je možné premenovať nový archív"
 
-#: locale/programs/locarchive.c:466
+#: locale/programs/locarchive.c:558
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr "nie je možné otvoriť archív národného prostredia \"%s\""
 
-#: locale/programs/locarchive.c:471
+#: locale/programs/locarchive.c:563
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr "nie je možné zistiť stav archívu národného prostredia \"%s\""
 
-#: locale/programs/locarchive.c:490
+#: locale/programs/locarchive.c:582
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr "nie je možné uzamknúť archív národného prostredia \"%s\""
 
-#: locale/programs/locarchive.c:513
+#: locale/programs/locarchive.c:605
 #, c-format
 msgid "cannot read archive header"
 msgstr "nie je možné prečítať hlavičku archívu"
 
-#: locale/programs/locarchive.c:573
+#: locale/programs/locarchive.c:680
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "národné prostredie `%s' už existuje"
 
-#: locale/programs/locarchive.c:804 locale/programs/locarchive.c:819
-#: locale/programs/locarchive.c:831 locale/programs/locarchive.c:843
+#: locale/programs/locarchive.c:942 locale/programs/locarchive.c:957
+#: locale/programs/locarchive.c:969 locale/programs/locarchive.c:981
 #: locale/programs/locfile.c:344
 #, c-format
 msgid "cannot add to locale archive"
 msgstr "nie je možné pridať do archívu národného prostredia"
 
-#: locale/programs/locarchive.c:998
+#: locale/programs/locarchive.c:1139
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr "súbor aliasu národného prostredia `%s' nebol nájdený"
 
-#: locale/programs/locarchive.c:1142
+#: locale/programs/locarchive.c:1289
 #, c-format
 msgid "Adding %s\n"
 msgstr "Pridávam %s\n"
 
-#: locale/programs/locarchive.c:1148
+#: locale/programs/locarchive.c:1295
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "zistenie stavu \"%s\" zlyhalo: %s: ignorované"
 
-#: locale/programs/locarchive.c:1154
+#: locale/programs/locarchive.c:1301
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "\"%s\" nie je adresár; ignorované"
 
-#: locale/programs/locarchive.c:1161
+#: locale/programs/locarchive.c:1308
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "nie je možné otvoriť adresár \"%s\": %s: ignorované"
 
-#: locale/programs/locarchive.c:1233
+#: locale/programs/locarchive.c:1380
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "nekompletná skupina súborov národných prostredí v \"%s\""
 
-#: locale/programs/locarchive.c:1297
+#: locale/programs/locarchive.c:1444
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "nie je možné načítať všetky súbory v \"%s\": ignorované"
 
-#: locale/programs/locarchive.c:1367
+#: locale/programs/locarchive.c:1514
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "národné prostredie \"%s\" nie je v archíve"
@@ -2810,7 +2878,7 @@
 msgid "repertoire map file `%s' not found"
 msgstr "súbor mapy repertoáru `%s' nebol nájdený"
 
-#: login/programs/pt_chown.c:74
+#: login/programs/pt_chown.c:78
 #, c-format
 msgid ""
 "Set the owner, group and access permission of the slave pseudo terminal "
@@ -2819,7 +2887,7 @@
 "to be run directly from the command line.\n"
 msgstr ""
 
-#: login/programs/pt_chown.c:84
+#: login/programs/pt_chown.c:88
 #, c-format
 msgid ""
 "The owner is set to the current user, the group is set to `%s', and the "
@@ -2828,42 +2896,38 @@
 "%s"
 msgstr ""
 
-#: login/programs/pt_chown.c:161
+#: login/programs/pt_chown.c:192
 #, c-format
 msgid "too many arguments"
 msgstr ""
 
-#: login/programs/pt_chown.c:169
+#: login/programs/pt_chown.c:200
 #, c-format
 msgid "needs to be installed setuid `root'"
 msgstr ""
 
-#: malloc/mcheck.c:330
+#: malloc/mcheck.c:350
 msgid "memory is consistent, library is buggy\n"
 msgstr "pamäť je konzistentná, knižnica je chybná\n"
 
-#: malloc/mcheck.c:333
+#: malloc/mcheck.c:353
 msgid "memory clobbered before allocated block\n"
 msgstr "pamäť pred prideleným blokom prepísaná\n"
 
-#: malloc/mcheck.c:336
+#: malloc/mcheck.c:356
 msgid "memory clobbered past end of allocated block\n"
 msgstr "pamäť za koncom prideleného bloku prepísaná\n"
 
-#: malloc/mcheck.c:339
+#: malloc/mcheck.c:359
 msgid "block freed twice\n"
 msgstr "blok uvoľnený dvakrát\n"
 
-#: malloc/mcheck.c:342
+#: malloc/mcheck.c:362
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr "pochybný mcheck_status, knižnica má chyby\n"
 
-#: malloc/memusage.sh:27
-msgid "Try \\`memusage --help' for more information."
-msgstr ""
-
 #: malloc/memusage.sh:33
-msgid "memusage: option \\`$1' requires an argument"
+msgid "%s: option '%s' requires an argument\\n"
 msgstr ""
 
 #: malloc/memusage.sh:39
@@ -2901,9 +2965,9 @@
 msgid ""
 "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--"
 "unbuffered]\n"
-"            [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
-"            [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
-"            PROGRAM [PROGRAMOPTION]..."
+"\t    [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
+"\t    [--title=STRING] [--x-size=SIZE] [--y-size=SIZE]\n"
+"\t    PROGRAM [PROGRAMOPTION]..."
 msgstr ""
 
 #: malloc/memusage.sh:193
@@ -2962,7 +3026,7 @@
 msgid "unable to free arguments"
 msgstr "nie je možné uvoľniť argumenty"
 
-#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:133
+#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:132
 #: sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr "Úspech"
@@ -3597,12 +3661,12 @@
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: nie je možné zístiť adresu servera\n"
 
-#: nscd/aicache.c:82 nscd/hstcache.c:481
+#: nscd/aicache.c:83 nscd/hstcache.c:492
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "Nenájdené \"%s\" v cache počítačov!"
 
-#: nscd/aicache.c:84 nscd/hstcache.c:483
+#: nscd/aicache.c:85 nscd/hstcache.c:494
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr ""
@@ -3616,267 +3680,267 @@
 msgid " (first)"
 msgstr ""
 
-#: nscd/cache.c:286 nscd/connections.c:866
+#: nscd/cache.c:276 nscd/connections.c:861
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "nie je možné vykonať stat() súboru `%s': %s"
 
-#: nscd/cache.c:328
+#: nscd/cache.c:318
 #, c-format
 msgid "pruning %s cache; time %ld"
 msgstr ""
 
-#: nscd/cache.c:357
+#: nscd/cache.c:347
 #, c-format
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr ""
 
-#: nscd/connections.c:570
+#: nscd/connections.c:565
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr ""
 
-#: nscd/connections.c:578
+#: nscd/connections.c:573
 msgid "uninitialized header"
 msgstr ""
 
-#: nscd/connections.c:583
+#: nscd/connections.c:578
 msgid "header size does not match"
 msgstr ""
 
-#: nscd/connections.c:593
+#: nscd/connections.c:588
 msgid "file size does not match"
 msgstr ""
 
-#: nscd/connections.c:610
+#: nscd/connections.c:605
 msgid "verification failed"
 msgstr ""
 
-#: nscd/connections.c:624
+#: nscd/connections.c:619
 #, c-format
 msgid ""
 "suggested size of table for database %s larger than the persistent "
 "database's table"
 msgstr ""
 
-#: nscd/connections.c:635 nscd/connections.c:720
+#: nscd/connections.c:630 nscd/connections.c:715
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr ""
 
-#: nscd/connections.c:651
+#: nscd/connections.c:646
 #, c-format
 msgid "cannot access '%s'"
 msgstr ""
 
-#: nscd/connections.c:699
+#: nscd/connections.c:694
 #, c-format
 msgid ""
 "database for %s corrupted or simultaneously used; remove %s manually if "
 "necessary and restart"
 msgstr ""
 
-#: nscd/connections.c:706
+#: nscd/connections.c:701
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr ""
 
-#: nscd/connections.c:709
+#: nscd/connections.c:704
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr ""
 
-#: nscd/connections.c:780
+#: nscd/connections.c:775
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr ""
 
-#: nscd/connections.c:819
+#: nscd/connections.c:814
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:902
+#: nscd/connections.c:897
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "nie je možné otvoriť socket `%s'"
 
-#: nscd/connections.c:922
+#: nscd/connections.c:917
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr ""
 
-#: nscd/connections.c:930
+#: nscd/connections.c:925
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr ""
 
-#: nscd/connections.c:943
+#: nscd/connections.c:938
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "nie je možné povoliť socketu prijímať spojenia: %s"
 
-#: nscd/connections.c:1043
+#: nscd/connections.c:1039
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr ""
 
-#: nscd/connections.c:1055
+#: nscd/connections.c:1051
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr ""
 "nie je možné spracovať starú verziu žiadosti %d; aktuálna verzia je %d"
 
-#: nscd/connections.c:1077
+#: nscd/connections.c:1073
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr ""
 
-#: nscd/connections.c:1082
+#: nscd/connections.c:1078
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr ""
 
-#: nscd/connections.c:1087
+#: nscd/connections.c:1083
 msgid "request not handled due to missing permission"
 msgstr ""
 
-#: nscd/connections.c:1125 nscd/connections.c:1178
+#: nscd/connections.c:1121 nscd/connections.c:1174
 #, c-format
 msgid "cannot write result: %s"
 msgstr "nie je možné zapísať výsledok: %s"
 
-#: nscd/connections.c:1261
+#: nscd/connections.c:1257
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "chyba pri získaní id volajúceho: %s"
 
-#: nscd/connections.c:1320
+#: nscd/connections.c:1316
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1334
+#: nscd/connections.c:1330
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1374
+#: nscd/connections.c:1370
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1384
+#: nscd/connections.c:1380
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1397
+#: nscd/connections.c:1393
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1429
+#: nscd/connections.c:1439
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1438
+#: nscd/connections.c:1448
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr ""
 
-#: nscd/connections.c:1644
+#: nscd/connections.c:1641
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "neúplné čítanie žiadosti: `%s'"
 
-#: nscd/connections.c:1677
+#: nscd/connections.c:1674
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "dĺžka kľúča v žiadosti príliš dlhá: %d"
 
-#: nscd/connections.c:1690
+#: nscd/connections.c:1687
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "neúplné čítanie kľúča žiadosti: %s"
 
-#: nscd/connections.c:1699
+#: nscd/connections.c:1696
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: žiadosť prijatá (verzia = %d) z PID %ld"
 
-#: nscd/connections.c:1704
+#: nscd/connections.c:1701
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: žiadosť prijatá (verzia = %d)"
 
-#: nscd/connections.c:1903 nscd/connections.c:2101
+#: nscd/connections.c:1901 nscd/connections.c:2099
 #, c-format
 msgid "disabled inotify after read error %d"
 msgstr ""
 
-#: nscd/connections.c:2230
+#: nscd/connections.c:2228
 msgid "could not initialize conditional variable"
 msgstr ""
 
-#: nscd/connections.c:2238
+#: nscd/connections.c:2236
 msgid "could not start clean-up thread; terminating"
 msgstr ""
 
-#: nscd/connections.c:2252
+#: nscd/connections.c:2250
 msgid "could not start any worker thread; terminating"
 msgstr ""
 
-#: nscd/connections.c:2303 nscd/connections.c:2304 nscd/connections.c:2321
-#: nscd/connections.c:2330 nscd/connections.c:2348 nscd/connections.c:2359
-#: nscd/connections.c:2370
+#: nscd/connections.c:2301 nscd/connections.c:2302 nscd/connections.c:2319
+#: nscd/connections.c:2328 nscd/connections.c:2346 nscd/connections.c:2357
+#: nscd/connections.c:2368
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "Zlyhalo spustenie nscd ako používateľ '%s'"
 
-#: nscd/connections.c:2322
+#: nscd/connections.c:2320
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr ""
 
-#: nscd/connections.c:2331
+#: nscd/connections.c:2329
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist zlyhalo"
 
-#: nscd/connections.c:2349
+#: nscd/connections.c:2347
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups zlyhalo"
 
-#: nscd/grpcache.c:395 nscd/hstcache.c:430 nscd/initgrcache.c:416
-#: nscd/pwdcache.c:400 nscd/servicescache.c:343
+#: nscd/grpcache.c:383 nscd/hstcache.c:439 nscd/initgrcache.c:406
+#: nscd/pwdcache.c:378 nscd/servicescache.c:332
 #, c-format
 msgid "short write in %s: %s"
 msgstr "neúplný zápis v %s: %s"
 
-#: nscd/grpcache.c:438 nscd/initgrcache.c:78
+#: nscd/grpcache.c:428 nscd/initgrcache.c:78
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "Nenájdené \"%s\" v cache skupín!"
 
-#: nscd/grpcache.c:440 nscd/initgrcache.c:80
+#: nscd/grpcache.c:430 nscd/initgrcache.c:80
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr ""
 
-#: nscd/grpcache.c:517
+#: nscd/grpcache.c:509
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "Neplatné číselné gid \"%s\"!"
 
-#: nscd/mem.c:457
+#: nscd/mem.c:431
 #, c-format
 msgid "freed %zu bytes in %s cache"
 msgstr ""
 
-#: nscd/mem.c:594
+#: nscd/mem.c:574
 #, c-format
 msgid "no more memory for database '%s'"
 msgstr ""
@@ -3926,7 +3990,7 @@
 msgid "Name Service Cache Daemon."
 msgstr "Démon cache služby názvov."
 
-#: nscd/nscd.c:147 nss/getent.c:876 nss/makedb.c:123
+#: nscd/nscd.c:147 nss/getent.c:952 nss/makedb.c:123
 #, c-format
 msgid "wrong number of arguments"
 msgstr "chybný počet argumentov"
@@ -3955,7 +4019,7 @@
 msgid "Could not create log file"
 msgstr ""
 
-#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:172
+#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:174
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr "Táto voľba je dostupná iba superužívateľovi!"
@@ -3965,7 +4029,7 @@
 msgid "'%s' is not a known database"
 msgstr ""
 
-#: nscd/nscd.c:370 nscd/nscd_stat.c:191
+#: nscd/nscd.c:370 nscd/nscd_stat.c:193
 #, c-format
 msgid "write incomplete"
 msgstr "neúplný zápis"
@@ -4030,35 +4094,35 @@
 msgid "maximum file size for %s database too small"
 msgstr ""
 
-#: nscd/nscd_stat.c:141
+#: nscd/nscd_stat.c:143
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "nie je možné zapísať štatistiku: `%s'"
 
-#: nscd/nscd_stat.c:156
+#: nscd/nscd_stat.c:158
 msgid "yes"
 msgstr ""
 
-#: nscd/nscd_stat.c:157
+#: nscd/nscd_stat.c:159
 msgid "no"
 msgstr ""
 
-#: nscd/nscd_stat.c:168
+#: nscd/nscd_stat.c:170
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr "Len správca alebo %s má dostupnú túto voľbu!"
 
-#: nscd/nscd_stat.c:179
+#: nscd/nscd_stat.c:181
 #, c-format
 msgid "nscd not running!\n"
 msgstr "nscd nebeží!\n"
 
-#: nscd/nscd_stat.c:203
+#: nscd/nscd_stat.c:205
 #, c-format
 msgid "cannot read statistics data"
 msgstr "nie je možné načítať štatistické údaje"
 
-#: nscd/nscd_stat.c:206
+#: nscd/nscd_stat.c:208
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4069,27 +4133,27 @@
 "\n"
 "%15d  ladiaca úroveň servera\n"
 
-#: nscd/nscd_stat.c:230
+#: nscd/nscd_stat.c:232
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr "%3ud %2uh %2um %2lus  doba behu servera\n"
 
-#: nscd/nscd_stat.c:233
+#: nscd/nscd_stat.c:235
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr "    %2uh %2um %2lus  doba behu servera\n"
 
-#: nscd/nscd_stat.c:235
+#: nscd/nscd_stat.c:237
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr "        %2um %2lus  doba behu servera\n"
 
-#: nscd/nscd_stat.c:237
+#: nscd/nscd_stat.c:239
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr "            %2lus  doba behu servera\n"
 
-#: nscd/nscd_stat.c:239
+#: nscd/nscd_stat.c:241
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4097,9 +4161,10 @@
 "%15lu  number of times clients had to wait\n"
 "%15s  paranoia mode enabled\n"
 "%15lu  restart internal\n"
+"%15u  reload count\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:273
+#: nscd/nscd_stat.c:276
 #, c-format
 msgid ""
 "\n"
@@ -4127,17 +4192,17 @@
 "%15s  check /etc/%s for changes\n"
 msgstr ""
 
-#: nscd/pwdcache.c:443
+#: nscd/pwdcache.c:423
 #, c-format
 msgid "Haven't found \"%s\" in password cache!"
 msgstr "Nenájdené \"%s\" v cache hesiel!"
 
-#: nscd/pwdcache.c:445
+#: nscd/pwdcache.c:425
 #, c-format
 msgid "Reloading \"%s\" in password cache!"
 msgstr ""
 
-#: nscd/pwdcache.c:523
+#: nscd/pwdcache.c:506
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "Neplatné číselné uid \"%s\"!"
@@ -4233,43 +4298,47 @@
 "%15u  CAV misses\n"
 msgstr ""
 
-#: nscd/servicescache.c:390
+#: nscd/servicescache.c:381
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr ""
 
-#: nscd/servicescache.c:392
+#: nscd/servicescache.c:383
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr ""
 
-#: nss/getent.c:52
+#: nss/getent.c:54
 msgid "database [key ...]"
 msgstr "databáza [kľúč ...]"
 
-#: nss/getent.c:57
+#: nss/getent.c:59
 msgid "Service configuration to be used"
 msgstr "Konfigurácia služby, ktorá má byť použitá"
 
-#: nss/getent.c:62
+#: nss/getent.c:60
+msgid "disable IDN encoding"
+msgstr ""
+
+#: nss/getent.c:65
 msgid "Get entries from administrative database."
 msgstr ""
 
-#: nss/getent.c:143 nss/getent.c:408
+#: nss/getent.c:149 nss/getent.c:479
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "Enumerácia %s nie je podporované\n"
 
-#: nss/getent.c:794
+#: nss/getent.c:866
 #, c-format
 msgid "Unknown database name"
 msgstr ""
 
-#: nss/getent.c:820
+#: nss/getent.c:896
 msgid "Supported databases:\n"
 msgstr ""
 
-#: nss/getent.c:886
+#: nss/getent.c:962
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "Neznáma databáza %s\n"
@@ -4330,17 +4399,17 @@
 msgid "while reading database"
 msgstr ""
 
-#: posix/getconf.c:945
+#: posix/getconf.c:1036
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr "Použitie: %s [-v špecifikácia] meno_premennej [cesta]\n"
 
-#: posix/getconf.c:948
+#: posix/getconf.c:1039
 #, c-format
 msgid "       %s -a [pathname]\n"
 msgstr ""
 
-#: posix/getconf.c:1023
+#: posix/getconf.c:1115
 #, c-format
 msgid ""
 "Usage: getconf [-v SPEC] VAR\n"
@@ -4352,142 +4421,146 @@
 "\n"
 msgstr ""
 
-#: posix/getconf.c:1081
+#: posix/getconf.c:1173
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "neznáma špecifikácia \"%s\""
 
-#: posix/getconf.c:1109
+#: posix/getconf.c:1225
 #, c-format
 msgid "Couldn't execute %s"
 msgstr ""
 
-#: posix/getconf.c:1149 posix/getconf.c:1165
+#: posix/getconf.c:1269 posix/getconf.c:1285
 msgid "undefined"
 msgstr "nedefinované"
 
-#: posix/getconf.c:1187
+#: posix/getconf.c:1307
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "Nerozpoznaná premenná `%s'"
 
-#: posix/getopt.c:570 posix/getopt.c:586
+#: posix/getopt.c:594 posix/getopt.c:623
 #, c-format
-msgid "%s: option '%s' is ambiguous\n"
-msgstr "%s: voľba `%s' nie je jednoznačná\n"
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr ""
 
-#: posix/getopt.c:619 posix/getopt.c:623
+#: posix/getopt.c:664 posix/getopt.c:668
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: voľba `--%s' nedovoľuje použiť argument\n"
 
-#: posix/getopt.c:632 posix/getopt.c:637
+#: posix/getopt.c:677 posix/getopt.c:682
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: voľba `%c%s' nedovoľuje použiť argument\n"
 
-#: posix/getopt.c:680 posix/getopt.c:699 posix/getopt.c:1002
-#: posix/getopt.c:1021
+#: posix/getopt.c:725 posix/getopt.c:744
 #, c-format
-msgid "%s: option '%s' requires an argument\n"
-msgstr "%s: voľba `%s' vyžaduje argument\n"
+msgid "%s: option '--%s' requires an argument\n"
+msgstr ""
 
-#: posix/getopt.c:737 posix/getopt.c:740
+#: posix/getopt.c:782 posix/getopt.c:785
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: nerozpoznaná voľba `--%s'\n"
 
-#: posix/getopt.c:748 posix/getopt.c:751
+#: posix/getopt.c:793 posix/getopt.c:796
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: nerozpoznaná voľba `%c%s'\n"
 
-#: posix/getopt.c:800 posix/getopt.c:803
+#: posix/getopt.c:845 posix/getopt.c:848
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: chybná voľba -- %c\n"
 
-#: posix/getopt.c:853 posix/getopt.c:870 posix/getopt.c:1073
-#: posix/getopt.c:1091
+#: posix/getopt.c:898 posix/getopt.c:915 posix/getopt.c:1123
+#: posix/getopt.c:1141
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: voľba vyžaduje argument -- %c\n"
 
-#: posix/getopt.c:923 posix/getopt.c:939
+#: posix/getopt.c:971 posix/getopt.c:987
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: voľba `-W %s' nie je jednoznačná\n"
 
-#: posix/getopt.c:963 posix/getopt.c:981
+#: posix/getopt.c:1011 posix/getopt.c:1029
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: voľba `-W %s' nedovoľuje pouťiť argument\n"
 
-#: posix/regcomp.c:136
+#: posix/getopt.c:1050 posix/getopt.c:1068
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr ""
+
+#: posix/regcomp.c:135
 msgid "No match"
 msgstr "Žiadna zhoda"
 
-#: posix/regcomp.c:139
+#: posix/regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "Neprípustný regulérny výraz"
 
-#: posix/regcomp.c:142
+#: posix/regcomp.c:141
 msgid "Invalid collation character"
 msgstr "Neprípustný znak triedenia"
 
-#: posix/regcomp.c:145
+#: posix/regcomp.c:144
 msgid "Invalid character class name"
 msgstr "Neprípustný názov triedy znakov"
 
-#: posix/regcomp.c:148
+#: posix/regcomp.c:147
 msgid "Trailing backslash"
 msgstr "Koncové spätné lomítko"
 
-#: posix/regcomp.c:151
+#: posix/regcomp.c:150
 msgid "Invalid back reference"
 msgstr "Neprípustný spätný odkaz"
 
-#: posix/regcomp.c:154
+#: posix/regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "Nepárová [ or [^"
 
-#: posix/regcomp.c:157
+#: posix/regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "Nepárová ( or \\("
 
-#: posix/regcomp.c:160
+#: posix/regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "Nepárová \\{"
 
-#: posix/regcomp.c:163
+#: posix/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "Neprípustný obsah \\{\\}"
 
-#: posix/regcomp.c:166
+#: posix/regcomp.c:165
 msgid "Invalid range end"
 msgstr "Neprípustný koniec rozsahu"
 
-#: posix/regcomp.c:169
+#: posix/regcomp.c:168
 msgid "Memory exhausted"
 msgstr "Pamäť vyčerpaná"
 
-#: posix/regcomp.c:172
+#: posix/regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "Neprípustný predchádzajúci regulérny výraz"
 
-#: posix/regcomp.c:175
+#: posix/regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "Predčasný koniec regulérneho výrazu"
 
-#: posix/regcomp.c:178
+#: posix/regcomp.c:177
 msgid "Regular expression too big"
 msgstr "Regulérny výraz príliš veľký"
 
-#: posix/regcomp.c:181
+#: posix/regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "Nepárová ) or \\)"
 
-#: posix/regcomp.c:681
+#: posix/regcomp.c:680
 msgid "No previous regular expression"
 msgstr "Žiadny predchádzajúci regulérny výraz"
 
@@ -4548,6 +4621,189 @@
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
 msgstr "%s: riadok %d: ignorujem koncové smetie `%s'\n"
 
+#: stdio-common/psiginfo-data.h:2
+msgid "Illegal opcode"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:3
+msgid "Illegal operand"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:4
+msgid "Illegal addressing mode"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:5
+msgid "Illegal trap"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:6
+msgid "Privileged opcode"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:7
+msgid "Privileged register"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:8
+msgid "Coprocessor error"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:9
+msgid "Internal stack error"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:12
+msgid "Integer divide by zero"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:13
+msgid "Integer overflow"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:14
+msgid "Floating-point divide by zero"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:15
+msgid "Floating-point overflow"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:16
+msgid "Floating-point underflow"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:17
+msgid "Floating-poing inexact result"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:18
+msgid "Invalid floating-point operation"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:19
+msgid "Subscript out of range"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:22
+msgid "Address not mapped to object"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:23
+msgid "Invalid permissions for mapped object"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:26
+msgid "Invalid address alignment"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:27
+msgid "Nonexisting physical address"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:28
+msgid "Object-specific hardware error"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:31
+msgid "Process breakpoint"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:32
+msgid "Process trace trap"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:35
+msgid "Child has exited"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:36
+msgid "Child has terminated abnormally and did not create a core file"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:37
+msgid "Child hat terminated abnormally and created a core file"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:38
+msgid "Traced child has trapped"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:39
+msgid "Child has stopped"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:40
+msgid "Stopped child has continued"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:43
+msgid "Data input available"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:44
+msgid "Output buffers available"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:45
+msgid "Input message available"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:46
+msgid "I/O error"
+msgstr "V/V chyba"
+
+#: stdio-common/psiginfo-data.h:47
+msgid "High priority input available"
+msgstr ""
+
+#: stdio-common/psiginfo-data.h:48
+msgid "Device disconnected"
+msgstr ""
+
+#: stdio-common/psiginfo.c:145
+msgid "Signal sent by kill()"
+msgstr ""
+
+#: stdio-common/psiginfo.c:148
+msgid "Signal sent by sigqueue()"
+msgstr ""
+
+#: stdio-common/psiginfo.c:151
+msgid "Signal generated by the expiration of a timer"
+msgstr ""
+
+#: stdio-common/psiginfo.c:154
+msgid "Signal generated by the completion of an asynchronous I/O request"
+msgstr ""
+
+#: stdio-common/psiginfo.c:158
+msgid ""
+"Signal generated by the arrival of a message on an empty message queue"
+msgstr ""
+
+#: stdio-common/psiginfo.c:163
+msgid "Signal sent by tkill()"
+msgstr ""
+
+#: stdio-common/psiginfo.c:168
+msgid ""
+"Signal generated by the completion of an asynchronous name lookup request"
+msgstr ""
+
+#: stdio-common/psiginfo.c:174
+msgid "Signal generated by the completion of an I/O request"
+msgstr ""
+
+#: stdio-common/psiginfo.c:180
+msgid "Signal sent by the kernel"
+msgstr ""
+
+#: stdio-common/psiginfo.c:204
+#, c-format
+msgid "Unknown signal %d\n"
+msgstr ""
+
 #: stdio-common/psignal.c:51
 #, c-format
 msgid "%s%sUnknown signal %d\n"
@@ -4557,7 +4813,7 @@
 msgid "Unknown signal"
 msgstr ""
 
-#: string/_strerror.c:45 sysdeps/mach/_strerror.c:87
+#: string/_strerror.c:47 sysdeps/mach/_strerror.c:87
 msgid "Unknown error "
 msgstr "Neznáma chyba "
 
@@ -4575,270 +4831,270 @@
 msgid "Unknown signal %d"
 msgstr "Neznámy signál %d"
 
-#: sunrpc/auth_unix.c:114 sunrpc/clnt_tcp.c:131 sunrpc/clnt_udp.c:143
-#: sunrpc/clnt_unix.c:128 sunrpc/svc_tcp.c:179 sunrpc/svc_tcp.c:218
-#: sunrpc/svc_udp.c:153 sunrpc/svc_unix.c:176 sunrpc/svc_unix.c:215
-#: sunrpc/xdr.c:566 sunrpc/xdr.c:718 sunrpc/xdr_array.c:106
-#: sunrpc/xdr_rec.c:156 sunrpc/xdr_ref.c:85
+#: sunrpc/auth_unix.c:113 sunrpc/clnt_tcp.c:125 sunrpc/clnt_udp.c:136
+#: sunrpc/clnt_unix.c:126 sunrpc/svc_tcp.c:173 sunrpc/svc_tcp.c:218
+#: sunrpc/svc_udp.c:147 sunrpc/svc_unix.c:174 sunrpc/svc_unix.c:215
+#: sunrpc/xdr.c:632 sunrpc/xdr.c:792 sunrpc/xdr_array.c:100
+#: sunrpc/xdr_rec.c:154 sunrpc/xdr_ref.c:79
 msgid "out of memory\n"
 msgstr ""
 
-#: sunrpc/auth_unix.c:350
+#: sunrpc/auth_unix.c:351
 msgid "auth_unix.c: Fatal marshalling problem"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:105 sunrpc/clnt_perr.c:121
+#: sunrpc/clnt_perr.c:98 sunrpc/clnt_perr.c:114
 #, c-format
 msgid "%s: %s; low version = %lu, high version = %lu"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:112
+#: sunrpc/clnt_perr.c:105
 #, c-format
 msgid "%s: %s; why = %s\n"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:114
+#: sunrpc/clnt_perr.c:107
 #, c-format
 msgid "%s: %s; why = (unknown authentication error - %d)\n"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:159
+#: sunrpc/clnt_perr.c:156
 msgid "RPC: Success"
 msgstr "RPC: Úspech"
 
-#: sunrpc/clnt_perr.c:162
+#: sunrpc/clnt_perr.c:159
 msgid "RPC: Can't encode arguments"
 msgstr "RPC: Nie je možné zakódovať argumenty"
 
-#: sunrpc/clnt_perr.c:166
+#: sunrpc/clnt_perr.c:163
 msgid "RPC: Can't decode result"
 msgstr "RPC: Nie je možné dekódovať výsledok"
 
-#: sunrpc/clnt_perr.c:170
+#: sunrpc/clnt_perr.c:167
 msgid "RPC: Unable to send"
 msgstr "RPC: Nie je možné vysielať"
 
-#: sunrpc/clnt_perr.c:174
+#: sunrpc/clnt_perr.c:171
 msgid "RPC: Unable to receive"
 msgstr "RPC: Nie je možné prijímať"
 
-#: sunrpc/clnt_perr.c:178
+#: sunrpc/clnt_perr.c:175
 msgid "RPC: Timed out"
 msgstr "RPC: Časovač vypršal"
 
-#: sunrpc/clnt_perr.c:182
+#: sunrpc/clnt_perr.c:179
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC: Nekompatibilné verzie RPC"
 
-#: sunrpc/clnt_perr.c:186
+#: sunrpc/clnt_perr.c:183
 msgid "RPC: Authentication error"
 msgstr "RPC: Chyba pri overení práv"
 
-#: sunrpc/clnt_perr.c:190
+#: sunrpc/clnt_perr.c:187
 msgid "RPC: Program unavailable"
 msgstr "RPC: Program nie je k dispozícii"
 
-#: sunrpc/clnt_perr.c:194
+#: sunrpc/clnt_perr.c:191
 msgid "RPC: Program/version mismatch"
 msgstr "RPC: Nesúhlasí program alebo verzia"
 
-#: sunrpc/clnt_perr.c:198
+#: sunrpc/clnt_perr.c:195
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: Procedúra nie je k dispozícii"
 
-#: sunrpc/clnt_perr.c:202
+#: sunrpc/clnt_perr.c:199
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC: Server nemôže dekódovať argumenty"
 
-#: sunrpc/clnt_perr.c:206
+#: sunrpc/clnt_perr.c:203
 msgid "RPC: Remote system error"
 msgstr "RPC: Chyba vzdialeného systému"
 
-#: sunrpc/clnt_perr.c:210
+#: sunrpc/clnt_perr.c:207
 msgid "RPC: Unknown host"
 msgstr "RPC: Neznámy počítač"
 
-#: sunrpc/clnt_perr.c:214
+#: sunrpc/clnt_perr.c:211
 msgid "RPC: Unknown protocol"
 msgstr "RPC: Neznámy protokol"
 
-#: sunrpc/clnt_perr.c:218
+#: sunrpc/clnt_perr.c:215
 msgid "RPC: Port mapper failure"
 msgstr "RPC: Chyba portmappera"
 
-#: sunrpc/clnt_perr.c:222
+#: sunrpc/clnt_perr.c:219
 msgid "RPC: Program not registered"
 msgstr "RPC: Program nie je registrovaný"
 
-#: sunrpc/clnt_perr.c:226
+#: sunrpc/clnt_perr.c:223
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: Zlyhalo (nešpecifikovaná chyba)"
 
-#: sunrpc/clnt_perr.c:267
+#: sunrpc/clnt_perr.c:264
 msgid "RPC: (unknown error code)"
 msgstr "RPC: (neznámny chybový kód)"
 
-#: sunrpc/clnt_perr.c:330
+#: sunrpc/clnt_perr.c:336
 msgid "Authentication OK"
 msgstr "Overenie práv úspešné"
 
-#: sunrpc/clnt_perr.c:333
+#: sunrpc/clnt_perr.c:339
 msgid "Invalid client credential"
 msgstr "Neplatné oprávnenie klienta"
 
-#: sunrpc/clnt_perr.c:337
+#: sunrpc/clnt_perr.c:343
 msgid "Server rejected credential"
 msgstr "Server odmietol oprávnenie"
 
-#: sunrpc/clnt_perr.c:341
+#: sunrpc/clnt_perr.c:347
 msgid "Invalid client verifier"
 msgstr "Neplatné overenie klienta"
 
-#: sunrpc/clnt_perr.c:345
+#: sunrpc/clnt_perr.c:351
 msgid "Server rejected verifier"
 msgstr "Server odmietol overenie"
 
-#: sunrpc/clnt_perr.c:349
+#: sunrpc/clnt_perr.c:355
 msgid "Client credential too weak"
 msgstr "Oprávnenia klienta sú nepostačujúce"
 
-#: sunrpc/clnt_perr.c:353
+#: sunrpc/clnt_perr.c:359
 msgid "Invalid server verifier"
 msgstr "Neplatné overenie servera"
 
-#: sunrpc/clnt_perr.c:357
+#: sunrpc/clnt_perr.c:363
 msgid "Failed (unspecified error)"
 msgstr "Zlyhalo (nešpecifikovaná chyba)"
 
-#: sunrpc/clnt_raw.c:117
+#: sunrpc/clnt_raw.c:115
 msgid "clnt_raw.c: fatal header serialization error"
 msgstr ""
 
-#: sunrpc/pm_getmaps.c:83
+#: sunrpc/pm_getmaps.c:77
 msgid "pmap_getmaps.c: rpc problem"
 msgstr ""
 
-#: sunrpc/pmap_clnt.c:129
+#: sunrpc/pmap_clnt.c:127
 msgid "Cannot register service"
 msgstr "Nie je možné zaregistrovať službu"
 
-#: sunrpc/pmap_rmt.c:248
+#: sunrpc/pmap_rmt.c:243
 msgid "Cannot create socket for broadcast rpc"
 msgstr "Nie je možné vytvoriť zásuvku pre broadcast rpc"
 
-#: sunrpc/pmap_rmt.c:255
+#: sunrpc/pmap_rmt.c:250
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "Nie je možné nastaviť pre socket voľbu SO_BROADCAST"
 
-#: sunrpc/pmap_rmt.c:307
+#: sunrpc/pmap_rmt.c:302
 msgid "Cannot send broadcast packet"
 msgstr "Nie je možné vyslať broadcast balík"
 
-#: sunrpc/pmap_rmt.c:332
+#: sunrpc/pmap_rmt.c:327
 msgid "Broadcast poll problem"
 msgstr "Problém pri volaní poll pre všeobecné vysielanie"
 
-#: sunrpc/pmap_rmt.c:345
+#: sunrpc/pmap_rmt.c:340
 msgid "Cannot receive reply to broadcast"
 msgstr "Nie je možné prijať odpoveď na broadcast"
 
-#: sunrpc/rpc_main.c:290
+#: sunrpc/rpc_main.c:288
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: výstup by prepísal %s\n"
 
-#: sunrpc/rpc_main.c:297
+#: sunrpc/rpc_main.c:295
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s: nie je možné otvoriť %s: %m\n"
 
-#: sunrpc/rpc_main.c:309
+#: sunrpc/rpc_main.c:307
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr "%s: počas zápisu výstupu %s: %m"
 
-#: sunrpc/rpc_main.c:344
+#: sunrpc/rpc_main.c:342
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "nie je možné nájsť preprocesor: %s \n"
 
-#: sunrpc/rpc_main.c:352
+#: sunrpc/rpc_main.c:350
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr "nie je možné nájsť žiadny C preprocesor (cpp)\n"
 
-#: sunrpc/rpc_main.c:421
+#: sunrpc/rpc_main.c:419
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: C preprocesor zlyhal so signálom %d\n"
 
-#: sunrpc/rpc_main.c:424
+#: sunrpc/rpc_main.c:422
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr "%s: C preprocesor zlyhal s výstupným kódom %d\n"
 
-#: sunrpc/rpc_main.c:464
+#: sunrpc/rpc_main.c:462
 #, c-format
 msgid "illegal nettype: `%s'\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1130
+#: sunrpc/rpc_main.c:1128
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: priveľa defines\n"
 
-#: sunrpc/rpc_main.c:1142
+#: sunrpc/rpc_main.c:1140
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: chyba kódovania zoznamu argumentov\n"
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1175
+#: sunrpc/rpc_main.c:1173
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr "súbor `%s' už existuje a môže byť prepísaný\n"
 
-#: sunrpc/rpc_main.c:1220
+#: sunrpc/rpc_main.c:1218
 #, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr "Nie je možné zadať viac ako jeden vstupný súbor!\n"
 
-#: sunrpc/rpc_main.c:1394
+#: sunrpc/rpc_main.c:1392
 #, c-format
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "Táto implementácia nepodporuje nový štýl alebo MT-bezpečný kód!\n"
 
-#: sunrpc/rpc_main.c:1403
+#: sunrpc/rpc_main.c:1401
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "Príznaky netid a inetd nie je možné použiť súčasne!\n"
 
-#: sunrpc/rpc_main.c:1415
+#: sunrpc/rpc_main.c:1413
 #, c-format
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "Nie je možné použiť príznak netid bez TIRPC!\n"
 
-#: sunrpc/rpc_main.c:1422
+#: sunrpc/rpc_main.c:1420
 #, c-format
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "Pri použití nového štýlu nie je možné použiť príznaky tabuľky!\n"
 
-#: sunrpc/rpc_main.c:1441
+#: sunrpc/rpc_main.c:1439
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "\"vst_súbor\" je vyžadovaný pri použití príznakov tvorby vzoru.\n"
 
-#: sunrpc/rpc_main.c:1446
+#: sunrpc/rpc_main.c:1444
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "Nie je možné použiť viac ako jeden príznak tvorby súboru!\n"
 
-#: sunrpc/rpc_main.c:1455
+#: sunrpc/rpc_main.c:1453
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "použitie:  %s vstupný_súbor\n"
 
-#: sunrpc/rpc_main.c:1456
+#: sunrpc/rpc_main.c:1454
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
@@ -4847,289 +5103,289 @@
 "\t%s [-abkCLNTM][-Dnázov[=hodnota]] [-i veľkosť] [-I [-K sekundy]] [-Y "
 "cesta] vst_súbor\n"
 
-#: sunrpc/rpc_main.c:1458
+#: sunrpc/rpc_main.c:1456
 #, c-format
 msgid ""
 "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr ""
 "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o výst_súbor] [vst_súbor]\n"
 
-#: sunrpc/rpc_main.c:1460
+#: sunrpc/rpc_main.c:1458
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s nettype]* [-o výst_súbor] [vst_súbor]\n"
 
-#: sunrpc/rpc_main.c:1461
+#: sunrpc/rpc_main.c:1459
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n netid]* [-o výst_súbor] [vst_súbor]\n"
 
-#: sunrpc/rpc_main.c:1469
+#: sunrpc/rpc_main.c:1467
 #, c-format
 msgid "options:\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1470
+#: sunrpc/rpc_main.c:1468
 #, c-format
 msgid "-a\t\tgenerate all files, including samples\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1471
+#: sunrpc/rpc_main.c:1469
 #, c-format
 msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1472
+#: sunrpc/rpc_main.c:1470
 #, c-format
 msgid "-c\t\tgenerate XDR routines\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1473
+#: sunrpc/rpc_main.c:1471
 #, c-format
 msgid "-C\t\tANSI C mode\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1474
+#: sunrpc/rpc_main.c:1472
 #, c-format
 msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1475
+#: sunrpc/rpc_main.c:1473
 #, c-format
 msgid "-h\t\tgenerate header file\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1476
+#: sunrpc/rpc_main.c:1474
 #, c-format
 msgid "-i size\t\tsize at which to start generating inline code\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1477
+#: sunrpc/rpc_main.c:1475
 #, c-format
 msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1478
+#: sunrpc/rpc_main.c:1476
 #, c-format
 msgid "-K seconds\tserver exits after K seconds of inactivity\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1479
+#: sunrpc/rpc_main.c:1477
 #, c-format
 msgid "-l\t\tgenerate client side stubs\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1480
+#: sunrpc/rpc_main.c:1478
 #, c-format
 msgid "-L\t\tserver errors will be printed to syslog\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1481
+#: sunrpc/rpc_main.c:1479
 #, c-format
 msgid "-m\t\tgenerate server side stubs\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1482
+#: sunrpc/rpc_main.c:1480
 #, c-format
 msgid "-M\t\tgenerate MT-safe code\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1483
+#: sunrpc/rpc_main.c:1481
 #, c-format
 msgid "-n netid\tgenerate server code that supports named netid\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1484
+#: sunrpc/rpc_main.c:1482
 #, c-format
 msgid "-N\t\tsupports multiple arguments and call-by-value\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1485
+#: sunrpc/rpc_main.c:1483
 #, c-format
 msgid "-o outfile\tname of the output file\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1486
+#: sunrpc/rpc_main.c:1484
 #, c-format
 msgid "-s nettype\tgenerate server code that supports named nettype\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1487
+#: sunrpc/rpc_main.c:1485
 #, c-format
 msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1488
+#: sunrpc/rpc_main.c:1486
 #, c-format
 msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1489
+#: sunrpc/rpc_main.c:1487
 #, c-format
 msgid "-Sm \t\tgenerate makefile template \n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1490
+#: sunrpc/rpc_main.c:1488
 #, c-format
 msgid "-t\t\tgenerate RPC dispatch table\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1491
+#: sunrpc/rpc_main.c:1489
 #, c-format
 msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1492
+#: sunrpc/rpc_main.c:1490
 #, c-format
 msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
 msgstr ""
 
-#: sunrpc/rpc_scan.c:114
+#: sunrpc/rpc_scan.c:112
 msgid "constant or identifier expected"
 msgstr "očakávaná konštanta alebo identifikátor"
 
-#: sunrpc/rpc_scan.c:310
+#: sunrpc/rpc_scan.c:308
 msgid "illegal character in file: "
 msgstr "neprípustný znak v súbore: "
 
-#: sunrpc/rpc_scan.c:349 sunrpc/rpc_scan.c:375
+#: sunrpc/rpc_scan.c:347 sunrpc/rpc_scan.c:373
 msgid "unterminated string constant"
 msgstr "neukončená reťazcová konštanta"
 
-#: sunrpc/rpc_scan.c:381
+#: sunrpc/rpc_scan.c:379
 msgid "empty char string"
 msgstr "prázdny znakový reťazec"
 
-#: sunrpc/rpc_scan.c:523 sunrpc/rpc_scan.c:533
+#: sunrpc/rpc_scan.c:521 sunrpc/rpc_scan.c:531
 msgid "preprocessor error"
 msgstr "chyba preprocesora"
 
-#: sunrpc/rpcinfo.c:254 sunrpc/rpcinfo.c:400
+#: sunrpc/rpcinfo.c:246 sunrpc/rpcinfo.c:392
 #, c-format
 msgid "program %lu is not available\n"
 msgstr "program %lu nie je dostupný\n"
 
-#: sunrpc/rpcinfo.c:281 sunrpc/rpcinfo.c:327 sunrpc/rpcinfo.c:350
-#: sunrpc/rpcinfo.c:424 sunrpc/rpcinfo.c:470 sunrpc/rpcinfo.c:493
-#: sunrpc/rpcinfo.c:527
+#: sunrpc/rpcinfo.c:273 sunrpc/rpcinfo.c:319 sunrpc/rpcinfo.c:342
+#: sunrpc/rpcinfo.c:416 sunrpc/rpcinfo.c:462 sunrpc/rpcinfo.c:485
+#: sunrpc/rpcinfo.c:519
 #, c-format
 msgid "program %lu version %lu is not available\n"
 msgstr "program %lu verzie %lu nie je dostupný\n"
 
-#: sunrpc/rpcinfo.c:532
+#: sunrpc/rpcinfo.c:524
 #, c-format
 msgid "program %lu version %lu ready and waiting\n"
 msgstr "program %lu verzie %lu pripravený a čakajúci\n"
 
-#: sunrpc/rpcinfo.c:573 sunrpc/rpcinfo.c:580
+#: sunrpc/rpcinfo.c:565 sunrpc/rpcinfo.c:572
 msgid "rpcinfo: can't contact portmapper"
 msgstr "rpcinfo: nie je možné spojiť sa s portmapperom"
 
-#: sunrpc/rpcinfo.c:587
+#: sunrpc/rpcinfo.c:579
 msgid "No remote programs registered.\n"
 msgstr "Nie sú registrované žiadne vzdialené programy\n"
 
-#: sunrpc/rpcinfo.c:591
+#: sunrpc/rpcinfo.c:583
 msgid "   program vers proto   port\n"
 msgstr "   program verz proto   port\n"
 
-#: sunrpc/rpcinfo.c:630
+#: sunrpc/rpcinfo.c:622
 msgid "(unknown)"
 msgstr "(neznámy)"
 
-#: sunrpc/rpcinfo.c:654
+#: sunrpc/rpcinfo.c:646
 #, c-format
 msgid "rpcinfo: broadcast failed: %s\n"
 msgstr "rpcinfo: broadcast zlyhal: %s\n"
 
-#: sunrpc/rpcinfo.c:675
+#: sunrpc/rpcinfo.c:667
 msgid "Sorry. You are not root\n"
 msgstr "Bohužiaľ - nie ste superužívateľ\n"
 
-#: sunrpc/rpcinfo.c:682
+#: sunrpc/rpcinfo.c:674
 #, c-format
 msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
 msgstr "rpcinfo: Nie je možné zrušiť registráciu programu %s verzie %s\n"
 
-#: sunrpc/rpcinfo.c:691
+#: sunrpc/rpcinfo.c:683
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr ""
 "Použitie: rpcinfo [ -n číslo_portu ] -u počítač číslo_programu [ "
 "číslo_verzie ]\n"
 
-#: sunrpc/rpcinfo.c:693
+#: sunrpc/rpcinfo.c:685
 msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
 msgstr ""
 "       rpcinfo [ -n číslo_portu ] -t počítač číslo_programu [ číslo_verzie "
 "]\n"
 
-#: sunrpc/rpcinfo.c:695
+#: sunrpc/rpcinfo.c:687
 msgid "       rpcinfo -p [ host ]\n"
 msgstr "       rpcinfo -p [ počítač ]\n"
 
-#: sunrpc/rpcinfo.c:696
+#: sunrpc/rpcinfo.c:688
 msgid "       rpcinfo -b prognum versnum\n"
 msgstr "       rpcinfo -b číslo_programu číslo_verzie\n"
 
-#: sunrpc/rpcinfo.c:697
+#: sunrpc/rpcinfo.c:689
 msgid "       rpcinfo -d prognum versnum\n"
 msgstr "       rpcinfo -d číslo_programu číslo_verzie\n"
 
-#: sunrpc/rpcinfo.c:722
+#: sunrpc/rpcinfo.c:714
 #, c-format
 msgid "rpcinfo: %s is unknown service\n"
 msgstr "rpcinfo: %s je neznáma služba\n"
 
-#: sunrpc/rpcinfo.c:759
+#: sunrpc/rpcinfo.c:751
 #, c-format
 msgid "rpcinfo: %s is unknown host\n"
 msgstr "rpcinfo: %s je neznámy počítač\n"
 
-#: sunrpc/svc_run.c:70
+#: sunrpc/svc_run.c:71
 msgid "svc_run: - out of memory"
 msgstr ""
 
-#: sunrpc/svc_run.c:90
+#: sunrpc/svc_run.c:91
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll zlyhal"
 
-#: sunrpc/svc_simple.c:87
+#: sunrpc/svc_simple.c:81
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr "nie je možné znovu prideliť číslo procedúry %ld\n"
 
-#: sunrpc/svc_simple.c:97
+#: sunrpc/svc_simple.c:91
 msgid "couldn't create an rpc server\n"
 msgstr "nebolo možné vytvoriť rpc server\n"
 
-#: sunrpc/svc_simple.c:105
+#: sunrpc/svc_simple.c:99
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "nebolo možné zaregistrovať program %ld verzie %ld\n"
 
-#: sunrpc/svc_simple.c:113
+#: sunrpc/svc_simple.c:107
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: nedostatok pamäti\n"
 
-#: sunrpc/svc_simple.c:173
+#: sunrpc/svc_simple.c:168
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "problémy pri odpovedi programu %d\n"
 
-#: sunrpc/svc_simple.c:182
+#: sunrpc/svc_simple.c:177
 #, c-format
 msgid "never registered prog %d\n"
 msgstr "program %d nebol nikdy registrovaný\n"
 
-#: sunrpc/svc_tcp.c:155
+#: sunrpc/svc_tcp.c:149
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - problém pri vytváraní tcp socketu"
 
-#: sunrpc/svc_tcp.c:170
+#: sunrpc/svc_tcp.c:164
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - nie je možné vykonať getsockname alebo listen"
 
-#: sunrpc/svc_udp.c:128
+#: sunrpc/svc_udp.c:122
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: problém pri vytváraní socketu"
 
@@ -5139,47 +5395,47 @@
 # #: sunrpc/svc_tcp.c:168 sunrpc/svc_tcp.c:176
 # msgid "svctcp_create: out of memory\n"
 # msgstr "svctcp_create: nedostatok pamäti\n"
-#: sunrpc/svc_udp.c:142
+#: sunrpc/svc_udp.c:136
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - nemôžem vykonať getsockname"
 
-#: sunrpc/svc_udp.c:175
+#: sunrpc/svc_udp.c:168
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad je príliš malý pre IP_PKTINFO\n"
 
-#: sunrpc/svc_udp.c:475
+#: sunrpc/svc_udp.c:476
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: vyrovnávacia pamäť je už povolená"
 
-#: sunrpc/svc_udp.c:481
+#: sunrpc/svc_udp.c:482
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: nebolo možné prideliť vyrovnáciu pamäť"
 
-#: sunrpc/svc_udp.c:490
+#: sunrpc/svc_udp.c:491
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: nebolo možné prideliť dáta pre vyrovnávaciu pamäť"
 
-#: sunrpc/svc_udp.c:498
+#: sunrpc/svc_udp.c:499
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: nebolo možné prideliť frontu pre vyrovnávaciu pamäť"
 
-#: sunrpc/svc_udp.c:533
+#: sunrpc/svc_udp.c:535
 msgid "cache_set: victim not found"
 msgstr "cache_set: obeť nenájdená"
 
-#: sunrpc/svc_udp.c:544
+#: sunrpc/svc_udp.c:546
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: obeť nenájdená"
 
-#: sunrpc/svc_udp.c:551
+#: sunrpc/svc_udp.c:553
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: nebolo možné prideliť rpc vyrovnávaciu pamäť"
 
-#: sunrpc/svc_unix.c:150
+#: sunrpc/svc_unix.c:148
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - problém pri vytváraní AF_UNIX socketu"
 
-#: sunrpc/svc_unix.c:166
+#: sunrpc/svc_unix.c:164
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - nemôžem vykonať getsockname alebo listen"
 
@@ -6154,6 +6410,10 @@
 msgid "State not recoverable"
 msgstr ""
 
+#: sysdeps/gnu/errlist.c:1461
+msgid "Operation not possible due to RF-kill"
+msgstr ""
+
 #: sysdeps/mach/_strerror.c:57
 msgid "Error in unknown error system: "
 msgstr "Chyba v neznámom chybovom systéme: "
@@ -6261,43 +6521,46 @@
 msgid "cannot read header from `%s'"
 msgstr "nie je možné prečítať hlavičku z `%s'"
 
-#: timezone/zdump.c:210
+#: timezone/zdump.c:215
 msgid "lacks alphabetic at start"
 msgstr ""
 
-#: timezone/zdump.c:212
+#: timezone/zdump.c:217
 msgid "has fewer than 3 alphabetics"
 msgstr ""
 
-#: timezone/zdump.c:214
+#: timezone/zdump.c:219
 msgid "has more than 6 alphabetics"
 msgstr ""
 
-#: timezone/zdump.c:222
+#: timezone/zdump.c:227
 msgid "differs from POSIX standard"
 msgstr ""
 
-#: timezone/zdump.c:228
+#: timezone/zdump.c:233
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr ""
 
-#: timezone/zdump.c:279
+#: timezone/zdump.c:242
 #, c-format
 msgid ""
-"%s: usage is %s [ --version ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] "
+"zonename ...\n"
+"\n"
+"Report bugs to tz@elsie.nci.nih.gov.\n"
 msgstr ""
 
-#: timezone/zdump.c:296
+#: timezone/zdump.c:311
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr ""
 
-#: timezone/zdump.c:387
+#: timezone/zdump.c:398
 msgid "Error writing to standard output"
 msgstr "Chyba pri zápise na štandardný výstup"
 
-#: timezone/zdump.c:410
+#: timezone/zdump.c:421
 #, c-format
 msgid ""
 "%s: use of -v on system with floating time_t other than float or double\n"
@@ -6325,345 +6588,348 @@
 #: timezone/zic.c:459
 #, c-format
 msgid ""
-"%s: usage is %s [ --version ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p "
+"posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"\n"
+"Report bugs to tz@elsie.nci.nih.gov.\n"
 msgstr ""
 
-#: timezone/zic.c:494
+#: timezone/zic.c:496
 msgid "wild compilation-time specification of zic_t"
 msgstr ""
 
-#: timezone/zic.c:511
+#: timezone/zic.c:515
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: Voľba -d zadaná viac ako raz\n"
 
-#: timezone/zic.c:521
+#: timezone/zic.c:525
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: Voľba -l zadaná viac ako raz\n"
 
-#: timezone/zic.c:531
+#: timezone/zic.c:535
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: Voľba -p zadaná viac ako raz\n"
 
-#: timezone/zic.c:541
+#: timezone/zic.c:545
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: Voľba -y zadaná viac ako raz\n"
 
-#: timezone/zic.c:551
+#: timezone/zic.c:555
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: Voľba -L zadaná viac ako raz\n"
 
-#: timezone/zic.c:600
+#: timezone/zic.c:604
 msgid "link to link"
 msgstr ""
 
-#: timezone/zic.c:665
+#: timezone/zic.c:669
 msgid "hard link failed, symbolic link used"
 msgstr "pevný odkaz zlyhal, použitý symbolický"
 
-#: timezone/zic.c:673
+#: timezone/zic.c:677
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: Nie je možné vytvoriť prepojenie z %s na %s: %s\n"
 
-#: timezone/zic.c:745 timezone/zic.c:747
+#: timezone/zic.c:749 timezone/zic.c:751
 msgid "same rule name in multiple files"
 msgstr "rovnaké meno pravidla vo viacerých súboroch"
 
-#: timezone/zic.c:788
+#: timezone/zic.c:792
 msgid "unruly zone"
 msgstr "zóna bez pravidiel"
 
-#: timezone/zic.c:795
+#: timezone/zic.c:799
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s v zóne bez pravidiel"
 
-#: timezone/zic.c:816
+#: timezone/zic.c:820
 msgid "standard input"
 msgstr "štandardný vstup"
 
-#: timezone/zic.c:821
+#: timezone/zic.c:825
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: Nie je možné otvoriť %s: %s\n"
 
-#: timezone/zic.c:832
+#: timezone/zic.c:836
 msgid "line too long"
 msgstr "pridlhý riadok"
 
-#: timezone/zic.c:852
+#: timezone/zic.c:856
 msgid "input line of unknown type"
 msgstr "vstupný riadok neznámeho typu"
 
-#: timezone/zic.c:868
+#: timezone/zic.c:872
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: Priestupný riadok v súbore nepriestupných sekúnd %s\n"
 
-#: timezone/zic.c:875 timezone/zic.c:1312 timezone/zic.c:1334
+#: timezone/zic.c:879 timezone/zic.c:1316 timezone/zic.c:1338
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: fatálna chyba: Neprípustná l_hodnota %d\n"
 
-#: timezone/zic.c:883
+#: timezone/zic.c:887
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: Chyba pri čítaní %s\n"
 
-#: timezone/zic.c:890
+#: timezone/zic.c:894
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: Chyba pri uzatváraní %s: %s\n"
 
-#: timezone/zic.c:895
+#: timezone/zic.c:899
 msgid "expected continuation line not found"
 msgstr "očakávaný pokračovací riadok nebol nájdený"
 
-#: timezone/zic.c:939 timezone/zic.c:2476 timezone/zic.c:2495
+#: timezone/zic.c:943 timezone/zic.c:2480 timezone/zic.c:2499
 msgid "time overflow"
 msgstr "pretečenie času"
 
-#: timezone/zic.c:943
+#: timezone/zic.c:947
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:946
+#: timezone/zic.c:950
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr ""
 
-#: timezone/zic.c:959
+#: timezone/zic.c:963
 msgid "wrong number of fields on Rule line"
 msgstr "chybný počšt polí v riadku Rule"
 
-#: timezone/zic.c:963
+#: timezone/zic.c:967
 msgid "nameless rule"
 msgstr "bezmenné pravidlo"
 
-#: timezone/zic.c:968
+#: timezone/zic.c:972
 msgid "invalid saved time"
 msgstr "neprípustný uložený čas"
 
-#: timezone/zic.c:989
+#: timezone/zic.c:993
 msgid "wrong number of fields on Zone line"
 msgstr "chybný počet polí v riadku Zone"
 
-#: timezone/zic.c:995
+#: timezone/zic.c:999
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "Riadok \"Zone %s\" a voľba -l sa navzájom vylučujú"
 
-#: timezone/zic.c:1003
+#: timezone/zic.c:1007
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "Riadok \"Zone %s\" a voľba -p sa navzájom vylučujú"
 
-#: timezone/zic.c:1015
+#: timezone/zic.c:1019
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "duplicitné meno zóny %s (súbor \"%s\", riadok %d)"
 
-#: timezone/zic.c:1031
+#: timezone/zic.c:1035
 msgid "wrong number of fields on Zone continuation line"
 msgstr "chybný počet polí v pokračovacom riadku Zone"
 
-#: timezone/zic.c:1071
+#: timezone/zic.c:1075
 msgid "invalid UTC offset"
 msgstr "neprípustné posunutie voči UTC"
 
-#: timezone/zic.c:1074
+#: timezone/zic.c:1078
 msgid "invalid abbreviation format"
 msgstr "neprípustný formát skratky"
 
-#: timezone/zic.c:1103
+#: timezone/zic.c:1107
 msgid ""
 "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 "Koncový čas pokračovacieho riadku zóny nie je väčší ako koncový čas "
 "predchádzajúceho riadku"
 
-#: timezone/zic.c:1131
+#: timezone/zic.c:1135
 msgid "wrong number of fields on Leap line"
 msgstr "chybný počet polí v riadku Leap"
 
-#: timezone/zic.c:1140
+#: timezone/zic.c:1144
 msgid "invalid leaping year"
 msgstr "neprípustný priestupný rok"
 
-#: timezone/zic.c:1160 timezone/zic.c:1266
+#: timezone/zic.c:1164 timezone/zic.c:1270
 msgid "invalid month name"
 msgstr "neprípustný názov mesiaca"
 
-#: timezone/zic.c:1173 timezone/zic.c:1379 timezone/zic.c:1393
+#: timezone/zic.c:1177 timezone/zic.c:1383 timezone/zic.c:1397
 msgid "invalid day of month"
 msgstr "neprípustný deň mesiaca"
 
-#: timezone/zic.c:1178
+#: timezone/zic.c:1182
 msgid "time before zero"
 msgstr "čas menší ako nula"
 
-#: timezone/zic.c:1182
+#: timezone/zic.c:1186
 msgid "time too small"
 msgstr "čas je príliš malý"
 
-#: timezone/zic.c:1186
+#: timezone/zic.c:1190
 msgid "time too large"
 msgstr "čas je príliš veľký"
 
-#: timezone/zic.c:1190 timezone/zic.c:1295
+#: timezone/zic.c:1194 timezone/zic.c:1299
 msgid "invalid time of day"
 msgstr "neprípustný čas v dni"
 
-#: timezone/zic.c:1209
+#: timezone/zic.c:1213
 msgid "illegal CORRECTION field on Leap line"
 msgstr "neprípustné pole CORRECTION v riadku Leap"
 
-#: timezone/zic.c:1214
+#: timezone/zic.c:1218
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "neprípustné pole Rolling/Stationary v riadku Leap"
 
-#: timezone/zic.c:1230
+#: timezone/zic.c:1234
 msgid "wrong number of fields on Link line"
 msgstr "chybný počet polí v riadku Link"
 
-#: timezone/zic.c:1234
+#: timezone/zic.c:1238
 msgid "blank FROM field on Link line"
 msgstr "prázdne pole OD v riadku Link"
 
-#: timezone/zic.c:1238
+#: timezone/zic.c:1242
 msgid "blank TO field on Link line"
 msgstr "prázdne pole DO v riadku Link"
 
-#: timezone/zic.c:1316
+#: timezone/zic.c:1320
 msgid "invalid starting year"
 msgstr "neprípustný počiatočný rok"
 
-#: timezone/zic.c:1338
+#: timezone/zic.c:1342
 msgid "invalid ending year"
 msgstr "neprípustný koncový rok"
 
-#: timezone/zic.c:1342
+#: timezone/zic.c:1346
 msgid "starting year greater than ending year"
 msgstr "počiatočný rok väčší ako koncový"
 
-#: timezone/zic.c:1349
+#: timezone/zic.c:1353
 msgid "typed single year"
 msgstr "zadaný jeden rok"
 
-#: timezone/zic.c:1384
+#: timezone/zic.c:1388
 msgid "invalid weekday name"
 msgstr "neprípustný názov dňa"
 
-#: timezone/zic.c:1562
+#: timezone/zic.c:1566
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Nie je možné odstrániť %s: %s\n"
 
-#: timezone/zic.c:1572
+#: timezone/zic.c:1576
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Nie je možné vytvoriť %s: %s\n"
 
-#: timezone/zic.c:1722
+#: timezone/zic.c:1726
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: Chyba pri zápise %s\n"
 
-#: timezone/zic.c:2015
+#: timezone/zic.c:2019
 msgid "no POSIX environment variable for zone"
 msgstr ""
 
-#: timezone/zic.c:2172
+#: timezone/zic.c:2176
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 "nie je možné nájsť skratku časovej zóny pre použitie hneď po koncovom čase"
 
-#: timezone/zic.c:2218
+#: timezone/zic.c:2222
 msgid "too many transitions?!"
 msgstr "priveľa prechodov?!"
 
-#: timezone/zic.c:2237
+#: timezone/zic.c:2241
 msgid "internal error - addtype called with bad isdst"
 msgstr "vnútorná chyba - addtype zavolaný s chybným isdst"
 
-#: timezone/zic.c:2241
+#: timezone/zic.c:2245
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "vnútorná chyba - addtype zavolaný s chybným ttisstd"
 
-#: timezone/zic.c:2245
+#: timezone/zic.c:2249
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "vnútorná chyba - addtype zavolaný s chybným ttisgmt"
 
-#: timezone/zic.c:2264
+#: timezone/zic.c:2268
 msgid "too many local time types"
 msgstr "priveľa lokálnych typov času"
 
-#: timezone/zic.c:2268
+#: timezone/zic.c:2272
 msgid "UTC offset out of range"
 msgstr ""
 
-#: timezone/zic.c:2296
+#: timezone/zic.c:2300
 msgid "too many leap seconds"
 msgstr "priveľa priestupných sekúnd"
 
-#: timezone/zic.c:2302
+#: timezone/zic.c:2306
 msgid "repeated leap second moment"
 msgstr "opakovaný moment priestupnej sekundy"
 
-#: timezone/zic.c:2354
+#: timezone/zic.c:2358
 msgid "Wild result from command execution"
 msgstr "Čudný výsledok vykonania programu"
 
-#: timezone/zic.c:2355
+#: timezone/zic.c:2359
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: príkaz bol '%s', výsledok bol %d\n"
 
-#: timezone/zic.c:2453
+#: timezone/zic.c:2457
 msgid "Odd number of quotation marks"
 msgstr "Nepárny počet úvodzoviek"
 
-#: timezone/zic.c:2542
+#: timezone/zic.c:2546
 msgid "use of 2/29 in non leap-year"
 msgstr "29. február použitý v nepriestupnom roku"
 
-#: timezone/zic.c:2577
+#: timezone/zic.c:2581
 msgid ""
 "rule goes past start/end of month--will not work with pre-2004 versions of "
 "zic"
 msgstr ""
 
-#: timezone/zic.c:2609
+#: timezone/zic.c:2613
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr ""
 
-#: timezone/zic.c:2611
+#: timezone/zic.c:2615
 msgid "time zone abbreviation has more than 3 alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2613
+#: timezone/zic.c:2617
 msgid "time zone abbreviation has too many alphabetics"
 msgstr ""
 
-#: timezone/zic.c:2623
+#: timezone/zic.c:2627
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr ""
 
-#: timezone/zic.c:2635
+#: timezone/zic.c:2639
 msgid "too many, or too long, time zone abbreviations"
 msgstr "príliš veľa alebo príliš dlhé skratku časovej zóny"
 
-#: timezone/zic.c:2676
+#: timezone/zic.c:2680
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Nie je možné vytvoriť adresár %s: %s\n"
 
-#: timezone/zic.c:2698
+#: timezone/zic.c:2702
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: nesprávne rozšírenie znamienka pre %d\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libelf.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libelf.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libelf.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libelf.po	2012-02-23 06:55:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:31+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../lib/errors.h:25
 msgid "no error"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libexif-12.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libexif-12.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libexif-12.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libexif-12.po	2012-02-23 06:55:32.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:38+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:32+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
 #: libexif/olympus/mnote-olympus-entry.c:37
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libgpg-error.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libgpg-error.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libgpg-error.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libgpg-error.po	2012-02-23 06:55:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:43+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:36+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/err-sources.h:28
 msgid "Unspecified source"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libgphoto2-2.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libgphoto2-2.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libgphoto2-2.po	2012-01-02 17:50:43.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libgphoto2-2.po	2012-02-23 06:55:33.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:44+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: camlibs/adc65/adc65.c:243
 msgid ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libgphoto2_port-0.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libgphoto2_port-0.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libgphoto2_port-0.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libgphoto2_port-0.po	2012-02-23 06:55:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:44+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:37+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: libgphoto2_port/gphoto2-port-info-list.c:213
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libiconv.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libiconv.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libiconv.po	2012-01-02 17:51:10.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libiconv.po	2012-02-23 06:55:56.000000000 +0000
@@ -7,15 +7,15 @@
 "Project-Id-Version: libiconv 1.9.1\n"
 "Report-Msgid-Bugs-To: bug-gnu-libiconv@gnu.org\n"
 "POT-Creation-Date: 2007-10-25 00:19+0200\n"
-"PO-Revision-Date: 2011-10-05 10:36+0000\n"
+"PO-Revision-Date: 2012-01-03 14:43+0000\n"
 "Last-Translator: Marcel Telka <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:14+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. TRANSLATORS: The first line of the short usage message.
 #: src/iconv.c:105
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libidn.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libidn.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libidn.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libidn.po	2012-02-23 06:55:33.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:46+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
 #: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libvirt.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libvirt.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/libvirt.po	2012-01-02 17:51:06.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/libvirt.po	2012-02-23 06:55:52.000000000 +0000
@@ -7,67 +7,67 @@
 msgstr ""
 "Project-Id-Version: libvirt\n"
 "Report-Msgid-Bugs-To: libvir-list@redhat.com\n"
-"POT-Creation-Date: 2011-11-08 14:40+0800\n"
-"PO-Revision-Date: 2011-12-09 02:49+0000\n"
+"POT-Creation-Date: 2011-12-08 14:59+0800\n"
+"PO-Revision-Date: 2012-02-15 23:12+0000\n"
 "Last-Translator: Serge Hallyn <Unknown>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:19+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
-#: daemon/libvirtd.c:252
+#: daemon/libvirtd.c:256
 #, c-format
 msgid ""
 "%s: error: %s. Check /var/log/messages or run without --daemon for more "
 "info.\n"
 msgstr ""
 
-#: daemon/libvirtd.c:2758 daemon/libvirtd.c:2767
+#: daemon/libvirtd.c:446 daemon/libvirtd.c:451
 #, c-format
 msgid "Failed to parse mode '%s'"
 msgstr ""
 
-#: daemon/libvirtd.c:2429 daemon/libvirtd.c:2448
+#: daemon/libvirtd.c:590 daemon/libvirtd.c:609
 #, c-format
 msgid "failed to allocate memory for %s config list"
 msgstr ""
 
-#: daemon/libvirtd.c:2435 daemon/libvirtd.c:2465
+#: daemon/libvirtd.c:596 daemon/libvirtd.c:626
 #, c-format
 msgid "failed to allocate memory for %s config list value"
 msgstr ""
 
-#: daemon/libvirtd.c:610 daemon/libvirtd.c:633
+#: daemon/libvirtd.c:614 daemon/libvirtd.c:637
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: must be a string or list of strings"
 msgstr ""
 
-#: daemon/libvirtd.c:649
+#: daemon/libvirtd.c:653
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: invalid type: got %s; expected %s"
 msgstr ""
 
-#: daemon/libvirtd.c:710
+#: daemon/libvirtd.c:714
 #, c-format
 msgid "remoteReadConfigFile: %s: %s: unsupported auth %s"
 msgstr ""
 
-#: daemon/libvirtd.c:1088
+#: daemon/libvirtd.c:1100
 msgid "additional privileges are required"
 msgstr ""
 
-#: daemon/libvirtd.c:1094
+#: daemon/libvirtd.c:1106
 msgid "failed to set reduced privileges"
 msgstr ""
 
-#: daemon/libvirtd.c:1145
+#: daemon/libvirtd.c:1157
 msgid "Driver state initialization failed"
 msgstr ""
 
-#: daemon/libvirtd.c:1173
+#: daemon/libvirtd.c:1185
 #, c-format
 msgid ""
 "\n"
@@ -86,7 +86,7 @@
 "libvirt management daemon:\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1190
+#: daemon/libvirtd.c:1202
 #, c-format
 msgid ""
 "\n"
@@ -109,7 +109,7 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1217
+#: daemon/libvirtd.c:1229
 msgid ""
 "\n"
 "  Default paths:\n"
@@ -130,287 +130,408 @@
 "\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1278 src/lxc/lxc_controller.c:1306
+#: daemon/libvirtd.c:1290 src/lxc/lxc_controller.c:1541
 #: src/security/virt-aa-helper.c:1164 src/storage/parthelper.c:75
 #: src/util/iohelper.c:227 src/util/iohelper.c:234
 #, c-format
 msgid "%s: initialization failed\n"
 msgstr ""
 
-#: daemon/libvirtd.c:1315
+#: daemon/libvirtd.c:1327
 msgid "Invalid value for timeout"
 msgstr ""
 
-#: daemon/libvirtd.c:1323 daemon/libvirtd.c:1331
+#: daemon/libvirtd.c:1335 daemon/libvirtd.c:1343
 msgid "Can't allocate memory"
 msgstr ""
 
-#: daemon/libvirtd.c:1345
+#: daemon/libvirtd.c:1357
 #, c-format
 msgid "%s: internal error: unknown flag: %c"
 msgstr ""
 
-#: daemon/libvirtd.c:1352
+#: daemon/libvirtd.c:1364
 msgid "Can't create initial configuration"
 msgstr ""
 
-#: daemon/libvirtd.c:1361
+#: daemon/libvirtd.c:1373
 msgid "Can't determine config path"
 msgstr ""
 
-#: daemon/libvirtd.c:1369
+#: daemon/libvirtd.c:1381
 #, c-format
 msgid "Can't load config file '%s'"
 msgstr ""
 
-#: daemon/libvirtd.c:1375
+#: daemon/libvirtd.c:1387
 #, c-format
 msgid "invalid host UUID: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:1380
+#: daemon/libvirtd.c:1392
 msgid "Can't initialize logging"
 msgstr ""
 
-#: daemon/libvirtd.c:1387
+#: daemon/libvirtd.c:1399
 msgid "Can't determine pid file path."
 msgstr ""
 
-#: daemon/libvirtd.c:1395
+#: daemon/libvirtd.c:1407
 msgid "Can't determine socket paths"
 msgstr ""
 
-#: src/util/util.c:526
+#: daemon/libvirtd.c:1415
 #, c-format
 msgid "cannot change to root directory: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:3059
+#: daemon/libvirtd.c:1421
 #, c-format
 msgid "Failed to fork as daemon: %s"
 msgstr ""
 
-#: daemon/libvirtd.c:1422
+#: daemon/libvirtd.c:1434
 msgid "Can't determine user directory"
 msgstr ""
 
-#: daemon/libvirtd.c:3086
+#: daemon/libvirtd.c:1448
 #, c-format
 msgid "unable to create rundir %s: %s"
 msgstr ""
 
-#: daemon/remote.c:173
+#: daemon/qemu_dispatch.h:36 daemon/remote.c:663 daemon/remote.c:873
+#: daemon/remote.c:927 daemon/remote.c:982 daemon/remote.c:1046
+#: daemon/remote.c:1104 daemon/remote.c:1174 daemon/remote.c:1227
+#: daemon/remote.c:1274 daemon/remote.c:1320 daemon/remote.c:1391
+#: daemon/remote.c:1477 daemon/remote.c:1534 daemon/remote.c:1585
+#: daemon/remote.c:1649 daemon/remote.c:1715 daemon/remote.c:1793
+#: daemon/remote.c:1868 daemon/remote.c:1910 daemon/remote.c:2670
+#: daemon/remote.c:2723 daemon/remote.c:2764 daemon/remote.c:2842
+#: daemon/remote.c:2879 daemon/remote.c:2912 daemon/remote.c:2961
+#: daemon/remote.c:3007 daemon/remote.c:3048 daemon/remote.c:3099
+#: daemon/remote.c:3159 daemon/remote.c:3213 daemon/remote.c:3262
+#: daemon/remote.c:3310 daemon/remote.c:3350 daemon/remote_dispatch.h:163
+#: daemon/remote_dispatch.h:213 daemon/remote_dispatch.h:261
+#: daemon/remote_dispatch.h:313 daemon/remote_dispatch.h:365
+#: daemon/remote_dispatch.h:417 daemon/remote_dispatch.h:470
+#: daemon/remote_dispatch.h:547 daemon/remote_dispatch.h:601
+#: daemon/remote_dispatch.h:656 daemon/remote_dispatch.h:735
+#: daemon/remote_dispatch.h:787 daemon/remote_dispatch.h:841
+#: daemon/remote_dispatch.h:896 daemon/remote_dispatch.h:948
+#: daemon/remote_dispatch.h:998 daemon/remote_dispatch.h:1050
+#: daemon/remote_dispatch.h:1102 daemon/remote_dispatch.h:1154
+#: daemon/remote_dispatch.h:1293 daemon/remote_dispatch.h:1371
+#: daemon/remote_dispatch.h:1473 daemon/remote_dispatch.h:1531
+#: daemon/remote_dispatch.h:1591 daemon/remote_dispatch.h:1658
+#: daemon/remote_dispatch.h:1714 daemon/remote_dispatch.h:1792
+#: daemon/remote_dispatch.h:2002 daemon/remote_dispatch.h:2058
+#: daemon/remote_dispatch.h:2114 daemon/remote_dispatch.h:2170
+#: daemon/remote_dispatch.h:2223 daemon/remote_dispatch.h:2278
+#: daemon/remote_dispatch.h:2341 daemon/remote_dispatch.h:2397
+#: daemon/remote_dispatch.h:2453 daemon/remote_dispatch.h:2508
+#: daemon/remote_dispatch.h:2560 daemon/remote_dispatch.h:2612
+#: daemon/remote_dispatch.h:2662 daemon/remote_dispatch.h:2714
+#: daemon/remote_dispatch.h:2856 daemon/remote_dispatch.h:2911
+#: daemon/remote_dispatch.h:2988 daemon/remote_dispatch.h:3044
+#: daemon/remote_dispatch.h:3194 daemon/remote_dispatch.h:3271
+#: daemon/remote_dispatch.h:3343 daemon/remote_dispatch.h:3396
+#: daemon/remote_dispatch.h:3453 daemon/remote_dispatch.h:3544
+#: daemon/remote_dispatch.h:3596 daemon/remote_dispatch.h:3648
+#: daemon/remote_dispatch.h:3700 daemon/remote_dispatch.h:3751
+#: daemon/remote_dispatch.h:3798 daemon/remote_dispatch.h:3847
+#: daemon/remote_dispatch.h:3900 daemon/remote_dispatch.h:3957
+#: daemon/remote_dispatch.h:4010 daemon/remote_dispatch.h:4063
+#: daemon/remote_dispatch.h:4112 daemon/remote_dispatch.h:4166
+#: daemon/remote_dispatch.h:4248 daemon/remote_dispatch.h:4300
+#: daemon/remote_dispatch.h:4354 daemon/remote_dispatch.h:4416
+#: daemon/remote_dispatch.h:4477 daemon/remote_dispatch.h:4532
+#: daemon/remote_dispatch.h:4587 daemon/remote_dispatch.h:4643
+#: daemon/remote_dispatch.h:4705 daemon/remote_dispatch.h:4767
+#: daemon/remote_dispatch.h:4827 daemon/remote_dispatch.h:4879
+#: daemon/remote_dispatch.h:4931 daemon/remote_dispatch.h:4986
+#: daemon/remote_dispatch.h:5044 daemon/remote_dispatch.h:5100
+#: daemon/remote_dispatch.h:5161 daemon/remote_dispatch.h:5225
+#: daemon/remote_dispatch.h:5287 daemon/remote_dispatch.h:5362
+#: daemon/remote_dispatch.h:5432 daemon/remote_dispatch.h:5490
+#: daemon/remote_dispatch.h:5547 daemon/remote_dispatch.h:5605
+#: daemon/remote_dispatch.h:5657 daemon/remote_dispatch.h:5709
+#: daemon/remote_dispatch.h:5761 daemon/remote_dispatch.h:5815
+#: daemon/remote_dispatch.h:5865 daemon/remote_dispatch.h:5916
+#: daemon/remote_dispatch.h:5966 daemon/remote_dispatch.h:6014
+#: daemon/remote_dispatch.h:6062 daemon/remote_dispatch.h:6113
+#: daemon/remote_dispatch.h:6165 daemon/remote_dispatch.h:6213
+#: daemon/remote_dispatch.h:6266 daemon/remote_dispatch.h:6314
+#: daemon/remote_dispatch.h:6361 daemon/remote_dispatch.h:6407
+#: daemon/remote_dispatch.h:6453 daemon/remote_dispatch.h:6500
+#: daemon/remote_dispatch.h:6554 daemon/remote_dispatch.h:6604
+#: daemon/remote_dispatch.h:6659 daemon/remote_dispatch.h:6715
+#: daemon/remote_dispatch.h:6770 daemon/remote_dispatch.h:6822
+#: daemon/remote_dispatch.h:6872 daemon/remote_dispatch.h:6924
+#: daemon/remote_dispatch.h:6974 daemon/remote_dispatch.h:7038
+#: daemon/remote_dispatch.h:7102 daemon/remote_dispatch.h:7166
+#: daemon/remote_dispatch.h:7230 daemon/remote_dispatch.h:7294
+#: daemon/remote_dispatch.h:7358 daemon/remote_dispatch.h:7422
+#: daemon/remote_dispatch.h:7486 daemon/remote_dispatch.h:7550
+#: daemon/remote_dispatch.h:7612 daemon/remote_dispatch.h:7666
+#: daemon/remote_dispatch.h:7718 daemon/remote_dispatch.h:7768
+#: daemon/remote_dispatch.h:7823 daemon/remote_dispatch.h:7879
+#: daemon/remote_dispatch.h:7935 daemon/remote_dispatch.h:7991
+#: daemon/remote_dispatch.h:8047 daemon/remote_dispatch.h:8102
+#: daemon/remote_dispatch.h:8154 daemon/remote_dispatch.h:8204
+#: daemon/remote_dispatch.h:8256 daemon/remote_dispatch.h:8310
+#: daemon/remote_dispatch.h:8360 daemon/remote_dispatch.h:8412
+#: daemon/remote_dispatch.h:8489 daemon/remote_dispatch.h:8545
+#: daemon/remote_dispatch.h:8614 daemon/remote_dispatch.h:8667
+#: daemon/remote_dispatch.h:8720 daemon/remote_dispatch.h:8772
+#: daemon/remote_dispatch.h:8826 daemon/remote_dispatch.h:8910
+#: daemon/remote_dispatch.h:8958 daemon/remote_dispatch.h:9059
+#: daemon/remote_dispatch.h:9126 daemon/remote_dispatch.h:9175
+#: daemon/remote_dispatch.h:9222 daemon/remote_dispatch.h:9270
+#: daemon/remote_dispatch.h:9318 daemon/remote_dispatch.h:9366
+#: daemon/remote_dispatch.h:9414 daemon/remote_dispatch.h:9462
+#: daemon/remote_dispatch.h:9510 daemon/remote_dispatch.h:9558
+#: daemon/remote_dispatch.h:9606 daemon/remote_dispatch.h:9654
+#: daemon/remote_dispatch.h:9704 daemon/remote_dispatch.h:9757
+#: daemon/remote_dispatch.h:9812 daemon/remote_dispatch.h:9864
+#: daemon/remote_dispatch.h:9914 daemon/remote_dispatch.h:9989
+#: daemon/remote_dispatch.h:10064 daemon/remote_dispatch.h:10119
+#: daemon/remote_dispatch.h:10171 daemon/remote_dispatch.h:10221
+#: daemon/remote_dispatch.h:10273 daemon/remote_dispatch.h:10325
+#: daemon/remote_dispatch.h:10377 daemon/remote_dispatch.h:10431
+#: daemon/remote_dispatch.h:10483 daemon/remote_dispatch.h:10533
+#: daemon/remote_dispatch.h:10585 daemon/remote_dispatch.h:10640
+#: daemon/remote_dispatch.h:10696 daemon/remote_dispatch.h:10755
+#: daemon/remote_dispatch.h:10811 daemon/remote_dispatch.h:10867
+#: daemon/remote_dispatch.h:10923 daemon/remote_dispatch.h:10992
+#: daemon/remote_dispatch.h:11044 daemon/remote_dispatch.h:11097
+#: daemon/remote_dispatch.h:11155 daemon/remote_dispatch.h:11208
+#: daemon/remote_dispatch.h:11260 daemon/remote_dispatch.h:11312
+#: daemon/remote_dispatch.h:11367 daemon/remote_dispatch.h:11426
+#: daemon/remote_dispatch.h:11486 daemon/remote_dispatch.h:11540
+#: daemon/remote_dispatch.h:11611 daemon/remote_dispatch.h:11669
+#: daemon/remote_dispatch.h:11725 daemon/remote_dispatch.h:11780
+#: daemon/remote_dispatch.h:11833 daemon/remote_dispatch.h:11890
+#: daemon/remote_dispatch.h:11942 daemon/remote_dispatch.h:12010
 msgid "connection not open"
 msgstr ""
 
-#: daemon/remote.c:64 src/remote/remote_driver.c:57
+#: daemon/remote.c:63 src/remote/remote_driver.c:57
 #, c-format
 msgid "conversion from hyper to %s overflowed"
 msgstr ""
 
-#: daemon/remote.c:142
+#: daemon/remote.c:599
 msgid "connection already open"
 msgstr ""
 
-#: daemon/remote.c:730 daemon/remote.c:808 src/remote/remote_driver.c:1298
-#: src/remote/remote_driver.c:1369
+#: daemon/remote.c:605
+msgid "keepalive support is required to connect"
+msgstr ""
+
+#: daemon/remote.c:747 daemon/remote.c:837 src/remote/remote_driver.c:1336
+#: src/remote/remote_driver.c:1415
 #, c-format
 msgid "unknown parameter type: %d"
 msgstr ""
 
-#: daemon/remote.c:501 daemon/remote.c:585
+#: daemon/remote.c:783 daemon/remote.c:878 daemon/remote.c:932
+#: daemon/remote.c:1113 daemon/remote.c:1592 daemon/remote.c:1656
+#: daemon/remote.c:1722 daemon/remote.c:1800 daemon/remote.c:1915
 msgid "nparams too large"
 msgstr ""
 
-#: src/remote/remote_driver.c:3196
+#: daemon/remote.c:798 src/remote/remote_driver.c:1376
 #, c-format
 msgid "Parameter %s too big for destination"
 msgstr ""
 
-#: daemon/remote.c:725
+#: daemon/remote.c:988
 msgid "maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX"
 msgstr ""
 
-#: daemon/remote.c:794 daemon/remote.c:843
+#: daemon/remote.c:1059 daemon/remote.c:1186
 msgid "size > maximum buffer size"
 msgstr ""
 
-#: daemon/remote.c:1290
+#: daemon/remote.c:1328
 msgid "ncpumaps > REMOTE_VCPUINFO_MAX"
 msgstr ""
 
-#: daemon/remote.c:1331
+#: daemon/remote.c:1334 daemon/remote.c:1405
 msgid "maxinfo * maplen > REMOTE_CPUMAPS_MAX"
 msgstr ""
 
-#: daemon/remote.c:1325
+#: daemon/remote.c:1399
 msgid "maxinfo > REMOTE_VCPUINFO_MAX"
 msgstr ""
 
-#: daemon/remote.c:2864
+#: daemon/remote.c:2047
 msgid "client tried invalid SASL init request"
 msgstr ""
 
-#: src/util/virterror.c:989
+#: daemon/remote.c:2093 daemon/remote.c:2245 daemon/remote.c:2343
+#: daemon/remote.c:2359 daemon/remote.c:2373 daemon/remote.c:2387
+#: daemon/remote.c:2478 daemon/remote.c:2615 daemon/remote.c:2644
+#: src/util/virterror.c:1020
 msgid "authentication failed"
 msgstr ""
 
-#: daemon/remote.c:3022
+#: daemon/remote.c:2120
 #, c-format
 msgid "negotiated SSF %d was not strong enough"
 msgstr ""
 
-#: daemon/remote.c:3119 daemon/remote.c:3207
+#: daemon/remote.c:2176 daemon/remote.c:2274
 msgid "client tried invalid SASL start request"
 msgstr ""
 
-#: daemon/remote.c:3141
+#: daemon/remote.c:2194
 #, c-format
 msgid "sasl start reply data too long %d"
 msgstr ""
 
-#: daemon/remote.c:3229
+#: daemon/remote.c:2291
 #, c-format
 msgid "sasl step reply data too long %d"
 msgstr ""
 
-#: daemon/remote.c:3356 daemon/remote.c:3425
+#: daemon/remote.c:2430 daemon/remote.c:2527
 msgid "client tried invalid PolicyKit init request"
 msgstr ""
 
-#: daemon/remote.c:3369
+#: daemon/remote.c:2442
 #, c-format
 msgid "Caller PID was too large %d"
 msgstr ""
 
-#: daemon/remote.c:2343 daemon/remote.c:2433
+#: daemon/remote.c:2448 daemon/remote.c:2538
 #, c-format
 msgid "Caller identity was too large %d:%d"
 msgstr ""
 
-#: daemon/remote.c:3374
+#: daemon/remote.c:2453
 #, c-format
 msgid "Cannot invoke %s"
 msgstr ""
 
-#: daemon/remote.c:2353
+#: daemon/remote.c:2458
 #, c-format
 msgid "Policy kit denied action %s from pid %d, uid %d: %s"
 msgstr ""
 
-#: daemon/remote.c:3361 daemon/remote.c:3430
+#: daemon/remote.c:2532
 msgid "cannot get peer socket identity"
 msgstr ""
 
-#: daemon/remote.c:3438
+#: daemon/remote.c:2546
 #, c-format
 msgid "Failed to lookup policy kit caller: %s"
 msgstr ""
 
-#: daemon/remote.c:2448
+#: daemon/remote.c:2553
 #, c-format
 msgid "Failed to create polkit action %s"
 msgstr ""
 
-#: daemon/remote.c:2458
+#: daemon/remote.c:2563
 #, c-format
 msgid "Failed to create polkit context %s"
 msgstr ""
 
-#: daemon/remote.c:3473
+#: daemon/remote.c:2581
 #, c-format
 msgid "Policy kit failed to check authorization %d %s"
 msgstr ""
 
-#: daemon/remote.c:2490
+#: daemon/remote.c:2595
 #, c-format
 msgid "Policy kit denied action %s from pid %d, uid %d, result: %s"
 msgstr ""
 
-#: daemon/remote.c:3518
+#: daemon/remote.c:2642
 msgid "client tried unsupported PolicyKit init request"
 msgstr ""
 
-#: daemon/remote.c:2625 daemon/remote.c:2820
+#: daemon/remote.c:2730 daemon/remote.c:2925
 #, c-format
 msgid "domain event %d already registered"
 msgstr ""
 
-#: daemon/remote.c:2666 daemon/remote.c:2870
+#: daemon/remote.c:2771 daemon/remote.c:2975
 #, c-format
 msgid "domain event %d not registered"
 msgstr ""
 
-#: daemon/remote.c:2815 daemon/remote.c:2864
+#: daemon/remote.c:2920 daemon/remote.c:2969
 #, c-format
 msgid "unsupported event ID %d"
 msgstr ""
 
-#: daemon/remote_dispatch.h:5153 daemon/remote_dispatch.h:5228
+#: daemon/remote_dispatch.h:5293 daemon/remote_dispatch.h:5368
 msgid "maxnames > REMOTE_DOMAIN_SNAPSHOT_LIST_NAMES_MAX"
 msgstr ""
 
-#: daemon/remote.c:1621
+#: daemon/remote_dispatch.h:6980
 msgid "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2586
+#: daemon/remote_dispatch.h:7044
 msgid "maxnames > REMOTE_DEFINED_INTERFACE_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2080 daemon/remote.c:2147 daemon/remote.c:3542
+#: daemon/remote_dispatch.h:7108 daemon/remote_dispatch.h:7364
 msgid "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:3576
+#: daemon/remote_dispatch.h:7172 daemon/remote_dispatch.h:7556
 msgid "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2114
+#: daemon/remote_dispatch.h:7236
 msgid "maxids > REMOTE_DOMAIN_ID_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:2533
+#: daemon/remote_dispatch.h:7300
 msgid "maxnames > REMOTE_INTERFACE_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:7288
+#: daemon/remote_dispatch.h:7428
 msgid "maxnames > REMOTE_NWFILTER_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:4885
+#: daemon/remote_dispatch.h:7492
 msgid "maxuuids > REMOTE_SECRET_UUID_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:8411
+#: daemon/remote_dispatch.h:8551
 msgid "maxnames > REMOTE_NODE_DEVICE_CAPS_LIST_MAX"
 msgstr ""
 
-#: daemon/remote_dispatch.h:8692
+#: daemon/remote_dispatch.h:8832
 msgid "maxcells > REMOTE_NODE_MAX_CELLS"
 msgstr ""
 
-#: daemon/remote.c:4429 daemon/remote.c:4600
+#: daemon/remote_dispatch.h:9065
 msgid "maxnames > REMOTE_NODE_DEVICE_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/remote.c:4062
+#: daemon/remote_dispatch.h:10929
 msgid "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX"
 msgstr ""
 
-#: daemon/stream.c:113
+#: daemon/stream.c:237
 msgid "stream had unexpected termination"
 msgstr ""
 
-#: daemon/stream.c:115
+#: daemon/stream.c:240
 msgid "stream had I/O failure"
 msgstr ""
 
-#: daemon/stream.c:468
+#: daemon/stream.c:622
 msgid "stream aborted at client request"
 msgstr ""
 
-#: daemon/stream.c:471
+#: daemon/stream.c:626
 #, c-format
 msgid "stream aborted with unexpected status %d"
 msgstr ""
@@ -493,1972 +614,2034 @@
 msgid "Unknown error"
 msgstr ""
 
-#: src/conf/cpu_conf.c:126
+#: src/conf/cpu_conf.c:132
 msgid "XML does not contain expected 'cpu' element"
 msgstr ""
 
-#: src/conf/cpu_conf.c:139
+#: src/conf/cpu_conf.c:145
 msgid ""
 "'arch' element element cannot be used inside 'cpu' element with 'match' "
 "attribute'"
 msgstr ""
 
-#: src/conf/cpu_conf.c:98
+#: src/conf/cpu_conf.c:169
 msgid "Invalid match attribute for CPU specification"
 msgstr ""
 
-#: src/conf/cpu_conf.c:107
+#: src/conf/cpu_conf.c:179
 msgid "Missing CPU architecture"
 msgstr ""
 
-#: src/conf/cpu_conf.c:114 src/cpu/cpu_x86.c:602
+#: src/conf/cpu_conf.c:187 src/cpu/cpu_x86.c:949
 msgid "Missing CPU model name"
 msgstr ""
 
-#: src/conf/cpu_conf.c:188
+#: src/conf/cpu_conf.c:194
 msgid "CPU vendor specified without CPU model"
 msgstr ""
 
-#: src/conf/cpu_conf.c:126
+#: src/conf/cpu_conf.c:206
 msgid "Missing 'sockets' attribute in CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:135
+#: src/conf/cpu_conf.c:215
 msgid "Missing 'cores' attribute in CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:144
+#: src/conf/cpu_conf.c:224
 msgid "Missing 'threads' attribute in CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:151
+#: src/conf/cpu_conf.c:231
 msgid "Invalid CPU topology"
 msgstr ""
 
-#: src/conf/cpu_conf.c:237 src/conf/cpu_conf.c:372
+#: src/conf/cpu_conf.c:243 src/conf/cpu_conf.c:433
 msgid "Non-empty feature list specified without CPU model"
 msgstr ""
 
-#: src/conf/cpu_conf.c:180
+#: src/conf/cpu_conf.c:270
 msgid "Invalid CPU feature policy"
 msgstr ""
 
-#: src/conf/cpu_conf.c:190
+#: src/conf/cpu_conf.c:280
 msgid "Invalid CPU feature name"
 msgstr ""
 
-#: src/conf/cpu_conf.c:197 src/conf/cpu_conf.c:345
+#: src/conf/cpu_conf.c:287 src/conf/cpu_conf.c:502
 #, c-format
 msgid "CPU feature `%s' specified more than once"
 msgstr ""
 
-#: src/conf/cpu_conf.c:277
+#: src/conf/cpu_conf.c:303
+msgid "NUMA topology defined without NUMA cells"
+msgstr ""
+
+#: src/conf/cpu_conf.c:322
+msgid "Missing 'cpus' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:339
+msgid "Missing 'memory' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:346
+msgid "Invalid 'memory' attribute in NUMA cell"
+msgstr ""
+
+#: src/conf/cpu_conf.c:400
 #, c-format
 msgid "Unexpected CPU match policy %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:305 src/cpu/cpu_x86.c:289
+#: src/conf/cpu_conf.c:457 src/cpu/cpu_x86.c:669
 msgid "Missing CPU feature name"
 msgstr ""
 
-#: src/conf/cpu_conf.c:315
+#: src/conf/cpu_conf.c:467
 #, c-format
 msgid "Unexpected CPU feature policy %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:468
+#: src/conf/cpu_conf.c:539
 msgid "Target CPU does not match source"
 msgstr ""
 
-#: src/conf/cpu_conf.c:474
+#: src/conf/cpu_conf.c:545
 #, c-format
 msgid "Target CPU type %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:482
+#: src/conf/cpu_conf.c:553
 #, c-format
 msgid "Target CPU arch %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:489
+#: src/conf/cpu_conf.c:560
 #, c-format
 msgid "Target CPU model %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:496
+#: src/conf/cpu_conf.c:567
 #, c-format
 msgid "Target CPU vendor %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:503
+#: src/conf/cpu_conf.c:574
 #, c-format
 msgid "Target CPU sockets %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:510
+#: src/conf/cpu_conf.c:581
 #, c-format
 msgid "Target CPU cores %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:517
+#: src/conf/cpu_conf.c:588
 #, c-format
 msgid "Target CPU threads %d does not match source %d"
 msgstr ""
 
-#: src/conf/cpu_conf.c:524
+#: src/conf/cpu_conf.c:595
 #, c-format
 msgid "Target CPU feature count %zu does not match source %zu"
 msgstr ""
 
-#: src/conf/cpu_conf.c:532
+#: src/conf/cpu_conf.c:603
 #, c-format
 msgid "Target CPU feature %s does not match source %s"
 msgstr ""
 
-#: src/conf/cpu_conf.c:539
+#: src/conf/cpu_conf.c:610
 #, c-format
 msgid "Target CPU feature policy %s does not match source %s"
 msgstr ""
 
-#: daemon/libvirtd.c:831 daemon/libvirtd.c:1329 src/conf/domain_conf.c:667
-#: src/conf/interface_conf.c:1373 src/conf/network_conf.c:175
-#: src/conf/node_device_conf.c:196 src/conf/storage_conf.c:1460
-#: src/openvz/openvz_conf.c:465 src/qemu/qemu_driver.c:961
-#: src/remote/remote_driver.c:978 src/remote/remote_driver.c:7171
-#: src/remote/remote_driver.c:7350 src/remote/remote_driver.c:7562
-#: src/test/test_driver.c:509 src/test/test_driver.c:754
+#: src/conf/domain_conf.c:643
+#, c-format
+msgid "could not parse weight %s"
+msgstr ""
+
+#: src/conf/domain_conf.c:656
+msgid "missing per-device path"
+msgstr ""
+
+#: src/conf/domain_conf.c:1543 src/conf/interface_conf.c:1288
+#: src/conf/network_conf.c:227 src/conf/node_device_conf.c:195
+#: src/conf/nwfilter_conf.c:2844 src/conf/storage_conf.c:1409
+#: src/libxl/libxl_driver.c:880 src/openvz/openvz_conf.c:474
+#: src/qemu/qemu_driver.c:420 src/remote/remote_driver.c:778
+#: src/rpc/virnetclientstream.c:151 src/rpc/virnetserver.c:377
+#: src/test/test_driver.c:526 src/test/test_driver.c:766
+#: src/xen/xen_driver.c:321
 msgid "cannot initialize mutex"
 msgstr ""
 
-#: src/conf/domain_conf.c:1724
+#: src/conf/domain_conf.c:1914
 #, c-format
 msgid "unknown address type '%d'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1752
+#: src/conf/domain_conf.c:1942
 msgid "Cannot parse <address> 'domain' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1759 src/conf/domain_conf.c:1826
-#: src/conf/domain_conf.c:1878 src/conf/domain_conf.c:1968
+#: src/conf/domain_conf.c:1949 src/conf/domain_conf.c:2016
+#: src/conf/domain_conf.c:2068 src/conf/domain_conf.c:2158
 msgid "Cannot parse <address> 'bus' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1766 src/conf/domain_conf.c:1927
+#: src/conf/domain_conf.c:1956 src/conf/domain_conf.c:2117
 msgid "Cannot parse <address> 'slot' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1773
+#: src/conf/domain_conf.c:1963
 msgid "Cannot parse <address> 'function' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1780
+#: src/conf/domain_conf.c:1970
 #, c-format
 msgid "Unknown value '%s' for <address> 'multifunction' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1787
+#: src/conf/domain_conf.c:1977
 msgid "Insufficient specification for PCI address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1819 src/conf/domain_conf.c:1871
-#: src/conf/domain_conf.c:1920
+#: src/conf/domain_conf.c:2009 src/conf/domain_conf.c:2061
+#: src/conf/domain_conf.c:2110
 msgid "Cannot parse <address> 'controller' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1833
+#: src/conf/domain_conf.c:2023
 msgid "Cannot parse <address> 'unit' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1839
+#: src/conf/domain_conf.c:2029
 msgid "Insufficient specification for drive address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1885 src/conf/domain_conf.c:1958
+#: src/conf/domain_conf.c:2075 src/conf/domain_conf.c:2148
 msgid "Cannot parse <address> 'port' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:1891
+#: src/conf/domain_conf.c:2081
 msgid "Insufficient specification for virtio serial address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1994
+#: src/conf/domain_conf.c:2184
 msgid "Cannot parse <master> 'startport' attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2057
+#: src/conf/domain_conf.c:2247
 #, c-format
 msgid "unknown address type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2062
+#: src/conf/domain_conf.c:2252
 msgid "No type specified for device address"
 msgstr ""
 
-#: src/conf/domain_conf.c:2096
+#: src/conf/domain_conf.c:2286
 msgid "Unknown device address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2121
+#: src/conf/domain_conf.c:2311
 msgid "missing boot order attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2126
+#: src/conf/domain_conf.c:2316
 #, c-format
 msgid "incorrect boot order '%s', expecting positive integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:2135
+#: src/conf/domain_conf.c:2325
 msgid "boot orders have to be contiguous and starting from 1"
 msgstr ""
 
-#: src/conf/domain_conf.c:2139
+#: src/conf/domain_conf.c:2329
 #, c-format
 msgid "boot order %d used for more than one device"
 msgstr ""
 
-#: src/conf/domain_conf.c:2278
+#: src/conf/domain_conf.c:2468
 msgid "Missing 'key' element for lease"
 msgstr ""
 
-#: src/conf/domain_conf.c:2283
+#: src/conf/domain_conf.c:2473
 msgid "Missing 'target' element for lease"
 msgstr ""
 
-#: src/conf/domain_conf.c:2290
+#: src/conf/domain_conf.c:2480
 #, c-format
 msgid "Malformed lease target offset %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:764
+#: src/conf/domain_conf.c:2554
 #, c-format
 msgid "unknown disk type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2390
+#: src/conf/domain_conf.c:2584
 msgid "missing protocol type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2396
+#: src/conf/domain_conf.c:2590
 #, c-format
 msgid "unknown protocol type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2403
+#: src/conf/domain_conf.c:2597
 msgid "missing name for disk source"
 msgstr ""
 
-#: src/conf/domain_conf.c:2421
+#: src/conf/domain_conf.c:2615
 msgid "missing name for host"
 msgstr ""
 
-#: src/conf/domain_conf.c:2427
+#: src/conf/domain_conf.c:2621
 msgid "missing port for host"
 msgstr ""
 
-#: src/conf/domain_conf.c:789 src/conf/domain_conf.c:3930
+#: src/conf/domain_conf.c:2630 src/conf/domain_conf.c:9800
 #, c-format
 msgid "unexpected disk type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2472
+#: src/conf/domain_conf.c:2666
 msgid "missing username for auth"
 msgstr ""
 
-#: src/conf/domain_conf.c:2484
+#: src/conf/domain_conf.c:2678
 msgid "missing type for secret"
 msgstr ""
 
-#: src/conf/domain_conf.c:2490
+#: src/conf/domain_conf.c:2684
 #, c-format
 msgid "invalid secret type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2500
+#: src/conf/domain_conf.c:2694
 msgid "only one of uuid and usage can be specfied"
 msgstr ""
 
-#: src/conf/domain_conf.c:2508
+#: src/conf/domain_conf.c:2702
 #, c-format
 msgid "malformed uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:841
+#: src/conf/domain_conf.c:2756
+msgid "total and read/write bytes_sec cannot be set at the same time"
+msgstr ""
+
+#: src/conf/domain_conf.c:2766
+msgid "total and read/write iops_sec cannot be set at the same time"
+msgstr ""
+
+#: src/conf/domain_conf.c:2802
 #, c-format
 msgid "unknown disk device '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:867
+#: src/conf/domain_conf.c:2828
 #, c-format
 msgid "Invalid floppy device name: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:882
+#: src/conf/domain_conf.c:2843
 #, c-format
 msgid "Invalid harddisk device name: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2601 src/conf/domain_conf.c:11889
+#: src/conf/domain_conf.c:2851 src/conf/domain_conf.c:12255
 #, c-format
 msgid "unknown disk snapshot setting '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:889
+#: src/conf/domain_conf.c:2862
 #, c-format
 msgid "unknown disk bus type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:914
+#: src/conf/domain_conf.c:2887
 #, c-format
 msgid "Invalid bus type '%s' for floppy disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:920
+#: src/conf/domain_conf.c:2893
 #, c-format
 msgid "Invalid bus type '%s' for disk"
 msgstr ""
 
-#: src/conf/domain_conf.c:927
+#: src/conf/domain_conf.c:2900
 #, c-format
 msgid "unknown disk cache mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2657
+#: src/conf/domain_conf.c:2907
 #, c-format
 msgid "unknown disk error policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2666
+#: src/conf/domain_conf.c:2916
 #, c-format
 msgid "unknown disk read error policy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2675
+#: src/conf/domain_conf.c:2925
 #, c-format
 msgid "unknown disk io mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2683
+#: src/conf/domain_conf.c:2933
 msgid "disk ioeventfd mode supported only for virtio bus"
 msgstr ""
 
-#: src/conf/domain_conf.c:2691
+#: src/conf/domain_conf.c:2941
 #, c-format
 msgid "unknown disk ioeventfd mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2701
+#: src/conf/domain_conf.c:2951
 msgid "disk event_idx mode supported only for virtio bus"
 msgstr ""
 
-#: src/conf/domain_conf.c:2709
+#: src/conf/domain_conf.c:2959
 #, c-format
 msgid "unknown disk event_idx mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:937 src/conf/domain_conf.c:1182
-#: src/conf/domain_conf.c:2396
+#: src/conf/domain_conf.c:2970 src/conf/domain_conf.c:3553
+#: src/conf/domain_conf.c:5876
 #, c-format
 msgid "Unable to parse devaddr parameter '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2735
+#: src/conf/domain_conf.c:2985
 #, c-format
 msgid "unknown startupPolicy value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2743
+#: src/conf/domain_conf.c:2993
 #, c-format
 msgid "Setting disk %s is allowed only for cdrom or floppy"
 msgstr ""
 
-#: src/conf/domain_conf.c:2859
+#: src/conf/domain_conf.c:3110
 #, c-format
 msgid "Unknown controller type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2868
+#: src/conf/domain_conf.c:3119
 #, c-format
 msgid "Cannot parse controller index %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2877
+#: src/conf/domain_conf.c:3128
 #, c-format
 msgid "Unknown model type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2895
+#: src/conf/domain_conf.c:3146
 #, c-format
 msgid "Invalid ports: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2910
+#: src/conf/domain_conf.c:3161
 #, c-format
 msgid "Invalid vectors: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2928
+#: src/conf/domain_conf.c:3179
 msgid "Controllers must use the 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:999
+#: src/conf/domain_conf.c:3219
 #, c-format
 msgid "unknown filesystem type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2979
+#: src/conf/domain_conf.c:3230
 #, c-format
 msgid "unknown accessmode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3015
+#: src/conf/domain_conf.c:3266
 #, c-format
 msgid "unknown fs driver type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3077
+#: src/conf/domain_conf.c:3328
 msgid "missing type attribute in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3082
+#: src/conf/domain_conf.c:3333
 #, c-format
 msgid "unknown type '%s' in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3089
+#: src/conf/domain_conf.c:3340
 #, c-format
 msgid "unsupported type '%s' in interface's <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3106
+#: src/conf/domain_conf.c:3357
 #, c-format
 msgid "Unkown mode '%s' in interface <actual> element"
 msgstr ""
 
-#: src/conf/domain_conf.c:1098
+#: src/conf/domain_conf.c:3438
 #, c-format
 msgid "unknown interface type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1168 src/qemu/qemu_conf.c:3426
+#: src/conf/domain_conf.c:3541 src/qemu/qemu_command.c:6158
 #, c-format
 msgid "unable to parse mac address '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3318
+#: src/conf/domain_conf.c:3568
 msgid "Network interfaces must use 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1202
+#: src/conf/domain_conf.c:3576
 msgid ""
 "No <source> 'network' attribute specified with <interface type='network'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:1228
+#: src/conf/domain_conf.c:3608
 msgid ""
 "No <source> 'bridge' attribute specified with <interface type='bridge'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:1248
+#: src/conf/domain_conf.c:3628
 msgid "No <source> 'port' attribute specified with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1253
+#: src/conf/domain_conf.c:3633
 msgid "Cannot parse <source> 'port' attribute with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1261
+#: src/conf/domain_conf.c:3641
 msgid "No <source> 'address' attribute specified with socket interface"
 msgstr ""
 
-#: src/conf/domain_conf.c:1273
+#: src/conf/domain_conf.c:3653
 msgid ""
 "No <source> 'name' attribute specified with <interface type='internal'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:3413
+#: src/conf/domain_conf.c:3663
 msgid "No <source> 'dev' attribute specified with <interface type='direct'/>"
 msgstr ""
 
-#: src/conf/domain_conf.c:3421
+#: src/conf/domain_conf.c:3671
 msgid "Unkown mode has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:1297
+#: src/conf/domain_conf.c:3709
 msgid "Model name contains invalid characters"
 msgstr ""
 
-#: src/conf/domain_conf.c:3473
+#: src/conf/domain_conf.c:3723
 #, c-format
 msgid "Unknown interface <driver name='%s'> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:3485
+#: src/conf/domain_conf.c:3735
 #, c-format
 msgid "Unknown interface <driver txmode='%s'> has been specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:3496
+#: src/conf/domain_conf.c:3746
 #, c-format
 msgid "unknown interface ioeventfd mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3506
+#: src/conf/domain_conf.c:3756
 #, c-format
 msgid "unknown interface event_idx mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3518
+#: src/conf/domain_conf.c:3768
 #, c-format
 msgid "unknown interface link state '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3544
+#: src/conf/domain_conf.c:3794
 msgid "sndbuf must be a positive integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:3592
+#: src/conf/domain_conf.c:3842
 #, c-format
 msgid "target type must be specified for %s device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3599
+#: src/conf/domain_conf.c:3849
 msgid "Driver does not have a default console type set"
 msgstr ""
 
-#: src/conf/domain_conf.c:1503
+#: src/conf/domain_conf.c:3928
 msgid "guestfwd channel does not define a target address"
 msgstr ""
 
-#: src/conf/domain_conf.c:1521
+#: src/conf/domain_conf.c:3943
 msgid "guestfwd channel only supports IPv4 addresses"
 msgstr ""
 
-#: src/conf/domain_conf.c:1528
+#: src/conf/domain_conf.c:3950
 msgid "guestfwd channel does not define a target port"
 msgstr ""
 
-#: src/conf/domain_conf.c:1491 src/conf/domain_conf.c:1534
+#: src/conf/domain_conf.c:3957 src/conf/domain_conf.c:3981
+#: src/conf/storage_conf.c:439
 #, c-format
 msgid "Invalid port number: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1445
+#: src/conf/domain_conf.c:4053
 #, c-format
 msgid "Unknown source mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1567 src/conf/domain_conf.c:1651
+#: src/conf/domain_conf.c:4086 src/conf/domain_conf.c:4169
 msgid "Missing source path attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1584 src/conf/domain_conf.c:1601
+#: src/conf/domain_conf.c:4104 src/conf/domain_conf.c:4121
 msgid "Missing source host attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1589 src/conf/domain_conf.c:1606
-#: src/conf/domain_conf.c:1633
+#: src/conf/domain_conf.c:4109 src/conf/domain_conf.c:4126
+#: src/conf/domain_conf.c:4151
 msgid "Missing source service attribute for char device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1624
+#: src/conf/domain_conf.c:4142
 #, c-format
 msgid "Unknown protocol '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4022 src/conf/domain_conf.c:4166
+#: src/conf/domain_conf.c:4272 src/conf/domain_conf.c:4416
 #, c-format
 msgid "unknown type presented to host for character device: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4030
+#: src/conf/domain_conf.c:4280
 #, c-format
 msgid "unknown character device type: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4059
+#: src/conf/domain_conf.c:4309
 msgid "spicevmc device type only supports virtio"
 msgstr ""
 
-#: src/conf/domain_conf.c:4099
+#: src/conf/domain_conf.c:4349
 msgid "missing smartcard device mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4104
+#: src/conf/domain_conf.c:4354
 #, c-format
 msgid "unknown smartcard device mode: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4121 src/conf/domain_conf.c:4150
+#: src/conf/domain_conf.c:4371 src/conf/domain_conf.c:4400
 msgid "host-certificates mode needs exactly three certificates"
 msgstr ""
 
-#: src/conf/domain_conf.c:4141
+#: src/conf/domain_conf.c:4391
 #, c-format
 msgid "expecting absolute path: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4160
+#: src/conf/domain_conf.c:4410
 msgid "passthrough mode requires a character device type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:4184
+#: src/conf/domain_conf.c:4434
 msgid "unknown smartcard mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4193
+#: src/conf/domain_conf.c:4443
 msgid "Controllers must use the 'ccid' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1707
+#: src/conf/domain_conf.c:4479
 msgid "missing input device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1713
+#: src/conf/domain_conf.c:4485
 #, c-format
 msgid "unknown input device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1720
+#: src/conf/domain_conf.c:4492
 #, c-format
 msgid "unknown input bus type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1728
+#: src/conf/domain_conf.c:4500
 #, c-format
 msgid "ps2 bus does not support %s input device"
 msgstr ""
 
-#: src/conf/domain_conf.c:1734 src/conf/domain_conf.c:1741
+#: src/conf/domain_conf.c:4506 src/conf/domain_conf.c:4513
 #, c-format
 msgid "unsupported input bus %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1746
+#: src/conf/domain_conf.c:4518
 #, c-format
 msgid "xen bus does not support %s input device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4291 src/conf/domain_conf.c:5834
+#: src/conf/domain_conf.c:4541 src/conf/domain_conf.c:6084
 msgid "Invalid address for a USB device"
 msgstr ""
 
-#: src/conf/domain_conf.c:4324
+#: src/conf/domain_conf.c:4574
 msgid "missing hub device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4330
+#: src/conf/domain_conf.c:4580
 #, c-format
 msgid "unknown hub device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4375
+#: src/conf/domain_conf.c:4625
 msgid "missing timer name"
 msgstr ""
 
-#: src/conf/domain_conf.c:4380
+#: src/conf/domain_conf.c:4630
 #, c-format
 msgid "unknown timer name '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4392
+#: src/conf/domain_conf.c:4642
 #, c-format
 msgid "unknown timer present value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4402
+#: src/conf/domain_conf.c:4652
 #, c-format
 msgid "unknown timer tickpolicy '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4412
+#: src/conf/domain_conf.c:4662
 #, c-format
 msgid "unknown timer track '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4422
+#: src/conf/domain_conf.c:4672
 msgid "invalid timer frequency"
 msgstr ""
 
-#: src/conf/domain_conf.c:4431
+#: src/conf/domain_conf.c:4681
 #, c-format
 msgid "unknown timer mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4444
+#: src/conf/domain_conf.c:4694
 msgid "invalid catchup threshold"
 msgstr ""
 
-#: src/conf/domain_conf.c:4453
+#: src/conf/domain_conf.c:4703
 msgid "invalid catchup slew"
 msgstr ""
 
-#: src/conf/domain_conf.c:4462
+#: src/conf/domain_conf.c:4712
 msgid "invalid catchup limit"
 msgstr ""
 
-#: src/conf/domain_conf.c:4515
+#: src/conf/domain_conf.c:4765
 #, c-format
 msgid "cannot parse password validity time '%s', expect YYYY-MM-DDTHH:MM:SS"
 msgstr ""
 
-#: src/conf/domain_conf.c:4534
+#: src/conf/domain_conf.c:4784
 #, c-format
 msgid "unknown connected value %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4545
+#: src/conf/domain_conf.c:4795
 msgid "VNC supports connected='keep' only"
 msgstr ""
 
-#: src/conf/domain_conf.c:4567
+#: src/conf/domain_conf.c:4817
 msgid "graphics listen type must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:4573
+#: src/conf/domain_conf.c:4823
 #, c-format
 msgid "unknown graphics listen type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4593
+#: src/conf/domain_conf.c:4843
 msgid "network attribute not allowed when listen type is not network"
 msgstr ""
 
-#: src/conf/domain_conf.c:1791
+#: src/conf/domain_conf.c:4885
 msgid "missing graphics device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:1797
+#: src/conf/domain_conf.c:4891
 #, c-format
 msgid "unknown graphics device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:4708
+#: src/conf/domain_conf.c:4958
 #, c-format
 msgid ""
 "graphics listen attribute %s must match address attribute of first listen "
 "element (found %s)"
 msgstr ""
 
-#: src/conf/domain_conf.c:1808
+#: src/conf/domain_conf.c:4974
 #, c-format
 msgid "cannot parse vnc port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:1846 src/conf/domain_conf.c:1908
+#: src/conf/domain_conf.c:5015 src/conf/domain_conf.c:5076
 #, c-format
 msgid "unknown fullscreen value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1864
+#: src/conf/domain_conf.c:5033
 #, c-format
 msgid "cannot parse rdp port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4844
+#: src/conf/domain_conf.c:5094
 #, c-format
 msgid "cannot parse spice port %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4857
+#: src/conf/domain_conf.c:5107
 #, c-format
 msgid "cannot parse spice tlsPort %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4894
+#: src/conf/domain_conf.c:5144
 msgid "spice channel missing name/mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:4902
+#: src/conf/domain_conf.c:5152
 #, c-format
 msgid "unknown spice channel name %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4910
+#: src/conf/domain_conf.c:5160
 #, c-format
 msgid "unknown spice channel mode %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4926
+#: src/conf/domain_conf.c:5176
 msgid "spice image missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4933
+#: src/conf/domain_conf.c:5183
 #, c-format
 msgid "unknown spice image compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4947
+#: src/conf/domain_conf.c:5197
 msgid "spice jpeg missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4954
+#: src/conf/domain_conf.c:5204
 #, c-format
 msgid "unknown spice jpeg compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4968
+#: src/conf/domain_conf.c:5218
 msgid "spice zlib missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4975
+#: src/conf/domain_conf.c:5225
 #, c-format
 msgid "unknown spice zlib compression %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:4989
+#: src/conf/domain_conf.c:5239
 msgid "spice playback missing compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:4996
+#: src/conf/domain_conf.c:5246
 msgid "unknown spice playback compression"
 msgstr ""
 
-#: src/conf/domain_conf.c:5010
+#: src/conf/domain_conf.c:5260
 msgid "spice streaming missing mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:5016
+#: src/conf/domain_conf.c:5266
 msgid "unknown spice streaming mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:5030
+#: src/conf/domain_conf.c:5280
 msgid "spice clipboard missing copypaste"
 msgstr ""
 
-#: src/conf/domain_conf.c:5037
+#: src/conf/domain_conf.c:5287
 #, c-format
 msgid "unknown copypaste value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1947
+#: src/conf/domain_conf.c:5330
 #, c-format
 msgid "unknown sound model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1980
+#: src/conf/domain_conf.c:5366
 msgid "watchdog must contain model name"
 msgstr ""
 
-#: src/conf/domain_conf.c:1986
+#: src/conf/domain_conf.c:5372
 #, c-format
 msgid "unknown watchdog model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:1997
+#: src/conf/domain_conf.c:5383
 #, c-format
 msgid "unknown watchdog action '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5169
+#: src/conf/domain_conf.c:5419
 msgid "balloon memory must contain model name"
 msgstr ""
 
-#: src/conf/domain_conf.c:5174
+#: src/conf/domain_conf.c:5424
 #, c-format
 msgid "unknown memory balloon model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5201
+#: src/conf/domain_conf.c:5451
 msgid "XML does not contain expected 'sysinfo' element"
 msgstr ""
 
-#: src/conf/domain_conf.c:5213
+#: src/conf/domain_conf.c:5463
 msgid "sysinfo must contain a type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:5218
+#: src/conf/domain_conf.c:5468
 #, c-format
 msgid "unknown sysinfo type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2143
+#: src/conf/domain_conf.c:5646
 #, c-format
 msgid "unknown video model '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2149
+#: src/conf/domain_conf.c:5652
 msgid "missing video model and cannot determine default"
 msgstr ""
 
-#: src/conf/domain_conf.c:2157
+#: src/conf/domain_conf.c:5660
 #, c-format
 msgid "cannot parse video ram '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2167
+#: src/conf/domain_conf.c:5670
 #, c-format
 msgid "cannot parse video heads '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2214
+#: src/conf/domain_conf.c:5719
 #, c-format
 msgid "cannot parse vendor id %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2221
+#: src/conf/domain_conf.c:5726
 msgid "usb vendor needs id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2232
+#: src/conf/domain_conf.c:5737
 #, c-format
 msgid "cannot parse product %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2240
+#: src/conf/domain_conf.c:5745
 msgid "usb product needs id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2251 src/conf/domain_conf.c:2343
+#: src/conf/domain_conf.c:5756
 #, c-format
 msgid "cannot parse bus %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2258
+#: src/conf/domain_conf.c:5763
 msgid "usb address needs bus id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2267
+#: src/conf/domain_conf.c:5772
 #, c-format
 msgid "cannot parse device %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2275
+#: src/conf/domain_conf.c:5780
 msgid "usb address needs device id"
 msgstr ""
 
-#: src/conf/domain_conf.c:2280
+#: src/conf/domain_conf.c:5785
 #, c-format
 msgid "unknown usb source type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2290
+#: src/conf/domain_conf.c:5795
 msgid "vendor cannot be 0."
 msgstr ""
 
-#: src/conf/domain_conf.c:2296
+#: src/conf/domain_conf.c:5801
 msgid "missing vendor"
 msgstr ""
 
-#: src/conf/domain_conf.c:2301
+#: src/conf/domain_conf.c:5806
 msgid "missing product"
 msgstr ""
 
-#: src/conf/domain_conf.c:5590
+#: src/conf/domain_conf.c:5840
 #, c-format
 msgid "unsupported element '%s' of 'origstates'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2403
+#: src/conf/domain_conf.c:5889
 #, c-format
 msgid "unknown pci source type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2436
+#: src/conf/domain_conf.c:5921
 #, c-format
 msgid "unknown hostdev mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2447
+#: src/conf/domain_conf.c:5932
 #, c-format
 msgid "unknown host device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2452
+#: src/conf/domain_conf.c:5937
 msgid "missing type in hostdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:5724
+#: src/conf/domain_conf.c:5974
 msgid "missing rom bar attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:5729
+#: src/conf/domain_conf.c:5979
 #, c-format
 msgid "unknown rom bar value '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2480
+#: src/conf/domain_conf.c:5986
 #, c-format
 msgid "unknown node %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5753
+#: src/conf/domain_conf.c:6003
 msgid "PCI host devices must use 'pci' address type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5789
+#: src/conf/domain_conf.c:6039
 #, c-format
 msgid "unknown redirdev bus '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5800
+#: src/conf/domain_conf.c:6050
 #, c-format
 msgid "unknown redirdev character device type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5805
+#: src/conf/domain_conf.c:6055
 msgid "missing type in redirdev"
 msgstr ""
 
-#: src/conf/domain_conf.c:2511
+#: src/conf/domain_conf.c:6113
 #, c-format
 msgid "unknown lifecycle action %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2535
+#: src/conf/domain_conf.c:6136
 msgid "missing security type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2542
+#: src/conf/domain_conf.c:6143
 msgid "invalid security type"
 msgstr ""
 
-#: src/conf/domain_conf.c:5905
+#: src/conf/domain_conf.c:6155
 #, c-format
 msgid "invalid security relabel value %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5913
+#: src/conf/domain_conf.c:6163
 msgid "dynamic label type must use resource relabeling"
 msgstr ""
 
-#: src/conf/domain_conf.c:2564
+#: src/conf/domain_conf.c:6182
 msgid "security label is missing"
 msgstr ""
 
-#: src/conf/domain_conf.c:2578
+#: src/conf/domain_conf.c:6196
 msgid "security imagelabel is missing"
 msgstr ""
 
-#: src/conf/domain_conf.c:2555
+#: src/conf/domain_conf.c:6220
 msgid "missing security model"
 msgstr ""
 
-#: src/conf/domain_conf.c:5993
+#: src/conf/domain_conf.c:6243 tools/virsh.c:12067
 msgid "(device_definition)"
 msgstr ""
 
-#: src/conf/domain_conf.c:2656
+#: src/conf/domain_conf.c:6311
 msgid "unknown device type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2737
+#: src/conf/domain_conf.c:6653
 msgid "unknown virt type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2748
+#: src/conf/domain_conf.c:6664
 #, c-format
 msgid "no emulator for domain %s os type %s on architecture %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6442
+#: src/conf/domain_conf.c:6692
 msgid "cannot count boot devices"
 msgstr ""
 
-#: src/conf/domain_conf.c:6453
+#: src/conf/domain_conf.c:6703
 msgid ""
 "per-device boot elements cannot be used together with os/boot elements"
 msgstr ""
 
-#: src/conf/domain_conf.c:2995
+#: src/conf/domain_conf.c:6713
 msgid "missing boot device"
 msgstr ""
 
-#: src/conf/domain_conf.c:3000
+#: src/conf/domain_conf.c:6718
 #, c-format
 msgid "unknown boot device '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:6496
+#: src/conf/domain_conf.c:6746
 msgid "need at least one serial port for useserial"
 msgstr ""
 
-#: src/conf/domain_conf.c:6537
+#: src/conf/domain_conf.c:6787
 msgid "vcpu id must be an unsigned integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6541
+#: src/conf/domain_conf.c:6791
 msgid "can't parse vcpupin node"
 msgstr ""
 
-#: src/conf/domain_conf.c:6547
+#: src/conf/domain_conf.c:6797
 msgid "vcpu id must be less than maxvcpus"
 msgstr ""
 
-#: src/conf/domain_conf.c:6570
+#: src/conf/domain_conf.c:6819
 msgid "missing cpuset for vcpupin"
 msgstr ""
 
-#: src/conf/domain_conf.c:2783
+#: src/conf/domain_conf.c:6863
 msgid "missing domain type attribute"
 msgstr ""
 
-#: src/conf/domain_conf.c:2789
+#: src/conf/domain_conf.c:6869
 #, c-format
 msgid "invalid domain type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6628
+#: src/conf/domain_conf.c:6877
 #, c-format
 msgid "unexpected domain type %s, expecting %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6653
+#: src/conf/domain_conf.c:6902
 #, c-format
 msgid "unexpected domain type %s, expecting one of these: %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2805 src/conf/network_conf.c:415
-#: src/conf/secret_conf.c:165
+#: src/conf/domain_conf.c:6926 src/conf/network_conf.c:848
+#: src/conf/secret_conf.c:180 src/openvz/openvz_conf.c:971
 msgid "Failed to generate UUID"
 msgstr ""
 
-#: src/conf/domain_conf.c:2811 src/conf/network_conf.c:422
-#: src/conf/secret_conf.c:171 src/conf/storage_conf.c:655
+#: src/conf/domain_conf.c:6933 src/conf/domain_conf.c:7882
+#: src/conf/network_conf.c:855 src/conf/nwfilter_conf.c:2448
+#: src/conf/secret_conf.c:186 src/conf/storage_conf.c:670
 msgid "malformed uuid element"
 msgstr ""
 
-#: src/conf/domain_conf.c:2823
+#: src/conf/domain_conf.c:6946
 msgid "missing memory element"
 msgstr ""
 
-#: src/conf/domain_conf.c:6734
+#: src/conf/domain_conf.c:6965
+msgid "cannot extract blkiotune nodes"
+msgstr ""
+
+#: src/conf/domain_conf.c:6981
+#, c-format
+msgid "duplicate device weight path '%s'"
+msgstr ""
+
+#: src/conf/domain_conf.c:7009
 msgid "maximum vcpus must be an integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6742
+#: src/conf/domain_conf.c:7017
 #, c-format
 msgid "invalid maxvcpus %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6750
+#: src/conf/domain_conf.c:7025
 msgid "current vcpus must be an integer"
 msgstr ""
 
-#: src/conf/domain_conf.c:6758
+#: src/conf/domain_conf.c:7033
 #, c-format
 msgid "invalid current vcpus %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6764
+#: src/conf/domain_conf.c:7039
 #, c-format
 msgid "maxvcpus must not be less than current vcpus (%d < %lu)"
 msgstr ""
 
-#: src/conf/domain_conf.c:6806
+#: src/conf/domain_conf.c:7080
 msgid "vcpupin nodes must be less than maxvcpus"
 msgstr ""
 
-#: src/conf/domain_conf.c:6821
+#: src/conf/domain_conf.c:7095
 msgid "duplicate vcpupin for same vcpu"
 msgstr ""
 
-#: src/conf/domain_conf.c:6833
+#: src/conf/domain_conf.c:7107
 msgid "cannot extract numatune nodes"
 msgstr ""
 
-#: src/conf/domain_conf.c:6855
+#: src/conf/domain_conf.c:7128
 msgid "nodeset for NUMA memory tuning must be set"
 msgstr ""
 
-#: src/conf/domain_conf.c:6864
+#: src/conf/domain_conf.c:7137
 #, c-format
 msgid "Unsupported NUMA memory tuning mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2860
+#: src/conf/domain_conf.c:7155
 #, c-format
 msgid "unexpected feature %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:6911
+#: src/conf/domain_conf.c:7184
 #, c-format
 msgid "unknown clock offset '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:6929
+#: src/conf/domain_conf.c:7202
 msgid "missing 'timezone' attribute for clock with offset='timezone'"
 msgstr ""
 
-#: src/conf/domain_conf.c:2900
+#: src/conf/domain_conf.c:7235
 msgid "no OS type"
 msgstr ""
 
-#: src/conf/domain_conf.c:2928
+#: src/conf/domain_conf.c:7262
 #, c-format
 msgid "os type '%s' & arch '%s' combination is not supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:2936 src/xen/xm_internal.c:709
+#: src/conf/domain_conf.c:7270 src/xenxs/xen_xm.c:259
 #, c-format
 msgid "no supported architecture for os type '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7038
+#: src/conf/domain_conf.c:7311
 msgid "init binary must be specified"
 msgstr ""
 
-#: src/conf/domain_conf.c:7106
+#: src/conf/domain_conf.c:7380
 msgid "cannot extract device leases"
 msgstr ""
 
-#: src/conf/domain_conf.c:7231
+#: src/conf/domain_conf.c:7505
 msgid "cannot extract console devices"
 msgstr ""
 
-#: src/conf/domain_conf.c:7265
+#: src/conf/domain_conf.c:7542
 msgid "Only the first console can be a serial port"
 msgstr ""
 
-#: src/conf/domain_conf.c:3307
+#: src/conf/domain_conf.c:7735
 msgid "cannot determine default video type"
 msgstr ""
 
-#: src/conf/domain_conf.c:3348
+#: src/conf/domain_conf.c:7772
 msgid "only a single watchdog device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7506
+#: src/conf/domain_conf.c:7792
 msgid "only a single memory balloon device is supported"
 msgstr ""
 
-#: src/conf/domain_conf.c:7596
+#: src/conf/domain_conf.c:7864
+msgid "Number of CPUs in <numa> exceeds the <vcpu> count"
+msgstr ""
+
+#: src/conf/domain_conf.c:7889
 msgid "UUID mismatch between <uuid> and <sysinfo>"
 msgstr ""
 
-#: src/conf/domain_conf.c:7608
+#: src/conf/domain_conf.c:7901
 #, c-format
 msgid "unknown smbios mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3404
+#: src/conf/domain_conf.c:7963
 msgid "no domain config"
 msgstr ""
 
-#: src/conf/domain_conf.c:3418
+#: src/conf/domain_conf.c:7977
 msgid "missing domain state"
 msgstr ""
 
-#: src/conf/domain_conf.c:3423
+#: src/conf/domain_conf.c:7982
 #, c-format
 msgid "invalid domain state '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:7698
+#: src/conf/domain_conf.c:7991
 #, c-format
 msgid "invalid domain state reason '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:3431
+#: src/conf/domain_conf.c:8002
 msgid "invalid pid"
 msgstr ""
 
-#: src/conf/domain_conf.c:7723
+#: src/conf/domain_conf.c:8016
 #, c-format
 msgid "Unknown taint flag %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7757 src/security/virt-aa-helper.c:641
-#: tools/virsh.c:1357 tools/virsh.c:1504 tools/virsh.c:1713
-#: tools/virsh.c:10938 tools/virsh.c:11006 tools/virsh.c:11478
-#: tools/virsh.c:11945
+#: src/conf/domain_conf.c:8050 src/security/virt-aa-helper.c:641
+#: tools/virsh.c:1369 tools/virsh.c:1516 tools/virsh.c:1725
+#: tools/virsh.c:11753 tools/virsh.c:11821 tools/virsh.c:12061
+#: tools/virsh.c:12551 tools/virsh.c:13024
 msgid "(domain_definition)"
 msgstr ""
 
-#: src/conf/domain_conf.c:3563 src/conf/domain_conf.c:3634
-#: src/conf/interface_conf.c:870 src/conf/network_conf.c:622
-#: src/conf/node_device_conf.c:1223 src/conf/secret_conf.c:117
-msgid "incorrect root element"
+#: src/conf/domain_conf.c:8087
+#, c-format
+msgid "unexpected root element <%s>, expecting <domain>"
+msgstr ""
+
+#: src/conf/domain_conf.c:8120
+#, c-format
+msgid "unexpected root element <%s>, expecting <domstatus>"
 msgstr ""
 
-#: src/conf/domain_conf.c:7871
+#: src/conf/domain_conf.c:8168
 #, c-format
 msgid "Target timer %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7879
+#: src/conf/domain_conf.c:8176
 #, c-format
 msgid "Target timer presence %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7887
+#: src/conf/domain_conf.c:8184
 #, c-format
 msgid "Target TSC frequency %lu does not match source %lu"
 msgstr ""
 
-#: src/conf/domain_conf.c:7894
+#: src/conf/domain_conf.c:8191
 #, c-format
 msgid "Target TSC mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7915
+#: src/conf/domain_conf.c:8212
 #, c-format
 msgid "Target device address type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:7928
+#: src/conf/domain_conf.c:8225
 #, c-format
 msgid ""
 "Target device PCI address %04x:%02x:%02x.%02x does not match source "
 "%04x:%02x:%02x.%02x"
 msgstr ""
 
-#: src/conf/domain_conf.c:7942
+#: src/conf/domain_conf.c:8239
 #, c-format
 msgid "Target device drive address %d:%d:%d does not match source %d:%d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7956
+#: src/conf/domain_conf.c:8253
 #, c-format
 msgid ""
 "Target device virtio serial address %d:%d:%d does not match source %d:%d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7969
+#: src/conf/domain_conf.c:8266
 #, c-format
 msgid "Target device ccid address %d:%d does not match source %d:%d"
 msgstr ""
 
-#: src/conf/domain_conf.c:7993
+#: src/conf/domain_conf.c:8290
 #, c-format
 msgid "Target disk device %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8001
+#: src/conf/domain_conf.c:8298
 #, c-format
 msgid "Target disk bus %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8009
+#: src/conf/domain_conf.c:8306
 #, c-format
 msgid "Target disk %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8016
+#: src/conf/domain_conf.c:8313
 #, c-format
 msgid "Target disk serial %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8023
+#: src/conf/domain_conf.c:8320
 msgid "Target disk access mode does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8044
+#: src/conf/domain_conf.c:8341
 #, c-format
 msgid "Target controller type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8052
+#: src/conf/domain_conf.c:8349
 #, c-format
 msgid "Target controller index %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8059
+#: src/conf/domain_conf.c:8356
 #, c-format
 msgid "Target controller model %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8067
+#: src/conf/domain_conf.c:8364
 #, c-format
 msgid "Target controller ports %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8074
+#: src/conf/domain_conf.c:8371
 #, c-format
 msgid "Target controller vectors %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8097
+#: src/conf/domain_conf.c:8394
 #, c-format
 msgid "Target filesystem guest target %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8104
+#: src/conf/domain_conf.c:8401
 msgid "Target filesystem access mode does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8125
+#: src/conf/domain_conf.c:8422
 #, c-format
 msgid ""
 "Target network card mac %02x:%02x:%02x:%02x:%02x:%02xdoes not match source "
 "%02x:%02x:%02x:%02x:%02x:%02x"
 msgstr ""
 
-#: src/conf/domain_conf.c:8136
+#: src/conf/domain_conf.c:8433
 #, c-format
 msgid "Target network card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8158
+#: src/conf/domain_conf.c:8455
 #, c-format
 msgid "Target input device type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8166
+#: src/conf/domain_conf.c:8463
 #, c-format
 msgid "Target input device bus %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8189
+#: src/conf/domain_conf.c:8486
 #, c-format
 msgid "Target sound card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8212
+#: src/conf/domain_conf.c:8509
 #, c-format
 msgid "Target video card model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8220
+#: src/conf/domain_conf.c:8517
 #, c-format
 msgid "Target video card vram %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8227
+#: src/conf/domain_conf.c:8524
 #, c-format
 msgid "Target video card heads %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8235
+#: src/conf/domain_conf.c:8532
 msgid "Target video card acceleration does not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8242
+#: src/conf/domain_conf.c:8539
 #, c-format
 msgid "Target video card 2d accel %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8249
+#: src/conf/domain_conf.c:8546
 #, c-format
 msgid "Target video card 3d accel %u does not match source %u"
 msgstr ""
 
-#: src/conf/domain_conf.c:8272
+#: src/conf/domain_conf.c:8569
 #, c-format
 msgid "Target host device mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8281
+#: src/conf/domain_conf.c:8578
 #, c-format
 msgid "Target host device subsystem %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8320 src/conf/domain_conf.c:8342
+#: src/conf/domain_conf.c:8617 src/conf/domain_conf.c:8639
 #, c-format
 msgid "Target serial port %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8364
+#: src/conf/domain_conf.c:8661
 #, c-format
 msgid "Target channel type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8374
+#: src/conf/domain_conf.c:8671
 #, c-format
 msgid "Target channel name %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8385
+#: src/conf/domain_conf.c:8682
 #, c-format
 msgid "Target channel addr %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8411
+#: src/conf/domain_conf.c:8708
 #, c-format
 msgid "Target console type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8434
+#: src/conf/domain_conf.c:8731
 #, c-format
 msgid "Target watchdog model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8457
+#: src/conf/domain_conf.c:8754
 #, c-format
 msgid "Target balloon model %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8480
+#: src/conf/domain_conf.c:8777
 #, c-format
 msgid "Target hub device type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8508
+#: src/conf/domain_conf.c:8805
 #, c-format
 msgid "Target domain virt type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8520
+#: src/conf/domain_conf.c:8817
 #, c-format
 msgid "Target domain uuid %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8527
+#: src/conf/domain_conf.c:8824
 #, c-format
 msgid "Target domain max memory %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8533
+#: src/conf/domain_conf.c:8830
 #, c-format
 msgid "Target domain current memory %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8539
+#: src/conf/domain_conf.c:8836
 #, c-format
 msgid "Target domain huge page backing %ld does not match source %ld"
 msgstr ""
 
-#: src/conf/domain_conf.c:8547
+#: src/conf/domain_conf.c:8844
 #, c-format
 msgid "Target domain vpu count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8553
+#: src/conf/domain_conf.c:8850
 #, c-format
 msgid "Target domain vpu max %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8560 src/conf/domain_conf.c:8572
+#: src/conf/domain_conf.c:8857 src/conf/domain_conf.c:8869
 #, c-format
 msgid "Target domain OS type %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8566
+#: src/conf/domain_conf.c:8863
 #, c-format
 msgid "Target domain architecture %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8579
+#: src/conf/domain_conf.c:8876
 #, c-format
 msgid "Target domain SMBIOS mode %s does not match source %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:8587
+#: src/conf/domain_conf.c:8884
 #, c-format
 msgid "Target domain features %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8594
+#: src/conf/domain_conf.c:8891
 msgid "Target domain timers do not match source"
 msgstr ""
 
-#: src/conf/domain_conf.c:8611
+#: src/conf/domain_conf.c:8908
 #, c-format
 msgid "Target domain disk count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8622
+#: src/conf/domain_conf.c:8919
 #, c-format
 msgid "Target domain disk controller count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8633
+#: src/conf/domain_conf.c:8930
 #, c-format
 msgid "Target domain filesystem count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8644
+#: src/conf/domain_conf.c:8941
 #, c-format
 msgid "Target domain net card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8655
+#: src/conf/domain_conf.c:8952
 #, c-format
 msgid "Target domain input device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8666
+#: src/conf/domain_conf.c:8963
 #, c-format
 msgid "Target domain sound card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8677
+#: src/conf/domain_conf.c:8974
 #, c-format
 msgid "Target domain video card count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8688
+#: src/conf/domain_conf.c:8985
 #, c-format
 msgid "Target domain host device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8699
+#: src/conf/domain_conf.c:8996
 #, c-format
 msgid "Target domain smartcard count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8710
+#: src/conf/domain_conf.c:9007
 #, c-format
 msgid "Target domain serial port count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8721
+#: src/conf/domain_conf.c:9018
 #, c-format
 msgid "Target domain parallel port count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8732
+#: src/conf/domain_conf.c:9029
 #, c-format
 msgid "Target domain channel count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8743
+#: src/conf/domain_conf.c:9040
 #, c-format
 msgid "Target domain console count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8754
+#: src/conf/domain_conf.c:9051
 #, c-format
 msgid "Target domain hub device count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8767
+#: src/conf/domain_conf.c:9064
 #, c-format
 msgid "Target domain watchdog count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:8779
+#: src/conf/domain_conf.c:9076
 #, c-format
 msgid "Target domain memory balloon count %d does not match source %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3845
+#: src/conf/domain_conf.c:9466
 msgid "topology cpuset syntax error"
 msgstr ""
 
-#: src/conf/domain_conf.c:3859
+#: src/conf/domain_conf.c:9639
 #, c-format
 msgid "unexpected lifecycle type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3882
+#: src/conf/domain_conf.c:9685
 #, c-format
 msgid "unexpected disk type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3887
+#: src/conf/domain_conf.c:9690
 #, c-format
 msgid "unexpected disk device %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3892
+#: src/conf/domain_conf.c:9695
 #, c-format
 msgid "unexpected disk bus %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3897
+#: src/conf/domain_conf.c:9700
 #, c-format
 msgid "unexpected disk cache mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9410
+#: src/conf/domain_conf.c:9705
 #, c-format
 msgid "unexpected disk io mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9560
+#: src/conf/domain_conf.c:9897
 #, c-format
 msgid "unexpected controller type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9569
+#: src/conf/domain_conf.c:9906
 #, c-format
 msgid "unexpected model type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:3974
+#: src/conf/domain_conf.c:9958
 #, c-format
 msgid "unexpected filesystem type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9627
+#: src/conf/domain_conf.c:9964
 #, c-format
 msgid "unexpected accessmode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4026 src/conf/domain_conf.c:4392
+#: src/conf/domain_conf.c:10028 src/conf/domain_conf.c:10091
+#: src/conf/domain_conf.c:10822
 #, c-format
 msgid "unexpected net type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:9699
+#: src/conf/domain_conf.c:10036
 #, c-format
 msgid "unexpected net type %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:9719
+#: src/conf/domain_conf.c:10056
 #, c-format
 msgid "unexpected source mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4138
+#: src/conf/domain_conf.c:10251
 #, c-format
 msgid "unexpected char type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10012
+#: src/conf/domain_conf.c:10352
 #, c-format
 msgid "unexpected char device type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10031
+#: src/conf/domain_conf.c:10371
 msgid "Could not format channel target type"
 msgstr ""
 
-#: src/conf/domain_conf.c:4233
+#: src/conf/domain_conf.c:10381
 msgid "Unable to format guestfwd port"
 msgstr ""
 
-#: src/conf/domain_conf.c:10101 src/conf/domain_conf.c:10132
-#: src/qemu/qemu_command.c:4369
+#: src/conf/domain_conf.c:10441 src/conf/domain_conf.c:10472
+#: src/qemu/qemu_command.c:4553
 #, c-format
 msgid "unexpected smartcard type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4273 src/xen/xend_internal.c:5672
+#: src/conf/domain_conf.c:10490 src/xenxs/xen_sxpr.c:1978
 #, c-format
 msgid "unexpected sound model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10178
+#: src/conf/domain_conf.c:10518
 #, c-format
 msgid "unexpected memballoon model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4294
+#: src/conf/domain_conf.c:10558
 #, c-format
 msgid "unexpected watchdog model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4300
+#: src/conf/domain_conf.c:10564
 #, c-format
 msgid "unexpected watchdog action %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4332
+#: src/conf/domain_conf.c:10605
 #, c-format
 msgid "unexpected video model %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4366 src/xen/xend_internal.c:5699
+#: src/conf/domain_conf.c:10642 src/xenxs/xen_sxpr.c:2006
 #, c-format
 msgid "unexpected input type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4371
+#: src/conf/domain_conf.c:10647
 #, c-format
 msgid "unexpected input bus type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10335
+#: src/conf/domain_conf.c:10675
 #, c-format
 msgid "unexpected timer name %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10351
+#: src/conf/domain_conf.c:10691
 #, c-format
 msgid "unexpected timer tickpolicy %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10365
+#: src/conf/domain_conf.c:10705
 #, c-format
 msgid "unexpected timer track %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10383
+#: src/conf/domain_conf.c:10723
 #, c-format
 msgid "unexpected timer mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4488
+#: src/conf/domain_conf.c:11007
 #, c-format
 msgid "unexpected hostdev mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4495
+#: src/conf/domain_conf.c:11016
 #, c-format
 msgid "unexpected hostdev type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10733
+#: src/conf/domain_conf.c:11073
 #, c-format
 msgid "unexpected rom bar value %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10773
+#: src/conf/domain_conf.c:11113
 #, c-format
 msgid "unexpected hub type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4552
+#: src/conf/domain_conf.c:11165
 #, c-format
 msgid "unexpected domain type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:10932
+#: src/conf/domain_conf.c:11298
 msgid "failed to format cpuset for vcpupin"
 msgstr ""
 
-#: src/conf/domain_conf.c:10954
+#: src/conf/domain_conf.c:11320
 msgid "failed to format nodeset for NUMA memory tuning"
 msgstr ""
 
-#: src/conf/domain_conf.c:4648
+#: src/conf/domain_conf.c:11378
 #, c-format
 msgid "unexpected boot device type %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:11040
+#: src/conf/domain_conf.c:11406
 #, c-format
 msgid "unexpected smbios mode %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4666
+#: src/conf/domain_conf.c:11422
 #, c-format
 msgid "unexpected feature %d"
 msgstr ""
 
-#: src/conf/domain_conf.c:4864 src/conf/network_conf.c:752
+#: src/conf/domain_conf.c:11705 src/conf/network_conf.c:1408
+#: src/conf/nwfilter_conf.c:2601 src/util/dnsmasq.c:529
 #, c-format
 msgid "cannot create config directory '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5018
+#: src/conf/domain_conf.c:11850
 #, c-format
 msgid "unexpected domain %s already exists"
 msgstr ""
 
-#: src/conf/domain_conf.c:5059 src/conf/network_conf.c:878
-#: src/conf/storage_conf.c:1537
+#: src/conf/domain_conf.c:11890 src/conf/network_conf.c:1508
+#: src/conf/nwfilter_conf.c:2915 src/conf/storage_conf.c:1486
 #, c-format
 msgid "Failed to open dir '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5124
+#: src/conf/domain_conf.c:11954
 #, c-format
 msgid "cannot remove config %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5231 src/xen/xm_internal.c:2671
+#: src/conf/domain_conf.c:12060 src/xen/xm_internal.c:1116
 #, c-format
 msgid "domain '%s' is already defined with uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:5240
+#: src/conf/domain_conf.c:12069
 #, c-format
 msgid "domain is already active as '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:5254
+#: src/conf/domain_conf.c:12083
 #, c-format
 msgid "domain '%s' already exists with uuid %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:11880
+#: src/conf/domain_conf.c:12246
 msgid "missing name from disk snapshot element"
 msgstr ""
 
-#: src/conf/domain_conf.c:11941 tools/virsh.c:13246 tools/virsh.c:13573
+#: src/conf/domain_conf.c:12307 tools/virsh.c:14325 tools/virsh.c:14652
 msgid "(domain_snapshot)"
 msgstr ""
 
-#: src/conf/domain_conf.c:11952
+#: src/conf/domain_conf.c:12318
 msgid "domainsnapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11962
+#: src/conf/domain_conf.c:12328
 msgid "a redefined snapshot must have a name"
 msgstr ""
 
-#: src/conf/domain_conf.c:11981
+#: src/conf/domain_conf.c:12347
 msgid "missing creationTime from existing snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11993
+#: src/conf/domain_conf.c:12359
 msgid "missing state from existing snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:11999
+#: src/conf/domain_conf.c:12365
 #, c-format
 msgid "Invalid state '%s' in domain snapshot XML"
 msgstr ""
 
-#: src/conf/domain_conf.c:12014 src/conf/domain_conf.c:12105
+#: src/conf/domain_conf.c:12380 src/conf/domain_conf.c:12471
 msgid "missing domain in snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:12047
+#: src/conf/domain_conf.c:12413
 msgid "unable to handle disk requests in snapshot"
 msgstr ""
 
-#: src/conf/domain_conf.c:12054
+#: src/conf/domain_conf.c:12420
 msgid "Could not find 'active' element"
 msgstr ""
 
-#: src/conf/domain_conf.c:12111
+#: src/conf/domain_conf.c:12477
 msgid "too many disk snapshot requests for domain"
 msgstr ""
 
-#: src/conf/domain_conf.c:12134
+#: src/conf/domain_conf.c:12500
 #, c-format
 msgid "no disk named '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:12141
+#: src/conf/domain_conf.c:12507
 #, c-format
 msgid "disk '%s' specified twice"
 msgstr ""
 
-#: src/conf/domain_conf.c:12155
+#: src/conf/domain_conf.c:12521
 #, c-format
 msgid "disk '%s' must use snapshot mode '%s'"
 msgstr ""
 
-#: src/conf/domain_conf.c:12162
+#: src/conf/domain_conf.c:12528
 #, c-format
 msgid "file '%s' for disk '%s' requires use of external snapshot mode"
 msgstr ""
 
-#: src/conf/domain_conf.c:12214
+#: src/conf/domain_conf.c:12582
+#, c-format
+msgid "cannot generate external snapshot name for disk '%s' without source"
+msgstr ""
+
+#: src/conf/domain_conf.c:12589
 #, c-format
-msgid "cannot generate external backup name for disk '%s' without source"
+msgid ""
+"source for disk '%s' is not a regular file; refusing to generate external "
+"snapshot name"
 msgstr ""
 
-#: src/conf/domain_conf.c:12226
+#: src/conf/domain_conf.c:12603
 msgid "integer overflow"
 msgstr ""
 
-#: src/conf/domain_conf.c:12359
+#: src/conf/domain_conf.c:12736
 #, c-format
 msgid "unexpected domain snapshot %s already exists"
 msgstr ""
 
-#: src/conf/domain_conf.c:12832
+#: src/conf/domain_conf.c:13209
 #, c-format
 msgid "unknown disk format '%s' for %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12841 src/qemu/qemu_driver.c:7695
+#: src/conf/domain_conf.c:13218 src/qemu/qemu_driver.c:8042
 #, c-format
 msgid "no disk format for %s and probing is disabled"
 msgstr ""
 
-#: src/conf/domain_conf.c:12858
+#: src/conf/domain_conf.c:13235
 #, c-format
 msgid "backing store for %s is self-referential"
 msgstr ""
 
-#: src/conf/domain_conf.c:12871
+#: src/conf/domain_conf.c:13248
 #, c-format
 msgid "unable to open disk path %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12884
+#: src/conf/domain_conf.c:13261
 #, c-format
 msgid "could not close file %s"
 msgstr ""
 
-#: src/conf/domain_conf.c:12970
+#: src/conf/domain_conf.c:13347
 #, c-format
 msgid "invalid domain state: %d"
 msgstr ""
@@ -2487,726 +2670,873 @@
 msgid "event queue is empty, nothing to pop"
 msgstr ""
 
-#: src/conf/interface_conf.c:133 src/conf/interface_conf.c:515
+#: src/conf/interface_conf.c:126
 msgid "interface has no name"
 msgstr ""
 
-#: src/conf/interface_conf.c:141
+#: src/conf/interface_conf.c:142
 msgid "interface mtu value is improper"
 msgstr ""
 
-#: src/conf/interface_conf.c:165
+#: src/conf/interface_conf.c:166
 #, c-format
 msgid "unknown interface startmode %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:197
+#: src/conf/interface_conf.c:198
 #, c-format
 msgid "unknown bonding mode %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:218
+#: src/conf/interface_conf.c:219
 #, c-format
 msgid "unknown mii bonding carrier %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:241
+#: src/conf/interface_conf.c:242
 #, c-format
 msgid "unknown arp bonding validate %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:267
+#: src/conf/interface_conf.c:268
 #, c-format
 msgid "unknown dhcp peerdns value %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:293
+#: src/conf/interface_conf.c:294
 msgid "Invalid ip address prefix value"
 msgstr ""
 
-#: src/conf/interface_conf.c:446
+#: src/conf/interface_conf.c:454
 msgid "protocol misses the family attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:465
+#: src/conf/interface_conf.c:473
 #, c-format
 msgid "unsupported protocol family '%s'"
 msgstr ""
 
-#: src/conf/interface_conf.c:602
+#: src/conf/interface_conf.c:547
 msgid "bond has no interfaces"
 msgstr ""
 
-#: src/conf/interface_conf.c:652
+#: src/conf/interface_conf.c:596
 msgid "bond interface miimon freq missing or invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:660
+#: src/conf/interface_conf.c:604
 msgid "bond interface miimon downdelay invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:669
+#: src/conf/interface_conf.c:613
 msgid "bond interface miimon updelay invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:688
+#: src/conf/interface_conf.c:632
 msgid "bond interface arpmon interval missing or invalid"
 msgstr ""
 
-#: src/conf/interface_conf.c:697
+#: src/conf/interface_conf.c:641
 msgid "bond interface arpmon target missing"
 msgstr ""
 
-#: src/conf/interface_conf.c:718
+#: src/conf/interface_conf.c:662
 msgid "vlan interface misses the tag attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:726
+#: src/conf/interface_conf.c:670
 msgid "vlan interface misses name attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:743
+#: src/conf/interface_conf.c:687
 msgid "interface misses the type attribute"
 msgstr ""
 
-#: src/conf/interface_conf.c:749
+#: src/conf/interface_conf.c:693
 #, c-format
 msgid "unknown interface type %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:508
+#: src/conf/interface_conf.c:714
 #, c-format
 msgid "interface has unsupported type '%s'"
 msgstr ""
 
-#: src/conf/interface_conf.c:785
+#: src/conf/interface_conf.c:751
 msgid "bridge interface misses the bridge element"
 msgstr ""
 
-#: src/conf/interface_conf.c:797
+#: src/conf/interface_conf.c:763
 #, c-format
 msgid "bridge interface stp should be on or off got %s"
 msgstr ""
 
-#: src/conf/interface_conf.c:820
+#: src/conf/interface_conf.c:793
 msgid "bond interface misses the bond element"
 msgstr ""
 
-#: src/conf/interface_conf.c:841
+#: src/conf/interface_conf.c:814
 msgid "vlan interface misses the vlan element"
 msgstr ""
 
-#: src/conf/interface_conf.c:867
+#: src/conf/interface_conf.c:842
+#, c-format
+msgid "unexpected root element <%s>, expecting <interface>"
+msgstr ""
+
+#: src/conf/interface_conf.c:869
 msgid "(interface_definition)"
 msgstr ""
 
-#: src/conf/interface_conf.c:1096
+#: src/conf/interface_conf.c:950
 msgid "bond arp monitoring has no target"
 msgstr ""
 
-#: src/conf/interface_conf.c:1123
+#: src/conf/interface_conf.c:978
 msgid "vlan misses the tag name"
 msgstr ""
 
-#: src/conf/interface_conf.c:1200
+#: src/conf/interface_conf.c:1060
 msgid "virInterfaceDefFormat unknown startmode"
 msgstr ""
 
-#: src/conf/interface_conf.c:1072
+#: src/conf/interface_conf.c:1074
 msgid "virInterfaceDefFormat NULL def"
 msgstr ""
 
-#: src/conf/interface_conf.c:1078
+#: src/conf/interface_conf.c:1080
 msgid "virInterfaceDefFormat missing interface name"
 msgstr ""
 
-#: src/conf/interface_conf.c:1222
+#: src/conf/interface_conf.c:1086
 #, c-format
 msgid "unexpected interface type %d"
 msgstr ""
 
-#: src/conf/network_conf.c:389
+#: src/conf/netdev_bandwidth_conf.c:46 src/conf/netdev_bandwidth_conf.c:113
+msgid "invalid argument supplied"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:57 src/conf/netdev_bandwidth_conf.c:69
+#: src/conf/netdev_bandwidth_conf.c:76
+#, c-format
+msgid "could not convert %s"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:63
+msgid "Missing mandatory average attribute"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:122
+msgid "Only one child <inbound> element allowed"
+msgstr ""
+
+#: src/conf/netdev_bandwidth_conf.c:130
+msgid "Only one child <outbound> element allowed"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:61
+msgid "missing virtualportprofile type"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:67
+#, c-format
+msgid "unknown virtualportprofile type %s"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:94
+msgid "cannot parse value of managerid parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:100
+msgid "value of managerid out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:108
+msgid "cannot parse value of typeid parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:114
+msgid "value for typeid out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:122
+msgid "cannot parse value of typeidversion parameter"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:128
+msgid "value of typeidversion out of range"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:138
+msgid "cannot parse instanceid parameter as a uuid"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:144
+msgid "cannot generate a random uuid for instanceid"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:153
+msgid "a parameter is missing for 802.1Qbg description"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:165
+msgid "profileid parameter too long"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:170
+msgid "profileid parameter is missing for 802.1Qbh description"
+msgstr ""
+
+#: src/conf/netdev_vport_profile_conf.c:177
+#: src/conf/netdev_vport_profile_conf.c:230
+#, c-format
+msgid "unexpected virtualport type %d"
+msgstr ""
+
+#: src/conf/network_conf.c:390
 #, c-format
 msgid "Invalid dhcp range '%s' to '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:415
+#: src/conf/network_conf.c:416
 #, c-format
 msgid "Cannot parse MAC address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:422
+#: src/conf/network_conf.c:423
 #, c-format
 msgid "Cannot use name address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:431
+#: src/conf/network_conf.c:432
 #, c-format
 msgid ""
 "Static host definition in network '%s' must have mac or name attribute"
 msgstr ""
 
-#: src/conf/network_conf.c:439
+#: src/conf/network_conf.c:440
 #, c-format
 msgid "Missing IP address in static host definition for network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:509
+#: src/conf/network_conf.c:510
 msgid "Missing IP address in DNS host definition"
 msgstr ""
 
-#: src/conf/network_conf.c:575
+#: src/conf/network_conf.c:576
 msgid "Missing required name attribute in dns txt record"
 msgstr ""
 
-#: src/conf/network_conf.c:580
+#: src/conf/network_conf.c:581
 #, c-format
 msgid "Missing required value attribute in dns txt record '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:586
+#: src/conf/network_conf.c:587
 #, c-format
 msgid "spaces are not allowed in DNS TXT record names (name is '%s')"
 msgstr ""
 
-#: src/conf/network_conf.c:654
+#: src/conf/network_conf.c:655
 #, c-format
 msgid "Bad address '%s' in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:666
+#: src/conf/network_conf.c:667
 #, c-format
 msgid "no family specified for non-IPv4 address address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:673
+#: src/conf/network_conf.c:674
 #, c-format
 msgid "family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:680
+#: src/conf/network_conf.c:681
 #, c-format
 msgid "family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:686
+#: src/conf/network_conf.c:687
 #, c-format
 msgid "Unrecognized family '%s' in definition of network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:696
+#: src/conf/network_conf.c:697
 #, c-format
 msgid "netmask specified without address in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:703
+#: src/conf/network_conf.c:704
 #, c-format
 msgid "netmask not supported for address '%s' in network '%s' (IPv4 only)"
 msgstr ""
 
-#: src/conf/network_conf.c:711
+#: src/conf/network_conf.c:712
 #, c-format
 msgid "network '%s' cannot have both prefix='%u' and a netmask"
 msgstr ""
 
-#: src/conf/network_conf.c:721
+#: src/conf/network_conf.c:722
 #, c-format
 msgid ""
 "network '%s' has invalid netmask '%s' for address '%s' (both must be IPv4)"
 msgstr ""
 
-#: src/conf/network_conf.c:880
+#: src/conf/network_conf.c:879
 #, c-format
 msgid "Invalid bridge mac address '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:489
+#: src/conf/network_conf.c:955
 #, c-format
 msgid "unknown forwarding type '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:995
+#: src/conf/network_conf.c:992
 #, c-format
 msgid ""
 "Missing required dev attribute in network '%s' forward interface element"
 msgstr ""
 
-#: src/conf/network_conf.c:1005
+#: src/conf/network_conf.c:1002
 #, c-format
 msgid ""
 "forward dev '%s' must match first interface element dev '%s' in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1030
+#: src/conf/network_conf.c:1027
 #, c-format
 msgid "%s forwarding requested, but no IP address provided for network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1037
+#: src/conf/network_conf.c:1034
 #, c-format
 msgid ""
 "multiple forwarding interfaces specified for network '%s', only one is "
 "supported"
 msgstr ""
 
-#: src/conf/network_conf.c:1048
+#: src/conf/network_conf.c:1045
 #, c-format
 msgid "bridge name not allowed in %s mode (network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1057
+#: src/conf/network_conf.c:1054
 #, c-format
 msgid ""
 "bridge delay/stp options only allowed in route, nat, and isolated mode, not "
 "in %s (network '%s')"
 msgstr ""
 
-#: src/conf/network_conf.c:1087
+#: src/conf/network_conf.c:1084
 msgid "(network_definition)"
 msgstr ""
 
-#: src/conf/network_conf.c:1297
+#: src/conf/network_conf.c:1111
+#, c-format
+msgid "unexpected root element <%s>, expecting <network>"
+msgstr ""
+
+#: src/conf/network_conf.c:1298
 #, c-format
 msgid "Unknown forward type %d in network '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:836
+#: src/conf/network_conf.c:1462
 #, c-format
 msgid "Network config filename '%s' does not match network name '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:927
+#: src/conf/network_conf.c:1555 src/util/dnsmasq.c:266
 #, c-format
 msgid "cannot remove config file '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1001
+#: src/conf/network_conf.c:1624
 #, c-format
 msgid "Bridge generation exceeded max id %d"
 msgstr ""
 
-#: src/conf/network_conf.c:1020
+#: src/conf/network_conf.c:1642
 #, c-format
 msgid "bridge name '%s' already in use."
 msgstr ""
 
-#: src/conf/network_conf.c:1694
+#: src/conf/network_conf.c:1697
 #, c-format
 msgid "network '%s' is already defined with uuid %s"
 msgstr ""
 
-#: src/conf/network_conf.c:1703
+#: src/conf/network_conf.c:1706
 #, c-format
 msgid "network is already active as '%s'"
 msgstr ""
 
-#: src/conf/network_conf.c:1717
+#: src/conf/network_conf.c:1720
 #, c-format
 msgid "network '%s' already exists with uuid %s"
 msgstr ""
 
-#: src/conf/node_device_conf.c:565
+#: src/conf/node_device_conf.c:564
 #, c-format
 msgid "no block device path supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:588
+#: src/conf/node_device_conf.c:584
 #, c-format
 msgid "missing storage capability type for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:610
+#: src/conf/node_device_conf.c:606
 #, c-format
 msgid "no removable media size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:611
+#: src/conf/node_device_conf.c:607
 #, c-format
 msgid "invalid removable media size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:621
+#: src/conf/node_device_conf.c:617
 #, c-format
 msgid "unknown storage capability type '%s' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:633
+#: src/conf/node_device_conf.c:629
 #, c-format
 msgid "no size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:634
+#: src/conf/node_device_conf.c:630
 #, c-format
 msgid "invalid size supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:661 src/conf/node_device_conf.c:739
+#: src/conf/node_device_conf.c:656 src/conf/node_device_conf.c:732
 #, c-format
 msgid "no SCSI host ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:662 src/conf/node_device_conf.c:740
+#: src/conf/node_device_conf.c:657 src/conf/node_device_conf.c:733
 #, c-format
 msgid "invalid SCSI host ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:667
+#: src/conf/node_device_conf.c:662
 #, c-format
 msgid "no SCSI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:668
+#: src/conf/node_device_conf.c:663
 #, c-format
 msgid "invalid SCSI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:673
+#: src/conf/node_device_conf.c:668
 #, c-format
 msgid "no SCSI target ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:674
+#: src/conf/node_device_conf.c:669
 #, c-format
 msgid "invalid SCSI target ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:679
+#: src/conf/node_device_conf.c:674
 #, c-format
 msgid "no SCSI LUN ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:680
+#: src/conf/node_device_conf.c:675
 #, c-format
 msgid "invalid SCSI LUN ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:708
+#: src/conf/node_device_conf.c:702
 #, c-format
 msgid "no target name supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:756
+#: src/conf/node_device_conf.c:746
 #, c-format
 msgid "missing SCSI host capability type for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:778
+#: src/conf/node_device_conf.c:768
 #, c-format
 msgid "no WWNN supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:786
+#: src/conf/node_device_conf.c:776
 #, c-format
 msgid "no WWPN supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:794
+#: src/conf/node_device_conf.c:784
 #, c-format
 msgid "unknown SCSI host capability type '%s' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:828
+#: src/conf/node_device_conf.c:818
 #, c-format
 msgid "no network interface supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:843
+#: src/conf/node_device_conf.c:833
 #, c-format
 msgid "invalid network type supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:871
+#: src/conf/node_device_conf.c:860
 #, c-format
 msgid "no USB interface number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:872
+#: src/conf/node_device_conf.c:861
 #, c-format
 msgid "invalid USB interface number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:877
+#: src/conf/node_device_conf.c:866
 #, c-format
 msgid "no USB interface class supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:878
+#: src/conf/node_device_conf.c:867
 #, c-format
 msgid "invalid USB interface class supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:883
+#: src/conf/node_device_conf.c:872
 #, c-format
 msgid "no USB interface subclass supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:884
+#: src/conf/node_device_conf.c:873
 #, c-format
 msgid "invalid USB interface subclass supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:889
+#: src/conf/node_device_conf.c:878
 #, c-format
 msgid "no USB interface protocol supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:890
+#: src/conf/node_device_conf.c:879
 #, c-format
 msgid "invalid USB interface protocol supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:940
+#: src/conf/node_device_conf.c:927
 #, c-format
 msgid "no USB bus number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:941
+#: src/conf/node_device_conf.c:928
 #, c-format
 msgid "invalid USB bus number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:946
+#: src/conf/node_device_conf.c:933
 #, c-format
 msgid "no USB device number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:947
+#: src/conf/node_device_conf.c:934
 #, c-format
 msgid "invalid USB device number supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:952
+#: src/conf/node_device_conf.c:939
 #, c-format
 msgid "no USB vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:953
+#: src/conf/node_device_conf.c:940
 #, c-format
 msgid "invalid USB vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:958
+#: src/conf/node_device_conf.c:945
 #, c-format
 msgid "no USB product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:959
+#: src/conf/node_device_conf.c:946
 #, c-format
 msgid "invalid USB product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:986
+#: src/conf/node_device_conf.c:972
 #, c-format
 msgid "no PCI domain ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:987
+#: src/conf/node_device_conf.c:973
 #, c-format
 msgid "invalid PCI domain ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:992
+#: src/conf/node_device_conf.c:978
 #, c-format
 msgid "no PCI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:993
+#: src/conf/node_device_conf.c:979
 #, c-format
 msgid "invalid PCI bus ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:998
+#: src/conf/node_device_conf.c:984
 #, c-format
 msgid "no PCI slot ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:999
+#: src/conf/node_device_conf.c:985
 #, c-format
 msgid "invalid PCI slot ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1004
+#: src/conf/node_device_conf.c:990
 #, c-format
 msgid "no PCI function ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1005
+#: src/conf/node_device_conf.c:991
 #, c-format
 msgid "invalid PCI function ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1010
+#: src/conf/node_device_conf.c:996
 #, c-format
 msgid "no PCI vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1011
+#: src/conf/node_device_conf.c:997
 #, c-format
 msgid "invalid PCI vendor ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1016
+#: src/conf/node_device_conf.c:1002
 #, c-format
 msgid "no PCI product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1017
+#: src/conf/node_device_conf.c:1003
 #, c-format
 msgid "invalid PCI product ID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1052
+#: src/conf/node_device_conf.c:1037
 #, c-format
 msgid "no system UUID supplied for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1058
+#: src/conf/node_device_conf.c:1043
 #, c-format
 msgid "malformed uuid element for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1093
+#: src/conf/node_device_conf.c:1077
 msgid "missing capability type"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1099
+#: src/conf/node_device_conf.c:1083
 #, c-format
 msgid "unknown capability type '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1136
+#: src/conf/node_device_conf.c:1120
 #, c-format
 msgid "unknown capability type '%d' for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1188
+#: src/conf/node_device_conf.c:1176
 #, c-format
 msgid "no device capabilities for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1234
+#: src/conf/node_device_conf.c:1210
+#, c-format
+msgid "unexpected root element <%s> expecting <device>"
+msgstr ""
+
+#: src/conf/node_device_conf.c:1238
 msgid "(node_device_definition)"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1356
+#: src/conf/node_device_conf.c:1285
 msgid "Device is not a fibre channel HBA"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1310
+#: src/conf/node_device_conf.c:1314
 #, c-format
 msgid "Could not find parent device for '%s'"
 msgstr ""
 
-#: src/conf/node_device_conf.c:1330
+#: src/conf/node_device_conf.c:1334
 #, c-format
 msgid "Parent device %s is not capable of vport operations"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1663
+#: src/conf/nwfilter_conf.c:1914
 #, c-format
 msgid "%s has illegal value %s"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1698 src/conf/nwfilter_conf.c:1911
+#: src/conf/nwfilter_conf.c:1949 src/conf/nwfilter_conf.c:2194
 msgid "rule node requires action attribute"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1918
+#: src/conf/nwfilter_conf.c:2201
 msgid "unknown rule action attribute value"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1925
+#: src/conf/nwfilter_conf.c:2208
 msgid "rule node requires direction attribute"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:1932
+#: src/conf/nwfilter_conf.c:2215
 msgid "unknown rule direction attribute value"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2020
+#: src/conf/nwfilter_conf.c:2292
+#, c-format
+msgid "Name of chain is longer than %u characters"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2300
+msgid "Chain name contains invalid characters"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2337
+#, c-format
+msgid ""
+"Invalid chain name '%s'. Please use a chain name called '%s' or any of the "
+"following prefixes: "
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2385
 msgid "filter has no name"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2030
+#: src/conf/nwfilter_conf.c:2393
+#, c-format
+msgid "Could not parse chain priority '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_conf.c:2400
 #, c-format
-msgid "unknown chain suffix '%s'"
+msgid "Priority '%d' is outside valid range of [%d,%d]"
 msgstr ""
 
-#: src/conf/storage_conf.c:649 src/storage/storage_backend.c:353
+#: src/conf/nwfilter_conf.c:2442 src/conf/storage_conf.c:664
+#: src/storage/storage_backend.c:431
 msgid "unable to generate uuid"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2100
+#: src/conf/nwfilter_conf.c:2505
 msgid "unknown root element for nw filter"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2126
+#: src/conf/nwfilter_conf.c:2531
 msgid "(nwfilter_definition"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2396
+#: src/conf/nwfilter_conf.c:2801
 #, c-format
 msgid "filter with same UUID but different name ('%s') already exists"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2407
+#: src/conf/nwfilter_conf.c:2812
 msgid "filter would introduce a loop"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2475
+#: src/conf/nwfilter_conf.c:2880
 #, c-format
 msgid "network filter config filename '%s' does not match name '%s'"
 msgstr ""
 
-#: src/conf/storage_conf.c:1595
+#: src/conf/nwfilter_conf.c:2957 src/conf/storage_conf.c:1536
 #, c-format
 msgid "cannot create config directory %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1628
+#: src/conf/nwfilter_conf.c:2970 src/conf/storage_conf.c:1555
 msgid "failed to generate XML"
 msgstr ""
 
-#: src/conf/storage_conf.c:1672
+#: src/conf/nwfilter_conf.c:2986 src/conf/storage_conf.c:1569
 #, c-format
 msgid "no config file for %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1678
+#: src/conf/nwfilter_conf.c:2992 src/conf/storage_conf.c:1575
 #, c-format
 msgid "cannot remove config for %s"
 msgstr ""
 
-#: src/conf/nwfilter_conf.c:2660
+#: src/conf/nwfilter_conf.c:3065
 #, c-format
 msgid "formatter for %s %s reported error"
 msgstr ""
 
-#: src/conf/nwfilter_params.c:177
+#: src/conf/nwfilter_params.c:114
+msgid "Variable value contains invalid character"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:321 src/conf/nwfilter_params.c:462
+#, c-format
+msgid "Could not find value for variable '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:333
+msgid ""
+"Cardinality of list items must be the same for processing them in parallel"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:394
+#, c-format
+msgid "Could not find iterator with id %u"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:454
+#, c-format
+msgid "Could not find variable '%s' in iterator"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:470
+#, c-format
+msgid "Could not get nth (%u) value of variable '%s'"
+msgstr ""
+
+#: src/conf/nwfilter_params.c:619
 #, c-format
 msgid "Could not put variable '%s' into hashmap"
 msgstr ""
 
-#: src/conf/nwfilter_params.c:281
+#: src/conf/nwfilter_params.c:746
 msgid "missing filter parameter table"
 msgstr ""
 
-#: src/conf/secret_conf.c:56 src/conf/secret_conf.c:100
-#: src/conf/secret_conf.c:274 src/conf/secret_conf.c:291
+#: src/conf/secret_conf.c:61 src/conf/secret_conf.c:113
+#: src/conf/secret_conf.c:243 src/conf/secret_conf.c:267
 #, c-format
 msgid "unexpected secret usage type %d"
 msgstr ""
 
-#: src/conf/secret_conf.c:72
+#: src/conf/secret_conf.c:77
 msgid "unknown secret usage type"
 msgstr ""
 
-#: src/conf/secret_conf.c:78
+#: src/conf/secret_conf.c:83
 #, c-format
 msgid "unknown secret usage type %s"
 msgstr ""
 
-#: src/conf/secret_conf.c:93
+#: src/conf/secret_conf.c:97
 msgid "volume usage specified, but volume path is missing"
 msgstr ""
 
@@ -3214,41 +3544,46 @@
 msgid "Ceph usage specified, but name is missing"
 msgstr ""
 
-#: src/conf/secret_conf.c:141
+#: src/conf/secret_conf.c:130
+#, c-format
+msgid "unexpected root element <%s>, expecting <secret>"
+msgstr ""
+
+#: src/conf/secret_conf.c:156
 msgid "invalid value of 'ephemeral'"
 msgstr ""
 
-#: src/conf/secret_conf.c:155
+#: src/conf/secret_conf.c:170
 msgid "invalid value of 'private'"
 msgstr ""
 
-#: src/conf/secret_conf.c:212
+#: src/conf/secret_conf.c:214
 msgid "(definition_of_secret)"
 msgstr ""
 
-#: src/conf/storage_conf.c:225 src/storage/storage_backend.c:768
+#: src/conf/storage_conf.c:226 src/storage/storage_backend.c:998
 #, c-format
 msgid "missing backend for pool type %d"
 msgstr ""
 
-#: src/conf/storage_conf.c:372
+#: src/conf/storage_conf.c:383
 msgid "missing auth host attribute"
 msgstr ""
 
-#: src/conf/storage_conf.c:379
+#: src/conf/storage_conf.c:390
 msgid "missing auth passwd attribute"
 msgstr ""
 
-#: src/conf/storage_conf.c:416
+#: src/conf/storage_conf.c:427
 #, c-format
 msgid "unknown pool format type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:438
+#: src/conf/storage_conf.c:464
 msgid "missing storage pool source device path"
 msgstr ""
 
-#: src/conf/storage_conf.c:457
+#: src/conf/storage_conf.c:483
 #, c-format
 msgid "unknown auth type '%s'"
 msgstr ""
@@ -3257,41 +3592,41 @@
 msgid "(storage_source_specification)"
 msgstr ""
 
-#: src/conf/storage_conf.c:511
+#: src/conf/storage_conf.c:528
 msgid "root element was not source"
 msgstr ""
 
-#: src/conf/storage_conf.c:563
+#: src/conf/storage_conf.c:578
 msgid "malformed octal mode"
 msgstr ""
 
-#: src/conf/storage_conf.c:574
+#: src/conf/storage_conf.c:589
 msgid "malformed owner element"
 msgstr ""
 
-#: src/conf/storage_conf.c:585
+#: src/conf/storage_conf.c:600
 msgid "malformed group element"
 msgstr ""
 
-#: src/conf/storage_conf.c:617 src/storage/storage_driver.c:446
-#: src/test/test_driver.c:3729
+#: src/conf/storage_conf.c:632 src/storage/storage_driver.c:454
+#: src/test/test_driver.c:4060
 #, c-format
 msgid "unknown storage pool type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:641
+#: src/conf/storage_conf.c:656
 msgid "missing pool source name element"
 msgstr ""
 
-#: src/conf/storage_conf.c:665
+#: src/conf/storage_conf.c:680
 msgid "missing storage pool source host name"
 msgstr ""
 
-#: src/conf/storage_conf.c:673
+#: src/conf/storage_conf.c:688
 msgid "missing storage pool source path"
 msgstr ""
 
-#: src/conf/storage_conf.c:691
+#: src/conf/storage_conf.c:706
 msgid "missing storage pool source adapter name"
 msgstr ""
 
@@ -3299,11 +3634,11 @@
 msgid "missing storage pool source device name"
 msgstr ""
 
-#: src/conf/storage_conf.c:698
+#: src/conf/storage_conf.c:722
 msgid "missing storage pool target path"
 msgstr ""
 
-#: src/conf/storage_conf.c:745
+#: src/conf/storage_conf.c:752
 msgid "unknown root element for storage pool"
 msgstr ""
 
@@ -3311,42 +3646,42 @@
 msgid "(storage_pool_definition)"
 msgstr ""
 
-#: src/conf/storage_conf.c:876
+#: src/conf/storage_conf.c:850
 #, c-format
 msgid "unknown pool format number %d"
 msgstr ""
 
-#: src/conf/storage_conf.c:909 src/conf/storage_conf.c:1723
+#: src/conf/storage_conf.c:891 src/conf/storage_conf.c:1613
 msgid "unexpected pool type"
 msgstr ""
 
-#: src/conf/storage_conf.c:1007
+#: src/conf/storage_conf.c:988
 #, c-format
 msgid "unknown size units '%s'"
 msgstr ""
 
-#: src/conf/storage_conf.c:1014
+#: src/conf/storage_conf.c:995
 msgid "malformed capacity element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1019
+#: src/conf/storage_conf.c:1000
 msgid "capacity element value too large"
 msgstr ""
 
-#: src/conf/storage_conf.c:1051
+#: src/conf/storage_conf.c:1031
 msgid "missing volume name element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1062
+#: src/conf/storage_conf.c:1042
 msgid "missing capacity element"
 msgstr ""
 
-#: src/conf/storage_conf.c:1091 src/conf/storage_conf.c:1122
+#: src/conf/storage_conf.c:1071 src/conf/storage_conf.c:1102
 #, c-format
 msgid "unknown volume format type %s"
 msgstr ""
 
-#: src/conf/storage_conf.c:1153
+#: src/conf/storage_conf.c:1132
 msgid "unknown root element for storage vol"
 msgstr ""
 
@@ -3354,7 +3689,7 @@
 msgid "(storage_volume_definition)"
 msgstr ""
 
-#: src/conf/storage_conf.c:1258
+#: src/conf/storage_conf.c:1192
 #, c-format
 msgid "unknown volume format number %d"
 msgstr ""
@@ -3384,126 +3719,126 @@
 msgid "Storage source conflict with pool: '%s'"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:93
+#: src/conf/storage_encryption_conf.c:92
 msgid "unknown volume encryption secret type"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:99
+#: src/conf/storage_encryption_conf.c:98
 #, c-format
 msgid "unknown volume encryption secret type %s"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:111
+#: src/conf/storage_encryption_conf.c:110
 #, c-format
 msgid "malformed volume encryption uuid '%s'"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:118
+#: src/conf/storage_encryption_conf.c:117
 msgid "missing volume encryption uuid"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:147
+#: src/conf/storage_encryption_conf.c:146
 msgid "unknown volume encryption format"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:153
+#: src/conf/storage_encryption_conf.c:152
 #, c-format
 msgid "unknown volume encryption format type %s"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:196
+#: src/conf/storage_encryption_conf.c:192
 msgid "unknown root element for volume encryption information"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:228
+#: src/conf/storage_encryption_conf.c:222
 msgid "unexpected volume encryption secret type"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:248
+#: src/conf/storage_encryption_conf.c:242
 msgid "unexpected encryption format"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:275
+#: src/conf/storage_encryption_conf.c:269
 msgid "Cannot open /dev/urandom"
 msgstr ""
 
-#: src/conf/storage_encryption_conf.c:286
+#: src/conf/storage_encryption_conf.c:280
 msgid "Cannot read from /dev/urandom"
 msgstr ""
 
-#: src/cpu/cpu.c:51 src/cpu/cpu_map.c:82
+#: src/cpu/cpu.c:54 src/cpu/cpu_map.c:90
 msgid "undefined hardware architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:79 src/cpu/cpu.c:307
+#: src/cpu/cpu.c:81 src/cpu/cpu.c:309
 msgid "(CPU_definition)"
 msgstr ""
 
-#: src/cpu/cpu.c:88
+#: src/cpu/cpu.c:90
 msgid "no CPU model specified"
 msgstr ""
 
-#: src/cpu/cpu.c:113
+#: src/cpu/cpu.c:118
 #, c-format
 msgid "cannot compare CPUs of %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:144 src/cpu/cpu.c:377
+#: src/cpu/cpu.c:146 src/cpu/cpu.c:379
 msgid "nonzero nmodels doesn't match with NULL models"
 msgstr ""
 
-#: src/cpu/cpu.c:133
+#: src/cpu/cpu.c:152
 msgid "invalid CPU definition"
 msgstr ""
 
-#: src/cpu/cpu.c:142
+#: src/cpu/cpu.c:161
 #, c-format
 msgid "cannot decode CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:168
+#: src/cpu/cpu.c:192
 #, c-format
 msgid "cannot encode CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:193
+#: src/cpu/cpu.c:218
 #, c-format
 msgid "cannot free CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:213
+#: src/cpu/cpu.c:239
 #, c-format
 msgid "cannot get node CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:235
+#: src/cpu/cpu.c:262
 #, c-format
 msgid "cannot compute guest CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:294
+#: src/cpu/cpu.c:296
 msgid "nonzero ncpus doesn't match with NULL xmlCPUs"
 msgstr ""
 
-#: src/cpu/cpu.c:299 src/cpu/cpu.c:371
+#: src/cpu/cpu.c:301 src/cpu/cpu.c:373
 msgid "No CPUs given"
 msgstr ""
 
-#: src/cpu/cpu.c:366
+#: src/cpu/cpu.c:368
 msgid "nonzero ncpus doesn't match with NULL cpus"
 msgstr ""
 
-#: src/cpu/cpu.c:386
+#: src/cpu/cpu.c:388
 #, c-format
 msgid "cannot compute baseline CPU of %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:408
+#: src/cpu/cpu.c:410
 #, c-format
 msgid "cannot update guest CPU data for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu.c:431
+#: src/cpu/cpu.c:433
 #, c-format
 msgid "cannot check guest CPU data for %s architecture"
 msgstr ""
@@ -3527,17 +3862,17 @@
 msgid "no callback provided"
 msgstr ""
 
-#: src/cpu/cpu_map.c:88
+#: src/cpu/cpu_map.c:102
 #, c-format
 msgid "cannot parse CPU map file: %s"
 msgstr ""
 
-#: src/cpu/cpu_map.c:106
+#: src/cpu/cpu_map.c:120
 #, c-format
 msgid "cannot find CPU map for %s architecture"
 msgstr ""
 
-#: src/cpu/cpu_map.c:113
+#: src/cpu/cpu_map.c:127
 #, c-format
 msgid "cannot parse CPU map for %s architecture"
 msgstr ""
@@ -3561,32 +3896,32 @@
 msgid "Invalid CPU vendor string '%s'"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:295
+#: src/cpu/cpu_x86.c:675
 #, c-format
 msgid "CPU feature %s already defined"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:325
+#: src/cpu/cpu_x86.c:699
 #, c-format
 msgid "Invalid cpuid[%d] in %s feature"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:494
+#: src/cpu/cpu_x86.c:812 src/cpu/cpu_x86.c:862
 #, c-format
 msgid "Unknown CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:513
+#: src/cpu/cpu_x86.c:833 src/cpu/cpu_x86.c:874 src/cpu/cpu_x86.c:1693
 #, c-format
 msgid "Unknown CPU feature %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:613
+#: src/cpu/cpu_x86.c:960
 #, c-format
 msgid "Missing ancestor's name in CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:620
+#: src/cpu/cpu_x86.c:967
 #, c-format
 msgid "Ancestor model %s not found for CPU model %s"
 msgstr ""
@@ -3601,17 +3936,17 @@
 msgid "Unknown vendor %s referenced by CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:646
+#: src/cpu/cpu_x86.c:1008
 #, c-format
 msgid "Missing feature name for CPU model %s"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:652
+#: src/cpu/cpu_x86.c:1014
 #, c-format
 msgid "Feature %s required by CPU model %s not found"
 msgstr ""
 
-#: src/cpu/cpu_x86.c:933
+#: src/cpu/cpu_x86.c:1346
 msgid "Cannot find suitable CPU model for given data"
 msgstr ""
 
@@ -3754,8 +4089,8 @@
 "value '%s' has unexpected value '%c', expecting '0' or '1'"
 msgstr ""
 
-#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4422
-#: src/esx/esx_driver.c:4515 src/esx/esx_storage_driver.c:669
+#: src/esx/esx_driver.c:685 src/esx/esx_driver.c:4439
+#: src/esx/esx_driver.c:4532 src/esx/esx_storage_driver.c:669
 #: src/esx/esx_util.c:56 src/esx/esx_util.c:275 src/esx/esx_vi.c:355
 #: src/esx/esx_vi.c:401 src/esx/esx_vi.c:640 src/esx/esx_vi.c:1112
 #: src/esx/esx_vi.c:1317 src/esx/esx_vi.c:1353 src/esx/esx_vi.c:1369
@@ -3928,9 +4263,9 @@
 msgstr ""
 
 #: src/esx/esx_driver.c:2590 src/esx/esx_driver.c:2674
-#: src/phyp/phyp_driver.c:1430 src/phyp/phyp_driver.c:3703
-#: src/vbox/vbox_tmpl.c:2076 src/vbox/vbox_tmpl.c:2134
-#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1290
+#: src/phyp/phyp_driver.c:1447 src/phyp/phyp_driver.c:3720
+#: src/vbox/vbox_tmpl.c:2081 src/vbox/vbox_tmpl.c:2139
+#: src/xenapi/xenapi_driver.c:1118 src/xenapi/xenapi_driver.c:1288
 #, c-format
 msgid "unsupported flags: (0x%x)"
 msgstr ""
@@ -4025,7 +4360,7 @@
 "(normal) or -3 (high)"
 msgstr ""
 
-#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4837
+#: src/esx/esx_driver.c:3855 src/esx/esx_driver.c:4854
 #, c-format
 msgid "Unknown field '%s'"
 msgstr ""
@@ -4073,42 +4408,42 @@
 msgid "Could not retrieve memory usage of resource pool"
 msgstr ""
 
-#: src/esx/esx_driver.c:4261 src/vbox/vbox_tmpl.c:5883
+#: src/esx/esx_driver.c:4278 src/vbox/vbox_tmpl.c:5888
 msgid "disk snapshots not supported yet"
 msgstr ""
 
-#: src/esx/esx_driver.c:4278
+#: src/esx/esx_driver.c:4295
 #, c-format
 msgid "Snapshot '%s' already exists"
 msgstr ""
 
-#: src/esx/esx_driver.c:4294
+#: src/esx/esx_driver.c:4311
 #, c-format
 msgid "Could not create snapshot: %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4638 src/qemu/qemu_driver.c:9751
-#: src/vbox/vbox_tmpl.c:6328
+#: src/esx/esx_driver.c:4655 src/qemu/qemu_driver.c:10098
+#: src/vbox/vbox_tmpl.c:6333
 #, c-format
 msgid "snapshot '%s' does not have a parent"
 msgstr ""
 
-#: src/esx/esx_driver.c:4717
+#: src/esx/esx_driver.c:4734
 #, c-format
 msgid "Could not revert to snapshot '%s': %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4783
+#: src/esx/esx_driver.c:4800
 #, c-format
 msgid "Could not delete snapshot '%s': %s"
 msgstr ""
 
-#: src/esx/esx_driver.c:4854
+#: src/esx/esx_driver.c:4871
 #, c-format
 msgid "Could not change memory parameters: %s"
 msgstr ""
 
-#: daemon/remote.c:596
+#: src/esx/esx_driver.c:4923
 #, c-format
 msgid "Field %s too big for destination"
 msgstr ""
@@ -4237,7 +4572,7 @@
 
 #: src/esx/esx_util.c:387
 #, c-format
-msgid "Formating IP address for host '%s' failed: %s"
+msgid "Formatting IP address for host '%s' failed: %s"
 msgstr ""
 
 #: src/esx/esx_util.c:407 src/esx/esx_vi.c:2369 src/hyperv/hyperv_driver.c:909
@@ -4661,7 +4996,7 @@
 
 #: src/esx/esx_vi.c:3957
 msgid ""
-"Cancelable task is blocked by an unanswered question but cancelation failed"
+"Cancelable task is blocked by an unanswered question but cancellation failed"
 msgstr ""
 
 #: src/esx/esx_vi.c:3962
@@ -4774,20 +5109,20 @@
 msgid "ManagedObjectReference is missing 'type' property"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6554 src/qemu/qemu_driver.c:6591
-#: src/qemu/qemu_driver.c:6657 src/qemu/qemu_driver.c:6773
+#: src/fdstream.c:75 src/fdstream.c:111 src/fdstream.c:192 src/fdstream.c:302
+#: src/fdstream.c:354
 msgid "stream is not open"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6561 src/qemu/qemu_driver.c:6598
+#: src/fdstream.c:82 src/fdstream.c:118
 msgid "stream does not have a callback registered"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6664
+#: src/fdstream.c:199
 msgid "stream already has a callback registered"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6674
+#: src/fdstream.c:209
 msgid "cannot register file watch on stream"
 msgstr ""
 
@@ -4804,7 +5139,7 @@
 msgid "Too many bytes to write to stream"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6789
+#: src/fdstream.c:311 src/fdstream.c:330
 msgid "cannot write to stream"
 msgstr ""
 
@@ -4816,7 +5151,7 @@
 msgid "cannot read from stream"
 msgstr ""
 
-#: src/fdstream.c:428 src/rpc/virnetsocket.c:138 src/util/event_poll.c:670
+#: src/fdstream.c:428 src/rpc/virnetsocket.c:139 src/util/event_poll.c:671
 msgid "Unable to initialize mutex"
 msgstr ""
 
@@ -4848,7 +5183,7 @@
 msgid "%s: Cannot request read and write flags together"
 msgstr ""
 
-#: src/fdstream.c:568 src/lxc/lxc_driver.c:1739
+#: src/fdstream.c:568 src/lxc/lxc_driver.c:1837
 msgid "Unable to create pipe"
 msgstr ""
 
@@ -4899,7 +5234,7 @@
 msgid "Domain is not paused"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1176
+#: src/hyperv/hyperv_driver.c:632 src/hyperv/hyperv_driver.c:1193
 msgid "Domain is not active or is in state transition"
 msgstr ""
 
@@ -4914,11 +5249,11 @@
 msgid "Domain is already active or is in state transition"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:1231
+#: src/hyperv/hyperv_driver.c:1248
 msgid "Domain has no managed save image"
 msgstr ""
 
-#: src/hyperv/hyperv_driver.c:1290
+#: src/hyperv/hyperv_driver.c:1308
 #, c-format
 msgid "openwsman error: %s"
 msgstr ""
@@ -5040,7 +5375,10 @@
 msgid "System is not available"
 msgstr ""
 
-#: tools/virsh.c:4378
+#: src/hyperv/hyperv_wmi.c:382 tools/virsh.c:3006 tools/virsh.c:9228
+#: tools/virsh.c:9315 tools/virsh.c:10697 tools/virsh.c:13296
+#: tools/virsh.c:13835 tools/virsh.c:13978 tools/virsh.c:16897
+#: tools/virsh.c:17006 tools/virsh.c:17421 tools/virsh.c:17427
 msgid "Out of memory"
 msgstr ""
 
@@ -5114,7 +5452,7 @@
 msgid "couldn't find interface with MAC address '%s'"
 msgstr ""
 
-#: src/interface/netcf_driver.c:316
+#: src/interface/netcf_driver.c:326
 msgid "multiple interfaces with matching MAC address"
 msgstr ""
 
@@ -5163,36 +5501,36 @@
 msgid "%s: unsupported flags (0x%lx)"
 msgstr ""
 
-#: src/libvirt.c:584 src/libvirt.c:617 src/libvirt.c:650 src/libvirt.c:683
-#: src/libvirt.c:716 src/libvirt.c:749 src/libvirt.c:785 src/libvirt.c:825
+#: src/libvirt.c:586 src/libvirt.c:619 src/libvirt.c:652 src/libvirt.c:685
+#: src/libvirt.c:718 src/libvirt.c:751 src/libvirt.c:787 src/libvirt.c:827
 #, c-format
 msgid "Too many drivers, cannot register %s"
 msgstr ""
 
-#: src/libvirt.c:792
+#: src/libvirt.c:794
 msgid "Tried to register an internal Xen driver"
 msgstr ""
 
-#: src/libvirt.c:851
+#: src/libvirt.c:853
 #, c-format
 msgid "Initialization of %s state driver failed"
 msgstr ""
 
-#: src/libvirt.c:997
+#: src/libvirt.c:1002
 msgid "Expected a list for 'uri_aliases' config parameter"
 msgstr ""
 
-#: src/libvirt.c:1009
+#: src/libvirt.c:1014
 msgid "Expected a string for 'uri_aliases' config parameter list entry"
 msgstr ""
 
-#: src/libvirt.c:1015
+#: src/libvirt.c:1020
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', expected 'alias=uri://host/path'"
 msgstr ""
 
-#: src/libvirt.c:1023
+#: src/libvirt.c:1028
 #, c-format
 msgid ""
 "Malformed 'uri_aliases' config entry '%s', aliases may only container 'a-Z, "
@@ -5219,7 +5557,7 @@
 msgstr ""
 
 #: src/libvirt.c:2565 src/libvirt.c:2709 src/libvirt.c:2863
-#: src/libvirt.c:15778 src/libvirt.c:16607
+#: src/libvirt.c:16017 src/libvirt.c:16846
 msgid "running and paused flags are mutually exclusive"
 msgstr ""
 
@@ -5247,97 +5585,117 @@
 msgid "could not build absolute core file path"
 msgstr ""
 
-#: src/libvirt.c:2886
+#: src/libvirt.c:3603
+#, c-format
+msgid "string parameter name '%.*s' too long"
+msgstr ""
+
+#: src/libvirt.c:3613
+#, c-format
+msgid "NULL string parameter '%s'"
+msgstr ""
+
+#: src/libvirt.c:3620
+#, c-format
+msgid "string parameter '%s' unsupported"
+msgstr ""
+
+#: src/libvirt.c:4092
 msgid "virDomainGetXMLDesc with secure flag"
 msgstr ""
 
-#: src/libvirt.c:3050
+#: src/libvirt.c:4278
 msgid "domainMigratePrepare did not set uri"
 msgstr ""
 
-#: src/libvirt.c:3136 src/qemu/qemu_driver.c:7475
+#: src/libvirt.c:4390 src/qemu/qemu_migration.c:1944
 msgid "domainMigratePrepare2 did not set uri"
 msgstr ""
 
-#: src/libvirt.c:4466 src/qemu/qemu_migration.c:2070
+#: src/libvirt.c:4536 src/qemu/qemu_migration.c:2082
 msgid "domainMigratePrepare3 did not set uri"
 msgstr ""
 
-#: src/libvirt.c:4642 src/libvirt.c:4714 src/libvirt.c:5094 src/libvirt.c:5106
+#: src/libvirt.c:4712 src/libvirt.c:4784 src/libvirt.c:5164 src/libvirt.c:5176
 msgid "Unable to change target guest XML during migration"
 msgstr ""
 
-#: src/libvirt.c:4647
+#: src/libvirt.c:4717
 msgid "Unable to override peer2peer migration URI"
 msgstr ""
 
-#: src/libvirt.c:4868 src/libvirt.c:5069
+#: src/libvirt.c:4938 src/libvirt.c:5139
 msgid "cannot enforce change protection"
 msgstr ""
 
-#: src/libvirt.c:3357
+#: src/libvirt.c:4944 src/libvirt.c:5145
 msgid "cannot perform tunnelled migration without using peer2peer flag"
 msgstr ""
 
-#: src/libvirt.c:4306
-msgid "path is NULL"
+#: src/libvirt.c:7090 src/libvirt.c:7166 src/libvirt.c:17055
+#: src/libvirt.c:17111 src/libvirt.c:17179 src/libvirt.c:17250
+msgid "disk is NULL"
 msgstr ""
 
-#: src/libvirt.c:4319
+#: src/libvirt.c:7097
 msgid "buffer is NULL"
 msgstr ""
 
-#: src/libvirt.c:7044
+#: src/libvirt.c:7268
 msgid ""
 "flags parameter must include VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr ""
 
-#: src/libvirt.c:4427
+#: src/libvirt.c:7275
 msgid "buffer is NULL but size is non-zero"
 msgstr ""
 
-#: src/libvirt.c:10151
+#: src/libvirt.c:14269
 msgid "data sources cannot be used for non-blocking streams"
 msgstr ""
 
-#: src/libvirt.c:10248
+#: src/libvirt.c:14371
 msgid "data sinks cannot be used for non-blocking streams"
 msgstr ""
 
-#: src/libvirt.c:16050
+#: src/libvirt.c:16289
 msgid "use of current flag requires redefine flag"
 msgstr ""
 
-#: src/libvirt.c:16056
+#: src/libvirt.c:16295
 msgid "redefine and no metadata flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16062
+#: src/libvirt.c:16301
 msgid "redefine and halt flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16115
+#: src/libvirt.c:16354
 msgid "virDomainSnapshotGetXMLDesc with secure flag"
 msgstr ""
 
-#: src/libvirt.c:16674
+#: src/libvirt.c:16913
 msgid "children and children_only flags are mutually exclusive"
 msgstr ""
 
-#: src/libvirt.c:16864
+#: src/libvirt.c:17117
 msgid "info is NULL"
 msgstr ""
 
-#: src/libvirt.c:17051
+#: src/libvirt.c:17318
 #, c-format
 msgid "Unable to access file descriptor %d"
 msgstr ""
 
-#: src/libvirt.c:17057
+#: src/libvirt.c:17324
 #, c-format
 msgid "File descriptor %d must be a socket"
 msgstr ""
 
+#: src/libvirt.c:17394
+msgid "negative or zero interval make no sense"
+msgstr ""
+
 #: src/locking/lock_driver_sanlock.c:95
 #, c-format
 msgid "Unable to access config file %s"
@@ -5554,42 +5912,42 @@
 msgid "this platform is missing dlopen"
 msgstr ""
 
-#: src/lxc/lxc_container.c:128
+#: src/lxc/lxc_container.c:147
 msgid "setsid failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:134
+#: src/lxc/lxc_container.c:153
 msgid "ioctl(TIOCSTTY) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:147
+#: src/lxc/lxc_container.c:168
 msgid "dup2(stdin) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:153
+#: src/lxc/lxc_container.c:174
 msgid "dup2(stdout) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:159
+#: src/lxc/lxc_container.c:180
 msgid "dup2(stderr) failed"
 msgstr ""
 
-#: src/lxc/lxc_container.c:311
+#: src/lxc/lxc_container.c:333
 msgid "Failed to make root private"
 msgstr ""
 
-#: src/lxc/lxc_container.c:322 src/lxc/lxc_container.c:344
-#: src/lxc/lxc_container.c:515
+#: src/lxc/lxc_container.c:344 src/lxc/lxc_container.c:366
+#: src/lxc/lxc_container.c:613 src/lxc/lxc_container.c:874
 #, c-format
 msgid "Failed to create %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:331
+#: src/lxc/lxc_container.c:353
 #, c-format
 msgid "Failed to mount empty tmpfs at %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:352
+#: src/lxc/lxc_container.c:374
 #, c-format
 msgid "Failed to bind new root %s into tmpfs"
 msgstr ""
@@ -5599,16 +5957,16 @@
 msgid "Failed to make new root %s readonly"
 msgstr ""
 
-#: src/lxc/lxc_container.c:361
+#: src/lxc/lxc_container.c:392
 #, c-format
 msgid "Failed to chroot into %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:369
+#: src/lxc/lxc_container.c:400
 msgid "Failed to pivot root"
 msgstr ""
 
-#: src/lxc/lxc_container.c:412
+#: src/lxc/lxc_container.c:459
 #, c-format
 msgid "Failed to mkdir %s"
 msgstr ""
@@ -5618,20 +5976,20 @@
 msgid "Failed to mount %s on %s type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:426
+#: src/lxc/lxc_container.c:511
 msgid "Cannot create /dev/pts"
 msgstr ""
 
-#: src/lxc/lxc_container.c:433
+#: src/lxc/lxc_container.c:518
 msgid "Failed to mount /dev/pts in container"
 msgstr ""
 
-#: src/lxc/lxc_container.c:468
+#: src/lxc/lxc_container.c:552
 #, c-format
 msgid "Failed to make device %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:485
+#: src/lxc/lxc_container.c:562
 msgid "Failed to make device /dev/ptmx"
 msgstr ""
 
@@ -5723,7 +6081,7 @@
 msgid "Cannot mount filesystem type %s"
 msgstr ""
 
-#: src/lxc/lxc_container.c:545
+#: src/lxc/lxc_container.c:984
 msgid "Failed to read /proc/mounts"
 msgstr ""
 
@@ -5737,25 +6095,25 @@
 msgid "Failed to unmount '%s' and could not unmount old root '%s'"
 msgstr ""
 
-#: src/lxc/lxc_container.c:624
+#: src/lxc/lxc_container.c:1098
 msgid "Failed to make / slave"
 msgstr ""
 
-#: src/lxc/lxc_container.c:687
+#: src/lxc/lxc_container.c:1148
 #, c-format
 msgid "Failed to remove capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:693
+#: src/lxc/lxc_container.c:1154
 #, c-format
 msgid "Failed to apply capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_container.c:732
+#: src/lxc/lxc_container.c:1195
 msgid "lxcChild() passed invalid vm definition"
 msgstr ""
 
-#: src/lxc/lxc_container.c:753
+#: src/lxc/lxc_container.c:1228
 #, c-format
 msgid "Failed to open tty %s"
 msgstr ""
@@ -5765,7 +6123,7 @@
 msgid "cannot find init path '%s' relative to container root"
 msgstr ""
 
-#: src/lxc/lxc_container.c:216
+#: src/lxc/lxc_container.c:1246
 msgid "Failed to read the container continue message"
 msgstr ""
 
@@ -5773,628 +6131,852 @@
 msgid "failed to send continue signal to controller"
 msgstr ""
 
-#: src/lxc/lxc_container.c:836
+#: src/lxc/lxc_container.c:1372
 msgid "Failed to run clone container"
 msgstr ""
 
-#: src/lxc/lxc_conf.c:76 src/qemu/qemu_driver.c:260 src/uml/uml_conf.c:87
+#: src/lxc/lxc_conf.c:81 src/qemu/qemu_driver.c:263 src/uml/uml_conf.c:91
 msgid "cannot get the host uuid"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:85
+#: src/lxc/lxc_controller.c:93
 msgid "Unable to read /dev"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2819
+#: src/lxc/lxc_controller.c:109 src/lxc/lxc_controller.c:162
+#: src/qemu/qemu_driver.c:960 src/util/iohelper.c:57
 #, c-format
 msgid "Unable to open %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:112
+#: src/lxc/lxc_controller.c:120
 #, c-format
 msgid "Unable to get loop status on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:123
+#: src/lxc/lxc_controller.c:131
 msgid "Unable to find a free loop device in /dev"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:160
+#: src/lxc/lxc_controller.c:168
 #, c-format
 msgid "Unable to attach %s to loop device"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:167
+#: src/lxc/lxc_controller.c:175
 msgid "Unable to mark loop device as autoclear"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:92
-msgid "Unable to get cgroup for driver"
+#: src/lxc/lxc_controller.c:252 src/qemu/qemu_process.c:1386
+msgid "Host kernel is not aware of NUMA."
 msgstr ""
 
-#: src/lxc/lxc_controller.c:99
+#: src/lxc/lxc_controller.c:264 src/qemu/qemu_process.c:1398
 #, c-format
-msgid "Unable to create cgroup for domain %s"
+msgid "Host cannot support NUMA node %d"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:274
+#: src/lxc/lxc_controller.c:293 src/qemu/qemu_process.c:1427
+msgid "NUMA memory tuning in 'preferred' mode only supports single node"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:304
 #, c-format
-msgid "Unable to set Blkio weight for domain %s"
+msgid "Unable to set NUMA policy %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:319
+msgid "NUMA policy is not available on this platform"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:392 src/qemu/qemu_cgroup.c:382
+#, c-format
+msgid "Unable to set io cpu shares for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:401
+#, c-format
+msgid "Unable to set io cpu quota for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:410
+#, c-format
+msgid "Unable to set io cpu period for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:284
+#: src/lxc/lxc_controller.c:429
 #, c-format
-msgid "Unable to set cpu shares for domain %s"
+msgid "Unable to set Blkio weight for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:107
+#: src/lxc/lxc_controller.c:449
 #, c-format
 msgid "Unable to set memory limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:302 src/qemu/qemu_cgroup.c:323
+#: src/lxc/lxc_controller.c:458 src/qemu/qemu_cgroup.c:347
 #, c-format
 msgid "Unable to set memory hard limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:312 src/qemu/qemu_cgroup.c:332
+#: src/lxc/lxc_controller.c:468 src/qemu/qemu_cgroup.c:356
 #, c-format
 msgid "Unable to set memory soft limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:322 src/qemu/qemu_cgroup.c:342
+#: src/lxc/lxc_controller.c:478 src/qemu/qemu_cgroup.c:366
 #, c-format
 msgid "Unable to set swap hard limit for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:115
+#: src/lxc/lxc_controller.c:508
 #, c-format
 msgid "Unable to deny devices for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:128
+#: src/lxc/lxc_controller.c:522
 #, c-format
 msgid "Unable to allow device %c:%d:%d for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:362
+#: src/lxc/lxc_controller.c:539
 #, c-format
 msgid "Unable to allow device %s for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:372
+#: src/lxc/lxc_controller.c:549
 #, c-format
 msgid "Unable to allow PTY devices for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:145
+#: src/lxc/lxc_controller.c:588
+msgid "Unable to get cgroup for driver"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:595
+#, c-format
+msgid "Unable to create cgroup for domain %s"
+msgstr ""
+
+#: src/lxc/lxc_controller.c:615
 #, c-format
 msgid "Unable to add task %d to cgroup for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:173
+#: src/lxc/lxc_controller.c:643
 #, c-format
 msgid "failed to create server socket '%s'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:183
+#: src/lxc/lxc_controller.c:653
 #, c-format
 msgid "Socket path %s too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:189
+#: src/lxc/lxc_controller.c:659
 #, c-format
 msgid "failed to bind server socket '%s'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:195
+#: src/lxc/lxc_controller.c:665
 #, c-format
 msgid "failed to listen server socket %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:257
+#: src/lxc/lxc_controller.c:687
 #, c-format
 msgid "failed to apply capabilities: %d"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:543
+#: src/lxc/lxc_controller.c:778
 msgid "Unable to read from monitor client"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:572
+#: src/lxc/lxc_controller.c:807
 msgid "Unable to accept monitor client"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:589 src/lxc/lxc_controller.c:861
+#: src/lxc/lxc_controller.c:824 src/lxc/lxc_controller.c:1096
 msgid "Unable to watch client socket"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:635
+#: src/lxc/lxc_controller.c:870
 msgid "Unable to create epoll fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:643
+#: src/lxc/lxc_controller.c:878
 msgid "Unable to add epoll fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:653
+#: src/lxc/lxc_controller.c:888
 msgid "Unable to wait on epoll"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:725
+#: src/lxc/lxc_controller.c:960
 msgid "Unable to read container pty"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:753
+#: src/lxc/lxc_controller.c:988
 msgid "Unable to write to container pty"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:820
+#: src/lxc/lxc_controller.c:1055
 msgid "Cannot create signal pipe"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:830
+#: src/lxc/lxc_controller.c:1065
 msgid "Unable to watch signal pipe"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:836
+#: src/lxc/lxc_controller.c:1071
 msgid "Cannot install signal handler"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:850
+#: src/lxc/lxc_controller.c:1085
 msgid "Unable to watch monitor socket"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:880 src/lxc/lxc_controller.c:890
+#: src/lxc/lxc_controller.c:1115 src/lxc/lxc_controller.c:1125
 msgid "Unable to watch host console PTY"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:973
+#: src/lxc/lxc_controller.c:1208
 #, c-format
 msgid "Unable to request personality for %s on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:513
+#: src/lxc/lxc_controller.c:1302
 msgid "sockpair failed"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1073
+#: src/lxc/lxc_controller.c:1308
 msgid "socketpair failed"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1110
+#: src/lxc/lxc_controller.c:1345
 #, c-format
 msgid "root source %s does not exist"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:543
+#: src/lxc/lxc_controller.c:1352
 msgid "Cannot unshare mount namespace"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:549
+#: src/lxc/lxc_controller.c:1358
 msgid "Failed to switch root mount into slave mode"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:561
+#: src/lxc/lxc_controller.c:1370
 #, c-format
 msgid "Failed to make path %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:569
+#: src/lxc/lxc_controller.c:1381
 #, c-format
 msgid "Failed to mount devpts on %s"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1158
+#: src/lxc/lxc_controller.c:1393
 msgid "Expected exactly one TTY fd"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:587 src/lxc/lxc_controller.c:596
-#: src/lxc/lxc_driver.c:1212
+#: src/lxc/lxc_controller.c:1405 src/lxc/lxc_controller.c:1414
+#: src/lxc/lxc_driver.c:1806
 msgid "Failed to allocate tty"
 msgstr ""
 
-#: src/lxc/lxc_container.c:187
+#: src/lxc/lxc_controller.c:1439
 msgid "Unable to send container continue message"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1210
+#: src/lxc/lxc_controller.c:1445
 msgid "error receiving signal from container"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1227
+#: src/lxc/lxc_controller.c:1462
 msgid "error sending continue signal to parent"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:1235 src/lxc/lxc_controller.c:1242
+#: src/lxc/lxc_controller.c:1470 src/lxc/lxc_controller.c:1477
 msgid "Unable to set file descriptor non blocking"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:773
+#: src/lxc/lxc_controller.c:1664
 #, c-format
 msgid "Unable to write pid file '%s/%s.pid'"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:787
+#: src/lxc/lxc_controller.c:1678
 msgid "Unable to change to root dir"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:793
+#: src/lxc/lxc_controller.c:1684
 msgid "Unable to become session leader"
 msgstr ""
 
-#: src/lxc/lxc_controller.c:804
+#: src/lxc/lxc_controller.c:1695
 msgid "Failed to accept a connection from driver"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:131
+#: src/lxc/lxc_driver.c:159
 #, c-format
 msgid "Unexpected LXC URI path '%s', try lxc:///"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:139
+#: src/lxc/lxc_driver.c:167
 msgid "lxc state driver is not active"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:229
+#: src/lxc/lxc_driver.c:238
 #, c-format
 msgid "No domain with matching id %d"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:561 src/lxc/lxc_driver.c:586 src/lxc/lxc_driver.c:618
-#: src/lxc/lxc_driver.c:2030 src/lxc/lxc_driver.c:2084
-#: src/lxc/lxc_driver.c:2111 src/lxc/lxc_driver.c:2280
-#: src/lxc/lxc_driver.c:2345
+#: src/lxc/lxc_driver.c:267 src/lxc/lxc_driver.c:321 src/lxc/lxc_driver.c:346
+#: src/lxc/lxc_driver.c:370 src/lxc/lxc_driver.c:502 src/lxc/lxc_driver.c:559
+#: src/lxc/lxc_driver.c:625 src/lxc/lxc_driver.c:652 src/lxc/lxc_driver.c:681
+#: src/lxc/lxc_driver.c:706 src/lxc/lxc_driver.c:738 src/lxc/lxc_driver.c:802
+#: src/lxc/lxc_driver.c:903 src/lxc/lxc_driver.c:1008
+#: src/lxc/lxc_driver.c:1993 src/lxc/lxc_driver.c:2251
+#: src/lxc/lxc_driver.c:3409 src/lxc/lxc_driver.c:3464
+#: src/lxc/lxc_driver.c:3491 src/lxc/lxc_driver.c:3659
+#: src/lxc/lxc_driver.c:3724 src/libxl/libxl_driver.c:1342
+#: src/libxl/libxl_driver.c:1400 src/libxl/libxl_driver.c:1456
+#: src/libxl/libxl_driver.c:1502 src/libxl/libxl_driver.c:1545
+#: src/libxl/libxl_driver.c:1600 src/libxl/libxl_driver.c:1939
+#: src/libxl/libxl_driver.c:2037 src/libxl/libxl_driver.c:2127
+#: src/libxl/libxl_driver.c:2173 src/libxl/libxl_driver.c:2207
+#: src/libxl/libxl_driver.c:2705 src/libxl/libxl_driver.c:3447
+#: src/libxl/libxl_driver.c:3475 src/vmware/vmware_driver.c:595
 #, c-format
 msgid "No domain with matching uuid '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:284
+#: src/lxc/lxc_driver.c:293
 #, c-format
 msgid "No domain with matching name '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:378 src/lxc/lxc_driver.c:1315
-#: src/lxc/lxc_driver.c:1365
+#: src/lxc/lxc_driver.c:449 src/lxc/lxc_driver.c:1999
+#: src/lxc/lxc_driver.c:2077
 msgid "System lacks NETNS support"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:439
+#: src/lxc/lxc_driver.c:508
 msgid "Cannot undefine transient domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:491
+#: src/lxc/lxc_driver.c:571 src/lxc/lxc_driver.c:762 src/lxc/lxc_driver.c:916
 #, c-format
 msgid "Unable to get cgroup for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:497
+#: src/lxc/lxc_driver.c:577
 msgid "Cannot read cputime for domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:502
+#: src/lxc/lxc_driver.c:582
 msgid "Cannot read memory usage for domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:592
+#: src/lxc/lxc_driver.c:712
 msgid "Cannot set max memory lower than current memory"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:624
+#: src/lxc/lxc_driver.c:744
 msgid "Cannot set memory higher than max memory"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2036 src/lxc/lxc_driver.c:2286
-#: src/lxc/lxc_driver.c:2351
+#: src/lxc/lxc_driver.c:750 src/lxc/lxc_driver.c:2257
+#: src/lxc/lxc_driver.c:3415 src/lxc/lxc_driver.c:3665
+#: src/lxc/lxc_driver.c:3730 src/libxl/libxl_driver.c:1346
+#: src/libxl/libxl_driver.c:1405 src/libxl/libxl_driver.c:1462
+#: src/libxl/libxl_driver.c:1508 src/libxl/libxl_driver.c:1551
+#: src/libxl/libxl_driver.c:1944 src/libxl/libxl_driver.c:2042
+#: src/libxl/libxl_driver.c:2132 src/libxl/libxl_driver.c:2404
+#: src/libxl/libxl_driver.c:2501 src/libxl/libxl_driver.c:3253
+#: src/libxl/libxl_driver.c:3548 src/libxl/libxl_driver.c:3615
+#: src/libxl/libxl_driver.c:3706 src/openvz/openvz_driver.c:523
+#: src/openvz/openvz_driver.c:561
 msgid "Domain is not running"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:747
+#: src/lxc/lxc_driver.c:756
 msgid "cgroups must be configured on the host"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:637
+#: src/lxc/lxc_driver.c:768
 msgid "Failed to set memory for domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6009 src/qemu/qemu_driver.c:6080
+#: src/lxc/lxc_driver.c:808 src/lxc/lxc_driver.c:2831
+#: src/lxc/lxc_driver.c:3032 src/lxc/lxc_driver.c:3158
+#: src/lxc/lxc_driver.c:3307 src/qemu/qemu_driver.c:6054
+#: src/qemu/qemu_driver.c:6273 src/qemu/qemu_driver.c:6482
+#: src/qemu/qemu_driver.c:6644 src/qemu/qemu_driver.c:6960
+#: src/qemu/qemu_driver.c:7232
 #, c-format
 msgid "cannot find cgroup for domain %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:811 src/qemu/qemu_driver.c:6240
+#: src/lxc/lxc_driver.c:820 src/qemu/qemu_driver.c:6505
 msgid "invalid type for memory hard_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:819 src/qemu/qemu_driver.c:6249
+#: src/lxc/lxc_driver.c:828 src/qemu/qemu_driver.c:6514
 msgid "unable to set memory hard_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:826 src/qemu/qemu_driver.c:6261
+#: src/lxc/lxc_driver.c:835 src/qemu/qemu_driver.c:6526
 msgid "invalid type for memory soft_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:834 src/qemu/qemu_driver.c:6270
+#: src/lxc/lxc_driver.c:843 src/qemu/qemu_driver.c:6535
 msgid "unable to set memory soft_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:841 src/qemu/qemu_driver.c:6282
+#: src/lxc/lxc_driver.c:850 src/qemu/qemu_driver.c:6547
 msgid "invalid type for swap_hard_limit tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:849 src/qemu/qemu_driver.c:6291
+#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:6556
 msgid "unable to set swap_hard_limit tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:854 src/qemu/qemu_driver.c:6300
+#: src/lxc/lxc_driver.c:863 src/qemu/qemu_driver.c:6565
 #, c-format
 msgid "Memory tunable `%s' not implemented"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:858 src/qemu/qemu_driver.c:5982
-#: src/qemu/qemu_driver.c:6011 src/qemu/qemu_driver.c:6305
+#: src/lxc/lxc_driver.c:867 src/lxc/lxc_driver.c:3202
+#: src/lxc/lxc_driver.c:3231 src/qemu/qemu_driver.c:6137
+#: src/qemu/qemu_driver.c:6192 src/qemu/qemu_driver.c:6570
 #, c-format
 msgid "Parameter `%s' not supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:922 src/qemu/qemu_driver.c:6457
+#: src/lxc/lxc_driver.c:931 src/qemu/qemu_driver.c:6726
 msgid "unable to get memory hard limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:927
+#: src/lxc/lxc_driver.c:936
 msgid "Field memory hard limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:937 src/qemu/qemu_driver.c:6473
+#: src/lxc/lxc_driver.c:946 src/qemu/qemu_driver.c:6742
 msgid "unable to get memory soft limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:942
+#: src/lxc/lxc_driver.c:951
 msgid "Field memory soft limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:952 src/qemu/qemu_driver.c:6489
+#: src/lxc/lxc_driver.c:961 src/qemu/qemu_driver.c:6758
 msgid "unable to get swap hard limit"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:957
+#: src/lxc/lxc_driver.c:966
 msgid "Field swap hard limit too long for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1202
-msgid "Unable to initialize bridging"
+#: src/lxc/lxc_driver.c:1226 src/network/bridge_driver.c:1780
+#: src/qemu/qemu_command.c:270 src/util/virnetdevmacvlan.c:583
+#, c-format
+msgid "cannot set bandwidth limits on %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:1262
+msgid "Unable to set network bandwidth on direct interfaces"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:805
-msgid "Failed to get bridge for interface"
+#: src/lxc/lxc_driver.c:1276
+msgid "Unable to set port profile on direct interfaces"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:850
-#, c-format
-msgid "Failed to add %s device to %s"
+#: src/lxc/lxc_driver.c:1366
+msgid "No bridge name specified"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1293 src/network/bridge_driver.c:1815
-#: src/qemu/qemu_command.c:330 src/util/macvtap.c:369
+#: src/lxc/lxc_driver.c:1394
 #, c-format
-msgid "cannot set bandwidth limits on %s"
+msgid "Unsupported network type %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:888
+#: src/lxc/lxc_driver.c:1428
 msgid "Failed to create client socket"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:896
+#: src/lxc/lxc_driver.c:1436
 #, c-format
 msgid "Socket path %s too big for destination"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:902
+#: src/lxc/lxc_driver.c:1442
 msgid "Failed to connect to client socket"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:927
+#: src/lxc/lxc_driver.c:1465
 #, c-format
 msgid "Invalid PID %d for container"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1375
+#: src/lxc/lxc_driver.c:1473
 msgid "Failed to kill container PIDs"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1381
+#: src/lxc/lxc_driver.c:1479
 msgid "Some container PIDs refused to die"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1547
+#: src/lxc/lxc_driver.c:1645
 #, c-format
 msgid "failed to open logfile %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1563 src/qemu/qemu_domain.c:1268
+#: src/lxc/lxc_driver.c:1661 src/qemu/qemu_domain.c:1273
 #, c-format
 msgid "unable to seek to end of log for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1567 src/qemu/qemu_domain.c:1272
+#: src/lxc/lxc_driver.c:1665 src/qemu/qemu_domain.c:1277
 #, c-format
 msgid "unable to seek to %lld from start for %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1584
+#: src/lxc/lxc_driver.c:1682
 msgid "Failure while reading guest log output"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1642
+#: src/lxc/lxc_driver.c:1740
 msgid ""
 "The 'cpuacct', 'devices' & 'memory' cgroups controllers must be mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1649
+#: src/lxc/lxc_driver.c:1747
 msgid "Unable to find 'cpuacct' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1655
+#: src/lxc/lxc_driver.c:1753
 msgid "Unable to find 'devices' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1661
+#: src/lxc/lxc_driver.c:1759
 msgid "Unable to find 'memory' cgroups controller mount"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1198
+#: src/lxc/lxc_driver.c:1765
 #, c-format
 msgid "Cannot create log directory '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1702
+#: src/lxc/lxc_driver.c:1800
 msgid "Only PTY console types are supported"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1233
+#: src/lxc/lxc_driver.c:1830
 #, c-format
 msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1774
+#: src/lxc/lxc_driver.c:1872
 msgid "could not close handshake fd"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1253
+#: src/lxc/lxc_driver.c:1885
 #, c-format
 msgid "Failed to read pid file %s/%s.pid"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1800
+#: src/lxc/lxc_driver.c:1898
 #, c-format
 msgid "guest failed to start: %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1839
+#: src/lxc/lxc_driver.c:1937
 msgid "could not close logfile"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1906 src/libxl/libxl_driver.c:2711
+#: src/lxc/lxc_driver.c:2005 src/libxl/libxl_driver.c:2711
 #: src/vmware/vmware_driver.c:601
 msgid "Domain is already running"
 msgstr ""
 
-#: src/uml/uml_driver.c:163
+#: src/lxc/lxc_driver.c:2329 src/libxl/libxl_driver.c:171
+#: src/qemu/qemu_driver.c:166 src/uml/uml_driver.c:168
 #, c-format
 msgid "Failed to autostart VM '%s': %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1884
+#: src/lxc/lxc_driver.c:2600
 #, c-format
 msgid "Unknown release: %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1946 src/qemu/qemu_driver.c:6032
-#, c-format
-msgid "Invalid parameter `%s'"
+#: src/lxc/lxc_driver.c:2669 src/lxc/lxc_driver.c:2826
+#: src/lxc/lxc_driver.c:3026 src/qemu/qemu_driver.c:5866
+#: src/qemu/qemu_driver.c:6955 src/qemu/qemu_driver.c:7226
+msgid "cgroup CPU controller is not mounted"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1937
-msgid "Invalid type for cpu_shares tunable, expected a 'ullong'"
+#: src/lxc/lxc_driver.c:2702 src/qemu/qemu_driver.c:6828
+#: src/qemu/qemu_driver.c:7080
+msgid "unable to get cpu bandwidth period tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2572
-#, c-format
-msgid "failed to set cpu_shares=%llu"
+#: src/lxc/lxc_driver.c:2709 src/qemu/qemu_driver.c:6821
+#: src/qemu/qemu_driver.c:7087
+msgid "unable to get cpu bandwidth tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1996
-msgid "Field cpu_shares too big for destination"
+#: src/lxc/lxc_driver.c:2731 src/qemu/qemu_cgroup.c:418
+msgid "Unable to get cpu bandwidth period"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2053
-#, c-format
-msgid "Invalid path, '%s' is not a known interface"
+#: src/lxc/lxc_driver.c:2738 src/qemu/qemu_cgroup.c:425
+msgid "Unable to set cpu bandwidth period"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2117
-msgid "Cannot set autostart for transient domain"
+#: src/lxc/lxc_driver.c:2747 src/qemu/qemu_cgroup.c:434
+msgid "Unable to set cpu bandwidth quota"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2142
+#: src/lxc/lxc_driver.c:2759 src/qemu/qemu_cgroup.c:446
+#: src/qemu/qemu_cgroup.c:481 src/qemu/qemu_driver.c:6808
+#: src/xenapi/xenapi_utils.c:391 src/xenapi/xenapi_utils.c:395
 #, c-format
-msgid "Cannot create autostart directory %s"
+msgid "%s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2149 src/qemu/qemu_driver.c:5930
-#: src/uml/uml_driver.c:1752
+#: src/lxc/lxc_driver.c:2791 src/lxc/lxc_driver.c:2974
+#: src/lxc/lxc_driver.c:3131 src/lxc/lxc_driver.c:3273
+#: src/qemu/qemu_driver.c:6027 src/qemu/qemu_driver.c:6239
+#: src/qemu/qemu_driver.c:6454 src/qemu/qemu_driver.c:6616
+#: src/qemu/qemu_driver.c:6920 src/qemu/qemu_driver.c:7174
 #, c-format
-msgid "Failed to create symlink '%s to '%s'"
+msgid "No such domain %s"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2156 src/network/bridge_driver.c:1538
-#: src/qemu/qemu_driver.c:5937 src/storage/storage_driver.c:1036
-#: src/uml/uml_driver.c:1759
-#, c-format
-msgid "Failed to delete symlink '%s'"
+#: src/lxc/lxc_driver.c:2807 src/lxc/lxc_driver.c:3166
+#: src/lxc/lxc_driver.c:3315 src/libxl/libxl_driver.c:1684
+#: src/libxl/libxl_driver.c:2276 src/qemu/qemu_driver.c:1847
+#: src/qemu/qemu_driver.c:3328 src/qemu/qemu_driver.c:3464
+#: src/qemu/qemu_driver.c:6062 src/qemu/qemu_driver.c:6281
+#: src/qemu/qemu_driver.c:6490 src/qemu/qemu_driver.c:6652
+#: src/qemu/qemu_driver.c:6936 src/qemu/qemu_driver.c:11172
+msgid "cannot change persistent config of a transient domain"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2293
-msgid "Suspend operation failed"
+#: src/lxc/lxc_driver.c:2820 src/lxc/lxc_driver.c:3020
+#: src/lxc/lxc_driver.c:3147 src/lxc/lxc_driver.c:3296
+#: src/lxc/lxc_driver.c:3787 src/qemu/qemu_driver.c:1401
+#: src/qemu/qemu_driver.c:1420 src/qemu/qemu_driver.c:1472
+#: src/qemu/qemu_driver.c:1529 src/qemu/qemu_driver.c:1585
+#: src/qemu/qemu_driver.c:1638 src/qemu/qemu_driver.c:1708
+#: src/qemu/qemu_driver.c:1840 src/qemu/qemu_driver.c:1951
+#: src/qemu/qemu_driver.c:1962 src/qemu/qemu_driver.c:2033
+#: src/qemu/qemu_driver.c:2194 src/qemu/qemu_driver.c:2696
+#: src/qemu/qemu_driver.c:2755 src/qemu/qemu_driver.c:2968
+#: src/qemu/qemu_driver.c:3079 src/qemu/qemu_driver.c:3170
+#: src/qemu/qemu_driver.c:3322 src/qemu/qemu_driver.c:3603
+#: src/qemu/qemu_driver.c:4438 src/qemu/qemu_driver.c:6043
+#: src/qemu/qemu_driver.c:6262 src/qemu/qemu_driver.c:6470
+#: src/qemu/qemu_driver.c:6632 src/qemu/qemu_driver.c:6949
+#: src/qemu/qemu_driver.c:7220 src/qemu/qemu_driver.c:7363
+#: src/qemu/qemu_driver.c:7428 src/qemu/qemu_driver.c:7451
+#: src/qemu/qemu_driver.c:7513 src/qemu/qemu_driver.c:7541
+#: src/qemu/qemu_driver.c:7726 src/qemu/qemu_driver.c:7796
+#: src/qemu/qemu_driver.c:7913 src/qemu/qemu_driver.c:8460
+#: src/qemu/qemu_driver.c:8940 src/qemu/qemu_driver.c:8975
+#: src/qemu/qemu_driver.c:9037 src/qemu/qemu_driver.c:9095
+#: src/qemu/qemu_driver.c:9204 src/qemu/qemu_driver.c:9482
+#: src/qemu/qemu_driver.c:10716 src/qemu/qemu_driver.c:10725
+#: src/qemu/qemu_driver.c:10864 src/qemu/qemu_driver.c:10970
+#: src/qemu/qemu_driver.c:10984 src/qemu/qemu_driver.c:11070
+#: src/qemu/qemu_driver.c:11165 src/qemu/qemu_driver.c:11324
+#: src/qemu/qemu_migration.c:2323 src/uml/uml_driver.c:2395
+#: src/xen/xen_driver.c:2132 src/xen/xen_hypervisor.c:1159
+#: src/xen/xen_hypervisor.c:1240 src/xen/xen_hypervisor.c:1359
+#: src/xen/xm_internal.c:715
+msgid "domain is not running"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:2358
-msgid "Resume operation failed"
+#: src/lxc/lxc_driver.c:2843 src/qemu/qemu_driver.c:6972
+msgid "invalid type for cpu_shares tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2986 src/qemu/qemu_driver.c:3180
-#: src/qemu/qemu_driver.c:3236 src/qemu/qemu_driver.c:3295
-#: src/qemu/qemu_driver.c:3336 src/qemu/qemu_driver.c:3388
-#: src/qemu/qemu_driver.c:3415 src/qemu/qemu_driver.c:3440
-#: src/qemu/qemu_driver.c:3472 src/qemu/qemu_driver.c:3529
-#: src/qemu/qemu_driver.c:3661 src/qemu/qemu_driver.c:3826
-#: src/qemu/qemu_driver.c:3956 src/qemu/qemu_driver.c:4023
-#: src/qemu/qemu_driver.c:4088 src/qemu/qemu_driver.c:4172
-#: src/qemu/qemu_driver.c:4207 src/qemu/qemu_driver.c:4466
-#: src/qemu/qemu_driver.c:4701 src/qemu/qemu_driver.c:4907
-#: src/qemu/qemu_driver.c:5414 src/qemu/qemu_driver.c:5808
-#: src/qemu/qemu_driver.c:5873 src/qemu/qemu_driver.c:5900
-#: src/qemu/qemu_driver.c:6131 src/qemu/qemu_driver.c:6202
-#: src/qemu/qemu_driver.c:6260 src/qemu/qemu_driver.c:6299
-#: src/qemu/qemu_driver.c:6372 src/qemu/qemu_driver.c:7569
-#: src/uml/uml_driver.c:1402 src/uml/uml_driver.c:1427
-#: src/uml/uml_driver.c:1460
-#, c-format
-msgid "no domain with matching uuid '%s'"
+#: src/lxc/lxc_driver.c:2851 src/qemu/qemu_driver.c:6980
+msgid "unable to set cpu shares tunable"
 msgstr ""
 
-#: src/opennebula/one_driver.c:577 src/qemu/qemu_driver.c:3188
-#: src/qemu/qemu_driver.c:3245 src/qemu/qemu_driver.c:3304
-#: src/qemu/qemu_driver.c:3345 src/qemu/qemu_driver.c:3670
-#: src/qemu/qemu_driver.c:3835 src/qemu/qemu_driver.c:6140
-#: src/qemu/qemu_driver.c:6208 src/qemu/qemu_driver.c:6271
-#: src/qemu/qemu_driver.c:6387 src/qemu/qemu_driver.c:7578
-#: src/xen/xen_hypervisor.c:1097 src/xen/xen_hypervisor.c:1181
-#: src/xen/xen_hypervisor.c:1290
-msgid "domain is not running"
+#: src/lxc/lxc_driver.c:2864 src/qemu/qemu_driver.c:6993
+msgid "invalid type for vcpu_period tunable, expected a 'ullong'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3076 src/uml/uml_driver.c:2430
+#: src/lxc/lxc_driver.c:2884 src/qemu/qemu_driver.c:7013
+msgid "invalid type for vcpu_quota tunable, expected a 'llong'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:2903 src/qemu/qemu_driver.c:7032
 #, c-format
-msgid "cannot find console device '%s'"
+msgid "Invalid parameter `%s'"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3077 src/uml/uml_driver.c:2431
-msgid "default"
+#: src/lxc/lxc_driver.c:2990 src/qemu/qemu_driver.c:7190
+msgid "cannot query persistent config of a transient domain"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3000 src/qemu/qemu_driver.c:7200
+msgid "can't get persistentDef"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3039 src/qemu/qemu_driver.c:7239
+msgid "unable to get cpu shares tunable"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:3083 src/qemu/qemu_driver.c:10551
-#: src/uml/uml_driver.c:2437 src/xen/xen_driver.c:2152
+#: src/lxc/lxc_driver.c:3054 src/lxc/lxc_driver.c:3068
+#: src/lxc/lxc_driver.c:3081 src/lxc/lxc_driver.c:3339
+#: src/lxc/lxc_driver.c:3362 src/libxl/libxl_driver.c:3646
+#: src/libxl/libxl_driver.c:3657 src/qemu/qemu_driver.c:6305
+#: src/qemu/qemu_driver.c:6344 src/qemu/qemu_driver.c:6366
+#: src/qemu/qemu_driver.c:6406 src/qemu/qemu_driver.c:6677
+#: src/qemu/qemu_driver.c:6687 src/qemu/qemu_driver.c:6697
+#: src/qemu/qemu_driver.c:6731 src/qemu/qemu_driver.c:6747
+#: src/qemu/qemu_driver.c:6763 src/qemu/qemu_driver.c:7254
+#: src/qemu/qemu_driver.c:7268 src/qemu/qemu_driver.c:7281
+#: src/qemu/qemu_driver.c:7579 src/qemu/qemu_driver.c:7593
+#: src/qemu/qemu_driver.c:7607 src/qemu/qemu_driver.c:7621
+#: src/qemu/qemu_driver.c:7635 src/qemu/qemu_driver.c:7649
+#: src/qemu/qemu_driver.c:7663 src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:11362 src/qemu/qemu_driver.c:11373
+#: src/qemu/qemu_driver.c:11384 src/qemu/qemu_driver.c:11395
+#: src/qemu/qemu_driver.c:11406 src/qemu/qemu_driver.c:11417
+#: src/test/test_driver.c:2726
 #, c-format
-msgid "character device %s is not using a PTY"
+msgid "Field name '%s' too long"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3152 src/lxc/lxc_driver.c:3301
+#: src/qemu/qemu_driver.c:6048 src/qemu/qemu_driver.c:6267
+msgid "blkio cgroup isn't mounted"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3182 src/lxc/lxc_driver.c:3216
+#: src/qemu/qemu_driver.c:6078 src/qemu/qemu_driver.c:6155
+msgid "invalid type for blkio weight tunable, expected a 'unsigned int'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3189 src/lxc/lxc_driver.c:3223
+#: src/qemu/qemu_driver.c:6085 src/qemu/qemu_driver.c:6162
+msgid "out of blkio weight range."
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3197 src/qemu/qemu_driver.c:6093
+msgid "unable to set blkio weight tunable"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3334 src/qemu/qemu_driver.c:6300
+msgid "unable to get blkio weight"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3432
+#, c-format
+msgid "Invalid path, '%s' is not a known interface"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3497
+msgid "Cannot set autostart for transient domain"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3520
+#, c-format
+msgid "Cannot create autostart directory %s"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3527 src/libxl/libxl_driver.c:3503
+#: src/qemu/qemu_driver.c:5796 src/uml/uml_driver.c:2275
+#, c-format
+msgid "Failed to create symlink '%s to '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3534 src/libxl/libxl_driver.c:3510
+#: src/network/bridge_driver.c:2608 src/qemu/qemu_driver.c:5803
+#: src/storage/storage_driver.c:1063 src/uml/uml_driver.c:2282
+#, c-format
+msgid "Failed to delete symlink '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3672
+msgid "Suspend operation failed"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3737
+msgid "Resume operation failed"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3781 src/libxl/libxl_driver.c:2801
+#: src/qemu/qemu_driver.c:1144 src/qemu/qemu_driver.c:1196
+#: src/qemu/qemu_driver.c:1220 src/qemu/qemu_driver.c:1244
+#: src/qemu/qemu_driver.c:1396 src/qemu/qemu_driver.c:1463
+#: src/qemu/qemu_driver.c:1520 src/qemu/qemu_driver.c:1567
+#: src/qemu/qemu_driver.c:1629 src/qemu/qemu_driver.c:1690
+#: src/qemu/qemu_driver.c:1757 src/qemu/qemu_driver.c:1784
+#: src/qemu/qemu_driver.c:1816 src/qemu/qemu_driver.c:1945
+#: src/qemu/qemu_driver.c:2022 src/qemu/qemu_driver.c:2068
+#: src/qemu/qemu_driver.c:2155 src/qemu/qemu_driver.c:2188
+#: src/qemu/qemu_driver.c:2690 src/qemu/qemu_driver.c:2749
+#: src/qemu/qemu_driver.c:2800 src/qemu/qemu_driver.c:2834
+#: src/qemu/qemu_driver.c:2958 src/qemu/qemu_driver.c:3295
+#: src/qemu/qemu_driver.c:3433 src/qemu/qemu_driver.c:3588
+#: src/qemu/qemu_driver.c:3686 src/qemu/qemu_driver.c:3777
+#: src/qemu/qemu_driver.c:3841 src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4748 src/qemu/qemu_driver.c:4966
+#: src/qemu/qemu_driver.c:5574 src/qemu/qemu_driver.c:5741
+#: src/qemu/qemu_driver.c:5768 src/qemu/qemu_driver.c:7422
+#: src/qemu/qemu_driver.c:7507 src/qemu/qemu_driver.c:7720
+#: src/qemu/qemu_driver.c:7782 src/qemu/qemu_driver.c:7830
+#: src/qemu/qemu_driver.c:7898 src/qemu/qemu_driver.c:7995
+#: src/qemu/qemu_driver.c:8357 src/qemu/qemu_driver.c:8446
+#: src/qemu/qemu_driver.c:8627 src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:8916 src/qemu/qemu_driver.c:8966
+#: src/qemu/qemu_driver.c:9028 src/qemu/qemu_driver.c:9084
+#: src/qemu/qemu_driver.c:9141 src/qemu/qemu_driver.c:9618
+#: src/qemu/qemu_driver.c:9868 src/qemu/qemu_driver.c:9899
+#: src/qemu/qemu_driver.c:9937 src/qemu/qemu_driver.c:9977
+#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10054
+#: src/qemu/qemu_driver.c:10084 src/qemu/qemu_driver.c:10127
+#: src/qemu/qemu_driver.c:10162 src/qemu/qemu_driver.c:10232
+#: src/qemu/qemu_driver.c:10593 src/qemu/qemu_driver.c:10710
+#: src/qemu/qemu_driver.c:10858 src/qemu/qemu_driver.c:10964
+#: src/qemu/qemu_driver.c:11064 src/qemu/qemu_driver.c:11142
+#: src/qemu/qemu_driver.c:11293 src/test/test_driver.c:2119
+#: src/uml/uml_driver.c:1637 src/uml/uml_driver.c:1662
+#: src/uml/uml_driver.c:1695 src/uml/uml_driver.c:2038
+#: src/uml/uml_driver.c:2156 src/uml/uml_driver.c:2389
+#: src/vmware/vmware_driver.c:638
+#, c-format
+msgid "no domain with matching uuid '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3808 src/uml/uml_driver.c:2416
+#, c-format
+msgid "cannot find console device '%s'"
+msgstr ""
+
+#: src/lxc/lxc_driver.c:3809 src/uml/uml_driver.c:2417
+msgid "default"
 msgstr ""
 
-#: src/lxc/veth.c:231
+#: src/lxc/lxc_driver.c:3815 src/qemu/qemu_driver.c:10898
+#: src/uml/uml_driver.c:2423 src/xen/xen_driver.c:2160
 #, c-format
-msgid "Failed to enable '%s'"
+msgid "character device %s is not using a PTY"
 msgstr ""
 
-#: tools/virsh.c:354
+#: src/libxl/libxl_driver.c:173 src/qemu/qemu_driver.c:160
+#: src/qemu/qemu_driver.c:168 src/qemu/qemu_hostdev.c:382
+#: src/qemu/qemu_hostdev.c:401 src/qemu/qemu_hostdev.c:429
+#: src/secret/secret_driver.c:505 src/uml/uml_driver.c:169
+#: src/xenapi/xenapi_utils.c:282 tools/virsh.c:530
 msgid "unknown error"
 msgstr ""
 
@@ -6411,7 +6993,7 @@
 msgid "machine type %s too big for destination"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4308
+#: src/libxl/libxl_driver.c:245
 msgid "cannot read domain image"
 msgstr ""
 
@@ -6419,21 +7001,21 @@
 msgid "failed to read libxl header"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4320
+#: src/libxl/libxl_driver.c:256 src/qemu/qemu_driver.c:3965
 msgid "image magic is incorrect"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4326
+#: src/libxl/libxl_driver.c:262 src/qemu/qemu_driver.c:3991
 #, c-format
 msgid "image version is not supported (%d > %d)"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3999
+#: src/libxl/libxl_driver.c:269 src/qemu/qemu_driver.c:3998
 #, c-format
 msgid "invalid XML length: %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4338
+#: src/libxl/libxl_driver.c:279 src/qemu/qemu_driver.c:4009
 msgid "failed to read XML"
 msgstr ""
 
@@ -6447,7 +7029,7 @@
 msgid "Failed to pin vcpu '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4381
+#: src/libxl/libxl_driver.c:660 src/qemu/qemu_driver.c:4380
 #, c-format
 msgid ""
 "cannot restore domain '%s' uuid %s from a file which belongs to domain '%s' "
@@ -6478,24 +7060,24 @@
 msgid "Failed to create log dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:509
+#: src/libxl/libxl_driver.c:926 src/qemu/qemu_driver.c:512
 #, c-format
 msgid "Failed to create state dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:515
+#: src/libxl/libxl_driver.c:932 src/qemu/qemu_driver.c:518
 #, c-format
 msgid "Failed to create lib dir '%s': %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:527
-#: src/qemu/qemu_driver.c:533
+#: src/libxl/libxl_driver.c:938 src/qemu/qemu_driver.c:530
+#: src/qemu/qemu_driver.c:536
 #, c-format
 msgid "Failed to create save dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:511 src/qemu/qemu_driver.c:543
-#: src/uml/uml_driver.c:859
+#: src/libxl/libxl_driver.c:949 src/qemu/qemu_domain.c:1218
+#: src/uml/uml_driver.c:1019
 #, c-format
 msgid "failed to create logfile %s"
 msgstr ""
@@ -6508,7 +7090,7 @@
 msgid "libxenlight state driver is not active"
 msgstr ""
 
-#: src/xen/xen_driver.c:265
+#: src/libxl/libxl_driver.c:1101 src/xen/xen_driver.c:289
 #, c-format
 msgid "unexpected Xen URI path '%s', try xen:///"
 msgstr ""
@@ -6539,16 +7121,30 @@
 msgid "Failed to destroy domain '%d'"
 msgstr ""
 
-#: src/opennebula/one_driver.c:283 src/opennebula/one_driver.c:314
-#: src/opennebula/one_driver.c:389 src/openvz/openvz_driver.c:395
-#: src/openvz/openvz_driver.c:478 src/openvz/openvz_driver.c:522
-#: src/openvz/openvz_driver.c:559 src/openvz/openvz_driver.c:1015
-#: src/openvz/openvz_driver.c:1057 src/openvz/openvz_driver.c:1088
-#: src/openvz/openvz_driver.c:1161 src/uml/uml_driver.c:1374
-#: src/uml/uml_driver.c:1497 src/uml/uml_driver.c:1537
-#: src/uml/uml_driver.c:1587 src/uml/uml_driver.c:1652
-#: src/uml/uml_driver.c:1696 src/uml/uml_driver.c:1722
-#: src/uml/uml_driver.c:1796
+#: src/libxl/libxl_driver.c:1625 src/libxl/libxl_driver.c:1656
+#: src/libxl/libxl_driver.c:1776 src/libxl/libxl_driver.c:1823
+#: src/libxl/libxl_driver.c:2264 src/libxl/libxl_driver.c:2383
+#: src/libxl/libxl_driver.c:2440 src/libxl/libxl_driver.c:2496
+#: src/libxl/libxl_driver.c:2560 src/libxl/libxl_driver.c:3240
+#: src/libxl/libxl_driver.c:3543 src/libxl/libxl_driver.c:3610
+#: src/libxl/libxl_driver.c:3701 src/openvz/openvz_driver.c:351
+#: src/openvz/openvz_driver.c:399 src/openvz/openvz_driver.c:473
+#: src/openvz/openvz_driver.c:517 src/openvz/openvz_driver.c:555
+#: src/openvz/openvz_driver.c:598 src/openvz/openvz_driver.c:649
+#: src/openvz/openvz_driver.c:1126 src/openvz/openvz_driver.c:1175
+#: src/openvz/openvz_driver.c:1205 src/openvz/openvz_driver.c:1298
+#: src/uml/uml_driver.c:1609 src/uml/uml_driver.c:1732
+#: src/uml/uml_driver.c:1778 src/uml/uml_driver.c:1807
+#: src/uml/uml_driver.c:1859 src/uml/uml_driver.c:1938
+#: src/uml/uml_driver.c:2221 src/uml/uml_driver.c:2247
+#: src/uml/uml_driver.c:2322 src/vbox/vbox_tmpl.c:2031
+#: src/vbox/vbox_tmpl.c:2091 src/vbox/vbox_tmpl.c:5261
+#: src/vbox/vbox_tmpl.c:5355 src/vbox/vbox_tmpl.c:5592
+#: src/vbox/vbox_tmpl.c:8657 src/vbox/vbox_tmpl.c:9022
+#: src/vmware/vmware_driver.c:330 src/vmware/vmware_driver.c:387
+#: src/vmware/vmware_driver.c:436 src/vmware/vmware_driver.c:480
+#: src/vmware/vmware_driver.c:835 src/vmware/vmware_driver.c:913
+#: src/vmware/vmware_driver.c:948
 msgid "no domain with matching uuid"
 msgstr ""
 
@@ -6556,20 +7152,13 @@
 msgid "cannot set memory on an inactive domain"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:1684 src/libxl/libxl_driver.c:2276
-#: src/qemu/qemu_driver.c:1841 src/qemu/qemu_driver.c:3322
-#: src/qemu/qemu_driver.c:3458 src/qemu/qemu_driver.c:5946
-#: src/qemu/qemu_driver.c:6093 src/qemu/qemu_driver.c:6225
-#: src/qemu/qemu_driver.c:6383 src/qemu/qemu_driver.c:6667
-msgid "cannot change persistent config of a transient domain"
-msgstr ""
-
 #: src/libxl/libxl_driver.c:1698
 #, c-format
 msgid "Failed to set maximum memory for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3478 src/uml/uml_driver.c:1472
+#: src/libxl/libxl_driver.c:1719 src/qemu/qemu_driver.c:1879
+#: src/uml/uml_driver.c:1707
 msgid "cannot set memory higher than max memory"
 msgstr ""
 
@@ -6611,8 +7200,8 @@
 msgstr ""
 
 #: src/libxl/libxl_driver.c:1928 src/libxl/libxl_driver.c:1977
-#: src/test/test_driver.c:1742 src/test/test_driver.c:1855
-#: src/xen/xen_driver.c:1043 src/xen/xen_driver.c:1067
+#: src/test/test_driver.c:1747 src/test/test_driver.c:1860
+#: src/xen/xen_driver.c:1051 src/xen/xen_driver.c:1075
 msgid "xml modification unsupported"
 msgstr ""
 
@@ -6631,13 +7220,13 @@
 msgid "After dumping core, failed to resume domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2754
+#: src/libxl/libxl_driver.c:2137 src/qemu/qemu_driver.c:2760
 msgid "cannot do managed save for transient domain"
 msgstr ""
 
 #: src/libxl/libxl_driver.c:2250 src/libxl/libxl_driver.c:2397
-#: src/qemu/qemu_driver.c:3792 src/test/test_driver.c:2128
-#: src/test/test_driver.c:2184 src/xen/xen_driver.c:1109
+#: src/qemu/qemu_driver.c:3791 src/test/test_driver.c:2133
+#: src/test/test_driver.c:2189 src/xen/xen_driver.c:1117
 #, c-format
 msgid "invalid flag combination: (0x%x)"
 msgstr ""
@@ -6650,11 +7239,13 @@
 msgid "cannot set vcpus on an inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3978
+#: src/libxl/libxl_driver.c:2282 src/qemu/qemu_driver.c:3341
+#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
 msgid "could not determine max vcpus for the domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3984
+#: src/libxl/libxl_driver.c:2292 src/qemu/qemu_driver.c:3351
+#: src/xen/xend_internal.c:2225 src/xen/xm_internal.c:740
 #, c-format
 msgid ""
 "requested vcpus is greater than max allowable vcpus for the domain: %d > %d"
@@ -6665,12 +7256,12 @@
 msgid "Failed to set vcpus for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3806
-#: src/test/test_driver.c:2144
+#: src/libxl/libxl_driver.c:2411 src/qemu/qemu_driver.c:3805
+#: src/qemu/qemu_driver.c:11340 src/test/test_driver.c:2149
 msgid "domain is transient"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4029 src/test/test_driver.c:2191
+#: src/libxl/libxl_driver.c:2446 src/test/test_driver.c:2378
 msgid "cannot pin vcpus on an inactive domain"
 msgstr ""
 
@@ -6683,8 +7274,9 @@
 msgid "Failed to list vcpus for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4516 src/qemu/qemu_driver.c:4554
-#: src/xen/xen_driver.c:1182 src/xen/xen_driver.c:1221
+#: src/libxl/libxl_driver.c:2587 src/libxl/libxl_driver.c:2630
+#: src/qemu/qemu_driver.c:4482 src/qemu/qemu_driver.c:4526
+#: src/xen/xen_driver.c:1274 src/xen/xen_driver.c:1323
 #, c-format
 msgid "unsupported config type %s"
 msgstr ""
@@ -6697,21 +7289,21 @@
 msgid "parsing xm config failed"
 msgstr ""
 
-#: src/opennebula/one_driver.c:289 src/qemu/qemu_driver.c:4919
-#: src/uml/uml_driver.c:1664
+#: src/libxl/libxl_driver.c:2807 src/qemu/qemu_driver.c:4972
+#: src/uml/uml_driver.c:1944 src/vmware/vmware_driver.c:644
 msgid "cannot undefine transient domain"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4998
+#: src/libxl/libxl_driver.c:2819 src/qemu/qemu_driver.c:4997
 msgid "Failed to remove domain managed save image"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5004
-#: tools/virsh.c:2033
+#: src/libxl/libxl_driver.c:2824 src/qemu/qemu_driver.c:5003
+#: tools/virsh.c:2045
 msgid "Refusing to undefine while domain managed save image exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5016
+#: src/libxl/libxl_driver.c:2882 src/qemu/qemu_hotplug.c:67
 #, c-format
 msgid "No device with bus '%s' and target '%s'"
 msgstr ""
@@ -6726,12 +7318,15 @@
 msgid "libxenlight failed to change media for disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5087 src/qemu/qemu_driver.c:5123
+#: src/libxl/libxl_driver.c:2934 src/qemu/qemu_hotplug.c:203
+#: src/qemu/qemu_hotplug.c:433 src/qemu/qemu_hotplug.c:556
+#: src/uml/uml_driver.c:1984
 #, c-format
 msgid "target %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5130
+#: src/libxl/libxl_driver.c:2940 src/qemu/qemu_hotplug.c:574
+#: src/uml/uml_driver.c:1991
 msgid "disk source path is missing"
 msgstr ""
 
@@ -6740,17 +7335,19 @@
 msgid "libxenlight failed to attach disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5482
+#: src/libxl/libxl_driver.c:2964 src/qemu/qemu_driver.c:5089
+#: src/uml/uml_driver.c:2061
 #, c-format
 msgid "disk bus '%s' cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5490
+#: src/libxl/libxl_driver.c:2970 src/qemu/qemu_driver.c:5094
 #, c-format
 msgid "disk device type '%s' cannot be hotplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5549
+#: src/libxl/libxl_driver.c:2997 src/qemu/qemu_hotplug.c:1505
+#: src/qemu/qemu_hotplug.c:1608 src/uml/uml_driver.c:2115
 #, c-format
 msgid "disk %s not found"
 msgstr ""
@@ -6770,74 +7367,75 @@
 msgid "device type '%s' cannot hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5504
+#: src/libxl/libxl_driver.c:3049 src/qemu/qemu_driver.c:5184
+#: src/uml/uml_driver.c:2066
 #, c-format
 msgid "device type '%s' cannot be attached"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5364
+#: src/libxl/libxl_driver.c:3067 src/qemu/qemu_driver.c:5363
 #, c-format
 msgid "target %s already exists."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5415
+#: src/libxl/libxl_driver.c:3080 src/qemu/qemu_driver.c:5414
 msgid "persistent attach of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3099 src/qemu/qemu_driver.c:5215
-#: src/xen/xm_internal.c:1548
+#: src/libxl/libxl_driver.c:3099 src/xen/xm_internal.c:1547
 #, c-format
 msgid "device type '%s' cannot be detached"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5435
+#: src/libxl/libxl_driver.c:3118 src/qemu/qemu_driver.c:5434
 #, c-format
 msgid "no target device %s"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5464
+#: src/libxl/libxl_driver.c:3125 src/qemu/qemu_driver.c:5463
 msgid "persistent detach of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5306
+#: src/libxl/libxl_driver.c:3150 src/qemu/qemu_driver.c:5305
 #, c-format
 msgid "disk bus '%s' cannot be updated."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5343
+#: src/libxl/libxl_driver.c:3157 src/qemu/qemu_driver.c:5342
 #, c-format
 msgid "device type '%s' cannot be updated"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5484
+#: src/libxl/libxl_driver.c:3178 src/qemu/qemu_driver.c:5483
 #, c-format
 msgid "target %s doesn't exist."
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5491
+#: src/libxl/libxl_driver.c:3184 src/qemu/qemu_driver.c:5490
 msgid "this disk doesn't support update"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5536
+#: src/libxl/libxl_driver.c:3205 src/qemu/qemu_driver.c:5535
 msgid "persistent update of device is not supported"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5600
+#: src/libxl/libxl_driver.c:3260 src/qemu/qemu_driver.c:5599
 msgid "cannot modify device on transient domain"
 msgstr ""
 
 #: src/libxl/libxl_driver.c:3290 src/libxl/libxl_driver.c:3314
-#: src/qemu/qemu_driver.c:5626 src/qemu/qemu_driver.c:5656
+#: src/qemu/qemu_driver.c:5625 src/qemu/qemu_driver.c:5655
 #, c-format
 msgid "unknown domain modify action %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5906 src/uml/uml_driver.c:1728
+#: src/libxl/libxl_driver.c:3481 src/qemu/qemu_driver.c:5774
+#: src/uml/uml_driver.c:2253
 msgid "cannot set autostart for transient domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5923 src/storage/storage_driver.c:1021
-#: src/uml/uml_driver.c:1745
+#: src/libxl/libxl_driver.c:3496 src/qemu/qemu_driver.c:5789
+#: src/storage/storage_driver.c:1048 src/uml/uml_driver.c:2268
 #, c-format
 msgid "cannot create autostart directory %s"
 msgstr ""
@@ -6857,21 +7455,6 @@
 msgid "Failed to get scheduler parameters for domain '%d' with libxenlight"
 msgstr ""
 
-#: src/libxl/libxl_driver.c:3646 src/libxl/libxl_driver.c:3657
-#: src/qemu/qemu_driver.c:6117 src/qemu/qemu_driver.c:6140
-#: src/qemu/qemu_driver.c:6408 src/qemu/qemu_driver.c:6418
-#: src/qemu/qemu_driver.c:6428 src/qemu/qemu_driver.c:6462
-#: src/qemu/qemu_driver.c:6478 src/qemu/qemu_driver.c:6494
-#: src/qemu/qemu_driver.c:6988 src/qemu/qemu_driver.c:7002
-#: src/qemu/qemu_driver.c:7015 src/qemu/qemu_driver.c:7232
-#: src/qemu/qemu_driver.c:7246 src/qemu/qemu_driver.c:7260
-#: src/qemu/qemu_driver.c:7274 src/qemu/qemu_driver.c:7288
-#: src/qemu/qemu_driver.c:7302 src/qemu/qemu_driver.c:7316
-#: src/qemu/qemu_driver.c:7330 src/test/test_driver.c:2721
-#, c-format
-msgid "Field name '%s' too long"
-msgstr ""
-
 #: src/libxl/libxl_driver.c:3738
 msgid "invalid type for weight tunable, expected a 'uint'"
 msgstr ""
@@ -6908,11 +7491,11 @@
 msgid "libxenlight does not support transient disks"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2395
+#: src/libxl/libxl_conf.c:693 src/qemu/qemu_process.c:2974
 msgid "Unable to find an unused VNC port"
 msgstr ""
 
-#: src/xen/xend_internal.c:5287
+#: src/libxl/libxl_conf.c:775 src/xenxs/xen_sxpr.c:1564
 msgid "unexpected chr device type"
 msgstr ""
 
@@ -6924,302 +7507,266 @@
 msgid "Failed to get version info from libxenlight"
 msgstr ""
 
-#: src/network/bridge_driver.c:246 src/qemu/qemu_conf.c:1404
-#: src/uml/uml_conf.c:114
-msgid "cannot initialize bridge support"
-msgstr ""
-
-#: src/network/bridge_driver.c:544 src/network/bridge_driver.c:550
+#: src/network/bridge_driver.c:688 src/network/bridge_driver.c:694
+#: src/network/bridge_driver.c:706 src/network/bridge_driver.c:773
+#: src/network/bridge_driver.c:779
 #, c-format
 msgid "cannot create directory %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:775
+#: src/network/bridge_driver.c:765
 #, c-format
 msgid "Cannot find %s - Possibly the package isn't installed"
 msgstr ""
 
-#: src/network/bridge_driver.c:821
+#: src/network/bridge_driver.c:811
 #, c-format
 msgid "bridge  '%s' has an invalid prefix"
 msgstr ""
 
-#: src/network/bridge_driver.c:857
+#: src/network/bridge_driver.c:847
 #, c-format
 msgid "couldn't write radvd config file '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:907 src/network/bridge_driver.c:1081
+#: src/network/bridge_driver.c:897 src/network/bridge_driver.c:1071
 #, c-format
 msgid "Invalid prefix or netmask for '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:603
+#: src/network/bridge_driver.c:909
 #, c-format
 msgid "failed to add iptables rule to allow forwarding from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:614
+#: src/network/bridge_driver.c:923
 #, c-format
 msgid "failed to add iptables rule to allow forwarding to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:969
+#: src/network/bridge_driver.c:959
 #, c-format
 msgid "failed to add iptables rule to enable masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:970
+#: src/network/bridge_driver.c:960
 msgid "failed to add iptables rule to enable masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:983
+#: src/network/bridge_driver.c:973
 #, c-format
 msgid "failed to add iptables rule to enable UDP masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:984
+#: src/network/bridge_driver.c:974
 msgid "failed to add iptables rule to enable UDP masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:997
+#: src/network/bridge_driver.c:987
 #, c-format
 msgid "failed to add iptables rule to enable TCP masquerading to %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:998
+#: src/network/bridge_driver.c:988
 msgid "failed to add iptables rule to enable TCP masquerading"
 msgstr ""
 
-#: src/network/bridge_driver.c:656
+#: src/network/bridge_driver.c:1083
 #, c-format
 msgid "failed to add iptables rule to allow routing from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:667
+#: src/network/bridge_driver.c:1095
 #, c-format
 msgid "failed to add iptables rule to allow routing to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1159
+#: src/network/bridge_driver.c:1149
 #, c-format
 msgid "failed to add ip6tables rule to block outbound traffic from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1167
+#: src/network/bridge_driver.c:1157
 #, c-format
 msgid "failed to add ip6tables rule to block inbound traffic to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1176
+#: src/network/bridge_driver.c:1166
 #, c-format
 msgid "failed to add ip6tables rule to allow cross bridge traffic on '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1185 src/network/bridge_driver.c:1193
+#: src/network/bridge_driver.c:1175 src/network/bridge_driver.c:1183
 #, c-format
 msgid "failed to add ip6tables rule to allow DNS requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:693 src/network/bridge_driver.c:700
+#: src/network/bridge_driver.c:1236 src/network/bridge_driver.c:1244
 #, c-format
 msgid "failed to add iptables rule to allow DHCP requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:708 src/network/bridge_driver.c:715
+#: src/network/bridge_driver.c:1267 src/network/bridge_driver.c:1275
 #, c-format
 msgid "failed to add iptables rule to allow DNS requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1295
+#: src/network/bridge_driver.c:1285
 #, c-format
 msgid "failed to add iptables rule to allow TFTP requests from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:725
+#: src/network/bridge_driver.c:1295
 #, c-format
 msgid "failed to add iptables rule to block outbound traffic from '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:732
+#: src/network/bridge_driver.c:1303
 #, c-format
 msgid "failed to add iptables rule to block inbound traffic to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:740
+#: src/network/bridge_driver.c:1312
 #, c-format
 msgid "failed to add iptables rule to allow cross bridge traffic on '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1533
+#: src/network/bridge_driver.c:1523
 #, c-format
 msgid "cannot write to %s to disable IPv6 on bridge %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:871
+#: src/network/bridge_driver.c:1545 src/network/bridge_driver.c:1561
 #, c-format
 msgid "cannot disable %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:1664
+#: src/network/bridge_driver.c:1654
 #, c-format
 msgid "Network is already in use by interface %s"
 msgstr ""
 
-#: src/network/bridge_driver.c:1686
+#: src/network/bridge_driver.c:1675
 #, c-format
 msgid "bridge '%s' has an invalid netmask or IP address"
 msgstr ""
 
-#: src/network/bridge_driver.c:1694
-#, c-format
-msgid "cannot set IP address on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:906
-#, c-format
-msgid "cannot create bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1739
-#, c-format
-msgid "cannot create dummy tap device '%s' to set mac address on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1751
-#, c-format
-msgid "cannot set forward delay on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:1759
-#, c-format
-msgid "cannot set STP '%s' on bridge '%s'"
-msgstr ""
-
-#: src/network/bridge_driver.c:938
-#, c-format
-msgid "failed to bring the bridge '%s' up"
-msgstr ""
-
-#: src/network/bridge_driver.c:949
+#: src/network/bridge_driver.c:1765
 msgid "failed to enable IP forwarding"
 msgstr ""
 
-#: src/network/bridge_driver.c:900
+#: src/network/bridge_driver.c:1914
 msgid "network is already active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1058 src/network/bridge_driver.c:1327
-#: src/network/bridge_driver.c:1365 src/network/bridge_driver.c:1388
-#: src/network/bridge_driver.c:1423 src/network/bridge_driver.c:1478
-#: src/network/bridge_driver.c:1503
+#: src/network/bridge_driver.c:2016 src/network/bridge_driver.c:2344
+#: src/network/bridge_driver.c:2431 src/network/bridge_driver.c:2454
+#: src/network/bridge_driver.c:2493 src/network/bridge_driver.c:2548
+#: src/network/bridge_driver.c:2573
 msgid "no network with matching uuid"
 msgstr ""
 
-#: src/network/bridge_driver.c:1081
+#: src/network/bridge_driver.c:2039 src/network/bridge_driver.c:2706
+#: src/network/bridge_driver.c:2920 src/network/bridge_driver.c:3021
+#: src/network/bridge_driver.c:3108
 #, c-format
 msgid "no network with matching name '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:2367
+#: src/network/bridge_driver.c:2289
 msgid ""
 "Multiple dhcp sections found. dhcp is supported only for a single IPv4 "
 "address on each network"
 msgstr ""
 
-#: src/network/bridge_driver.c:1333
+#: src/network/bridge_driver.c:2350
 msgid "network is still active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1394
+#: src/network/bridge_driver.c:2460
 msgid "network is not active"
 msgstr ""
 
-#: src/network/bridge_driver.c:1446
+#: src/network/bridge_driver.c:2516
 msgid "no network with matching id"
 msgstr ""
 
-#: src/network/bridge_driver.c:1452 src/test/test_driver.c:3061
+#: src/network/bridge_driver.c:2522 src/test/test_driver.c:3291
 #, c-format
 msgid "network '%s' does not have a bridge name."
 msgstr ""
 
-#: src/network/bridge_driver.c:1509
+#: src/network/bridge_driver.c:2579
 msgid "cannot set autostart for transient network"
 msgstr ""
 
-#: src/network/bridge_driver.c:1524
+#: src/network/bridge_driver.c:2594
 #, c-format
 msgid "cannot create autostart directory '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:1531 src/storage/storage_driver.c:1028
+#: src/network/bridge_driver.c:2601 src/storage/storage_driver.c:1055
 #, c-format
 msgid "Failed to create symlink '%s' to '%s'"
 msgstr ""
 
-#: src/network/bridge_driver.c:2887 src/network/bridge_driver.c:3000
-#: src/network/bridge_driver.c:3101
+#: src/network/bridge_driver.c:2822 src/network/bridge_driver.c:2935
+#: src/network/bridge_driver.c:3036
 #, c-format
 msgid ""
 "network '%s' uses a direct mode, but has no forward dev and no interface pool"
 msgstr ""
 
-#: src/network/bridge_driver.c:2925
+#: src/network/bridge_driver.c:2860
 #, c-format
 msgid ""
 "network '%s' requires exclusive access to interfaces, but none are available"
 msgstr ""
 
-#: src/network/bridge_driver.c:2993 src/network/bridge_driver.c:3094
+#: src/network/bridge_driver.c:2928 src/network/bridge_driver.c:3029
 msgid "the interface uses a direct mode, but has no source dev"
 msgstr ""
 
-#: src/network/bridge_driver.c:3018 src/network/bridge_driver.c:3117
+#: src/network/bridge_driver.c:2953 src/network/bridge_driver.c:3052
 #, c-format
 msgid "network '%s' doesn't have dev='%s' in use by domain"
 msgstr ""
 
-#: src/network/bridge_driver.c:3034
+#: src/network/bridge_driver.c:2969
 #, c-format
 msgid "network '%s' claims dev='%s' is already in use by a different domain"
 msgstr ""
 
-#: src/network/bridge_driver.c:3187
+#: src/network/bridge_driver.c:3122
 #, c-format
 msgid "network '%s' doesn't have an IPv4 address"
 msgstr ""
 
-#: src/network/bridge_driver.c:3209
+#: src/network/bridge_driver.c:3144
 #, c-format
 msgid "network '%s' has no associated interface or bridge"
 msgstr ""
 
-#: src/network/bridge_driver.c:3218
-#, c-format
-msgid "Failed to get IP address for '%s' (network '%s')"
-msgstr ""
-
-#: src/node_device/node_device_driver.c:101
+#: src/node_device/node_device_driver.c:88
 #, c-format
 msgid "cannot resolve driver link %s"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:280
-#: src/node_device/node_device_driver.c:309
-#: src/node_device/node_device_driver.c:344
-#: src/node_device/node_device_driver.c:375 src/test/test_driver.c:4811
-#: src/test/test_driver.c:4837 src/test/test_driver.c:4873
-#: src/test/test_driver.c:4904
+#: src/node_device/node_device_driver.c:275
+#: src/node_device/node_device_driver.c:305
+#: src/node_device/node_device_driver.c:341
+#: src/node_device/node_device_driver.c:372 src/test/test_driver.c:5181
+#: src/test/test_driver.c:5207 src/test/test_driver.c:5243
+#: src/test/test_driver.c:5274
 #, c-format
 msgid "no node device with matching name '%s'"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:320 src/test/test_driver.c:4848
+#: src/node_device/node_device_driver.c:316 src/test/test_driver.c:5218
 msgid "no parent for this device"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:421
+#: src/node_device/node_device_driver.c:418
 #, c-format
 msgid "Invalid vport operation (%d)"
 msgstr ""
@@ -7229,16 +7776,16 @@
 msgid "No vport operation path found for host%d"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:452
+#: src/node_device/node_device_driver.c:469
 #, c-format
 msgid "Write of '%s' to '%s' during vport create/delete failed"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:461
+#: src/node_device/node_device_driver.c:478
 msgid "Vport operation complete"
 msgstr ""
 
-#: src/node_device/node_device_driver.c:474
+#: src/node_device/node_device_driver.c:491
 msgid "Could not get current time"
 msgstr ""
 
@@ -7270,13 +7817,13 @@
 msgid "libhal_get_all_devices failed"
 msgstr ""
 
-#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:879
-#: src/qemu/qemu_migration.c:902 src/qemu/qemu_migration.c:908
+#: src/node_device/node_device_hal.c:801 src/qemu/qemu_migration.c:880
+#: src/qemu/qemu_migration.c:903 src/qemu/qemu_migration.c:909
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: src/node_device/node_device_linux_sysfs.c:57
+#: src/node_device/node_device_linux_sysfs.c:59
 #, c-format
 msgid "Failed to open WWN path '%s' for reading"
 msgstr ""
@@ -7291,6 +7838,11 @@
 msgid "Failed to read WWNN for host%d"
 msgstr ""
 
+#: src/node_device/node_device_linux_sysfs.c:155
+#, c-format
+msgid "Failed to read fabric WWN for host%d"
+msgstr ""
+
 #: src/node_device/node_device_udev.c:64
 #, c-format
 msgid "Failed to convert '%s' to unsigned long long"
@@ -7385,8 +7937,9 @@
 msgid "udev_monitor_new_from_netlink returned NULL"
 msgstr ""
 
-#: src/nodeinfo.c:159 src/uml/uml_driver.c:1821 src/util/pci.c:1082
-#: src/util/util.c:353
+#: src/nodeinfo.c:106 src/nodeinfo.c:152 src/nodeinfo.c:617 src/nodeinfo.c:652
+#: src/nodeinfo.c:716 src/uml/uml_driver.c:2344 src/util/command.c:265
+#: src/util/pci.c:1594
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -7401,11 +7954,11 @@
 msgid "could not convert '%s' to an integer"
 msgstr ""
 
-#: src/nodeinfo.c:82
+#: src/nodeinfo.c:230
 msgid "parsing cpuinfo processor"
 msgstr ""
 
-#: src/nodeinfo.c:94
+#: src/nodeinfo.c:245 src/nodeinfo.c:277
 msgid "parsing cpuinfo cpu MHz"
 msgstr ""
 
@@ -7419,7 +7972,7 @@
 msgid "parsing number of processors %c"
 msgstr ""
 
-#: src/nodeinfo.c:121
+#: src/nodeinfo.c:314
 msgid "no cpus found"
 msgstr ""
 
@@ -7441,7 +7994,8 @@
 msgid "no threads found"
 msgstr ""
 
-#: src/lxc/lxc_driver.c:1975 src/qemu/qemu_driver.c:6066
+#: src/nodeinfo.c:417 src/xen/xen_hypervisor.c:1270
+#: src/xen/xend_internal.c:3609
 msgid "Invalid parameter count"
 msgstr ""
 
@@ -7469,7 +8023,7 @@
 msgid "no available memory line found"
 msgstr ""
 
-#: src/nodeinfo.c:175
+#: src/nodeinfo.c:633
 msgid "node info not implemented on this platform"
 msgstr ""
 
@@ -7477,7 +8031,7 @@
 msgid "node CPU stats not implemented on this platform"
 msgstr ""
 
-#: src/nodeinfo.c:257 src/nodeinfo.c:294
+#: src/nodeinfo.c:692 src/nodeinfo.c:822 src/nodeinfo.c:860
 msgid "NUMA not supported on this host"
 msgstr ""
 
@@ -7489,7 +8043,7 @@
 msgid "node memory stats not implemented on this platform"
 msgstr ""
 
-#: src/nodeinfo.c:263
+#: src/nodeinfo.c:828
 #, c-format
 msgid "start cell %d out of range (0-%d)"
 msgstr ""
@@ -7499,11 +8053,11 @@
 msgid "Failed to query NUMA free memory for node: %d"
 msgstr ""
 
-#: src/nodeinfo.c:275 src/nodeinfo.c:302
+#: src/nodeinfo.c:868
 msgid "Failed to query NUMA free memory"
 msgstr ""
 
-#: src/nodeinfo.c:323 src/nodeinfo.c:330
+#: src/nodeinfo.c:889 src/nodeinfo.c:896
 msgid "NUMA memory information not available on this platform"
 msgstr ""
 
@@ -7521,137 +8075,129 @@
 msgid "nwfilter is in use"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:163
-#, c-format
-msgid "cannot find value for '%s'"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:170
+#: src/nwfilter/nwfilter_ebiptables_driver.c:241
 #, c-format
 msgid "Buffer to small to print MAC address '%s' into"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:204
+#: src/nwfilter/nwfilter_ebiptables_driver.c:275
 msgid "buffer too small for IP address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:218
+#: src/nwfilter/nwfilter_ebiptables_driver.c:289
 msgid "buffer too small for IPv6 address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:229
+#: src/nwfilter/nwfilter_ebiptables_driver.c:300
 msgid "Buffer too small for MAC address"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:241
-#: src/nwfilter/nwfilter_ebiptables_driver.c:261
+#: src/nwfilter/nwfilter_ebiptables_driver.c:312
+#: src/nwfilter/nwfilter_ebiptables_driver.c:342
 msgid "Buffer too small for uint8 type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:251
+#: src/nwfilter/nwfilter_ebiptables_driver.c:322
+msgid "Buffer too small for uint32 type"
+msgstr ""
+
+#: src/nwfilter/nwfilter_ebiptables_driver.c:332
 msgid "Buffer too small for uint16 type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:268
+#: src/nwfilter/nwfilter_ebiptables_driver.c:349
 #, c-format
 msgid "Unhandled datatype %x"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1172
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1224
 #, c-format
 msgid "cannot create rule since %s tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:1897
+#: src/nwfilter/nwfilter_ebiptables_driver.c:1942
 msgid "cannot create rule since ebtables tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2448
-msgid "illegal protocol type"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2513
-msgid "cannot create temporary file"
-msgstr ""
-
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2520
-msgid "cannot change permissions on temp. file"
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2043
+#, c-format
+msgid ""
+"STP filtering in %s direction with source MAC address set is not supported"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2529
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2538
-msgid "cannot write string to file"
+#: src/nwfilter/nwfilter_ebiptables_driver.c:2598
+msgid "illegal protocol type"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:2994
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3086
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3197
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3112
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3208
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3323
 msgid "cannot create rules since ebtables tool is missing."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3052
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3170
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3241
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3171
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3297
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3369
 msgid "Some rules could not be created."
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3310
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3474
 #, c-format
 msgid "To enable ip%stables filtering for the VM do 'echo 1 > %s'"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3514
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3796
 #, c-format
-msgid "Some rules could not be created for interface %s."
+msgid "Some rules could not be created for interface %s%s%s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3634
+#: src/nwfilter/nwfilter_ebiptables_driver.c:3936
 msgid "error while executing CLI commands"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3769
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4077
 msgid "essential tools to support ip(6)tables firewalls could not be located"
 msgstr ""
 
-#: src/nwfilter/nwfilter_ebiptables_driver.c:3778
+#: src/nwfilter/nwfilter_ebiptables_driver.c:4086
 msgid "firewall tools were not found or cannot be used"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:155
+#: src/nwfilter/nwfilter_gentech_driver.c:160
 msgid "Could not add variable 'MAC' to hashmap"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:165
+#: src/nwfilter/nwfilter_gentech_driver.c:174
 msgid "Could not add variable 'IP' to hashmap"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:422
-#: src/nwfilter/nwfilter_gentech_driver.c:513
-#: src/nwfilter/nwfilter_gentech_driver.c:805
+#: src/nwfilter/nwfilter_gentech_driver.c:426
+#: src/nwfilter/nwfilter_gentech_driver.c:523
+#: src/nwfilter/nwfilter_gentech_driver.c:810
 #, c-format
 msgid "Filter '%s' is in use."
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:471
-#: src/nwfilter/nwfilter_gentech_driver.c:557
+#: src/nwfilter/nwfilter_gentech_driver.c:474
+#: src/nwfilter/nwfilter_gentech_driver.c:566
 #, c-format
 msgid "referenced filter '%s' is missing"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:744
+#: src/nwfilter/nwfilter_gentech_driver.c:750
 #, c-format
 msgid "Cannot instantiate filter due to unresolvable variables: %s"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:787
-#: src/nwfilter/nwfilter_gentech_driver.c:1017
-#: src/nwfilter/nwfilter_gentech_driver.c:1043
-#: src/nwfilter/nwfilter_gentech_driver.c:1067
+#: src/nwfilter/nwfilter_gentech_driver.c:792
+#: src/nwfilter/nwfilter_gentech_driver.c:1012
+#: src/nwfilter/nwfilter_gentech_driver.c:1038
+#: src/nwfilter/nwfilter_gentech_driver.c:1063
 #, c-format
 msgid "Could not get access to ACL tech driver '%s'"
 msgstr ""
 
-#: src/nwfilter/nwfilter_gentech_driver.c:798
+#: src/nwfilter/nwfilter_gentech_driver.c:803
 #, c-format
 msgid "Could not find filter '%s'"
 msgstr ""
@@ -7665,34 +8211,39 @@
 msgid "interface name %s does not fit into buffer "
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:651
+#: src/nwfilter/nwfilter_learnipaddr.c:706
+#, c-format
+msgid "Failed to add IP address %s to IP address cache for interface %s"
+msgstr ""
+
+#: src/nwfilter/nwfilter_learnipaddr.c:724
 #, c-format
 msgid "encountered an error on interface %s index %d"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:715
+#: src/nwfilter/nwfilter_learnipaddr.c:788
 msgid ""
 "IP parameter must be provided since snooping the IP address does not work "
 "possibly due to missing tools"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:743
+#: src/nwfilter/nwfilter_learnipaddr.c:816
 #, c-format
 msgid "Destination buffer for ifname ('%s') not large enough"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:751
+#: src/nwfilter/nwfilter_learnipaddr.c:824
 #, c-format
 msgid "Destination buffer for linkdev ('%s') not large enough"
 msgstr ""
 
-#: src/nwfilter/nwfilter_learnipaddr.c:803
+#: src/nwfilter/nwfilter_learnipaddr.c:876
 msgid ""
 "IP parameter must be given since libvirt was not compiled with IP address "
 "learning support"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:131
+#: src/openvz/openvz_conf.c:124
 msgid "Could not extract vzctl version"
 msgstr ""
 
@@ -7737,25 +8288,26 @@
 msgid "Wrong MAC address"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:371
+#: src/openvz/openvz_conf.c:373
 #, c-format
 msgid "Could not read 'OSTEMPLATE' from config for container %d"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:385
+#: src/openvz/openvz_conf.c:387
 #, c-format
 msgid "Could not read 'VE_PRIVATE' from config for container %d"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:456 src/openvz/openvz_driver.c:154
+#: src/openvz/openvz_conf.c:464 src/openvz/openvz_conf.c:1054
+#: src/openvz/openvz_driver.c:1651
 msgid "Failed to parse vzlist output"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:494
+#: src/openvz/openvz_conf.c:511
 msgid "UUID in config file malformed"
 msgstr ""
 
-#: src/openvz/openvz_conf.c:506
+#: src/openvz/openvz_conf.c:523
 #, c-format
 msgid "Could not read config for container %d"
 msgstr ""
@@ -7769,143 +8321,145 @@
 msgid "Failed to scan configuration directory"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:119
+#: src/openvz/openvz_driver.c:110
 msgid "Container is not defined"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:192 src/openvz/openvz_driver.c:745
+#: src/openvz/openvz_driver.c:155 src/openvz/openvz_driver.c:849
 #, c-format
 msgid "Could not put argument to %s"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:215
+#: src/openvz/openvz_driver.c:173
 msgid "only one filesystem supported"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:224
+#: src/openvz/openvz_driver.c:182
 msgid "filesystem is not of type 'template' or 'mount'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:235
+#: src/openvz/openvz_driver.c:193
 msgid "Could not convert domain name to VEID"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:241
+#: src/openvz/openvz_driver.c:199
 msgid "Could not copy default config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:247
+#: src/openvz/openvz_driver.c:205
 msgid "Could not set the source dir for the filesystem"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:255
+#: src/openvz/openvz_driver.c:212
 msgid "Error creating command for container"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:406
+#: src/openvz/openvz_driver.c:364
 #, c-format
 msgid "cannot read cputime for domain %d"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:529 src/openvz/openvz_driver.c:566
+#: src/openvz/openvz_driver.c:608 src/openvz/openvz_driver.c:659
+#: src/vmware/vmware_driver.c:336 src/vmware/vmware_driver.c:395
+#: src/vmware/vmware_driver.c:491
 msgid "domain is not in running state"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:646
+#: src/openvz/openvz_driver.c:749
 msgid "Container ID is not specified"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:679
+#: src/openvz/openvz_driver.c:785
 msgid "Could not generate eth name for container"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:690
+#: src/openvz/openvz_driver.c:797
 msgid "Could not generate veth name"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:774
+#: src/openvz/openvz_driver.c:878
 msgid "Could not configure network"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:785
+#: src/openvz/openvz_driver.c:889
 msgid "cannot replace NETIF config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:823
+#: src/openvz/openvz_driver.c:921
 #, c-format
 msgid "Already an OPENVZ VM active with the id '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:835 src/openvz/openvz_driver.c:917
+#: src/openvz/openvz_driver.c:932 src/openvz/openvz_driver.c:1014
 msgid "Error creating initial configuration"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:843 src/openvz/openvz_driver.c:923
+#: src/openvz/openvz_driver.c:940 src/openvz/openvz_driver.c:1020
 msgid "Could not set UUID"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:951 src/vbox/vbox_tmpl.c:5049
+#: src/openvz/openvz_driver.c:949 src/vbox/vbox_tmpl.c:5054
 msgid "current vcpu count must equal maximum"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:853 src/openvz/openvz_driver.c:945
+#: src/openvz/openvz_driver.c:955 src/openvz/openvz_driver.c:1040
 msgid "Could not set number of virtual cpu"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:861
+#: src/openvz/openvz_driver.c:963
 msgid "Could not set memory size"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:903
+#: src/openvz/openvz_driver.c:1001
 #, c-format
 msgid "Already an OPENVZ VM defined with the id '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:976
+#: src/openvz/openvz_driver.c:1074
 msgid "no domain with matching id"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:982
+#: src/openvz/openvz_driver.c:1083 src/vmware/vmware_driver.c:217
 msgid "domain is not in shutoff state"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1094
+#: src/openvz/openvz_driver.c:1211
 msgid "Could not read container config"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1115 src/qemu/qemu_driver.c:2846
+#: src/openvz/openvz_driver.c:1235 src/qemu/qemu_driver.c:1010
 #, c-format
 msgid "unknown type '%s'"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1246 src/openvz/openvz_driver.c:1290
+#: src/openvz/openvz_driver.c:1244 src/openvz/openvz_driver.c:1288
 #, c-format
 msgid "unsupported flags (0x%x)"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1167
+#: src/openvz/openvz_driver.c:1304
 msgid "VCPUs should be >= 1"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1212
+#: src/openvz/openvz_driver.c:1357
 #, c-format
 msgid "unexpected OpenVZ URI path '%s', try openvz:///system"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1219
+#: src/openvz/openvz_driver.c:1364
 msgid "OpenVZ control file /proc/vz does not exist"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1225
+#: src/openvz/openvz_driver.c:1370
 msgid "OpenVZ control file /proc/vz is not accessible"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1317 src/openvz/openvz_driver.c:1363
+#: src/openvz/openvz_driver.c:1465 src/openvz/openvz_driver.c:1520
 #, c-format
 msgid "Could not parse VPS ID %s"
 msgstr ""
 
-#: src/openvz/openvz_driver.c:1472 src/openvz/openvz_driver.c:1531
+#: src/openvz/openvz_driver.c:1476 src/openvz/openvz_driver.c:1535
 msgid "failed to close file"
 msgstr ""
 
@@ -7932,179 +8486,179 @@
 msgid "Unable to determine number of domains."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:347
+#: src/phyp/phyp_driver.c:1005 src/phyp/phyp_driver.c:1086
 msgid "No authentication callback provided."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:280
+#: src/phyp/phyp_driver.c:1026
 #, c-format
 msgid "Error while getting %s address info"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:297
+#: src/phyp/phyp_driver.c:1043
 #, c-format
 msgid "Failed to connect to %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:317
+#: src/phyp/phyp_driver.c:1063
 msgid "Failure establishing SSH session."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:386
+#: src/phyp/phyp_driver.c:1105
 msgid "Authentication failed"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:94
+#: src/phyp/phyp_driver.c:1160
 msgid "Missing server name in phyp:// URI"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:153
+#: src/phyp/phyp_driver.c:1202
 msgid "Error parsing 'path'. Invalid characters."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:159
+#: src/phyp/phyp_driver.c:1209
 msgid "Error while opening SSH session."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1573 src/phyp/phyp_driver.c:1618
-#: src/phyp/phyp_driver.c:1796
+#: src/phyp/phyp_driver.c:1590 src/phyp/phyp_driver.c:1635
+#: src/phyp/phyp_driver.c:1813
 msgid "Unable to get VIOS profile name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1613 src/phyp/phyp_driver.c:1761
+#: src/phyp/phyp_driver.c:1630 src/phyp/phyp_driver.c:1778
 msgid "Unable to get VIOS name"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1623
+#: src/phyp/phyp_driver.c:1640
 msgid "Unable to get free slot number"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1771 src/phyp/phyp_driver.c:1775
+#: src/phyp/phyp_driver.c:1788 src/phyp/phyp_driver.c:1792
 msgid "Unable to create new virtual adapter"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1855
+#: src/phyp/phyp_driver.c:1872
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR.Contact your "
 "support to enable this feature."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:1986
+#: src/phyp/phyp_driver.c:2003
 #, c-format
 msgid "Unable to create Volume: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2037 src/phyp/phyp_driver.c:2290
-#: src/phyp/phyp_driver.c:2739
+#: src/phyp/phyp_driver.c:2054 src/phyp/phyp_driver.c:2307
+#: src/phyp/phyp_driver.c:2756
 msgid "Unable to determine storage pool's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2042 src/phyp/phyp_driver.c:2744
+#: src/phyp/phyp_driver.c:2059 src/phyp/phyp_driver.c:2761
 msgid "Unable to determine storage pool's uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2048 src/phyp/phyp_driver.c:2750
+#: src/phyp/phyp_driver.c:2065 src/phyp/phyp_driver.c:2767
 msgid "Unable to determine storage pools's size."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2061 src/phyp/phyp_driver.c:2763
+#: src/phyp/phyp_driver.c:2078 src/phyp/phyp_driver.c:2780
 msgid "Unable to determine storage pools's source adapter."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2066
+#: src/phyp/phyp_driver.c:2083
 msgid "Error parsing volume XML."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2072
+#: src/phyp/phyp_driver.c:2089
 msgid "StoragePool name already exists."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2080
+#: src/phyp/phyp_driver.c:2097
 msgid "Key must be empty, Power Hypervisor will create one for you."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2085
+#: src/phyp/phyp_driver.c:2102
 msgid "Capacity cannot be empty."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2261
+#: src/phyp/phyp_driver.c:2278
 msgid "Unable to determine storage sp's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2266
+#: src/phyp/phyp_driver.c:2283
 msgid "Unable to determine storage sp's uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2271
+#: src/phyp/phyp_driver.c:2288
 msgid "Unable to determine storage sps's size."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2283
+#: src/phyp/phyp_driver.c:2300
 msgid "Unable to determine storage sps's source adapter."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2490
+#: src/phyp/phyp_driver.c:2507
 #, c-format
 msgid "Unable to destroy Storage Pool: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:2529
+#: src/phyp/phyp_driver.c:2546
 #, c-format
 msgid "Unable to create Storage Pool: %s"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3340
+#: src/phyp/phyp_driver.c:3357
 msgid "Unable to determine domain's name."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3345
+#: src/phyp/phyp_driver.c:3362
 msgid "Unable to generate random uuid."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3351
+#: src/phyp/phyp_driver.c:3368
 msgid "Unable to determine domain's max memory."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3357
+#: src/phyp/phyp_driver.c:3374
 msgid "Unable to determine domain's memory."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3363
+#: src/phyp/phyp_driver.c:3380
 msgid "Unable to determine domain's CPU."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3566
+#: src/phyp/phyp_driver.c:3583
 msgid ""
 "Field <memory> on the domain XML file is missing or has invalid value."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3573
+#: src/phyp/phyp_driver.c:3590
 msgid ""
 "Field <currentMemory> on the domain XML file is missing or has invalid value."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3580
+#: src/phyp/phyp_driver.c:3597
 msgid "Domain XML must contain at least one <disk> element."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3586
+#: src/phyp/phyp_driver.c:3603
 msgid "Field <src> under <disk> on the domain XML file is missing."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3602
+#: src/phyp/phyp_driver.c:3619
 #, c-format
 msgid "Unable to create LPAR. Reason: '%s'"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3607
+#: src/phyp/phyp_driver.c:3624
 msgid "Unable to add LPAR to the table"
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3711
+#: src/phyp/phyp_driver.c:3728
 msgid "You are trying to set a number of CPUs bigger than the max possible."
 msgstr ""
 
-#: src/phyp/phyp_driver.c:3735
+#: src/phyp/phyp_driver.c:3752
 msgid ""
 "Possibly you don't have IBM Tools installed in your LPAR. Contact your "
 "support to enable this feature."
@@ -8120,23 +8674,23 @@
 msgid "cannot filter mac addresses on bridge '%s'"
 msgstr ""
 
-#: src/qemu/qemu_bridge_filter.c:80 src/qemu/qemu_bridge_filter.c:102
+#: src/qemu/qemu_bridge_filter.c:79 src/qemu/qemu_bridge_filter.c:100
 #, c-format
 msgid "failed to add ebtables rule to allow routing to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1355 src/qemu/qemu_driver.c:2419
-#: src/qemu/qemu_driver.c:4604
+#: src/qemu/qemu_capabilities.c:285 src/qemu/qemu_capabilities.c:1330
+#: src/qemu/qemu_capabilities.c:1413
 #, c-format
 msgid "Cannot find QEMU binary %s"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:1193
+#: src/qemu/qemu_capabilities.c:1202
 #, c-format
 msgid "cannot parse %s version number in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_capabilities.c:1398
+#: src/qemu/qemu_capabilities.c:1407
 #, c-format
 msgid "Cannot find suitable emulator for %s"
 msgstr ""
@@ -8151,7 +8705,7 @@
 msgid "Unable to deny access for disk path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1956
+#: src/qemu/qemu_cgroup.c:164 src/qemu/qemu_migration.c:2873
 #, c-format
 msgid "Unable to allow device %s for %s"
 msgstr ""
@@ -8161,25 +8715,25 @@
 msgid "Unable to allow device %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1929
+#: src/qemu/qemu_cgroup.c:211
 #, c-format
 msgid "Unable to create cgroup for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1943
+#: src/qemu/qemu_cgroup.c:227
 #, c-format
 msgid "Unable to deny all devices for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1965
+#: src/qemu/qemu_cgroup.c:242
 msgid "unable to allow /dev/pts/ devices"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1973
+#: src/qemu/qemu_cgroup.c:257
 msgid "unable to allow /dev/snd/ devices"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1984 src/qemu/qemu_driver.c:5450
+#: src/qemu/qemu_cgroup.c:269
 #, c-format
 msgid "unable to allow device %s"
 msgstr ""
@@ -8189,860 +8743,827 @@
 msgid "Unable to set io weight for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:311
+#: src/qemu/qemu_cgroup.c:311 src/qemu/qemu_cgroup.c:334
 msgid "Block I/O tuning is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:349
-msgid "Memory cgroup is not available on this host"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:358
+#: src/qemu/qemu_cgroup.c:326
 #, c-format
-msgid "Unable to set io cpu shares for domain %s"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:364
-msgid "CPU tuning is not available on this host"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:394
-msgid "Unable to get cpu bandwidth period"
-msgstr ""
-
-#: src/qemu/qemu_cgroup.c:401
-msgid "Unable to set cpu bandwidth period"
+msgid "Unable to set io device weight for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:410
-msgid "Unable to set cpu bandwidth quota"
+#: src/qemu/qemu_cgroup.c:373
+msgid "Memory cgroup is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:422 src/qemu/qemu_cgroup.c:457
-#: src/qemu/qemu_driver.c:6539 src/xenapi/xenapi_utils.c:391
-#: src/xenapi/xenapi_utils.c:395
-#, c-format
-msgid "%s"
+#: src/qemu/qemu_cgroup.c:388
+msgid "CPU tuning is not available on this host"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:446 src/qemu/qemu_cgroup.c:537
-#: src/qemu/qemu_driver.c:5068 src/qemu/qemu_driver.c:5289
+#: src/qemu/qemu_cgroup.c:470 src/qemu/qemu_cgroup.c:561
+#: src/qemu/qemu_driver.c:5067 src/qemu/qemu_driver.c:5288
 #: src/qemu/qemu_hotplug.c:1047 src/qemu/qemu_hotplug.c:1521
-#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2860
+#: src/qemu/qemu_hotplug.c:1624 src/qemu/qemu_migration.c:2861
 #, c-format
 msgid "Unable to find cgroup for %s"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:483
+#: src/qemu/qemu_cgroup.c:507
 #, c-format
 msgid "Unable to create vcpu cgroup for %s(vcpu: %d)"
 msgstr ""
 
-#: src/qemu/qemu_cgroup.c:493
+#: src/qemu/qemu_cgroup.c:517
 #, c-format
 msgid "unable to add vcpu %d task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2042
+#: src/qemu/qemu_cgroup.c:584
 #, c-format
 msgid "unable to find cgroup for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2050
+#: src/qemu/qemu_cgroup.c:592
 #, c-format
 msgid "unable to add domain %s task %d to cgroup"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1448
-#, c-format
-msgid "failed to add ebtables rule to allow MAC address on  '%s'"
-msgstr ""
-
-#: src/qemu/qemu_command.c:197
-msgid "No support for macvtap device"
-msgstr ""
-
-#: src/qemu/qemu_command.c:233
+#: src/qemu/qemu_command.c:200
 #, c-format
 msgid "Network '%s' is not active."
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1398
+#: src/qemu/qemu_command.c:226
 #, c-format
 msgid "Network type %d is not supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1429 src/uml/uml_conf.c:133
-#, c-format
-msgid "Failed to add tap interface to bridge. %s is not a bridge device"
-msgstr ""
-
-#: src/qemu/qemu_command.c:300 src/uml/uml_conf.c:161
-msgid ""
-"Failed to add tap interface to bridge. Your kernel is missing the 'tun' "
-"module or CONFIG_TUN, or you need to add the /dev/net/tun device node."
-msgstr ""
-
-#: src/qemu/qemu_conf.c:1433 src/uml/uml_conf.c:137
-#, c-format
-msgid "Failed to add tap interface to bridge '%s'"
-msgstr ""
-
-#: src/qemu/qemu_conf.c:1437 src/uml/uml_conf.c:141
+#: src/qemu/qemu_command.c:261
 #, c-format
-msgid "Failed to add tap interface '%s' to bridge '%s'"
+msgid "failed to add ebtables rule to allow MAC address on  '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:372
+#: src/qemu/qemu_command.c:312
 msgid "vhost-net is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:383
+#: src/qemu/qemu_command.c:323
 msgid "vhost-net is only supported for virtio network interfaces"
 msgstr ""
 
-#: src/qemu/qemu_command.c:399
+#: src/qemu/qemu_command.c:339
 msgid "vhost-net was requested for an interface, but is unavailable"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4954
+#: src/qemu/qemu_command.c:420
 #, c-format
 msgid "cannot convert disk '%s' to bus/device index"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4980
+#: src/qemu/qemu_command.c:449
 #, c-format
 msgid "Unsupported disk name mapping for bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:573
+#: src/qemu/qemu_command.c:513
 msgid "Unable to determine device index for network device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:600
+#: src/qemu/qemu_command.c:540
 msgid "Unable to determine device index for hostdev device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:627
+#: src/qemu/qemu_command.c:567
 msgid "Unable to determine device index for redirected device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:763
+#: src/qemu/qemu_command.c:703
 msgid "Only PCI domain 0 and bus 0 are available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:797
+#: src/qemu/qemu_command.c:737
 #, c-format
 msgid ""
 "Attempted double use of PCI Address '%s' (may need \"multifunction='on'\" "
 "for device on function 0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:802
+#: src/qemu/qemu_command.c:742
 #, c-format
 msgid "Attempted double use of PCI Address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:826
+#: src/qemu/qemu_command.c:766
 #, c-format
 msgid ""
 "Attempted double use of PCI Address '%s'(need \"multifunction='off'\" for "
 "device on function 0)"
 msgstr ""
 
-#: src/qemu/qemu_command.c:946
+#: src/qemu/qemu_command.c:886
 #, c-format
 msgid "unable to reserve PCI address %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1007
+#: src/qemu/qemu_command.c:947
 msgid "Only PCI device addresses with function=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1135
+#: src/qemu/qemu_command.c:1075
 msgid "No more available PCI addresses"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1195
+#: src/qemu/qemu_command.c:1135
 msgid "Primary IDE controller must have PCI address 0:0:1.1"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1218
+#: src/qemu/qemu_command.c:1158
 msgid "PIIX3 USB controller must have PCI address 0:0:1.2"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1253
+#: src/qemu/qemu_command.c:1193
 msgid "Primary video card must have PCI address 0:0:2.0"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1333
+#: src/qemu/qemu_command.c:1273
 msgid "virtio only support device address type 'PCI'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1415
+#: src/qemu/qemu_command.c:1355
 msgid "Only PCI device addresses with domain=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1420
+#: src/qemu/qemu_command.c:1360
 msgid "Only PCI device addresses with bus=0 are supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1426
+#: src/qemu/qemu_command.c:1366
 msgid "The function of PCI device addresses must less than 8"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1433
+#: src/qemu/qemu_command.c:1373
 msgid ""
 "Only PCI device addresses with function=0 are supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1439
+#: src/qemu/qemu_command.c:1379
 msgid "'multifunction=on' is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1876
+#: src/qemu/qemu_command.c:1430
 #, c-format
 msgid "driver serial '%s' contains unsafe characters"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2296 src/qemu/qemu_conf.c:2410 src/uml/uml_conf.c:475
+#: src/qemu/qemu_command.c:1471
+#, c-format
+msgid "could not get the value of the secret for username %s"
+msgstr ""
+
+#: src/qemu/qemu_command.c:1486
+#, c-format
+msgid "rbd username '%s' specified but secret not found"
+msgstr ""
+
+#: src/qemu/qemu_command.c:1635 src/qemu/qemu_command.c:1924
+#: src/qemu/qemu_command.c:4222 src/uml/uml_conf.c:429
 #, c-format
 msgid "unsupported disk type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1520
+#: src/qemu/qemu_command.c:1643
 msgid "unexpected address type for scsi disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1529
+#: src/qemu/qemu_command.c:1652
 msgid "SCSI controller only supports 1 bus"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1539
+#: src/qemu/qemu_command.c:1662
 msgid "unexpected address type for ide disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1545 src/qemu/qemu_command.c:1561
+#: src/qemu/qemu_command.c:1668 src/qemu/qemu_command.c:1684
 #, c-format
 msgid "Only 1 %s controller is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1555
+#: src/qemu/qemu_command.c:1678
 msgid "unexpected address type for fdc disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1567
+#: src/qemu/qemu_command.c:1690
 #, c-format
 msgid "Only 1 %s bus is supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2321 src/qemu/qemu_conf.c:2420
+#: src/qemu/qemu_command.c:1715 src/qemu/qemu_command.c:4232
 #, c-format
 msgid "unsupported disk driver type for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2327 src/qemu/qemu_conf.c:2426
+#: src/qemu/qemu_command.c:1721 src/qemu/qemu_command.c:4238
 msgid "cannot create virtual FAT disks in read-write mode"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1610 src/qemu/qemu_command.c:4058
+#: src/qemu/qemu_command.c:1733 src/qemu/qemu_command.c:4254
 msgid "NBD accepts only one host"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1665 src/xenxs/xen_sxpr.c:1748
+#: src/qemu/qemu_command.c:1790 src/xenxs/xen_sxpr.c:1747
 #: src/xenxs/xen_xm.c:1189
 msgid "transient disks not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1688
+#: src/qemu/qemu_command.c:1813
 msgid "disk cache mode 'directsync' is not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1694
+#: src/qemu/qemu_command.c:1819
 msgid "disk cache mode 'unsafe' is not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1738
+#: src/qemu/qemu_command.c:1863
 msgid "disk aio mode not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1808
+#: src/qemu/qemu_command.c:1964
 #, c-format
 msgid "unsupported disk bus '%s' with device setup"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1837
+#: src/qemu/qemu_command.c:1993
 msgid "only supports mount filesystem type"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1843
+#: src/qemu/qemu_command.c:1999
 msgid "Filesystem driver type not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1879
+#: src/qemu/qemu_command.c:2035
 msgid "can only passthrough directories"
 msgstr ""
 
-#: src/qemu/qemu_command.c:1946
+#: src/qemu/qemu_command.c:2102
 #, c-format
 msgid "%s not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2016
+#: src/qemu/qemu_command.c:2172
 #, c-format
 msgid "Unknown controller type: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2098
+#: src/qemu/qemu_command.c:2254
 msgid "unrecognized virtio-net-pci 'tx' option"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2103
+#: src/qemu/qemu_command.c:2259
 msgid "virtio-net-pci 'tx' option not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2253 src/qemu/qemu_command.c:5047
+#: src/qemu/qemu_command.c:2409 src/qemu/qemu_command.c:5231
 msgid "missing watchdog model"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2802
+#: src/qemu/qemu_command.c:2489 src/qemu/qemu_command.c:5193
 msgid "invalid sound model"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2392
+#: src/qemu/qemu_command.c:2548
 msgid "invalid video model"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2401 src/qemu/qemu_command.c:4883
+#: src/qemu/qemu_command.c:2557 src/qemu/qemu_command.c:5067
 #, c-format
 msgid "value for 'vram' must be less than '%u'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2444
+#: src/qemu/qemu_command.c:2600
 #, c-format
 msgid "Failed opening %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2473
+#: src/qemu/qemu_command.c:2629
 msgid "rombar not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2525
+#: src/qemu/qemu_command.c:2681
 #, c-format
 msgid "Redirection bus %s is not supported by QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2532
+#: src/qemu/qemu_command.c:2688
 msgid "USB redirection is not supported by this version of QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2565 src/qemu/qemu_command.c:2635
+#: src/qemu/qemu_command.c:2721 src/qemu/qemu_command.c:2791
 msgid "USB host device is missing bus/device information"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2598
+#: src/qemu/qemu_command.c:2754
 #, c-format
 msgid "hub type %s not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2605
+#: src/qemu/qemu_command.c:2761
 msgid "usb-hub not supported by QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2733
+#: src/qemu/qemu_command.c:2889
 msgid "spicevmc not supported in this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2742
+#: src/qemu/qemu_command.c:2898
 #, c-format
 msgid "unsupported chardev '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2870
+#: src/qemu/qemu_command.c:3026
 msgid "Cannot use virtio serial for parallel/serial devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2880
+#: src/qemu/qemu_command.c:3036
 msgid "virtio serial device has invalid address type"
 msgstr ""
 
-#: src/qemu/qemu_command.c:2898
+#: src/qemu/qemu_command.c:3054
 #, c-format
 msgid "Unsupported spicevmc target name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3042 src/qemu/qemu_command.c:3597
-#: src/xenxs/xen_sxpr.c:2114 src/xenxs/xen_xm.c:1577
+#: src/qemu/qemu_command.c:3198 src/qemu/qemu_command.c:3815
+#: src/xenxs/xen_sxpr.c:2113 src/xenxs/xen_xm.c:1577
 #, c-format
 msgid "unsupported clock offset '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3056
+#: src/qemu/qemu_command.c:3212
 #, c-format
 msgid "unsupported rtc timer track '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3080
+#: src/qemu/qemu_command.c:3236
 #, c-format
 msgid "unsupported rtc timer tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3129
+#: src/qemu/qemu_command.c:3285
 msgid "CPU specification not supported by hypervisor"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1803
+#: src/qemu/qemu_command.c:3299
 msgid "guest CPU is not compatible with host CPU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3255
+#: src/qemu/qemu_command.c:3411
 msgid ""
 "setting current vcpu count less than maximum is not supported with this QEMU "
 "binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3337
+#: src/qemu/qemu_command.c:3551
 #, c-format
 msgid "the QEMU binary %s does not support kqemu"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3350
+#: src/qemu/qemu_command.c:3564
 #, c-format
 msgid "the QEMU binary %s does not support kvm"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3361
+#: src/qemu/qemu_command.c:3575
 #, c-format
 msgid "the QEMU binary %s does not support %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2095
+#: src/qemu/qemu_command.c:3622
 msgid "hugetlbfs filesystem is not mounted"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2100
+#: src/qemu/qemu_command.c:3627
 msgid "hugepages are disabled by administrator config"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2105
+#: src/qemu/qemu_command.c:3632
 #, c-format
 msgid "hugepage backing not supported by '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2135
+#: src/qemu/qemu_command.c:3674
 #, c-format
 msgid "qemu emulator '%s' does not support xen"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3469
+#: src/qemu/qemu_command.c:3687
 #, c-format
 msgid "the QEMU binary %s does not support smbios settings"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3478 src/qemu/qemu_driver.c:977
+#: src/qemu/qemu_command.c:3696 src/qemu/qemu_driver.c:983
 msgid "Host SMBIOS information is not available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3487
+#: src/qemu/qemu_command.c:3705
 #, c-format
 msgid "Domain '%s' sysinfo are not available"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3532
+#: src/qemu/qemu_command.c:3750
 msgid "qemu does not support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3537
+#: src/qemu/qemu_command.c:3755
 msgid "qemu does not support SGA"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3542
+#: src/qemu/qemu_command.c:3760
 msgid "need at least one serial port to use SGA"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3613
+#: src/qemu/qemu_command.c:3831
 #, c-format
 msgid "unsupported timer type (name) '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3633 src/qemu/qemu_command.c:3644
+#: src/qemu/qemu_command.c:3851 src/qemu/qemu_command.c:3862
 #, c-format
 msgid "unsupported rtc tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3668 src/qemu/qemu_command.c:3677
+#: src/qemu/qemu_command.c:3886 src/qemu/qemu_command.c:3895
 #, c-format
 msgid "unsupported pit tickpolicy '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3699
+#: src/qemu/qemu_command.c:3917
 msgid "pit timer is not supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3732
+#: src/qemu/qemu_command.c:3950
 msgid "hypervisor lacks deviceboot feature"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2246
+#: src/qemu/qemu_command.c:4016 src/qemu/qemu_driver.c:5059
 #, c-format
 msgid "unsupported driver name '%s' for disk '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3819
+#: src/qemu/qemu_command.c:4037
 msgid "SATA is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:3836
+#: src/qemu/qemu_command.c:4054
 msgid "Multiple legacy USB controller not supported"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2286 src/qemu/qemu_conf.c:2391
+#: src/qemu/qemu_command.c:4111 src/qemu/qemu_command.c:4202
 #, c-format
 msgid "unsupported usb disk type for '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4136
+#: src/qemu/qemu_command.c:4320
 msgid "filesystem passthrough not supported by this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4289
+#: src/qemu/qemu_command.c:4473
 msgid "this QEMU binary lacks multiple smartcard support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4300 src/qemu/qemu_command.c:4312
+#: src/qemu/qemu_command.c:4484 src/qemu/qemu_command.c:4496
 msgid "this QEMU binary lacks smartcard host mode support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4322
+#: src/qemu/qemu_command.c:4506
 #, c-format
 msgid "invalid certificate name: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4333
+#: src/qemu/qemu_command.c:4517
 #, c-format
 msgid "invalid database name: %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4348
+#: src/qemu/qemu_command.c:4532
 msgid "this QEMU binary lacks smartcard passthrough mode support"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4457
+#: src/qemu/qemu_command.c:4641
 msgid "guestfwd requires QEMU to support -chardev & -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4485 src/qemu/qemu_command.c:4524
+#: src/qemu/qemu_command.c:4669 src/qemu/qemu_command.c:4708
 msgid "virtio channel requires QEMU to support -device"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4549
+#: src/qemu/qemu_command.c:4733
 #, c-format
 msgid "unsupported console target type %s"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4590
+#: src/qemu/qemu_command.c:4774
 msgid "only 1 graphics device is supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4629 src/qemu/qemu_command.c:4771
+#: src/qemu/qemu_command.c:4813 src/qemu/qemu_command.c:4955
 msgid "network-based listen not possible, network driver not present"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4635 src/qemu/qemu_command.c:4777
+#: src/qemu/qemu_command.c:4819 src/qemu/qemu_command.c:4961
 #, c-format
 msgid "listen network '%s' had no usable address"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4713
+#: src/qemu/qemu_command.c:4897
 #, c-format
 msgid "sdl not supported by '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4750
+#: src/qemu/qemu_command.c:4934
 msgid "spice graphics are not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4851
+#: src/qemu/qemu_command.c:5035
 #, c-format
 msgid "unsupported graphics type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4864
+#: src/qemu/qemu_command.c:5048
 msgid "This QEMU does not support QXL graphics adapters"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2756 src/qemu/qemu_conf.c:2782
+#: src/qemu/qemu_command.c:5055
 #, c-format
 msgid "video type %s is not supported with QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4917
+#: src/qemu/qemu_command.c:5101
 #, c-format
 msgid "video type %s is not supported with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4929
+#: src/qemu/qemu_command.c:5113
 #, c-format
 msgid "video type %s is only valid as primary video card"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2745
+#: src/qemu/qemu_command.c:5128
 msgid "only one video card is currently supported"
 msgstr ""
 
-#: src/qemu/qemu_command.c:4980 src/qemu/qemu_command.c:5016
+#: src/qemu/qemu_command.c:5164 src/qemu/qemu_command.c:5200
 msgid "this QEMU binary lacks hda support"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2829
+#: src/qemu/qemu_command.c:5247
 msgid "invalid watchdog action"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5104
+#: src/qemu/qemu_command.c:5288
 msgid "booting from assigned devices is only supported for PCI devices"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5109
+#: src/qemu/qemu_command.c:5293
 msgid ""
 "booting from assigned PCI devices is not supported with this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:2869 src/qemu/qemu_monitor_text.c:1377
+#: src/qemu/qemu_command.c:5350 src/qemu/qemu_monitor_text.c:1961
 msgid "PCI device assignment is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1927
+#: src/qemu/qemu_command.c:5364
 msgid "TCP migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:1935 src/qemu/qemu_conf.c:1941
+#: src/qemu/qemu_command.c:5381
 msgid "STDIO migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5204
+#: src/qemu/qemu_command.c:5388
 msgid "EXEC migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5212
+#: src/qemu/qemu_command.c:5396
 msgid "FD migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5221
+#: src/qemu/qemu_command.c:5405
 msgid "UNIX migration is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5228
+#: src/qemu/qemu_command.c:5412
 msgid "unknown migration protocol"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5243
+#: src/qemu/qemu_command.c:5427
 #, c-format
 msgid ""
 "Memory balloon device type '%s' is not supported by this version of qemu"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3084
+#: src/qemu/qemu_command.c:5645
 #, c-format
 msgid "malformed keyword arguments in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5566 src/qemu/qemu_command.c:6704
+#: src/qemu/qemu_command.c:5748 src/qemu/qemu_command.c:6890
 #, c-format
 msgid "cannot parse nbd filename '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5622 src/qemu/qemu_command.c:6731
+#: src/qemu/qemu_command.c:5807 src/qemu/qemu_command.c:6919
 #, c-format
 msgid "cannot parse sheepdog filename '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3218
+#: src/qemu/qemu_command.c:5894
 #, c-format
 msgid "cannot parse drive index '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5717
+#: src/qemu/qemu_command.c:5902
 #, c-format
 msgid "cannot parse drive bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5725
+#: src/qemu/qemu_command.c:5910
 #, c-format
 msgid "cannot parse drive unit '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5734
+#: src/qemu/qemu_command.c:5919
 #, c-format
 msgid "cannot parse io mode '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3227
+#: src/qemu/qemu_command.c:5931
 #, c-format
 msgid "missing file parameter in drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5759
+#: src/qemu/qemu_command.c:5944
 #, c-format
 msgid "missing index/unit/bus parameter in drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5808
+#: src/qemu/qemu_command.c:5993
 #, c-format
 msgid "invalid device name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3294
+#: src/qemu/qemu_command.c:6029
 #, c-format
 msgid "cannot parse NIC vlan in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3306
+#: src/qemu/qemu_command.c:6041
 #, c-format
 msgid "cannot find NIC definition for vlan %d"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3365
+#: src/qemu/qemu_command.c:6098
 #, c-format
 msgid "cannot parse vlan in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3395
+#: src/qemu/qemu_command.c:6128
 #, c-format
 msgid "cannot parse NIC definition '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:5991
+#: src/qemu/qemu_command.c:6176
 #, c-format
 msgid "cannot parse sndbuf size in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3466 src/qemu/qemu_conf.c:3524
+#: src/qemu/qemu_command.c:6212
 #, c-format
 msgid "unknown PCI device syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3474 src/qemu/qemu_conf.c:3547
+#: src/qemu/qemu_command.c:6220
 #, c-format
 msgid "cannot extract PCI device bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3481
+#: src/qemu/qemu_command.c:6227
 #, c-format
 msgid "cannot extract PCI device slot '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3488
+#: src/qemu/qemu_command.c:6234
 #, c-format
 msgid "cannot extract PCI device function '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6084
+#: src/qemu/qemu_command.c:6269
 #, c-format
 msgid "unknown USB device syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3533
+#: src/qemu/qemu_command.c:6278
 #, c-format
 msgid "cannot extract USB device vendor '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6100
+#: src/qemu/qemu_command.c:6285
 #, c-format
 msgid "cannot extract USB device product '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6107
+#: src/qemu/qemu_command.c:6292
 #, c-format
 msgid "cannot extract USB device bus '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6114
+#: src/qemu/qemu_command.c:6299
 #, c-format
 msgid "cannot extract USB device address '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3667
+#: src/qemu/qemu_command.c:6408
 #, c-format
 msgid "cannot find port number in character device %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3707
+#: src/qemu/qemu_command.c:6448
 #, c-format
 msgid "unknown character device syntax %s"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3782
+#: src/qemu/qemu_command.c:6541
 #, c-format
 msgid "unknown CPU syntax '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6435
+#: src/qemu/qemu_command.c:6620
 #, c-format
 msgid "cannot parse CPU topology '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3814
+#: src/qemu/qemu_command.c:6661
 msgid "no emulator path found"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6488
+#: src/qemu/qemu_command.c:6674
 msgid "failed to generate uuid"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3866
+#: src/qemu/qemu_command.c:6723
 #, c-format
 msgid "missing value for %s argument"
 msgstr ""
 
-#: src/qemu/qemu_command.c:6597
+#: src/qemu/qemu_command.c:6783
 #, c-format
 msgid "missing VNC port number in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3911
+#: src/qemu/qemu_command.c:6790
 #, c-format
 msgid "cannot parse VNC port '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3935
+#: src/qemu/qemu_command.c:6817
 #, c-format
 msgid "cannot parse memory level '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:3952
+#: src/qemu/qemu_command.c:6829
 #, c-format
 msgid "cannot parse UUID '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:4217
+#: src/qemu/qemu_command.c:7193
 #, c-format
 msgid "unknown video adapter type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7073
+#: src/qemu/qemu_command.c:7260
 msgid "CEPH_ARGS was set without an rbd disk"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7080
+#: src/qemu/qemu_command.c:7267
 #, c-format
 msgid "could not parse CEPH_ARGS '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7115
+#: src/qemu/qemu_command.c:7302
 #, c-format
 msgid "found no rbd hosts in CEPH_ARGS '%s'"
 msgstr ""
 
-#: src/qemu/qemu_command.c:7325
+#: src/qemu/qemu_command.c:7511
 #, c-format
 msgid "Unable to resolve %s for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:123
+#: src/qemu/qemu_conf.c:108
 msgid "unable to find hugetlbfs mountpoint"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:250
+#: src/qemu/qemu_conf.c:292
 msgid "cgroup_controllers must be a list of strings"
 msgstr ""
 
@@ -9051,965 +9572,949 @@
 msgid "Unknown cgroup controller '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:288
+#: src/qemu/qemu_conf.c:333
 msgid "cgroup_device_acl must be a list of strings"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:406
+#: src/qemu/qemu_conf.c:407
 #, c-format
 msgid "failed to enable mac filter in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:338
+#: src/qemu/qemu_conf.c:415
 #, c-format
 msgid "failed to add rule to drop all frames in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_conf.c:457
+#: src/qemu/qemu_conf.c:458
 #, c-format
 msgid "Failed to load lock manager %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:239
+#: src/qemu/qemu_domain.c:244
 msgid "Unexpected QEMU monitor still active during domain deletion"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:213
+#: src/qemu/qemu_domain.c:335
 msgid "no monitor path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:240
+#: src/qemu/qemu_domain.c:362
 #, c-format
 msgid "unsupported monitor type '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:388
+#: src/qemu/qemu_domain.c:393
 msgid "failed to parse qemu capabilities flags"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:401
+#: src/qemu/qemu_domain.c:406
 #, c-format
 msgid "Unknown qemu capabilities flag %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:421
+#: src/qemu/qemu_domain.c:426
 #, c-format
 msgid "Unknown job type %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:434
+#: src/qemu/qemu_domain.c:439
 #, c-format
 msgid "Unknown async job type %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:445
+#: src/qemu/qemu_domain.c:450
 #, c-format
 msgid "Unknown job phase %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:500
+#: src/qemu/qemu_domain.c:505
 #, c-format
 msgid "Failed to register xml namespace '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:523
+#: src/qemu/qemu_domain.c:528
 msgid "No qemu command-line argument specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:549
+#: src/qemu/qemu_domain.c:554
 msgid "No qemu environment name specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:554
+#: src/qemu/qemu_domain.c:559
 msgid "Empty qemu environment name specified"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:559
+#: src/qemu/qemu_domain.c:564
 msgid "Invalid environment name, it must begin with a letter or underscore"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:564
+#: src/qemu/qemu_domain.c:569
 msgid ""
 "Invalid environment name, it must contain only alphanumerics and underscore"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:313 src/qemu/qemu_driver.c:356
+#: src/qemu/qemu_domain.c:789
 msgid "cannot acquire state change lock"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:788
+#: src/qemu/qemu_domain.c:793
 msgid "cannot acquire state change lock due to max_queued limit"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:316 src/qemu/qemu_driver.c:359
+#: src/qemu/qemu_domain.c:797
 msgid "cannot acquire job mutex"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:845
+#: src/qemu/qemu_domain.c:850
 msgid "Attempt to start invalid job"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:915
+#: src/qemu/qemu_domain.c:920
 #, c-format
 msgid "unepxected async job %d"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:924
+#: src/qemu/qemu_domain.c:929
 msgid "domain is no longer running"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7907
+#: src/qemu/qemu_domain.c:1086 src/qemu/qemu_driver.c:8875
 msgid "cannot get host CPU capabilities"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1218
+#: src/qemu/qemu_domain.c:1223
 #, c-format
 msgid "failed to set close-on-exec flag on %s"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1302
+#: src/qemu/qemu_domain.c:1307
 #, c-format
 msgid "Unable to write to domain logfile %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:589
+#: src/qemu/qemu_domain.c:1334 src/storage/storage_backend.c:783
 msgid "unable to find kvm-img or qemu-img"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1360
+#: src/qemu/qemu_domain.c:1365
 #, c-format
 msgid "cannot create snapshot directory '%s'"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1433
+#: src/qemu/qemu_domain.c:1438
 #, c-format
 msgid "Disk device '%s' does not support snapshotting"
 msgstr ""
 
-#: src/qemu/qemu_domain.c:1630 src/qemu/qemu_domain.c:1638
+#: src/qemu/qemu_domain.c:1635 src/qemu/qemu_domain.c:1643
 #, c-format
 msgid "cannot access file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:155
+#: src/qemu/qemu_driver.c:158
 #, c-format
 msgid "Failed to start job on VM '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:229
+#: src/qemu/qemu_driver.c:232
 msgid "Failed to initialize security drivers"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:310
+#: src/qemu/qemu_driver.c:313
 #, c-format
 msgid "Failed to allocate memory for snapshot directory for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:320
+#: src/qemu/qemu_driver.c:323
 #, c-format
 msgid "Failed to open snapshot directory %s for domain %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:335
+#: src/qemu/qemu_driver.c:338
 msgid "Failed to allocate memory for path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:342
+#: src/qemu/qemu_driver.c:345
 #, c-format
 msgid "Failed to read snapshot file %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:353
+#: src/qemu/qemu_driver.c:356
 #, c-format
 msgid "Failed to parse snapshot XML from file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:374
+#: src/qemu/qemu_driver.c:377
 #, c-format
 msgid "Too many snapshots claiming to be current for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:380
+#: src/qemu/qemu_driver.c:383
 #, c-format
 msgid "Snapshots have inconsistent relations for domain %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:521
+#: src/qemu/qemu_driver.c:524
 #, c-format
 msgid "Failed to create cache dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:539
+#: src/qemu/qemu_driver.c:542
 #, c-format
 msgid "Failed to create dump dir '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:570
+#: src/qemu/qemu_driver.c:573
 msgid "Missing lock manager implementation"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1088 src/qemu/qemu_driver.c:3726
-#: src/qemu/qemu_driver.c:3761 src/qemu/qemu_driver.c:3856
-#: src/qemu/qemu_driver.c:3891
+#: src/qemu/qemu_driver.c:590
 #, c-format
 msgid "unable to set ownership of '%s' to user %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1094
+#: src/qemu/qemu_driver.c:596 src/qemu/qemu_driver.c:602
+#: src/qemu/qemu_driver.c:608
 #, c-format
 msgid "unable to set ownership of '%s' to %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1119
+#: src/qemu/qemu_driver.c:629
 #, c-format
 msgid "unable to create hugepage path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1126
+#: src/qemu/qemu_driver.c:636
 #, c-format
 msgid "unable to set ownership on %s to %d:%d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2733
+#: src/qemu/qemu_driver.c:863
 msgid "qemu state driver is not active"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2739
+#: src/qemu/qemu_driver.c:869
 #, c-format
 msgid "no QEMU URI path given, try %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2750
+#: src/qemu/qemu_driver.c:880
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2757
+#: src/qemu/qemu_driver.c:887
 #, c-format
 msgid "unexpected QEMU URI path '%s', try qemu:///session"
 msgstr ""
 
-#: src/opennebula/one_driver.c:580 src/opennebula/one_driver.c:613
-#: src/qemu/qemu_driver.c:2959 src/uml/uml_driver.c:1314
-#: src/uml/uml_driver.c:1344 src/vbox/vbox_tmpl.c:1032
+#: src/qemu/qemu_driver.c:1117 src/uml/uml_driver.c:1531
+#: src/uml/uml_driver.c:1567 src/vbox/vbox_tmpl.c:1233
+#: src/vbox/vbox_tmpl.c:1520 src/vbox/vbox_tmpl.c:1572
+#: src/vbox/vbox_tmpl.c:1623 src/vbox/vbox_tmpl.c:1676
+#: src/vbox/vbox_tmpl.c:1727 src/vbox/vbox_tmpl.c:1803
+#: src/vbox/vbox_tmpl.c:2113
 #, c-format
 msgid "no domain with matching id %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3011 src/qemu/qemu_driver.c:7679
+#: src/qemu/qemu_driver.c:1169 src/qemu/qemu_driver.c:8403
+#: src/qemu/qemu_driver.c:8664
 #, c-format
 msgid "no domain with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2569 src/qemu/qemu_driver.c:3255
-#: src/qemu/qemu_driver.c:7731
+#: src/qemu/qemu_driver.c:1481 src/qemu/qemu_migration.c:2674
+#: src/qemu/qemu_migration.c:2801 src/qemu/qemu_process.c:406
+#: src/qemu/qemu_process.c:3287
 msgid "resume operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1570
+#: src/qemu/qemu_driver.c:1576
 msgid "Reboot is not supported with this QEMU binary"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1595
+#: src/qemu/qemu_driver.c:1601
 msgid "Reboot is not supported without the JSON monitor"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1853
+#: src/qemu/qemu_driver.c:1859
 msgid "cannot resize the maximum memory on an active domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3496 src/uml/uml_driver.c:1466
+#: src/qemu/qemu_driver.c:1896 src/uml/uml_driver.c:1701
 msgid "cannot set memory of an active domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2001
+#: src/qemu/qemu_driver.c:2007
 #, c-format
 msgid "cannot translate keycode %u of %s codeset to rfb keycode"
 msgstr ""
 
-#: src/uml/uml_driver.c:1508
+#: src/qemu/qemu_driver.c:2079 src/uml/uml_driver.c:1743
 msgid "cannot read cputime for domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2282
+#: src/qemu/qemu_driver.c:2288
 #, c-format
 msgid "failed to write header to domain save file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2290 src/qemu/qemu_driver.c:4335
+#: src/qemu/qemu_driver.c:2296 src/qemu/qemu_driver.c:4334
 #, c-format
 msgid "failed to write xml to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2341
+#: src/qemu/qemu_driver.c:2347
 #, c-format
 msgid "unable to open %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2356 src/qemu/qemu_driver.c:2380
+#: src/qemu/qemu_driver.c:2362 src/qemu/qemu_driver.c:2386
 #, c-format
 msgid "Failed to create file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2371
+#: src/qemu/qemu_driver.c:2377
 #, c-format
 msgid "Failed to create file '%s': couldn't determine fs type"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2392
+#: src/qemu/qemu_driver.c:2398
 #, c-format
 msgid "Error from child process creating '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2442 src/qemu/qemu_driver.c:9277
-#: src/qemu/qemu_migration.c:798
+#: src/qemu/qemu_driver.c:2448 src/qemu/qemu_driver.c:9624
+#: src/qemu/qemu_migration.c:799
 msgid "domain is marked for auto destroy"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2470 src/qemu/qemu_driver.c:2980
-#: src/qemu/qemu_driver.c:8873 src/qemu/qemu_driver.c:9155
-#: src/qemu/qemu_driver.c:10019 src/qemu/qemu_driver.c:10070
+#: src/qemu/qemu_driver.c:2476 src/qemu/qemu_driver.c:2986
+#: src/qemu/qemu_driver.c:9220 src/qemu/qemu_driver.c:9502
+#: src/qemu/qemu_driver.c:10366 src/qemu/qemu_driver.c:10417
 #: src/qemu/qemu_hotplug.c:408 src/qemu/qemu_hotplug.c:761
-#: src/qemu/qemu_migration.c:1613 src/qemu/qemu_migration.c:1925
-#: src/qemu/qemu_migration.c:2245 src/qemu/qemu_migration.c:2601
-#: src/qemu/qemu_process.c:383 src/qemu/qemu_process.c:396
+#: src/qemu/qemu_migration.c:1622 src/qemu/qemu_migration.c:1937
+#: src/qemu/qemu_migration.c:2261 src/qemu/qemu_migration.c:2612
+#: src/qemu/qemu_process.c:384 src/qemu/qemu_process.c:397
 msgid "guest unexpectedly quit"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3691 src/qemu/qemu_driver.c:7529
+#: src/qemu/qemu_driver.c:2510
 msgid "failed to get domain xml"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2533 src/qemu/qemu_driver.c:2863
-#: src/qemu/qemu_driver.c:3948
+#: src/qemu/qemu_driver.c:2539 src/qemu/qemu_driver.c:2869
+#: src/qemu/qemu_driver.c:3947
 msgid "bypass cache unsupported by this system"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2564 src/qemu/qemu_driver.c:2584
-#: src/qemu/qemu_driver.c:3107 src/vbox/vbox_tmpl.c:9091
+#: src/qemu/qemu_driver.c:2570 src/qemu/qemu_driver.c:2590
+#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9096
 #, c-format
 msgid "unable to close %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2574
+#: src/qemu/qemu_driver.c:2580
 #, c-format
 msgid "unable to seek %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2580
+#: src/qemu/qemu_driver.c:2586
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3649
+#: src/qemu/qemu_driver.c:2673
 msgid "Invalid save image format specified in configuration file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2673
+#: src/qemu/qemu_driver.c:2679
 msgid ""
 "Compression program for image format in configuration file isn't available"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3717 src/qemu/qemu_driver.c:3848
+#: src/qemu/qemu_driver.c:2891
 #, c-format
 msgid "unable to save file %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2917
+#: src/qemu/qemu_driver.c:2923
 msgid "Invalid dump image format specified in configuration file, using raw"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2922
+#: src/qemu/qemu_driver.c:2928
 msgid ""
 "Compression program for dump image format in configuration file isn't "
 "available, using raw"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3917
+#: src/qemu/qemu_driver.c:3024
 msgid "resuming after dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3062
+#: src/qemu/qemu_driver.c:3068 src/qemu/qemu_driver.c:7352
 #, c-format
 msgid "no domain matching uuid '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3081
+#: src/qemu/qemu_driver.c:3087
 msgid "currently is supported only taking screenshots of screen ID 0"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6399
+#: src/qemu/qemu_driver.c:3098 src/qemu/qemu_driver.c:7925
+#: src/vbox/vbox_tmpl.c:9048
 #, c-format
 msgid "mkstemp(\"%s\") failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3113 src/vbox/vbox_tmpl.c:9097
+#: src/qemu/qemu_driver.c:3119 src/vbox/vbox_tmpl.c:9102
 msgid "unable to open stream"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3174
+#: src/qemu/qemu_driver.c:3180
 msgid "Dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3182
+#: src/qemu/qemu_driver.c:3188
 msgid "Resuming after dump failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3253
+#: src/qemu/qemu_driver.c:3259
 msgid "cannot change vcpu count of this domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3277 src/test/test_driver.c:2189
-#: src/xen/xen_driver.c:1114
+#: src/qemu/qemu_driver.c:3283 src/test/test_driver.c:2194
+#: src/xen/xen_driver.c:1122
 #, c-format
 msgid "argument out of range: %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3310
+#: src/qemu/qemu_driver.c:3316
 msgid "cannot adjust maximum on running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3971 src/qemu/qemu_driver.c:4178
-#: src/qemu/qemu_driver.c:4213
+#: src/qemu/qemu_driver.c:3334 src/qemu/qemu_driver.c:3847
 #, c-format
 msgid "unknown virt type in domain definition '%d'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3441
+#: src/qemu/qemu_driver.c:3447
 msgid "a domain is inactive; can change only persistent config"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4037
+#: src/qemu/qemu_driver.c:3456
 #, c-format
 msgid "vcpu number out of range %d > %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4056
+#: src/qemu/qemu_driver.c:3495 src/qemu/qemu_process.c:1578
 msgid "cpu affinity is not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3496
+#: src/qemu/qemu_driver.c:3502
 msgid "failed to delete vcpupin xml of a running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3503
+#: src/qemu/qemu_driver.c:3509
 msgid "failed to update or add vcpupin xml of a running domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3518
+#: src/qemu/qemu_driver.c:3524
 msgid "failed to delete vcpupin xml of a persistent domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3525
+#: src/qemu/qemu_driver.c:3531
 msgid "failed to update or add vcpupin xml of a persistent domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3577
-msgid "cannot get live and persistent info concurrently"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:3613
+#: src/qemu/qemu_driver.c:3612
 msgid "cannot get persistent config of a transient domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4095
+#: src/qemu/qemu_driver.c:3693
 msgid "cannot list vcpu pinning for an inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4126
+#: src/qemu/qemu_driver.c:3724
 msgid "cannot get vCPU placement & pCPU time"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4144
+#: src/qemu/qemu_driver.c:3742
 msgid "cpu affinity is not available"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3799 src/test/test_driver.c:2137
+#: src/qemu/qemu_driver.c:3798 src/test/test_driver.c:2142
 #: src/xen/xend_internal.c:2347 src/xen/xm_internal.c:795
 msgid "domain not active"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4236
+#: src/qemu/qemu_driver.c:3870
 msgid "Failed to get security label"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4267
+#: src/qemu/qemu_driver.c:3902
 #, c-format
 msgid "security model string exceeds max %d bytes"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4277
+#: src/qemu/qemu_driver.c:3912
 #, c-format
 msgid "security DOI string exceeds max %d bytes"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4314
+#: src/qemu/qemu_driver.c:3960
 msgid "failed to read qemu header"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3970
+#: src/qemu/qemu_driver.c:3969
 msgid "save image is incomplete"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3974
+#: src/qemu/qemu_driver.c:3973
 #, c-format
 msgid "cannot remove corrupt file: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4018 src/qemu/qemu_driver.c:4122
+#: src/qemu/qemu_driver.c:4017 src/qemu/qemu_driver.c:4121
 #, c-format
 msgid "cannot close file: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4371
+#: src/qemu/qemu_driver.c:4078
 #, c-format
 msgid "Invalid compressed save format %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4383
+#: src/qemu/qemu_driver.c:4093
 #, c-format
 msgid "Failed to start decompression binary %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4421
+#: src/qemu/qemu_driver.c:4145
 msgid "failed to resume domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4320
+#: src/qemu/qemu_driver.c:4319
 msgid "new xml too large to fit in file"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4329
+#: src/qemu/qemu_driver.c:4328
 #, c-format
 msgid "cannot seek in '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4688
+#: src/qemu/qemu_driver.c:4687
 #, c-format
 msgid "cannot remove managed save file %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4710
+#: src/qemu/qemu_driver.c:4757
 msgid "domain is already running"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:4981
+#: src/qemu/qemu_driver.c:4980
 #, c-format
 msgid "cannot delete inactive domain with %d snapshots"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5125
+#: src/qemu/qemu_driver.c:5124
 #, c-format
 msgid "disk controller bus '%s' cannot be hotplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5211 src/uml/uml_driver.c:2191
+#: src/qemu/qemu_driver.c:5210 src/uml/uml_driver.c:2177
 msgid "This type of disk cannot be hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5236
+#: src/qemu/qemu_driver.c:5214
+#, c-format
+msgid "disk device type '%s' cannot be detached"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:5235
 #, c-format
 msgid "disk controller bus '%s' cannot be hotunplugged."
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5268 src/uml/uml_driver.c:2195
+#: src/qemu/qemu_driver.c:5267 src/uml/uml_driver.c:2181
 msgid "This type of device cannot be hot unplugged"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5386
+#: src/qemu/qemu_driver.c:5385
 #, c-format
 msgid "mac %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5402
+#: src/qemu/qemu_driver.c:5401
 #, c-format
 msgid "Lease %s in lockspace %s already exists"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5447
+#: src/qemu/qemu_driver.c:5446
 #, c-format
 msgid "no nic of mac %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5456 src/qemu/qemu_hotplug.c:2263
+#: src/qemu/qemu_driver.c:5455 src/qemu/qemu_hotplug.c:2262
 #, c-format
 msgid "Lease %s in lockspace %s does not exist"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5521
+#: src/qemu/qemu_driver.c:5520
 #, c-format
 msgid "mac %s doesn't exist"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5592
+#: src/qemu/qemu_driver.c:5591
 msgid "cannot do live update a device on inactive domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5867 src/qemu/qemu_driver.c:6686
-#: src/qemu/qemu_driver.c:6960
-msgid "cgroup CPU controller is not mounted"
-msgstr ""
-
-#: src/lxc/lxc_driver.c:1926 src/lxc/lxc_driver.c:1984
-#: src/qemu/qemu_driver.c:6003 src/qemu/qemu_driver.c:6074
+#: src/qemu/qemu_driver.c:5964
 #, c-format
-msgid "No such domain %s"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5932 src/qemu/qemu_driver.c:6079
-msgid "blkio cgroup isn't mounted"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5962 src/qemu/qemu_driver.c:5996
-msgid "invalid type for blkio weight tunable, expected a 'unsigned int'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:5969 src/qemu/qemu_driver.c:6003
-msgid "out of blkio weight range."
+msgid "unable to parse %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5977
-msgid "unable to set blkio weight tunable"
+#: src/qemu/qemu_driver.c:6101 src/qemu/qemu_driver.c:6173
+msgid "invalid type for device_weight tunable, expected a 'char *'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6112
-msgid "unable to get blkio weight"
+#: src/qemu/qemu_driver.c:6119
+#, c-format
+msgid "Unable to set io device weight for path %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6211 src/qemu/qemu_driver.c:6369
+#: src/qemu/qemu_driver.c:6476 src/qemu/qemu_driver.c:6638
 msgid "cgroup memory controller is not mounted"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6552 src/qemu/qemu_driver.c:6818
-msgid "unable to get cpu bandwidth tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6559 src/qemu/qemu_driver.c:6811
-msgid "unable to get cpu bandwidth period tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6602
+#: src/qemu/qemu_driver.c:6871
 #, c-format
 msgid "Unable to find vcpu cgroup for %s(vcpu: %d)"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6020
-msgid "invalid type for cpu_shares tunable, expected a 'ullong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6027
-msgid "unable to set cpu shares tunable"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6724
-msgid "invalid type for vcpu_period tunable, expected a 'ullong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6744
-msgid "invalid type for vcpu_quota tunable, expected a 'llong'"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6850
+#: src/qemu/qemu_driver.c:7119
 #, c-format
 msgid "Unable to find vcpu cgroup for %s(vcpu: 0)"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6893
-msgid "cannot query live and config together"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6924
-msgid "cannot query persistent config of a transient domain"
-msgstr ""
-
-#: src/qemu/qemu_driver.c:6934
-msgid "can't get persistentDef"
+#: src/qemu/qemu_driver.c:7333
+msgid "empty path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6087
-msgid "unable to get cpu shares tunable"
+#: src/qemu/qemu_driver.c:7339
+#, c-format
+msgid "size must be less than %llu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6153 src/test/test_driver.c:2602
+#: src/qemu/qemu_driver.c:7369 src/qemu/qemu_driver.c:7434
+#: src/qemu/qemu_driver.c:7520 src/test/test_driver.c:2825
 #, c-format
 msgid "invalid path: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7091 src/qemu/qemu_driver.c:7180
+#: src/qemu/qemu_driver.c:7441 src/qemu/qemu_driver.c:7527
 #: src/qemu/qemu_hotplug.c:75
 #, c-format
 msgid "missing disk device alias name for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6225 src/test/test_driver.c:2657
+#: src/qemu/qemu_driver.c:7743 src/test/test_driver.c:2880
 #, c-format
 msgid "invalid path, '%s' is not a known interface"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7410
+#: src/qemu/qemu_driver.c:7757
 msgid "interface stats not implemented on this platform"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6305 src/uml/uml_driver.c:1802
+#: src/qemu/qemu_driver.c:7836 src/qemu/qemu_driver.c:8001
+#: src/uml/uml_driver.c:2328
 msgid "NULL or empty path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7496 src/uml/uml_driver.c:2349
+#: src/qemu/qemu_driver.c:7843 src/uml/uml_driver.c:2335
 #, c-format
 msgid "invalid path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6324
+#: src/qemu/qemu_driver.c:7852
 #, c-format
 msgid "%s: failed to open"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6335
+#: src/qemu/qemu_driver.c:7863
 #, c-format
 msgid "%s: failed to seek or read"
 msgstr ""
 
-#: src/libvirt.c:4420 src/qemu/qemu_driver.c:6378
+#: src/qemu/qemu_driver.c:7904
 msgid "flags parameter must be VIR_MEMORY_VIRTUAL or VIR_MEMORY_PHYSICAL"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6421
+#: src/qemu/qemu_driver.c:7949
 #, c-format
 msgid "failed to read temporary file created with template %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7661
+#: src/qemu/qemu_driver.c:8008
 #, c-format
 msgid "invalid path %s not assigned to domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7667
+#: src/qemu/qemu_driver.c:8014
 #, c-format
 msgid "disk %s does not currently have a source assigned"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7677
+#: src/qemu/qemu_driver.c:8024
 #, c-format
 msgid "failed to open path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7685
+#: src/qemu/qemu_driver.c:8032
 #, c-format
 msgid "unknown disk format %s for %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:846
+#: src/qemu/qemu_driver.c:8061 src/storage/storage_backend.c:1018
+#: src/storage/storage_backend.c:1046 src/storage/storage_backend.c:1166
+#: src/util/storage_file.c:744 src/util/storage_file.c:840
 #, c-format
 msgid "cannot stat file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7736
+#: src/qemu/qemu_driver.c:8083
 #, c-format
 msgid "failed to seek to end of %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6833 src/qemu/qemu_driver.c:7001
+#: src/qemu/qemu_driver.c:8236 src/qemu/qemu_driver.c:8308
+#: src/qemu/qemu_driver.c:8541 src/qemu/qemu_driver.c:8576
 msgid "no domain XML passed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6838
+#: src/qemu/qemu_driver.c:8241 src/qemu/qemu_driver.c:8581
 msgid "PrepareTunnel called but no TUNNELLED flag set"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6843
+#: src/qemu/qemu_driver.c:8246 src/qemu/qemu_driver.c:8586
 msgid "tunnelled migration requested but NULL stream passed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7905 src/qemu/qemu_driver.c:7945
-#: src/qemu/qemu_driver.c:8000
+#: src/qemu/qemu_driver.c:8252 src/qemu/qemu_driver.c:8292
+#: src/qemu/qemu_driver.c:8347
 #, c-format
 msgid "Cannot use migrate v2 protocol with lock manager %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:6995
+#: src/qemu/qemu_driver.c:8302 src/qemu/qemu_driver.c:8535
 msgid "Tunnelled migration requested but invalid RPC method called"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8136 src/qemu/qemu_migration.c:1199
+#: src/qemu/qemu_driver.c:8483 src/qemu/qemu_migration.c:1207
 msgid "domain disappeared"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7811 src/xen/xen_driver.c:1705
+#: src/qemu/qemu_driver.c:8769 src/xen/xen_driver.c:1970
 #, c-format
 msgid "device %s is not a PCI device"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8636
+#: src/qemu/qemu_driver.c:8983
 msgid "no job is active on the domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8640
+#: src/qemu/qemu_driver.c:8987
 msgid "cannot abort incoming migration; use virDomainDestroy instead"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8698
+#: src/qemu/qemu_driver.c:9045
 msgid "domain is not being migrated"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8821
+#: src/qemu/qemu_driver.c:9168
 #, c-format
 msgid "Disk '%s' does not support snapshotting"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8907 src/qemu/qemu_driver.c:9214
+#: src/qemu/qemu_driver.c:9254 src/qemu/qemu_driver.c:9561
 msgid "resuming after snapshot failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8937
+#: src/qemu/qemu_driver.c:9284
 #, c-format
 msgid ""
 "active qemu domains require external disk snapshots; disk %s requested "
 "internal"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8945
+#: src/qemu/qemu_driver.c:9292
 #, c-format
 msgid "internal snapshot for disk %s unsupported for storage type %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8963
+#: src/qemu/qemu_driver.c:9310
 #, c-format
 msgid "external snapshot format for disk %s is unsupported: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8971
+#: src/qemu/qemu_driver.c:9318
 #, c-format
 msgid "unable to stat for disk %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8977
+#: src/qemu/qemu_driver.c:9324
 #, c-format
 msgid ""
 "external snapshot file for disk %s already exists and is not a block device: "
 "%s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8991 src/qemu/qemu_driver.c:9031
+#: src/qemu/qemu_driver.c:9338 src/qemu/qemu_driver.c:9378
 msgid "unexpected code path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:8998
+#: src/qemu/qemu_driver.c:9345
 msgid "disk snapshots require at least one disk to be selected for snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9282
+#: src/qemu/qemu_driver.c:9629
 msgid "cannot halt after transient domain snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9296
+#: src/qemu/qemu_driver.c:9643
 #, c-format
 msgid "cannot set snapshot %s as its own parent"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9303
+#: src/qemu/qemu_driver.c:9650
 #, c-format
 msgid "parent %s for snapshot %s not found"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9310
+#: src/qemu/qemu_driver.c:9657
 #, c-format
 msgid "parent %s would create cycle to %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9328
+#: src/qemu/qemu_driver.c:9675
 #, c-format
 msgid "definition for snapshot %s must use uuid %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9339
+#: src/qemu/qemu_driver.c:9686
 #, c-format
 msgid ""
 "cannot change between online and offline snapshot state in snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9347
+#: src/qemu/qemu_driver.c:9694
 #, c-format
 msgid ""
 "cannot change between disk snapshot and system checkpoint in snapshot %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9447
+#: src/qemu/qemu_driver.c:9794
 msgid "disk snapshots of inactive domains not implemented yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9597 src/qemu/qemu_driver.c:9637
-#: src/qemu/qemu_driver.c:9744 src/qemu/qemu_driver.c:9822
-#: src/qemu/qemu_driver.c:9892 src/qemu/qemu_driver.c:10253
+#: src/qemu/qemu_driver.c:9944 src/qemu/qemu_driver.c:9984
+#: src/qemu/qemu_driver.c:10091 src/qemu/qemu_driver.c:10169
+#: src/qemu/qemu_driver.c:10239 src/qemu/qemu_driver.c:10600
 #, c-format
 msgid "no domain snapshot with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9679
+#: src/qemu/qemu_driver.c:10026
 #, c-format
 msgid "no snapshot with matching name '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9786
+#: src/qemu/qemu_driver.c:10133
 msgid "the domain does not have a current snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9903
+#: src/qemu/qemu_driver.c:10250
 msgid ""
 "transient domain needs to request run or pause to revert to inactive snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9909
+#: src/qemu/qemu_driver.c:10256
 msgid "revert to external disk snapshot not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9916
+#: src/qemu/qemu_driver.c:10263
 #, c-format
 msgid "snapshot '%s' lacks domain '%s' rollback info"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:9926
+#: src/qemu/qemu_driver.c:10273
 msgid "must respawn qemu to start inactive snapshot"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10268
+#: src/qemu/qemu_driver.c:10615
 #, c-format
 msgid "deletion of %d external disk snapshots not supported yet"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10295
+#: src/qemu/qemu_driver.c:10642
 #, c-format
 msgid "failed to set snapshot '%s' as current"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10427
+#: src/qemu/qemu_driver.c:10774
 #, c-format
 msgid "No monitor connection for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10433
+#: src/qemu/qemu_driver.c:10780
 #, c-format
 msgid "Cannot connect to monitor connection of type '%s' for pid %u"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10544
+#: src/qemu/qemu_driver.c:10891
 #, c-format
 msgid "cannot find character device %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10594
+#: src/qemu/qemu_driver.c:10942
 msgid "No device found for specified path"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10730
+#: src/qemu/qemu_driver.c:11078
 #, c-format
 msgid "No graphics backend with index %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:10742
+#: src/qemu/qemu_driver.c:11090
 #, c-format
 msgid "Can only open VNC or SPICE graphics backends, not %s"
 msgstr ""
 
+#: src/qemu/qemu_driver.c:11187
+#, c-format
+msgid "expected unsigned long long for parameter %s"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11211
+#, c-format
+msgid "Unrecognized parameter %s"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11220
+msgid "total and read/write of bytes_sec cannot be set at the same time"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11227
+msgid "total and read/write of iops_sec cannot be set at the same time"
+msgstr ""
+
+#: src/qemu/qemu_driver.c:11246
+msgid "Write to config file failed"
+msgstr ""
+
 #: src/qemu/qemu_hostdev.c:189
 #, c-format
 msgid "PCI device %s is not assignable"
@@ -10059,7 +10564,7 @@
 msgid "SCSI controller %d was missing its PCI address"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5165
+#: src/qemu/qemu_hotplug.c:658
 msgid "installed qemu version does not support host_net_add"
 msgstr ""
 
@@ -10079,12 +10584,12 @@
 msgid "guest unexpectedly quit during hotplug"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5375 src/qemu/qemu_driver.c:5769
+#: src/qemu/qemu_hotplug.c:1092 src/qemu/qemu_hotplug.c:2145
 #, c-format
 msgid "hostdev mode '%s' not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5393 src/qemu/qemu_driver.c:5780
+#: src/qemu/qemu_hotplug.c:1133 src/qemu/qemu_hotplug.c:2159
 #, c-format
 msgid "hostdev subsys type '%s' not supported"
 msgstr ""
@@ -10169,13 +10674,13 @@
 msgstr ""
 
 #: src/qemu/qemu_hotplug.c:1513 src/qemu/qemu_hotplug.c:1760
-#: src/qemu/qemu_hotplug.c:1996
+#: src/qemu/qemu_hotplug.c:1995
 #, c-format
 msgid "cannot hot unplug multifunction PCI device: %s"
 msgstr ""
 
 #: src/qemu/qemu_hotplug.c:1530 src/qemu/qemu_hotplug.c:1754
-#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2004
+#: src/qemu/qemu_hotplug.c:1849 src/qemu/qemu_hotplug.c:2003
 msgid "device cannot be detached without a PCI address"
 msgstr ""
 
@@ -10193,7 +10698,7 @@
 msgid "device cannot be detached: device is busy"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5612
+#: src/qemu/qemu_hotplug.c:1839
 #, c-format
 msgid "network device %02x:%02x:%02x:%02x:%02x:%02x not found"
 msgstr ""
@@ -10207,316 +10712,320 @@
 msgid "unable to determine original VLAN"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5646
+#: src/qemu/qemu_hotplug.c:1927
 #, c-format
 msgid "failed to remove ebtables rule on  '%s'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5699
+#: src/qemu/qemu_hotplug.c:1985
 #, c-format
 msgid "host pci device %.4x:%.2x:%.2x.%.1x not found"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2094
+#: src/qemu/qemu_hotplug.c:2093
 #, c-format
 msgid "host usb device %03d.%03d not found"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2102
+#: src/qemu/qemu_hotplug.c:2101
 msgid "device cannot be detached without a device alias"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2108
+#: src/qemu/qemu_hotplug.c:2107
 msgid "device cannot be detached with this QEMU version"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2200
+#: src/qemu/qemu_hotplug.c:2199
 msgid "Graphics password only supported for VNC"
 msgstr ""
 
-#: src/qemu/qemu_hotplug.c:2226
+#: src/qemu/qemu_hotplug.c:2225
 msgid "Expiry of passwords is not supported"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:163
+#: src/qemu/qemu_migration.c:164
 #, c-format
 msgid "unable to read server cert %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:170
+#: src/qemu/qemu_migration.c:171
 #, c-format
 msgid "cannot initialize cert object: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:181
+#: src/qemu/qemu_migration.c:182
 #, c-format
 msgid "cannot load cert data from %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:276
+#: src/qemu/qemu_migration.c:277
 msgid "Unable to obtain host UUID"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:297
+#: src/qemu/qemu_migration.c:298
 msgid "Migration graphics data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:323
+#: src/qemu/qemu_migration.c:324
 msgid "Migration lockstate data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:354
+#: src/qemu/qemu_migration.c:355
 msgid "Migration persistent data already present"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:469
+#: src/qemu/qemu_migration.c:470
 msgid "missing type attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:474
+#: src/qemu/qemu_migration.c:475
 #, c-format
 msgid "unknown graphics type %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:481
+#: src/qemu/qemu_migration.c:482
 msgid "missing port attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:487
+#: src/qemu/qemu_migration.c:488
 msgid "missing tlsPort attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:493
+#: src/qemu/qemu_migration.c:494
 msgid "missing listen attribute in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:530
+#: src/qemu/qemu_migration.c:531
 msgid "missing name element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:535
+#: src/qemu/qemu_migration.c:536
 #, c-format
 msgid "Incoming cookie data had unexpected name %s vs %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:545
+#: src/qemu/qemu_migration.c:546
 msgid "missing uuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:551
+#: src/qemu/qemu_migration.c:552
 #, c-format
 msgid "Incoming cookie data had unexpected UUID %s vs %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:559
+#: src/qemu/qemu_migration.c:560
 msgid "missing hostname element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:564 src/qemu/qemu_migration.c:581
+#: src/qemu/qemu_migration.c:565 src/qemu/qemu_migration.c:582
 #, c-format
 msgid "Attempt to migrate guest to the same host %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:571
+#: src/qemu/qemu_migration.c:572
 msgid "missing hostuuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:576
+#: src/qemu/qemu_migration.c:577
 msgid "malformed hostuuid element in migration data"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:597
+#: src/qemu/qemu_migration.c:598
 msgid "missing feature name"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:603
+#: src/qemu/qemu_migration.c:604
 #, c-format
 msgid "Unknown migration cookie feature %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:611
+#: src/qemu/qemu_migration.c:612
 #, c-format
 msgid "Unsupported migration cookie feature %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:629
+#: src/qemu/qemu_migration.c:630
 msgid "Missing lock driver name in migration cookie"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:641
+#: src/qemu/qemu_migration.c:642
 #, c-format
 msgid "Too many domain elements in migration cookie: %d"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:677
+#: src/qemu/qemu_migration.c:678
 msgid "(qemu_migration_cookie)"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:739
+#: src/qemu/qemu_migration.c:740
 msgid "Migration cookie was not NULL terminated"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:759
+#: src/qemu/qemu_migration.c:760
 #, c-format
 msgid "Missing %s lock state for migration cookie"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:766
+#: src/qemu/qemu_migration.c:767
 #, c-format
 msgid "Source host lock driver %s different from target %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:803
+#: src/qemu/qemu_migration.c:804
 #, c-format
 msgid "cannot migrate domain with %d snapshots"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:812
+#: src/qemu/qemu_migration.c:813
 msgid "Domain with assigned host devices cannot be migrated"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:879
+#: src/qemu/qemu_migration.c:880
 msgid "is not active"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:902
+#: src/qemu/qemu_migration.c:903
 msgid "unexpectedly failed"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:908
+#: src/qemu/qemu_migration.c:909
 msgid "canceled by client"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:925 src/qemu/qemu_migration.c:1625
+#: src/qemu/qemu_migration.c:927 src/qemu/qemu_migration.c:1634
 msgid "migration job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:928
+#: src/qemu/qemu_migration.c:930
 msgid "domain save job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:931
+#: src/qemu/qemu_migration.c:933
 msgid "domain core dump job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:934
+#: src/qemu/qemu_migration.c:936
 msgid "job"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1044
+#: src/qemu/qemu_migration.c:950
+msgid "Lost connection to destination host"
+msgstr ""
+
+#: src/qemu/qemu_migration.c:1052
 msgid "target domain name doesn't match source name nor destination name"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1141 src/qemu/qemu_migration.c:1817
+#: src/qemu/qemu_migration.c:1149 src/qemu/qemu_migration.c:1829
 msgid "cannot create pipe for tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1161
+#: src/qemu/qemu_migration.c:1169
 msgid "cannot pass pipe for tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1307
+#: src/qemu/qemu_migration.c:1315
 msgid ""
 "hostname on destination resolved to localhost, but migration requires an FQDN"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7042
+#: src/qemu/qemu_migration.c:1337
 msgid "only tcp URIs are supported for KVM/QEMU migrations"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7065
+#: src/qemu/qemu_migration.c:1361
 msgid "URI ended with incorrect ':port'"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7233
+#: src/qemu/qemu_migration.c:1449
 msgid "tunnelled migration failed to read from qemu"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1487
+#: src/qemu/qemu_migration.c:1495
 msgid "Unable to create migration thread"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1544
+#: src/qemu/qemu_migration.c:1553
 #, c-format
 msgid "Migration with lock driver %s requires cookie support"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:1633
+#: src/qemu/qemu_migration.c:1642
 msgid "failed to accept connection from qemu"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7177
+#: src/qemu/qemu_migration.c:1737
 #, c-format
 msgid "cannot parse URI %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7337
+#: src/qemu/qemu_migration.c:1807
 msgid "Source qemu is too old to support tunnelled migration"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7516
+#: src/qemu/qemu_migration.c:2233
 #, c-format
 msgid "Failed to connect to remote libvirt URI %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:7522
+#: src/qemu/qemu_migration.c:2254
 msgid "Destination libvirt does not support peer-to-peer migration protocol"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2352 src/qemu/qemu_migration.c:2425
+#: src/qemu/qemu_migration.c:2368 src/qemu/qemu_migration.c:2441
 #, c-format
 msgid "Failed to resume guest %s after failure"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2486
+#: src/qemu/qemu_migration.c:2502
 msgid "received unexpected cookie with P2P migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2497
+#: src/qemu/qemu_migration.c:2513
 msgid "Unexpected dconnuri parameter with non-peer2peer migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2639
+#: src/qemu/qemu_migration.c:2650
 msgid "can't get vmdef"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:2913
+#: src/qemu/qemu_migration.c:2914
 msgid "Unable to set cloexec flag"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3007
+#: src/qemu/qemu_migration.c:3001
 #, c-format
 msgid "migration protocol going backwards %s => %s"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3041
+#: src/qemu/qemu_migration.c:3035
 #, c-format
 msgid "domain '%s' is not processing incoming migration"
 msgstr ""
 
-#: src/qemu/qemu_migration.c:3043
+#: src/qemu/qemu_migration.c:3037
 #, c-format
 msgid "domain '%s' is not being migrated"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:236
+#: src/qemu/qemu_monitor.c:226
 msgid "failed to create socket"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:244
+#: src/qemu/qemu_monitor.c:234
 #, c-format
 msgid "Monitor path %s too big for destination"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:261
+#: src/qemu/qemu_monitor.c:252
 msgid "failed to connect to monitor socket"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:268
+#: src/qemu/qemu_monitor.c:259
 msgid "monitor socket did not show up."
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:286
+#: src/qemu/qemu_monitor.c:277
 #, c-format
 msgid "Unable to open monitor path %s"
 msgstr ""
@@ -10560,32 +11069,32 @@
 msgid "Error while processing monitor IO"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:573
+#: src/qemu/qemu_monitor.c:646
 msgid "EOF notify callback must be supplied"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:584
+#: src/qemu/qemu_monitor.c:657
 msgid "cannot initialize monitor mutex"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:590
+#: src/qemu/qemu_monitor.c:663
 msgid "cannot initialize monitor condition"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:614
+#: src/qemu/qemu_monitor.c:687
 #, c-format
 msgid "unable to handle monitor type: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:623
+#: src/qemu/qemu_monitor.c:696
 msgid "Unable to set monitor close-on-exec flag"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:628
+#: src/qemu/qemu_monitor.c:701
 msgid "Unable to put monitor into non-blocking mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:640
+#: src/qemu/qemu_monitor.c:713
 msgid "unable to register monitor events"
 msgstr ""
 
@@ -10599,29 +11108,29 @@
 #: src/qemu/qemu_monitor.c:1157 src/qemu/qemu_monitor.c:1177
 #: src/qemu/qemu_monitor.c:1198 src/qemu/qemu_monitor.c:1218
 #: src/qemu/qemu_monitor.c:1246 src/qemu/qemu_monitor.c:1282
-#: src/qemu/qemu_monitor.c:1320 src/qemu/qemu_monitor.c:1366
-#: src/qemu/qemu_monitor.c:1398 src/qemu/qemu_monitor.c:1420
-#: src/qemu/qemu_monitor.c:1439 src/qemu/qemu_monitor.c:1460
-#: src/qemu/qemu_monitor.c:1483 src/qemu/qemu_monitor.c:1506
-#: src/qemu/qemu_monitor.c:1528 src/qemu/qemu_monitor.c:1548
-#: src/qemu/qemu_monitor.c:1568 src/qemu/qemu_monitor.c:1591
-#: src/qemu/qemu_monitor.c:1619 src/qemu/qemu_monitor.c:1652
-#: src/qemu/qemu_monitor.c:1684 src/qemu/qemu_monitor.c:1726
-#: src/qemu/qemu_monitor.c:1791 src/qemu/qemu_monitor.c:1816
-#: src/qemu/qemu_monitor.c:1866 src/qemu/qemu_monitor.c:1887
-#: src/qemu/qemu_monitor.c:1908 src/qemu/qemu_monitor.c:1931
-#: src/qemu/qemu_monitor.c:1954 src/qemu/qemu_monitor.c:1975
-#: src/qemu/qemu_monitor.c:1997 src/qemu/qemu_monitor.c:2019
-#: src/qemu/qemu_monitor.c:2057 src/qemu/qemu_monitor.c:2088
-#: src/qemu/qemu_monitor.c:2127 src/qemu/qemu_monitor.c:2152
-#: src/qemu/qemu_monitor.c:2189 src/qemu/qemu_monitor.c:2210
-#: src/qemu/qemu_monitor.c:2231 src/qemu/qemu_monitor.c:2257
-#: src/qemu/qemu_monitor.c:2277 src/qemu/qemu_monitor.c:2296
-#: src/qemu/qemu_monitor.c:2315 src/qemu/qemu_monitor.c:2338
-#: src/qemu/qemu_monitor.c:2372 src/qemu/qemu_monitor.c:2393
-#: src/qemu/qemu_monitor.c:2412 src/qemu/qemu_monitor.c:2431
-#: src/qemu/qemu_monitor.c:2450 src/qemu/qemu_monitor.c:2474
-#: src/qemu/qemu_monitor.c:2541 src/qemu/qemu_monitor.c:2633
+#: src/qemu/qemu_monitor.c:1335 src/qemu/qemu_monitor.c:1381
+#: src/qemu/qemu_monitor.c:1413 src/qemu/qemu_monitor.c:1435
+#: src/qemu/qemu_monitor.c:1454 src/qemu/qemu_monitor.c:1475
+#: src/qemu/qemu_monitor.c:1498 src/qemu/qemu_monitor.c:1521
+#: src/qemu/qemu_monitor.c:1543 src/qemu/qemu_monitor.c:1563
+#: src/qemu/qemu_monitor.c:1583 src/qemu/qemu_monitor.c:1606
+#: src/qemu/qemu_monitor.c:1634 src/qemu/qemu_monitor.c:1667
+#: src/qemu/qemu_monitor.c:1699 src/qemu/qemu_monitor.c:1741
+#: src/qemu/qemu_monitor.c:1806 src/qemu/qemu_monitor.c:1831
+#: src/qemu/qemu_monitor.c:1881 src/qemu/qemu_monitor.c:1902
+#: src/qemu/qemu_monitor.c:1923 src/qemu/qemu_monitor.c:1946
+#: src/qemu/qemu_monitor.c:1969 src/qemu/qemu_monitor.c:1990
+#: src/qemu/qemu_monitor.c:2012 src/qemu/qemu_monitor.c:2034
+#: src/qemu/qemu_monitor.c:2072 src/qemu/qemu_monitor.c:2103
+#: src/qemu/qemu_monitor.c:2142 src/qemu/qemu_monitor.c:2167
+#: src/qemu/qemu_monitor.c:2204 src/qemu/qemu_monitor.c:2225
+#: src/qemu/qemu_monitor.c:2246 src/qemu/qemu_monitor.c:2272
+#: src/qemu/qemu_monitor.c:2292 src/qemu/qemu_monitor.c:2311
+#: src/qemu/qemu_monitor.c:2330 src/qemu/qemu_monitor.c:2353
+#: src/qemu/qemu_monitor.c:2387 src/qemu/qemu_monitor.c:2408
+#: src/qemu/qemu_monitor.c:2427 src/qemu/qemu_monitor.c:2446
+#: src/qemu/qemu_monitor.c:2465 src/qemu/qemu_monitor.c:2489
+#: src/qemu/qemu_monitor.c:2556 src/qemu/qemu_monitor.c:2681
 msgid "monitor must not be NULL"
 msgstr ""
 
@@ -10633,21 +11142,21 @@
 msgid "monitor || name must not be NULL"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1343
+#: src/qemu/qemu_monitor.c:1358
 #, c-format
 msgid "unsupported protocol type %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:1732
+#: src/qemu/qemu_monitor.c:1747
 #, c-format
 msgid "file offset must be a multiple of %llu"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2025
+#: src/qemu/qemu_monitor.c:2040
 msgid "fd must be valid"
 msgstr ""
 
-#: src/qemu/qemu_monitor.c:2031
+#: src/qemu/qemu_monitor.c:2046
 #, c-format
 msgid "qemu is not using a unix socket monitor, cannot send fd %s"
 msgstr ""
@@ -10685,12 +11194,12 @@
 msgid "unable to execute QEMU command '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:384
+#: src/qemu/qemu_monitor_json.c:388
 #, c-format
 msgid "argument key '%s' is too short, missing type prefix"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:433
+#: src/qemu/qemu_monitor_json.c:442
 #, c-format
 msgid "unsupported data type '%c' for arg '%s'"
 msgstr ""
@@ -10724,7 +11233,7 @@
 msgid "cpu information was empty"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2557
+#: src/qemu/qemu_monitor_json.c:1062 src/qemu/qemu_monitor_json.c:2589
 msgid "character device information was missing array element"
 msgstr ""
 
@@ -10799,25 +11308,32 @@
 msgid "cannot find info for device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:649
+#: src/qemu/qemu_monitor_json.c:1497 src/qemu/qemu_monitor_json.c:1636
+#: src/qemu/qemu_monitor_json.c:1711
 msgid "blockstats reply was missing device list"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:659 src/qemu/qemu_monitor_json.c:665
+#: src/qemu/qemu_monitor_json.c:1507 src/qemu/qemu_monitor_json.c:1513
+#: src/qemu/qemu_monitor_json.c:1644 src/qemu/qemu_monitor_json.c:1722
+#: src/qemu/qemu_monitor_json.c:1728
 msgid "blockstats device entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:676
+#: src/qemu/qemu_monitor_json.c:1531 src/qemu/qemu_monitor_json.c:1651
+#: src/qemu/qemu_monitor_json.c:1753
 msgid "blockstats stats entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:682 src/qemu/qemu_monitor_json.c:688
-#: src/qemu/qemu_monitor_json.c:694 src/qemu/qemu_monitor_json.c:700
+#: src/qemu/qemu_monitor_json.c:1537 src/qemu/qemu_monitor_json.c:1543
+#: src/qemu/qemu_monitor_json.c:1552 src/qemu/qemu_monitor_json.c:1558
+#: src/qemu/qemu_monitor_json.c:1564 src/qemu/qemu_monitor_json.c:1573
+#: src/qemu/qemu_monitor_json.c:1582 src/qemu/qemu_monitor_json.c:1591
+#: src/qemu/qemu_monitor_json.c:1759
 #, c-format
 msgid "cannot read %s statistic"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:708
+#: src/qemu/qemu_monitor_json.c:1599 src/qemu/qemu_monitor_json.c:1767
 #, c-format
 msgid "cannot find statistics for device '%s'"
 msgstr ""
@@ -10826,167 +11342,213 @@
 msgid "blockstats parent entry was not in expected format"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:923
+#: src/qemu/qemu_monitor_json.c:2147
 msgid "info migration reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:929
+#: src/qemu/qemu_monitor_json.c:2153
 msgid "info migration reply was missing return status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:935 src/qemu/qemu_monitor_text.c:969
+#: src/qemu/qemu_monitor_json.c:2159 src/qemu/qemu_monitor_text.c:1541
+#: src/qemu/qemu_monitor_text.c:1548
 #, c-format
 msgid "unexpected migration status in %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:943
+#: src/qemu/qemu_monitor_json.c:2167
 msgid "migration was active, but no RAM info was set"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:949
+#: src/qemu/qemu_monitor_json.c:2174
 msgid "migration was active, but RAM 'transferred' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:954
+#: src/qemu/qemu_monitor_json.c:2180
 msgid "migration was active, but RAM 'remaining' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:959
+#: src/qemu/qemu_monitor_json.c:2186
 msgid "migration was active, but RAM 'total' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2166
+#: src/qemu/qemu_monitor_json.c:2198
 msgid "disk migration was active, but 'transferred' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2173
+#: src/qemu/qemu_monitor_json.c:2205
 msgid "disk migration was active, but 'remaining' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2180
+#: src/qemu/qemu_monitor_json.c:2212
 msgid "disk migration was active, but 'total' data was missing"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2309 src/qemu/qemu_monitor_json.c:2319
-#: src/qemu/qemu_monitor_json.c:2329
+#: src/qemu/qemu_monitor_json.c:2341 src/qemu/qemu_monitor_json.c:2351
+#: src/qemu/qemu_monitor_json.c:2361
 msgid "usb_add not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2339 src/qemu/qemu_monitor_json.c:2350
-#: src/qemu/qemu_monitor_json.c:2360 src/qemu/qemu_monitor_json.c:2626
+#: src/qemu/qemu_monitor_json.c:2371 src/qemu/qemu_monitor_json.c:2382
+#: src/qemu/qemu_monitor_json.c:2392 src/qemu/qemu_monitor_json.c:2658
 msgid "pci_add not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2369
+#: src/qemu/qemu_monitor_json.c:2401
 msgid "pci_del not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2541
+#: src/qemu/qemu_monitor_json.c:2573
 msgid "character device reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2547
+#: src/qemu/qemu_monitor_json.c:2579
 msgid "character device information was not an array"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2563 src/qemu/qemu_monitor_json.c:2569
+#: src/qemu/qemu_monitor_json.c:2595 src/qemu/qemu_monitor_json.c:2601
 msgid "character device information was missing filename"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1744
+#: src/qemu/qemu_monitor_json.c:2614 src/qemu/qemu_monitor_text.c:2398
 #, c-format
 msgid "failed to save chardev path '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2640
+#: src/qemu/qemu_monitor_json.c:2672
 msgid "drive_add reply was missing device address"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2646
+#: src/qemu/qemu_monitor_json.c:2678
 msgid "drive_add reply was missing device bus number"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2652
+#: src/qemu/qemu_monitor_json.c:2684
 msgid "drive_add reply was missing device unit number"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2703
+#: src/qemu/qemu_monitor_json.c:2735
 msgid "query-pci not suppported in JSON mode"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:2822
+#: src/qemu/qemu_monitor_json.c:2854
 msgid ""
 "deleting disk is not supported.  This may leak data if disk is reassigned"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3007
+#: src/qemu/qemu_monitor_json.c:3039
 msgid ""
 "HMP passthrough is not supported by qemu process; only QMP commands can be "
 "used"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3107
+#: src/qemu/qemu_monitor_json.c:3139
 msgid "entry was missing 'device'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3116
+#: src/qemu/qemu_monitor_json.c:3148
 msgid "entry was missing 'type'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3126
+#: src/qemu/qemu_monitor_json.c:3158
 msgid "entry was missing 'speed'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3133
+#: src/qemu/qemu_monitor_json.c:3165
 msgid "entry was missing 'offset'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3139
+#: src/qemu/qemu_monitor_json.c:3171
 msgid "entry was missing 'len'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3161
+#: src/qemu/qemu_monitor_json.c:3193
 msgid "reply was missing return data"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3167
+#: src/qemu/qemu_monitor_json.c:3199
 msgid "urecognized format of block job information"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3173
+#: src/qemu/qemu_monitor_json.c:3205
 msgid "unable to determine array size"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3181
+#: src/qemu/qemu_monitor_json.c:3213
 msgid "missing array element"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3229 src/qemu/qemu_monitor_text.c:3316
+#: src/qemu/qemu_monitor_json.c:3261 src/qemu/qemu_monitor_json.c:3437
+#: src/qemu/qemu_monitor_json.c:3470 src/qemu/qemu_monitor_text.c:3349
 #, c-format
 msgid "No active operation on device: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3232 src/qemu/qemu_monitor_text.c:3308
+#: src/qemu/qemu_monitor_json.c:3264 src/qemu/qemu_monitor_text.c:3341
 #, c-format
 msgid "Device %s in use"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3235 src/qemu/qemu_monitor_text.c:3328
+#: src/qemu/qemu_monitor_json.c:3267 src/qemu/qemu_monitor_json.c:3440
+#: src/qemu/qemu_monitor_json.c:3473 src/qemu/qemu_monitor_text.c:3361
 #, c-format
 msgid "Operation is not supported for device: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3238 src/qemu/qemu_monitor_text.c:3388
+#: src/qemu/qemu_monitor_json.c:3270 src/qemu/qemu_monitor_text.c:3421
+#: src/qemu/qemu_monitor_text.c:3497 src/qemu/qemu_monitor_text.c:3603
 #, c-format
 msgid "Command '%s' is not found"
 msgstr ""
 
-#: src/qemu/qemu_monitor_json.c:3241
+#: src/qemu/qemu_monitor_json.c:3273 src/qemu/qemu_monitor_json.c:3443
+#: src/qemu/qemu_monitor_json.c:3476
 msgid "Unexpected error"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:173
-msgid "Password request seen, but no handler available"
+#: src/qemu/qemu_monitor_json.c:3327
+msgid " block_io_throttle reply was missing device list"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3338 src/qemu/qemu_monitor_json.c:3344
+msgid "block io throttle device entry was not in expected format"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3358
+msgid "block io throttle inserted entry was not in expected format"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3364
+msgid "cannot read total_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3370
+msgid "cannot read read_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3376
+msgid "cannot read write_bytes_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3382
+msgid "cannot read total_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3388
+msgid "cannot read read_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3394
+msgid "cannot read write_iops_sec"
+msgstr ""
+
+#: src/qemu/qemu_monitor_json.c:3402
+#, c-format
+msgid "cannot find throttling info for device '%s'"
+msgstr ""
+
+#: src/qemu/qemu_monitor_text.c:173
+msgid "Password request seen, but no handler available"
 msgstr ""
 
 #: src/qemu/qemu_monitor_text.c:321
@@ -10994,7 +11556,7 @@
 msgid "Unable to extract disk path from %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:354
+#: src/qemu/qemu_monitor_text.c:389
 msgid "cannot stop CPU execution"
 msgstr ""
 
@@ -11007,7 +11569,7 @@
 msgid "unexpected reply from info status: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:367
+#: src/qemu/qemu_monitor_text.c:450
 msgid "system shutdown operation failed"
 msgstr ""
 
@@ -11027,7 +11589,7 @@
 msgid "system reset operation failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:386
+#: src/qemu/qemu_monitor_text.c:528
 msgid "cannot run monitor command to fetch CPU thread info"
 msgstr ""
 
@@ -11035,7 +11597,7 @@
 msgid "could not query kvm status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:534
+#: src/qemu/qemu_monitor_text.c:716
 msgid "could not query memory balloon allocation"
 msgstr ""
 
@@ -11044,7 +11606,7 @@
 msgid "unexpected balloon information '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:571
+#: src/qemu/qemu_monitor_text.c:760
 msgid "could not query memory balloon statistics"
 msgstr ""
 
@@ -11061,15 +11623,15 @@
 msgid "no info for device '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:602
+#: src/qemu/qemu_monitor_text.c:884 src/qemu/qemu_monitor_text.c:1011
 msgid "'info blockstats' command failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:614
+#: src/qemu/qemu_monitor_text.c:896 src/qemu/qemu_monitor_text.c:1023
 msgid "'info blockstats' not supported by this qemu"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:678
+#: src/qemu/qemu_monitor_text.c:994
 #, c-format
 msgid "no stats found for device %s"
 msgstr ""
@@ -11078,855 +11640,876 @@
 msgid "unable to query block extent with this QEMU"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:725
+#: src/qemu/qemu_monitor_text.c:1095
+msgid "failed to resize block"
+msgstr ""
+
+#: src/qemu/qemu_monitor_text.c:1151
 msgid "setting VNC password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1143
+#: src/qemu/qemu_monitor_text.c:1176
 msgid "setting password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1177
+#: src/qemu/qemu_monitor_text.c:1210
 msgid "expiring password failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:754
+#: src/qemu/qemu_monitor_text.c:1249
 msgid "could not balloon memory allocation"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1253
+#: src/qemu/qemu_monitor_text.c:1286
 msgid "could not change CPU online status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:787 src/qemu/qemu_monitor_text.c:831
+#: src/qemu/qemu_monitor_text.c:1321
 #, c-format
 msgid "could not eject media on %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:796 src/qemu/qemu_monitor_text.c:840
+#: src/qemu/qemu_monitor_text.c:1330
 #, c-format
 msgid "could not eject media on %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1332
+#: src/qemu/qemu_monitor_text.c:1365
 #, c-format
 msgid "could not change media on %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1341 src/qemu/qemu_monitor_text.c:1348
+#: src/qemu/qemu_monitor_text.c:1374 src/qemu/qemu_monitor_text.c:1381
 #, c-format
 msgid "could not change media on %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1384
+#: src/qemu/qemu_monitor_text.c:1417
 #, c-format
 msgid "could not save memory region to '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1431
+#: src/qemu/qemu_monitor_text.c:1464
 msgid "could not restrict migration speed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1458
+#: src/qemu/qemu_monitor_text.c:1491
 msgid "could not set maximum migration downtime"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:958
+#: src/qemu/qemu_monitor_text.c:1532
 msgid "cannot query migration status"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:982
+#: src/qemu/qemu_monitor_text.c:1561
 #, c-format
 msgid "cannot parse migration data transferred statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:993
+#: src/qemu/qemu_monitor_text.c:1574
 #, c-format
 msgid "cannot parse migration data remaining statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1004
+#: src/qemu/qemu_monitor_text.c:1587
 #, c-format
 msgid "cannot parse migration data total statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1570
+#: src/qemu/qemu_monitor_text.c:1603
 #, c-format
 msgid "cannot parse disk migration data transferred statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1583
+#: src/qemu/qemu_monitor_text.c:1616
 #, c-format
 msgid "cannot parse disk migration data remaining statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1596
+#: src/qemu/qemu_monitor_text.c:1629
 #, c-format
 msgid "cannot parse disk migration data total statistic %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1048
+#: src/qemu/qemu_monitor_text.c:1683
 #, c-format
 msgid "unable to start migration to %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1055
+#: src/qemu/qemu_monitor_text.c:1690
 #, c-format
 msgid "migration to '%s' failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1062
+#: src/qemu/qemu_monitor_text.c:1697
 #, c-format
 msgid "migration to '%s' not supported by this qemu: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1159
+#: src/qemu/qemu_monitor_text.c:1718
 msgid "cannot run monitor command to cancel migration"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1714
+#: src/qemu/qemu_monitor_text.c:1747
 msgid "cannot run monitor command to relocate graphics client"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1188
+#: src/qemu/qemu_monitor_text.c:1778
 msgid "cannot run monitor command to add usb disk"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1196
+#: src/qemu/qemu_monitor_text.c:1786
 #, c-format
 msgid "unable to add USB disk %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1223
+#: src/qemu/qemu_monitor_text.c:1814
 msgid "cannot attach usb device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1231
+#: src/qemu/qemu_monitor_text.c:1822
 msgid "adding usb device failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1371
+#: src/qemu/qemu_monitor_text.c:1955
 msgid "cannot attach host pci device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1386 src/qemu/qemu_monitor_text.c:1478
+#: src/qemu/qemu_monitor_text.c:1967 src/qemu/qemu_monitor_text.c:2054
 #, c-format
 msgid "parsing pci_add reply failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1426
+#: src/qemu/qemu_monitor_text.c:2006
 #, c-format
 msgid "cannot attach %s disk %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1440
+#: src/qemu/qemu_monitor_text.c:2019
 #, c-format
 msgid "adding %s disk failed %s: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1471
+#: src/qemu/qemu_monitor_text.c:2048
 #, c-format
 msgid "failed to add NIC with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1517
+#: src/qemu/qemu_monitor_text.c:2092
 msgid "failed to remove PCI device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1536
+#: src/qemu/qemu_monitor_text.c:2111
 #, c-format
 msgid "failed to detach PCI device, invalid address %.4x:%.2x:%.2x: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1565
+#: src/qemu/qemu_monitor_text.c:2140
 #, c-format
 msgid "failed to pass fd to qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1573
+#: src/qemu/qemu_monitor_text.c:2148
 #, c-format
 msgid "qemu does not support sending of file handles: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2122
+#: src/qemu/qemu_monitor_text.c:2155
 #, c-format
 msgid "unable to send file handle '%s': %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1601 src/qemu/qemu_monitor_text.c:1637
+#: src/qemu/qemu_monitor_text.c:2183
 #, c-format
 msgid "failed to close fd in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1609
+#: src/qemu/qemu_monitor_text.c:2191
 #, c-format
 msgid "qemu does not support closing of file handles: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2186
+#: src/qemu/qemu_monitor_text.c:2219
 #, c-format
 msgid "failed to add host net with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2192
+#: src/qemu/qemu_monitor_text.c:2225
 #, c-format
 msgid "unable to add host net: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:1667
+#: src/qemu/qemu_monitor_text.c:2254
 #, c-format
 msgid "failed to remove host network in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2250
+#: src/qemu/qemu_monitor_text.c:2283
 #, c-format
 msgid "failed to add netdev with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2279
+#: src/qemu/qemu_monitor_text.c:2312
 #, c-format
 msgid "failed to remove netdev in qemu with '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2314
+#: src/qemu/qemu_monitor_text.c:2347
 msgid "failed to retrieve chardev info in qemu with 'info chardev'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2399
+#: src/qemu/qemu_monitor_text.c:2432
 #, c-format
 msgid "cannot attach %s disk controller"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2412
+#: src/qemu/qemu_monitor_text.c:2445
 #, c-format
 msgid "adding %s disk controller failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2498
+#: src/qemu/qemu_monitor_text.c:2531
 #, c-format
 msgid "failed to attach drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2504 src/qemu/qemu_monitor_text.c:2781
+#: src/qemu/qemu_monitor_text.c:2537 src/qemu/qemu_monitor_text.c:2814
 msgid "drive hotplug is not supported"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2516
+#: src/qemu/qemu_monitor_text.c:2549
 #, c-format
 msgid "adding %s disk failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2571
+#: src/qemu/qemu_monitor_text.c:2604
 #, c-format
 msgid "cannot parse value for %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2589
+#: src/qemu/qemu_monitor_text.c:2622
 msgid "cannot query PCI addresses"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2682
+#: src/qemu/qemu_monitor_text.c:2715
 #, c-format
 msgid "cannot detach %s device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2688
+#: src/qemu/qemu_monitor_text.c:2721
 #, c-format
 msgid "detaching %s device failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2722
+#: src/qemu/qemu_monitor_text.c:2755
 #, c-format
 msgid "cannot attach %s device"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2738
+#: src/qemu/qemu_monitor_text.c:2771
 #, c-format
 msgid "adding %s device failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2775
+#: src/qemu/qemu_monitor_text.c:2808
 #, c-format
 msgid "failed to add drive '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2787
+#: src/qemu/qemu_monitor_text.c:2820
 msgid "open disk image file failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2823
+#: src/qemu/qemu_monitor_text.c:2856
 #, c-format
 msgid "cannot delete %s drive"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2828
+#: src/qemu/qemu_monitor_text.c:2861
 msgid ""
 "deleting drive is not supported.  This may leak data if disk is reassigned"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2840
+#: src/qemu/qemu_monitor_text.c:2873
 #, c-format
 msgid "deleting %s drive failed: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2876
+#: src/qemu/qemu_monitor_text.c:2909
 msgid "failed to set disk password"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2882
+#: src/qemu/qemu_monitor_text.c:2915
 msgid "setting disk password is not supported"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2886
+#: src/qemu/qemu_monitor_text.c:2919
 msgid "the disk password is incorrect"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2914 src/qemu/qemu_monitor_text.c:3066
+#: src/qemu/qemu_monitor_text.c:2947 src/qemu/qemu_monitor_text.c:3099
 #, c-format
 msgid "failed to take snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2920 src/qemu/qemu_monitor_text.c:3073
+#: src/qemu/qemu_monitor_text.c:2953 src/qemu/qemu_monitor_text.c:3106
 #, c-format
 msgid "Failed to take snapshot: %s"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2925
+#: src/qemu/qemu_monitor_text.c:2958
 msgid "this domain does not have a device to take snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2962
+#: src/qemu/qemu_monitor_text.c:2995
 #, c-format
 msgid "failed to restore snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2969
+#: src/qemu/qemu_monitor_text.c:3002
 msgid "this domain does not have a device to load snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:2974
+#: src/qemu/qemu_monitor_text.c:3007
 #, c-format
 msgid "the snapshot '%s' does not exist, and was not loaded"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3020
+#: src/qemu/qemu_monitor_text.c:3053
 #, c-format
 msgid "failed to delete snapshot using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3027
+#: src/qemu/qemu_monitor_text.c:3060
 msgid "this domain does not have a device to delete snapshots"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3104
+#: src/qemu/qemu_monitor_text.c:3137
 #, c-format
 msgid "failed to run cmd '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3134
+#: src/qemu/qemu_monitor_text.c:3167
 #, c-format
 msgid "failed to inject NMI using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3156
+#: src/qemu/qemu_monitor_text.c:3189
 #, c-format
 msgid "keycode %d is invalid: 0x%X"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3178
+#: src/qemu/qemu_monitor_text.c:3211
 #, c-format
 msgid "failed to send key using command '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3185
+#: src/qemu/qemu_monitor_text.c:3218
 #, c-format
 msgid "failed to send key '%s'"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3211
+#: src/qemu/qemu_monitor_text.c:3244
 msgid "taking screenshot failed"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3302
+#: src/qemu/qemu_monitor_text.c:3335
 msgid "Device not found"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3381
+#: src/qemu/qemu_monitor_text.c:3414 src/qemu/qemu_monitor_text.c:3490
+#: src/qemu/qemu_monitor_text.c:3596
 msgid "cannot run monitor command"
 msgstr ""
 
-#: src/qemu/qemu_monitor_text.c:3418
+#: src/qemu/qemu_monitor_text.c:3451
 msgid "adding graphics client failed"
 msgstr ""
 
-#: src/qemu/qemu_process.c:201
+#: src/qemu/qemu_monitor_text.c:3580
+#, c-format
+msgid "No info for device '%s'"
+msgstr ""
+
+#: src/qemu/qemu_process.c:202
 #, c-format
 msgid "no disk found with path %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:224
+#: src/qemu/qemu_process.c:225
 #, c-format
 msgid "no disk found with alias %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:244
+#: src/qemu/qemu_process.c:245
 #, c-format
 msgid "disk %s does not have any encryption information"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:737
+#: src/qemu/qemu_process.c:253
 msgid "cannot find secrets without a connection"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:745 src/storage/storage_backend.c:387
+#: src/qemu/qemu_process.c:261 src/storage/storage_backend.c:465
 msgid "secret storage not supported"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:758
+#: src/qemu/qemu_process.c:270
 #, c-format
 msgid "invalid <encryption> for volume %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:776
+#: src/qemu/qemu_process.c:288
 #, c-format
 msgid "format='qcow' passphrase for %s must not contain a '\\0'"
 msgstr ""
 
-#: src/qemu/qemu_process.c:452
+#: src/qemu/qemu_process.c:447
 msgid "Failed to create reboot thread, killing domain"
 msgstr ""
 
-#: src/qemu/qemu_process.c:843
+#: src/qemu/qemu_process.c:877
 #, c-format
 msgid "Failed to set security context for monitor for %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:876
+#: src/qemu/qemu_process.c:910
 #, c-format
 msgid "Failed to clear security context for monitor for %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1326
+#: src/qemu/qemu_process.c:976
 #, c-format
 msgid "Failure while reading %s log output"
 msgstr ""
 
-#: src/qemu/qemu_process.c:964
+#: src/qemu/qemu_process.c:998
 #, c-format
 msgid "Out of space while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:971
+#: src/qemu/qemu_process.c:1005
 #, c-format
 msgid "Process exited while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:986
+#: src/qemu/qemu_process.c:1020
 #, c-format
 msgid "Timed out while reading %s log output: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1432
+#: src/qemu/qemu_process.c:1107
 #, c-format
 msgid "no assigned pty for device %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1255
+#: src/qemu/qemu_process.c:1300
 #, c-format
 msgid "process exited while connecting to monitor: %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:1593
+#: src/qemu/qemu_process.c:1350
 #, c-format
 msgid "got wrong number of vCPU pids from QEMU monitor. got %d, wanted %d"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1341
-msgid "Host kernel is not aware of NUMA."
-msgstr ""
-
-#: src/qemu/qemu_process.c:1353
-#, c-format
-msgid "Host cannot support NUMA node %d"
-msgstr ""
-
-#: src/qemu/qemu_process.c:1382
-msgid "NUMA memory tuning in 'preferred' mode only supports single node"
-msgstr ""
-
-#: src/qemu/qemu_process.c:1396
+#: src/qemu/qemu_process.c:1441
 msgid "Invalid mode for memory NUMA tuning."
 msgstr ""
 
-#: src/qemu/qemu_process.c:1411
+#: src/qemu/qemu_process.c:1456
 msgid "libvirt is compiled without NUMA tuning support"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1492
+#: src/qemu/qemu_process.c:1537
 msgid "Setting of link state is not supported by this qemu"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1501
+#: src/qemu/qemu_process.c:1546
 #, c-format
 msgid "Couldn't set link state on interface: %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1902
+#: src/qemu/qemu_process.c:1947
 #, c-format
 msgid "cannot find PCI address for VirtIO disk %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1916
+#: src/qemu/qemu_process.c:1961
 #, c-format
 msgid "cannot find PCI address for %s NIC"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1930
+#: src/qemu/qemu_process.c:1975
 #, c-format
 msgid "cannot find PCI address for controller %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1944
+#: src/qemu/qemu_process.c:1989
 #, c-format
 msgid "cannot find PCI address for video adapter %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1958
+#: src/qemu/qemu_process.c:2003
 #, c-format
 msgid "cannot find PCI address for sound adapter %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1971
+#: src/qemu/qemu_process.c:2016
 #, c-format
 msgid "cannot find PCI address for watchdog %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:1983
+#: src/qemu/qemu_process.c:2028
 #, c-format
 msgid "cannot find PCI address for balloon %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2102
+#: src/qemu/qemu_process.c:2147
 #, c-format
 msgid "Unable to pre-create chardev file '%s'"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2122
+#: src/qemu/qemu_process.c:2167
 #, c-format
 msgid "cannot limit number of processes to %d"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2773
+#: src/qemu/qemu_process.c:2843
 msgid "Could not create thread. QEMU initialization might be incomplete"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2374 src/uml/uml_driver.c:823
+#: src/qemu/qemu_process.c:2909 src/qemu/qemu_process.c:3579
+#: src/uml/uml_driver.c:983
 msgid "VM is already active"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2914
+#: src/qemu/qemu_process.c:2984
 msgid "Unable to find an unused SPICE port"
 msgstr ""
 
-#: src/qemu/qemu_process.c:2922
+#: src/qemu/qemu_process.c:2992
 msgid "Unable to find an unused SPICE TLS port"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2403 src/uml/uml_driver.c:845
+#: src/qemu/qemu_process.c:3005 src/qemu/qemu_process.c:3595
+#: src/uml/uml_driver.c:1005
 #, c-format
 msgid "cannot create log directory %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2459
+#: src/qemu/qemu_process.c:3054
 msgid "Failed to build pidfile path."
 msgstr ""
 
-#: src/qemu/qemu_process.c:2991
+#: src/qemu/qemu_process.c:3061
 #, c-format
 msgid "Cannot remove stale PID file %s"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3086
+#: src/qemu/qemu_process.c:3156
 #, c-format
 msgid "Domain %s didn't show up"
 msgstr ""
 
-#: src/qemu/qemu_process.c:3133
+#: src/qemu/qemu_process.c:3203
 #, c-format
 msgid "cannot stat fd %d"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2635
+#: src/qemu/qemu_process.c:3426
 #, c-format
 msgid "failed to remove ebtables rule to allow MAC address on  '%s'"
 msgstr ""
 
-#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1192
-#: src/remote/remote_client_bodies.h:1231
-#: src/remote/remote_client_bodies.h:1299
-#: src/remote/remote_client_bodies.h:1471
-#: src/remote/remote_client_bodies.h:1505
-#: src/remote/remote_client_bodies.h:1841
-#: src/remote/remote_client_bodies.h:4882
+#: src/remote/remote_client_bodies.h:17 src/remote/remote_client_bodies.h:1219
+#: src/remote/remote_client_bodies.h:1258
+#: src/remote/remote_client_bodies.h:1326
+#: src/remote/remote_client_bodies.h:1498
+#: src/remote/remote_client_bodies.h:1532
+#: src/remote/remote_client_bodies.h:1868
+#: src/remote/remote_client_bodies.h:4967
 #, c-format
 msgid "%s length greater than maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_client_bodies.h:2319
-#: src/remote/remote_client_bodies.h:2338
-#: src/remote/remote_client_bodies.h:2382
-#: src/remote/remote_client_bodies.h:2401
-#: src/remote/remote_client_bodies.h:3126
-#: src/remote/remote_client_bodies.h:3143
-#: src/remote/remote_client_bodies.h:3187
-#: src/remote/remote_client_bodies.h:3204
-#: src/remote/remote_client_bodies.h:3248
-#: src/remote/remote_client_bodies.h:3265
-#: src/remote/remote_client_bodies.h:3309
-#: src/remote/remote_client_bodies.h:3326
-#: src/remote/remote_client_bodies.h:3370
-#: src/remote/remote_client_bodies.h:3387
-#: src/remote/remote_client_bodies.h:3431
-#: src/remote/remote_client_bodies.h:3448
-#: src/remote/remote_client_bodies.h:3492
-#: src/remote/remote_client_bodies.h:3509
-#: src/remote/remote_client_bodies.h:3553
-#: src/remote/remote_client_bodies.h:3570
-#: src/remote/remote_client_bodies.h:3614
-#: src/remote/remote_client_bodies.h:3631
-#: src/remote/remote_client_bodies.h:4130
-#: src/remote/remote_client_bodies.h:4148
-#: src/remote/remote_client_bodies.h:4303
-#: src/remote/remote_client_bodies.h:4322
-#: src/remote/remote_client_bodies.h:5240
-#: src/remote/remote_client_bodies.h:5258
+#: src/remote/remote_client_bodies.h:2378
+#: src/remote/remote_client_bodies.h:2397
+#: src/remote/remote_client_bodies.h:2441
+#: src/remote/remote_client_bodies.h:2460
+#: src/remote/remote_client_bodies.h:3185
+#: src/remote/remote_client_bodies.h:3202
+#: src/remote/remote_client_bodies.h:3246
+#: src/remote/remote_client_bodies.h:3263
+#: src/remote/remote_client_bodies.h:3307
+#: src/remote/remote_client_bodies.h:3324
+#: src/remote/remote_client_bodies.h:3368
+#: src/remote/remote_client_bodies.h:3385
+#: src/remote/remote_client_bodies.h:3429
+#: src/remote/remote_client_bodies.h:3446
+#: src/remote/remote_client_bodies.h:3490
+#: src/remote/remote_client_bodies.h:3507
+#: src/remote/remote_client_bodies.h:3551
+#: src/remote/remote_client_bodies.h:3568
+#: src/remote/remote_client_bodies.h:3612
+#: src/remote/remote_client_bodies.h:3629
+#: src/remote/remote_client_bodies.h:3673
+#: src/remote/remote_client_bodies.h:3690
+#: src/remote/remote_client_bodies.h:4189
+#: src/remote/remote_client_bodies.h:4207
+#: src/remote/remote_client_bodies.h:4362
+#: src/remote/remote_client_bodies.h:4381
+#: src/remote/remote_client_bodies.h:5325
+#: src/remote/remote_client_bodies.h:5343
 #, c-format
 msgid "too many remote undefineds: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:349
+#: src/remote/remote_driver.c:354
 #, c-format
 msgid "using unix socket and remote server '%s' is not supported."
 msgstr ""
 
-#: src/remote/remote_driver.c:411
+#: src/remote/remote_driver.c:369
 msgid ""
 "remote_open: transport in URL not recognised (should be tls|unix|ssh|ext|tcp)"
 msgstr ""
 
-#: src/remote/remote_driver.c:569
+#: src/remote/remote_driver.c:539
 msgid "remote_open: for 'ext' transport, command is required"
 msgstr ""
 
-#: src/remote/remote_driver.c:816
+#: src/remote/remote_driver.c:596
+msgid "Unable to locate libvirtd daemon in $PATH"
+msgstr ""
+
+#: src/remote/remote_driver.c:651
 msgid "transport methods unix, ssh and ext are not supported under Windows"
 msgstr ""
 
-#: src/remote/remote_driver.c:1050
+#: src/remote/remote_driver.c:1078
 msgid "remoteNodeGetCPUStats: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1069 src/remote/remote_driver.c:1133
+#: src/remote/remote_driver.c:1097 src/remote/remote_driver.c:1161
 #, c-format
 msgid "Stats %s too big for destination"
 msgstr ""
 
-#: src/remote/remote_driver.c:1114
+#: src/remote/remote_driver.c:1142
 msgid "remoteNodeGetMemoryStats: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1760
+#: src/remote/remote_driver.c:1194
 #, c-format
 msgid "too many NUMA cells: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:1823 src/remote/remote_driver.c:1837
+#: src/remote/remote_driver.c:1233 src/remote/remote_driver.c:1247
 #, c-format
 msgid "too many remote domain IDs: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:1327
+#: src/remote/remote_driver.c:1365
 msgid "returned number of parameters exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:1410
+#: src/remote/remote_driver.c:1462
 msgid "remoteDomainBlockStatsFlags: returned number of stats exceeds limit"
 msgstr ""
 
-#: src/remote/remote_driver.c:2428
+#: src/remote/remote_driver.c:1609 src/remote/remote_driver.c:1682
 #, c-format
 msgid "vCPU count exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2434
+#: src/remote/remote_driver.c:1617 src/remote/remote_driver.c:1689
 #, c-format
 msgid "vCPU map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2451
+#: src/remote/remote_driver.c:1638 src/remote/remote_driver.c:1706
 #, c-format
 msgid "host reports too many vCPUs: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2457
+#: src/remote/remote_driver.c:1645 src/remote/remote_driver.c:1712
 #, c-format
 msgid "host reports map buffer length exceeds maximum: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:2532
+#: src/remote/remote_driver.c:1762
 #, c-format
 msgid "security label exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:2567
+#: src/remote/remote_driver.c:1833
 #, c-format
 msgid "security model exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:2576
+#: src/remote/remote_driver.c:1842
 #, c-format
 msgid "security doi exceeds maximum: %zd"
 msgstr ""
 
-#: src/remote/remote_driver.c:1876
+#: src/remote/remote_driver.c:1928
 msgid "caller ignores cookie or cookielen"
 msgstr ""
 
-#: src/remote/remote_driver.c:1885 src/remote/remote_driver.c:3881
+#: src/remote/remote_driver.c:1937 src/remote/remote_driver.c:3988
 msgid "caller ignores uri_out"
 msgstr ""
 
-#: src/remote/remote_driver.c:3384
+#: src/remote/remote_driver.c:2040
 #, c-format
 msgid "too many memory stats requested: %d > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3428
+#: src/remote/remote_driver.c:2084
 #, c-format
 msgid "block peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3449 src/remote/remote_driver.c:3500
+#: src/remote/remote_driver.c:2105 src/remote/remote_driver.c:2156
 msgid "returned buffer is not same size as requested"
 msgstr ""
 
-#: src/remote/remote_driver.c:3480
+#: src/remote/remote_driver.c:2136
 #, c-format
 msgid "memory peek request too large for remote protocol, %zi > %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6027
+#: src/remote/remote_driver.c:2556
 #, c-format
 msgid "unknown authentication type %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:6037
+#: src/remote/remote_driver.c:2565
 #, c-format
 msgid "requested authentication type %s rejected"
 msgstr ""
 
-#: src/remote/remote_driver.c:6078
+#: src/remote/remote_driver.c:2604
 #, c-format
 msgid "unsupported authentication type %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6425
+#: src/remote/remote_driver.c:2859
 #, c-format
 msgid "SASL mechanism %s not supported by server"
 msgstr ""
 
-#: src/remote/remote_driver.c:6462 src/remote/remote_driver.c:6540
+#: src/remote/remote_driver.c:2886 src/remote/remote_driver.c:2956
 msgid "Failed to make auth credentials"
 msgstr ""
 
-#: src/remote/remote_driver.c:2800
+#: src/remote/remote_driver.c:2907
 #, c-format
 msgid "SASL negotiation data too long: %zu bytes"
 msgstr ""
 
-#: src/remote/remote_driver.c:6686
+#: src/remote/remote_driver.c:2965 src/remote/remote_driver.c:3092
 msgid "Failed to collect auth credentials"
 msgstr ""
 
-#: src/remote/remote_driver.c:2860
+#: src/remote/remote_driver.c:2967
 msgid "No authentication callback available"
 msgstr ""
 
-#: src/remote/remote_driver.c:6610
+#: src/remote/remote_driver.c:3019
 #, c-format
 msgid "negotiation SSF %d was not strong enough"
 msgstr ""
 
-#: src/remote/remote_driver.c:6721
+#: src/remote/remote_driver.c:3127 src/remote/remote_driver.c:3767
 msgid "no event support"
 msgstr ""
 
-#: src/remote/remote_driver.c:6726
+#: src/remote/remote_driver.c:3133 src/remote/remote_driver.c:3775
 msgid "adding cb to list"
 msgstr ""
 
-#: src/remote/remote_driver.c:3396
+#: src/remote/remote_driver.c:3503
 msgid "no internalFlags support"
 msgstr ""
 
-#: src/remote/remote_driver.c:3710
+#: src/remote/remote_driver.c:3817
 #, c-format
 msgid "unable to find callback ID %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:3813 src/remote/remote_driver.c:3872
-#: src/remote/remote_driver.c:3954 src/remote/remote_driver.c:4015
-#: src/remote/remote_driver.c:4074
+#: src/remote/remote_driver.c:3920 src/remote/remote_driver.c:3979
+#: src/remote/remote_driver.c:4061 src/remote/remote_driver.c:4122
+#: src/remote/remote_driver.c:4181
 msgid "caller ignores cookieout or cookieoutlen"
 msgstr ""
 
-#: src/remote/remote_driver.c:831
+#: src/remote/remote_driver.c:4275
+msgid ""
+"the caller doesn't support keepalive protocol; perhaps it's missing event "
+"loop implementation"
+msgstr ""
+
+#: src/rpc/virkeepalive.c:337
+msgid "keepalive interval already set"
+msgstr ""
+
+#: src/rpc/virnetclient.c:280
 msgid "unable to make pipe"
 msgstr ""
 
-#: src/rpc/virnetclient.c:426
+#: src/rpc/virnetclient.c:540 src/rpc/virnetclient.c:1556
+msgid "failed to wake up polling thread"
+msgstr ""
+
+#: src/rpc/virnetclient.c:645
 msgid "Unable to read TLS confirmation"
 msgstr ""
 
-#: src/rpc/virnetclient.c:431
+#: src/rpc/virnetclient.c:650
 msgid "server verification (of our certificate or IP address) failed"
 msgstr ""
 
-#: src/rpc/virnetclient.c:568
+#: src/rpc/virnetclient.c:801
 #, c-format
 msgid "no call waiting for reply with prog %d vers %d serial %d"
 msgstr ""
 
-#: src/rpc/virnetclient.c:716
+#: src/rpc/virnetclient.c:954
 #, c-format
 msgid "got unexpected RPC call prog %d vers %d proc %d type %d"
 msgstr ""
 
-#: src/rpc/virnetclient.c:985
+#: src/rpc/virnetclient.c:1382
 msgid "read on wakeup fd failed"
 msgstr ""
 
-#: src/remote/remote_driver.c:8307
+#: src/rpc/virnetclient.c:1402
 msgid "poll on socket failed"
 msgstr ""
 
-#: src/remote/remote_driver.c:8368
+#: src/rpc/virnetclient.c:1450
 msgid "received hangup / error event on socket"
 msgstr ""
 
-#: src/rpc/virnetclient.c:1139
-msgid "failed to wake up polling thread"
-msgstr ""
-
-#: src/remote/remote_driver.c:8462
+#: src/rpc/virnetclient.c:1565
 msgid "failed to wait on condition"
 msgstr ""
 
-#: src/rpc/virnetclient.c:1269
+#: src/rpc/virnetclient.c:1691
 msgid "Attempt to send an asynchronous message with a synchronous reply"
 msgstr ""
 
-#: daemon/libvirtd.c:836
+#: src/rpc/virnetclient.c:1697
+msgid "Attempt to send a non-blocking message with a synchronous reply"
+msgstr ""
+
+#: src/rpc/virnetclient.c:1710
+msgid "client socket is closed"
+msgstr ""
+
+#: src/rpc/virnetclient.c:1716
 msgid "cannot initialize condition variable"
 msgstr ""
 
@@ -11986,11 +12569,11 @@
 msgid "Unexpected message status %d"
 msgstr ""
 
-#: src/rpc/virnetclientstream.c:455
+#: src/rpc/virnetclientstream.c:456
 msgid "multiple stream callbacks not supported"
 msgstr ""
 
-#: src/rpc/virnetclientstream.c:491 src/rpc/virnetclientstream.c:513
+#: src/rpc/virnetclientstream.c:492 src/rpc/virnetclientstream.c:514
 msgid "no stream callback registered"
 msgstr ""
 
@@ -12070,7 +12653,7 @@
 msgid "Unable to duplicate FD %d"
 msgstr ""
 
-#: src/remote/remote_driver.c:6320
+#: src/rpc/virnetsaslcontext.c:61 src/rpc/virnetsaslcontext.c:91
 #, c-format
 msgid "failed to initialize SASL library: %d (%s)"
 msgstr ""
@@ -12086,7 +12669,7 @@
 msgid "Malformed TLS whitelist regular expression '%s'"
 msgstr ""
 
-#: daemon/remote.c:3088
+#: src/rpc/virnetsaslcontext.c:146
 #, c-format
 msgid "SASL client %s not allowed in whitelist"
 msgstr ""
@@ -12095,31 +12678,31 @@
 msgid "Client's username is not on the list of allowed clients"
 msgstr ""
 
-#: src/remote/remote_driver.c:6364
+#: src/rpc/virnetsaslcontext.c:218 src/rpc/virnetsaslcontext.c:264
 #, c-format
 msgid "Failed to create SASL client context: %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6387
+#: src/rpc/virnetsaslcontext.c:293
 #, c-format
 msgid "cannot set external SSF %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:3051
+#: src/rpc/virnetsaslcontext.c:314
 #, c-format
 msgid "cannot query SASL username on connection %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:3059
+#: src/rpc/virnetsaslcontext.c:321
 msgid "no client username was found"
 msgstr ""
 
-#: daemon/remote.c:3012 src/remote/remote_driver.c:6601
+#: src/rpc/virnetsaslcontext.c:342
 #, c-format
 msgid "cannot query SASL ssf on connection %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6406
+#: src/rpc/virnetsaslcontext.c:378
 #, c-format
 msgid "cannot set security props %d (%s)"
 msgstr ""
@@ -12129,12 +12712,13 @@
 msgid "cannot get security props %d (%s)"
 msgstr ""
 
-#: daemon/remote.c:2972
+#: src/rpc/virnetsaslcontext.c:430
 #, c-format
 msgid "cannot list SASL mechanisms %d (%s)"
 msgstr ""
 
-#: src/remote/remote_driver.c:6444
+#: src/rpc/virnetsaslcontext.c:483 src/rpc/virnetsaslcontext.c:578
+#: src/rpc/virnetsaslcontext.c:623
 #, c-format
 msgid "Failed to start SASL negotiation: %d (%s)"
 msgstr ""
@@ -12159,184 +12743,188 @@
 msgid "failed to decode SASL data: %d (%s)"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:122
+#: src/rpc/virnetsocket.c:123
 msgid "Unable to set close-on-exec flag"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:127
+#: src/rpc/virnetsocket.c:128
 msgid "Unable to enable non-blocking flag"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:159
+#: src/rpc/virnetsocket.c:160
 msgid "Unable to disable nagle algorithm"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:212 src/rpc/virnetsocket.c:409
+#: src/rpc/virnetsocket.c:213 src/rpc/virnetsocket.c:410
 #, c-format
 msgid "Unable to resolve address '%s' service '%s': %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:225 src/rpc/virnetsocket.c:420
+#: src/rpc/virnetsocket.c:226 src/rpc/virnetsocket.c:421
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:231
+#: src/rpc/virnetsocket.c:232
 msgid "Unable to enable port reuse"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:248
+#: src/rpc/virnetsocket.c:249
 msgid "Unable to force bind to IPv6 only"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:256 src/rpc/virnetsocket.c:286
+#: src/rpc/virnetsocket.c:257 src/rpc/virnetsocket.c:287
 msgid "Unable to bind to port"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:267 src/rpc/virnetsocket.c:443
-#: src/rpc/virnetsocket.c:516 src/rpc/virnetsocket.c:1251
+#: src/rpc/virnetsocket.c:268 src/rpc/virnetsocket.c:444
+#: src/rpc/virnetsocket.c:523 src/rpc/virnetsocket.c:1272
 msgid "Unable to get local socket name"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:324 src/rpc/virnetsocket.c:484
+#: src/rpc/virnetsocket.c:325 src/rpc/virnetsocket.c:491
 msgid "Failed to create socket"
 msgstr ""
 
-#: daemon/libvirtd.c:552
+#: src/rpc/virnetsocket.c:332 src/rpc/virnetsocket.c:497
 #, c-format
 msgid "Path %s too long for unix socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:344
+#: src/rpc/virnetsocket.c:345
 #, c-format
 msgid "Failed to bind socket to '%s'"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:355
+#: src/rpc/virnetsocket.c:356
 #, c-format
 msgid "Failed to change ownership of '%s' to %d:%d"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:379 src/rpc/virnetsocket.c:536
+#: src/rpc/virnetsocket.c:380 src/rpc/virnetsocket.c:543
 msgid "UNIX sockets are not supported on this platform"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:436
+#: src/rpc/virnetsocket.c:437
 #, c-format
 msgid "unable to connect to server at '%s:%s'"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:449
+#: src/rpc/virnetsocket.c:450
 msgid "Unable to get remote socket name"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:509
+#: src/rpc/virnetsocket.c:486
+msgid "Auto-spawn of daemon requested, but no binary specified"
+msgstr ""
+
+#: src/rpc/virnetsocket.c:516
 #, c-format
 msgid "Failed to connect socket to '%s'"
 msgstr ""
 
-#: src/remote/remote_driver.c:792
+#: src/rpc/virnetsocket.c:565 src/rpc/virnetsocket.c:571
 msgid "unable to create socket pair"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:602
+#: src/rpc/virnetsocket.c:609
 msgid "Tunnelling sockets not supported on this platform"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:779
+#: src/rpc/virnetsocket.c:787
 msgid "Unable to copy socket file handle"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:829
+#: src/rpc/virnetsocket.c:837
 msgid "Failed to get client socket identity"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:847
+#: src/rpc/virnetsocket.c:855
 msgid "Client socket identity not available"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:964
+#: src/rpc/virnetsocket.c:985
 #, c-format
 msgid "Cannot recv data: %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:967
+#: src/rpc/virnetsocket.c:988
 msgid "Cannot recv data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:972
+#: src/rpc/virnetsocket.c:993
 #, c-format
 msgid "End of file while reading data: %s"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:975
+#: src/rpc/virnetsocket.c:996
 msgid "End of file while reading data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1002
+#: src/rpc/virnetsocket.c:1023
 msgid "Cannot write data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1007
+#: src/rpc/virnetsocket.c:1028
 msgid "End of file while writing data"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1153
+#: src/rpc/virnetsocket.c:1174
 msgid "Sending file descriptors is not supported on this socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1164
+#: src/rpc/virnetsocket.c:1185
 #, c-format
 msgid "Failed to send file descriptor %d"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1187
+#: src/rpc/virnetsocket.c:1208
 msgid "Receiving file descriptors is not supported on this socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1197
+#: src/rpc/virnetsocket.c:1218
 msgid "Failed to recv file descriptor"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1214
+#: src/rpc/virnetsocket.c:1235
 msgid "Unable to listen on socket"
 msgstr ""
 
-#: src/rpc/virnetsocket.c:1245
+#: src/rpc/virnetsocket.c:1266
 msgid "Unable to accept client"
 msgstr ""
 
-#: src/rpc/virnetserver.c:241
+#: src/rpc/virnetserver.c:245
 #, c-format
 msgid "Too many active clients (%zu), dropping connection from %s"
 msgstr ""
 
-#: daemon/libvirtd.c:954
+#: src/rpc/virnetserver.c:366
 #, c-format
 msgid "Failed to connect to system bus for PolicyKit auth: %s"
 msgstr ""
 
-#: src/rpc/virnetserver.c:476
+#: src/rpc/virnetserver.c:489
 msgid "Failed to read from signal pipe"
 msgstr ""
 
-#: src/rpc/virnetserver.c:493
+#: src/rpc/virnetserver.c:506
 #, c-format
 msgid "Unexpected signal received: %d"
 msgstr ""
 
-#: src/rpc/virnetserver.c:508
+#: src/rpc/virnetserver.c:521
 msgid "Unable to create signal pipe"
 msgstr ""
 
-#: src/rpc/virnetserver.c:517
+#: src/rpc/virnetserver.c:530
 msgid "Failed to add signal handle watch"
 msgstr ""
 
-#: daemon/libvirtd.c:2236
+#: src/rpc/virnetserver.c:708
 msgid "Failed to register shutdown timeout"
 msgstr ""
 
-#: src/rpc/virnetserverclient.c:750 src/rpc/virnetserverclient.c:909
+#: src/rpc/virnetserverclient.c:788 src/rpc/virnetserverclient.c:947
 #, c-format
 msgid "unexpected zero/negative length request %lld"
 msgstr ""
@@ -12346,7 +12934,7 @@
 msgid "Failed to add watch for fd %d events %d"
 msgstr ""
 
-#: src/rpc/virnetservermdns.c:344
+#: src/rpc/virnetservermdns.c:344 src/util/virtime.c:247
 msgid "Unable to get current time"
 msgstr ""
 
@@ -12365,12 +12953,12 @@
 msgid "Cannot find program %d version %d"
 msgstr ""
 
-#: daemon/dispatch.c:375
+#: src/rpc/virnetserverprogram.c:274
 #, c-format
 msgid "program mismatch (actual %x, expected %x)"
 msgstr ""
 
-#: daemon/dispatch.c:381
+#: src/rpc/virnetserverprogram.c:281
 #, c-format
 msgid "version mismatch (actual %x, expected %x)"
 msgstr ""
@@ -12385,12 +12973,12 @@
 msgid "Unexpected message status %u"
 msgstr ""
 
-#: daemon/dispatch.c:475
+#: src/rpc/virnetserverprogram.c:376
 #, c-format
 msgid "unknown procedure: %d"
 msgstr ""
 
-#: daemon/dispatch.c:467
+#: src/rpc/virnetserverprogram.c:390
 msgid "authentication required"
 msgstr ""
 
@@ -12399,7 +12987,7 @@
 msgid "Cannot read %s '%s'"
 msgstr ""
 
-#: src/remote/remote_driver.c:1296
+#: src/rpc/virnettlscontext.c:114
 msgid "cannot get current time"
 msgstr ""
 
@@ -12518,23 +13106,23 @@
 msgid "Unable to verify client certificate %s against CA certificate %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:1301
+#: src/rpc/virnettlscontext.c:453 src/rpc/virnettlscontext.c:964
 msgid "Invalid certificate"
 msgstr ""
 
-#: src/remote/remote_driver.c:1304
+#: src/rpc/virnettlscontext.c:456 src/rpc/virnettlscontext.c:967
 msgid "The certificate is not trusted."
 msgstr ""
 
-#: src/remote/remote_driver.c:1307
+#: src/rpc/virnettlscontext.c:459 src/rpc/virnettlscontext.c:970
 msgid "The certificate hasn't got a known issuer."
 msgstr ""
 
-#: src/remote/remote_driver.c:1310
+#: src/rpc/virnettlscontext.c:462 src/rpc/virnettlscontext.c:973
 msgid "The certificate has been revoked."
 msgstr ""
 
-#: src/remote/remote_driver.c:1314
+#: src/rpc/virnettlscontext.c:466 src/rpc/virnettlscontext.c:977
 msgid "The certificate uses an insecure algorithm"
 msgstr ""
 
@@ -12638,66 +13226,66 @@
 msgid "TLS handshake failed %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:6377
+#: src/rpc/virnettlscontext.c:1388
 msgid "invalid cipher size for TLS session"
 msgstr ""
 
-#: src/secret/secret_driver.c:170
+#: src/secret/secret_driver.c:176
 #, c-format
 msgid "mkstemp('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:174
+#: src/secret/secret_driver.c:180
 #, c-format
 msgid "fchmod('%s') failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:180
+#: src/secret/secret_driver.c:186
 #, c-format
 msgid "error writing to '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:185
+#: src/secret/secret_driver.c:191
 #, c-format
 msgid "error closing '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:191
+#: src/secret/secret_driver.c:197
 #, c-format
 msgid "rename(%s, %s) failed"
 msgstr ""
 
-#: src/secret/secret_driver.c:242
+#: src/secret/secret_driver.c:247
 #, c-format
 msgid "cannot create '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:349
+#: src/secret/secret_driver.c:354
 #, c-format
 msgid "<uuid> does not match secret file name '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:376 src/secret/secret_driver.c:485
+#: src/secret/secret_driver.c:381 src/secret/secret_driver.c:488
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:380
+#: src/secret/secret_driver.c:385
 #, c-format
 msgid "cannot stat '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:385
+#: src/secret/secret_driver.c:390
 #, c-format
 msgid "'%s' file does not fit in memory"
 msgstr ""
 
-#: src/secret/secret_driver.c:394
+#: src/secret/secret_driver.c:399
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:402
+#: src/secret/secret_driver.c:406
 #, c-format
 msgid "invalid base64 in '%s'"
 msgstr ""
@@ -12707,130 +13295,129 @@
 msgid "Error reading secret: %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:634 src/secret/secret_driver.c:802
-#: src/secret/secret_driver.c:836 src/secret/secret_driver.c:888
-#: src/secret/secret_driver.c:934
+#: src/secret/secret_driver.c:637 src/secret/secret_driver.c:809
+#: src/secret/secret_driver.c:845 src/secret/secret_driver.c:900
+#: src/secret/secret_driver.c:946
 #, c-format
 msgid "no secret with matching uuid '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:661
+#: src/secret/secret_driver.c:664
 #, c-format
 msgid "no secret with matching usage '%s'"
 msgstr ""
 
-#: src/secret/secret_driver.c:701
+#: src/secret/secret_driver.c:706
 #, c-format
 msgid "a secret with UUID %s already defined for use with %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:721
+#: src/secret/secret_driver.c:726
 #, c-format
 msgid "a secret with UUID %s is already defined for use with %s"
 msgstr ""
 
-#: src/secret/secret_driver.c:728
+#: src/secret/secret_driver.c:733
 msgid "cannot change private flag on existing secret"
 msgstr ""
 
-#: src/secret/secret_driver.c:776
+#: src/secret/secret_driver.c:781
 msgid "list of secrets is inconsistent"
 msgstr ""
 
-#: src/secret/secret_driver.c:896
+#: src/secret/secret_driver.c:908
 #, c-format
 msgid "secret '%s' does not have a value"
 msgstr ""
 
-#: src/secret/secret_driver.c:903
+#: src/secret/secret_driver.c:915
 msgid "secret is private"
 msgstr ""
 
-#: src/secret/secret_driver.c:1026
+#: src/secret/secret_driver.c:1038
 msgid "Out of memory initializing secrets"
 msgstr ""
 
-#: src/security/security_apparmor.c:75
+#: src/security/security_apparmor.c:85
 #, c-format
 msgid "Failed to read AppArmor profiles list '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:124
+#: src/security/security_apparmor.c:134
 #, c-format
 msgid "Failed to read '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:268
+#: src/security/security_apparmor.c:242
 msgid "could not find libvirtd"
 msgstr ""
 
-#: src/security/security_apparmor.c:497 src/security/security_apparmor.c:538
+#: src/security/security_apparmor.c:279 src/security/security_apparmor.c:303
+#: src/security/security_apparmor.c:321 src/security/security_apparmor.c:643
 #, c-format
 msgid "cannot update AppArmor profile '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:298
+#: src/security/security_apparmor.c:348
 #, c-format
 msgid "template '%s' does not exist"
 msgstr ""
 
-#: src/security/security_apparmor.c:403
+#: src/security/security_apparmor.c:404
 msgid "Cannot set a base label with AppArmour"
 msgstr ""
 
-#: src/security/security_apparmor.c:334 src/security/security_selinux.c:172
+#: src/security/security_apparmor.c:412 src/security/security_selinux.c:185
 msgid "security label already defined for VM"
 msgstr ""
 
-#: src/security/security_apparmor.c:441
+#: src/security/security_apparmor.c:442
 #, c-format
 msgid "cannot load AppArmor profile '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:402
+#: src/security/security_apparmor.c:493
 msgid "error copying profile name"
 msgstr ""
 
-#: src/security/security_apparmor.c:408
+#: src/security/security_apparmor.c:499
 msgid "error calling profile_status()"
 msgstr ""
 
-#: src/security/security_apparmor.c:431
+#: src/security/security_apparmor.c:538
 #, c-format
 msgid "could not remove profile for '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:457 src/security/security_selinux.c:672
+#: src/security/security_apparmor.c:560 src/security/security_selinux.c:1042
+#: src/security/security_selinux.c:1071 src/security/security_selinux.c:1106
+#: src/security/security_selinux.c:1173 src/security/security_selinux.c:1210
 #, c-format
 msgid ""
 "security label driver mismatch: '%s' model configured for domain, but "
 "hypervisor driver is '%s'."
 msgstr ""
 
-#: src/security/security_apparmor.c:467
+#: src/security/security_apparmor.c:570
 msgid "error calling aa_change_profile()"
 msgstr ""
 
-#: src/security/security_apparmor.c:527
+#: src/security/security_apparmor.c:631
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: src/security/security_apparmor.c:561
+#: src/security/security_apparmor.c:667
 #, c-format
 msgid "Invalid security label '%s'"
 msgstr ""
 
-#: src/security/security_apparmor.c:795
-msgid "could not find path for descriptor"
-msgstr ""
-
 #: src/security/security_dac.c:124
 #, c-format
 msgid "unable to set user and group to '%d:%d' on '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:361
+#: src/security/security_dac.c:143
 #, c-format
 msgid "cannot resolve symlink %s"
 msgstr ""
@@ -12840,22 +13427,22 @@
 msgid "Security driver %s not found"
 msgstr ""
 
-#: src/security/security_selinux.c:114
+#: src/security/security_selinux.c:119
 #, c-format
 msgid "cannot open SELinux virtual domain context file '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:121
+#: src/security/security_selinux.c:126
 #, c-format
 msgid "cannot read SELinux virtual domain context file %s"
 msgstr ""
 
-#: src/security/security_selinux.c:133
+#: src/security/security_selinux.c:138
 #, c-format
 msgid "cannot open SELinux virtual image context file %s"
 msgstr ""
 
-#: src/security/security_selinux.c:140
+#: src/security/security_selinux.c:145
 #, c-format
 msgid "cannot read SELinux virtual image context file %s"
 msgstr ""
@@ -12878,26 +13465,26 @@
 msgid "unable to allocate socket security context '%s'"
 msgstr ""
 
-#: src/security/security_selinux.c:193 src/security/security_selinux.c:199
+#: src/security/security_selinux.c:246 src/security/security_selinux.c:253
 #, c-format
 msgid "cannot generate selinux context for %s"
 msgstr ""
 
-#: src/security/security_selinux.c:230 src/security/security_selinux.c:282
+#: src/security/security_selinux.c:302 src/security/security_selinux.c:370
 #, c-format
 msgid "unable to get PID %d security context"
 msgstr ""
 
-#: src/security/security_selinux.c:289
+#: src/security/security_selinux.c:377
 #, c-format
 msgid "security label exceeds maximum length: %d"
 msgstr ""
 
-#: src/security/security_selinux.c:301
+#: src/security/security_selinux.c:390
 msgid "error calling security_getenforce()"
 msgstr ""
 
-#: src/security/security_selinux.c:335
+#: src/security/security_selinux.c:424
 #, c-format
 msgid "unable to set security context '%s' on '%s'"
 msgstr ""
@@ -12919,12 +13506,12 @@
 msgid "unknown smartcard type %d"
 msgstr ""
 
-#: src/security/security_selinux.c:654
+#: src/security/security_selinux.c:1052
 #, c-format
 msgid "Invalid security label %s"
 msgstr ""
 
-#: src/security/security_selinux.c:682
+#: src/security/security_selinux.c:1081
 #, c-format
 msgid "unable to set security context '%s'"
 msgstr ""
@@ -13104,6 +13691,10 @@
 msgid "Could not find <uuid>"
 msgstr ""
 
+#: src/security/virt-aa-helper.c:647
+msgid "unexpected root element, expecting <domain>"
+msgstr ""
+
 #: src/security/virt-aa-helper.c:657
 msgid "os.type is not 'hvm'"
 msgstr ""
@@ -13112,7 +13703,7 @@
 #: src/security/virt-aa-helper.c:721 src/security/virt-aa-helper.c:815
 #: src/security/virt-aa-helper.c:824 src/security/virt-aa-helper.c:899
 #: src/security/virt-aa-helper.c:1190 src/security/virt-aa-helper.c:1194
-#: src/security/virt-aa-helper.c:1250
+#: src/security/virt-aa-helper.c:1254
 msgid "could not allocate memory"
 msgstr ""
 
@@ -13192,11 +13783,11 @@
 msgid "could not parse arguments"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:1229
+#: src/security/virt-aa-helper.c:1233
 msgid "failed to allocate buffer"
 msgstr ""
 
-#: src/security/virt-aa-helper.c:1260
+#: src/security/virt-aa-helper.c:1264
 msgid "could not create profile"
 msgstr ""
 
@@ -13215,22 +13806,22 @@
 msgid "unable to access disk %s\n"
 msgstr ""
 
-#: src/storage/storage_backend.c:134
+#: src/storage/storage_backend.c:141
 #, c-format
 msgid "could not open input path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:156
+#: src/storage/storage_backend.c:179
 #, c-format
 msgid "failed reading from file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:172 src/storage/storage_backend.c:278
+#: src/storage/storage_backend.c:196 src/storage/storage_backend.c:318
 #, c-format
 msgid "cannot extend file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:178
+#: src/storage/storage_backend.c:203
 #, c-format
 msgid "failed writing to file '%s'"
 msgstr ""
@@ -13240,51 +13831,51 @@
 msgid "cannot sync data to file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:188 src/storage/storage_backend.c:234
-#: src/storage/storage_backend.c:328 src/storage/storage_backend_fs.c:835
-#: src/storage/storage_backend_logical.c:638
+#: src/storage/storage_backend.c:222 src/storage/storage_backend.c:293
+#: src/storage/storage_backend_logical.c:734
 #, c-format
 msgid "cannot close file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:218 src/storage/storage_backend.c:269
-#: src/storage/storage_backend_fs.c:511 src/storage/storage_backend_fs.c:752
+#: src/storage/storage_backend.c:257 src/storage/storage_backend.c:407
+#: src/storage/storage_backend_fs.c:761 src/storage/storage_backend_fs.c:788
+#: src/storage/storage_backend_fs.c:1042
 #, c-format
 msgid "cannot create path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:272 src/util/util.c:759 src/util/util.c:803
-#: src/util/util.c:1036
+#: src/storage/storage_backend.c:272 src/util/util.c:757 src/util/util.c:801
+#: src/util/util.c:1034
 #, c-format
 msgid "stat of '%s' failed"
 msgstr ""
 
-#: src/storage/storage_backend.c:281 src/util/util.c:766 src/util/util.c:809
+#: src/storage/storage_backend.c:281 src/util/util.c:764 src/util/util.c:807
 #, c-format
 msgid "cannot chown '%s' to (%u, %u)"
 msgstr ""
 
 #: src/storage/storage_backend.c:287 src/storage/storage_backend.c:601
-#: src/util/util.c:776 src/util/util.c:817 src/util/util.c:1049
+#: src/util/util.c:774 src/util/util.c:815 src/util/util.c:1047
 #, c-format
 msgid "cannot set mode of '%s' to %04o"
 msgstr ""
 
-#: src/storage/storage_backend.c:308 src/storage/storage_backend.c:319
+#: src/storage/storage_backend.c:346 src/storage/storage_backend.c:355
 #, c-format
 msgid "cannot fill file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:261 src/storage/storage_backend_disk.c:560
-#: src/storage/storage_backend_logical.c:584
+#: src/storage/storage_backend.c:391 src/storage/storage_backend_disk.c:648
+#: src/storage/storage_backend_logical.c:683
 msgid "storage pool does not support encrypted volumes"
 msgstr ""
 
-#: src/storage/storage_backend.c:364
+#: src/storage/storage_backend.c:442
 msgid "too many conflicts when generating an uuid"
 msgstr ""
 
-#: src/storage/storage_backend.c:394
+#: src/storage/storage_backend.c:472
 msgid "secrets already defined"
 msgstr ""
 
@@ -13303,7 +13894,7 @@
 msgid "unable to parse qemu-img output '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:513 src/storage/storage_backend.c:519
+#: src/storage/storage_backend.c:688 src/storage/storage_backend.c:694
 #, c-format
 msgid "unknown storage vol type %d"
 msgstr ""
@@ -13312,121 +13903,120 @@
 msgid "a different backing store cannot be specified."
 msgstr ""
 
-#: src/storage/storage_backend.c:541
+#: src/storage/storage_backend.c:718
 #, c-format
 msgid "unknown storage vol backing store type %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:547
+#: src/storage/storage_backend.c:737
 #, c-format
 msgid "inaccessible backing store volume %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:559
+#: src/storage/storage_backend.c:749
 #, c-format
 msgid "qcow volume encryption unsupported with volume format %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:567
+#: src/storage/storage_backend.c:757
 #, c-format
 msgid "unsupported volume encryption format %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:573
+#: src/storage/storage_backend.c:763
 msgid "too many secrets for qcow encryption"
 msgstr ""
 
-#: src/storage/storage_backend.c:644
+#: src/storage/storage_backend.c:877
 msgid "cannot copy from volume with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:650
+#: src/storage/storage_backend.c:883
 #, c-format
 msgid "unsupported storage vol type %d"
 msgstr ""
 
-#: src/storage/storage_backend.c:656
+#: src/storage/storage_backend.c:889
 msgid "copy-on-write image not supported with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:662
+#: src/storage/storage_backend.c:895
 msgid "encrypted volumes not supported with qcow-create"
 msgstr ""
 
-#: src/storage/storage_backend.c:696
+#: src/storage/storage_backend.c:927
 #, c-format
 msgid "Unknown file create tool type '%d'."
 msgstr ""
 
-#: src/storage/storage_backend.c:745
+#: src/storage/storage_backend.c:975
 msgid "creation of non-raw file images is not supported without qemu-img."
 msgstr ""
 
-#: src/storage/storage_backend.c:783 src/storage/storage_backend_fs.c:67
-#: src/storage/storage_backend_mpath.c:52
-#: src/storage/storage_backend_scsi.c:147
+#: src/storage/storage_backend.c:1039
 #, c-format
 msgid "cannot open volume '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1060
+#: src/storage/storage_backend.c:1075
 #, c-format
 msgid "unexpected storage mode for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:879
+#: src/storage/storage_backend.c:1199
 #, c-format
 msgid "cannot seek to end of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:900
+#: src/storage/storage_backend.c:1220
 #, c-format
 msgid "cannot get file context of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:971 src/storage/storage_backend_scsi.c:165
+#: src/storage/storage_backend.c:1290
 #, c-format
 msgid "cannot seek to beginning of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:978 src/storage/storage_backend_scsi.c:172
+#: src/storage/storage_backend.c:1297
 #, c-format
 msgid "cannot read beginning of file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1044
+#: src/storage/storage_backend.c:1362
 #, c-format
 msgid "cannot read dir '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1131
+#: src/storage/storage_backend.c:1447
+#: src/storage/storage_backend_logical.c:209
 #, c-format
 msgid "Failed to compile regex %s"
 msgstr ""
 
-#: src/storage/storage_backend.c:1163 src/storage/storage_backend.c:1297
+#: src/storage/storage_backend.c:1478
 msgid "cannot read fd"
 msgstr ""
 
-#: src/storage/storage_backend.c:1578
+#: src/storage/storage_backend.c:1593
 msgid "cannot open file using fd"
 msgstr ""
 
-#: src/storage/storage_backend.c:1330
+#: src/storage/storage_backend.c:1624
 #, c-format
 msgid "read error on pipe to '%s'"
 msgstr ""
 
-#: src/storage/storage_backend.c:1385 src/storage/storage_backend.c:1397
+#: src/storage/storage_backend.c:1654 src/storage/storage_backend.c:1666
 #, c-format
 msgid "%s not implemented on Win32"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:109
+#: src/storage/storage_backend_disk.c:110
 msgid "cannot parse device start location"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:116
+#: src/storage/storage_backend_disk.c:117
 msgid "cannot parse device end location"
 msgstr ""
 
@@ -13435,37 +14025,49 @@
 msgid "device path '%s' doesn't exist"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:398
+#: src/storage/storage_backend_disk.c:398 src/storage/storage_backend_fs.c:740
+msgid "Overwrite and no overwrite flags are mutually exclusive"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:414
+msgid "Error checking for disk label"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:417
+msgid "Disk label already present"
+msgstr ""
+
+#: src/storage/storage_backend_disk.c:466
 msgid "Invalid partition type"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:406
+#: src/storage/storage_backend_disk.c:475
 msgid "extended partition already exists"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:430
+#: src/storage/storage_backend_disk.c:510
 msgid "no extended partition found and no primary partition available"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:452
+#: src/storage/storage_backend_disk.c:516
 msgid "unknown partition type"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:515
+#: src/storage/storage_backend_disk.c:600
 msgid "no large enough free extent"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:629
+#: src/storage/storage_backend_disk.c:731
 #, c-format
 msgid "Couldn't read volume target path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:640
+#: src/storage/storage_backend_disk.c:744
 #, c-format
 msgid "Volume path '%s' did not start with parent pool source device name."
 msgstr ""
 
-#: src/storage/storage_backend_disk.c:649
+#: src/storage/storage_backend_disk.c:754
 #, c-format
 msgid "cannot parse partition number from target '%s'"
 msgstr ""
@@ -13475,36 +14077,38 @@
 msgid "cannot probe backing volume format: %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:154
+#: src/storage/storage_backend_fs.c:196
 #, c-format
 msgid "invalid netfs path (no /): %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:160
+#: src/storage/storage_backend_fs.c:202
 #, c-format
 msgid "invalid netfs path (ends in /): %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:265
+#: src/storage/storage_backend_fs.c:304
 #, c-format
 msgid "cannot read mount list '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:357 src/storage/storage_backend_fs.c:433
-#: src/storage/storage_backend_iscsi.c:276
+#: src/storage/storage_backend_fs.c:392 src/storage/storage_backend_fs.c:457
+#: src/storage/storage_backend_iscsi.c:628
+#: src/storage/storage_backend_iscsi.c:660
 msgid "missing source host"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:362
+#: src/storage/storage_backend_fs.c:397
 msgid "missing source path"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:368 src/storage/storage_backend_fs.c:444
-#: src/storage/storage_backend_iscsi.c:283
+#: src/storage/storage_backend_fs.c:403 src/storage/storage_backend_fs.c:468
+#: src/storage/storage_backend_iscsi.c:635
+#: src/storage/storage_backend_iscsi.c:667
 msgid "missing source device"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:438
+#: src/storage/storage_backend_fs.c:462
 msgid "missing source dir"
 msgstr ""
 
@@ -13553,16 +14157,12 @@
 msgid "Source device does not exist when formatting pool '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:740
-msgid "Overwrite and no overwrite flags are mutually exclusive"
-msgstr ""
-
 #: src/storage/storage_backend_fs.c:751
 #, c-format
 msgid "path '%s' is not absolute"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:535
+#: src/storage/storage_backend_fs.c:821
 #, c-format
 msgid "cannot open path '%s'"
 msgstr ""
@@ -13572,213 +14172,210 @@
 msgid "cannot probe backing volume info: %s"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:631
+#: src/storage/storage_backend_fs.c:905
 #, c-format
 msgid "cannot statvfs path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:698
+#: src/storage/storage_backend_fs.c:974
 #, c-format
 msgid "failed to remove pool '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:746
+#: src/storage/storage_backend_fs.c:1028
 msgid "cannot copy from volume to a directory volume"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:772
+#: src/storage/storage_backend_fs.c:1062
 msgid ""
 "storage pool does not support building encrypted volumes from other volumes"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:792
+#: src/storage/storage_backend_fs.c:1082
 msgid "creation of non-raw images is not supported without qemu-img"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:878
+#: src/storage/storage_backend_fs.c:1134
 #, c-format
 msgid "cannot unlink file '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:65
+#: src/storage/storage_backend_iscsi.c:66
 #, c-format
 msgid "host lookup failed %s"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:72
+#: src/storage/storage_backend_iscsi.c:73
 #, c-format
 msgid "no IP address for target %s"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:81
+#: src/storage/storage_backend_iscsi.c:82
 #, c-format
 msgid "cannot format ip addr for %s"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:149
+#: src/storage/storage_backend_iscsi.c:168
 msgid "cannot find session"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:193
+#: src/storage/storage_backend_iscsi.c:192
 #, c-format
 msgid "Could not allocate memory for output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:208
+#: src/storage/storage_backend_iscsi.c:207
 #, c-format
 msgid ""
 "Failed to open stream for file descriptor when reading output from '%s': '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:220
+#: src/storage/storage_backend_iscsi.c:219
 #, c-format
 msgid "Unexpected line > %d characters when parsing output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:238
+#: src/storage/storage_backend_iscsi.c:237
 #, c-format
 msgid "Missing space when parsing output of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:289
+#: src/storage/storage_backend_iscsi.c:288
 msgid "Failed to initialize random generator when creating iscsi interface"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:306
+#: src/storage/storage_backend_iscsi.c:305
 #, c-format
 msgid "Failed to run command '%s' to create new iscsi interface"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:316
+#: src/storage/storage_backend_iscsi.c:315
 #, c-format
 msgid "Failed to run command '%s' to update iscsi interface with IQN '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:188
+#: src/storage/storage_backend_iscsi.c:408
 #, c-format
 msgid "Failed to get host number for iSCSI session with path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_iscsi.c:196
+#: src/storage/storage_backend_iscsi.c:416
 #, c-format
 msgid "Failed to find LUs on host %u"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:147
+#: src/storage/storage_backend_logical.c:154
 msgid "malformed volume extent stripes value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:159
+#: src/storage/storage_backend_logical.c:168
 msgid "malformed volume extent length value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:164
+#: src/storage/storage_backend_logical.c:173
 msgid "malformed volume extent size value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:209
+#: src/storage/storage_backend_logical.c:216
 msgid "malformed volume extent devices value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:154
+#: src/storage/storage_backend_logical.c:245
 msgid "malformed volume extent offset value"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:355
+#: src/storage/storage_backend_logical.c:434
 msgid "failed to get source from sourceList"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:410
+#: src/storage/storage_backend_logical.c:511
 #, c-format
 msgid "cannot open device '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:416
+#: src/storage/storage_backend_logical.c:517
 #, c-format
 msgid "cannot clear device header of '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:517
+#: src/storage/storage_backend_logical.c:524
 #, c-format
 msgid "cannot flush header of device'%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:423
+#: src/storage/storage_backend_logical.c:531
 #, c-format
 msgid "cannot close device '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:811
-#: src/storage/storage_backend_logical.c:624
+#: src/storage/storage_backend_logical.c:720
 #, c-format
 msgid "cannot set file owner '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_fs.c:819
-#: src/storage/storage_backend_logical.c:631
+#: src/storage/storage_backend_logical.c:727
 #, c-format
 msgid "cannot set file mode '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_logical.c:647
+#: src/storage/storage_backend_logical.c:743
 #, c-format
 msgid "cannot find newly created volume '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_mpath.c:233
+#: src/storage/storage_backend_mpath.c:232
 #, c-format
 msgid "Failed to get %s minor number"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:65
+#: src/storage/storage_backend_scsi.c:66
 #, c-format
 msgid "Could not find typefile '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:77
+#: src/storage/storage_backend_scsi.c:78
 #, c-format
 msgid "Could not read typefile '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:89
+#: src/storage/storage_backend_scsi.c:90
 #, c-format
 msgid "Device type '%s' is not an integer"
 msgstr ""
 
-#: src/storage/storage_backend_mpath.c:123
-#: src/storage/storage_backend_scsi.c:260
+#: src/storage/storage_backend_scsi.c:270
 #, c-format
 msgid "Failed to update volume for '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:316
-#: src/storage/storage_backend_scsi.c:407
+#: src/storage/storage_backend_scsi.c:322
+#: src/storage/storage_backend_scsi.c:411
 #, c-format
 msgid "Failed to opendir sysfs path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:364
+#: src/storage/storage_backend_scsi.c:369
 #, c-format
 msgid "Failed to parse block name %s"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:456
+#: src/storage/storage_backend_scsi.c:457
 #, c-format
 msgid "Failed to determine if %u:%u:%u:%u is a Direct-Access LUN"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:523
+#: src/storage/storage_backend_scsi.c:524
 #: src/storage/storage_backend_scsi.c:566
 #, c-format
 msgid "Failed to opendir path '%s'"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:610
+#: src/storage/storage_backend_scsi.c:609
 #, c-format
 msgid "Could not open '%s' to trigger host scan"
 msgstr ""
 
-#: src/storage/storage_backend_scsi.c:621
+#: src/storage/storage_backend_scsi.c:620
 #, c-format
 msgid "Write to '%s' to trigger host scan failed"
 msgstr ""
@@ -13803,39 +14400,40 @@
 msgid "Failed to autostart storage pool '%s': %s"
 msgstr ""
 
-#: src/storage/storage_driver.c:275 src/storage/storage_driver.c:974
-#: src/storage/storage_driver.c:1003
+#: src/storage/storage_driver.c:280 src/storage/storage_driver.c:1003
+#: src/storage/storage_driver.c:1032
 msgid "no pool with matching uuid"
 msgstr ""
 
-#: src/storage/storage_driver.c:300
+#: src/storage/storage_driver.c:305
 #, c-format
 msgid "no pool with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:456 src/test/test_driver.c:3761
+#: src/storage/storage_driver.c:464 src/test/test_driver.c:4092
 #, c-format
 msgid "pool type '%s' does not support source discovery"
 msgstr ""
 
-#: src/storage/storage_driver.c:616 src/storage/storage_driver.c:670
-#: src/storage/storage_driver.c:715 src/storage/storage_driver.c:752
-#: src/storage/storage_driver.c:808 src/storage/storage_driver.c:857
-#: src/storage/storage_driver.c:913 src/storage/storage_driver.c:949
-#: src/storage/storage_driver.c:1065 src/storage/storage_driver.c:1098
-#: src/storage/storage_driver.c:1143 src/storage/storage_driver.c:1269
-#: src/storage/storage_driver.c:1390 src/storage/storage_driver.c:1543
-#: src/storage/storage_driver.c:1622 src/storage/storage_driver.c:1675
-#: src/storage/storage_driver.c:1722
+#: src/storage/storage_driver.c:632 src/storage/storage_driver.c:690
+#: src/storage/storage_driver.c:736 src/storage/storage_driver.c:773
+#: src/storage/storage_driver.c:830 src/storage/storage_driver.c:883
+#: src/storage/storage_driver.c:939 src/storage/storage_driver.c:978
+#: src/storage/storage_driver.c:1092 src/storage/storage_driver.c:1125
+#: src/storage/storage_driver.c:1170 src/storage/storage_driver.c:1303
+#: src/storage/storage_driver.c:1433 src/storage/storage_driver.c:1593
+#: src/storage/storage_driver.c:1655 src/storage/storage_driver.c:1872
+#: src/storage/storage_driver.c:1929 src/storage/storage_driver.c:2010
+#: src/storage/storage_driver.c:2066 src/storage/storage_driver.c:2113
 msgid "no storage pool with matching uuid"
 msgstr ""
 
-#: src/storage/storage_driver.c:622
+#: src/storage/storage_driver.c:638
 msgid "pool is still active"
 msgstr ""
 
-#: src/storage/storage_driver.c:628 src/storage/storage_driver.c:767
-#: src/storage/storage_driver.c:823 src/storage/storage_driver.c:872
+#: src/storage/storage_driver.c:644 src/storage/storage_driver.c:788
+#: src/storage/storage_driver.c:845 src/storage/storage_driver.c:898
 #, c-format
 msgid "pool '%s' has asynchronous jobs running."
 msgstr ""
@@ -13845,24 +14443,26 @@
 msgid "Failed to delete autostart link '%s': %s"
 msgstr ""
 
-#: src/storage/storage_driver.c:679
+#: src/storage/storage_driver.c:699
 msgid "pool already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:724
+#: src/storage/storage_driver.c:745
 msgid "storage pool is already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:761 src/storage/storage_driver.c:866
-#: src/storage/storage_driver.c:1071 src/storage/storage_driver.c:1104
-#: src/storage/storage_driver.c:1149 src/storage/storage_driver.c:1275
-#: src/storage/storage_driver.c:1403 src/storage/storage_driver.c:1409
-#: src/storage/storage_driver.c:1549 src/storage/storage_driver.c:1628
-#: src/storage/storage_driver.c:1681 src/storage/storage_driver.c:1728
+#: src/storage/storage_driver.c:782 src/storage/storage_driver.c:892
+#: src/storage/storage_driver.c:1098 src/storage/storage_driver.c:1131
+#: src/storage/storage_driver.c:1176 src/storage/storage_driver.c:1309
+#: src/storage/storage_driver.c:1446 src/storage/storage_driver.c:1452
+#: src/storage/storage_driver.c:1599 src/storage/storage_driver.c:1661
+#: src/storage/storage_driver.c:1878 src/storage/storage_driver.c:1935
+#: src/storage/storage_driver.c:2016 src/storage/storage_driver.c:2072
+#: src/storage/storage_driver.c:2119
 msgid "storage pool is not active"
 msgstr ""
 
-#: src/storage/storage_driver.c:817
+#: src/storage/storage_driver.c:839
 msgid "storage pool is still active"
 msgstr ""
 
@@ -13870,52 +14470,56 @@
 msgid "pool does not support pool deletion"
 msgstr ""
 
-#: src/storage/storage_driver.c:1009 src/test/test_driver.c:4119
+#: src/storage/storage_driver.c:1038 src/test/test_driver.c:4468
 msgid "pool has no config file"
 msgstr ""
 
-#: src/storage/storage_driver.c:1157 src/storage/storage_driver.c:1419
-#: src/storage/storage_driver.c:1560 src/storage/storage_driver.c:1636
-#: src/storage/storage_driver.c:1689 src/storage/storage_driver.c:1736
-#: src/test/test_driver.c:4241 src/test/test_driver.c:4442
-#: src/test/test_driver.c:4518 src/test/test_driver.c:4596
-#: src/test/test_driver.c:4641 src/test/test_driver.c:4681
+#: src/storage/storage_driver.c:1184 src/storage/storage_driver.c:1462
+#: src/storage/storage_driver.c:1607 src/storage/storage_driver.c:1669
+#: src/storage/storage_driver.c:1886 src/storage/storage_driver.c:1946
+#: src/storage/storage_driver.c:2024 src/storage/storage_driver.c:2080
+#: src/storage/storage_driver.c:2127 src/test/test_driver.c:4590
+#: src/test/test_driver.c:4797 src/test/test_driver.c:4876
+#: src/test/test_driver.c:4954 src/test/test_driver.c:5002
+#: src/test/test_driver.c:5042
 #, c-format
 msgid "no storage vol with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1197
+#: src/storage/storage_driver.c:1224
 msgid "no storage vol with matching key"
 msgstr ""
 
-#: src/storage/storage_driver.c:1244
+#: src/storage/storage_driver.c:1275
 msgid "no storage vol with matching path"
 msgstr ""
 
-#: src/storage/storage_driver.c:1288 src/test/test_driver.c:4354
-#: src/test/test_driver.c:4435
+#: src/storage/storage_driver.c:1322 src/test/test_driver.c:4706
+#: src/test/test_driver.c:4790
 msgid "storage vol already exists"
 msgstr ""
 
-#: src/storage/storage_driver.c:1300
+#: src/storage/storage_driver.c:1334
 msgid "storage pool does not support volume creation"
 msgstr ""
 
-#: src/storage/storage_driver.c:1396
+#: src/storage/storage_driver.c:1439
 #, c-format
 msgid "no storage pool with matching name '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1430
+#: src/storage/storage_driver.c:1473
 #, c-format
 msgid "storage volume name '%s' already in use."
 msgstr ""
 
-#: src/storage/storage_driver.c:1446
+#: src/storage/storage_driver.c:1489
 msgid "storage pool does not support volume creation from an existing volume"
 msgstr ""
 
-#: src/storage/storage_driver.c:1452 src/storage/storage_driver.c:1567
+#: src/storage/storage_driver.c:1495 src/storage/storage_driver.c:1614
+#: src/storage/storage_driver.c:1676 src/storage/storage_driver.c:1893
+#: src/storage/storage_driver.c:1953
 #, c-format
 msgid "volume '%s' is still being allocated."
 msgstr ""
@@ -13955,20 +14559,20 @@
 msgid "Failed to stat storage volume with path '%s'"
 msgstr ""
 
-#: src/storage/storage_driver.c:1574
+#: src/storage/storage_driver.c:1960
 msgid "storage pool does not support vol deletion"
 msgstr ""
 
-#: src/test/test_driver.c:337
+#: src/test/test_driver.c:347
 #, c-format
 msgid "Exceeded max iface limit %d"
 msgstr ""
 
-#: src/test/test_driver.c:684
+#: src/test/test_driver.c:693
 msgid "resolving volume filename"
 msgstr ""
 
-#: src/test/test_driver.c:788
+#: src/test/test_driver.c:786
 msgid "Root element is not 'node'"
 msgstr ""
 
@@ -13996,7 +14600,7 @@
 msgid "invalid node cpu mhz value"
 msgstr ""
 
-#: src/test/test_driver.c:863 src/xen/xm_internal.c:1072
+#: src/test/test_driver.c:859 src/xenxs/xen_xm.c:655
 #, c-format
 msgid "Model %s too big for destination"
 msgstr ""
@@ -14005,356 +14609,336 @@
 msgid "invalid node memory value"
 msgstr ""
 
-#: src/test/test_driver.c:891
+#: src/test/test_driver.c:887
 msgid "resolving domain filename"
 msgstr "resolving domain filename"
 
-#: src/test/test_driver.c:934
+#: src/test/test_driver.c:931
 msgid "resolving network filename"
 msgstr ""
 
-#: src/test/test_driver.c:970
+#: src/test/test_driver.c:966
 msgid "resolving interface filename"
 msgstr ""
 
-#: src/test/test_driver.c:1008
+#: src/test/test_driver.c:1003
 msgid "resolving pool filename"
 msgstr ""
 
-#: src/test/test_driver.c:1061
+#: src/test/test_driver.c:1055
 msgid "resolving device filename"
 msgstr ""
 
-#: src/test/test_driver.c:1129
+#: src/test/test_driver.c:1125
 msgid "testOpen: supply a path or use test:///default"
 msgstr ""
 
-#: src/test/test_driver.c:1480
+#: src/test/test_driver.c:1482
 #, c-format
 msgid "domain '%s' not paused"
 msgstr ""
 
-#: src/test/test_driver.c:1522 src/test/test_driver.c:1563
+#: src/test/test_driver.c:1525 src/test/test_driver.c:1566
 #, c-format
 msgid "domain '%s' not running"
 msgstr ""
 
-#: src/opennebula/one_driver.c:320 src/test/test_driver.c:519
-#: src/test/test_driver.c:1672 src/test/test_driver.c:2113
-#: src/test/test_driver.c:2608 src/test/test_driver.c:2663
+#: src/test/test_driver.c:1682 src/test/test_driver.c:2300
+#: src/test/test_driver.c:2831 src/test/test_driver.c:2886
 msgid "getting time of day"
 msgstr "getting time of day"
 
-#: src/test/test_driver.c:1717
+#: src/test/test_driver.c:1765
 #, c-format
 msgid "saving domain '%s' failed to allocate space for metadata"
 msgstr ""
 
-#: src/test/test_driver.c:1724
+#: src/test/test_driver.c:1772
 #, c-format
 msgid "saving domain '%s' to '%s': open failed"
 msgstr ""
 
-#: src/test/test_driver.c:1731 src/test/test_driver.c:1737
-#: src/test/test_driver.c:1743 src/test/test_driver.c:1750
+#: src/test/test_driver.c:1779 src/test/test_driver.c:1785
+#: src/test/test_driver.c:1791 src/test/test_driver.c:1798
 #, c-format
 msgid "saving domain '%s' to '%s': write failed"
 msgstr ""
 
-#: src/test/test_driver.c:1802
+#: src/test/test_driver.c:1866
 #, c-format
 msgid "cannot read domain image '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1808
+#: src/test/test_driver.c:1872
 #, c-format
 msgid "incomplete save header in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1814
+#: src/test/test_driver.c:1878
 msgid "mismatched header magic"
 msgstr ""
 
-#: src/test/test_driver.c:1819
+#: src/test/test_driver.c:1883
 #, c-format
 msgid "failed to read metadata length in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1825
+#: src/test/test_driver.c:1889
 msgid "length of metadata out of range"
 msgstr ""
 
-#: src/test/test_driver.c:1834
+#: src/test/test_driver.c:1898
 #, c-format
 msgid "incomplete metdata in '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:1897
+#: src/test/test_driver.c:1970
 #, c-format
 msgid "domain '%s' coredump: failed to open %s"
 msgstr ""
 
-#: src/test/test_driver.c:1903
+#: src/test/test_driver.c:1976
 #, c-format
 msgid "domain '%s' coredump: failed to write header to %s"
 msgstr ""
 
-#: src/test/test_driver.c:1909
+#: src/test/test_driver.c:1982
 #, c-format
 msgid "domain '%s' coredump: write failed: %s"
 msgstr ""
 
-#: src/test/test_driver.c:2055
+#: src/test/test_driver.c:2209
 msgid "cannot hotplug vcpus for an inactive domain"
 msgstr ""
 
-#: src/test/test_driver.c:2105
+#: src/test/test_driver.c:2292
 msgid "cannot list vcpus for an inactive domain"
 msgstr ""
 
-#: src/test/test_driver.c:2197
+#: src/test/test_driver.c:2384
 msgid "requested vcpu is higher than allocated vcpus"
 msgstr ""
 
-#: src/test/test_driver.c:2336
+#: src/test/test_driver.c:2525
 msgid "Range exceeds available cells"
 msgstr ""
 
-#: src/test/test_driver.c:2370
+#: src/test/test_driver.c:2561
 #, c-format
 msgid "Domain '%s' is already running"
 msgstr ""
 
-#: src/test/test_driver.c:2946
+#: src/test/test_driver.c:3172
 #, c-format
 msgid "Network '%s' is still running"
 msgstr ""
 
-#: src/test/test_driver.c:2979
+#: src/test/test_driver.c:3205
 #, c-format
 msgid "Network '%s' is already running"
 msgstr ""
 
-#: src/test/test_driver.c:3562
+#: src/test/test_driver.c:3560
 msgid "there is another transaction running."
 msgstr ""
 
-#: src/test/test_driver.c:3589
+#: src/test/test_driver.c:3587
 msgid "no transaction running, nothing to be commited."
 msgstr ""
 
-#: src/test/test_driver.c:3616
+#: src/test/test_driver.c:3614
 msgid "no transaction running, nothing to rollback."
 msgstr ""
 
-#: src/test/test_driver.c:3703 src/test/test_driver.c:3867
-#: src/test/test_driver.c:3900 src/test/test_driver.c:3968
+#: src/test/test_driver.c:4032 src/test/test_driver.c:4204
+#: src/test/test_driver.c:4240 src/test/test_driver.c:4311
 #, c-format
 msgid "storage pool '%s' is already active"
 msgstr ""
 
-#: src/storage/storage_driver.c:531 src/test/test_driver.c:3788
+#: src/test/test_driver.c:4122
 msgid "storage pool already exists"
 msgstr ""
 
-#: src/test/test_driver.c:3929 src/test/test_driver.c:4000
-#: src/test/test_driver.c:4152 src/test/test_driver.c:4187
-#: src/test/test_driver.c:4233 src/test/test_driver.c:4344
-#: src/test/test_driver.c:4425 src/test/test_driver.c:4525
-#: src/test/test_driver.c:4603 src/test/test_driver.c:4648
-#: src/test/test_driver.c:4688
+#: src/test/test_driver.c:4269 src/test/test_driver.c:4346
+#: src/test/test_driver.c:4501 src/test/test_driver.c:4536
+#: src/test/test_driver.c:4582 src/test/test_driver.c:4696
+#: src/test/test_driver.c:4780 src/test/test_driver.c:4883
+#: src/test/test_driver.c:4961 src/test/test_driver.c:5009
+#: src/test/test_driver.c:5049
 #, c-format
 msgid "storage pool '%s' is not active"
 msgstr ""
 
-#: src/test/test_driver.c:4284
+#: src/test/test_driver.c:4633
 #, c-format
 msgid "no storage vol with matching key '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:4318
+#: src/test/test_driver.c:4667
 #, c-format
 msgid "no storage vol with matching path '%s'"
 msgstr ""
 
-#: src/test/test_driver.c:4362 src/test/test_driver.c:4451
+#: src/test/test_driver.c:4714 src/test/test_driver.c:4806
 #, c-format
 msgid "Not enough free space in pool for volume '%s'"
 msgstr ""
 
-#: src/uml/uml_conf.c:183
-msgid "IP address not supported for ethernet inteface"
+#: src/uml/uml_conf.c:191
+msgid "IP address not supported for ethernet interface"
 msgstr ""
 
-#: src/uml/uml_conf.c:188
-msgid "script execution not supported for ethernet inteface"
+#: src/uml/uml_conf.c:196
+msgid "script execution not supported for ethernet interface"
 msgstr ""
 
-#: src/uml/uml_conf.c:195
+#: src/uml/uml_conf.c:203
 msgid "TCP server networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:200
+#: src/uml/uml_conf.c:208
 msgid "TCP client networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:215
+#: src/uml/uml_conf.c:223
 #, c-format
 msgid "Network '%s' not found"
 msgstr ""
 
-#: src/uml/uml_conf.c:245
+#: src/uml/uml_conf.c:253
 msgid "internal networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:289
+#: src/uml/uml_conf.c:258
 msgid "direct networking type not supported"
 msgstr ""
 
-#: src/uml/uml_conf.c:311
+#: src/uml/uml_conf.c:327
 msgid "only TCP listen is supported for chr device"
 msgstr ""
 
-#: src/uml/uml_conf.c:376
+#: src/uml/uml_conf.c:345
 #, c-format
 msgid "failed to open chardev file: %s"
 msgstr ""
 
-#: src/uml/uml_conf.c:331
+#: src/uml/uml_conf.c:366
 #, c-format
 msgid "unsupported chr device type %d"
 msgstr ""
 
-#: src/uml/uml_driver.c:418
+#: src/uml/uml_driver.c:471
 msgid "cannot initialize inotify"
 msgstr ""
 
-#: src/uml/uml_driver.c:424
+#: src/uml/uml_driver.c:477
 #, c-format
 msgid "Failed to create monitor directory %s: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:457
+#: src/uml/uml_driver.c:514
 msgid "umlStartup: out of memory"
 msgstr ""
 
-#: src/uml/uml_driver.c:604
+#: src/uml/uml_driver.c:776
 #, c-format
 msgid "failed to read pid: %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:627
+#: src/uml/uml_driver.c:798
 #, c-format
 msgid "Unix path %s too long for destination"
 msgstr ""
 
-#: src/uml/uml_driver.c:658
+#: src/uml/uml_driver.c:828
 msgid "cannot open socket"
 msgstr ""
 
-#: src/uml/uml_driver.c:667
+#: src/uml/uml_driver.c:838
 msgid "cannot bind socket"
 msgstr ""
 
-#: src/uml/uml_driver.c:723
+#: src/uml/uml_driver.c:892
 #, c-format
 msgid "cannot send too long command %s (%d bytes)"
 msgstr ""
 
-#: src/uml/uml_driver.c:729
+#: src/uml/uml_driver.c:898
 #, c-format
 msgid "Command %s too long for destination"
 msgstr ""
 
-#: src/uml/uml_driver.c:736
+#: src/uml/uml_driver.c:905
 #, c-format
 msgid "cannot send command %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:746
+#: src/uml/uml_driver.c:918
 #, c-format
 msgid "cannot read reply %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:926
+#: src/uml/uml_driver.c:924
 #, c-format
 msgid "incomplete reply %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:963
-msgid "Cleanup tap"
-msgstr ""
-
-#: src/uml/uml_driver.c:974
-#, c-format
-msgid "Cleanup '%s'"
-msgstr ""
-
-#: src/uml/uml_driver.c:977
-#, c-format
-msgid "Cleanup failed %d"
-msgstr ""
-
-#: src/uml/uml_driver.c:981
-msgid "Cleanup tap done"
-msgstr ""
-
-#: src/uml/uml_driver.c:829
+#: src/uml/uml_driver.c:989
 msgid "no kernel specified"
 msgstr ""
 
-#: src/uml/uml_driver.c:838
+#: src/uml/uml_driver.c:998
 #, c-format
 msgid "Cannot find UML kernel %s"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:517 src/qemu/qemu_driver.c:549
-#: src/uml/uml_driver.c:868
+#: src/uml/uml_driver.c:1028
 msgid "Unable to set VM logfile close-on-exec flag"
 msgstr ""
 
-#: src/uml/uml_driver.c:997
+#: src/uml/uml_driver.c:1167
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///system"
 msgstr ""
 
-#: src/uml/uml_driver.c:1004
+#: src/uml/uml_driver.c:1174
 #, c-format
 msgid "unexpected UML URI path '%s', try uml:///session"
 msgstr ""
 
-#: src/uml/uml_driver.c:1013
+#: src/uml/uml_driver.c:1183
 msgid "uml state driver is not active"
 msgstr ""
 
-#: src/uml/uml_driver.c:1230
+#: src/uml/uml_driver.c:1435
 #, c-format
 msgid "cannot parse version %s"
 msgstr ""
 
-#: src/uml/uml_driver.c:1321
+#: src/uml/uml_driver.c:1538
 msgid "shutdown operation failed"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:3446 src/uml/uml_driver.c:1433
+#: src/uml/uml_driver.c:1668
 msgid "cannot set max memory lower than current memory"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5423
+#: src/uml/uml_driver.c:2044
 msgid "cannot attach device on inactive domain"
 msgstr ""
 
-#: src/uml/uml_driver.c:2104 src/uml/uml_driver.c:2216
-#: src/vbox/vbox_tmpl.c:5533 src/vbox/vbox_tmpl.c:5548
-#: src/vbox/vbox_tmpl.c:5704
+#: src/uml/uml_driver.c:2090 src/uml/uml_driver.c:2202
+#: src/vbox/vbox_tmpl.c:5538 src/vbox/vbox_tmpl.c:5553
+#: src/vbox/vbox_tmpl.c:5709
 msgid "cannot modify the persistent configuration of a domain"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:5817
+#: src/uml/uml_driver.c:2162
 msgid "cannot detach device on inactive domain"
 msgstr ""
 
-#: src/uml/uml_driver.c:1832
+#: src/uml/uml_driver.c:2355 tools/virsh.c:10107
 #, c-format
 msgid "cannot read %s"
 msgstr ""
@@ -14437,15 +15021,15 @@
 msgid "cannot clear process capabilities %d"
 msgstr ""
 
-#: src/util/util.c:347
+#: src/util/command.c:167
 msgid "cannot block signals"
 msgstr ""
 
-#: src/util/util.c:418 src/util/util.c:533
+#: src/util/command.c:186 src/util/command.c:492
 msgid "cannot fork child process"
 msgstr ""
 
-#: src/util/util.c:437 src/util/util.c:474
+#: src/util/command.c:198 src/util/command.c:243
 msgid "cannot unblock signals"
 msgstr ""
 
@@ -14454,15 +15038,15 @@
 msgid "Cannot find '%s' in path"
 msgstr ""
 
-#: src/util/util.c:362
+#: src/util/command.c:345
 msgid "cannot create pipe"
 msgstr ""
 
-#: src/util/util.c:369 src/util/util.c:398
+#: src/util/command.c:352 src/util/command.c:377
 msgid "Failed to set non-blocking file descriptor flag"
 msgstr ""
 
-#: src/util/util.c:391
+#: src/util/command.c:370
 msgid "Failed to create pipe"
 msgstr ""
 
@@ -14471,19 +15055,19 @@
 msgid "failed to preserve fd %d"
 msgstr ""
 
-#: src/util/util.c:490
+#: src/util/command.c:444
 msgid "failed to setup stdin file handle"
 msgstr ""
 
-#: src/util/util.c:496
+#: src/util/command.c:449
 msgid "failed to setup stdout file handle"
 msgstr ""
 
-#: src/util/util.c:502
+#: src/util/command.c:454
 msgid "failed to setup stderr file handle"
 msgstr ""
 
-#: src/util/util.c:520
+#: src/util/command.c:479
 msgid "cannot become session leader"
 msgstr ""
 
@@ -14491,7 +15075,7 @@
 msgid "cannot change to root directory"
 msgstr ""
 
-#: src/util/util.c:543
+#: src/util/command.c:502
 #, c-format
 msgid "could not write pidfile %s for %d"
 msgstr ""
@@ -14504,7 +15088,7 @@
 msgid "Could not re-enable SIGPIPE"
 msgstr ""
 
-#: src/util/util.c:567
+#: src/util/command.c:554
 #, c-format
 msgid "cannot execute binary %s"
 msgstr ""
@@ -14517,199 +15101,199 @@
 msgid "virExec is not implemented for WIN32"
 msgstr ""
 
-#: src/util/command.c:1515 src/util/command.c:1734 src/util/command.c:1782
-#: src/util/command.c:2010 src/util/command.c:2156 src/util/command.c:2345
-#: src/util/command.c:2404
+#: src/util/command.c:1526 src/util/command.c:1745 src/util/command.c:1793
+#: src/util/command.c:2021 src/util/command.c:2167 src/util/command.c:2356
+#: src/util/command.c:2415
 msgid "invalid use of command API"
 msgstr ""
 
-#: src/util/command.c:1552
+#: src/util/command.c:1563
 #, c-format
 msgid "exit status %d"
 msgstr ""
 
-#: src/util/command.c:1555
+#: src/util/command.c:1566
 #, c-format
 msgid "fatal signal %d"
 msgstr ""
 
-#: src/util/command.c:1558
+#: src/util/command.c:1569
 #, c-format
 msgid "invalid value %d"
 msgstr ""
 
-#: src/util/command.c:1632
+#: src/util/command.c:1643
 msgid "unable to poll on child"
 msgstr ""
 
-#: src/util/command.c:1659
+#: src/util/command.c:1670
 msgid "unable to read child stdout"
 msgstr ""
 
-#: src/util/command.c:1660
+#: src/util/command.c:1671
 msgid "unable to read child stderr"
 msgstr ""
 
-#: src/util/command.c:1688
+#: src/util/command.c:1699
 msgid "unable to write to child input"
 msgstr ""
 
-#: src/util/command.c:1748
+#: src/util/command.c:1759
 msgid "Executing new processes is not supported on Win32 platform"
 msgstr ""
 
-#: src/util/command.c:1804
+#: src/util/command.c:1815
 msgid "cannot mix caller fds with blocking execution"
 msgstr ""
 
-#: src/util/command.c:1810
+#: src/util/command.c:1821
 msgid "cannot mix string I/O with daemon"
 msgstr ""
 
-#: src/util/command.c:1820
+#: src/util/command.c:1831
 msgid "unable to open pipe"
 msgstr ""
 
-#: src/util/command.c:1927
+#: src/util/command.c:1938
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
-#: src/util/command.c:1935
+#: src/util/command.c:1946
 msgid "Unable to notify parent process"
 msgstr ""
 
-#: src/util/command.c:1945
+#: src/util/command.c:1956
 msgid "Unknown failure during hook execution"
 msgstr ""
 
-#: src/util/command.c:1948
+#: src/util/command.c:1959
 msgid "Unable to send error to parent process"
 msgstr ""
 
-#: src/util/command.c:1957
+#: src/util/command.c:1968
 msgid "Unable to wait on parent process"
 msgstr ""
 
-#: src/util/command.c:1959
+#: src/util/command.c:1970
 msgid "libvirtd quit during handshake"
 msgstr ""
 
-#: src/util/command.c:1963
+#: src/util/command.c:1974
 #, c-format
 msgid "Unexpected confirm code '%c' from parent process"
 msgstr ""
 
-#: src/util/command.c:2022
+#: src/util/command.c:2033
 msgid "cannot mix string I/O with asynchronous command"
 msgstr ""
 
-#: src/util/command.c:2028
+#: src/util/command.c:2039
 #, c-format
 msgid "command is already running as pid %d"
 msgstr ""
 
-#: src/util/command.c:2035
+#: src/util/command.c:2046
 msgid "daemonized command cannot use virCommandRunAsync"
 msgstr ""
 
-#: src/util/command.c:2040
+#: src/util/command.c:2051
 #, c-format
 msgid "daemonized command cannot set working directory %s"
 msgstr ""
 
-#: src/util/command.c:2046
+#: src/util/command.c:2057
 msgid "creation of pid file requires daemonized command"
 msgstr ""
 
-#: src/util/command.c:2104 src/util/command.c:2113
+#: src/util/command.c:2115 src/util/command.c:2124
 #, c-format
 msgid "unable to wait for process %d"
 msgstr ""
 
-#: src/util/command.c:2121
+#: src/util/command.c:2132
 #, c-format
 msgid "Child process (%d) status unexpected: %s"
 msgstr ""
 
-#: src/util/command.c:2162
+#: src/util/command.c:2173
 msgid "command is not yet running"
 msgstr ""
 
-#: src/util/command.c:2180
+#: src/util/command.c:2191
 #, c-format
 msgid "Child process (%s) status unexpected: %s"
 msgstr ""
 
-#: src/util/command.c:2351 src/util/command.c:2410
+#: src/util/command.c:2362 src/util/command.c:2421
 msgid "Handshake is already complete"
 msgstr ""
 
-#: src/util/command.c:2358
+#: src/util/command.c:2369
 msgid "Unable to wait for child process"
 msgstr ""
 
-#: src/util/command.c:2360
+#: src/util/command.c:2371
 msgid "Child process quit during startup handshake"
 msgstr ""
 
-#: src/util/command.c:2375
+#: src/util/command.c:2386
 msgid "No error message from child failure"
 msgstr ""
 
-#: src/util/command.c:2416
+#: src/util/command.c:2427
 msgid "Unable to notify child process"
 msgstr ""
 
-#: src/util/conf.c:354
+#: src/util/conf.c:355
 msgid "unterminated number"
 msgstr "unterminated number"
 
-#: src/util/conf.c:387 src/util/conf.c:407 src/util/conf.c:422
+#: src/util/conf.c:388 src/util/conf.c:412 src/util/conf.c:427
 msgid "unterminated string"
 msgstr "unterminated string"
 
-#: src/util/conf.c:453 src/util/conf.c:516
+#: src/util/conf.c:458 src/util/conf.c:528
 msgid "expecting a value"
 msgstr "expecting a value"
 
-#: src/util/conf.c:464
+#: src/util/conf.c:469
 msgid "lists not allowed in VMX format"
 msgstr ""
 
-#: src/util/conf.c:478
+#: src/util/conf.c:490
 msgid "expecting a separator in list"
 msgstr "expecting a separator in list"
 
-#: src/util/conf.c:501
+#: src/util/conf.c:513
 msgid "list is not closed with ]"
 msgstr ""
 
-#: src/util/conf.c:508
+#: src/util/conf.c:520
 msgid "numbers not allowed in VMX format"
 msgstr ""
 
-#: src/util/conf.c:551
+#: src/util/conf.c:563
 msgid "expecting a name"
 msgstr "expecting a name"
 
-#: src/util/conf.c:615
+#: src/util/conf.c:627
 msgid "expecting a separator"
 msgstr "expecting a separator"
 
-#: src/util/conf.c:646
+#: src/util/conf.c:658
 msgid "expecting an assignment"
 msgstr "expecting an assignment"
 
-#: src/util/conf.c:941
+#: src/util/conf.c:953
 msgid "failed to open file"
 msgstr "failed to open file"
 
-#: src/util/conf.c:951
+#: src/util/conf.c:963
 msgid "failed to save content"
 msgstr "failed to save content"
 
-#: src/conf/domain_conf.c:4881 src/conf/network_conf.c:769
+#: src/util/dnsmasq.c:251 src/util/dnsmasq.c:417
 #, c-format
 msgid "cannot write config file '%s'"
 msgstr ""
@@ -14719,15 +15303,15 @@
 msgid "Failed to make dnsmasq (PID: %d) reload config files."
 msgstr ""
 
-#: src/util/event_poll.c:626
+#: src/util/event_poll.c:627
 msgid "Unable to poll on file handles"
 msgstr ""
 
-#: src/util/event_poll.c:676
+#: src/util/event_poll.c:677
 msgid "Unable to setup wakeup pipe"
 msgstr ""
 
-#: src/util/event_poll.c:684
+#: src/util/event_poll.c:685
 #, c-format
 msgid "Unable to add handle %d to event loop"
 msgstr ""
@@ -14870,842 +15454,889 @@
 msgid "%s: unknown failure with %s\n"
 msgstr ""
 
-#: src/util/interface.c:122
-msgid "ifaceGetFlags is not supported on non-linux platforms"
+#: src/util/iptables.c:297
+msgid "Only IPv4 or IPv6 addresses can be used with iptables"
 msgstr ""
 
-#: src/util/interface.c:131
-msgid "ifaceIsUp is not supported on non-linux platforms"
+#: src/util/iptables.c:303
+msgid "Failure to mask address"
 msgstr ""
 
-#: src/util/interface.c:245 src/util/interface.c:322
+#: src/util/iptables.c:767
 #, c-format
-msgid "invalid interface name %s"
+msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
 msgstr ""
 
-#: src/util/interface.c:254
-#, c-format
-msgid "coud not get MAC address of interface %s"
+#: src/util/json.c:927
+msgid "Unable to create JSON parser"
 msgstr ""
 
-#: src/util/interface.c:333
+#: src/util/json.c:939
 #, c-format
-msgid "interface %s does not exist"
+msgid "cannot parse json %s: %s"
 msgstr ""
 
-#: src/util/interface.c:353
-msgid "ifaceGetIndex is not supported on non-linux platforms"
+#: src/util/json.c:1051
+msgid "Unable to create JSON formatter"
 msgstr ""
 
-#: src/util/interface.c:398
-msgid "ifaceGetVlanID is not supported on non-linux platforms"
+#: src/util/json.c:1081 src/util/json.c:1087
+msgid "No JSON parser implementation is available"
 msgstr ""
 
-#: src/util/interface.c:684
-#, c-format
-msgid "error creating %s type of interface"
+#: src/util/netlink.c:81
+msgid "cannot allocate nlhandle for netlink"
 msgstr ""
 
-#: src/util/interface.c:708 src/util/interface.c:822 src/util/interface.c:966
-#: src/util/macvtap.c:741
-msgid "malformed netlink response message"
+#: src/util/netlink.c:87
+msgid "cannot connect to netlink socket"
 msgstr ""
 
-#: src/util/interface.c:716 src/util/interface.c:830 src/util/interface.c:974
-#: src/util/macvtap.c:749
-msgid "allocated netlink buffer is too small"
+#: src/util/netlink.c:99
+msgid "cannot send to netlink socket"
 msgstr ""
 
-#: src/util/interface.c:733
-msgid ""
-"ifaceMacvtapLinkAdd is not supported since the include files were too old"
+#: src/util/netlink.c:113
+msgid "error in select call"
 msgstr ""
 
-#: src/util/interface.c:736
-msgid "ifaceMacvtapLinkAdd is not supported on non-linux platforms"
+#: src/util/netlink.c:116
+msgid "no valid netlink response was received"
 msgstr ""
 
-#: src/util/interface.c:798
-#, c-format
-msgid "error destroying %s interface"
+#: src/util/netlink.c:124
+msgid "nl_recv failed"
 msgstr ""
 
-#: src/util/interface.c:841
-msgid "ifaceLinkDel is not supported since the include files were too old"
+#: src/util/netlink.c:147
+msgid "nlComm is not supported since libnl was not available"
 msgstr ""
 
-#: src/util/interface.c:844
-msgid "ifaceLinkDel is not supported on non-linux platforms"
+#: src/util/netlink.c:149
+msgid "nlComm is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/interface.c:936
+#: src/util/pci.c:624
 #, c-format
-msgid "error dumping %s (%d) interface"
-msgstr ""
-
-#: src/util/interface.c:990
-msgid ""
-"ifaceMacvtapLinkDump is not supported since the include files were too old"
-msgstr ""
-
-#: src/util/interface.c:993
-msgid "ifaceMacvtapLinkDump is not supported on non-linux platforms"
-msgstr ""
-
-#: src/util/interface.c:1047
-msgid "buffer for root interface name is too small"
+msgid "Active %s devices on bus with %s, not doing bus reset"
 msgstr ""
 
-#: src/util/interface.c:1082
-msgid ""
-"ifaceGetNthParent is not supported since the include files were too old"
+#: src/util/pci.c:634 src/util/pci.c:1678
+#, c-format
+msgid "Failed to find parent device for %s"
 msgstr ""
 
-#: src/util/interface.c:1085
-msgid "ifaceGetNthParent is not supported on non-linux platforms"
+#: src/util/pci.c:647 src/util/pci.c:693
+#, c-format
+msgid "Failed to read PCI config space for %s"
 msgstr ""
 
-#: src/util/interface.c:1113
+#: src/util/pci.c:667 src/util/pci.c:713
 #, c-format
-msgid ""
-"Getting MAC address from '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed."
+msgid "Failed to restore PCI config space for %s"
 msgstr ""
 
-#: src/util/interface.c:1130
+#: src/util/pci.c:728
 #, c-format
-msgid "Unable to preserve mac for %s"
+msgid "Failed to open config space file '%s'"
 msgstr ""
 
-#: src/util/interface.c:1139 src/util/interface.c:1190
+#: src/util/pci.c:753
 #, c-format
-msgid ""
-"Setting MAC address on  '%s' to '%02x:%02x:%02x:%02x:%02x:%02x' failed."
+msgid "Not resetting active device %s"
 msgstr ""
 
-#: src/util/interface.c:1180
+#: src/util/pci.c:780
 #, c-format
-msgid "Cannot parse MAC address from '%s'"
+msgid "Unable to reset PCI device %s: %s"
 msgstr ""
 
-#: src/util/interface.c:1323
-msgid "ifaceIsVirtualFunction is not supported on non-linux platforms"
+#: src/util/pci.c:782
+msgid "no FLR, PM reset or bus reset available"
 msgstr ""
 
-#: src/util/interface.c:1334
-msgid "ifaceGetVirtualFunctionIndex is not supported on non-linux platforms"
+#: src/util/pci.c:906
+#, c-format
+msgid "Failed to unbind PCI device '%s' from %s"
 msgstr ""
 
-#: src/util/interface.c:1344
-msgid "ifaceGetPhysicalFunction is not supported on non-linux platforms"
+#: src/util/pci.c:924
+#, c-format
+msgid "Failed to remove slot for PCI device '%s' from %s"
 msgstr ""
 
-#: src/util/iptables.c:297
-msgid "Only IPv4 or IPv6 addresses can be used with iptables"
+#: src/util/pci.c:948
+#, c-format
+msgid "Failed to trigger a re-probe for PCI device '%s'"
 msgstr ""
 
-#: src/util/iptables.c:303
-msgid "Failure to mask address"
+#: src/util/pci.c:1006
+#, c-format
+msgid "Failed to add PCI device ID '%s' to %s"
 msgstr ""
 
-#: src/util/iptables.c:767
+#: src/util/pci.c:1037
 #, c-format
-msgid "Attempted to NAT '%s'. NAT is only supported for IPv4."
+msgid "Failed to unbind PCI device '%s'"
 msgstr ""
 
-#: src/util/json.c:927
-msgid "Unable to create JSON parser"
+#: src/util/pci.c:1059
+#, c-format
+msgid "Failed to add slot for PCI device '%s' to %s"
 msgstr ""
 
-#: src/util/json.c:912
+#: src/util/pci.c:1071
 #, c-format
-msgid "cannot parse json %s: %s"
+msgid "Failed to bind PCI device '%s' to %s"
 msgstr ""
 
-#: src/util/json.c:1051
-msgid "Unable to create JSON formatter"
+#: src/util/pci.c:1094
+#, c-format
+msgid "Failed to remove PCI ID '%s' from %s"
 msgstr ""
 
-#: src/util/json.c:1037 src/util/json.c:1043
-msgid "No JSON parser implementation is available"
+#: src/util/pci.c:1125 src/util/pci.c:1144
+msgid "cannot find any PCI stub module"
 msgstr ""
 
-#: src/util/macvtap.c:124
-msgid "buffer for ifindex path is too small"
+#: src/util/pci.c:1131
+#, c-format
+msgid "Not detaching active device %s"
 msgstr ""
 
-#: src/util/macvtap.c:132
+#: src/util/pci.c:1150
 #, c-format
-msgid "cannot open macvtap file %s to determine interface index"
+msgid "Not reattaching active device %s"
 msgstr ""
 
-#: src/util/macvtap.c:139
-msgid "cannot determine macvtap's tap device interface index"
+#: src/util/pci.c:1321
+#, c-format
+msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
 msgstr ""
 
-#: src/util/macvtap.c:151
-msgid "internal buffer for tap device is too small"
+#: src/util/pci.c:1333
+#, c-format
+msgid "Device %s not found: could not access %s"
 msgstr ""
 
-#: src/util/macvtap.c:168
+#: src/util/pci.c:1343
 #, c-format
-msgid "cannot open macvtap tap device %s"
+msgid "Failed to read product/vendor ID for %s"
 msgstr ""
 
-#: src/util/macvtap.c:202
-msgid "cannot get interface flags on macvtap tap"
+#: src/util/pci.c:1352
+#, c-format
+msgid "dev->id buffer overflow: %s %s"
 msgstr ""
 
-#: src/util/macvtap.c:211
-msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
+#: src/util/pci.c:1490
+#, c-format
+msgid "Device %s is already in use"
 msgstr ""
 
-#: src/util/macvtap.c:215
-msgid "cannot get feature flags on macvtap tap"
+#: src/util/pci.c:1733
+#, c-format
+msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
 msgstr ""
 
-#: src/util/macvtap.c:220
-msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
+#: src/util/pci.c:1830
+#, c-format
+msgid "Failed to resolve device link '%s': '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:310
+#: src/util/pci.c:1844
 #, c-format
-msgid "Interface %s already exists"
+msgid "Failed to parse PCI config address '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:349
+#: src/util/pci.c:1911
 #, c-format
-msgid ""
-"cannot 'up' interface %s -- another macvtap device may be 'up' and have the "
-"same MAC address"
+msgid "Failed to open dir '%s': '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:452
-msgid "error parsing pid of lldpad"
+#: src/util/pci.c:1942
+#, c-format
+msgid "Failed to get SR IOV function from device link '%s'"
 msgstr ""
 
-#: src/util/macvtap.c:457
+#: src/util/pci.c:2004
 #, c-format
-msgid "Error opening file %s"
+msgid "Error getting physical function's '%s' virtual_functions"
 msgstr ""
 
-#: src/util/macvtap.c:493
-msgid "error parsing IFLA_PORT_SELF part"
+#: src/util/pci.c:2076
+msgid "pciGetPhysicalFunction is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:497
-msgid "IFLA_PORT_SELF is missing"
+#: src/util/pci.c:2086
+msgid "pciGetVirtualFunctions is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:509
-msgid "error while iterating over IFLA_VF_PORTS part"
+#: src/util/pci.c:2094
+msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:515
-msgid "error parsing IFLA_VF_PORT part"
+#: src/util/pci.c:2104
+msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:533
-msgid "Could not find netlink response with expected parameters"
+#: src/util/pci.c:2114
+msgid "pciDeviceNetName is not supported on non-linux platforms"
 msgstr ""
 
-#: src/util/macvtap.c:538
-msgid "IFLA_VF_PORTS is missing"
+#: src/util/processinfo.c:75 src/util/processinfo.c:91
+#, c-format
+msgid "cannot set CPU affinity on process %d"
 msgstr ""
 
-#: src/util/macvtap.c:552
-msgid "no IFLA_PORT_RESPONSE found in netlink message"
-msgstr ""
-
-#: src/util/macvtap.c:715
+#: src/util/processinfo.c:136 src/util/processinfo.c:150
 #, c-format
-msgid "error during virtual port configuration of ifindex %d"
+msgid "cannot get CPU affinity of process %d"
 msgstr ""
 
-#: src/util/macvtap.c:786
-msgid "sending of PortProfileRequest failed."
+#: src/util/processinfo.c:170 src/util/processinfo.c:180
+msgid "Process CPU affinity is not supported on this platform"
 msgstr ""
 
-#: src/util/macvtap.c:807
+#: src/util/sexpr.c:245
 #, c-format
-msgid "error %d during port-profile setlink on interface %s (%d)"
+msgid "unknown s-expression kind %d"
 msgstr ""
 
-#: src/util/macvtap.c:821
-msgid "port-profile setlink timed out"
+#: src/util/stats_linux.c:54
+msgid "Could not open /proc/net/dev"
 msgstr ""
 
-#: src/util/macvtap.c:881 src/util/macvtap.c:1000
-msgid "Kernel VF Port support was missing at compile time."
+#: src/util/stats_linux.c:110
+msgid "/proc/net/dev: Interface not found"
 msgstr ""
 
-#: src/util/macvtap.c:922 src/util/macvtap.c:1067
+#: src/util/storage_file.c:760
 #, c-format
-msgid "operation type %d not supported"
+msgid "cannot set to start of '%s'"
 msgstr ""
 
-#: src/util/netlink.c:81
-msgid "cannot allocate nlhandle for netlink"
+#: src/util/storage_file.c:765 src/util/storage_file.c:861
+#, c-format
+msgid "cannot read header '%s'"
 msgstr ""
 
-#: src/util/netlink.c:87
-msgid "cannot connect to netlink socket"
+#: src/util/storage_file.c:796 src/util/storage_file.c:908
+#, c-format
+msgid "cannot open file '%s'"
 msgstr ""
 
-#: src/util/netlink.c:99
-msgid "cannot send to netlink socket"
+#: src/util/storage_file.c:851
+#, c-format
+msgid "cannot seek to start of '%s'"
 msgstr ""
 
-#: src/util/netlink.c:113
-msgid "error in select call"
+#: src/util/storage_file.c:870
+#, c-format
+msgid "unknown storage file format %d"
 msgstr ""
 
-#: src/util/netlink.c:116
-msgid "no valid netlink response was received"
+#: src/util/storage_file.c:974
+#, c-format
+msgid "Invalid relative path '%s'"
 msgstr ""
 
-#: src/util/netlink.c:124
-msgid "nl_recv failed"
+#: src/util/storage_file.c:992
+#, c-format
+msgid "cannot determine filesystem for '%s'"
 msgstr ""
 
-#: src/util/netlink.c:147
-msgid "nlComm is not supported since libnl was not available"
+#: src/util/sysinfo.c:127
+msgid "Host sysinfo extraction not supported on this platform"
 msgstr ""
 
-#: src/util/netlink.c:149
-msgid "nlComm is not supported on non-linux platforms"
+#: src/util/sysinfo.c:464
+#, c-format
+msgid "Failed to find path for %s binary"
 msgstr ""
 
-#: src/util/network.c:85 src/util/network.c:178
-msgid "Missing address"
+#: src/util/sysinfo.c:474
+#, c-format
+msgid "Failed to execute command %s"
 msgstr ""
 
-#: src/util/network.c:94
+#: src/util/sysinfo.c:680
 #, c-format
-msgid "Cannot parse socket address '%s': %s"
+msgid "unexpected sysinfo type model %d"
+msgstr ""
+
+#: src/util/sysinfo.c:713
+msgid "Target sysinfo does not match source"
 msgstr ""
 
-#: src/util/network.c:101
+#: src/util/sysinfo.c:719
 #, c-format
-msgid "No socket addresses found for '%s'"
+msgid "Target sysinfo %s does not match source %s"
 msgstr ""
 
-#: src/util/network.c:202
+#: src/util/sysinfo.c:729
 #, c-format
-msgid "Cannot convert socket address to string: %s"
+msgid "Target sysinfo %s %s does not match source %s"
 msgstr ""
 
-#: src/util/network.c:709
-msgid "missing virtualportprofile type"
+#: src/util/util.c:328
+msgid "Unknown poll response."
 msgstr ""
 
-#: src/util/network.c:739
-msgid "cannot parse value of managerid parameter"
+#: src/util/util.c:362
+msgid "poll error"
 msgstr ""
 
-#: src/util/network.c:745
-msgid "value of managerid out of range"
+#: src/util/util.c:451
+#, c-format
+msgid "Failed to open file '%s'"
 msgstr ""
 
-#: src/util/network.c:753
-msgid "cannot parse value of typeid parameter"
+#: src/util/util.c:458
+#, c-format
+msgid "Failed to read file '%s'"
 msgstr ""
 
-#: src/util/network.c:759
-msgid "value for typeid out of range"
+#: src/util/util.c:745
+#, c-format
+msgid "failed to create file '%s'"
 msgstr ""
 
-#: src/util/network.c:767
-msgid "cannot parse value of typeidversion parameter"
+#: src/util/util.c:794
+#, c-format
+msgid "failed to create directory '%s'"
 msgstr ""
 
-#: src/util/network.c:773
-msgid "value of typeidversion out of range"
+#: src/util/util.c:866
+#, c-format
+msgid "failed to create socket needed for '%s'"
 msgstr ""
 
-#: src/util/network.c:783
-msgid "cannot parse instanceid parameter as a uuid"
+#: src/util/util.c:901 src/util/util.c:994
+#, c-format
+msgid "failed to wait for child creating '%s'"
 msgstr ""
 
-#: src/util/network.c:789
-msgid "cannot generate a random uuid for instanceid"
+#: src/util/util.c:1024
+#, c-format
+msgid "child failed to create directory '%s'"
 msgstr ""
 
-#: src/util/network.c:798
-msgid "a parameter is missing for 802.1Qbg description"
+#: src/util/util.c:1040
+#, c-format
+msgid "cannot chown '%s' to group %u"
 msgstr ""
 
-#: src/util/network.c:810
-msgid "profileid parameter too long"
+#: src/util/util.c:1078
+msgid "virFileOpenAs is not implemented for WIN32"
 msgstr ""
 
-#: src/util/network.c:815
-msgid "profileid parameter is missing for 802.1Qbh descripion"
+#: src/util/util.c:1090
+msgid "virDirCreate is not implemented for WIN32"
 msgstr ""
 
-#: src/util/network.c:825
-msgid "unknown virtualport type"
+#: src/util/util.c:1913
+#, c-format
+msgid "Disk index %d is negative"
 msgstr ""
 
-#: src/util/network.c:931 src/util/network.c:998 src/util/network.c:1305
-msgid "invalid argument supplied"
+#: src/util/util.c:1969
+msgid "failed to determine host name"
 msgstr ""
 
-#: src/util/network.c:942 src/util/network.c:954 src/util/network.c:961
+#: src/util/util.c:2151
 #, c-format
-msgid "could not convert %s"
+msgid "Failed to find user record for uid '%u'"
 msgstr ""
 
-#: src/util/network.c:948
-msgid "Missing mandatory average attribute"
+#: src/util/util.c:2215
+#, c-format
+msgid "Failed to find user record for name '%s'"
 msgstr ""
 
-#: src/util/network.c:1007
-msgid "Only one child <inbound> element allowed"
+#: src/util/util.c:2264
+#, c-format
+msgid "Failed to find group record for name '%s'"
 msgstr ""
 
-#: src/util/network.c:1015
-msgid "Only one child <outbound> element allowed"
+#: src/util/util.c:2291
+#, c-format
+msgid "cannot change to '%d' group"
 msgstr ""
 
-#: src/util/pci.c:477
+#: src/util/util.c:2323
 #, c-format
-msgid "Active %s devices on bus with %s, not doing bus reset"
+msgid "cannot getpwuid_r(%d)"
 msgstr ""
 
-#: src/util/pci.c:486
+#: src/util/util.c:2330
 #, c-format
-msgid "Failed to find parent device for %s"
+msgid "cannot initgroups(\"%s\", %d)"
 msgstr ""
 
-#: src/util/pci.c:647 src/util/pci.c:693
+#: src/util/util.c:2339
 #, c-format
-msgid "Failed to read PCI config space for %s"
+msgid "cannot change to uid to '%d'"
 msgstr ""
 
-#: src/util/pci.c:519 src/util/pci.c:565
-#, c-format
-msgid "Failed to restore PCI config space for %s"
+#: src/util/util.c:2357
+msgid "virGetUserDirectory is not available"
+msgstr ""
+
+#: src/util/util.c:2366
+msgid "virGetUserName is not available"
+msgstr ""
+
+#: src/util/util.c:2375
+msgid "virGetUserID is not available"
 msgstr ""
 
-#: src/util/pci.c:578
+#: src/util/util.c:2385
+msgid "virGetGroupID is not available"
+msgstr ""
+
+#: src/util/util.c:2395
+msgid "virSetUIDGID is not available"
+msgstr ""
+
+#: src/util/viraudit.c:60
+msgid "Unable to initialize audit layer"
+msgstr ""
+
+#: src/util/virfile.c:150
+msgid "O_DIRECT unsupported on this platform"
+msgstr ""
+
+#: src/util/virfile.c:167
 #, c-format
-msgid "Failed to open config space file '%s'"
+msgid "invalid fd %d for %s"
 msgstr ""
 
-#: src/util/pci.c:600
+#: src/util/virfile.c:173
 #, c-format
-msgid "Not resetting active device %s"
+msgid "unexpected mode %x for %s"
 msgstr ""
 
-#: src/util/pci.c:627
+#: src/util/virfile.c:180
 #, c-format
-msgid "Unable to reset PCI device %s: %s"
+msgid "unable to create pipe for %s"
 msgstr ""
 
-#: src/util/pci.c:629
-msgid "no FLR, PM reset or bus reset available"
+#: src/util/virfile.c:200
+msgid "unable to close pipe"
 msgstr ""
 
-#: src/util/pci.c:906
+#: src/util/virfile.c:354
 #, c-format
-msgid "Failed to unbind PCI device '%s' from %s"
+msgid "cannot create file '%s'"
 msgstr ""
 
-#: src/util/pci.c:924
+#: src/util/virfile.c:360
 #, c-format
-msgid "Failed to remove slot for PCI device '%s' from %s"
+msgid "cannot write data to file '%s'"
 msgstr ""
 
-#: src/util/pci.c:818
+#: src/util/virfile.c:366
 #, c-format
-msgid "Failed to trigger a re-probe for PCI device '%s'"
+msgid "cannot sync file '%s'"
 msgstr ""
 
-#: src/util/pci.c:712
+#: src/util/virfile.c:372
 #, c-format
-msgid "Failed to add PCI device ID '%s' to %s"
+msgid "cannot save file '%s'"
 msgstr ""
 
-#: src/util/pci.c:725
+#: src/util/virfile.c:378
 #, c-format
-msgid "Failed to unbind PCI device '%s'"
+msgid "cannot rename file '%s' as '%s'"
 msgstr ""
 
-#: src/util/pci.c:738
+#: src/util/virnetdev.c:62 src/util/virnetdev.c:486
+#: src/util/virnetdevbridge.c:61 src/util/virnetdevtap.c:146
+#: src/util/virnetdevtap.c:204
 #, c-format
-msgid "Failed to add slot for PCI device '%s' to %s"
+msgid "Network interface name '%s' is too long"
 msgstr ""
 
-#: src/util/pci.c:746 src/util/pci.c:793
-#, c-format
-msgid "Failed to bind PCI device '%s' to %s"
+#: src/util/virnetdev.c:69 src/util/virnetdevbridge.c:69
+msgid "Cannot open network interface control socket"
 msgstr ""
 
-#: src/util/pci.c:758
-#, c-format
-msgid "Failed to remove PCI ID '%s' from %s"
+#: src/util/virnetdev.c:75 src/util/virnetdevbridge.c:75
+msgid "Cannot set close-on-exec flag for socket"
 msgstr ""
 
-#: src/util/pci.c:772 src/util/pci.c:833
-msgid "cannot find any PCI stub module"
+#: src/util/virnetdev.c:115
+#, c-format
+msgid "Unable to check interface flags for %s"
 msgstr ""
 
-#: src/util/pci.c:1131
+#: src/util/virnetdev.c:129
 #, c-format
-msgid "Not detaching active device %s"
+msgid "Unable to check interface %s"
 msgstr ""
 
-#: src/util/pci.c:1150
+#: src/util/virnetdev.c:159 src/util/virnetdev.c:213 src/util/virnetdev.c:231
 #, c-format
-msgid "Not reattaching active device %s"
+msgid "Cannot get interface MAC on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1321
+#: src/util/virnetdev.c:168 src/util/virnetdev.c:184
 #, c-format
-msgid "dev->name buffer overflow: %.4x:%.2x:%.2x.%.1x"
+msgid "Cannot set interface MAC on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1333
+#: src/util/virnetdev.c:269
 #, c-format
-msgid "Device %s not found: could not access %s"
+msgid "Unable to preserve mac for %s"
 msgstr ""
 
-#: src/util/pci.c:896
+#: src/util/virnetdev.c:310
 #, c-format
-msgid "Failed to read product/vendor ID for %s"
+msgid "Cannot parse MAC address from '%s'"
 msgstr ""
 
-#: src/util/pci.c:1352
+#: src/util/virnetdev.c:345 src/util/virnetdev.c:360
 #, c-format
-msgid "dev->id buffer overflow: %s %s"
+msgid "Cannot get interface MTU on '%s'"
 msgstr ""
 
-#: src/util/pci.c:975
+#: src/util/virnetdev.c:391 src/util/virnetdev.c:406
 #, c-format
-msgid "Device %s is already in use"
+msgid "Cannot set interface MTU on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1733
+#: src/util/virnetdev.c:493
 #, c-format
-msgid "Device %s is behind a switch lacking ACS and cannot be assigned"
+msgid "Unable to rename '%s' to '%s'"
 msgstr ""
 
-#: src/util/pci.c:1830
+#: src/util/virnetdev.c:508
 #, c-format
-msgid "Failed to resolve device link '%s': '%s'"
+msgid "Cannot rename interface '%s' to '%s' on this platform"
 msgstr ""
 
-#: src/util/pci.c:1844
+#: src/util/virnetdev.c:538 src/util/virnetdev.c:598 src/util/virnetdev.c:615
 #, c-format
-msgid "Failed to parse PCI config address '%s'"
+msgid "Cannot get interface flags on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1911
+#: src/util/virnetdev.c:552 src/util/virnetdev.c:569
 #, c-format
-msgid "Failed to open dir '%s': '%s'"
+msgid "Cannot set interface flags on '%s'"
 msgstr ""
 
-#: src/util/pci.c:1942
+#: src/util/virnetdev.c:640 src/util/virnetdev.c:689
+msgid "Unable to open control socket"
+msgstr ""
+
+#: src/util/virnetdev.c:649 src/util/virnetdev.c:695
 #, c-format
-msgid "Failed to get SR IOV function from device link '%s'"
+msgid "invalid interface name %s"
 msgstr ""
 
-#: src/util/pci.c:2004
+#: src/util/virnetdev.c:656
 #, c-format
-msgid "Error getting physical function's '%s' virtual_functions"
+msgid "Unable to get index for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2076
-msgid "pciGetPhysicalFunction is not supported on non-linux platforms"
+#: src/util/virnetdev.c:672
+msgid "Unable to get interface index on this platform"
 msgstr ""
 
-#: src/util/pci.c:2086
-msgid "pciGetVirtualFunctions is not supported on non-linux platforms"
+#: src/util/virnetdev.c:702
+#, c-format
+msgid "Unable to get VLAN for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2094
-msgid "pciDeviceIsVirtualFunction is not supported on non-linux platforms"
+#: src/util/virnetdev.c:719
+msgid "Unable to get VLAN on this platform"
 msgstr ""
 
-#: src/util/pci.c:2104
-msgid "pciGetVirtualFunctionIndex is not supported on non-linux platforms"
+#: src/util/virnetdev.c:837
+#, c-format
+msgid "Unable to get IPv4 address for interface %s"
 msgstr ""
 
-#: src/util/pci.c:2114
-msgid "pciDeviceNetName is not supported on non-linux platforms"
+#: src/util/virnetdev.c:857
+msgid "Unable to get IPv4 address on this platform"
 msgstr ""
 
-#: src/util/processinfo.c:77 src/util/processinfo.c:93
-#: src/util/processinfo.c:138 src/util/processinfo.c:152
+#: src/util/virnetdev.c:903
 #, c-format
-msgid "cannot set CPU affinity on process %d"
+msgid "coud not get MAC address of interface %s"
 msgstr ""
 
-#: src/util/processinfo.c:136 src/util/processinfo.c:150
-#, c-format
-msgid "cannot get CPU affinity of process %d"
+#: src/util/virnetdev.c:935
+msgid "Unable to check interface config on this platform"
 msgstr ""
 
-#: src/util/processinfo.c:172 src/util/processinfo.c:182
-msgid "Process CPU affinity is not supported on this platform"
+#: src/util/virnetdev.c:1063
+msgid "Unable to check virtual function status on this platfornm"
 msgstr ""
 
-#: src/util/sexpr.c:245
-#, c-format
-msgid "unknown s-expression kind %d"
+#: src/util/virnetdev.c:1073
+msgid "Unable to get virtual function index on this platfornm"
 msgstr ""
 
-#: src/util/stats_linux.c:54
-msgid "Could not open /proc/net/dev"
+#: src/util/virnetdev.c:1082
+msgid "Unable to get physical function status on this platfornm"
 msgstr ""
 
-#: src/util/stats_linux.c:110
-msgid "/proc/net/dev: Interface not found"
+#: src/util/virnetdevbridge.c:118 src/util/virnetdevbridge.c:129
+#: src/util/virnetdevbridge.c:136
+#, c-format
+msgid "Unable to set bridge %s %s"
 msgstr ""
 
-#: src/util/storage_file.c:760
+#: src/util/virnetdevbridge.c:170 src/util/virnetdevbridge.c:182
+#: src/util/virnetdevbridge.c:192
 #, c-format
-msgid "cannot set to start of '%s'"
+msgid "Unable to get bridge %s %s"
 msgstr ""
 
-#: src/util/storage_file.c:289
+#: src/util/virnetdevbridge.c:224 src/util/virnetdevbridge.c:238
 #, c-format
-msgid "cannot read header '%s'"
+msgid "Unable to create bridge %s"
 msgstr ""
 
-#: src/util/storage_file.c:415
+#: src/util/virnetdevbridge.c:262 src/util/virnetdevbridge.c:276
 #, c-format
-msgid "cannot open file '%s'"
+msgid "Unable to delete bridge %s"
 msgstr ""
 
-#: src/util/storage_file.c:851
+#: src/util/virnetdevbridge.c:303 src/util/virnetdevbridge.c:350
 #, c-format
-msgid "cannot seek to start of '%s'"
+msgid "Unable to get interface index for %s"
 msgstr ""
 
-#: src/util/storage_file.c:870
+#: src/util/virnetdevbridge.c:309 src/util/virnetdevbridge.c:323
 #, c-format
-msgid "unknown storage file format %d"
+msgid "Unable to add bridge %s port %s"
 msgstr ""
 
-#: src/util/storage_file.c:974
+#: src/util/virnetdevbridge.c:357 src/util/virnetdevbridge.c:371
 #, c-format
-msgid "Invalid relative path '%s'"
+msgid "Unable to remove bridge %s port %s"
 msgstr ""
 
-#: src/util/storage_file.c:992
+#: src/util/virnetdevbridge.c:502
 #, c-format
-msgid "cannot determine filesystem for '%s'"
+msgid "Unable to set STP delay on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:127
-msgid "Host sysinfo extraction not supported on this platform"
+#: src/util/virnetdevbridge.c:510
+#, c-format
+msgid "Unable to get STP delay on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:464
+#: src/util/virnetdevbridge.c:520
 #, c-format
-msgid "Failed to find path for %s binary"
+msgid "Unable to set STP on %s on this platform"
 msgstr ""
 
-#: src/util/sysinfo.c:474
+#: src/util/virnetdevbridge.c:528
 #, c-format
-msgid "Failed to execute command %s"
+msgid "Unable to get STP on %s on this platform"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:184
+#, c-format
+msgid "error creating %s type of interface"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:208 src/util/virnetdevmacvlan.c:294
+#: src/util/virnetdevvportprofile.c:275 src/util/virnetdevvportprofile.c:562
+msgid "malformed netlink response message"
+msgstr ""
+
+#: src/util/virnetdevmacvlan.c:216 src/util/virnetdevmacvlan.c:302
+#: src/util/virnetdevvportprofile.c:283 src/util/virnetdevvportprofile.c:570
+msgid "allocated netlink buffer is too small"
 msgstr ""
 
-#: src/util/sysinfo.c:680
+#: src/util/virnetdevmacvlan.c:270
 #, c-format
-msgid "unexpected sysinfo type model %d"
+msgid "error destroying %s interface"
 msgstr ""
 
-#: src/util/sysinfo.c:713
-msgid "Target sysinfo does not match source"
+#: src/util/virnetdevmacvlan.c:329
+msgid "buffer for ifindex path is too small"
 msgstr ""
 
-#: src/util/sysinfo.c:719
+#: src/util/virnetdevmacvlan.c:337
 #, c-format
-msgid "Target sysinfo %s does not match source %s"
+msgid "cannot open macvtap file %s to determine interface index"
 msgstr ""
 
-#: src/util/sysinfo.c:729
-#, c-format
-msgid "Target sysinfo %s %s does not match source %s"
+#: src/util/virnetdevmacvlan.c:344
+msgid "cannot determine macvtap's tap device interface index"
 msgstr ""
 
-#: src/util/util.c:736
-msgid "Unknown poll response."
+#: src/util/virnetdevmacvlan.c:356
+msgid "internal buffer for tap device is too small"
 msgstr ""
 
-#: src/util/util.c:767
-msgid "poll error"
+#: src/util/virnetdevmacvlan.c:373
+#, c-format
+msgid "cannot open macvtap tap device %s"
 msgstr ""
 
-#: src/util/util.c:968
-#, c-format
-msgid "Failed to open file '%s'"
+#: src/util/virnetdevmacvlan.c:407
+msgid "cannot get interface flags on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:975
-#, c-format
-msgid "Failed to read file '%s'"
+#: src/util/virnetdevmacvlan.c:416
+msgid "cannot clean IFF_VNET_HDR flag on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:747
-#, c-format
-msgid "failed to create file '%s'"
+#: src/util/virnetdevmacvlan.c:420
+msgid "cannot get feature flags on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:796
-#, c-format
-msgid "failed to create directory '%s'"
+#: src/util/virnetdevmacvlan.c:425
+msgid "cannot set IFF_VNET_HDR flag on macvtap tap"
 msgstr ""
 
-#: src/util/util.c:868
+#: src/util/virnetdevmacvlan.c:517
 #, c-format
-msgid "failed to create socket needed for '%s'"
+msgid "Unable to create macvlan device %s"
 msgstr ""
 
-#: src/util/util.c:903 src/util/util.c:996
-#, c-format
-msgid "failed to wait for child creating '%s'"
+#: src/util/virnetdevmacvlan.c:653 src/util/virnetdevmacvlan.c:660
+#: src/util/virnetdevmacvlan.c:678 src/util/virnetdevmacvlan.c:690
+msgid "Cannot create macvlan devices on this platform"
+msgstr ""
+
+#: src/util/virnetdevtap.c:131 src/util/virnetdevtap.c:195
+msgid "Unable to open /dev/net/tun, is tun module loaded?"
 msgstr ""
 
-#: src/util/util.c:1026
+#: src/util/virnetdevtap.c:154
 #, c-format
-msgid "child failed to create directory '%s'"
+msgid "Unable to create tap device %s"
 msgstr ""
 
-#: src/util/util.c:1042
+#: src/util/virnetdevtap.c:162
 #, c-format
-msgid "cannot chown '%s' to group %u"
+msgid "Unable to set tap device %s to persistent"
 msgstr ""
 
-#: src/util/util.c:1080
-msgid "virFileOpenAs is not implemented for WIN32"
+#: src/util/virnetdevtap.c:211
+msgid "Unable to associate TAP device"
 msgstr ""
 
-#: src/util/util.c:1092
-msgid "virDirCreate is not implemented for WIN32"
+#: src/util/virnetdevtap.c:217
+msgid "Unable to make TAP device non-persistent"
 msgstr ""
 
-#: src/util/util.c:1790
-#, c-format
-msgid "Disk index %d is negative"
+#: src/util/virnetdevtap.c:233
+msgid "Unable to create TAP devices on this platform"
 msgstr ""
 
-#: src/util/util.c:1826
-msgid "failed to determine host name"
+#: src/util/virnetdevtap.c:239
+msgid "Unable to delete TAP devices on this platform"
 msgstr ""
 
-#: src/util/util.c:2153
-#, c-format
-msgid "Failed to find user record for uid '%u'"
+#: src/util/virnetdevvportprofile.c:154
+msgid "error parsing pid of lldpad"
 msgstr ""
 
-#: src/util/util.c:2028
+#: src/util/virnetdevvportprofile.c:159
 #, c-format
-msgid "Failed to find user record for name '%s'"
+msgid "Error opening file %s"
 msgstr ""
 
-#: src/util/util.c:2065
+#: src/util/virnetdevvportprofile.c:245
 #, c-format
-msgid "Failed to find group record for name '%s'"
+msgid "error dumping %s (%d) interface"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:2306
-#, c-format
-msgid "cannot change to '%d' group"
+#: src/util/virnetdevvportprofile.c:314
+msgid "error parsing IFLA_PORT_SELF part"
 msgstr ""
 
-#: src/util/util.c:2325
-#, c-format
-msgid "cannot getpwuid_r(%d)"
+#: src/util/virnetdevvportprofile.c:318
+msgid "IFLA_PORT_SELF is missing"
 msgstr ""
 
-#: src/util/util.c:2332
-#, c-format
-msgid "cannot initgroups(\"%s\", %d)"
+#: src/util/virnetdevvportprofile.c:330
+msgid "error while iterating over IFLA_VF_PORTS part"
 msgstr ""
 
-#: src/util/util.c:2341
-#, c-format
-msgid "cannot change to uid to '%d'"
+#: src/util/virnetdevvportprofile.c:336
+msgid "error parsing IFLA_VF_PORT part"
 msgstr ""
 
-#: src/util/util.c:2359
-msgid "virGetUserDirectory is not available"
+#: src/util/virnetdevvportprofile.c:354
+msgid "Could not find netlink response with expected parameters"
 msgstr ""
 
-#: src/util/util.c:2368
-msgid "virGetUserName is not available"
+#: src/util/virnetdevvportprofile.c:359
+msgid "IFLA_VF_PORTS is missing"
 msgstr ""
 
-#: src/util/util.c:2377
-msgid "virGetUserID is not available"
+#: src/util/virnetdevvportprofile.c:373
+msgid "no IFLA_PORT_RESPONSE found in netlink message"
 msgstr ""
 
-#: src/util/util.c:2387
-msgid "virGetGroupID is not available"
+#: src/util/virnetdevvportprofile.c:536
+#, c-format
+msgid "error during virtual port configuration of ifindex %d"
 msgstr ""
 
-#: src/util/util.c:2397
-msgid "virSetUIDGID is not available"
+#: src/util/virnetdevvportprofile.c:618
+msgid "buffer for root interface name is too small"
 msgstr ""
 
-#: src/qemu/qemu_driver.c:300 src/qemu/qemu_driver.c:342
-#: src/xen/xm_internal.c:496
-msgid "cannot get time of day"
+#: src/util/virnetdevvportprofile.c:674
+msgid "sending of PortProfileRequest failed."
 msgstr ""
 
-#: src/util/viraudit.c:60
-msgid "Unable to initialize audit layer"
+#: src/util/virnetdevvportprofile.c:695
+#, c-format
+msgid "error %d during port-profile setlink on interface %s (%d)"
 msgstr ""
 
-#: src/util/virfile.c:150
-msgid "O_DIRECT unsupported on this platform"
+#: src/util/virnetdevvportprofile.c:709
+msgid "port-profile setlink timed out"
 msgstr ""
 
-#: src/util/virfile.c:167
+#: src/util/virnetdevvportprofile.c:793 src/util/virnetdevvportprofile.c:925
 #, c-format
-msgid "invalid fd %d for %s"
+msgid "operation type %d not supported"
 msgstr ""
 
-#: src/util/virfile.c:173
-#, c-format
-msgid "unexpected mode %x for %s"
+#: src/util/virnetdevvportprofile.c:1062 src/util/virnetdevvportprofile.c:1073
+msgid "Virtual port profile association not supported on this platform"
 msgstr ""
 
-#: src/util/virfile.c:180
-#, c-format
-msgid "unable to create pipe for %s"
+#: src/util/virnodesuspend.c:99
+msgid "Suspend duration is too short"
 msgstr ""
 
-#: src/util/virfile.c:200
-msgid "unable to close pipe"
+#: src/util/virnodesuspend.c:202
+msgid "Suspend operation already in progress"
 msgstr ""
 
-#: src/util/virfile.c:354
-#, c-format
-msgid "cannot create file '%s'"
+#: src/util/virnodesuspend.c:210
+msgid "Suspend-to-RAM"
 msgstr ""
 
-#: src/util/virfile.c:360
-#, c-format
-msgid "cannot write data to file '%s'"
+#: src/util/virnodesuspend.c:218
+msgid "Suspend-to-Disk"
 msgstr ""
 
-#: src/util/virfile.c:366
-#, c-format
-msgid "cannot sync file '%s'"
+#: src/util/virnodesuspend.c:226
+msgid "Hybrid-Suspend"
 msgstr ""
 
-#: src/util/virfile.c:372
-#, c-format
-msgid "cannot save file '%s'"
+#: src/util/virnodesuspend.c:233
+msgid "Invalid suspend target"
 msgstr ""
 
-#: src/util/virfile.c:378
-#, c-format
-msgid "cannot rename file '%s' as '%s'"
+#: src/util/virnodesuspend.c:243
+msgid "Failed to create thread to suspend the host\n"
 msgstr ""
 
 #: src/util/virpidfile.c:321
@@ -15733,674 +16364,701 @@
 msgid "Failed to write to pid file '%s'"
 msgstr ""
 
-#: src/util/virterror.c:223
+#: src/util/virsocketaddr.c:95 src/util/virsocketaddr.c:188
+msgid "Missing address"
+msgstr ""
+
+#: src/util/virsocketaddr.c:104
+#, c-format
+msgid "Cannot parse socket address '%s': %s"
+msgstr ""
+
+#: src/util/virsocketaddr.c:111
+#, c-format
+msgid "No socket addresses found for '%s'"
+msgstr ""
+
+#: src/util/virsocketaddr.c:212
+#, c-format
+msgid "Cannot convert socket address to string: %s"
+msgstr ""
+
+#: src/util/virterror.c:226
 msgid "An error occurred, but the cause is unknown"
 msgstr ""
 
-#: src/util/virterror.c:537
+#: src/util/virterror.c:572
 msgid "warning"
 msgstr "warning"
 
-#: src/util/virterror.c:540
+#: src/util/virterror.c:575 tools/virsh.c:16932
 msgid "error"
 msgstr "error"
 
-#: src/util/virterror.c:674
+#: src/util/virterror.c:705
 msgid "No error message provided"
 msgstr "No error message provided"
 
-#: src/util/virterror.c:737
+#: src/util/virterror.c:768
 #, c-format
 msgid "internal error %s"
 msgstr "internal error %s"
 
-#: src/util/virterror.c:739
+#: src/util/virterror.c:770
 msgid "internal error"
 msgstr "internal error"
 
-#: src/util/virterror.c:742
+#: src/util/virterror.c:773 tools/virsh.c:12077
 msgid "out of memory"
 msgstr "out of memory"
 
-#: src/util/virterror.c:774
+#: src/util/virterror.c:777
 msgid "this function is not supported by the connection driver"
 msgstr ""
 
-#: src/util/virterror.c:776
+#: src/util/virterror.c:779
 #, c-format
 msgid "this function is not supported by the connection driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:780
+#: src/util/virterror.c:783
 msgid "no connection driver available"
 msgstr ""
 
-#: src/util/virterror.c:782
+#: src/util/virterror.c:785
 #, c-format
 msgid "no connection driver available for %s"
 msgstr ""
 
-#: src/util/virterror.c:758
+#: src/util/virterror.c:789
 msgid "invalid connection pointer in"
 msgstr "invalid connection pointer in"
 
-#: src/util/virterror.c:760
+#: src/util/virterror.c:791
 #, c-format
 msgid "invalid connection pointer in %s"
 msgstr "invalid connection pointer in %s"
 
-#: src/util/virterror.c:764
+#: src/util/virterror.c:795
 msgid "invalid domain pointer in"
 msgstr "invalid domain pointer in"
 
-#: src/util/virterror.c:766
+#: src/util/virterror.c:797
 #, c-format
 msgid "invalid domain pointer in %s"
 msgstr "invalid domain pointer in %s"
 
-#: src/util/virterror.c:798
+#: src/util/virterror.c:801
 msgid "invalid argument"
 msgstr ""
 
-#: src/util/virterror.c:800
+#: src/util/virterror.c:803
 #, c-format
 msgid "invalid argument: %s"
 msgstr ""
 
-#: src/util/virterror.c:776
+#: src/util/virterror.c:807
 #, c-format
 msgid "operation failed: %s"
 msgstr "operation failed: %s"
 
-#: src/util/virterror.c:778
+#: src/util/virterror.c:809
 msgid "operation failed"
 msgstr "operation failed"
 
-#: src/util/virterror.c:782
+#: src/util/virterror.c:813
 #, c-format
 msgid "GET operation failed: %s"
 msgstr "GET operation failed: %s"
 
-#: src/util/virterror.c:784
+#: src/util/virterror.c:815
 msgid "GET operation failed"
 msgstr "GET operation failed"
 
-#: src/util/virterror.c:788
+#: src/util/virterror.c:819
 #, c-format
 msgid "POST operation failed: %s"
 msgstr "POST operation failed: %s"
 
-#: src/util/virterror.c:790
+#: src/util/virterror.c:821
 msgid "POST operation failed"
 msgstr "POST operation failed"
 
-#: src/util/virterror.c:793
+#: src/util/virterror.c:824
 #, c-format
 msgid "got unknown HTTP error code %d"
 msgstr "got unknown HTTP error code %d"
 
-#: src/util/virterror.c:797
+#: src/util/virterror.c:828
 #, c-format
 msgid "unknown host %s"
 msgstr "unknown host %s"
 
-#: src/util/virterror.c:799
+#: src/util/virterror.c:830
 msgid "unknown host"
 msgstr "unknown host"
 
-#: src/util/virterror.c:803
+#: src/util/virterror.c:834
 #, c-format
 msgid "failed to serialize S-Expr: %s"
 msgstr "failed to serialize S-Expr: %s"
 
-#: src/util/virterror.c:805
+#: src/util/virterror.c:836
 msgid "failed to serialize S-Expr"
 msgstr "failed to serialize S-Expr"
 
-#: src/util/virterror.c:809
+#: src/util/virterror.c:840
 msgid "could not use Xen hypervisor entry"
 msgstr "could not use Xen hypervisor entry"
 
-#: src/util/virterror.c:811
+#: src/util/virterror.c:842
 #, c-format
 msgid "could not use Xen hypervisor entry %s"
 msgstr "could not use Xen hypervisor entry %s"
 
-#: src/util/virterror.c:815
+#: src/util/virterror.c:846
 msgid "could not connect to Xen Store"
 msgstr "could not connect to Xen Store"
 
-#: src/util/virterror.c:817
+#: src/util/virterror.c:848
 #, c-format
 msgid "could not connect to Xen Store %s"
 msgstr "could not connect to Xen Store %s"
 
-#: src/util/virterror.c:820
+#: src/util/virterror.c:851
 #, c-format
 msgid "failed Xen syscall %s"
 msgstr ""
 
-#: src/util/virterror.c:824
+#: src/util/virterror.c:855
 msgid "unknown OS type"
 msgstr "unknown OS type"
 
-#: src/util/virterror.c:826
+#: src/util/virterror.c:857
 #, c-format
 msgid "unknown OS type %s"
 msgstr "unknown OS type %s"
 
-#: src/util/virterror.c:829
+#: src/util/virterror.c:860
 msgid "missing kernel information"
 msgstr "missing kernel information"
 
-#: src/util/virterror.c:833
+#: src/util/virterror.c:864
 msgid "missing root device information"
 msgstr "missing root device information"
 
-#: src/util/virterror.c:835
+#: src/util/virterror.c:866
 #, c-format
 msgid "missing root device information in %s"
 msgstr "missing root device information in %s"
 
-#: src/util/virterror.c:839
+#: src/util/virterror.c:870
 msgid "missing source information for device"
 msgstr "missing source information for device"
 
-#: src/util/virterror.c:841
+#: src/util/virterror.c:872
 #, c-format
 msgid "missing source information for device %s"
 msgstr "missing source information for device %s"
 
-#: src/util/virterror.c:845
+#: src/util/virterror.c:876
 msgid "missing target information for device"
 msgstr "missing target information for device"
 
-#: src/util/virterror.c:847
+#: src/util/virterror.c:878
 #, c-format
 msgid "missing target information for device %s"
 msgstr "missing target information for device %s"
 
-#: src/util/virterror.c:851
+#: src/util/virterror.c:882
 msgid "missing domain name information"
 msgstr "missing domain name information"
 
-#: src/util/virterror.c:853
+#: src/util/virterror.c:884
 #, c-format
 msgid "missing domain name information in %s"
 msgstr "missing domain name information in %s"
 
-#: src/util/virterror.c:857
+#: src/util/virterror.c:888
 msgid "missing operating system information"
 msgstr "missing operating system information"
 
-#: src/util/virterror.c:859
+#: src/util/virterror.c:890
 #, c-format
 msgid "missing operating system information for %s"
 msgstr "missing operating system information for %s"
 
-#: src/util/virterror.c:863
+#: src/util/virterror.c:894
 msgid "missing devices information"
 msgstr "missing devices information"
 
-#: src/util/virterror.c:865
+#: src/util/virterror.c:896
 #, c-format
 msgid "missing devices information for %s"
 msgstr "missing devices information for %s"
 
-#: src/util/virterror.c:869
+#: src/util/virterror.c:900
 msgid "too many drivers registered"
 msgstr "too many drivers registered"
 
-#: src/util/virterror.c:871
+#: src/util/virterror.c:902
 #, c-format
 msgid "too many drivers registered in %s"
 msgstr "too many drivers registered in %s"
 
-#: src/util/virterror.c:875
+#: src/util/virterror.c:906
 msgid "library call failed, possibly not supported"
 msgstr "library call failed, possibly not supported"
 
-#: src/util/virterror.c:877
+#: src/util/virterror.c:908
 #, c-format
 msgid "library call %s failed, possibly not supported"
 msgstr "library call %s failed, possibly not supported"
 
-#: src/util/virterror.c:909
+#: src/util/virterror.c:912
 msgid "XML description is invalid or not well formed"
 msgstr ""
 
-#: src/util/virterror.c:911
+#: src/util/virterror.c:914
 #, c-format
 msgid "XML error: %s"
 msgstr ""
 
-#: src/util/virterror.c:887
+#: src/util/virterror.c:918
 msgid "this domain exists already"
 msgstr "this domain exists already"
 
-#: src/util/virterror.c:889
+#: src/util/virterror.c:920
 #, c-format
 msgid "domain %s exists already"
 msgstr "domain %s exists already"
 
-#: src/util/virterror.c:893
+#: src/util/virterror.c:924
 msgid "operation forbidden for read only access"
 msgstr "operation forbidden for read only access"
 
-#: src/util/virterror.c:895
+#: src/util/virterror.c:926
 #, c-format
 msgid "operation %s forbidden for read only access"
 msgstr "operation %s forbidden for read only access"
 
-#: src/util/virterror.c:899
+#: src/util/virterror.c:930
 msgid "failed to open configuration file for reading"
 msgstr "failed to open configuration file for reading"
 
-#: src/util/virterror.c:901
+#: src/util/virterror.c:932
 #, c-format
 msgid "failed to open %s for reading"
 msgstr "failed to open %s for reading"
 
-#: src/util/virterror.c:905
+#: src/util/virterror.c:936
 msgid "failed to read configuration file"
 msgstr "failed to read configuration file"
 
-#: src/util/virterror.c:907
+#: src/util/virterror.c:938
 #, c-format
 msgid "failed to read configuration file %s"
 msgstr "failed to read configuration file %s"
 
-#: src/util/virterror.c:911
+#: src/util/virterror.c:942
 msgid "failed to parse configuration file"
 msgstr "failed to parse configuration file"
 
-#: src/util/virterror.c:913
+#: src/util/virterror.c:944
 #, c-format
 msgid "failed to parse configuration file %s"
 msgstr "failed to parse configuration file %s"
 
-#: src/util/virterror.c:917
+#: src/util/virterror.c:948
 msgid "configuration file syntax error"
 msgstr "configuration file syntax error"
 
-#: src/util/virterror.c:919
+#: src/util/virterror.c:950
 #, c-format
 msgid "configuration file syntax error: %s"
 msgstr "configuration file syntax error: %s"
 
-#: src/util/virterror.c:923
+#: src/util/virterror.c:954
 msgid "failed to write configuration file"
 msgstr "failed to write configuration file"
 
-#: src/util/virterror.c:925
+#: src/util/virterror.c:956
 #, c-format
 msgid "failed to write configuration file: %s"
 msgstr "failed to write configuration file: %s"
 
-#: src/util/virterror.c:929
+#: src/util/virterror.c:960
 msgid "parser error"
 msgstr "parser error"
 
-#: src/util/virterror.c:935
+#: src/util/virterror.c:966
 msgid "invalid network pointer in"
 msgstr ""
 
-#: src/util/virterror.c:937
+#: src/util/virterror.c:968
 #, c-format
 msgid "invalid network pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:941
+#: src/util/virterror.c:972
 msgid "this network exists already"
 msgstr ""
 
-#: src/util/virterror.c:943
+#: src/util/virterror.c:974
 #, c-format
 msgid "network %s exists already"
 msgstr ""
 
-#: src/util/virterror.c:947
+#: src/util/virterror.c:978
 msgid "system call error"
 msgstr ""
 
-#: src/util/virterror.c:953
+#: src/util/virterror.c:984
 msgid "RPC error"
 msgstr ""
 
-#: src/util/virterror.c:959
+#: src/util/virterror.c:990
 msgid "GNUTLS call error"
 msgstr ""
 
-#: src/util/virterror.c:965
+#: src/util/virterror.c:996
 msgid "Failed to find the network"
 msgstr ""
 
-#: src/util/virterror.c:967
+#: src/util/virterror.c:998
 #, c-format
 msgid "Failed to find the network: %s"
 msgstr ""
 
-#: src/util/virterror.c:971
+#: src/util/virterror.c:1002
 msgid "Domain not found"
 msgstr ""
 
-#: src/util/virterror.c:973
+#: src/util/virterror.c:1004
 #, c-format
 msgid "Domain not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:977
+#: src/util/virterror.c:1008
 msgid "Network not found"
 msgstr ""
 
-#: src/util/virterror.c:979
+#: src/util/virterror.c:1010
 #, c-format
 msgid "Network not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:983
+#: src/util/virterror.c:1014
 msgid "invalid MAC address"
 msgstr ""
 
-#: src/util/virterror.c:985
+#: src/util/virterror.c:1016
 #, c-format
 msgid "invalid MAC address: %s"
 msgstr ""
 
-#: src/util/virterror.c:991
+#: src/util/virterror.c:1022
 #, c-format
 msgid "authentication failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:995
+#: src/util/virterror.c:1026
 msgid "Storage pool not found"
 msgstr ""
 
-#: src/util/virterror.c:997
+#: src/util/virterror.c:1028
 #, c-format
 msgid "Storage pool not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1001
+#: src/util/virterror.c:1032
 msgid "Storage volume not found"
 msgstr ""
 
-#: src/util/virterror.c:1003
+#: src/util/virterror.c:1034
 #, c-format
 msgid "Storage volume not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1035
+#: src/util/virterror.c:1038
 msgid "Storage pool probe failed"
 msgstr ""
 
-#: src/util/virterror.c:1037
+#: src/util/virterror.c:1040
 #, c-format
 msgid "Storage pool probe failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:1041
+#: src/util/virterror.c:1044
 msgid "Storage pool already built"
 msgstr ""
 
-#: src/util/virterror.c:1043
+#: src/util/virterror.c:1046
 #, c-format
 msgid "Storage pool already built: %s"
 msgstr ""
 
-#: src/util/virterror.c:1007
+#: src/util/virterror.c:1050
 msgid "invalid storage pool pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1009
+#: src/util/virterror.c:1052
 #, c-format
 msgid "invalid storage pool pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1013
+#: src/util/virterror.c:1056
 msgid "invalid storage volume pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1015
+#: src/util/virterror.c:1058
 #, c-format
 msgid "invalid storage volume pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1019
+#: src/util/virterror.c:1062
 msgid "Failed to find a storage driver"
 msgstr ""
 
-#: src/util/virterror.c:1021
+#: src/util/virterror.c:1064
 #, c-format
 msgid "Failed to find a storage driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1025
+#: src/util/virterror.c:1068
 msgid "Failed to find a node driver"
 msgstr ""
 
-#: src/util/virterror.c:1027
+#: src/util/virterror.c:1070
 #, c-format
 msgid "Failed to find a node driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1031
+#: src/util/virterror.c:1074
 msgid "invalid node device pointer"
 msgstr ""
 
-#: src/util/virterror.c:1033
+#: src/util/virterror.c:1076
 #, c-format
 msgid "invalid node device pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1037
+#: src/util/virterror.c:1080
 msgid "Node device not found"
 msgstr ""
 
-#: src/util/virterror.c:1039
+#: src/util/virterror.c:1082
 #, c-format
 msgid "Node device not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1043
+#: src/util/virterror.c:1086
 msgid "Security model not found"
 msgstr ""
 
-#: src/util/virterror.c:1045
+#: src/util/virterror.c:1088
 #, c-format
 msgid "Security model not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1049
+#: src/util/virterror.c:1092
 msgid "Requested operation is not valid"
 msgstr ""
 
-#: src/util/virterror.c:1051
+#: src/util/virterror.c:1094
 #, c-format
 msgid "Requested operation is not valid: %s"
 msgstr ""
 
-#: src/util/virterror.c:1055
+#: src/util/virterror.c:1098
 msgid "Failed to find the interface"
 msgstr ""
 
-#: src/util/virterror.c:1057
+#: src/util/virterror.c:1100
 #, c-format
 msgid "Failed to find the interface: %s"
 msgstr ""
 
-#: src/util/virterror.c:1061
+#: src/util/virterror.c:1104
 msgid "Interface not found"
 msgstr ""
 
-#: src/util/virterror.c:1063
+#: src/util/virterror.c:1106
 #, c-format
 msgid "Interface not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1067
+#: src/util/virterror.c:1110
 msgid "invalid interface pointer in"
 msgstr ""
 
-#: src/util/virterror.c:1069
+#: src/util/virterror.c:1112
 #, c-format
 msgid "invalid interface pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1073
+#: src/util/virterror.c:1116
 msgid "multiple matching interfaces found"
 msgstr ""
 
-#: src/util/virterror.c:1075
+#: src/util/virterror.c:1118
 #, c-format
 msgid "multiple matching interfaces found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1079
+#: src/util/virterror.c:1122
 msgid "Failed to find a secret storage driver"
 msgstr ""
 
-#: src/util/virterror.c:1081
+#: src/util/virterror.c:1124
 #, c-format
 msgid "Failed to find a secret storage driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1085
+#: src/util/virterror.c:1128
 msgid "Invalid secret"
 msgstr ""
 
-#: src/util/virterror.c:1087
+#: src/util/virterror.c:1130
 #, c-format
 msgid "Invalid secret: %s"
 msgstr ""
 
-#: src/util/virterror.c:1091
+#: src/util/virterror.c:1134
 msgid "Secret not found"
 msgstr ""
 
-#: src/util/virterror.c:1093
+#: src/util/virterror.c:1136
 #, c-format
 msgid "Secret not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1137
+#: src/util/virterror.c:1140
 msgid "Failed to start the nwfilter driver"
 msgstr ""
 
-#: src/util/virterror.c:1139
+#: src/util/virterror.c:1142
 #, c-format
 msgid "Failed to start the nwfilter driver: %s"
 msgstr ""
 
-#: src/util/virterror.c:1143
+#: src/util/virterror.c:1146
 msgid "Invalid network filter"
 msgstr ""
 
-#: src/util/virterror.c:1145
+#: src/util/virterror.c:1148
 #, c-format
 msgid "Invalid network filter: %s"
 msgstr ""
 
-#: src/util/virterror.c:1149
+#: src/util/virterror.c:1152
 msgid "Network filter not found"
 msgstr ""
 
-#: src/util/virterror.c:1151
+#: src/util/virterror.c:1154
 #, c-format
 msgid "Network filter not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1155
+#: src/util/virterror.c:1158
 msgid "Error while building firewall"
 msgstr ""
 
-#: src/util/virterror.c:1157
+#: src/util/virterror.c:1160
 #, c-format
 msgid "Error while building firewall: %s"
 msgstr ""
 
-#: src/util/virterror.c:1097
+#: src/util/virterror.c:1164
 msgid "unsupported configuration"
 msgstr ""
 
-#: src/util/virterror.c:1099
+#: src/util/virterror.c:1166
 #, c-format
 msgid "unsupported configuration: %s"
 msgstr ""
 
-#: src/util/virterror.c:1103
+#: src/util/virterror.c:1170
 msgid "Timed out during operation"
 msgstr ""
 
-#: src/util/virterror.c:1105
+#: src/util/virterror.c:1172
 #, c-format
 msgid "Timed out during operation: %s"
 msgstr ""
 
-#: src/util/virterror.c:1109
+#: src/util/virterror.c:1176
 msgid "Failed to make domain persistent after migration"
 msgstr ""
 
-#: src/util/virterror.c:1111
+#: src/util/virterror.c:1178
 #, c-format
 msgid "Failed to make domain persistent after migration: %s"
 msgstr ""
 
-#: src/util/virterror.c:1179
+#: src/util/virterror.c:1182
 msgid "Hook script execution failed"
 msgstr ""
 
-#: src/util/virterror.c:1181
+#: src/util/virterror.c:1184
 #, c-format
 msgid "Hook script execution failed: %s"
 msgstr ""
 
-#: src/util/virterror.c:1185
+#: src/util/virterror.c:1188
 msgid "Invalid snapshot"
 msgstr ""
 
-#: src/util/virterror.c:1187
+#: src/util/virterror.c:1190
 #, c-format
 msgid "Invalid snapshot: %s"
 msgstr ""
 
-#: src/util/virterror.c:1191
+#: src/util/virterror.c:1194
 msgid "Domain snapshot not found"
 msgstr ""
 
-#: src/util/virterror.c:1193
+#: src/util/virterror.c:1196
 #, c-format
 msgid "Domain snapshot not found: %s"
 msgstr ""
 
-#: src/util/virterror.c:1197
+#: src/util/virterror.c:1200
 msgid "invalid stream pointer"
 msgstr ""
 
-#: src/util/virterror.c:1199
+#: src/util/virterror.c:1202
 #, c-format
 msgid "invalid stream pointer in %s"
 msgstr ""
 
-#: src/util/virterror.c:1203
+#: src/util/virterror.c:1206
 msgid "argument unsupported"
 msgstr ""
 
-#: src/util/virterror.c:1205
+#: src/util/virterror.c:1208
 #, c-format
 msgid "argument unsupported: %s"
 msgstr ""
 
-#: src/util/virterror.c:1209
+#: src/util/virterror.c:1212
 msgid "revert requires force"
 msgstr ""
 
-#: src/util/virterror.c:1211
+#: src/util/virterror.c:1214
 #, c-format
 msgid "revert requires force: %s"
 msgstr ""
 
-#: src/util/xml.c:60
+#: src/util/virtime.c:288
+msgid "Unable to break out time format"
+msgstr ""
+
+#: src/util/virtime.c:316 src/util/virtime.c:347
+msgid "Unable to format time"
+msgstr ""
+
+#: src/util/xml.c:70
 msgid "Invalid parameter to virXPathString()"
 msgstr ""
 
@@ -16409,15 +17067,15 @@
 msgid "'%s' value longer than %zd bytes"
 msgstr ""
 
-#: src/util/xml.c:131
+#: src/util/xml.c:140
 msgid "Invalid parameter to virXPathNumber()"
 msgstr ""
 
-#: src/util/xml.c:161
+#: src/util/xml.c:169
 msgid "Invalid parameter to virXPathLong()"
 msgstr ""
 
-#: src/util/xml.c:248 src/util/xml.c:346
+#: src/util/xml.c:282 src/util/xml.c:406
 msgid "Invalid parameter to virXPathULong()"
 msgstr ""
 
@@ -16425,15 +17083,15 @@
 msgid "Invalid parameter to virXPathLongLong()"
 msgstr ""
 
-#: src/util/xml.c:404
+#: src/util/xml.c:517
 msgid "Invalid parameter to virXPathBoolean()"
 msgstr ""
 
-#: src/util/xml.c:442
+#: src/util/xml.c:554
 msgid "Invalid parameter to virXPathNode()"
 msgstr ""
 
-#: src/util/xml.c:483
+#: src/util/xml.c:594
 msgid "Invalid parameter to virXPathNodeSet()"
 msgstr ""
 
@@ -16456,21 +17114,11 @@
 "%s"
 msgstr ""
 
-#: src/conf/domain_conf.c:2611 src/conf/domain_conf.c:3498
-#: src/conf/domain_conf.c:3539 src/conf/domain_conf.c:3611
-#: src/conf/interface_conf.c:937 src/conf/interface_conf.c:977
-#: src/conf/network_conf.c:560 src/conf/network_conf.c:600
-#: src/conf/node_device_conf.c:1302 src/conf/secret_conf.c:241
-#: src/conf/storage_conf.c:800 src/conf/storage_conf.c:1210
+#: src/util/xml.c:774
 msgid "missing root element"
 msgstr ""
 
-#: src/conf/domain_conf.c:3492 src/conf/domain_conf.c:3533
-#: src/conf/domain_conf.c:3605 src/conf/interface_conf.c:931
-#: src/conf/interface_conf.c:971 src/conf/network_conf.c:554
-#: src/conf/network_conf.c:594 src/conf/node_device_conf.c:1296
-#: src/conf/secret_conf.c:234 src/conf/storage_conf.c:793
-#: src/conf/storage_conf.c:1203
+#: src/util/xml.c:798
 msgid "failed to parse xml document"
 msgstr ""
 
@@ -16519,21 +17167,21 @@
 msgid "Calling %s from '%s' failed"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:135 src/vbox/vbox_tmpl.c:788
+#: src/vbox/vbox_driver.c:166 src/vbox/vbox_tmpl.c:1001
 msgid "no VirtualBox driver path specified (try vbox:///session)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:142 src/vbox/vbox_tmpl.c:795
+#: src/vbox/vbox_driver.c:173 src/vbox/vbox_tmpl.c:1008
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///session)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:149 src/vbox/vbox_tmpl.c:802
+#: src/vbox/vbox_driver.c:180 src/vbox/vbox_tmpl.c:1015
 #, c-format
 msgid "unknown driver path '%s' specified (try vbox:///system)"
 msgstr ""
 
-#: src/vbox/vbox_driver.c:155
+#: src/vbox/vbox_driver.c:186
 msgid "unable to initialize VirtualBox driver API"
 msgstr ""
 
@@ -16553,390 +17201,390 @@
 msgid "Cound not extract VirtualBox version"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1127
+#: src/vbox/vbox_tmpl.c:1132
 #, c-format
 msgid "Could not get list of Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1164
+#: src/vbox/vbox_tmpl.c:1169
 #, c-format
 msgid "Could not get number of Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1236 src/vbox/vbox_tmpl.c:1296
-#: src/vbox/vbox_tmpl.c:1366 src/vbox/vbox_tmpl.c:1440
-#: src/vbox/vbox_tmpl.c:1853 src/vbox/vbox_tmpl.c:3679
+#: src/vbox/vbox_tmpl.c:1241 src/vbox/vbox_tmpl.c:1301
+#: src/vbox/vbox_tmpl.c:1371 src/vbox/vbox_tmpl.c:1445
+#: src/vbox/vbox_tmpl.c:1858 src/vbox/vbox_tmpl.c:3684
 #, c-format
 msgid "Could not get list of machines, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1536
+#: src/vbox/vbox_tmpl.c:1541
 msgid "error while suspending the domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1542
+#: src/vbox/vbox_tmpl.c:1547
 msgid "machine not in running state to suspend it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1588
+#: src/vbox/vbox_tmpl.c:1593
 msgid "error while resuming the domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1594
+#: src/vbox/vbox_tmpl.c:1599
 msgid "machine not paused, so can't resume it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1631
+#: src/vbox/vbox_tmpl.c:1636
 msgid "machine paused, so can't power it down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1635 src/vbox/vbox_tmpl.c:1735
+#: src/vbox/vbox_tmpl.c:1640 src/vbox/vbox_tmpl.c:1740
 msgid "machine already powered down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1693
+#: src/vbox/vbox_tmpl.c:1698
 msgid "machine not running, so can't reboot it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1811
+#: src/vbox/vbox_tmpl.c:1816
 msgid "memory size can't be changed unless domain is powered down"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1827 src/vbox/vbox_tmpl.c:5042
+#: src/vbox/vbox_tmpl.c:1832 src/vbox/vbox_tmpl.c:5047
 #, c-format
 msgid "could not set the memory size of the domain to: %lu Kb, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:1964 src/vbox/vbox_tmpl.c:5891
-#: src/vbox/vbox_tmpl.c:5993 src/vbox/vbox_tmpl.c:6098
-#: src/vbox/vbox_tmpl.c:6149 src/vbox/vbox_tmpl.c:6238
-#: src/vbox/vbox_tmpl.c:6270 src/vbox/vbox_tmpl.c:6312
-#: src/vbox/vbox_tmpl.c:6376 src/vbox/vbox_tmpl.c:6544
-#: src/vbox/vbox_tmpl.c:6702
+#: src/vbox/vbox_tmpl.c:1969 src/vbox/vbox_tmpl.c:5896
+#: src/vbox/vbox_tmpl.c:5998 src/vbox/vbox_tmpl.c:6103
+#: src/vbox/vbox_tmpl.c:6154 src/vbox/vbox_tmpl.c:6243
+#: src/vbox/vbox_tmpl.c:6275 src/vbox/vbox_tmpl.c:6317
+#: src/vbox/vbox_tmpl.c:6381 src/vbox/vbox_tmpl.c:6549
+#: src/vbox/vbox_tmpl.c:6707
 msgid "no domain with matching UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2101
+#: src/vbox/vbox_tmpl.c:2106
 #, c-format
 msgid "could not set the number of cpus of the domain to: %u, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2112
+#: src/vbox/vbox_tmpl.c:2117
 #, c-format
 msgid "can't open session to the domain with id %d"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:2765
+#: src/vbox/vbox_tmpl.c:2770
 #, c-format
 msgid ""
 "Could not generate medium name for the disk at: controller instance:%u, "
 "port:%d, slot:%d"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3405
+#: src/vbox/vbox_tmpl.c:3410
 #, c-format
 msgid "Could not get list of Defined Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3455
+#: src/vbox/vbox_tmpl.c:3460
 #, c-format
 msgid "Could not get number of Defined Domains, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3625
+#: src/vbox/vbox_tmpl.c:3630
 msgid "OpenRemoteSession/LaunchVMProcess failed, domain can't be started"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3672
+#: src/vbox/vbox_tmpl.c:3677
 msgid "Error while reading the domain name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3709
+#: src/vbox/vbox_tmpl.c:3714
 msgid "machine is not in poweroff|saved|aborted state, so couldn't start it"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3842 src/vbox/vbox_tmpl.c:5393
+#: src/vbox/vbox_tmpl.c:3847 src/vbox/vbox_tmpl.c:5398
 #, c-format
 msgid "can't get the uuid of the file to be attached to cdrom: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3849 src/vbox/vbox_tmpl.c:5402
+#: src/vbox/vbox_tmpl.c:3854 src/vbox/vbox_tmpl.c:5407
 #, c-format
 msgid "could not attach the file to cdrom: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3906
+#: src/vbox/vbox_tmpl.c:3911
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3952
+#: src/vbox/vbox_tmpl.c:3957
 #, c-format
 msgid "could not attach the file as harddisk: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:3998 src/vbox/vbox_tmpl.c:5446
+#: src/vbox/vbox_tmpl.c:4003 src/vbox/vbox_tmpl.c:5451
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached to floppy drive: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4006 src/vbox/vbox_tmpl.c:5453
+#: src/vbox/vbox_tmpl.c:4011 src/vbox/vbox_tmpl.c:5458
 #, c-format
 msgid "could not attach the file to floppy drive: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4186
+#: src/vbox/vbox_tmpl.c:4191
 #, c-format
 msgid ""
 "Failed to attach the following disk/dvd/floppy to the machine: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4196
+#: src/vbox/vbox_tmpl.c:4201
 #, c-format
 msgid ""
 "can't get the uuid of the file to be attached as harddisk/dvd/floppy: %s, "
 "rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4237
+#: src/vbox/vbox_tmpl.c:4242
 #, c-format
 msgid ""
 "can't get the port/slot number of harddisk/dvd/floppy to be attached: %s, "
 "rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:4260
+#: src/vbox/vbox_tmpl.c:4265
 #, c-format
 msgid "could not attach the file as harddisk/dvd/floppy: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5034 src/vbox/vbox_tmpl.c:5102
+#: src/vbox/vbox_tmpl.c:5039 src/vbox/vbox_tmpl.c:5107
 #, c-format
 msgid "could not define a domain, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5054
+#: src/vbox/vbox_tmpl.c:5059
 #, c-format
 msgid "could not set the number of virtual CPUs to: %u, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5072
+#: src/vbox/vbox_tmpl.c:5077
 #, c-format
 msgid "could not change PAE status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085
-#: src/vbox/vbox_tmpl.c:5093
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Enabled"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5074 src/vbox/vbox_tmpl.c:5085
-#: src/vbox/vbox_tmpl.c:5093
+#: src/vbox/vbox_tmpl.c:5079 src/vbox/vbox_tmpl.c:5090
+#: src/vbox/vbox_tmpl.c:5098
 msgid "Disabled"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5083
+#: src/vbox/vbox_tmpl.c:5088
 #, c-format
 msgid "could not change ACPI status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5091
+#: src/vbox/vbox_tmpl.c:5096
 #, c-format
 msgid "could not change APIC status to: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5298
+#: src/vbox/vbox_tmpl.c:5303
 #, c-format
 msgid "could not delete the domain, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5498
+#: src/vbox/vbox_tmpl.c:5503
 #, c-format
 msgid "could not attach shared folder '%s', rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5618
+#: src/vbox/vbox_tmpl.c:5623
 #, c-format
 msgid "could not de-attach the mounted ISO, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5639
+#: src/vbox/vbox_tmpl.c:5644
 #, c-format
 msgid "could not attach the file to floppy drive, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5674
+#: src/vbox/vbox_tmpl.c:5679
 #, c-format
 msgid "could not detach shared folder '%s', rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5726 src/vbox/vbox_tmpl.c:6111
+#: src/vbox/vbox_tmpl.c:5731 src/vbox/vbox_tmpl.c:6116
 #, c-format
 msgid "could not get snapshot count for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5746 src/vbox/vbox_tmpl.c:6172
+#: src/vbox/vbox_tmpl.c:5751 src/vbox/vbox_tmpl.c:6177
 #, c-format
 msgid "could not get root snapshot for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5759
+#: src/vbox/vbox_tmpl.c:5764
 #, c-format
 msgid "unexpected number of snapshots < %u"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5767 src/vbox/vbox_tmpl.c:6666
+#: src/vbox/vbox_tmpl.c:5772 src/vbox/vbox_tmpl.c:6671
 msgid "could not get children snapshots"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5776
+#: src/vbox/vbox_tmpl.c:5781
 #, c-format
 msgid "unexpected number of snapshots > %u"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5822 src/vbox/vbox_tmpl.c:6192
+#: src/vbox/vbox_tmpl.c:5827 src/vbox/vbox_tmpl.c:6197
 msgid "could not get snapshot name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5837
+#: src/vbox/vbox_tmpl.c:5842
 #, c-format
 msgid "domain %s has no snapshots with name %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5898 src/vbox/vbox_tmpl.c:6471
-#: src/vbox/vbox_tmpl.c:6571 src/vbox/vbox_tmpl.c:6713
+#: src/vbox/vbox_tmpl.c:5903 src/vbox/vbox_tmpl.c:6476
+#: src/vbox/vbox_tmpl.c:6576 src/vbox/vbox_tmpl.c:6718
 msgid "could not get domain state"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5913 src/vbox/vbox_tmpl.c:6487
-#: src/vbox/vbox_tmpl.c:6736
+#: src/vbox/vbox_tmpl.c:5918 src/vbox/vbox_tmpl.c:6492
+#: src/vbox/vbox_tmpl.c:6741
 #, c-format
 msgid "could not open VirtualBox session with domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5935 src/vbox/vbox_tmpl.c:5943
+#: src/vbox/vbox_tmpl.c:5940 src/vbox/vbox_tmpl.c:5948
 #, c-format
 msgid "could not take snapshot of domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:5950 src/vbox/vbox_tmpl.c:6563
+#: src/vbox/vbox_tmpl.c:5955 src/vbox/vbox_tmpl.c:6568
 #, c-format
 msgid "could not get current snapshot of domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6007
+#: src/vbox/vbox_tmpl.c:6012
 #, c-format
 msgid "could not get description of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6023
+#: src/vbox/vbox_tmpl.c:6028
 #, c-format
 msgid "could not get creation time of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6033 src/vbox/vbox_tmpl.c:6322
+#: src/vbox/vbox_tmpl.c:6038 src/vbox/vbox_tmpl.c:6327
 #, c-format
 msgid "could not get parent of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6041 src/vbox/vbox_tmpl.c:6336
+#: src/vbox/vbox_tmpl.c:6046 src/vbox/vbox_tmpl.c:6341
 #, c-format
 msgid "could not get name of parent of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6056 src/vbox/vbox_tmpl.c:6555
+#: src/vbox/vbox_tmpl.c:6061 src/vbox/vbox_tmpl.c:6560
 #, c-format
 msgid "could not get online state of snapshot %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6277 src/vbox/vbox_tmpl.c:6383
+#: src/vbox/vbox_tmpl.c:6282 src/vbox/vbox_tmpl.c:6388
 msgid "could not get current snapshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6389
+#: src/vbox/vbox_tmpl.c:6394
 msgid "domain has no snapshots"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6396
+#: src/vbox/vbox_tmpl.c:6401
 msgid "could not get current snapshot name"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6430 src/vbox/vbox_tmpl.c:6617
+#: src/vbox/vbox_tmpl.c:6435 src/vbox/vbox_tmpl.c:6622
 msgid "could not get snapshot UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6437 src/vbox/vbox_tmpl.c:6499
-#: src/vbox/vbox_tmpl.c:6509
+#: src/vbox/vbox_tmpl.c:6442 src/vbox/vbox_tmpl.c:6504
+#: src/vbox/vbox_tmpl.c:6514
 #, c-format
 msgid "could not restore snapshot for domain %s"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6464
+#: src/vbox/vbox_tmpl.c:6469
 msgid "could not get domain UUID"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6478
+#: src/vbox/vbox_tmpl.c:6483
 #, c-format
 msgid "domain %s is already running"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6496
+#: src/vbox/vbox_tmpl.c:6501
 msgid "cannot restore domain snapshot for running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6578
+#: src/vbox/vbox_tmpl.c:6583
 msgid "cannot revert snapshot of running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6629
+#: src/vbox/vbox_tmpl.c:6634
 msgid "cannot delete domain snapshot for running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6632 src/vbox/vbox_tmpl.c:6641
+#: src/vbox/vbox_tmpl.c:6637 src/vbox/vbox_tmpl.c:6646
 msgid "could not delete snapshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:6727
+#: src/vbox/vbox_tmpl.c:6732
 msgid "cannot delete snapshots of running domain"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8238
+#: src/vbox/vbox_tmpl.c:8243
 #, c-format
 msgid "could not get number of volumes in the pool: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8290
+#: src/vbox/vbox_tmpl.c:8295
 #, c-format
 msgid "could not get the volume list in the pool: %s, rc=%08x"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:8372 src/vbox/vbox_tmpl.c:8603
-#: src/vbox/vbox_tmpl.c:8772 src/vbox/vbox_tmpl.c:8842
-#: src/vbox/vbox_tmpl.c:8949
+#: src/vbox/vbox_tmpl.c:8377 src/vbox/vbox_tmpl.c:8608
+#: src/vbox/vbox_tmpl.c:8777 src/vbox/vbox_tmpl.c:8847
+#: src/vbox/vbox_tmpl.c:8954
 #, c-format
 msgid "Could not parse UUID from '%s'"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9024
+#: src/vbox/vbox_tmpl.c:9029
 msgid "unable to get monitor count"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9030
+#: src/vbox/vbox_tmpl.c:9035
 #, c-format
 msgid "screen ID higher than monitor count (%d)"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9069
+#: src/vbox/vbox_tmpl.c:9074
 msgid "unable to get screen resolution"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9079
+#: src/vbox/vbox_tmpl.c:9084
 msgid "failed to take screenshot"
 msgstr ""
 
-#: src/vbox/vbox_tmpl.c:9085
+#: src/vbox/vbox_tmpl.c:9090
 #, c-format
 msgid "unable to write data to '%s'"
 msgstr ""
@@ -17463,7 +18111,7 @@
 #: src/vmx/vmx.c:3516
 #, c-format
 msgid ""
-"Expecting domain XML entry 'devices/interfase/model' to be 'vlance' or "
+"Expecting domain XML entry 'devices/interface/model' to be 'vlance' or "
 "'vmxnet' or 'vmxnet2' or 'vmxnet3' or 'e1000' but found '%s'"
 msgstr ""
 
@@ -17537,116 +18185,116 @@
 msgid "unsupported path, use xvdN, hdN, or sdN for domain %d"
 msgstr ""
 
-#: src/xen/xen_driver.c:1319
+#: src/xen/xen_driver.c:1425
 msgid "failed to get XML representation of migrated domain"
 msgstr ""
 
-#: src/xen/xen_driver.c:1326
+#: src/xen/xen_driver.c:1432
 msgid "failed to define domain on destination host"
 msgstr ""
 
-#: src/xen/xen_driver.c:2072
+#: src/xen/xen_driver.c:2080
 #, c-format
 msgid "Device %s has been assigned to guest %d"
 msgstr ""
 
-#: src/xen/xen_driver.c:2131
+#: src/xen/xen_driver.c:2139
 msgid "Named device aliases are not supported"
 msgstr ""
 
-#: src/xen/xen_driver.c:2146
+#: src/xen/xen_driver.c:2154
 msgid "cannot find default console device"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:1340
+#: src/xen/xen_hypervisor.c:1409
 #, c-format
 msgid "Credit scheduler weight parameter (%d) is out of range (1-65535)"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:1417
+#: src/xen/xen_hypervisor.c:1418
 #, c-format
 msgid "Credit scheduler cap parameter (%d) is out of range (0-65534)"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2313
+#: src/xen/xen_hypervisor.c:2444
 msgid "could not read CPU flags"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2595 src/xen/xen_hypervisor.c:2606
+#: src/xen/xen_hypervisor.c:2725 src/xen/xen_hypervisor.c:2736
 #, c-format
 msgid "cannot read file %s"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2775 src/xen/xen_hypervisor.c:3433
+#: src/xen/xen_hypervisor.c:2905 src/xen/xen_hypervisor.c:3598
 msgid "domain shut off or invalid"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2783
+#: src/xen/xen_hypervisor.c:2913
 msgid "unsupported in dom interface < 4"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:2791 src/xen/xen_hypervisor.c:2797
-#: src/xen/xen_hypervisor.c:3448
+#: src/xen/xen_hypervisor.c:2921 src/xen/xen_hypervisor.c:2927
+#: src/xen/xen_hypervisor.c:3613
 msgid "cannot get domain details"
 msgstr ""
 
-#: src/xen/xen_hypervisor.c:3465 src/xen/xen_hypervisor.c:3473
+#: src/xen/xen_hypervisor.c:3630 src/xen/xen_hypervisor.c:3638
 msgid "cannot get VCPUs info"
 msgstr ""
 
-#: src/xen/xen_inotify.c:131 src/xen/xen_inotify.c:207
+#: src/xen/xen_inotify.c:95 src/xen/xen_inotify.c:171
 #, c-format
 msgid "parsing uuid %s"
 msgstr ""
 
-#: src/xen/xen_inotify.c:156
+#: src/xen/xen_inotify.c:120
 msgid "finding dom on config list"
 msgstr ""
 
-#: src/xen/xen_inotify.c:243
+#: src/xen/xen_inotify.c:207
 msgid "Error looking up domain"
 msgstr ""
 
-#: src/xen/xen_inotify.c:250 src/xen/xen_inotify.c:343
-#: src/xen/xen_inotify.c:350
+#: src/xen/xen_inotify.c:214 src/xen/xen_inotify.c:307
+#: src/xen/xen_inotify.c:314
 msgid "Error adding file to config cache"
 msgstr ""
 
-#: src/xen/xen_inotify.c:296
+#: src/xen/xen_inotify.c:260
 msgid "conn, or private data is NULL"
 msgstr ""
 
-#: src/xen/xen_inotify.c:339 src/xen/xen_inotify.c:362
+#: src/xen/xen_inotify.c:303 src/xen/xen_inotify.c:326
 msgid "looking up dom"
 msgstr ""
 
-#: src/xen/xen_inotify.c:407
+#: src/xen/xen_inotify.c:373
 #, c-format
 msgid "cannot open directory: %s"
 msgstr ""
 
-#: src/xen/xen_inotify.c:425
+#: src/xen/xen_inotify.c:389
 msgid "Error adding file to config list"
 msgstr ""
 
-#: src/xen/xen_inotify.c:435
+#: src/xen/xen_inotify.c:402
 msgid "initializing inotify"
 msgstr ""
 
-#: src/xen/xen_inotify.c:446
+#: src/xen/xen_inotify.c:413
 #, c-format
 msgid "adding watch on %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:128
+#: src/xen/xend_internal.c:93
 msgid "failed to create a socket"
 msgstr ""
 
-#: src/xen/xend_internal.c:151
+#: src/xen/xend_internal.c:113
 msgid "failed to connect to xend"
 msgstr ""
 
-#: src/xen/xend_internal.c:198 src/xen/xend_internal.c:201
+#: src/xen/xend_internal.c:160
 msgid "failed to read from Xen Daemon"
 msgstr "failed to read from Xen Daemon"
 
@@ -17659,56 +18307,56 @@
 msgid "Xend returned HTTP Content-Length of %d, which exceeds maximum of %d"
 msgstr ""
 
-#: src/xen/xend_internal.c:389
+#: src/xen/xend_internal.c:367
 #, c-format
 msgid "%d status from xen daemon: %s:%s"
 msgstr ""
 
-#: src/xen/xend_internal.c:440 src/xen/xend_internal.c:443
-#: src/xen/xend_internal.c:451
+#: src/xen/xend_internal.c:415 src/xen/xend_internal.c:418
+#: src/xen/xend_internal.c:427
 #, c-format
 msgid "xend_post: error from xen daemon: %s"
 msgstr ""
 
-#: src/remote/remote_driver.c:592 src/xen/xend_internal.c:811
+#: src/xen/xend_internal.c:681
 #, c-format
 msgid "unable to resolve hostname '%s': %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:848
+#: src/xen/xend_internal.c:718
 #, c-format
 msgid "unable to connect to '%s:%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1007
+#: src/xen/xend_internal.c:855
 msgid "domain information incomplete, missing domid"
 msgstr "domain information incomplete, missing domid"
 
-#: src/xen/xend_internal.c:1013
+#: src/xen/xend_internal.c:861
 msgid "domain information incorrect domid not numeric"
 msgstr "domain information incorrect domid not numeric"
 
-#: src/xen/xend_internal.c:1018 src/xen/xend_internal.c:1070
+#: src/xen/xend_internal.c:866 src/xen/xend_internal.c:918
 msgid "domain information incomplete, missing uuid"
 msgstr "domain information incomplete, missing uuid"
 
-#: src/xen/xend_internal.c:1057 src/xen/xend_internal.c:2359
-#: src/xen/xend_internal.c:2366
+#: src/xen/xend_internal.c:905 src/xenxs/xen_sxpr.c:1086
+#: src/xenxs/xen_sxpr.c:1093
 msgid "domain information incomplete, missing name"
 msgstr "domain information incomplete, missing name"
 
-#: src/xen/xend_internal.c:2833
+#: src/xen/xend_internal.c:1176
 msgid "topology syntax error"
 msgstr ""
 
-#: src/xen/xend_internal.c:2897
+#: src/xen/xend_internal.c:1239
 msgid "failed to parse Xend domain information"
 msgstr "failed to parse Xend domain information"
 
-#: src/xen/xend_internal.c:3023 src/xen/xend_internal.c:3050
-#: src/xen/xend_internal.c:3078 src/xen/xend_internal.c:3107
-#: src/xen/xend_internal.c:3138 src/xen/xend_internal.c:3216
-#: src/xen/xend_internal.c:3253
+#: src/xen/xend_internal.c:1365 src/xen/xend_internal.c:1391
+#: src/xen/xend_internal.c:1418 src/xen/xend_internal.c:1448
+#: src/xen/xend_internal.c:1485 src/xen/xend_internal.c:1561
+#: src/xen/xend_internal.c:1599
 #, c-format
 msgid "Domain %s isn't running."
 msgstr ""
@@ -17729,10 +18377,6 @@
 msgid "Xend only supports modifying both live and persistent config"
 msgstr ""
 
-#: src/xen/xend_internal.c:2220 src/xen/xm_internal.c:731
-msgid "could not determin max vcpus for the domain"
-msgstr ""
-
 #: src/xen/xend_internal.c:2299
 msgid "failed to add vcpupin xml entry"
 msgstr ""
@@ -17742,8 +18386,8 @@
 msgid "Cannot modify live config if domain is inactive"
 msgstr ""
 
-#: src/xen/xend_internal.c:4173 src/xen/xend_internal.c:4180
-#: src/xen/xend_internal.c:4262
+#: src/xen/xend_internal.c:2739 src/xen/xend_internal.c:2746
+#: src/xen/xend_internal.c:2867 src/xen/xend_internal.c:2978
 msgid "unsupported device type"
 msgstr ""
 
@@ -17756,72 +18400,72 @@
 msgid "requested device does not exist"
 msgstr ""
 
-#: src/xen/xend_internal.c:4307
+#: src/xen/xend_internal.c:3022
 msgid "xenDaemonGetAutostart failed to find this domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:4348
+#: src/xen/xend_internal.c:3062
 msgid "xenDaemonSetAutostart failed to find this domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:4356
+#: src/xen/xend_internal.c:3072
 msgid "unexpected value from on_xend_start"
 msgstr ""
 
-#: src/xen/xend_internal.c:4372
+#: src/xen/xend_internal.c:3087
 msgid "sexpr2string failed"
 msgstr ""
 
-#: src/xen/xend_internal.c:4377
+#: src/xen/xend_internal.c:3100
 msgid "Failed to redefine sexpr"
 msgstr ""
 
-#: src/xen/xend_internal.c:4382
+#: src/xen/xend_internal.c:3105
 msgid "on_xend_start not present in sexpr"
 msgstr ""
 
-#: src/xen/xend_internal.c:4440
+#: src/xen/xend_internal.c:3168
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support renaming domains during "
 "migration"
 msgstr ""
 
-#: src/xen/xend_internal.c:4450
+#: src/xen/xend_internal.c:3178
 msgid ""
 "xenDaemonDomainMigrate: Xen does not support bandwidth limits during "
 "migration"
 msgstr ""
 
-#: src/xen/xend_internal.c:4478
+#: src/xen/xend_internal.c:3206
 msgid "xenDaemonDomainMigrate: xend cannot migrate paused domains"
 msgstr ""
 
-#: src/xen/xend_internal.c:4486
+#: src/xen/xend_internal.c:3214
 msgid "xenDaemonDomainMigrate: unsupported flag"
 msgstr ""
 
-#: src/xen/xend_internal.c:4499
+#: src/xen/xend_internal.c:3227
 msgid "xenDaemonDomainMigrate: invalid URI"
 msgstr ""
 
-#: src/xen/xend_internal.c:4504
+#: src/xen/xend_internal.c:3232
 msgid ""
 "xenDaemonDomainMigrate: only xenmigr:// migrations are supported by Xen"
 msgstr ""
 
-#: src/xen/xend_internal.c:4511
+#: src/xen/xend_internal.c:3239
 msgid "xenDaemonDomainMigrate: a hostname must be specified in the URI"
 msgstr ""
 
-#: src/xen/xend_internal.c:4531
+#: src/xen/xend_internal.c:3259
 msgid "xenDaemonDomainMigrate: invalid port number"
 msgstr ""
 
-#: src/xen/xend_internal.c:4590
+#: src/xen/xend_internal.c:3325
 msgid "failed to parse domain description"
 msgstr ""
 
-#: src/xen/xend_internal.c:4596
+#: src/xen/xend_internal.c:3331
 msgid "failed to build sexpr"
 msgstr ""
 
@@ -17830,155 +18474,159 @@
 msgid "Failed to create inactive domain %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:4786 src/xen/xend_internal.c:4862
-#: src/xen/xend_internal.c:4959
+#: src/xen/xend_internal.c:3515 src/xen/xend_internal.c:3588
+#: src/xen/xend_internal.c:3696
 msgid "unsupported in xendConfigVersion < 4"
 msgstr ""
 
-#: src/xen/xend_internal.c:4798
+#: src/xen/xend_internal.c:3527
 msgid "node information incomplete, missing scheduler name"
 msgstr ""
 
-#: src/xen/xend_internal.c:4816 src/xen/xend_internal.c:4917
-#: src/xen/xend_internal.c:5029
+#: src/xen/xend_internal.c:3547 src/xen/xend_internal.c:3656
+#: src/xen/xend_internal.c:3766
 msgid "Unknown scheduler"
 msgstr ""
 
-#: src/xen/xend_internal.c:4875 src/xen/xend_internal.c:4972
+#: src/xen/xend_internal.c:3601 src/xen/xend_internal.c:3709
 msgid "Failed to get a scheduler name"
 msgstr ""
 
-#: src/xen/xend_internal.c:4888 src/xen/xend_internal.c:5008
+#: src/xen/xend_internal.c:3620 src/xen/xend_internal.c:3745
 msgid "domain information incomplete, missing cpu_weight"
 msgstr ""
 
-#: src/xen/xend_internal.c:4893 src/xen/xend_internal.c:5017
+#: src/xen/xend_internal.c:3625 src/xen/xend_internal.c:3754
 msgid "domain information incomplete, missing cpu_cap"
 msgstr ""
 
-#: src/xen/xend_internal.c:4899
+#: src/xen/xend_internal.c:3632
 #, c-format
 msgid "Weight %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:4908
+#: src/xen/xend_internal.c:3643
 #, c-format
 msgid "Cap %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:5075
+#: src/xen/xend_internal.c:3815
 msgid "domainBlockPeek is not supported for dom0"
 msgstr ""
 
-#: src/xen/xend_internal.c:5096
+#: src/xen/xend_internal.c:3836
 #, c-format
 msgid "%s: invalid path"
 msgstr ""
 
-#: src/xen/xend_internal.c:5104
+#: src/xen/xend_internal.c:3845
 #, c-format
 msgid "failed to open for reading: %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5116
+#: src/xen/xend_internal.c:3857
 #, c-format
 msgid "failed to lseek or read from file: %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:6065
+#: src/xen/xend_internal.c:3998
 msgid "hotplug of device type not supported"
 msgstr ""
 
-#: src/xen/xm_internal.c:399
+#: src/xen/xm_internal.c:221
 #, c-format
 msgid "cannot stat: %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:457
+#: src/xen/xm_internal.c:285
 msgid "xenXMConfigCacheRefresh: virHashAddEntry"
 msgstr ""
 
-#: src/xen/xm_internal.c:509
+#: src/xen/xm_internal.c:326
+msgid "cannot get time of day"
+msgstr ""
+
+#: src/xen/xm_internal.c:339
 #, c-format
 msgid "cannot read directory %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:1711
+#: src/xen/xm_internal.c:848
 msgid "read only connection"
 msgstr ""
 
-#: src/xen/xm_internal.c:1716
+#: src/xen/xm_internal.c:853
 msgid "not inactive domain"
 msgstr ""
 
-#: src/xen/xm_internal.c:1724
+#: src/xen/xm_internal.c:861
 msgid "virHashLookup"
 msgstr ""
 
-#: src/xen/xm_internal.c:1729
+#: src/xen/xm_internal.c:866
 msgid "can't retrieve config file for domain"
 msgstr ""
 
-#: src/xen/xm_internal.c:2684
+#: src/xen/xm_internal.c:1129
 msgid "can't retrieve config filename for domain to overwrite"
 msgstr ""
 
-#: src/xen/xm_internal.c:2690
+#: src/xen/xm_internal.c:1135
 msgid "can't retrieve config entry for domain to overwrite"
 msgstr ""
 
-#: src/xen/xm_internal.c:2701 src/xen/xm_internal.c:2708
+#: src/xen/xm_internal.c:1142 src/xen/xm_internal.c:1149
 msgid "failed to remove old domain from config map"
 msgstr ""
 
-#: src/xen/xm_internal.c:2735
+#: src/xen/xm_internal.c:1169
 msgid "unable to get current time"
 msgstr ""
 
-#: src/xen/xm_internal.c:2744 src/xen/xm_internal.c:2751
+#: src/xen/xm_internal.c:1181 src/xen/xm_internal.c:1188
 msgid "unable to store config file handle"
 msgstr ""
 
-#: src/xen/xm_internal.c:1393 src/xen/xm_internal.c:1490
+#: src/xen/xm_internal.c:1392 src/xen/xm_internal.c:1489
 msgid "Xm driver only supports modifying persistent config"
 msgstr ""
 
-#: src/xen/xm_internal.c:1435
+#: src/xen/xm_internal.c:1434
 msgid "Xm driver only supports adding disk or network devices"
 msgstr ""
 
-#: src/xen/xm_internal.c:1575
+#: src/xen/xm_internal.c:1574
 msgid "block peeking not implemented"
 msgstr ""
 
-#: src/xen/xm_internal.c:3148
+#: src/xen/xm_internal.c:1609
 #, c-format
 msgid "cannot check link %s points to config %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:3177
+#: src/xen/xm_internal.c:1638
 #, c-format
 msgid "failed to create link %s to %s"
 msgstr ""
 
-#: src/xen/xm_internal.c:3185
+#: src/xen/xm_internal.c:1646
 #, c-format
 msgid "failed to remove link %s"
 msgstr ""
 
-#: src/xen/xs_internal.c:300
+#: src/xen/xs_internal.c:258
 msgid "failed to connect to Xen Store"
 msgstr "failed to connect to Xen Store"
 
-#: src/xen/xs_internal.c:325
+#: src/xen/xs_internal.c:282
 msgid "adding watch @releaseDomain"
 msgstr ""
 
-#: src/xen/xs_internal.c:334
+#: src/xen/xs_internal.c:291
 msgid "adding watch @introduceDomain"
 msgstr ""
 
-#: src/xen/xs_internal.c:1203
+#: src/xen/xs_internal.c:1141
 msgid "watch already tracked"
 msgstr ""
 
@@ -18036,10 +18684,10 @@
 #: src/xenapi/xenapi_driver.c:924 src/xenapi/xenapi_driver.c:959
 #: src/xenapi/xenapi_driver.c:990 src/xenapi/xenapi_driver.c:1027
 #: src/xenapi/xenapi_driver.c:1082 src/xenapi/xenapi_driver.c:1126
-#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1239
-#: src/xenapi/xenapi_driver.c:1298 src/xenapi/xenapi_driver.c:1356
-#: src/xenapi/xenapi_driver.c:1629 src/xenapi/xenapi_driver.c:1725
-#: src/xenapi/xenapi_driver.c:1767 src/xenapi/xenapi_driver.c:1813
+#: src/xenapi/xenapi_driver.c:1170 src/xenapi/xenapi_driver.c:1237
+#: src/xenapi/xenapi_driver.c:1296 src/xenapi/xenapi_driver.c:1354
+#: src/xenapi/xenapi_driver.c:1627 src/xenapi/xenapi_driver.c:1723
+#: src/xenapi/xenapi_driver.c:1765 src/xenapi/xenapi_driver.c:1811
 msgid "Domain name is not unique"
 msgstr ""
 
@@ -18051,27 +18699,27 @@
 msgid "Couldn't fetch Domain Information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1228
+#: src/xenapi/xenapi_driver.c:1226
 msgid "Couldn't fetch Node Information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1511
+#: src/xenapi/xenapi_driver.c:1509
 msgid "Unable to parse given mac address"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1563
+#: src/xenapi/xenapi_driver.c:1561
 msgid "Couldn't get VM record"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1690
+#: src/xenapi/xenapi_driver.c:1688
 msgid "Couldn't get VM information from XML"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1864
+#: src/xenapi/xenapi_driver.c:1862
 msgid "Couldn't get host metrics - memory information"
 msgstr ""
 
-#: src/xenapi/xenapi_driver.c:1870
+#: src/xenapi/xenapi_driver.c:1868
 msgid "Couldn't get host metrics"
 msgstr ""
 
@@ -18079,182 +18727,180 @@
 msgid "Query parameter 'no_verify' has unexpected value (should be 0 or 1)"
 msgstr ""
 
-#: src/xen/xend_internal.c:2346
+#: src/xenxs/xen_sxpr.c:60 src/xenxs/xen_sxpr.c:1073
 msgid "domain information incomplete, missing id"
 msgstr ""
 
-#: src/xen/xend_internal.c:1151
+#: src/xenxs/xen_sxpr.c:98
 msgid "domain information incomplete, missing HVM loader"
 msgstr ""
 
-#: src/xen/xend_internal.c:1205
+#: src/xenxs/xen_sxpr.c:158
 msgid "domain information incomplete, missing kernel & bootloader"
 msgstr ""
 
-#: src/xen/xend_internal.c:1467
+#: src/xenxs/xen_sxpr.c:199
 #, c-format
 msgid "unknown chr device type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1303 src/xen/xend_internal.c:1343
-#: src/xen/xend_internal.c:1359 src/xen/xend_internal.c:1494
-#: src/xen/xend_internal.c:1522 src/xen/xend_internal.c:1538
+#: src/xenxs/xen_sxpr.c:225 src/xenxs/xen_sxpr.c:255 src/xenxs/xen_sxpr.c:273
 msgid "malformed char device string"
 msgstr ""
 
-#: src/xen/xend_internal.c:1629
+#: src/xenxs/xen_sxpr.c:375
 msgid "domain information incomplete, vbd has no dev"
 msgstr "domain information incomplete, vbd has no dev"
 
-#: src/xen/xend_internal.c:1640
+#: src/xenxs/xen_sxpr.c:386
 msgid "domain information incomplete, vbd has no src"
 msgstr "domain information incomplete, vbd has no src"
 
-#: src/xen/xend_internal.c:1649
+#: src/xenxs/xen_sxpr.c:395
 msgid "cannot parse vbd filename, missing driver name"
 msgstr "cannot parse vbd filename, missing driver name"
 
-#: src/xen/xend_internal.c:1658 src/xen/xm_internal.c:909
+#: src/xenxs/xen_sxpr.c:409 src/xenxs/xen_xm.c:496
 #, c-format
 msgid "Driver name %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:1669
+#: src/xenxs/xen_sxpr.c:422
 msgid "cannot parse vbd filename, missing driver type"
 msgstr "cannot parse vbd filename, missing driver type"
 
-#: src/xen/xend_internal.c:1678 src/xen/xm_internal.c:930
+#: src/xenxs/xen_sxpr.c:431 src/xenxs/xen_xm.c:517
 #, c-format
 msgid "Driver type %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:1831
+#: src/xenxs/xen_sxpr.c:585 src/xenxs/xen_xm.c:695
 #, c-format
 msgid "malformed mac address '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:1917
+#: src/xenxs/xen_sxpr.c:663
 #, c-format
 msgid "Sound model %s too big for destination"
 msgstr ""
 
-#: src/xen/xend_internal.c:2117
+#: src/xenxs/xen_sxpr.c:853
 #, c-format
 msgid "unknown graphics type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2244
+#: src/xenxs/xen_sxpr.c:976
 msgid "missing PCI domain"
 msgstr ""
 
-#: src/xen/xend_internal.c:2249
+#: src/xenxs/xen_sxpr.c:981
 msgid "missing PCI bus"
 msgstr ""
 
-#: src/xen/xend_internal.c:2254
+#: src/xenxs/xen_sxpr.c:986
 msgid "missing PCI slot"
 msgstr ""
 
-#: src/xen/xend_internal.c:2259
+#: src/xenxs/xen_sxpr.c:991
 msgid "missing PCI func"
 msgstr ""
 
-#: src/xen/xend_internal.c:2265
+#: src/xenxs/xen_sxpr.c:997
 #, c-format
 msgid "cannot parse PCI domain '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2270
+#: src/xenxs/xen_sxpr.c:1002
 #, c-format
 msgid "cannot parse PCI bus '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2275
+#: src/xenxs/xen_sxpr.c:1007
 #, c-format
 msgid "cannot parse PCI slot '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2280
+#: src/xenxs/xen_sxpr.c:1012
 #, c-format
 msgid "cannot parse PCI func '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:2417
+#: src/xenxs/xen_sxpr.c:1146
 #, c-format
 msgid "invalid CPU mask %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:2428 src/xen/xend_internal.c:2438
-#: src/xen/xend_internal.c:2448
+#: src/xenxs/xen_sxpr.c:1160 src/xenxs/xen_sxpr.c:1170
+#: src/xenxs/xen_sxpr.c:1180
 #, c-format
 msgid "unknown lifecycle type %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5198 src/xen/xend_internal.c:5244
+#: src/xenxs/xen_sxpr.c:1473 src/xenxs/xen_sxpr.c:1521
 #, c-format
 msgid "unexpected graphics type %d"
 msgstr ""
 
-#: src/xenxs/xen_sxpr.c:1621
+#: src/xenxs/xen_sxpr.c:1620
 #, c-format
 msgid "unsupported chr device type '%s'"
 msgstr ""
 
-#: src/xen/xend_internal.c:5370
+#: src/xenxs/xen_sxpr.c:1660
 #, c-format
 msgid "Cannot directly attach floppy %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5382
+#: src/xenxs/xen_sxpr.c:1672
 #, c-format
 msgid "Cannot directly attach CDROM %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5437 src/xen/xm_internal.c:1994
+#: src/xenxs/xen_sxpr.c:1732 src/xenxs/xen_xm.c:1166
 #, c-format
 msgid "unsupported disk type %s"
 msgstr ""
 
-#: src/xen/xend_internal.c:5487 src/xen/xm_internal.c:2097
+#: src/xenxs/xen_sxpr.c:1786 src/xenxs/xen_xm.c:1316
 #, c-format
 msgid "unsupported network type %d"
 msgstr ""
 
-#: src/xen/xend_internal.c:5528 src/xen/xm_internal.c:2085
+#: src/xenxs/xen_sxpr.c:1827 src/xenxs/xen_xm.c:1304
 #, c-format
 msgid "network %s is not active"
 msgstr ""
 
-#: src/xen/xend_internal.c:5598 src/xen/xend_internal.c:5649
+#: src/xenxs/xen_sxpr.c:1906 src/xenxs/xen_sxpr.c:1956
 msgid "managed PCI devices not supported with XenD"
 msgstr ""
 
-#: src/xen/xend_internal.c:5764 src/xen/xend_internal.c:5771
-#: src/xen/xend_internal.c:5778
+#: src/xenxs/xen_sxpr.c:2083 src/xenxs/xen_sxpr.c:2090
+#: src/xenxs/xen_sxpr.c:2097
 #, c-format
 msgid "unexpected lifecycle value %d"
 msgstr ""
 
-#: src/xenxs/xen_sxpr.c:2107 src/xenxs/xen_xm.c:1565
+#: src/xenxs/xen_sxpr.c:2106 src/xenxs/xen_xm.c:1565
 msgid "configurable timezones are not supported"
 msgstr ""
 
-#: src/xen/xend_internal.c:5799
+#: src/xenxs/xen_sxpr.c:2130
 msgid "no HVM domain loader"
 msgstr ""
 
-#: src/xen/xm_internal.c:158 src/xen/xm_internal.c:186
-#: src/xen/xm_internal.c:191 src/xen/xm_internal.c:214
+#: src/xenxs/xen_xm.c:60 src/xenxs/xen_xm.c:87 src/xenxs/xen_xm.c:92
+#: src/xenxs/xen_xm.c:114
 #, c-format
 msgid "config value %s was malformed"
 msgstr ""
 
-#: src/xen/xm_internal.c:236 src/xen/xm_internal.c:249
+#: src/xenxs/xen_xm.c:135 src/xenxs/xen_xm.c:148 src/xenxs/xen_xm.c:186
 #, c-format
 msgid "config value %s was missing"
 msgstr ""
 
-#: src/xen/xm_internal.c:242
+#: src/xenxs/xen_xm.c:141
 #, c-format
 msgid "config value %s was not a string"
 msgstr ""
@@ -18278,97 +18924,100 @@
 msgid "%s not parseable"
 msgstr ""
 
-#: src/xen/xm_internal.c:795
+#: src/xenxs/xen_xm.c:351
 #, c-format
 msgid "unexpected value %s for on_poweroff"
 msgstr ""
 
-#: src/xen/xm_internal.c:803
+#: src/xenxs/xen_xm.c:359
 #, c-format
 msgid "unexpected value %s for on_reboot"
 msgstr ""
 
-#: src/xen/xm_internal.c:811
+#: src/xenxs/xen_xm.c:367
 #, c-format
 msgid "unexpected value %s for on_crash"
 msgstr ""
 
-#: src/xen/xm_internal.c:874
+#: src/xenxs/xen_xm.c:461
 #, c-format
 msgid "Source file %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:893
+#: src/xenxs/xen_xm.c:480
 #, c-format
 msgid "Dest file %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1048
+#: src/xenxs/xen_xm.c:633
 #, c-format
 msgid "MAC address %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1056
+#: src/xenxs/xen_xm.c:641
 #, c-format
 msgid "Bridge %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1079
+#: src/xenxs/xen_xm.c:662
 #, c-format
 msgid "Type %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1086
+#: src/xenxs/xen_xm.c:669
 #, c-format
 msgid "Vifname %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1094
+#: src/xenxs/xen_xm.c:677
 #, c-format
 msgid "IP %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1203
+#: src/xenxs/xen_xm.c:777
 #, c-format
 msgid "Domain %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1213
+#: src/xenxs/xen_xm.c:787
 #, c-format
 msgid "Bus %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1223
+#: src/xenxs/xen_xm.c:797
 #, c-format
 msgid "Slot %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1233
+#: src/xenxs/xen_xm.c:807
 #, c-format
 msgid "Function %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:1349
+#: src/xenxs/xen_xm.c:931
 #, c-format
 msgid "VFB %s too big for destination"
 msgstr ""
 
-#: src/xen/xm_internal.c:2365 src/xen/xm_internal.c:2374
-#: src/xen/xm_internal.c:2383
+#: src/xenxs/xen_xm.c:1625 src/xenxs/xen_xm.c:1634 src/xenxs/xen_xm.c:1643
 #, c-format
 msgid "unexpected lifecycle action %d"
 msgstr ""
 
-#: tools/console.c:298
+#: tools/console.c:317
 #, c-format
 msgid "unable to get tty attributes: %s"
 msgstr ""
 
-#: tools/console.c:307
+#: tools/console.c:326
 #, c-format
 msgid "unable to set tty attributes: %s"
 msgstr ""
 
+#: tools/console.c:379
+msgid "unable to wait on console condition"
+msgstr ""
+
 #: tools/libvirt-guests.init.sh:139
 msgid "libvirt-guests is configured not to start any guests on boot"
 msgstr ""
@@ -18457,703 +19106,720 @@
 "restart|reload|force-reload|gueststatus|shutdown}"
 msgstr ""
 
-#: tools/virsh.c:8374 tools/virsh.c:8386 tools/virsh.c:8399
+#: tools/virsh.c:412 tools/virsh.c:424
 #, c-format
 msgid "%s: %d: failed to allocate %d bytes"
 msgstr "%s: %d: failed to allocate %d bytes"
 
-#: tools/virsh.c:8413
+#: tools/virsh.c:438
 #, c-format
 msgid "%s: %d: failed to allocate %lu bytes"
 msgstr "%s: %d: zlyhalo pridelenie %lu bajtov"
 
-#: tools/virsh.c:598
+#: tools/virsh.c:610
 msgid "Failed to reconnect to the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:600
+#: tools/virsh.c:612
 msgid "Reconnected to the hypervisor"
 msgstr ""
 
-#: tools/virsh.c:375
+#: tools/virsh.c:627
 msgid "print help"
 msgstr "print help"
 
-#: tools/virsh.c:616
+#: tools/virsh.c:628
 msgid ""
 "Prints global help, command specific help, or help for a\n"
 "    group of related commands"
 msgstr ""
 
-#: tools/virsh.c:623
+#: tools/virsh.c:635
 msgid ""
 "Prints global help, command specific help, or help for a group of related "
 "commands"
 msgstr ""
 
-#: tools/virsh.c:636
+#: tools/virsh.c:648
 msgid ""
 "Grouped commands:\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:639 tools/virsh.c:14488
+#: tools/virsh.c:651 tools/virsh.c:15574
 #, c-format
 msgid " %s (help keyword '%s'):\n"
 msgstr ""
 
-#: tools/virsh.c:657
+#: tools/virsh.c:669
 #, c-format
 msgid "command or command group '%s' doesn't exist"
 msgstr ""
 
-#: tools/virsh.c:407
+#: tools/virsh.c:678
 msgid "autostart a domain"
 msgstr ""
 
-#: tools/virsh.c:409
+#: tools/virsh.c:680
 msgid "Configure a domain to be automatically started at boot."
 msgstr "Nakonfigurovať doménu, aby sa automaticky spúštala po štarte."
 
-#: tools/virsh.c:414 tools/virsh.c:512 tools/virsh.c:737 tools/virsh.c:773
-#: tools/virsh.c:830 tools/virsh.c:897 tools/virsh.c:951 tools/virsh.c:1202
-#: tools/virsh.c:1245 tools/virsh.c:1490 tools/virsh.c:1539 tools/virsh.c:1577
-#: tools/virsh.c:1615 tools/virsh.c:1653 tools/virsh.c:1691 tools/virsh.c:1842
-#: tools/virsh.c:1928 tools/virsh.c:2065 tools/virsh.c:2121 tools/virsh.c:2177
-#: tools/virsh.c:2296 tools/virsh.c:2544 tools/virsh.c:6146 tools/virsh.c:6221
-#: tools/virsh.c:6282 tools/virsh.c:6340 tools/virsh.c:6398 tools/virsh.c:6514
-#: tools/virsh.c:6634 tools/virsh.c:6791 tools/virsh.c:7168
+#: tools/virsh.c:685 tools/virsh.c:788 tools/virsh.c:973 tools/virsh.c:1021
+#: tools/virsh.c:1068 tools/virsh.c:1243 tools/virsh.c:1309 tools/virsh.c:1474
+#: tools/virsh.c:1590 tools/virsh.c:1646 tools/virsh.c:1693 tools/virsh.c:1773
+#: tools/virsh.c:2199 tools/virsh.c:2473 tools/virsh.c:2523 tools/virsh.c:2577
+#: tools/virsh.c:2905 tools/virsh.c:2958 tools/virsh.c:3108 tools/virsh.c:3146
+#: tools/virsh.c:3184 tools/virsh.c:3222 tools/virsh.c:3261 tools/virsh.c:3299
+#: tools/virsh.c:3437 tools/virsh.c:3520 tools/virsh.c:3717 tools/virsh.c:3925
+#: tools/virsh.c:4031 tools/virsh.c:4275 tools/virsh.c:4369 tools/virsh.c:4403
+#: tools/virsh.c:4490 tools/virsh.c:4580 tools/virsh.c:4660 tools/virsh.c:4837
+#: tools/virsh.c:5338 tools/virsh.c:5595 tools/virsh.c:5886 tools/virsh.c:5931
+#: tools/virsh.c:5974 tools/virsh.c:6058 tools/virsh.c:6082 tools/virsh.c:6138
+#: tools/virsh.c:6245 tools/virsh.c:11728 tools/virsh.c:11797
+#: tools/virsh.c:11852 tools/virsh.c:12161 tools/virsh.c:12240
+#: tools/virsh.c:12310 tools/virsh.c:12509 tools/virsh.c:12644
+#: tools/virsh.c:12989 tools/virsh.c:13566 tools/virsh.c:13785
+#: tools/virsh.c:13915 tools/virsh.c:14047 tools/virsh.c:14185
+#: tools/virsh.c:14358 tools/virsh.c:14722 tools/virsh.c:14784
+#: tools/virsh.c:14841 tools/virsh.c:14915 tools/virsh.c:14986
 msgid "domain name, id or uuid"
 msgstr "domain name, id or uuid"
 
-#: tools/virsh.c:415 tools/virsh.c:2636 tools/virsh.c:3613
+#: tools/virsh.c:686 tools/virsh.c:6198 tools/virsh.c:8255
 msgid "disable autostarting"
 msgstr "zakázať autom. spustenie"
 
-#: tools/virsh.c:436
+#: tools/virsh.c:707
 #, c-format
 msgid "Failed to mark domain %s as autostarted"
 msgstr "Zlyhalo označenie domény %s aby sa spúštala po štarte"
 
-#: tools/virsh.c:438
+#: tools/virsh.c:709
 #, c-format
 msgid "Failed to unmark domain %s as autostarted"
 msgstr "Zlyhalo odznačenie domény %s aby sa spúštala po štarte"
 
-#: tools/virsh.c:444
+#: tools/virsh.c:715
 #, c-format
 msgid "Domain %s marked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:446
+#: tools/virsh.c:717
 #, c-format
 msgid "Domain %s unmarked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:456
+#: tools/virsh.c:727
 msgid "(re)connect to hypervisor"
 msgstr "(re)connect to hypervisor"
 
-#: tools/virsh.c:458
+#: tools/virsh.c:729
 msgid ""
 "Connect to local hypervisor. This is built-in command after shell start up."
 msgstr ""
 "Connect to local hypervisor. This is built-in command after shell start up."
 
-#: tools/virsh.c:463
+#: tools/virsh.c:735
 msgid "hypervisor connection URI"
 msgstr "hypervisor connection URI"
 
-#: tools/virsh.c:464
+#: tools/virsh.c:736
 msgid "read-only connection"
 msgstr "read-only connection"
 
-#: tools/virsh.c:737 tools/virsh.c:16396
+#: tools/virsh.c:749 tools/virsh.c:17515
 #, c-format
 msgid "Failed to disconnect from the hypervisor, %d leaked reference(s)"
 msgstr ""
 
-#: tools/virsh.c:745
+#: tools/virsh.c:757
 msgid "Please specify valid connection URI"
 msgstr ""
 
-#: tools/virsh.c:494
+#: tools/virsh.c:770
 msgid "Failed to connect to the hypervisor"
 msgstr "Failed to connect to the hypervisor"
 
-#: tools/virsh.c:505
+#: tools/virsh.c:781
 msgid "connect to the guest console"
 msgstr ""
 
-#: tools/virsh.c:507
+#: tools/virsh.c:783
 msgid "Connect the virtual serial console for the guest"
 msgstr ""
 
-#: tools/virsh.c:777
+#: tools/virsh.c:789
 msgid "character device name"
 msgstr ""
 
-#: tools/virsh.c:544
+#: tools/virsh.c:800
 msgid "Unable to get domain status"
 msgstr ""
 
-#: tools/virsh.c:549
+#: tools/virsh.c:805
 msgid "The domain is not running"
 msgstr ""
 
-#: tools/virsh.c:570
+#: tools/virsh.c:809
 #, c-format
 msgid "Connected to domain %s\n"
 msgstr ""
 
-#: tools/virsh.c:571
-msgid "Escape character is ^]\n"
+#: tools/virsh.c:810
+#, c-format
+msgid "Escape character is %s\n"
 msgstr ""
 
-#: tools/virsh.c:821
+#: tools/virsh.c:833
 msgid "Invalid devname"
 msgstr ""
 
-#: tools/virsh.c:614
+#: tools/virsh.c:851
 msgid "list domains"
 msgstr "list domains"
 
-#: tools/virsh.c:615
+#: tools/virsh.c:852
 msgid "Returns list of domains."
 msgstr "Returns list of domains."
 
-#: tools/virsh.c:620
+#: tools/virsh.c:857
 msgid "list inactive domains"
 msgstr "list inactive domains"
 
-#: tools/virsh.c:621
+#: tools/virsh.c:858
 msgid "list inactive & active domains"
 msgstr "list inactive & active domains"
 
-#: tools/virsh.c:848
+#: tools/virsh.c:860
 msgid "mark domains with managed save state"
 msgstr ""
 
-#: tools/virsh.c:643 tools/virsh.c:650
+#: tools/virsh.c:885 tools/virsh.c:892
 msgid "Failed to list active domains"
 msgstr "Failed to list active domains"
 
-#: tools/virsh.c:661 tools/virsh.c:669
+#: tools/virsh.c:903 tools/virsh.c:911
 msgid "Failed to list inactive domains"
 msgstr "Failed to list inactive domains"
 
-#: tools/virsh.c:678
+#: tools/virsh.c:920
 msgid "Id"
 msgstr "Id"
 
-#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265
-#: tools/virsh.c:5226
+#: tools/virsh.c:920 tools/virsh.c:6679 tools/virsh.c:6874 tools/virsh.c:7147
+#: tools/virsh.c:8118 tools/virsh.c:9108 tools/virsh.c:9128 tools/virsh.c:9197
+#: tools/virsh.c:10604 tools/virsh.c:10619 tools/virsh.c:10669
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Name"
 msgstr "Name"
 
-#: tools/virsh.c:678 tools/virsh.c:3017 tools/virsh.c:3290 tools/virsh.c:4265
+#: tools/virsh.c:920 tools/virsh.c:6874 tools/virsh.c:7147 tools/virsh.c:9108
+#: tools/virsh.c:9133 tools/virsh.c:9197 tools/virsh.c:14496
+#: tools/virsh.c:14500
 msgid "State"
 msgstr "State"
 
-#: tools/virsh.c:941 tools/virsh.c:15745
+#: tools/virsh.c:953 tools/virsh.c:16834
 msgid "saved"
 msgstr ""
 
-#: tools/virsh.c:731
+#: tools/virsh.c:967
 msgid "domain state"
 msgstr "domain state"
 
-#: tools/virsh.c:732
+#: tools/virsh.c:968
 msgid "Returns state about a domain."
 msgstr ""
 
-#: tools/virsh.c:962
+#: tools/virsh.c:974
 msgid "also print reason for the state"
 msgstr ""
 
-#: tools/virsh.c:1003
+#: tools/virsh.c:1015
 msgid "domain control interface state"
 msgstr ""
 
-#: tools/virsh.c:1004
+#: tools/virsh.c:1016
 msgid "Returns state of a control interface to the domain."
 msgstr ""
 
-#: tools/virsh.c:767
+#: tools/virsh.c:1061
 msgid "get device block stats for a domain"
 msgstr ""
 
-#: tools/virsh.c:1050
+#: tools/virsh.c:1062
 msgid ""
 "Get device block stats for a running domain. See man page or use --human for "
 "explanation of fields"
 msgstr ""
 
-#: tools/virsh.c:774
+#: tools/virsh.c:1069 tools/virsh.c:1647 tools/virsh.c:6246
 msgid "block device"
 msgstr ""
 
-#: tools/virsh.c:1058
+#: tools/virsh.c:1070
 msgid "print a more human readable output"
 msgstr ""
 
-#: tools/virsh.c:1072
+#: tools/virsh.c:1084
 msgid "number of read operations:"
 msgstr ""
 
-#: tools/virsh.c:1074
+#: tools/virsh.c:1086
 msgid "number of bytes read:"
 msgstr ""
 
-#: tools/virsh.c:1076
+#: tools/virsh.c:1088
 msgid "number of write operations:"
 msgstr ""
 
-#: tools/virsh.c:1078
+#: tools/virsh.c:1090
 msgid "number of bytes written:"
 msgstr ""
 
-#: tools/virsh.c:1080
+#: tools/virsh.c:1092
 msgid "error count:"
 msgstr ""
 
-#: tools/virsh.c:1082
+#: tools/virsh.c:1094
 msgid "number of flush operations:"
 msgstr ""
 
-#: tools/virsh.c:1084
+#: tools/virsh.c:1096
 msgid "total duration of reads (ns):"
 msgstr ""
 
-#: tools/virsh.c:1086
+#: tools/virsh.c:1098
 msgid "total duration of writes (ns):"
 msgstr ""
 
-#: tools/virsh.c:1088
+#: tools/virsh.c:1100
 msgid "total duration of flushes (ns):"
 msgstr ""
 
-#: tools/virsh.c:797
+#: tools/virsh.c:1152 tools/virsh.c:1172
 #, c-format
 msgid "Failed to get block stats %s %s"
 msgstr ""
 
-#: tools/virsh.c:1147 tools/virsh.c:1166
+#: tools/virsh.c:1159 tools/virsh.c:1178
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
 
-#: tools/virsh.c:824
+#: tools/virsh.c:1237
 msgid "get network interface stats for a domain"
 msgstr ""
 
-#: tools/virsh.c:825
+#: tools/virsh.c:1238
 msgid "Get network interface stats for a running domain."
 msgstr ""
 
-#: tools/virsh.c:831
+#: tools/virsh.c:1244
 msgid "interface device"
 msgstr "rozhranie zariadenia"
 
-#: tools/virsh.c:854
+#: tools/virsh.c:1267
 #, c-format
 msgid "Failed to get interface stats %s %s"
 msgstr ""
 
-#: tools/virsh.c:1291
+#: tools/virsh.c:1303
 msgid "set link state of a virtual interface"
 msgstr ""
 
-#: tools/virsh.c:1292
+#: tools/virsh.c:1304
 msgid ""
 "Set link state of a domain's virtual interface. This command wraps usage of "
 "update-device command."
 msgstr ""
 
-#: tools/virsh.c:1298 tools/virsh.c:1463
+#: tools/virsh.c:1310 tools/virsh.c:1475
 msgid "interface device (MAC Address)"
 msgstr ""
 
-#: tools/virsh.c:1299
+#: tools/virsh.c:1311
 msgid "new state of the device"
 msgstr ""
 
-#: tools/virsh.c:1300
+#: tools/virsh.c:1312
 msgid "persist interface state"
 msgstr ""
 
-#: tools/virsh.c:1337
+#: tools/virsh.c:1349
 #, c-format
 msgid "invalid link state '%s'"
 msgstr ""
 
-#: tools/virsh.c:1344 tools/virsh.c:1500
+#: tools/virsh.c:1356 tools/virsh.c:1512
 msgid "Failed to get domain description xml"
 msgstr ""
 
-#: tools/virsh.c:1360 tools/virsh.c:1507
+#: tools/virsh.c:1372 tools/virsh.c:1519
 msgid "Failed to parse domain description xml"
 msgstr ""
 
-#: tools/virsh.c:1367 tools/virsh.c:1514
+#: tools/virsh.c:1379 tools/virsh.c:1526
 msgid "Failed to extract interface information or no interfaces found"
 msgstr ""
 
-#: tools/virsh.c:1390
+#: tools/virsh.c:1402
 #, c-format
 msgid "interface with address '%s' not found"
 msgstr ""
 
-#: tools/virsh.c:5485 tools/virsh.c:5544 tools/virsh.c:6595 tools/virsh.c:6864
+#: tools/virsh.c:1436 tools/virsh.c:11018 tools/virsh.c:11077
+#: tools/virsh.c:12597 tools/virsh.c:13060
 msgid "Failed to allocate memory"
 msgstr ""
 
-#: tools/virsh.c:6600 tools/virsh.c:6869
+#: tools/virsh.c:1441 tools/virsh.c:12602 tools/virsh.c:13065
 msgid "Failed to create XML"
 msgstr ""
 
-#: tools/virsh.c:1434
+#: tools/virsh.c:1446
 msgid "Failed to update interface link state"
 msgstr ""
 
-#: tools/virsh.c:1437 tools/virsh.c:11219
+#: tools/virsh.c:1449 tools/virsh.c:12292
 msgid "Device updated successfully\n"
 msgstr ""
 
-#: tools/virsh.c:1456
+#: tools/virsh.c:1468
 msgid "get link state of a virtual interface"
 msgstr ""
 
-#: tools/virsh.c:1457
+#: tools/virsh.c:1469
 msgid "Get link state of a domain's virtual interface."
 msgstr ""
 
-#: tools/virsh.c:1464
+#: tools/virsh.c:1476
 msgid "Get persistent interface state"
 msgstr ""
 
-#: tools/virsh.c:1537
+#: tools/virsh.c:1549
 #, c-format
 msgid "Interface with address '%s' not found."
 msgstr ""
 
-#: tools/virsh.c:891
+#: tools/virsh.c:1584
 msgid "get memory statistics for a domain"
 msgstr ""
 
-#: tools/virsh.c:892
+#: tools/virsh.c:1585
 msgid "Get memory statistics for a runnng domain."
 msgstr ""
 
-#: tools/virsh.c:917
+#: tools/virsh.c:1610
 #, c-format
 msgid "Failed to get memory statistics for domain %s"
 msgstr ""
 
-#: tools/virsh.c:1628
+#: tools/virsh.c:1640
 msgid "domain block device size information"
 msgstr ""
 
-#: tools/virsh.c:1629
+#: tools/virsh.c:1641
 msgid "Get block device size info for a domain."
 msgstr ""
 
-#: tools/virsh.c:4530 tools/virsh.c:5126
+#: tools/virsh.c:1675 tools/virsh.c:9466 tools/virsh.c:10376
 msgid "Capacity:"
 msgstr ""
 
-#: tools/virsh.c:4533 tools/virsh.c:5129
+#: tools/virsh.c:1676 tools/virsh.c:9469 tools/virsh.c:10379
 msgid "Allocation:"
 msgstr ""
 
-#: tools/virsh.c:1665
+#: tools/virsh.c:1677
 msgid "Physical:"
 msgstr ""
 
-#: tools/virsh.c:1675
+#: tools/virsh.c:1687
 msgid "list all domain blocks"
 msgstr ""
 
-#: tools/virsh.c:1676
+#: tools/virsh.c:1688
 msgid "Get the names of block devices for a domain."
 msgstr ""
 
-#: tools/virsh.c:1683
+#: tools/virsh.c:1695
 msgid "get inactive rather than running configuration"
 msgstr ""
 
-#: tools/virsh.c:1721
+#: tools/virsh.c:1733
 msgid "Target"
 msgstr ""
 
-#: tools/virsh.c:1721
+#: tools/virsh.c:1733
 msgid "Source"
 msgstr ""
 
-#: tools/virsh.c:945
+#: tools/virsh.c:1767
 msgid "suspend a domain"
 msgstr "suspend a domain"
 
-#: tools/virsh.c:946
+#: tools/virsh.c:1768
 msgid "Suspend a running domain."
 msgstr "Suspend a running domain."
 
-#: tools/virsh.c:969
+#: tools/virsh.c:1791
 #, c-format
 msgid "Domain %s suspended\n"
 msgstr "Domain %s suspended\n"
 
-#: tools/virsh.c:971
+#: tools/virsh.c:1793
 #, c-format
 msgid "Failed to suspend domain %s"
 msgstr "Failed to suspend domain %s"
 
-#: tools/virsh.c:983
+#: tools/virsh.c:1805
 msgid "create a domain from an XML file"
 msgstr "create a domain from an XML file"
 
-#: tools/virsh.c:984
+#: tools/virsh.c:1806
 msgid "Create a domain."
 msgstr "Create a domain."
 
-#: tools/virsh.c:989 tools/virsh.c:1046
+#: tools/virsh.c:1811 tools/virsh.c:1874
 msgid "file containing an XML domain description"
 msgstr ""
 
-#: tools/virsh.c:991 tools/virsh.c:1151
+#: tools/virsh.c:1813 tools/virsh.c:2096
 msgid "attach to console after creation"
 msgstr ""
 
-#: tools/virsh.c:1803 tools/virsh.c:2086
+#: tools/virsh.c:1815 tools/virsh.c:2098
 msgid "leave the guest paused after creation"
 msgstr ""
 
-#: tools/virsh.c:1804 tools/virsh.c:2088
+#: tools/virsh.c:1816 tools/virsh.c:2100
 msgid "automatically destroy the guest when virsh disconnects"
 msgstr ""
 
-#: tools/virsh.c:1022
+#: tools/virsh.c:1850
 #, c-format
 msgid "Domain %s created from %s\n"
 msgstr "Domain %s created from %s\n"
 
-#: tools/virsh.c:1030
+#: tools/virsh.c:1858
 #, c-format
 msgid "Failed to create domain from %s"
 msgstr "Failed to create domain from %s"
 
-#: tools/virsh.c:1040
+#: tools/virsh.c:1868
 msgid "define (but don't start) a domain from an XML file"
 msgstr "define (but don't start) a domain from an XML file"
 
-#: tools/virsh.c:1041
+#: tools/virsh.c:1869
 msgid "Define a domain."
 msgstr "Define a domain."
 
-#: tools/virsh.c:1073
+#: tools/virsh.c:1899
 #, c-format
 msgid "Domain %s defined from %s\n"
 msgstr "Domain %s defined from %s\n"
 
-#: tools/virsh.c:1077
+#: tools/virsh.c:1903
 #, c-format
 msgid "Failed to define domain from %s"
 msgstr "Failed to define domain from %s"
 
-#: tools/virsh.c:1901
+#: tools/virsh.c:1913
 msgid "undefine a domain"
 msgstr ""
 
-#: tools/virsh.c:1903
+#: tools/virsh.c:1915
 msgid "Undefine an inactive domain, or convert persistent to transient."
 msgstr ""
 
-#: tools/virsh.c:1093 tools/virsh.c:2467
+#: tools/virsh.c:1920 tools/virsh.c:5513
 msgid "domain name or uuid"
 msgstr "domain name or uuid"
 
-#: tools/virsh.c:1909
+#: tools/virsh.c:1921
 msgid "remove domain managed state file"
 msgstr ""
 
-#: tools/virsh.c:1911
+#: tools/virsh.c:1923
 msgid "remove all domain snapshot metadata, if inactive"
 msgstr ""
 
-#: tools/virsh.c:2048
+#: tools/virsh.c:2060
 #, c-format
 msgid "Unable to remove metadata of %d snapshots"
 msgstr ""
 
-#: tools/virsh.c:2049
+#: tools/virsh.c:2061
 #, c-format
 msgid "Refusing to undefine while %d snapshots exist"
 msgstr ""
 
-#: tools/virsh.c:1128
+#: tools/virsh.c:2070
 #, c-format
 msgid "Domain %s has been undefined\n"
 msgstr "Domain %s has been undefined\n"
 
-#: tools/virsh.c:1130
+#: tools/virsh.c:2073
 #, c-format
 msgid "Failed to undefine domain %s"
 msgstr "Failed to undefine domain %s"
 
-#: tools/virsh.c:1143
+#: tools/virsh.c:2086
 msgid "start a (previously defined) inactive domain"
 msgstr "start a (previously defined) inactive domain"
 
-#: tools/virsh.c:2075
+#: tools/virsh.c:2087
 msgid ""
 "Start a domain, either from the last managedsave\n"
 "    state, or via a fresh boot if no managedsave state\n"
 "    is present."
 msgstr ""
 
-#: tools/virsh.c:1149
+#: tools/virsh.c:2094
 msgid "name of the inactive domain"
 msgstr "name of the inactive domain"
 
-#: tools/virsh.c:2090
+#: tools/virsh.c:2102
 msgid "avoid file system cache when loading"
 msgstr ""
 
-#: tools/virsh.c:2092
+#: tools/virsh.c:2104
 msgid "force fresh boot by discarding any managed save"
 msgstr ""
 
-#: tools/virsh.c:1172
+#: tools/virsh.c:2127
 msgid "Domain is already active"
 msgstr "Domain is already active"
 
-#: tools/virsh.c:1185
+#: tools/virsh.c:2169
 #, c-format
 msgid "Failed to start domain %s"
 msgstr "Failed to start domain %s"
 
-#: tools/virsh.c:1178
+#: tools/virsh.c:2174
 #, c-format
 msgid "Domain %s started\n"
 msgstr "Domain %s started\n"
 
-#: tools/virsh.c:1196
+#: tools/virsh.c:2192
 msgid "save a domain state to a file"
 msgstr "save a domain state to a file"
 
-#: tools/virsh.c:2181
+#: tools/virsh.c:2193
 msgid "Save the RAM state of a running domain."
 msgstr ""
 
-#: tools/virsh.c:2186 tools/virsh.c:2460 tools/virsh.c:2891
+#: tools/virsh.c:2198 tools/virsh.c:2472 tools/virsh.c:2903
 msgid "avoid file system cache when saving"
 msgstr ""
 
-#: tools/virsh.c:1203
+#: tools/virsh.c:2200
 msgid "where to save the data"
 msgstr "where to save the data"
 
-#: tools/virsh.c:2190 tools/virsh.c:2305 tools/virsh.c:2826 tools/virsh.c:5498
+#: tools/virsh.c:2202 tools/virsh.c:2317 tools/virsh.c:2838 tools/virsh.c:5600
 msgid "filename containing updated XML for the target"
 msgstr ""
 
-#: tools/virsh.c:2191 tools/virsh.c:2306 tools/virsh.c:2363
+#: tools/virsh.c:2203 tools/virsh.c:2318 tools/virsh.c:2375
 msgid "set domain to be running on restore"
 msgstr ""
 
-#: tools/virsh.c:2192 tools/virsh.c:2307 tools/virsh.c:2364
+#: tools/virsh.c:2204 tools/virsh.c:2319 tools/virsh.c:2376
 msgid "set domain to be paused on restore"
 msgstr ""
 
-#: tools/virsh.c:2221 tools/virsh.c:2855 tools/virsh.c:5543
+#: tools/virsh.c:2233 tools/virsh.c:2867 tools/virsh.c:5645
 msgid "malformed xml argument"
 msgstr ""
 
-#: tools/virsh.c:1227
+#: tools/virsh.c:2247
 #, c-format
 msgid "Failed to save domain %s to %s"
 msgstr "Failed to save domain %s to %s"
 
-#: tools/virsh.c:1225
+#: tools/virsh.c:2251
 #, c-format
 msgid "Domain %s saved to %s\n"
 msgstr "Domain %s saved to %s\n"
 
-#: tools/virsh.c:2252
+#: tools/virsh.c:2264
 msgid "saved state domain information in XML"
 msgstr ""
 
-#: tools/virsh.c:2253
+#: tools/virsh.c:2265
 msgid ""
 "Output the domain information for a saved state file,\n"
 "as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:2259
+#: tools/virsh.c:2271
 msgid "saved state file to read"
 msgstr ""
 
-#: tools/virsh.c:2298
+#: tools/virsh.c:2272 tools/virsh.c:5340 tools/virsh.c:14188
+#: tools/virsh.c:14725
 msgid "include security sensitive information in XML dump"
 msgstr ""
 
-#: tools/virsh.c:2297
+#: tools/virsh.c:2309
 msgid "redefine the XML for a domain's saved state file"
 msgstr ""
 
-#: tools/virsh.c:2298
+#: tools/virsh.c:2310
 msgid "Replace the domain XML associated with a saved state file"
 msgstr ""
 
-#: tools/virsh.c:2303
+#: tools/virsh.c:2315
 msgid "saved state file to modify"
 msgstr ""
 
-#: tools/virsh.c:2332
+#: tools/virsh.c:2344
 msgid "malformed or missing xml argument"
 msgstr ""
 
-#: tools/virsh.c:2340 tools/virsh.c:2430 tools/virsh.c:13050
+#: tools/virsh.c:2352 tools/virsh.c:2442 tools/virsh.c:14129
 #, c-format
 msgid "Failed to update %s"
 msgstr ""
 
-#: tools/virsh.c:2344
+#: tools/virsh.c:2356
 #, c-format
 msgid "State file %s updated.\n"
 msgstr ""
 
-#: tools/virsh.c:2356
+#: tools/virsh.c:2368
 msgid "edit XML for a domain's saved state file"
 msgstr ""
 
-#: tools/virsh.c:2357
+#: tools/virsh.c:2369
 msgid "Edit the domain XML associated with a saved state file"
 msgstr ""
 
-#: tools/virsh.c:2362
+#: tools/virsh.c:2374
 msgid "saved state file to edit"
 msgstr ""
 
-#: tools/virsh.c:2389
+#: tools/virsh.c:2401
 msgid "--running and --saved are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:2421
+#: tools/virsh.c:2433
 #, c-format
 msgid "Saved image %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:2434
+#: tools/virsh.c:2446
 #, c-format
 msgid "State file %s edited.\n"
 msgstr ""
 
-#: tools/virsh.c:2451
+#: tools/virsh.c:2463
 msgid "managed save of a domain state"
 msgstr ""
 
-#: tools/virsh.c:2452
+#: tools/virsh.c:2464
 msgid ""
 "Save and destroy a running domain, so it can be restarted from\n"
 "    the same state at a later time.  When the virsh 'start'\n"
@@ -19161,872 +19827,873 @@
 "    be started from this saved state."
 msgstr ""
 
-#: tools/virsh.c:2462
+#: tools/virsh.c:2474
 msgid "set domain to be running on next start"
 msgstr ""
 
-#: tools/virsh.c:2463
+#: tools/virsh.c:2475
 msgid "set domain to be paused on next start"
 msgstr ""
 
-#: tools/virsh.c:2489
+#: tools/virsh.c:2501
 #, c-format
 msgid "Failed to save domain %s state"
 msgstr ""
 
-#: tools/virsh.c:2493
+#: tools/virsh.c:2505
 #, c-format
 msgid "Domain %s state saved by libvirt\n"
 msgstr ""
 
-#: tools/virsh.c:2505
+#: tools/virsh.c:2517
 msgid "Remove managed save of a domain"
 msgstr ""
 
-#: tools/virsh.c:2506
+#: tools/virsh.c:2518
 msgid "Remove an existing managed save state file from a domain"
 msgstr ""
 
-#: tools/virsh.c:2531
+#: tools/virsh.c:2543
 msgid "Failed to check for domain managed save image"
 msgstr ""
 
-#: tools/virsh.c:2537
+#: tools/virsh.c:2549
 #, c-format
 msgid "Failed to remove managed save image for domain %s"
 msgstr ""
 
-#: tools/virsh.c:2542
+#: tools/virsh.c:2554
 #, c-format
 msgid "Removed managedsave image for domain %s"
 msgstr ""
 
-#: tools/virsh.c:2545
+#: tools/virsh.c:2557
 #, c-format
 msgid "Domain %s has no manage save image; removal skipped"
 msgstr ""
 
-#: tools/virsh.c:1239
+#: tools/virsh.c:2571
 msgid "show/set scheduler parameters"
 msgstr ""
 
-#: tools/virsh.c:1240
+#: tools/virsh.c:2572
 msgid "Show/Set scheduler parameters."
 msgstr ""
 
-#: tools/virsh.c:1246
+#: tools/virsh.c:2578
 msgid "parameter=value"
 msgstr ""
 
-#: tools/virsh.c:1247
+#: tools/virsh.c:2579
 msgid "weight for XEN_CREDIT"
 msgstr ""
 
-#: tools/virsh.c:1248
+#: tools/virsh.c:2580
 msgid "cap for XEN_CREDIT"
 msgstr ""
 
-#: tools/virsh.c:2569
+#: tools/virsh.c:2581
 msgid "get/set current scheduler info"
 msgstr ""
 
-#: tools/virsh.c:2570
+#: tools/virsh.c:2582
 msgid "get/set value to be used on next boot"
 msgstr ""
 
-#: tools/virsh.c:2571
+#: tools/virsh.c:2583
 msgid "get/set value from running domain"
 msgstr ""
 
-#: tools/virsh.c:1266
+#: tools/virsh.c:2599
 msgid "Invalid value of weight"
 msgstr "Neplatná hodnota výšky"
 
-#: tools/virsh.c:1281
+#: tools/virsh.c:2613
 msgid "Invalid value of cap"
 msgstr ""
 
-#: tools/virsh.c:1293
+#: tools/virsh.c:2625
 msgid "Invalid syntax for --set, expecting name=value"
 msgstr ""
 
-#: tools/virsh.c:1308
+#: tools/virsh.c:2640
 msgid "Invalid value for parameter, expecting an int"
 msgstr ""
 
-#: tools/virsh.c:1315
+#: tools/virsh.c:2647
 msgid "Invalid value for parameter, expecting an unsigned int"
 msgstr ""
 
-#: tools/virsh.c:2642
+#: tools/virsh.c:2654
 msgid "Invalid value for parameter, expecting a long long"
 msgstr ""
 
-#: tools/virsh.c:1329
+#: tools/virsh.c:2661
 msgid "Invalid value for parameter, expecting an unsigned long long"
 msgstr ""
 
-#: tools/virsh.c:1335
+#: tools/virsh.c:2667
 msgid "Invalid value for parameter, expecting a double"
 msgstr ""
 
-#: tools/virsh.c:2686 tools/virsh.c:4053 tools/virsh.c:4286 tools/virsh.c:4500
-#: tools/virsh.c:4589 tools/virsh.c:4674 tools/virsh.c:4830
+#: tools/virsh.c:2698 tools/virsh.c:4065 tools/virsh.c:4298 tools/virsh.c:4512
+#: tools/virsh.c:4601 tools/virsh.c:4689 tools/virsh.c:4869 tools/virsh.c:6283
 msgid "--current must be specified exclusively"
 msgstr ""
 
-#: tools/virsh.c:1369 tools/virsh.c:1373
+#: tools/virsh.c:2718 tools/virsh.c:2722
 msgid "Scheduler"
 msgstr "Plánovač"
 
-#: tools/virsh.c:1373
+#: tools/virsh.c:2722
 msgid "Unknown"
 msgstr ""
 
-#: tools/virsh.c:2767
+#: tools/virsh.c:2779
 #, c-format
 msgid "invalid scheduler option: %s"
 msgstr ""
 
-#: tools/virsh.c:2774
+#: tools/virsh.c:2786
 msgid "cannot query both live and config at once"
 msgstr ""
 
-#: tools/virsh.c:1445
+#: tools/virsh.c:2828
 msgid "restore a domain from a saved state in a file"
 msgstr "restore a domain from a saved state in a file"
 
-#: tools/virsh.c:1446
+#: tools/virsh.c:2829
 msgid "Restore a domain."
 msgstr "Restore a domain."
 
-#: tools/virsh.c:1451
+#: tools/virsh.c:2834
 msgid "the state to restore"
 msgstr "the state to restore"
 
-#: tools/virsh.c:2824
+#: tools/virsh.c:2836
 msgid "avoid file system cache when restoring"
 msgstr ""
 
-#: tools/virsh.c:2827
+#: tools/virsh.c:2839
 msgid "restore domain into running state"
 msgstr ""
 
-#: tools/virsh.c:2828
+#: tools/virsh.c:2840
 msgid "restore domain into paused state"
 msgstr ""
 
-#: tools/virsh.c:1472
+#: tools/virsh.c:2878
 #, c-format
 msgid "Failed to restore domain from %s"
 msgstr "Failed to restore domain from %s"
 
-#: tools/virsh.c:1470
+#: tools/virsh.c:2882
 #, c-format
 msgid "Domain restored from %s\n"
 msgstr "Domain restored from %s\n"
 
-#: tools/virsh.c:1482
+#: tools/virsh.c:2894
 msgid "dump the core of a domain to a file for analysis"
 msgstr "dump the core of a domain to a file for analysis"
 
-#: tools/virsh.c:1483
+#: tools/virsh.c:2895
 msgid "Core dump a domain."
 msgstr "Core dump a domain."
 
-#: tools/virsh.c:1488
+#: tools/virsh.c:2900
 msgid "perform a live core dump if supported"
 msgstr ""
 
-#: tools/virsh.c:1489
+#: tools/virsh.c:2901
 msgid "crash the domain after core dump"
 msgstr ""
 
-#: tools/virsh.c:2892
+#: tools/virsh.c:2904
 msgid "reset the domain after core dump"
 msgstr ""
 
-#: tools/virsh.c:1491
+#: tools/virsh.c:2906
 msgid "where to dump the core"
 msgstr "where to dump the core"
 
-#: tools/virsh.c:1521
+#: tools/virsh.c:2938
 #, c-format
 msgid "Failed to core dump domain %s to %s"
 msgstr "Failed to core dump domain %s to %s"
 
-#: tools/virsh.c:1519
+#: tools/virsh.c:2942
 #, c-format
 msgid "Domain %s dumped to %s\n"
 msgstr ""
 
-#: tools/virsh.c:2939
+#: tools/virsh.c:2951
 msgid ""
 "take a screenshot of a current domain console and store it into a file"
 msgstr ""
 
-#: tools/virsh.c:2941
+#: tools/virsh.c:2953
 msgid "screenshot of a current domain console"
 msgstr ""
 
-#: tools/virsh.c:2947
+#: tools/virsh.c:2959
 msgid "where to store the screenshot"
 msgstr ""
 
-#: tools/virsh.c:2948
+#: tools/virsh.c:2960
 msgid "ID of a screen to take screenshot of"
 msgstr ""
 
-#: tools/virsh.c:2978
+#: tools/virsh.c:2990
 msgid "Invalid domain supplied"
 msgstr ""
 
-#: tools/virsh.c:3020 tools/virsh.c:9287 tools/virsh.c:9378
+#: tools/virsh.c:3032 tools/virsh.c:10102 tools/virsh.c:10193
 msgid "file must not be empty"
 msgstr ""
 
-#: tools/virsh.c:3025
+#: tools/virsh.c:3037
 msgid "invalid screen ID"
 msgstr ""
 
-#: tools/virsh.c:3036
+#: tools/virsh.c:3048
 #, c-format
 msgid "could not take a screenshot of %s"
 msgstr ""
 
-#: tools/virsh.c:3049
+#: tools/virsh.c:3061
 #, c-format
 msgid "cannot create file %s"
 msgstr ""
 
-#: tools/virsh.c:3057
+#: tools/virsh.c:3069
 #, c-format
 msgid "could not receive data from domain %s"
 msgstr ""
 
-#: tools/virsh.c:3062 tools/virsh.c:9308 tools/virsh.c:9404
+#: tools/virsh.c:3074 tools/virsh.c:10123 tools/virsh.c:10219
 #, c-format
 msgid "cannot close file %s"
 msgstr ""
 
-#: tools/virsh.c:3067
+#: tools/virsh.c:3079
 #, c-format
 msgid "cannot close stream on domain %s"
 msgstr ""
 
-#: tools/virsh.c:3071
+#: tools/virsh.c:3083
 #, c-format
 msgid "Screenshot saved to %s, with type of %s"
 msgstr ""
 
-#: tools/virsh.c:1533
+#: tools/virsh.c:3102
 msgid "resume a domain"
 msgstr "resume a domain"
 
-#: tools/virsh.c:1534
+#: tools/virsh.c:3103
 msgid "Resume a previously suspended domain."
 msgstr "Resume a previously suspended domain."
 
-#: tools/virsh.c:1557
+#: tools/virsh.c:3126
 #, c-format
 msgid "Domain %s resumed\n"
 msgstr "Domain %s resumed\n"
 
-#: tools/virsh.c:1559
+#: tools/virsh.c:3128
 #, c-format
 msgid "Failed to resume domain %s"
 msgstr "Failed to resume domain %s"
 
-#: tools/virsh.c:1571
+#: tools/virsh.c:3140
 msgid "gracefully shutdown a domain"
 msgstr "gracefully shutdown a domain"
 
-#: tools/virsh.c:1572
+#: tools/virsh.c:3141
 msgid "Run shutdown in the target domain."
 msgstr "Run shutdown in the target domain."
 
-#: tools/virsh.c:1595
+#: tools/virsh.c:3164
 #, c-format
 msgid "Domain %s is being shutdown\n"
 msgstr "Domain %s is being shutdown\n"
 
-#: tools/virsh.c:1597
+#: tools/virsh.c:3166
 #, c-format
 msgid "Failed to shutdown domain %s"
 msgstr "Failed to shutdown domain %s"
 
-#: tools/virsh.c:1609
+#: tools/virsh.c:3178
 msgid "reboot a domain"
 msgstr "reboot a domain"
 
-#: tools/virsh.c:1610
+#: tools/virsh.c:3179
 msgid "Run a reboot command in the target domain."
 msgstr "Run a reboot command in the target domain."
 
-#: tools/virsh.c:1633
+#: tools/virsh.c:3202
 #, c-format
 msgid "Domain %s is being rebooted\n"
 msgstr "Domain %s is being rebooted\n"
 
-#: tools/virsh.c:1635
+#: tools/virsh.c:3204
 #, c-format
 msgid "Failed to reboot domain %s"
 msgstr "Failed to reboot domain %s"
 
-#: tools/virsh.c:3204
+#: tools/virsh.c:3216
 msgid "reset a domain"
 msgstr ""
 
-#: tools/virsh.c:3205
+#: tools/virsh.c:3217
 msgid "Reset the target domain as if by power button"
 msgstr ""
 
-#: tools/virsh.c:3228
+#: tools/virsh.c:3240
 #, c-format
 msgid "Domain %s was reset\n"
 msgstr ""
 
-#: tools/virsh.c:3230
+#: tools/virsh.c:3242
 #, c-format
 msgid "Failed to reset domain %s"
 msgstr ""
 
-#: tools/virsh.c:3242
+#: tools/virsh.c:3254
 msgid "destroy (stop) a domain"
 msgstr ""
 
-#: tools/virsh.c:3244
+#: tools/virsh.c:3256
 msgid "Forcefully stop a given domain, but leave its resources intact."
 msgstr ""
 
-#: tools/virsh.c:1671
+#: tools/virsh.c:3279
 #, c-format
 msgid "Domain %s destroyed\n"
 msgstr "Domain %s destroyed\n"
 
-#: tools/virsh.c:1673
+#: tools/virsh.c:3281
 #, c-format
 msgid "Failed to destroy domain %s"
 msgstr "Failed to destroy domain %s"
 
-#: tools/virsh.c:1685
+#: tools/virsh.c:3293
 msgid "domain information"
 msgstr "domain information"
 
-#: tools/virsh.c:1686
+#: tools/virsh.c:3294
 msgid "Returns basic information about the domain."
 msgstr "Returns basic information about the domain."
 
-#: tools/virsh.c:1714 tools/virsh.c:1716
+#: tools/virsh.c:3325 tools/virsh.c:3327
 msgid "Id:"
 msgstr "Id:"
 
-#: tools/virsh.c:1717 tools/virsh.c:4500 tools/virsh.c:5116
+#: tools/virsh.c:3328 tools/virsh.c:9414 tools/virsh.c:10353
 msgid "Name:"
 msgstr "Name:"
 
-#: tools/virsh.c:1720 tools/virsh.c:4503
+#: tools/virsh.c:3331 tools/virsh.c:9417
 msgid "UUID:"
 msgstr "UUID:"
 
-#: tools/virsh.c:1723
+#: tools/virsh.c:3334
 msgid "OS Type:"
 msgstr "OS Type:"
 
-#: tools/virsh.c:1728 tools/virsh.c:1886 tools/virsh.c:4510 tools/virsh.c:4514
-#: tools/virsh.c:4518 tools/virsh.c:4522
+#: tools/virsh.c:3339 tools/virsh.c:3969 tools/virsh.c:3998 tools/virsh.c:9424
+#: tools/virsh.c:9428 tools/virsh.c:9432 tools/virsh.c:9436 tools/virsh.c:9440
 msgid "State:"
 msgstr "State:"
 
-#: tools/virsh.c:1731 tools/virsh.c:2248
+#: tools/virsh.c:3342 tools/virsh.c:5037
 msgid "CPU(s):"
 msgstr "CPU(s):"
 
-#: tools/virsh.c:1738 tools/virsh.c:1893
+#: tools/virsh.c:3349 tools/virsh.c:3976
 msgid "CPU time:"
 msgstr "CPU time:"
 
-#: tools/virsh.c:1742 tools/virsh.c:1745
+#: tools/virsh.c:3353 tools/virsh.c:3356
 msgid "Max memory:"
 msgstr "Max memory:"
 
-#: tools/virsh.c:1746
+#: tools/virsh.c:3357
 msgid "no limit"
 msgstr ""
 
-#: tools/virsh.c:1748
+#: tools/virsh.c:3359
 msgid "Used memory:"
 msgstr "Used memory:"
 
-#: tools/virsh.c:3359 tools/virsh.c:3361 tools/virsh.c:6288 tools/virsh.c:6290
-#: tools/virsh.c:8635 tools/virsh.c:8637
+#: tools/virsh.c:3371 tools/virsh.c:3373 tools/virsh.c:6690 tools/virsh.c:6692
+#: tools/virsh.c:9450 tools/virsh.c:9452
 msgid "Persistent:"
 msgstr ""
 
-#: tools/virsh.c:3359 tools/virsh.c:3371 tools/virsh.c:6288 tools/virsh.c:8159
-#: tools/virsh.c:8174 tools/virsh.c:8176 tools/virsh.c:8177 tools/virsh.c:8178
-#: tools/virsh.c:8635 tools/virsh.c:9557 tools/virsh.c:9699 tools/virsh.c:9706
-#: tools/virsh.c:9707 tools/virsh.c:9708 tools/virsh.c:9724
-#: tools/virsh.c:15766 tools/virsh.c:15846
+#: tools/virsh.c:3371 tools/virsh.c:3383 tools/virsh.c:6690 tools/virsh.c:8974
+#: tools/virsh.c:8989 tools/virsh.c:8991 tools/virsh.c:8992 tools/virsh.c:8993
+#: tools/virsh.c:9450 tools/virsh.c:10372 tools/virsh.c:10514
+#: tools/virsh.c:10521 tools/virsh.c:10522 tools/virsh.c:10523
+#: tools/virsh.c:10539 tools/virsh.c:16855 tools/virsh.c:16935
 msgid "unknown"
 msgstr ""
 
-#: tools/virsh.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290
-#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151
-#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646
-#: tools/virsh.c:15800
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "yes"
 msgstr ""
 
-#: tools/virsh.c:3361 tools/virsh.c:3374 tools/virsh.c:6284 tools/virsh.c:6290
-#: tools/virsh.c:6295 tools/virsh.c:6491 tools/virsh.c:6514 tools/virsh.c:8151
-#: tools/virsh.c:8162 tools/virsh.c:8637 tools/virsh.c:8646
-#: tools/virsh.c:15800
+#: tools/virsh.c:3373 tools/virsh.c:3386 tools/virsh.c:6686 tools/virsh.c:6692
+#: tools/virsh.c:6697 tools/virsh.c:6893 tools/virsh.c:6916 tools/virsh.c:8966
+#: tools/virsh.c:8977 tools/virsh.c:9452 tools/virsh.c:9461
+#: tools/virsh.c:16889
 msgid "no"
 msgstr ""
 
-#: tools/virsh.c:1756
+#: tools/virsh.c:3377 tools/virsh.c:6695 tools/virsh.c:6697 tools/virsh.c:9459
+#: tools/virsh.c:9461
 msgid "Autostart:"
 msgstr ""
 
-#: tools/virsh.c:1757
+#: tools/virsh.c:3378
 msgid "enable"
 msgstr ""
 
-#: tools/virsh.c:1757
+#: tools/virsh.c:3378
 msgid "disable"
 msgstr ""
 
-#: tools/virsh.c:3371 tools/virsh.c:3373
+#: tools/virsh.c:3383 tools/virsh.c:3385
 msgid "Managed save:"
 msgstr ""
 
-#: tools/virsh.c:1770
+#: tools/virsh.c:3401
 msgid "Security model:"
 msgstr ""
 
-#: tools/virsh.c:1771
+#: tools/virsh.c:3402
 msgid "Security DOI:"
 msgstr ""
 
-#: tools/virsh.c:1780
+#: tools/virsh.c:3416
 msgid "Security label:"
 msgstr ""
 
-#: tools/virsh.c:3419
+#: tools/virsh.c:3431
 msgid "domain job information"
 msgstr ""
 
-#: tools/virsh.c:3420
+#: tools/virsh.c:3432
 msgid "Returns information about jobs running on a domain."
 msgstr ""
 
-#: tools/virsh.c:3447
+#: tools/virsh.c:3459
 msgid "Job type:"
 msgstr ""
 
-#: tools/virsh.c:3450
+#: tools/virsh.c:3462
 msgid "Bounded"
 msgstr ""
 
-#: tools/virsh.c:3454
+#: tools/virsh.c:3466
 msgid "Unbounded"
 msgstr ""
 
-#: tools/virsh.c:3459
+#: tools/virsh.c:3471
 msgid "None"
 msgstr ""
 
-#: tools/virsh.c:3463
+#: tools/virsh.c:3475
 msgid "Time elapsed:"
 msgstr ""
 
-#: tools/virsh.c:3465
+#: tools/virsh.c:3477
 msgid "Time remaining:"
 msgstr ""
 
-#: tools/virsh.c:3468
+#: tools/virsh.c:3480
 msgid "Data processed:"
 msgstr ""
 
-#: tools/virsh.c:3470
+#: tools/virsh.c:3482
 msgid "Data remaining:"
 msgstr ""
 
-#: tools/virsh.c:3472
+#: tools/virsh.c:3484
 msgid "Data total:"
 msgstr ""
 
-#: tools/virsh.c:3476
+#: tools/virsh.c:3488
 msgid "Memory processed:"
 msgstr ""
 
-#: tools/virsh.c:3478
+#: tools/virsh.c:3490
 msgid "Memory remaining:"
 msgstr ""
 
-#: tools/virsh.c:3480
+#: tools/virsh.c:3492
 msgid "Memory total:"
 msgstr ""
 
-#: tools/virsh.c:3484
+#: tools/virsh.c:3496
 msgid "File processed:"
 msgstr ""
 
-#: tools/virsh.c:3486
+#: tools/virsh.c:3498
 msgid "File remaining:"
 msgstr ""
 
-#: tools/virsh.c:3488
+#: tools/virsh.c:3500
 msgid "File total:"
 msgstr ""
 
-#: tools/virsh.c:3502
+#: tools/virsh.c:3514
 msgid "abort active domain job"
 msgstr ""
 
-#: tools/virsh.c:3503
+#: tools/virsh.c:3515
 msgid "Aborts the currently running domain job"
 msgstr ""
 
-#: tools/virsh.c:1793
+#: tools/virsh.c:3547
 msgid "NUMA free memory"
 msgstr ""
 
-#: tools/virsh.c:1794
+#: tools/virsh.c:3548
 msgid "display available free memory for the NUMA cell."
 msgstr ""
 
-#: tools/virsh.c:1799
+#: tools/virsh.c:3553
 msgid "NUMA cell number"
 msgstr ""
 
-#: tools/virsh.c:3542
+#: tools/virsh.c:3554
 msgid "show free memory for all NUMA cells"
 msgstr ""
 
-#: tools/virsh.c:3568
+#: tools/virsh.c:3580
 msgid "cell number has to be a number"
 msgstr ""
 
-#: tools/virsh.c:3574
+#: tools/virsh.c:3586
 msgid "--cellno and --all are mutually exclusive. Please choose only one."
 msgstr ""
 
-#: tools/virsh.c:3582 tools/virsh.c:3588
+#: tools/virsh.c:3594 tools/virsh.c:3600
 msgid "unable to get node capabilities"
 msgstr ""
 
-#: tools/virsh.c:3586
+#: tools/virsh.c:3598
 msgid "(capabilities)"
 msgstr ""
 
-#: tools/virsh.c:3595
+#: tools/virsh.c:3607
 msgid "could not get information about NUMA topology"
 msgstr ""
 
-#: tools/virsh.c:3607
+#: tools/virsh.c:3619
 msgid "conversion from string failed"
 msgstr ""
 
-#: tools/virsh.c:3615
+#: tools/virsh.c:3627
 #, c-format
 msgid "failed to get free memory for NUMA node number: %lu"
 msgstr ""
 
-#: tools/virsh.c:1825
+#: tools/virsh.c:3641 tools/virsh.c:3654
 msgid "Total"
 msgstr "Celkom"
 
-#: tools/virsh.c:3663
+#: tools/virsh.c:3675
 msgid "connection vcpu maximum"
 msgstr ""
 
-#: tools/virsh.c:3664
+#: tools/virsh.c:3676
 msgid "Show maximum number of virtual CPUs for guests on this connection."
 msgstr ""
 
-#: tools/virsh.c:3669
+#: tools/virsh.c:3681
 msgid "domain type"
 msgstr ""
 
-#: tools/virsh.c:3680
+#: tools/virsh.c:3692
 msgid "Invalid type"
 msgstr ""
 
-#: tools/virsh.c:3699
+#: tools/virsh.c:3711
 msgid "domain vcpu counts"
 msgstr ""
 
-#: tools/virsh.c:3700
+#: tools/virsh.c:3712
 msgid "Returns the number of virtual CPUs used by the domain."
 msgstr ""
 
-#: tools/virsh.c:3706
+#: tools/virsh.c:3718
 msgid "get maximum cap on vcpus"
 msgstr ""
 
-#: tools/virsh.c:3707
+#: tools/virsh.c:3719
 msgid "get number of currently active vcpus"
 msgstr ""
 
-#: tools/virsh.c:3708
+#: tools/virsh.c:3720
 msgid "get value from running domain"
 msgstr ""
 
-#: tools/virsh.c:3709
+#: tools/virsh.c:3721
 msgid "get value to be used on next boot"
 msgstr ""
 
-#: tools/virsh.c:3711
+#: tools/virsh.c:3723
 msgid "get value according to current domain state"
 msgstr ""
 
-#: tools/virsh.c:3734
+#: tools/virsh.c:3746
 #, c-format
 msgid ""
 "when using --%s, one of --config, --live, or --current must be specified"
 msgstr ""
 
-#: tools/virsh.c:3739
+#: tools/virsh.c:3751
 #, c-format
 msgid "when using --%s, either --maximum or --active must be specified"
 msgstr ""
 
-#: tools/virsh.c:3759
+#: tools/virsh.c:3771
 msgid "--maximum and --active cannot both be specified"
 msgstr ""
 
-#: tools/virsh.c:3764
+#: tools/virsh.c:3776
 msgid "--config, --live, and --current are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:3810 tools/virsh.c:3831
+#: tools/virsh.c:3822 tools/virsh.c:3843
 msgid "maximum"
 msgstr ""
 
-#: tools/virsh.c:3810 tools/virsh.c:3868
+#: tools/virsh.c:3822 tools/virsh.c:3880
 msgid "config"
 msgstr ""
 
-#: tools/virsh.c:3831 tools/virsh.c:3890
+#: tools/virsh.c:3843 tools/virsh.c:3902
 msgid "live"
 msgstr ""
 
-#: tools/virsh.c:3868 tools/virsh.c:3890
+#: tools/virsh.c:3880 tools/virsh.c:3902
 msgid "current"
 msgstr ""
 
-#: tools/virsh.c:3907
+#: tools/virsh.c:3919
 msgid "detailed domain vcpu information"
 msgstr ""
 
-#: tools/virsh.c:1837
+#: tools/virsh.c:3920
 msgid "Returns basic information about the domain virtual CPUs."
 msgstr "Returns basic information about the domain virtual CPUs."
 
-#: tools/virsh.c:1884
+#: tools/virsh.c:3967 tools/virsh.c:3996 tools/virsh.c:4131
 msgid "VCPU:"
 msgstr "VCPU:"
 
-#: tools/virsh.c:1885
+#: tools/virsh.c:3968 tools/virsh.c:3997
 msgid "CPU:"
 msgstr "CPU:"
 
-#: tools/virsh.c:1895
+#: tools/virsh.c:3978 tools/virsh.c:4000
 msgid "CPU Affinity:"
 msgstr "CPU Affinity:"
 
-#: tools/virsh.c:3985 tools/virsh.c:3986 tools/virsh.c:3987
+#: tools/virsh.c:3997 tools/virsh.c:3998 tools/virsh.c:3999
 msgid "N/A"
 msgstr ""
 
-#: tools/virsh.c:3987
+#: tools/virsh.c:3999
 msgid "CPU time"
 msgstr ""
 
-#: tools/virsh.c:4013
+#: tools/virsh.c:4025
 msgid "control or query domain vcpu affinity"
 msgstr ""
 
-#: tools/virsh.c:1923
+#: tools/virsh.c:4026
 msgid "Pin domain VCPUs to host physical CPUs."
 msgstr "Pin domain VCPUs to host physical CPUs."
 
-#: tools/virsh.c:1929
+#: tools/virsh.c:4032
 msgid "vcpu number"
 msgstr "vcpu number"
 
-#: tools/virsh.c:4022
+#: tools/virsh.c:4034
 msgid "host cpu number(s) to set, or omit option to query"
 msgstr ""
 
-#: tools/virsh.c:4023 tools/virsh.c:4266 tools/virsh.c:4480 tools/virsh.c:4570
-#: tools/virsh.c:4651 tools/virsh.c:4807
+#: tools/virsh.c:4035 tools/virsh.c:4278 tools/virsh.c:4492 tools/virsh.c:4582
+#: tools/virsh.c:4665 tools/virsh.c:4846 tools/virsh.c:6259
 msgid "affect next boot"
 msgstr ""
 
-#: tools/virsh.c:4024 tools/virsh.c:4267 tools/virsh.c:4481 tools/virsh.c:4571
-#: tools/virsh.c:4652 tools/virsh.c:4808
+#: tools/virsh.c:4036 tools/virsh.c:4279 tools/virsh.c:4493 tools/virsh.c:4583
+#: tools/virsh.c:4666 tools/virsh.c:4847 tools/virsh.c:6260
 msgid "affect running domain"
 msgstr ""
 
-#: tools/virsh.c:4025 tools/virsh.c:4268 tools/virsh.c:4482 tools/virsh.c:4572
-#: tools/virsh.c:4653 tools/virsh.c:4809
+#: tools/virsh.c:4037 tools/virsh.c:4280 tools/virsh.c:4494 tools/virsh.c:4584
+#: tools/virsh.c:4667 tools/virsh.c:4848 tools/virsh.c:6261
 msgid "affect current domain"
 msgstr ""
 
-#: tools/virsh.c:4074
+#: tools/virsh.c:4086
 msgid "vcpupin: Missing cpulist."
 msgstr ""
 
-#: tools/virsh.c:1957
+#: tools/virsh.c:4095
 msgid "vcpupin: Invalid or missing vCPU number."
 msgstr ""
 
-#: tools/virsh.c:4094
+#: tools/virsh.c:4106
 msgid "vcpupin: failed to get domain information."
 msgstr ""
 
-#: tools/virsh.c:1980
+#: tools/virsh.c:4112
 msgid "vcpupin: Invalid vCPU number."
 msgstr ""
 
-#: tools/virsh.c:4119
+#: tools/virsh.c:4131
 msgid "CPU Affinity"
 msgstr ""
 
-#: tools/virsh.c:2036
+#: tools/virsh.c:4200 tools/virsh.c:4224
 #, c-format
 msgid "Physical CPU %d doesn't exist."
 msgstr "Fyzické CPU %d neexistuje."
 
-#: tools/virsh.c:4248
+#: tools/virsh.c:4260
 msgid "cpulist: Invalid format."
 msgstr ""
 
-#: tools/virsh.c:2059
+#: tools/virsh.c:4269
 msgid "change number of virtual CPUs"
 msgstr "change number of virtual CPUs"
 
-#: tools/virsh.c:2060
+#: tools/virsh.c:4270
 msgid "Change the number of virtual CPUs in the guest domain."
 msgstr ""
 
-#: tools/virsh.c:2066
+#: tools/virsh.c:4276
 msgid "number of virtual CPUs"
 msgstr "number of virtual CPUs"
 
-#: tools/virsh.c:4265
+#: tools/virsh.c:4277
 msgid "set maximum limit on next boot"
 msgstr ""
 
-#: tools/virsh.c:4307
+#: tools/virsh.c:4319
 msgid "Invalid number of virtual CPUs"
 msgstr ""
 
-#: tools/virsh.c:4330
+#: tools/virsh.c:4342
 msgid "--maximum must be used with --config only"
 msgstr ""
 
-#: tools/virsh.c:4351
+#: tools/virsh.c:4363
 msgid "Inject NMI to the guest"
 msgstr ""
 
-#: tools/virsh.c:4352
+#: tools/virsh.c:4364
 msgid "Inject NMI to the guest domain."
 msgstr ""
 
-#: tools/virsh.c:4385
+#: tools/virsh.c:4397
 msgid "Send keycodes to the guest"
 msgstr ""
 
-#: tools/virsh.c:4386
+#: tools/virsh.c:4398
 msgid "Send keycodes (integers or symbolic names) to the guest"
 msgstr ""
 
-#: tools/virsh.c:4393
+#: tools/virsh.c:4405
 msgid "the codeset of keycodes, default:linux"
 msgstr ""
 
-#: tools/virsh.c:4395
+#: tools/virsh.c:4407
 msgid "the time (in milliseconds) how long the keys will be held"
 msgstr ""
 
-#: tools/virsh.c:4396
+#: tools/virsh.c:4408
 msgid "the key code"
 msgstr ""
 
-#: tools/virsh.c:4439
+#: tools/virsh.c:4451
 #, c-format
 msgid "unknown codeset: '%s'"
 msgstr ""
 
-#: tools/virsh.c:4445
+#: tools/virsh.c:4457
 msgid "too many keycodes"
 msgstr ""
 
-#: tools/virsh.c:4451
+#: tools/virsh.c:4463
 #, c-format
 msgid "invalid keycode: '%s'"
 msgstr ""
 
-#: tools/virsh.c:2115
+#: tools/virsh.c:4484
 msgid "change memory allocation"
 msgstr "change memory allocation"
 
-#: tools/virsh.c:2116
+#: tools/virsh.c:4485
 msgid "Change the current memory allocation in the guest domain."
 msgstr "Change the current memory allocation in the guest domain."
 
-#: tools/virsh.c:2122
+#: tools/virsh.c:4491
 msgid "number of kilobytes of memory"
 msgstr ""
 
-#: tools/virsh.c:4521 tools/virsh.c:4609
+#: tools/virsh.c:4533 tools/virsh.c:4621
 msgid "memory size has to be a number"
 msgstr ""
 
-#: tools/virsh.c:4527
+#: tools/virsh.c:4539
 #, c-format
 msgid "Invalid value of %lu for memory size"
 msgstr ""
 
-#: tools/virsh.c:2149
+#: tools/virsh.c:4545
 msgid "Unable to verify MaxMemorySize"
 msgstr ""
 
-#: tools/virsh.c:4539
+#: tools/virsh.c:4551
 #, c-format
 msgid "Requested memory size %lu kb is larger than maximum of %lu kb"
 msgstr ""
 
-#: tools/virsh.c:2171
+#: tools/virsh.c:4574
 msgid "change maximum memory limit"
 msgstr "change maximum memory limit"
 
-#: tools/virsh.c:2172
+#: tools/virsh.c:4575
 msgid "Change the maximum memory allocation limit in the guest domain."
 msgstr "Change the maximum memory allocation limit in the guest domain."
 
-#: tools/virsh.c:2178
+#: tools/virsh.c:4581
 msgid "maximum memory limit in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:2143 tools/virsh.c:2155 tools/virsh.c:2199
+#: tools/virsh.c:4627
 #, c-format
 msgid "Invalid value of %d for memory size"
 msgstr "Neplatná hodnota %d veľkosti pamäte"
 
-#: tools/virsh.c:2218
+#: tools/virsh.c:4633 tools/virsh.c:4638
 msgid "Unable to change MaxMemorySize"
 msgstr ""
 
-#: tools/virsh.c:4639
+#: tools/virsh.c:4651
 msgid "Get or set blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4640
+#: tools/virsh.c:4652
 msgid ""
 "Get or set the current blkio parameters for a guest domain.\n"
 "    To get the blkio parameters use following command: \n"
@@ -20034,36 +20701,45 @@
 "    virsh # blkiotune <domain>"
 msgstr ""
 
-#: tools/virsh.c:4650
+#: tools/virsh.c:4662
 msgid "IO Weight in range [100, 1000]"
 msgstr ""
 
-#: tools/virsh.c:4693 tools/virsh.c:4852
+#: tools/virsh.c:4664
+msgid "per-device IO Weights, in the form of /path/to/device,weight,..."
+msgstr ""
+
+#: tools/virsh.c:4708 tools/virsh.c:4891 tools/virsh.c:6305 tools/virsh.c:6313
+#: tools/virsh.c:6321 tools/virsh.c:6329 tools/virsh.c:6337 tools/virsh.c:6345
 msgid "Unable to parse integer parameter"
 msgstr ""
 
-#: tools/virsh.c:4700
+#: tools/virsh.c:4715
 #, c-format
 msgid "Invalid value of %d for I/O weight"
 msgstr ""
 
-#: tools/virsh.c:4709
+#: tools/virsh.c:4723
+msgid "Unable to parse string parameter"
+msgstr ""
+
+#: tools/virsh.c:4734
 msgid "Unable to get number of blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4722
+#: tools/virsh.c:4747
 msgid "Unable to get blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4774
+#: tools/virsh.c:4810
 msgid "Unable to change blkio parameters"
 msgstr ""
 
-#: tools/virsh.c:4789
+#: tools/virsh.c:4828
 msgid "Get or set memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4790
+#: tools/virsh.c:4829
 msgid ""
 "Get or set the current memory parameters for a guest domain.\n"
 "    To get the memory parameters use following command: \n"
@@ -20071,2970 +20747,3346 @@
 "    virsh # memtune <domain>"
 msgstr ""
 
-#: tools/virsh.c:4800
+#: tools/virsh.c:4839
 msgid "Max memory in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4802
+#: tools/virsh.c:4841
 msgid "Memory during contention in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4804
+#: tools/virsh.c:4843
 msgid "Max memory plus swap in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4806
+#: tools/virsh.c:4845
 msgid "Min guaranteed memory in kilobytes"
 msgstr ""
 
-#: tools/virsh.c:4872
+#: tools/virsh.c:4911
 msgid "Unable to get number of memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4885
+#: tools/virsh.c:4924
 msgid "Unable to get memory parameters"
 msgstr ""
 
-#: tools/virsh.c:4965
+#: tools/virsh.c:5004
 msgid "Unable to change memory parameters"
 msgstr ""
 
-#: tools/virsh.c:2230
+#: tools/virsh.c:5019
 msgid "node information"
 msgstr "node information"
 
-#: tools/virsh.c:2231
+#: tools/virsh.c:5020
 msgid "Returns basic information about the node."
 msgstr "Returns basic information about the node."
 
-#: tools/virsh.c:2244
+#: tools/virsh.c:5033
 msgid "failed to get node information"
 msgstr "failed to get node information"
 
-#: tools/virsh.c:2247
+#: tools/virsh.c:5036
 msgid "CPU model:"
 msgstr "CPU model:"
 
-#: tools/virsh.c:2249
+#: tools/virsh.c:5038
 msgid "CPU frequency:"
 msgstr "CPU frequency:"
 
-#: tools/virsh.c:2250
+#: tools/virsh.c:5039
 msgid "CPU socket(s):"
 msgstr "CPU socket(s):"
 
-#: tools/virsh.c:2251
+#: tools/virsh.c:5040
 msgid "Core(s) per socket:"
 msgstr "Core(s) per socket:"
 
-#: tools/virsh.c:2252
+#: tools/virsh.c:5041
 msgid "Thread(s) per core:"
 msgstr "Thread(s) per core:"
 
-#: tools/virsh.c:2253
+#: tools/virsh.c:5042
 msgid "NUMA cell(s):"
 msgstr "NUMA cell(s):"
 
-#: tools/virsh.c:2254
+#: tools/virsh.c:5043
 msgid "Memory size:"
 msgstr "Memory size:"
 
-#: tools/virsh.c:5013
+#: tools/virsh.c:5052
 msgid "Prints cpu stats of the node."
 msgstr ""
 
-#: tools/virsh.c:5014
+#: tools/virsh.c:5053
 msgid "Returns cpu stats of the node, in nanoseconds."
 msgstr ""
 
-#: tools/virsh.c:5019
+#: tools/virsh.c:5058
 msgid "prints specified cpu statistics only."
 msgstr ""
 
-#: tools/virsh.c:5020
+#: tools/virsh.c:5059
 msgid "prints by percentage during 1 second."
 msgstr ""
 
-#: tools/virsh.c:5048
+#: tools/virsh.c:5087
 msgid "Invalid value of cpuNum"
 msgstr ""
 
-#: tools/virsh.c:5054
+#: tools/virsh.c:5093
 msgid "Unable to get number of cpu stats"
 msgstr ""
 
-#: tools/virsh.c:5068
+#: tools/virsh.c:5107
 msgid "Unable to get node cpu stats"
 msgstr ""
 
-#: tools/virsh.c:5098 tools/virsh.c:5121
+#: tools/virsh.c:5137 tools/virsh.c:5160
 msgid "user:"
 msgstr ""
 
-#: tools/virsh.c:5099 tools/virsh.c:5123
+#: tools/virsh.c:5138 tools/virsh.c:5162
 msgid "system:"
 msgstr ""
 
-#: tools/virsh.c:5100 tools/virsh.c:5108 tools/virsh.c:5125
+#: tools/virsh.c:5139 tools/virsh.c:5147 tools/virsh.c:5164
 msgid "idle:"
 msgstr ""
 
-#: tools/virsh.c:5101 tools/virsh.c:5127
+#: tools/virsh.c:5140 tools/virsh.c:5166
 msgid "iowait:"
 msgstr ""
 
-#: tools/virsh.c:5107 tools/virsh.c:5119
+#: tools/virsh.c:5146 tools/virsh.c:5158
 msgid "usage:"
 msgstr ""
 
-#: tools/virsh.c:5142
+#: tools/virsh.c:5181
 msgid "Prints memory stats of the node."
 msgstr ""
 
-#: tools/virsh.c:5143
+#: tools/virsh.c:5182
 msgid "Returns memory stats of the node, in kilobytes."
 msgstr ""
 
-#: tools/virsh.c:5148
+#: tools/virsh.c:5187
 msgid "prints specified cell statistics only."
 msgstr ""
 
-#: tools/virsh.c:5165
+#: tools/virsh.c:5204
 msgid "Invalid value of cellNum"
 msgstr ""
 
-#: tools/virsh.c:5172
+#: tools/virsh.c:5211
 msgid "Unable to get number of memory stats"
 msgstr ""
 
-#: tools/virsh.c:5185
+#: tools/virsh.c:5224
 msgid "Unable to get memory stats"
 msgstr ""
 
-#: tools/virsh.c:2263
+#: tools/virsh.c:5242
+msgid "suspend the host node for a given time duration"
+msgstr ""
+
+#: tools/virsh.c:5243
+msgid ""
+"Suspend the host node for a given time duration and attempt to resume "
+"thereafter."
+msgstr ""
+
+#: tools/virsh.c:5249
+msgid "mem(Suspend-to-RAM), disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)"
+msgstr ""
+
+#: tools/virsh.c:5251
+msgid "Suspend duration in seconds"
+msgstr ""
+
+#: tools/virsh.c:5252
+msgid "Suspend flags, 0 for default"
+msgstr ""
+
+#: tools/virsh.c:5283
+msgid "Invalid target"
+msgstr ""
+
+#: tools/virsh.c:5288
+msgid "Invalid duration"
+msgstr ""
+
+#: tools/virsh.c:5294
+msgid "The host was not suspended"
+msgstr ""
+
+#: tools/virsh.c:5305
 msgid "capabilities"
 msgstr ""
 
-#: tools/virsh.c:2264
+#: tools/virsh.c:5306
 msgid "Returns capabilities of hypervisor/driver."
 msgstr ""
 
-#: tools/virsh.c:2277
+#: tools/virsh.c:5319
 msgid "failed to get capabilities"
 msgstr ""
 
-#: tools/virsh.c:2290
+#: tools/virsh.c:5332
 msgid "domain information in XML"
 msgstr "domain information in XML"
 
-#: tools/virsh.c:2291
+#: tools/virsh.c:5333
 msgid "Output the domain information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:2297 tools/virsh.c:3405
+#: tools/virsh.c:5339 tools/virsh.c:7262
 msgid "show inactive defined XML"
 msgstr ""
 
-#: tools/virsh.c:5239
+#: tools/virsh.c:5341
 msgid "update guest CPU according to host CPU"
 msgstr ""
 
-#: tools/virsh.c:2339
+#: tools/virsh.c:5385
 msgid "Convert native config to domain XML"
 msgstr ""
 
-#: tools/virsh.c:2340
+#: tools/virsh.c:5386
 msgid "Convert native guest configuration format to domain XML format."
 msgstr ""
 
-#: tools/virsh.c:2345
+#: tools/virsh.c:5391
 msgid "source config data format"
 msgstr ""
 
-#: tools/virsh.c:2346
+#: tools/virsh.c:5392
 msgid "config data file to import from"
 msgstr ""
 
-#: tools/virsh.c:2385
+#: tools/virsh.c:5431
 msgid "Convert domain XML to native config"
 msgstr ""
 
-#: tools/virsh.c:2386
+#: tools/virsh.c:5432
 msgid "Convert domain XML config to a native guest configuration format."
 msgstr ""
 
-#: tools/virsh.c:2391
+#: tools/virsh.c:5437
 msgid "target config data type format"
 msgstr ""
 
-#: tools/virsh.c:2392
+#: tools/virsh.c:5438
 msgid "xml data file to export from"
 msgstr ""
 
-#: tools/virsh.c:2431
+#: tools/virsh.c:5477
 msgid "convert a domain id or UUID to domain name"
 msgstr "convert a domain id or UUID to domain name"
 
-#: tools/virsh.c:2437
+#: tools/virsh.c:5483
 msgid "domain id or uuid"
 msgstr "domain id or uuid"
 
-#: tools/virsh.c:2461
+#: tools/virsh.c:5507
 msgid "convert a domain name or UUID to domain id"
 msgstr "convert a domain name or UUID to domain id"
 
-#: tools/virsh.c:2496
+#: tools/virsh.c:5542
 msgid "convert a domain name or id to domain UUID"
 msgstr "convert a domain name or id to domain UUID"
 
-#: tools/virsh.c:2502
+#: tools/virsh.c:5548
 msgid "domain id or name"
 msgstr "domain id or name"
 
-#: tools/virsh.c:2521
+#: tools/virsh.c:5567
 msgid "failed to get domain UUID"
 msgstr "failed to get domain UUID"
 
-#: tools/virsh.c:2531
+#: tools/virsh.c:5577
 msgid "migrate domain to another host"
 msgstr ""
 
-#: tools/virsh.c:2532
+#: tools/virsh.c:5578
 msgid "Migrate domain to another host.  Add --live for live migration."
 msgstr ""
 
-#: tools/virsh.c:2537
+#: tools/virsh.c:5583
 msgid "live migration"
 msgstr ""
 
-#: tools/virsh.c:2538
+#: tools/virsh.c:5584
 msgid "peer-2-peer migration"
 msgstr ""
 
-#: tools/virsh.c:2539
+#: tools/virsh.c:5585
 msgid "direct migration"
 msgstr ""
 
-#: tools/virsh.c:2540
+#: tools/virsh.c:5586
 msgid "tunnelled migration"
 msgstr ""
 
-#: tools/virsh.c:2541
+#: tools/virsh.c:5587
 msgid "persist VM on destination"
 msgstr ""
 
-#: tools/virsh.c:2542
+#: tools/virsh.c:5588
 msgid "undefine VM on source"
 msgstr ""
 
-#: tools/virsh.c:2543
+#: tools/virsh.c:5589
 msgid "do not restart the domain on the destination host"
 msgstr ""
 
-#: tools/virsh.c:5488
+#: tools/virsh.c:5590
 msgid "migration with non-shared storage with full disk copy"
 msgstr ""
 
-#: tools/virsh.c:5489
+#: tools/virsh.c:5591
 msgid ""
 "migration with non-shared storage with incremental copy (same base image "
 "shared between source and destination)"
 msgstr ""
 
-#: tools/virsh.c:5491
+#: tools/virsh.c:5593
 msgid "prevent any configuration changes to domain until migration ends)"
 msgstr ""
 
-#: tools/virsh.c:5492
+#: tools/virsh.c:5594
 msgid "display the progress of migration"
 msgstr ""
 
-#: tools/virsh.c:5494
+#: tools/virsh.c:5596
 msgid ""
 "connection URI of the destination host as seen from the client(normal "
 "migration) or source(p2p migration)"
 msgstr ""
 
-#: tools/virsh.c:2546
+#: tools/virsh.c:5597
 msgid "migration URI, usually can be omitted"
 msgstr ""
 
-#: tools/virsh.c:2547
+#: tools/virsh.c:5598
 msgid "rename to new name during migration (if supported)"
 msgstr ""
 
-#: tools/virsh.c:5497
+#: tools/virsh.c:5599
 msgid "force guest to suspend if live migration exceeds timeout (in seconds)"
 msgstr ""
 
-#: tools/virsh.c:5538 tools/virsh.c:7652 tools/virsh.c:8472 tools/virsh.c:8484
-#: tools/virsh.c:8823
+#: tools/virsh.c:5640 tools/virsh.c:8467 tools/virsh.c:9287 tools/virsh.c:9299
+#: tools/virsh.c:9638
 msgid "missing argument"
 msgstr ""
 
-#: tools/virsh.c:2597
+#: tools/virsh.c:5684
 msgid "migrate: Unexpected migrateuri for peer2peer/direct migration"
 msgstr ""
 
-#: tools/virsh.c:5673
+#: tools/virsh.c:5775
 msgid "migrate: Unexpected timeout for offline migration"
 msgstr ""
 
-#: tools/virsh.c:5678
+#: tools/virsh.c:5780
 msgid "migrate: Invalid timeout"
 msgstr ""
 
-#: tools/virsh.c:5684
+#: tools/virsh.c:5786
 msgid "migrate: Timeout is too big"
 msgstr ""
 
-#: tools/virsh.c:5778
+#: tools/virsh.c:5880
 msgid "set maximum tolerable downtime"
 msgstr ""
 
-#: tools/virsh.c:5779
+#: tools/virsh.c:5881
 msgid ""
 "Set maximum tolerable downtime of a domain which is being live-migrated to "
 "another host."
 msgstr ""
 
-#: tools/virsh.c:5785
+#: tools/virsh.c:5887
 msgid "maximum tolerable downtime (in milliseconds) for migration"
 msgstr ""
 
-#: tools/virsh.c:5804
+#: tools/virsh.c:5906
 msgid "migrate: Invalid downtime"
 msgstr ""
 
-#: tools/virsh.c:5822
+#: tools/virsh.c:5924
 msgid "Set the maximum migration bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5823
+#: tools/virsh.c:5925
 msgid ""
 "Set the maximum migration bandwidth (in Mbps) for a domain which is being "
 "migrated to another host."
 msgstr ""
 
-#: tools/virsh.c:5830
+#: tools/virsh.c:5932
 msgid "migration bandwidth limit in Mbps"
 msgstr ""
 
-#: tools/virsh.c:5848
+#: tools/virsh.c:5950
 msgid "migrate: Invalid bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5866
+#: tools/virsh.c:5968
 msgid "Get the maximum migration bandwidth"
 msgstr ""
 
-#: tools/virsh.c:5867
+#: tools/virsh.c:5969
 msgid "Get the maximum migration bandwidth (in Mbps) for a domain."
 msgstr ""
 
-#: tools/virsh.c:5927
+#: tools/virsh.c:6029
 msgid "bandwidth must be a number"
 msgstr ""
 
-#: tools/virsh.c:5950 tools/virsh.c:5951
+#: tools/virsh.c:6052 tools/virsh.c:6053
 msgid "Populate a disk from its backing image."
 msgstr ""
 
-#: tools/virsh.c:5957 tools/virsh.c:5981
+#: tools/virsh.c:6059 tools/virsh.c:6083
 msgid "Fully-qualified path of disk"
 msgstr ""
 
-#: tools/virsh.c:5958
+#: tools/virsh.c:6060
 msgid "Bandwidth limit in MB/s"
 msgstr ""
 
-#: tools/virsh.c:5974 tools/virsh.c:5975
+#: tools/virsh.c:6076 tools/virsh.c:6077
 msgid "Manage active block operations."
 msgstr ""
 
-#: tools/virsh.c:5982
+#: tools/virsh.c:6084
 msgid "Abort the active job on the speficied disk"
 msgstr ""
 
-#: tools/virsh.c:5983
+#: tools/virsh.c:6085
 msgid "Get active job information for the specified disk"
 msgstr ""
 
-#: tools/virsh.c:5984
+#: tools/virsh.c:6086
 msgid "Set the Bandwidth limit in MB/s"
 msgstr ""
 
-#: tools/virsh.c:6004
+#: tools/virsh.c:6106
 msgid "One of --abort, --info, or --bandwidth is required"
 msgstr ""
 
-#: tools/virsh.c:2628
+#: tools/virsh.c:6132 tools/virsh.c:6133
+msgid "Resize block device of domain."
+msgstr ""
+
+#: tools/virsh.c:6139
+msgid "Fully-qualified path of block device"
+msgstr ""
+
+#: tools/virsh.c:6140
+msgid "New size of the block device in kilobytes, the size must be integer"
+msgstr ""
+
+#: tools/virsh.c:6158
+msgid "Path must not be empty"
+msgstr ""
+
+#: tools/virsh.c:6163 tools/virsh.c:10088 tools/virsh.c:10093
+#: tools/virsh.c:10180 tools/virsh.c:10185
+msgid "Unable to parse integer"
+msgstr ""
+
+#: tools/virsh.c:6168
+#, c-format
+msgid "Size must be less than %llu"
+msgstr ""
+
+#: tools/virsh.c:6176
+#, c-format
+msgid "Failed to resize block device '%s'"
+msgstr ""
+
+#: tools/virsh.c:6178
+#, c-format
+msgid "Block device '%s' is resized"
+msgstr ""
+
+#: tools/virsh.c:6190
 msgid "autostart a network"
 msgstr ""
 
-#: tools/virsh.c:2630
+#: tools/virsh.c:6192
 msgid "Configure a network to be automatically started at boot."
 msgstr "Nakonfigurovať sieť, aby sa spúštala pri štarte."
 
-#: tools/virsh.c:2635 tools/virsh.c:3155
+#: tools/virsh.c:6197 tools/virsh.c:6580 tools/virsh.c:6619 tools/virsh.c:7012
+#: tools/virsh.c:13667
 msgid "network name or uuid"
 msgstr ""
 
-#: tools/virsh.c:2657
+#: tools/virsh.c:6219
 #, c-format
 msgid "failed to mark network %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:2659
+#: tools/virsh.c:6221
 #, c-format
 msgid "failed to unmark network %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:2665
+#: tools/virsh.c:6227
 #, c-format
 msgid "Network %s marked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:2667
+#: tools/virsh.c:6229
 #, c-format
 msgid "Network %s unmarked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:2677
+#: tools/virsh.c:6239
+msgid "Set or query a block device I/O tuning parameters."
+msgstr ""
+
+#: tools/virsh.c:6240
+msgid "Set or query disk I/O parameters such as block throttling."
+msgstr ""
+
+#: tools/virsh.c:6248
+msgid "total throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6250
+msgid "read throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6252
+msgid "write throughput limit in bytes per second"
+msgstr ""
+
+#: tools/virsh.c:6254
+msgid "total I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6256
+msgid "read I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6258
+msgid "write I/O operations limit per second"
+msgstr ""
+
+#: tools/virsh.c:6355
+msgid "Unable to get number of block I/O throttle parameters"
+msgstr ""
+
+#: tools/virsh.c:6368
+msgid "Unable to get block I/O throttle parameters"
+msgstr ""
+
+#: tools/virsh.c:6465
+msgid "Unable to change block I/O throttle"
+msgstr ""
+
+#: tools/virsh.c:6482
 msgid "create a network from an XML file"
 msgstr ""
 
-#: tools/virsh.c:2678
+#: tools/virsh.c:6483
 msgid "Create a network."
 msgstr ""
 
-#: tools/virsh.c:2683 tools/virsh.c:2731
+#: tools/virsh.c:6488 tools/virsh.c:6534
 msgid "file containing an XML network description"
 msgstr ""
 
-#: tools/virsh.c:2710
+#: tools/virsh.c:6513
 #, c-format
 msgid "Network %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:2714
+#: tools/virsh.c:6517
 #, c-format
 msgid "Failed to create network from %s"
 msgstr ""
 
-#: tools/virsh.c:2725
+#: tools/virsh.c:6528
 msgid "define (but don't start) a network from an XML file"
 msgstr ""
 
-#: tools/virsh.c:2726
+#: tools/virsh.c:6529
 msgid "Define a network."
 msgstr ""
 
-#: tools/virsh.c:2758
+#: tools/virsh.c:6559
 #, c-format
 msgid "Network %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:2762
+#: tools/virsh.c:6563
 #, c-format
 msgid "Failed to define network from %s"
 msgstr ""
 
-#: tools/virsh.c:6172
+#: tools/virsh.c:6574
 msgid "destroy (stop) a network"
 msgstr ""
 
-#: tools/virsh.c:6173
+#: tools/virsh.c:6575
 msgid "Forcefully stop a given network."
 msgstr ""
 
-#: tools/virsh.c:2797
+#: tools/virsh.c:6598
 #, c-format
 msgid "Network %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:2799
+#: tools/virsh.c:6600
 #, c-format
 msgid "Failed to destroy network %s"
 msgstr ""
 
-#: tools/virsh.c:2812
+#: tools/virsh.c:6613
 msgid "network information in XML"
 msgstr ""
 
-#: tools/virsh.c:2813
+#: tools/virsh.c:6614
 msgid "Output the network information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:6250
+#: tools/virsh.c:6652
 msgid "network information"
 msgstr ""
 
-#: tools/virsh.c:3194
+#: tools/virsh.c:6653
+msgid "Returns basic information about the network"
+msgstr ""
+
+#: tools/virsh.c:6658 tools/virsh.c:7051
 msgid "network name"
 msgstr "názov siete"
 
-#: tools/virsh.c:5631
+#: tools/virsh.c:6682 tools/virsh.c:8118 tools/virsh.c:11164
 msgid "UUID"
 msgstr ""
 
-#: tools/virsh.c:6284
+#: tools/virsh.c:6686
 msgid "Active:"
 msgstr ""
 
-#: tools/virsh.c:3034 tools/virsh.c:3057 tools/virsh.c:4280 tools/virsh.c:4303
+#: tools/virsh.c:6695 tools/virsh.c:6891 tools/virsh.c:6914 tools/virsh.c:8963
+#: tools/virsh.c:9459
 msgid "no autostart"
 msgstr ""
 
-#: tools/virsh.c:6299
+#: tools/virsh.c:6701
 msgid "Bridge:"
 msgstr ""
 
-#: tools/virsh.c:2852
+#: tools/virsh.c:6712
 msgid "edit XML configuration for a physical host interface"
 msgstr ""
 
-#: tools/virsh.c:2853
+#: tools/virsh.c:6713
 msgid "Edit the XML configuration for a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:2858 tools/virsh.c:3404 tools/virsh.c:3496 tools/virsh.c:3534
-#: tools/virsh.c:3572
+#: tools/virsh.c:6718 tools/virsh.c:7261 tools/virsh.c:7351 tools/virsh.c:7389
+#: tools/virsh.c:7427
 msgid "interface name or MAC address"
 msgstr ""
 
-#: tools/virsh.c:2901
+#: tools/virsh.c:6758
 #, c-format
 msgid "Interface %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:2917 tools/virsh.c:7230
+#: tools/virsh.c:6774 tools/virsh.c:8210 tools/virsh.c:13625
 msgid "ERROR: the XML configuration was changed by another user"
 msgstr ""
 
-#: tools/virsh.c:2927
+#: tools/virsh.c:6784
 #, c-format
 msgid "Interface %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:2952
+#: tools/virsh.c:6809
 msgid "list networks"
 msgstr "zoznam sietí"
 
-#: tools/virsh.c:2953
+#: tools/virsh.c:6810
 msgid "Returns list of networks."
 msgstr ""
 
-#: tools/virsh.c:2958
+#: tools/virsh.c:6815
 msgid "list inactive networks"
 msgstr ""
 
-#: tools/virsh.c:2959
+#: tools/virsh.c:6816
 msgid "list inactive & active networks"
 msgstr ""
 
-#: tools/virsh.c:2979 tools/virsh.c:2987
+#: tools/virsh.c:6836 tools/virsh.c:6844
 msgid "Failed to list active networks"
 msgstr ""
 
-#: tools/virsh.c:2998 tools/virsh.c:3008
+#: tools/virsh.c:6855 tools/virsh.c:6865
 msgid "Failed to list inactive networks"
 msgstr ""
 
-#: tools/virsh.c:3018 tools/virsh.c:4265
+#: tools/virsh.c:6875 tools/virsh.c:9109 tools/virsh.c:9138 tools/virsh.c:9197
 msgid "Autostart"
 msgstr "Automatické spustenie"
 
-#: tools/virsh.c:3040 tools/virsh.c:3306 tools/virsh.c:4286
+#: tools/virsh.c:6897 tools/virsh.c:7163 tools/virsh.c:9077
 msgid "active"
 msgstr "aktívne"
 
-#: tools/virsh.c:3063 tools/virsh.c:3323 tools/virsh.c:4309 tools/virsh.c:4511
+#: tools/virsh.c:6920 tools/virsh.c:7180 tools/virsh.c:9002 tools/virsh.c:9075
+#: tools/virsh.c:9425
 msgid "inactive"
 msgstr ""
 
-#: tools/virsh.c:3079
+#: tools/virsh.c:6936
 msgid "convert a network UUID to network name"
 msgstr ""
 
-#: tools/virsh.c:3085
+#: tools/virsh.c:6942
 msgid "network uuid"
 msgstr "uuid siete"
 
-#: tools/virsh.c:3110
+#: tools/virsh.c:6967
 msgid "start a (previously defined) inactive network"
 msgstr ""
 
-#: tools/virsh.c:3111
+#: tools/virsh.c:6968
 msgid "Start a network."
 msgstr ""
 
-#: tools/virsh.c:3116
+#: tools/virsh.c:6973
 msgid "name of the inactive network"
 msgstr ""
 
-#: tools/virsh.c:3133
+#: tools/virsh.c:6990
 #, c-format
 msgid "Network %s started\n"
 msgstr ""
 
-#: tools/virsh.c:3136
+#: tools/virsh.c:6993
 #, c-format
 msgid "Failed to start network %s"
 msgstr ""
 
-#: tools/virsh.c:3149
+#: tools/virsh.c:7006
 msgid "undefine an inactive network"
 msgstr ""
 
-#: tools/virsh.c:3150
+#: tools/virsh.c:7007
 msgid "Undefine the configuration for an inactive network."
 msgstr ""
 
-#: tools/virsh.c:3173
+#: tools/virsh.c:7030
 #, c-format
 msgid "Network %s has been undefined\n"
 msgstr ""
 
-#: tools/virsh.c:3175
+#: tools/virsh.c:7032
 #, c-format
 msgid "Failed to undefine network %s"
 msgstr ""
 
-#: tools/virsh.c:3188
+#: tools/virsh.c:7045
 msgid "convert a network name to network UUID"
 msgstr ""
 
-#: tools/virsh.c:3214
+#: tools/virsh.c:7071
 msgid "failed to get network UUID"
 msgstr ""
 
-#: tools/virsh.c:3226
+#: tools/virsh.c:7083
 msgid "list physical host interfaces"
 msgstr ""
 
-#: tools/virsh.c:3227
+#: tools/virsh.c:7084
 msgid "Returns list of physical host interfaces."
 msgstr ""
 
-#: tools/virsh.c:3232
+#: tools/virsh.c:7089
 msgid "list inactive interfaces"
 msgstr ""
 
-#: tools/virsh.c:3233
+#: tools/virsh.c:7090
 msgid "list inactive & active interfaces"
 msgstr ""
 
-#: tools/virsh.c:3252 tools/virsh.c:3260
+#: tools/virsh.c:7109 tools/virsh.c:7117
 msgid "Failed to list active interfaces"
 msgstr ""
 
-#: tools/virsh.c:3271 tools/virsh.c:3281
+#: tools/virsh.c:7128 tools/virsh.c:7138
 msgid "Failed to list inactive interfaces"
 msgstr ""
 
-#: tools/virsh.c:3291
+#: tools/virsh.c:7148
 msgid "MAC Address"
 msgstr ""
 
-#: tools/virsh.c:3338
+#: tools/virsh.c:7195
 msgid "convert an interface MAC address to interface name"
 msgstr ""
 
-#: tools/virsh.c:3344
+#: tools/virsh.c:7201
 msgid "interface mac"
 msgstr ""
 
-#: tools/virsh.c:3368
+#: tools/virsh.c:7225
 msgid "convert an interface name to interface MAC address"
 msgstr ""
 
-#: tools/virsh.c:3374
+#: tools/virsh.c:7231
 msgid "interface name"
 msgstr ""
 
-#: tools/virsh.c:3398
+#: tools/virsh.c:7255
 msgid "interface information in XML"
 msgstr ""
 
-#: tools/virsh.c:3399
+#: tools/virsh.c:7256
 msgid ""
 "Output the physical host interface information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:3443
+#: tools/virsh.c:7300
 msgid "define (but don't start) a physical host interface from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3444
+#: tools/virsh.c:7301
 msgid "Define a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3449
+#: tools/virsh.c:7306
 msgid "file containing an XML interface description"
 msgstr ""
 
-#: tools/virsh.c:3476
+#: tools/virsh.c:7331
 #, c-format
 msgid "Interface %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3480
+#: tools/virsh.c:7335
 #, c-format
 msgid "Failed to define interface from %s"
 msgstr ""
 
-#: tools/virsh.c:3490
+#: tools/virsh.c:7345
 msgid "undefine a physical host interface (remove it from configuration)"
 msgstr ""
 
-#: tools/virsh.c:3491
+#: tools/virsh.c:7346
 msgid "undefine an interface."
 msgstr ""
 
-#: tools/virsh.c:3514
+#: tools/virsh.c:7369
 #, c-format
 msgid "Interface %s undefined\n"
 msgstr ""
 
-#: tools/virsh.c:3516
+#: tools/virsh.c:7371
 #, c-format
 msgid "Failed to undefine interface %s"
 msgstr ""
 
-#: tools/virsh.c:3528
+#: tools/virsh.c:7383
 msgid "start a physical host interface (enable it / \"if-up\")"
 msgstr ""
 
-#: tools/virsh.c:3529
+#: tools/virsh.c:7384
 msgid "start a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3552
+#: tools/virsh.c:7407 tools/virsh.c:7936
 #, c-format
 msgid "Interface %s started\n"
 msgstr ""
 
-#: tools/virsh.c:3554
+#: tools/virsh.c:7409 tools/virsh.c:7933
 #, c-format
 msgid "Failed to start interface %s"
 msgstr ""
 
-#: tools/virsh.c:3566
+#: tools/virsh.c:7421
 msgid "destroy a physical host interface (disable it / \"if-down\")"
 msgstr ""
 
-#: tools/virsh.c:7020
+#: tools/virsh.c:7422
 msgid "forcefully stop a physical host interface."
 msgstr ""
 
-#: tools/virsh.c:3590
+#: tools/virsh.c:7445
 #, c-format
 msgid "Interface %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:3592
+#: tools/virsh.c:7447
 #, c-format
 msgid "Failed to destroy interface %s"
 msgstr ""
 
-#: tools/virsh.c:7057
+#: tools/virsh.c:7459
 msgid ""
 "create a snapshot of current interfaces settings, which can be later "
 "commited (iface-commit) or restored (iface-rollback)"
 msgstr ""
 
-#: tools/virsh.c:7060
+#: tools/virsh.c:7462
 msgid "Create a restore point for interfaces settings"
 msgstr ""
 
-#: tools/virsh.c:7075
+#: tools/virsh.c:7477
 msgid "Failed to begin network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7079
+#: tools/virsh.c:7481
 msgid "Network config change transaction started\n"
 msgstr ""
 
-#: tools/virsh.c:7087
+#: tools/virsh.c:7489
 msgid "commit changes made since iface-begin and free restore point"
 msgstr ""
 
-#: tools/virsh.c:7088
+#: tools/virsh.c:7490
 msgid "commit changes and free restore point"
 msgstr ""
 
-#: tools/virsh.c:7103
+#: tools/virsh.c:7505
 msgid "Failed to commit network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7107
+#: tools/virsh.c:7509
 msgid "Network config change transaction committed\n"
 msgstr ""
 
-#: tools/virsh.c:7115
+#: tools/virsh.c:7517
 msgid "rollback to previous saved configuration created via iface-begin"
 msgstr ""
 
-#: tools/virsh.c:7116
+#: tools/virsh.c:7518
 msgid "rollback to previous restore point"
 msgstr ""
 
-#: tools/virsh.c:7131
+#: tools/virsh.c:7533
 msgid "Failed to rollback network config change transaction"
 msgstr ""
 
-#: tools/virsh.c:7135
+#: tools/virsh.c:7537
 msgid "Network config change transaction rolled back\n"
 msgstr ""
 
-#: tools/virsh.c:7143
+#: tools/virsh.c:7545
+msgid "create a bridge device and attach an existing network device to it"
+msgstr ""
+
+#: tools/virsh.c:7546
+msgid "bridge an existing network device"
+msgstr ""
+
+#: tools/virsh.c:7551
+msgid "existing interface name"
+msgstr ""
+
+#: tools/virsh.c:7552
+msgid "new bridge device name"
+msgstr ""
+
+#: tools/virsh.c:7553
+msgid "do not enable STP for this bridge"
+msgstr ""
+
+#: tools/virsh.c:7555
+msgid "number of seconds to squelch traffic on newly connected ports"
+msgstr ""
+
+#: tools/virsh.c:7556
+msgid "don't start the bridge immediately"
+msgstr ""
+
+#: tools/virsh.c:7587
+msgid "Missing bridge device name in command"
+msgstr ""
+
+#: tools/virsh.c:7593
+#, c-format
+msgid "Network device %s already exists"
+msgstr ""
+
+#: tools/virsh.c:7601
+msgid "Unable to parse delay parameter"
+msgstr ""
+
+#: tools/virsh.c:7611
+msgid "(interface definition)"
+msgstr ""
+
+#: tools/virsh.c:7612 tools/virsh.c:7810
+#, c-format
+msgid "Failed to parse configuration of %s"
+msgstr ""
+
+#: tools/virsh.c:7619 tools/virsh.c:7817
+#, c-format
+msgid "Existing device %s has no type"
+msgstr ""
+
+#: tools/virsh.c:7624
+#, c-format
+msgid "Existing device %s is already a bridge"
+msgstr ""
+
+#: tools/virsh.c:7631 tools/virsh.c:7830
+#, c-format
+msgid "Interface name from config %s doesn't match given supplied name %s"
+msgstr ""
+
+#: tools/virsh.c:7638
+msgid "Failed to create bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7646
+msgid "Failed to set stp attribute in xml document"
+msgstr ""
+
+#: tools/virsh.c:7653
+#, c-format
+msgid "Failed to set bridge delay %d in xml document"
+msgstr ""
+
+#: tools/virsh.c:7661
+msgid "Failed to set bridge interface type to 'bridge' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7666
+#, c-format
+msgid "Failed to set master bridge interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7675
+msgid "Failed to create interface node under bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7683
+#, c-format
+msgid "Failed to set new slave interface type to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7689
+#, c-format
+msgid "Failed to set new slave interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7709 tools/virsh.c:7892
+#, c-format
+msgid "Failed to move '%s' element in xml document"
+msgstr ""
+
+#: tools/virsh.c:7720
+#, c-format
+msgid "Failed to format new xml document for bridge %s"
+msgstr ""
+
+#: tools/virsh.c:7729
+#, c-format
+msgid "Failed to define new bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7734
+#, c-format
+msgid "Created bridge %s with attached device %s\n"
+msgstr ""
+
+#: tools/virsh.c:7740
+#, c-format
+msgid "Failed to start bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7743
+#, c-format
+msgid "Bridge interface %s started\n"
+msgstr ""
+
+#: tools/virsh.c:7766
+msgid "undefine a bridge device after detaching its slave device"
+msgstr ""
+
+#: tools/virsh.c:7767
+msgid "unbridge a network device"
+msgstr ""
+
+#: tools/virsh.c:7772
+msgid "current bridge device name"
+msgstr ""
+
+#: tools/virsh.c:7774
+msgid "don't start the un-slaved interface immediately (not recommended)"
+msgstr ""
+
+#: tools/virsh.c:7808
+msgid "(bridge interface definition)"
+msgstr ""
+
+#: tools/virsh.c:7822
+#, c-format
+msgid "Device %s is not a bridge"
+msgstr ""
+
+#: tools/virsh.c:7838
+msgid "No bridge node in xml document"
+msgstr ""
+
+#: tools/virsh.c:7843
+msgid "Multiple interfaecs attached to bridge"
+msgstr ""
+
+#: tools/virsh.c:7848
+msgid "No interface attached to bridge"
+msgstr ""
+
+#: tools/virsh.c:7856
+#, c-format
+msgid "Device attached to bridge %s has no name"
+msgstr ""
+
+#: tools/virsh.c:7861
+#, c-format
+msgid "Attached device %s has no type"
+msgstr ""
+
+#: tools/virsh.c:7866
+#, c-format
+msgid "Failed to set interface type to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7872
+#, c-format
+msgid "Failed to set interface name to '%s' in xml document"
+msgstr ""
+
+#: tools/virsh.c:7903
+#, c-format
+msgid "Failed to format new xml document for un-enslaved interface %s"
+msgstr ""
+
+#: tools/virsh.c:7912
+#, c-format
+msgid "Failed to destroy bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7916
+#, c-format
+msgid "Failed to undefine bridge interface %s"
+msgstr ""
+
+#: tools/virsh.c:7923
+#, c-format
+msgid "Failed to define new interface %s"
+msgstr ""
+
+#: tools/virsh.c:7927
+#, c-format
+msgid "Device %s un-attached from bridge %s\n"
+msgstr ""
+
+#: tools/virsh.c:7958
 msgid "define or update a network filter from an XML file"
 msgstr ""
 
-#: tools/virsh.c:7144
+#: tools/virsh.c:7959
 msgid "Define a new network filter or update an existing one."
 msgstr ""
 
-#: tools/virsh.c:7149
+#: tools/virsh.c:7964
 msgid "file containing an XML network filter description"
 msgstr ""
 
-#: tools/virsh.c:7174
+#: tools/virsh.c:7989
 #, c-format
 msgid "Network filter %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:7178
+#: tools/virsh.c:7993
 #, c-format
 msgid "Failed to define network filter from %s"
 msgstr ""
 
-#: tools/virsh.c:7189
+#: tools/virsh.c:8004
 msgid "undefine a network filter"
 msgstr ""
 
-#: tools/virsh.c:7190
+#: tools/virsh.c:8005
 msgid "Undefine a given network filter."
 msgstr ""
 
-#: tools/virsh.c:7195 tools/virsh.c:7234 tools/virsh.c:7340
+#: tools/virsh.c:8010 tools/virsh.c:8049 tools/virsh.c:8155
 msgid "network filter name or uuid"
 msgstr ""
 
-#: tools/virsh.c:7213
+#: tools/virsh.c:8028
 #, c-format
 msgid "Network filter %s undefined\n"
 msgstr ""
 
-#: tools/virsh.c:7215
+#: tools/virsh.c:8030
 #, c-format
 msgid "Failed to undefine network filter %s"
 msgstr ""
 
-#: tools/virsh.c:7228
+#: tools/virsh.c:8043
 msgid "network filter information in XML"
 msgstr ""
 
-#: tools/virsh.c:7229
+#: tools/virsh.c:8044
 msgid "Output the network filter information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:7267
+#: tools/virsh.c:8082
 msgid "list network filters"
 msgstr ""
 
-#: tools/virsh.c:7268
+#: tools/virsh.c:8083
 msgid "Returns list of network filters."
 msgstr ""
 
-#: tools/virsh.c:7288 tools/virsh.c:7296
+#: tools/virsh.c:8103 tools/virsh.c:8111
 msgid "Failed to list network filters"
 msgstr ""
 
-#: tools/virsh.c:7334
+#: tools/virsh.c:8149
 msgid "edit XML configuration for a network filter"
 msgstr ""
 
-#: tools/virsh.c:7335
+#: tools/virsh.c:8150
 msgid "Edit the XML configuration for a network filter."
 msgstr ""
 
-#: tools/virsh.c:7379
+#: tools/virsh.c:8194
 #, c-format
 msgid "Network filter %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:7405
+#: tools/virsh.c:8220
 #, c-format
 msgid "Network filter %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:3605
+#: tools/virsh.c:8247
 msgid "autostart a pool"
 msgstr ""
 
-#: tools/virsh.c:3607
+#: tools/virsh.c:8249
 msgid "Configure a pool to be automatically started at boot."
 msgstr ""
 
-#: tools/virsh.c:3612 tools/virsh.c:4012 tools/virsh.c:4051 tools/virsh.c:4090
-#: tools/virsh.c:4129 tools/virsh.c:4168 tools/virsh.c:4482 tools/virsh.c:4747
-#: tools/virsh.c:4980 tools/virsh.c:5057 tools/virsh.c:5098 tools/virsh.c:5149
-#: tools/virsh.c:5190 tools/virsh.c:5334 tools/virsh.c:7288
+#: tools/virsh.c:8254 tools/virsh.c:8650 tools/virsh.c:8701 tools/virsh.c:8740
+#: tools/virsh.c:8779 tools/virsh.c:8818 tools/virsh.c:9394 tools/virsh.c:9751
+#: tools/virsh.c:9981 tools/virsh.c:10058 tools/virsh.c:10158
+#: tools/virsh.c:10254 tools/virsh.c:10295 tools/virsh.c:10336
+#: tools/virsh.c:10400 tools/virsh.c:10440 tools/virsh.c:10828
+#: tools/virsh.c:10861 tools/virsh.c:13684
 msgid "pool name or uuid"
 msgstr ""
 
-#: tools/virsh.c:3634
+#: tools/virsh.c:8276
 #, c-format
 msgid "failed to mark pool %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:3636
+#: tools/virsh.c:8278
 #, c-format
 msgid "failed to unmark pool %s as autostarted"
 msgstr ""
 
-#: tools/virsh.c:3642
+#: tools/virsh.c:8284
 #, c-format
 msgid "Pool %s marked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:3644
+#: tools/virsh.c:8286
 #, c-format
 msgid "Pool %s unmarked as autostarted\n"
 msgstr ""
 
-#: tools/virsh.c:3654
+#: tools/virsh.c:8296
 msgid "create a pool from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3655 tools/virsh.c:3877
+#: tools/virsh.c:8297 tools/virsh.c:8515
 msgid "Create a pool."
 msgstr ""
 
-#: tools/virsh.c:3661 tools/virsh.c:3923
+#: tools/virsh.c:8303 tools/virsh.c:8562
 msgid "file containing an XML pool description"
 msgstr ""
 
-#: tools/virsh.c:3688
+#: tools/virsh.c:8328
 #, c-format
 msgid "Pool %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3692
+#: tools/virsh.c:8332
 #, c-format
 msgid "Failed to create pool from %s"
 msgstr ""
 
-#: tools/virsh.c:3703
+#: tools/virsh.c:8343
 msgid "create a device defined by an XML file on the node"
 msgstr ""
 
-#: tools/virsh.c:3705
+#: tools/virsh.c:8345
 msgid ""
 "Create a device on the node.  Note that this command creates devices on the "
 "physical host that can then be assigned to a virtual machine."
 msgstr ""
 
-#: tools/virsh.c:3713
+#: tools/virsh.c:8353
 msgid "file containing an XML description of the device"
 msgstr ""
 
-#: tools/virsh.c:3742
+#: tools/virsh.c:8378
 #, c-format
 msgid "Node device %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3746
+#: tools/virsh.c:8382
 #, c-format
 msgid "Failed to create node device from %s"
 msgstr ""
 
-#: tools/virsh.c:7579
+#: tools/virsh.c:8394
 msgid "destroy (stop) a device on the node"
 msgstr ""
 
-#: tools/virsh.c:7580
+#: tools/virsh.c:8395
 msgid ""
 "Destroy a device on the node.  Note that this command destroys devices on "
 "the physical host"
 msgstr ""
 
-#: tools/virsh.c:3766
+#: tools/virsh.c:8402
 msgid "name of the device to be destroyed"
 msgstr ""
 
-#: tools/virsh.c:3790
+#: tools/virsh.c:8423
 #, c-format
 msgid "Destroyed node device '%s'\n"
 msgstr ""
 
-#: tools/virsh.c:3792
+#: tools/virsh.c:8425
 #, c-format
 msgid "Failed to destroy node device '%s'"
 msgstr ""
 
-#: tools/virsh.c:3805
+#: tools/virsh.c:8438
 msgid "name of the pool"
 msgstr ""
 
-#: tools/virsh.c:3806
+#: tools/virsh.c:8439
 msgid "print XML document, but don't define/create"
 msgstr ""
 
-#: tools/virsh.c:3807
+#: tools/virsh.c:8440
 msgid "type of the pool"
 msgstr ""
 
-#: tools/virsh.c:3808
+#: tools/virsh.c:8441
 msgid "source-host for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3809
+#: tools/virsh.c:8442
 msgid "source path for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3810
+#: tools/virsh.c:8443
 msgid "source device for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3811
+#: tools/virsh.c:8444
 msgid "source name for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3812
+#: tools/virsh.c:8445
 msgid "target for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:7631
+#: tools/virsh.c:8446
 msgid "format for underlying storage"
 msgstr ""
 
-#: tools/virsh.c:3859 tools/virsh.c:4713 tools/virsh.c:5018
+#: tools/virsh.c:8497 tools/virsh.c:9717 tools/virsh.c:10016
+#: tools/virsh.c:12468 tools/virsh.c:12948 tools/virsh.c:13529
+#: tools/virsh.c:13546
 msgid "Failed to allocate XML buffer"
 msgstr ""
 
-#: tools/virsh.c:3876
+#: tools/virsh.c:8514
 msgid "create a pool from a set of args"
 msgstr ""
 
-#: tools/virsh.c:3902
+#: tools/virsh.c:8541
 #, c-format
 msgid "Pool %s created\n"
 msgstr ""
 
-#: tools/virsh.c:3905
+#: tools/virsh.c:8544
 #, c-format
 msgid "Failed to create pool %s"
 msgstr ""
 
-#: tools/virsh.c:3917
+#: tools/virsh.c:8556
 msgid "define (but don't start) a pool from an XML file"
 msgstr ""
 
-#: tools/virsh.c:3918 tools/virsh.c:3966
+#: tools/virsh.c:8557 tools/virsh.c:8603
 msgid "Define a pool."
 msgstr ""
 
-#: tools/virsh.c:3950
+#: tools/virsh.c:8587
 #, c-format
 msgid "Pool %s defined from %s\n"
 msgstr ""
 
-#: tools/virsh.c:3954
+#: tools/virsh.c:8591
 #, c-format
 msgid "Failed to define pool from %s"
 msgstr ""
 
-#: tools/virsh.c:3965
+#: tools/virsh.c:8602
 msgid "define a pool from a set of args"
 msgstr ""
 
-#: tools/virsh.c:3991
+#: tools/virsh.c:8629
 #, c-format
 msgid "Pool %s defined\n"
 msgstr ""
 
-#: tools/virsh.c:3994
+#: tools/virsh.c:8632
 #, c-format
 msgid "Failed to define pool %s"
 msgstr ""
 
-#: tools/virsh.c:4006
+#: tools/virsh.c:8644
 msgid "build a pool"
 msgstr ""
 
-#: tools/virsh.c:4007
+#: tools/virsh.c:8645
 msgid "Build a given pool."
 msgstr ""
 
-#: tools/virsh.c:7836
+#: tools/virsh.c:8651
 msgid "do not overwrite an existing pool of this type"
 msgstr ""
 
-#: tools/virsh.c:7837
+#: tools/virsh.c:8652
 msgid "overwrite any existing data"
 msgstr ""
 
-#: tools/virsh.c:4030
+#: tools/virsh.c:8679
 #, c-format
 msgid "Pool %s built\n"
 msgstr ""
 
-#: tools/virsh.c:4032
+#: tools/virsh.c:8681
 #, c-format
 msgid "Failed to build pool %s"
 msgstr ""
 
-#: tools/virsh.c:7879
+#: tools/virsh.c:8694
 msgid "destroy (stop) a pool"
 msgstr ""
 
-#: tools/virsh.c:7881
+#: tools/virsh.c:8696
 msgid "Forcefully stop a given pool. Raw data in the pool is untouched"
 msgstr ""
 
-#: tools/virsh.c:4069
+#: tools/virsh.c:8719
 #, c-format
 msgid "Pool %s destroyed\n"
 msgstr ""
 
-#: tools/virsh.c:4071
+#: tools/virsh.c:8721
 #, c-format
 msgid "Failed to destroy pool %s"
 msgstr ""
 
-#: tools/virsh.c:4084
+#: tools/virsh.c:8734
 msgid "delete a pool"
 msgstr ""
 
-#: tools/virsh.c:4085
+#: tools/virsh.c:8735
 msgid "Delete a given pool."
 msgstr ""
 
-#: tools/virsh.c:4108
+#: tools/virsh.c:8758
 #, c-format
 msgid "Pool %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:4110
+#: tools/virsh.c:8760
 #, c-format
 msgid "Failed to delete pool %s"
 msgstr ""
 
-#: tools/virsh.c:4123
+#: tools/virsh.c:8773
 msgid "refresh a pool"
 msgstr ""
 
-#: tools/virsh.c:4124
+#: tools/virsh.c:8774
 msgid "Refresh a given pool."
 msgstr ""
 
-#: tools/virsh.c:4147
+#: tools/virsh.c:8797
 #, c-format
 msgid "Pool %s refreshed\n"
 msgstr ""
 
-#: tools/virsh.c:4149
+#: tools/virsh.c:8799
 #, c-format
 msgid "Failed to refresh pool %s"
 msgstr ""
 
-#: tools/virsh.c:4162
+#: tools/virsh.c:8812
 msgid "pool information in XML"
 msgstr ""
 
-#: tools/virsh.c:4163
+#: tools/virsh.c:8813
 msgid "Output the pool information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:4202
+#: tools/virsh.c:8852
 msgid "list pools"
 msgstr ""
 
-#: tools/virsh.c:4203
+#: tools/virsh.c:8853
 msgid "Returns list of pools."
 msgstr ""
 
-#: tools/virsh.c:4208
+#: tools/virsh.c:8858
 msgid "list inactive pools"
 msgstr ""
 
-#: tools/virsh.c:4209
+#: tools/virsh.c:8859
 msgid "list inactive & active pools"
 msgstr ""
 
-#: tools/virsh.c:8045
+#: tools/virsh.c:8860
 msgid "display extended details for pools"
 msgstr ""
 
-#: tools/virsh.c:4229 tools/virsh.c:4237
+#: tools/virsh.c:8901 tools/virsh.c:8927
 msgid "Failed to list active pools"
 msgstr ""
 
-#: tools/virsh.c:4248 tools/virsh.c:4256
+#: tools/virsh.c:8910 tools/virsh.c:8939
 msgid "Failed to list inactive pools"
 msgstr ""
 
-#: tools/virsh.c:8173
+#: tools/virsh.c:8988
 msgid "Could not retrieve pool information"
 msgstr ""
 
-#: tools/virsh.c:4515
+#: tools/virsh.c:9005 tools/virsh.c:9429
 msgid "building"
 msgstr ""
 
-#: tools/virsh.c:4519 tools/virsh.c:8271 tools/virsh.c:8297
+#: tools/virsh.c:9008 tools/virsh.c:9433 tools/virsh.c:16734
+#: tools/virsh.c:16947
 msgid "running"
 msgstr "running"
 
-#: tools/virsh.c:4523
+#: tools/virsh.c:9011 tools/virsh.c:9437
 msgid "degraded"
 msgstr ""
 
-#: tools/virsh.c:8199 tools/virsh.c:8626
+#: tools/virsh.c:9014 tools/virsh.c:9441
 msgid "inaccessible"
 msgstr ""
 
-#: tools/virsh.c:8237 tools/virsh.c:8238 tools/virsh.c:8239
+#: tools/virsh.c:9052 tools/virsh.c:9053 tools/virsh.c:9054
 msgid "-"
 msgstr ""
 
-#: tools/virsh.c:8328 tools/virsh.c:8383
+#: tools/virsh.c:9143 tools/virsh.c:9198
 msgid "Persistent"
 msgstr ""
 
-#: tools/virsh.c:8333 tools/virsh.c:8383 tools/virsh.c:9819
+#: tools/virsh.c:9148 tools/virsh.c:9198 tools/virsh.c:10634
 msgid "Capacity"
 msgstr ""
 
-#: tools/virsh.c:8338 tools/virsh.c:8383 tools/virsh.c:9824 tools/virsh.c:9855
+#: tools/virsh.c:9153 tools/virsh.c:9198 tools/virsh.c:10639
+#: tools/virsh.c:10670
 msgid "Allocation"
 msgstr ""
 
-#: tools/virsh.c:8343 tools/virsh.c:8383
+#: tools/virsh.c:9158 tools/virsh.c:9198
 msgid "Available"
 msgstr ""
 
-#: tools/virsh.c:4381
+#: tools/virsh.c:9232 tools/virsh.c:10701
 #, c-format
 msgid "virAsprintf failed (errno %d)"
 msgstr ""
 
-#: tools/virsh.c:4324
+#: tools/virsh.c:9262
 msgid "find potential storage pool sources"
 msgstr ""
 
-#: tools/virsh.c:4325 tools/virsh.c:4405
+#: tools/virsh.c:9263 tools/virsh.c:9339
 msgid "Returns XML <sources> document."
 msgstr ""
 
-#: tools/virsh.c:4331
+#: tools/virsh.c:9269
 msgid "type of storage pool sources to find"
 msgstr ""
 
-#: tools/virsh.c:4332
+#: tools/virsh.c:9270
 msgid "optional host to query"
 msgstr ""
 
-#: tools/virsh.c:4333
+#: tools/virsh.c:9271
 msgid "optional port to query"
 msgstr ""
 
-#: tools/virsh.c:8457
+#: tools/virsh.c:9272
 msgid "optional initiator IQN to use for query"
 msgstr ""
 
-#: tools/virsh.c:4390 tools/virsh.c:4441
+#: tools/virsh.c:9324 tools/virsh.c:9374
 #, c-format
 msgid "Failed to find any %s pool sources"
 msgstr ""
 
-#: tools/virsh.c:4404
+#: tools/virsh.c:9338
 msgid "discover potential storage pool sources"
 msgstr ""
 
-#: tools/virsh.c:4411
+#: tools/virsh.c:9345
 msgid "type of storage pool sources to discover"
 msgstr ""
 
-#: tools/virsh.c:4413
+#: tools/virsh.c:9347
 msgid "optional file of source xml to query for pools"
 msgstr ""
 
-#: tools/virsh.c:8546 tools/virsh.c:11470 tools/virsh.c:11769
-#: tools/virsh.c:15183
+#: tools/virsh.c:9361 tools/virsh.c:12543 tools/virsh.c:12847
+#: tools/virsh.c:16272
 msgid "missing option"
 msgstr ""
 
-#: tools/virsh.c:4476
+#: tools/virsh.c:9388
 msgid "storage pool information"
 msgstr ""
 
-#: tools/virsh.c:4477
+#: tools/virsh.c:9389
 msgid "Returns basic information about the storage pool."
 msgstr ""
 
-#: tools/virsh.c:4536
+#: tools/virsh.c:9472
 msgid "Available:"
 msgstr ""
 
-#: tools/virsh.c:4551
+#: tools/virsh.c:9487
 msgid "convert a pool UUID to pool name"
 msgstr ""
 
-#: tools/virsh.c:4557
+#: tools/virsh.c:9493
 msgid "pool uuid"
 msgstr ""
 
-#: tools/virsh.c:4582
+#: tools/virsh.c:9518
 msgid "start a (previously defined) inactive pool"
 msgstr ""
 
-#: tools/virsh.c:4583
+#: tools/virsh.c:9519
 msgid "Start a pool."
 msgstr ""
 
-#: tools/virsh.c:4588
+#: tools/virsh.c:9524
 msgid "name of the inactive pool"
 msgstr ""
 
-#: tools/virsh.c:4605
+#: tools/virsh.c:9541
 #, c-format
 msgid "Pool %s started\n"
 msgstr ""
 
-#: tools/virsh.c:4608
+#: tools/virsh.c:9544
 #, c-format
 msgid "Failed to start pool %s"
 msgstr ""
 
-#: tools/virsh.c:4621
+#: tools/virsh.c:9557
 msgid "create a volume from a set of args"
 msgstr ""
 
-#: tools/virsh.c:4622 tools/virsh.c:4818
+#: tools/virsh.c:9558 tools/virsh.c:9822
 msgid "Create a vol."
 msgstr ""
 
-#: tools/virsh.c:4627 tools/virsh.c:4786 tools/virsh.c:4823 tools/virsh.c:4881
+#: tools/virsh.c:9563 tools/virsh.c:9790 tools/virsh.c:9827 tools/virsh.c:9884
 msgid "pool name"
 msgstr ""
 
-#: tools/virsh.c:4628
+#: tools/virsh.c:9564
 msgid "name of the volume"
 msgstr ""
 
-#: tools/virsh.c:4629
+#: tools/virsh.c:9565
 msgid "size of the vol with optional k,M,G,T suffix"
 msgstr ""
 
-#: tools/virsh.c:4630
+#: tools/virsh.c:9566
 msgid "initial allocation size with optional k,M,G,T suffix"
 msgstr ""
 
-#: tools/virsh.c:4631
+#: tools/virsh.c:9567
 msgid "file format type raw,bochs,qcow,qcow2,vmdk"
 msgstr ""
 
-#: tools/virsh.c:8753
+#: tools/virsh.c:9568
 msgid "the backing volume if taking a snapshot"
 msgstr ""
 
-#: tools/virsh.c:8754
+#: tools/virsh.c:9569
 msgid "format of backing volume if taking a snapshot"
 msgstr ""
 
-#: tools/virsh.c:4689 tools/virsh.c:4694
+#: tools/virsh.c:9628 tools/virsh.c:9632
 #, c-format
 msgid "Malformed size %s"
 msgstr ""
 
-#: tools/virsh.c:7965
+#: tools/virsh.c:9692 tools/virsh.c:16306
 #, c-format
 msgid "failed to get vol '%s'"
 msgstr ""
 
-#: tools/virsh.c:4722
+#: tools/virsh.c:9726
 #, c-format
 msgid "Vol %s created\n"
 msgstr ""
 
-#: tools/virsh.c:4726
+#: tools/virsh.c:9730
 #, c-format
 msgid "Failed to create vol %s"
 msgstr ""
 
-#: tools/virsh.c:4741
+#: tools/virsh.c:9745
 msgid "undefine an inactive pool"
 msgstr ""
 
-#: tools/virsh.c:4742
+#: tools/virsh.c:9746
 msgid "Undefine the configuration for an inactive pool."
 msgstr ""
 
-#: tools/virsh.c:4765
+#: tools/virsh.c:9769
 #, c-format
 msgid "Pool %s has been undefined\n"
 msgstr ""
 
-#: tools/virsh.c:4767
+#: tools/virsh.c:9771
 #, c-format
 msgid "Failed to undefine pool %s"
 msgstr ""
 
-#: tools/virsh.c:4780
+#: tools/virsh.c:9784
 msgid "convert a pool name to pool UUID"
 msgstr ""
 
-#: tools/virsh.c:4806
+#: tools/virsh.c:9810
 msgid "failed to get pool UUID"
 msgstr ""
 
-#: tools/virsh.c:4817
+#: tools/virsh.c:9821
 msgid "create a vol from an XML file"
 msgstr ""
 
-#: tools/virsh.c:4824 tools/virsh.c:4882
+#: tools/virsh.c:9828 tools/virsh.c:9885
 msgid "file containing an XML vol description"
 msgstr ""
 
-#: tools/virsh.c:4861
+#: tools/virsh.c:9864
 #, c-format
 msgid "Vol %s created from %s\n"
 msgstr ""
 
-#: tools/virsh.c:4865 tools/virsh.c:4922
+#: tools/virsh.c:9868 tools/virsh.c:9924
 #, c-format
 msgid "Failed to create vol from %s"
 msgstr ""
 
-#: tools/virsh.c:4875
+#: tools/virsh.c:9878
 msgid "create a vol, using another volume as input"
 msgstr ""
 
-#: tools/virsh.c:4876
+#: tools/virsh.c:9879
 msgid "Create a vol from an existing volume."
 msgstr ""
 
-#: tools/virsh.c:4884
+#: tools/virsh.c:9886
 msgid "input vol name or key"
 msgstr ""
 
-#: tools/virsh.c:4883
+#: tools/virsh.c:9887
 msgid "pool name or uuid of the input volume's pool"
 msgstr ""
 
-#: tools/virsh.c:4919
+#: tools/virsh.c:9921
 #, c-format
 msgid "Vol %s created from input vol %s\n"
 msgstr ""
 
-#: tools/virsh.c:9135
+#: tools/virsh.c:9950
 msgid "(volume_definition)"
 msgstr ""
 
-#: tools/virsh.c:4974
+#: tools/virsh.c:9973
 msgid "clone a volume."
 msgstr ""
 
-#: tools/virsh.c:4975
+#: tools/virsh.c:9974
 msgid "Clone an existing volume."
 msgstr ""
 
-#: tools/virsh.c:4981
+#: tools/virsh.c:9979
 msgid "orig vol name or key"
 msgstr ""
 
-#: tools/virsh.c:4982
+#: tools/virsh.c:9980
 msgid "clone name"
 msgstr ""
 
-#: tools/virsh.c:5004
+#: tools/virsh.c:10003 tools/virsh.c:10795
 msgid "failed to get parent pool"
 msgstr ""
 
-#: tools/virsh.c:5025
+#: tools/virsh.c:10023
 #, c-format
 msgid "Vol %s cloned from %s\n"
 msgstr ""
 
-#: tools/virsh.c:5028
+#: tools/virsh.c:10026
 #, c-format
 msgid "Failed to clone vol from %s"
 msgstr ""
 
-#: tools/virsh.c:9235
+#: tools/virsh.c:10050
 msgid "upload a file into a volume"
 msgstr ""
 
-#: tools/virsh.c:9236
+#: tools/virsh.c:10051
 msgid "Upload a file into a volume"
 msgstr ""
 
-#: tools/virsh.c:5058 tools/virsh.c:5099 tools/virsh.c:5150
+#: tools/virsh.c:10056 tools/virsh.c:10156 tools/virsh.c:10253
+#: tools/virsh.c:10294 tools/virsh.c:10335 tools/virsh.c:10399
 msgid "vol name, key or path"
 msgstr ""
 
-#: tools/virsh.c:5123
+#: tools/virsh.c:10057 tools/virsh.c:10157 tools/virsh.c:10360
+#: tools/virsh.c:10530
 msgid "file"
 msgstr ""
 
-#: tools/virsh.c:9244
+#: tools/virsh.c:10059
 msgid "volume offset to upload to"
 msgstr ""
 
-#: tools/virsh.c:9245
+#: tools/virsh.c:10060
 msgid "amount of data to upload"
 msgstr ""
 
-#: tools/virsh.c:9273 tools/virsh.c:9278 tools/virsh.c:9365 tools/virsh.c:9370
-msgid "Unable to parse integer"
-msgstr ""
-
-#: tools/virsh.c:9298
+#: tools/virsh.c:10113
 #, c-format
 msgid "cannot upload to volume %s"
 msgstr ""
 
-#: tools/virsh.c:9303
+#: tools/virsh.c:10118
 #, c-format
 msgid "cannot send data to volume %s"
 msgstr ""
 
-#: tools/virsh.c:9314 tools/virsh.c:9410
+#: tools/virsh.c:10129 tools/virsh.c:10225
 #, c-format
 msgid "cannot close volume %s"
 msgstr ""
 
-#: tools/virsh.c:9335 tools/virsh.c:9336
+#: tools/virsh.c:10150 tools/virsh.c:10151
 msgid "Download a volume to a file"
 msgstr ""
 
-#: tools/virsh.c:9344
+#: tools/virsh.c:10159
 msgid "volume offset to download from"
 msgstr ""
 
-#: tools/virsh.c:9345
+#: tools/virsh.c:10160
 msgid "amount of data to download"
 msgstr ""
 
-#: tools/virsh.c:9385
+#: tools/virsh.c:10200
 #, c-format
 msgid "cannot create %s"
 msgstr ""
 
-#: tools/virsh.c:9394
+#: tools/virsh.c:10209
 #, c-format
 msgid "cannot download from volume %s"
 msgstr ""
 
-#: tools/virsh.c:9399
+#: tools/virsh.c:10214
 #, c-format
 msgid "cannot receive data from volume %s"
 msgstr ""
 
-#: tools/virsh.c:5051
+#: tools/virsh.c:10247
 msgid "delete a vol"
 msgstr ""
 
-#: tools/virsh.c:5052
+#: tools/virsh.c:10248
 msgid "Delete a given vol."
 msgstr ""
 
-#: tools/virsh.c:5077
+#: tools/virsh.c:10273
 #, c-format
 msgid "Vol %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:5079
+#: tools/virsh.c:10275
 #, c-format
 msgid "Failed to delete vol %s"
 msgstr ""
 
-#: tools/virsh.c:9473
+#: tools/virsh.c:10288
 msgid "wipe a vol"
 msgstr ""
 
-#: tools/virsh.c:9474
+#: tools/virsh.c:10289
 msgid "Ensure data previously on a volume is not accessible to future reads"
 msgstr ""
 
-#: tools/virsh.c:9499
+#: tools/virsh.c:10314
 #, c-format
 msgid "Vol %s wiped\n"
 msgstr ""
 
-#: tools/virsh.c:9501
+#: tools/virsh.c:10316
 #, c-format
 msgid "Failed to wipe vol %s"
 msgstr ""
 
-#: tools/virsh.c:5092
+#: tools/virsh.c:10329
 msgid "storage vol information"
 msgstr ""
 
-#: tools/virsh.c:5093
+#: tools/virsh.c:10330
 msgid "Returns basic information about the storage vol."
 msgstr ""
 
-#: tools/virsh.c:5121
+#: tools/virsh.c:10360 tools/virsh.c:10364 tools/virsh.c:10368
+#: tools/virsh.c:10372
 msgid "Type:"
 msgstr ""
 
-#: tools/virsh.c:5123
+#: tools/virsh.c:10364 tools/virsh.c:10533
 msgid "block"
 msgstr ""
 
-#: tools/virsh.c:9553 tools/virsh.c:9721
+#: tools/virsh.c:10368 tools/virsh.c:10536
 msgid "dir"
 msgstr ""
 
-#: tools/virsh.c:5143
+#: tools/virsh.c:10393
 msgid "vol information in XML"
 msgstr ""
 
-#: tools/virsh.c:5144
+#: tools/virsh.c:10394
 msgid "Output the vol information as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5184
+#: tools/virsh.c:10434
 msgid "list vols"
 msgstr ""
 
-#: tools/virsh.c:5185
+#: tools/virsh.c:10435
 msgid "Returns list of vols by pool."
 msgstr ""
 
-#: tools/virsh.c:9626
+#: tools/virsh.c:10441
 msgid "display extended details for volumes"
 msgstr ""
 
-#: tools/virsh.c:9667
+#: tools/virsh.c:10482
 msgid "Failed to list storage volumes"
 msgstr ""
 
-#: tools/virsh.c:5210 tools/virsh.c:5218
+#: tools/virsh.c:10492
 msgid "Failed to list active vols"
 msgstr ""
 
-#: tools/virsh.c:5226
+#: tools/virsh.c:10604 tools/virsh.c:10624 tools/virsh.c:10669
 msgid "Path"
 msgstr ""
 
-#: tools/virsh.c:9814 tools/virsh.c:9854
+#: tools/virsh.c:10629 tools/virsh.c:10669
 msgid "Type"
 msgstr ""
 
-#: tools/virsh.c:9917
+#: tools/virsh.c:10732
 msgid "returns the volume name for a given volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9923 tools/virsh.c:9956
+#: tools/virsh.c:10738 tools/virsh.c:10771
 msgid "volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9949
+#: tools/virsh.c:10764
 msgid "returns the storage pool for a given volume key or path"
 msgstr ""
 
-#: tools/virsh.c:9955
+#: tools/virsh.c:10770
 msgid "return the pool uuid rather than pool name"
 msgstr ""
 
-#: tools/virsh.c:10006
+#: tools/virsh.c:10821
 msgid "returns the volume key for a given volume name or path"
 msgstr ""
 
-#: tools/virsh.c:10012
+#: tools/virsh.c:10827
 msgid "volume name or path"
 msgstr ""
 
-#: tools/virsh.c:10039
+#: tools/virsh.c:10854
 msgid "returns the volume path for a given volume name or key"
 msgstr ""
 
-#: tools/virsh.c:10045
+#: tools/virsh.c:10860
 msgid "volume name or key"
 msgstr ""
 
-#: tools/virsh.c:5362
+#: tools/virsh.c:10894
 msgid "define or modify a secret from an XML file"
 msgstr ""
 
-#: tools/virsh.c:5363
+#: tools/virsh.c:10895
 msgid "Define or modify a secret."
 msgstr ""
 
-#: tools/virsh.c:5368
+#: tools/virsh.c:10900
 msgid "file containing secret attributes in XML"
 msgstr ""
 
-#: tools/virsh.c:5393
+#: tools/virsh.c:10925
 #, c-format
 msgid "Failed to set attributes from %s"
 msgstr ""
 
-#: tools/virsh.c:5397
+#: tools/virsh.c:10929
 msgid "Failed to get UUID of created secret"
 msgstr ""
 
-#: tools/virsh.c:5401
+#: tools/virsh.c:10933
 #, c-format
 msgid "Secret %s created\n"
 msgstr ""
 
-#: tools/virsh.c:5410
+#: tools/virsh.c:10942
 msgid "secret attributes in XML"
 msgstr ""
 
-#: tools/virsh.c:5411
+#: tools/virsh.c:10943
 msgid "Output attributes of a secret as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5416 tools/virsh.c:5456 tools/virsh.c:5515 tools/virsh.c:5567
+#: tools/virsh.c:10948 tools/virsh.c:10988 tools/virsh.c:11048
+#: tools/virsh.c:11100
 msgid "secret UUID"
 msgstr ""
 
-#: tools/virsh.c:5450
+#: tools/virsh.c:10982
 msgid "set a secret value"
 msgstr ""
 
-#: tools/virsh.c:5451
+#: tools/virsh.c:10983
 msgid "Set a secret value."
 msgstr ""
 
-#: tools/virsh.c:5457
+#: tools/virsh.c:10989
 msgid "base64-encoded secret value"
 msgstr ""
 
-#: tools/virsh.c:5481
+#: tools/virsh.c:11014
 msgid "Invalid base64 data"
 msgstr ""
 
-#: tools/virsh.c:5494
+#: tools/virsh.c:11027
 msgid "Failed to set secret value"
 msgstr ""
 
-#: tools/virsh.c:5497
+#: tools/virsh.c:11030
 msgid "Secret value set\n"
 msgstr ""
 
-#: tools/virsh.c:5509
+#: tools/virsh.c:11042
 msgid "Output a secret value"
 msgstr ""
 
-#: tools/virsh.c:5510
+#: tools/virsh.c:11043
 msgid "Output a secret value to stdout."
 msgstr ""
 
-#: tools/virsh.c:5561
+#: tools/virsh.c:11094
 msgid "undefine a secret"
 msgstr ""
 
-#: tools/virsh.c:5562
+#: tools/virsh.c:11095
 msgid "Undefine a secret."
 msgstr ""
 
-#: tools/virsh.c:5586
+#: tools/virsh.c:11119
 #, c-format
 msgid "Failed to delete secret %s"
 msgstr ""
 
-#: tools/virsh.c:5589
+#: tools/virsh.c:11122
 #, c-format
 msgid "Secret %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:5601
+#: tools/virsh.c:11134
 msgid "list secrets"
 msgstr ""
 
-#: tools/virsh.c:5602
+#: tools/virsh.c:11135
 msgid "Returns a list of secrets"
 msgstr ""
 
-#: tools/virsh.c:5617 tools/virsh.c:5624
+#: tools/virsh.c:11150 tools/virsh.c:11157
 msgid "Failed to list secrets"
 msgstr ""
 
-#: tools/virsh.c:5631
+#: tools/virsh.c:11164
 msgid "Usage"
 msgstr ""
 
-#: tools/virsh.c:5645
+#: tools/virsh.c:11178
 msgid "Volume"
 msgstr ""
 
-#: tools/virsh.c:5655
+#: tools/virsh.c:11188
 msgid "Unused"
 msgstr ""
 
-#: tools/virsh.c:5669
+#: tools/virsh.c:11202
 msgid "show version"
 msgstr "show version"
 
-#: tools/virsh.c:5670
+#: tools/virsh.c:11203
 msgid "Display the system version information."
 msgstr "Display the system version information."
 
-#: tools/virsh.c:10393
+#: tools/virsh.c:11208
 msgid "report daemon version too"
 msgstr ""
 
-#: tools/virsh.c:5693
+#: tools/virsh.c:11231
 msgid "failed to get hypervisor type"
 msgstr "failed to get hypervisor type"
 
-#: tools/virsh.c:5702
+#: tools/virsh.c:11240
 #, c-format
 msgid "Compiled against library: libvir %d.%d.%d\n"
 msgstr "Compiled against library: libvir %d.%d.%d\n"
 
-#: tools/virsh.c:5707
+#: tools/virsh.c:11245
 msgid "failed to get the library version"
 msgstr "failed to get the library version"
 
-#: tools/virsh.c:5714
+#: tools/virsh.c:11252
 #, c-format
 msgid "Using library: libvir %d.%d.%d\n"
 msgstr "Using library: libvir %d.%d.%d\n"
 
-#: tools/virsh.c:5721
+#: tools/virsh.c:11259
 #, c-format
 msgid "Using API: %s %d.%d.%d\n"
 msgstr "Using API: %s %d.%d.%d\n"
 
-#: tools/virsh.c:5726
+#: tools/virsh.c:11264
 msgid "failed to get the hypervisor version"
 msgstr "failed to get the hypervisor version"
 
-#: tools/virsh.c:5731
+#: tools/virsh.c:11269
 #, c-format
 msgid "Cannot extract running %s hypervisor version\n"
 msgstr "Cannot extract running %s hypervisor version\n"
 
-#: tools/virsh.c:5738
+#: tools/virsh.c:11276
 #, c-format
 msgid "Running hypervisor: %s %d.%d.%d\n"
 msgstr "Running hypervisor: %s %d.%d.%d\n"
 
-#: tools/virsh.c:10468
+#: tools/virsh.c:11283
 msgid "failed to get the daemon version"
 msgstr ""
 
-#: tools/virsh.c:10474
+#: tools/virsh.c:11289
 #, c-format
 msgid "Running against daemon: %d.%d.%d\n"
 msgstr ""
 
-#: tools/virsh.c:5748
+#: tools/virsh.c:11301
 msgid "enumerate devices on this host"
 msgstr ""
 
-#: tools/virsh.c:5754
+#: tools/virsh.c:11307
 msgid "list devices in a tree"
 msgstr ""
 
-#: tools/virsh.c:5755
+#: tools/virsh.c:11308
 msgid "capability name"
 msgstr ""
 
-#: tools/virsh.c:5856
+#: tools/virsh.c:11408
 msgid "Failed to count node devices"
 msgstr ""
 
-#: tools/virsh.c:5866
+#: tools/virsh.c:11418
 msgid "Failed to list node devices"
 msgstr ""
 
-#: tools/virsh.c:5916
+#: tools/virsh.c:11468
 msgid "node device details in XML"
 msgstr ""
 
-#: tools/virsh.c:5917
+#: tools/virsh.c:11469
 msgid "Output the node device details as an XML dump to stdout."
 msgstr ""
 
-#: tools/virsh.c:5923 tools/virsh.c:5966 tools/virsh.c:6007 tools/virsh.c:6048
+#: tools/virsh.c:11475 tools/virsh.c:11518 tools/virsh.c:11559
+#: tools/virsh.c:11600
 msgid "device key"
 msgstr ""
 
-#: tools/virsh.c:5939 tools/virsh.c:5982 tools/virsh.c:6023 tools/virsh.c:6064
+#: tools/virsh.c:11491 tools/virsh.c:11534 tools/virsh.c:11575
+#: tools/virsh.c:11616
 msgid "Could not find matching device"
 msgstr ""
 
-#: tools/virsh.c:5959
+#: tools/virsh.c:11511
 msgid "dettach node device from its device driver"
 msgstr ""
 
-#: tools/virsh.c:5960
+#: tools/virsh.c:11512
 msgid ""
 "Dettach node device from its device driver before assigning to a domain."
 msgstr ""
 
-#: tools/virsh.c:5987
+#: tools/virsh.c:11539
 #, c-format
 msgid "Device %s dettached\n"
 msgstr ""
 
-#: tools/virsh.c:5989
+#: tools/virsh.c:11541
 #, c-format
 msgid "Failed to dettach device %s"
 msgstr ""
 
-#: tools/virsh.c:6000
+#: tools/virsh.c:11552
 msgid "reattach node device to its device driver"
 msgstr ""
 
-#: tools/virsh.c:6001
+#: tools/virsh.c:11553
 msgid ""
 "Reattach node device to its device driver once released by the domain."
 msgstr ""
 
-#: tools/virsh.c:6028
+#: tools/virsh.c:11580
 #, c-format
 msgid "Device %s re-attached\n"
 msgstr ""
 
-#: tools/virsh.c:6030
+#: tools/virsh.c:11582
 #, c-format
 msgid "Failed to re-attach device %s"
 msgstr ""
 
-#: tools/virsh.c:6041
+#: tools/virsh.c:11593
 msgid "reset node device"
 msgstr ""
 
-#: tools/virsh.c:6042
+#: tools/virsh.c:11594
 msgid "Reset node device before or after assigning to a domain."
 msgstr ""
 
-#: tools/virsh.c:6069
+#: tools/virsh.c:11621
 #, c-format
 msgid "Device %s reset\n"
 msgstr ""
 
-#: tools/virsh.c:6071
+#: tools/virsh.c:11623
 #, c-format
 msgid "Failed to reset device %s"
 msgstr ""
 
-#: tools/virsh.c:6082
+#: tools/virsh.c:11634
 msgid "print the hypervisor hostname"
 msgstr ""
 
-#: tools/virsh.c:6097
+#: tools/virsh.c:11649
 msgid "failed to get hostname"
 msgstr ""
 
-#: tools/virsh.c:6111
+#: tools/virsh.c:11663
 msgid "print the hypervisor canonical URI"
 msgstr ""
 
-#: tools/virsh.c:6126
+#: tools/virsh.c:11678
 msgid "failed to get URI"
 msgstr ""
 
-#: tools/virsh.c:10877
+#: tools/virsh.c:11692
 msgid "print the hypervisor sysinfo"
 msgstr ""
 
-#: tools/virsh.c:10879
+#: tools/virsh.c:11694
 msgid "output an XML string for the hypervisor sysinfo, if available"
 msgstr ""
 
-#: tools/virsh.c:10893
+#: tools/virsh.c:11708
 msgid "failed to get sysinfo"
 msgstr ""
 
-#: tools/virsh.c:6140
+#: tools/virsh.c:11722
 msgid "vnc display"
 msgstr ""
 
-#: tools/virsh.c:6141
+#: tools/virsh.c:11723
 msgid "Output the IP address and port number for the VNC display."
 msgstr ""
 
-#: tools/virsh.c:6215
+#: tools/virsh.c:11791
 msgid "tty console"
 msgstr "tty konzola"
 
-#: tools/virsh.c:6216
+#: tools/virsh.c:11792
 msgid "Output the device for the TTY console."
 msgstr ""
 
-#: tools/virsh.c:6276
+#: tools/virsh.c:11846
 msgid "attach device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:6277
+#: tools/virsh.c:11847
 msgid "Attach device from an XML <file>."
 msgstr ""
 
-#: tools/virsh.c:6283 tools/virsh.c:6341
+#: tools/virsh.c:11853 tools/virsh.c:12162 tools/virsh.c:12241
 msgid "XML file"
 msgstr "Súbor XML"
 
-#: tools/virsh.c:11039
+#: tools/virsh.c:11854
 msgid "persist device attachment"
 msgstr ""
 
-#: tools/virsh.c:6318
+#: tools/virsh.c:11895
 #, c-format
 msgid "Failed to attach device from %s"
 msgstr ""
 
-#: tools/virsh.c:6322
+#: tools/virsh.c:11899
 msgid "Device attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6334
+#: tools/virsh.c:11982 tools/virsh.c:11995
+msgid "Bad child elements counting."
+msgstr ""
+
+#: tools/virsh.c:12056
+#, c-format
+msgid "couldn't get XML description of domain %s"
+msgstr ""
+
+#: tools/virsh.c:12063
+msgid "Failed to parse domain definition xml"
+msgstr ""
+
+#: tools/virsh.c:12069
+msgid "Failed to parse device definition xml"
+msgstr ""
+
+#: tools/virsh.c:12091
+msgid "error when selecting nodes"
+msgstr ""
+
+#: tools/virsh.c:12120
+msgid "failed to create document saving context"
+msgstr ""
+
+#: tools/virsh.c:12155
 msgid "detach device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:6335
+#: tools/virsh.c:12156
 msgid "Detach device from an XML <file>"
 msgstr ""
 
-#: tools/virsh.c:11104
+#: tools/virsh.c:12163
 msgid "persist device detachment"
 msgstr ""
 
-#: tools/virsh.c:6376
+#: tools/virsh.c:12194
+#, c-format
+msgid "no such device in %s"
+msgstr ""
+
+#: tools/virsh.c:12196
+msgid "given XML selects too many devices. Please, be more specific"
+msgstr ""
+
+#: tools/virsh.c:12215
 #, c-format
 msgid "Failed to detach device from %s"
 msgstr ""
 
-#: tools/virsh.c:6380
+#: tools/virsh.c:12219
 msgid "Device detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:11161
+#: tools/virsh.c:12234
 msgid "update device from an XML file"
 msgstr ""
 
-#: tools/virsh.c:11162
+#: tools/virsh.c:12235
 msgid "Update device from an XML <file>."
 msgstr ""
 
-#: tools/virsh.c:11169
+#: tools/virsh.c:12242
 msgid "persist device update"
 msgstr ""
 
-#: tools/virsh.c:11170
+#: tools/virsh.c:12243
 msgid "force device update"
 msgstr ""
 
-#: tools/virsh.c:11215
+#: tools/virsh.c:12288
 #, c-format
 msgid "Failed to update device from %s"
 msgstr ""
 
-#: tools/virsh.c:6392
+#: tools/virsh.c:12304
 msgid "attach network interface"
 msgstr ""
 
-#: tools/virsh.c:6393
+#: tools/virsh.c:12305
 msgid "Attach new network interface."
 msgstr "Získať nové sieťové rozhranie."
 
-#: tools/virsh.c:6399 tools/virsh.c:6515
+#: tools/virsh.c:12311 tools/virsh.c:12510
 msgid "network interface type"
 msgstr "typ sieťového rozhrania"
 
-#: tools/virsh.c:6400
+#: tools/virsh.c:12312
 msgid "source of network interface"
 msgstr ""
 
-#: tools/virsh.c:6401
+#: tools/virsh.c:12313
 msgid "target network name"
 msgstr ""
 
-#: tools/virsh.c:6402 tools/virsh.c:6516
+#: tools/virsh.c:12314 tools/virsh.c:12511
 msgid "MAC address"
 msgstr ""
 
-#: tools/virsh.c:6403
+#: tools/virsh.c:12315
 msgid "script used to bridge network interface"
 msgstr ""
 
-#: tools/virsh.c:11243
+#: tools/virsh.c:12316
 msgid "model type"
 msgstr ""
 
-#: tools/virsh.c:11244
+#: tools/virsh.c:12317
 msgid "persist interface attachment"
 msgstr ""
 
-#: tools/virsh.c:11245
+#: tools/virsh.c:12318
 msgid "control domain's incoming traffics"
 msgstr ""
 
-#: tools/virsh.c:11246
+#: tools/virsh.c:12319
 msgid "control domain's outgoing traffics"
 msgstr ""
 
-#: tools/virsh.c:11326
+#: tools/virsh.c:12399
 #, c-format
 msgid "No support for %s in command 'attach-interface'"
 msgstr ""
 
-#: tools/virsh.c:11334
+#: tools/virsh.c:12407
 msgid "inbound format is incorrect"
 msgstr ""
 
-#: tools/virsh.c:11338
+#: tools/virsh.c:12411
 msgid "inbound average is mandatory"
 msgstr ""
 
-#: tools/virsh.c:11345
+#: tools/virsh.c:12418
 msgid "outbound format is incorrect"
 msgstr ""
 
-#: tools/virsh.c:11349
+#: tools/virsh.c:12422
 msgid "outbound average is mandatory"
 msgstr ""
 
-#: tools/virsh.c:11413
+#: tools/virsh.c:12486
 msgid "Failed to attach interface"
 msgstr ""
 
-#: tools/virsh.c:6491
+#: tools/virsh.c:12488
 msgid "Interface attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6508
+#: tools/virsh.c:12503
 msgid "detach network interface"
 msgstr ""
 
-#: tools/virsh.c:6509
+#: tools/virsh.c:12504
 msgid "Detach network interface."
 msgstr ""
 
-#: tools/virsh.c:11439
+#: tools/virsh.c:12512
 msgid "persist interface detachment"
 msgstr ""
 
-#: tools/virsh.c:6554 tools/virsh.c:6559
+#: tools/virsh.c:12554
 msgid "Failed to get interface information"
 msgstr ""
 
-#: tools/virsh.c:6567
+#: tools/virsh.c:12562
 #, c-format
 msgid "No found interface whose type is %s"
 msgstr "Nenájdené žiadne rozhranie, ktorého typ je %s"
 
-#: tools/virsh.c:11494
+#: tools/virsh.c:12567
 #, c-format
 msgid ""
 "Domain has %d interfaces. Please specify which one to detach using --mac"
 msgstr ""
 
-#: tools/virsh.c:6589
+#: tools/virsh.c:12591
 #, c-format
 msgid "No found interface whose MAC address is %s"
 msgstr "Nenájdené žiadne rozhranie, ktorého MAC adresa je %s"
 
-#: tools/virsh.c:11545
+#: tools/virsh.c:12618
 msgid "Failed to detach interface"
 msgstr ""
 
-#: tools/virsh.c:6608
+#: tools/virsh.c:12620
 msgid "Interface detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6628
+#: tools/virsh.c:12638
 msgid "attach disk device"
 msgstr ""
 
-#: tools/virsh.c:6629
+#: tools/virsh.c:12639
 msgid "Attach new disk device."
 msgstr ""
 
-#: tools/virsh.c:6635
+#: tools/virsh.c:12646
 msgid "source of disk device"
 msgstr ""
 
-#: tools/virsh.c:6636 tools/virsh.c:6792
+#: tools/virsh.c:12647 tools/virsh.c:12990
 msgid "target of disk device"
 msgstr ""
 
-#: tools/virsh.c:6637
+#: tools/virsh.c:12648
 msgid "driver of disk device"
 msgstr ""
 
-#: tools/virsh.c:6638
+#: tools/virsh.c:12649
 msgid "subdriver of disk device"
 msgstr ""
 
-#: tools/virsh.c:11576
+#: tools/virsh.c:12650
 msgid "cache mode of disk device"
 msgstr ""
 
-#: tools/virsh.c:6639
+#: tools/virsh.c:12651
 msgid "target device type"
 msgstr ""
 
-#: tools/virsh.c:6640
+#: tools/virsh.c:12652
 msgid "mode of device reading and writing"
 msgstr ""
 
-#: tools/virsh.c:11579
+#: tools/virsh.c:12653
 msgid "persist disk attachment"
 msgstr ""
 
-#: tools/virsh.c:11580
+#: tools/virsh.c:12654
 msgid "type of source (block|file)"
 msgstr ""
 
-#: tools/virsh.c:11581
+#: tools/virsh.c:12655
 msgid "serial of disk device"
 msgstr ""
 
-#: tools/virsh.c:11582
+#: tools/virsh.c:12656
 msgid "shareable between domains"
 msgstr ""
 
-#: tools/virsh.c:11583
+#: tools/virsh.c:12657
 msgid "address of disk device"
 msgstr ""
 
-#: tools/virsh.c:11779
+#: tools/virsh.c:12857
 #, c-format
 msgid "Unknown source type: '%s'"
 msgstr ""
 
-#: tools/virsh.c:11785
+#: tools/virsh.c:12863
 #, c-format
 msgid "No support for %s in command 'attach-disk'"
 msgstr ""
 
-#: tools/virsh.c:11826
+#: tools/virsh.c:12905
 msgid "Invalid address."
 msgstr ""
 
-#: tools/virsh.c:11838
+#: tools/virsh.c:12917
 msgid "expecting a pci:0000.00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11849
+#: tools/virsh.c:12928
 msgid "expecting a scsi:00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11860
+#: tools/virsh.c:12939
 msgid "expecting an ide:00.00.00 address."
 msgstr ""
 
-#: tools/virsh.c:11887
+#: tools/virsh.c:12966
 msgid "Failed to attach disk"
 msgstr ""
 
-#: tools/virsh.c:6769
+#: tools/virsh.c:12968
 msgid "Disk attached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6785
+#: tools/virsh.c:12983
 msgid "detach disk device"
 msgstr ""
 
-#: tools/virsh.c:6786
+#: tools/virsh.c:12984
 msgid "Detach disk device."
 msgstr ""
 
-#: tools/virsh.c:11912
+#: tools/virsh.c:12991
 msgid "persist disk detachment"
 msgstr ""
 
-#: tools/virsh.c:6827 tools/virsh.c:6832 tools/virsh.c:6839
+#: tools/virsh.c:13027 tools/virsh.c:13034
 msgid "Failed to get disk information"
 msgstr ""
 
-#: tools/virsh.c:6858
+#: tools/virsh.c:13054
 #, c-format
 msgid "No found disk whose target is %s"
 msgstr "Nenájdený žiadny disk, ktorého cieľ je %s"
 
-#: tools/virsh.c:12002
+#: tools/virsh.c:13081
 msgid "Failed to detach disk"
 msgstr ""
 
-#: tools/virsh.c:6877
+#: tools/virsh.c:13083
 msgid "Disk detached successfully\n"
 msgstr ""
 
-#: tools/virsh.c:6897
+#: tools/virsh.c:13101
 msgid "compare host CPU with a CPU described by an XML file"
 msgstr ""
 
-#: tools/virsh.c:6898
+#: tools/virsh.c:13102
 msgid "compare CPU with host CPU"
 msgstr ""
 
-#: tools/virsh.c:6903
+#: tools/virsh.c:13107
 msgid "file containing an XML CPU description"
 msgstr ""
 
-#: tools/virsh.c:12053
+#: tools/virsh.c:13132
 #, c-format
 msgid "Failed to read file '%s' to compare"
 msgstr ""
 
-#: tools/virsh.c:12066
+#: tools/virsh.c:13145
 msgid "Can't create XML buffer to extract CPU element."
 msgstr ""
 
-#: tools/virsh.c:12071
+#: tools/virsh.c:13150
 msgid "Failed to extract CPU element snippet from domain XML."
 msgstr ""
 
-#: tools/virsh.c:12077
+#: tools/virsh.c:13156
 #, c-format
 msgid ""
 "File '%s' does not contain a <cpu> element or is not a valid domain or "
 "capabilities XML"
 msgstr ""
 
-#: tools/virsh.c:6931
+#: tools/virsh.c:13165
 #, c-format
 msgid "CPU described in %s is incompatible with host CPU\n"
 msgstr ""
 
-#: tools/virsh.c:6937
+#: tools/virsh.c:13171
 #, c-format
 msgid "CPU described in %s is identical to host CPU\n"
 msgstr ""
 
-#: tools/virsh.c:6943
+#: tools/virsh.c:13176
 #, c-format
 msgid "Host CPU is a superset of CPU described in %s\n"
 msgstr ""
 
-#: tools/virsh.c:6950
+#: tools/virsh.c:13182
 #, c-format
 msgid "Failed to compare host CPU with %s"
 msgstr ""
 
-#: tools/virsh.c:12122
+#: tools/virsh.c:13201
 msgid "compute baseline CPU"
 msgstr ""
 
-#: tools/virsh.c:12123
+#: tools/virsh.c:13202
 msgid "Compute baseline CPU for a set of given CPUs."
 msgstr ""
 
-#: tools/virsh.c:12128
+#: tools/virsh.c:13207
 msgid "file containing XML CPU descriptions"
 msgstr ""
 
-#: tools/virsh.c:12175
+#: tools/virsh.c:13254
 #, c-format
 msgid "No host CPU specified in '%s'"
 msgstr ""
 
-#: tools/virsh.c:12188
+#: tools/virsh.c:13267
 msgid "Failed to extract <cpu> element"
 msgstr ""
 
-#: tools/virsh.c:12237
+#: tools/virsh.c:13316
 #, c-format
 msgid "mkstemps: failed to create temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:6984
+#: tools/virsh.c:13323
 #, c-format
 msgid "write: %s: failed to write to temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:6992
+#: tools/virsh.c:13331
 #, c-format
 msgid "close: %s: failed to write or close temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:7030
+#: tools/virsh.c:13372
 #, c-format
 msgid ""
 "%s: temporary filename contains shell meta or other unacceptable characters "
 "(is $TMPDIR wrong?)"
 msgstr ""
 
-#: tools/virsh.c:7067
+#: tools/virsh.c:13405
 #, c-format
 msgid "%s: failed to read temporary file: %s"
 msgstr ""
 
-#: tools/virsh.c:7080
+#: tools/virsh.c:13417
 msgid "change the current directory"
 msgstr ""
 
-#: tools/virsh.c:7081
+#: tools/virsh.c:13418
 msgid "Change the current directory."
 msgstr ""
 
-#: tools/virsh.c:7086
+#: tools/virsh.c:13423
 msgid "directory to switch to (default: home or else root)"
 msgstr ""
 
-#: tools/virsh.c:7097
+#: tools/virsh.c:13435
 msgid "cd: command valid only in interactive mode"
 msgstr ""
 
-#: tools/virsh.c:7110
+#: tools/virsh.c:13447
 #, c-format
 msgid "cd: %s: %s"
 msgstr ""
 
-#: tools/virsh.c:7124
+#: tools/virsh.c:13459
 msgid "print the current directory"
 msgstr ""
 
-#: tools/virsh.c:7125
+#: tools/virsh.c:13460
 msgid "Print the current directory."
 msgstr ""
 
-#: tools/virsh.c:7148
+#: tools/virsh.c:13472
 #, c-format
 msgid "pwd: cannot get current directory: %s"
 msgstr ""
 
-#: tools/virsh.c:7151
+#: tools/virsh.c:13476
 #, c-format
 msgid "%s\n"
 msgstr ""
 
-#: tools/virsh.c:12408
+#: tools/virsh.c:13487
 msgid "echo arguments"
 msgstr ""
 
-#: tools/virsh.c:12409
+#: tools/virsh.c:13488
 msgid "Echo back arguments, possibly with quoting."
 msgstr ""
 
-#: tools/virsh.c:12414
+#: tools/virsh.c:13493
 msgid "escape for shell use"
 msgstr ""
 
-#: tools/virsh.c:12415
+#: tools/virsh.c:13494
 msgid "escape for XML use"
 msgstr ""
 
-#: tools/virsh.c:12416
+#: tools/virsh.c:13495
 msgid "arguments to echo"
 msgstr ""
 
-#: tools/virsh.c:7162
+#: tools/virsh.c:13560
 msgid "edit XML configuration for a domain"
 msgstr ""
 
-#: tools/virsh.c:7163
+#: tools/virsh.c:13561
 msgid "Edit the XML configuration for a domain."
 msgstr ""
 
-#: tools/virsh.c:7214
+#: tools/virsh.c:13609
 #, c-format
 msgid "Domain %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:7240
+#: tools/virsh.c:13635
 #, c-format
 msgid "Domain %s XML configuration edited.\n"
 msgstr ""
 
-#: tools/virsh.c:7265
+#: tools/virsh.c:13661
 msgid "edit XML configuration for a network"
 msgstr ""
 
-#: tools/virsh.c:7266
+#: tools/virsh.c:13662
 msgid "Edit the XML configuration for a network."
 msgstr ""
 
-#: tools/virsh.c:7282
+#: tools/virsh.c:13678
 msgid "edit XML configuration for a storage pool"
 msgstr ""
 
-#: tools/virsh.c:7283
+#: tools/virsh.c:13679
 msgid "Edit the XML configuration for a storage pool."
 msgstr ""
 
-#: tools/virsh.c:7299
+#: tools/virsh.c:13695
 msgid "quit this interactive terminal"
 msgstr "quit this interactive terminal"
 
-#: tools/virsh.c:12657
+#: tools/virsh.c:13736
 msgid "cannot halt after snapshot of transient domain"
 msgstr ""
 
-#: tools/virsh.c:12676
+#: tools/virsh.c:13755
 msgid "Could not get snapshot name"
 msgstr ""
 
-#: tools/virsh.c:12681
+#: tools/virsh.c:13760
 #, c-format
 msgid "Domain snapshot %s created from '%s'"
 msgstr ""
 
-#: tools/virsh.c:12683
+#: tools/virsh.c:13762
 #, c-format
 msgid "Domain snapshot %s created"
 msgstr ""
 
-#: tools/virsh.c:12700
+#: tools/virsh.c:13779
 msgid "Create a snapshot from XML"
 msgstr ""
 
-#: tools/virsh.c:12701
+#: tools/virsh.c:13780
 msgid "Create a snapshot (disk and RAM) from XML"
 msgstr ""
 
-#: tools/virsh.c:12707
+#: tools/virsh.c:13786
 msgid "domain snapshot XML"
 msgstr ""
 
-#: tools/virsh.c:12708
+#: tools/virsh.c:13787
 msgid "redefine metadata for existing snapshot"
 msgstr ""
 
-#: tools/virsh.c:12709
+#: tools/virsh.c:13788
 msgid "with redefine, set current snapshot"
 msgstr ""
 
-#: tools/virsh.c:12710 tools/virsh.c:12840
+#: tools/virsh.c:13789 tools/virsh.c:13919
 msgid "take snapshot but create no metadata"
 msgstr ""
 
-#: tools/virsh.c:12711 tools/virsh.c:12841
+#: tools/virsh.c:13790 tools/virsh.c:13920
 msgid "halt domain after snapshot is created"
 msgstr ""
 
-#: tools/virsh.c:12712 tools/virsh.c:12842
+#: tools/virsh.c:13791 tools/virsh.c:13921
 msgid "capture disk state but not vm state"
 msgstr ""
 
-#: tools/virsh.c:12824
+#: tools/virsh.c:13903
 #, c-format
 msgid "unable to parse diskspec: %s"
 msgstr ""
 
-#: tools/virsh.c:12830
+#: tools/virsh.c:13909
 msgid "Create a snapshot from a set of args"
 msgstr ""
 
-#: tools/virsh.c:12831
+#: tools/virsh.c:13910
 msgid "Create a snapshot (disk and RAM) from arguments"
 msgstr ""
 
-#: tools/virsh.c:12837
+#: tools/virsh.c:13916
 msgid "name of snapshot"
 msgstr ""
 
-#: tools/virsh.c:12838
+#: tools/virsh.c:13917
 msgid "description of snapshot"
 msgstr ""
 
-#: tools/virsh.c:12839
+#: tools/virsh.c:13918
 msgid "print XML document rather than create"
 msgstr ""
 
-#: tools/virsh.c:12844
+#: tools/virsh.c:13923
 msgid "disk attributes: disk[,snapshot=type][,driver=type][,file=name]"
 msgstr ""
 
-#: tools/virsh.c:12876
+#: tools/virsh.c:13955
 msgid "argument must not be empty"
 msgstr ""
 
-#: tools/virsh.c:12932
+#: tools/virsh.c:14011
 #, c-format
 msgid "invalid argument for --%s"
 msgstr ""
 
-#: tools/virsh.c:12937
+#: tools/virsh.c:14016
 #, c-format
 msgid "--%s and --current are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:12946
+#: tools/virsh.c:14025
 #, c-format
 msgid "--%s or --current is required"
 msgstr ""
 
-#: tools/virsh.c:12962
+#: tools/virsh.c:14041
 msgid "edit XML for a snapshot"
 msgstr ""
 
-#: tools/virsh.c:12963
+#: tools/virsh.c:14042
 msgid "Edit the domain snapshot XML for a named snapshot"
 msgstr ""
 
-#: tools/virsh.c:12969 tools/virsh.c:13644 tools/virsh.c:13763
-#: tools/virsh.c:13837
+#: tools/virsh.c:14048 tools/virsh.c:14723 tools/virsh.c:14842
+#: tools/virsh.c:14916
 msgid "snapshot name"
 msgstr ""
 
-#: tools/virsh.c:12970
+#: tools/virsh.c:14049
 msgid "also set edited snapshot as current"
 msgstr ""
 
-#: tools/virsh.c:12971
+#: tools/virsh.c:14050
 msgid "allow renaming an existing snapshot"
 msgstr ""
 
-#: tools/virsh.c:12972
+#: tools/virsh.c:14051
 msgid "allow cloning to new name"
 msgstr ""
 
-#: tools/virsh.c:12995
+#: tools/virsh.c:14074
 msgid "--rename and --clone are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13041
+#: tools/virsh.c:14120
 #, c-format
 msgid "Snapshot %s XML configuration not changed.\n"
 msgstr ""
 
-#: tools/virsh.c:13056
+#: tools/virsh.c:14135
 #, c-format
 msgid "Snapshot %s edited.\n"
 msgstr ""
 
-#: tools/virsh.c:13058
+#: tools/virsh.c:14137
 #, c-format
 msgid "Snapshot %s cloned to %s.\n"
 msgstr ""
 
-#: tools/virsh.c:13067
+#: tools/virsh.c:14146
 #, c-format
 msgid "Failed to clean up %s"
 msgstr ""
 
-#: tools/virsh.c:13072
+#: tools/virsh.c:14151
 #, c-format
 msgid "Must use --rename or --clone to change %s to %s"
 msgstr ""
 
-#: tools/virsh.c:13100 tools/virsh.c:13101
+#: tools/virsh.c:14179 tools/virsh.c:14180
 msgid "Get or set the current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13107
+#: tools/virsh.c:14186
 msgid "list the name, rather than the full xml"
 msgstr ""
 
-#: tools/virsh.c:13111
+#: tools/virsh.c:14190
 msgid "name of existing snapshot to make current"
 msgstr ""
 
-#: tools/virsh.c:13138
+#: tools/virsh.c:14217
 #, c-format
 msgid "invalid snapshotname argument '%s'"
 msgstr ""
 
-#: tools/virsh.c:13148
+#: tools/virsh.c:14227
 msgid "--name and snapshotname are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13164
+#: tools/virsh.c:14243
 #, c-format
 msgid "Snapshot %s set as current"
 msgstr ""
 
-#: tools/virsh.c:13173
+#: tools/virsh.c:14252
 #, c-format
 msgid "domain '%s' has no current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13256
+#: tools/virsh.c:14335
 msgid "unable to determine if snapshot has parent"
 msgstr ""
 
-#: tools/virsh.c:13273
+#: tools/virsh.c:14352
 msgid "List snapshots for a domain"
 msgstr ""
 
-#: tools/virsh.c:13274
+#: tools/virsh.c:14353
 msgid "Snapshot List"
 msgstr ""
 
-#: tools/virsh.c:13280
+#: tools/virsh.c:14359
 msgid "add a column showing parent snapshot"
 msgstr ""
 
-#: tools/virsh.c:13281
+#: tools/virsh.c:14360
 msgid "list only snapshots without parents"
 msgstr ""
 
-#: tools/virsh.c:13282
+#: tools/virsh.c:14361
 msgid "list only snapshots without children"
 msgstr ""
 
-#: tools/virsh.c:13284
+#: tools/virsh.c:14363
 msgid "list only snapshots that have metadata that would prevent undefine"
 msgstr ""
 
-#: tools/virsh.c:13285
+#: tools/virsh.c:14364
 msgid "list snapshots in a tree"
 msgstr ""
 
-#: tools/virsh.c:13286
+#: tools/virsh.c:14365
 msgid "limit list to children of given snapshot"
 msgstr ""
 
-#: tools/virsh.c:13288
+#: tools/virsh.c:14367
 msgid "limit list to children of current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13289
+#: tools/virsh.c:14368
 msgid "with --from, list all descendants"
 msgstr ""
 
-#: tools/virsh.c:13338
+#: tools/virsh.c:14417
 msgid "--parent and --roots are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13343
+#: tools/virsh.c:14422
 msgid "--parent and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13350
+#: tools/virsh.c:14429
 msgid "--roots and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13355
+#: tools/virsh.c:14434
 msgid "--roots and --from are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13362
+#: tools/virsh.c:14441
 msgid "--leaves and --tree are mutually exclusive"
 msgstr ""
 
-#: tools/virsh.c:13410
+#: tools/virsh.c:14489
 msgid "missing support"
 msgstr ""
 
-#: tools/virsh.c:13417 tools/virsh.c:13421
+#: tools/virsh.c:14496 tools/virsh.c:14500
 msgid "Creation Time"
 msgstr ""
 
-#: tools/virsh.c:13418
+#: tools/virsh.c:14497
 msgid "Parent"
 msgstr ""
 
-#: tools/virsh.c:13507
+#: tools/virsh.c:14586
 #, c-format
 msgid "snapshot %s disappeared from list"
 msgstr ""
 
-#: tools/virsh.c:13592
+#: tools/virsh.c:14671
 msgid "time_t overflow"
 msgstr ""
 
-#: tools/virsh.c:13637
+#: tools/virsh.c:14716
 msgid "Dump XML for a domain snapshot"
 msgstr ""
 
-#: tools/virsh.c:13638
+#: tools/virsh.c:14717
 msgid "Snapshot Dump XML"
 msgstr ""
 
-#: tools/virsh.c:13699
+#: tools/virsh.c:14778
 msgid "Get the name of the parent of a snapshot"
 msgstr ""
 
-#: tools/virsh.c:13700
+#: tools/virsh.c:14779
 msgid "Extract the snapshot's parent, if any"
 msgstr ""
 
-#: tools/virsh.c:13706
+#: tools/virsh.c:14785
 msgid "find parent of snapshot name"
 msgstr ""
 
-#: tools/virsh.c:13707
+#: tools/virsh.c:14786
 msgid "find parent of current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13734
+#: tools/virsh.c:14813
 #, c-format
 msgid "snapshot '%s' has no parent"
 msgstr ""
 
-#: tools/virsh.c:13756
+#: tools/virsh.c:14835
 msgid "Revert a domain to a snapshot"
 msgstr ""
 
-#: tools/virsh.c:13757
+#: tools/virsh.c:14836
 msgid "Revert domain to snapshot"
 msgstr ""
 
-#: tools/virsh.c:13764
+#: tools/virsh.c:14843
 msgid "revert to current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13765
+#: tools/virsh.c:14844
 msgid "after reverting, change state to running"
 msgstr ""
 
-#: tools/virsh.c:13766
+#: tools/virsh.c:14845
 msgid "after reverting, change state to paused"
 msgstr ""
 
-#: tools/virsh.c:13767
+#: tools/virsh.c:14846
 msgid "try harder on risky reverts"
 msgstr ""
 
-#: tools/virsh.c:13830
+#: tools/virsh.c:14909
 msgid "Delete a domain snapshot"
 msgstr ""
 
-#: tools/virsh.c:13831
+#: tools/virsh.c:14910
 msgid "Snapshot Delete"
 msgstr ""
 
-#: tools/virsh.c:13838
+#: tools/virsh.c:14917
 msgid "delete current snapshot"
 msgstr ""
 
-#: tools/virsh.c:13839
+#: tools/virsh.c:14918
 msgid "delete snapshot and all children"
 msgstr ""
 
-#: tools/virsh.c:13840
+#: tools/virsh.c:14919
 msgid "delete children but not snapshot"
 msgstr ""
 
-#: tools/virsh.c:13842
+#: tools/virsh.c:14921
 msgid "delete only libvirt metadata, leaving snapshot contents behind"
 msgstr ""
 
-#: tools/virsh.c:13878
+#: tools/virsh.c:14957
 #, c-format
 msgid "Domain snapshot %s children deleted\n"
 msgstr ""
 
-#: tools/virsh.c:13880
+#: tools/virsh.c:14959
 #, c-format
 msgid "Domain snapshot %s deleted\n"
 msgstr ""
 
-#: tools/virsh.c:13882
+#: tools/virsh.c:14961
 #, c-format
 msgid "Failed to delete snapshot %s"
 msgstr ""
 
-#: tools/virsh.c:13901 tools/virsh.c:13902
+#: tools/virsh.c:14980 tools/virsh.c:14981
 msgid "QEMU Monitor Command"
 msgstr ""
 
-#: tools/virsh.c:13908
+#: tools/virsh.c:14987
 msgid "command is in human monitor protocol"
 msgstr ""
 
-#: tools/virsh.c:13909
+#: tools/virsh.c:14988
 msgid "command"
 msgstr ""
 
-#: tools/virsh.c:13939
+#: tools/virsh.c:15018
 msgid "Failed to collect command"
 msgstr ""
 
-#: tools/virsh.c:13967 tools/virsh.c:13968
+#: tools/virsh.c:15046 tools/virsh.c:15047
 msgid "QEMU Attach"
 msgstr ""
 
-#: tools/virsh.c:13973
+#: tools/virsh.c:15052
 msgid "pid"
 msgstr ""
 
-#: tools/virsh.c:13989
+#: tools/virsh.c:15068
 msgid "missing pid value"
 msgstr ""
 
-#: tools/virsh.c:13997
+#: tools/virsh.c:15076
 #, c-format
 msgid "Domain %s attached to pid %u\n"
 msgstr ""
 
-#: tools/virsh.c:14002
+#: tools/virsh.c:15081
 #, c-format
 msgid "Failed to attach to pid %u"
 msgstr ""
 
-#: tools/virsh.c:14388
+#: tools/virsh.c:15474
 #, c-format
 msgid "option --%s already seen"
 msgstr ""
 
-#: tools/virsh.c:8176
+#: tools/virsh.c:15483
 #, c-format
 msgid "command '%s' doesn't support option --%s"
 msgstr "command '%s' doesn't support option --%s"
 
-#: tools/virsh.c:7519
+#: tools/virsh.c:15527
 #, c-format
 msgid "command '%s' requires <%s> option"
 msgstr "command '%s' requires <%s> option"
 
-#: tools/virsh.c:7520
+#: tools/virsh.c:15528
 #, c-format
 msgid "command '%s' requires --%s option"
 msgstr "command '%s' requires --%s option"
 
-#: tools/virsh.c:14485
+#: tools/virsh.c:15571
 #, c-format
 msgid "command group '%s' doesn't exist"
 msgstr ""
 
-#: tools/virsh.c:7547
+#: tools/virsh.c:15592
 #, c-format
 msgid "command '%s' doesn't exist"
 msgstr "command '%s' doesn't exist"
 
-#: tools/virsh.c:14518 tools/virsh.c:15374
+#: tools/virsh.c:15604 tools/virsh.c:16463
 #, c-format
 msgid "internal error: bad options in command: '%s'"
 msgstr ""
 
-#: tools/virsh.c:7554
+#: tools/virsh.c:15609
 msgid "  NAME\n"
 msgstr "  NAME\n"
 
-#: tools/virsh.c:7557
+#: tools/virsh.c:15612
 msgid ""
 "\n"
 "  SYNOPSIS\n"
 msgstr ""
 
-#: tools/virsh.c:7566
+#: tools/virsh.c:15625
 #, c-format
 msgid "[--%s <number>]"
 msgstr ""
 
-#: tools/virsh.c:7568
+#: tools/virsh.c:15631
 #, c-format
 msgid "[--%s <string>]"
 msgstr ""
 
-#: tools/virsh.c:14558
+#: tools/virsh.c:15644
 #, c-format
 msgid "{[--%s] <string>}..."
 msgstr ""
 
-#: tools/virsh.c:14559
+#: tools/virsh.c:15645
 #, c-format
 msgid "[[--%s] <string>]..."
 msgstr ""
 
-#: tools/virsh.c:14561
+#: tools/virsh.c:15647
 #, c-format
 msgid "<%s>..."
 msgstr ""
 
-#: tools/virsh.c:14562
+#: tools/virsh.c:15648
 #, c-format
 msgid "[<%s>]..."
 msgstr ""
 
-#: tools/virsh.c:7581
+#: tools/virsh.c:15662
 msgid ""
 "\n"
 "  DESCRIPTION\n"
@@ -23042,7 +24094,7 @@
 "\n"
 "  DESCRIPTION\n"
 
-#: tools/virsh.c:7587
+#: tools/virsh.c:15668
 msgid ""
 "\n"
 "  OPTIONS\n"
@@ -23050,72 +24102,72 @@
 "\n"
 "  OPTIONS\n"
 
-#: tools/virsh.c:14590
+#: tools/virsh.c:15676
 #, c-format
 msgid "[--%s] <number>"
 msgstr ""
 
-#: tools/virsh.c:7592
+#: tools/virsh.c:15677
 #, c-format
 msgid "--%s <number>"
 msgstr "--%s <number>"
 
-#: tools/virsh.c:7594
+#: tools/virsh.c:15681
 #, c-format
 msgid "--%s <string>"
 msgstr "--%s <string>"
 
-#: tools/virsh.c:14598 tools/virsh.c:14603
+#: tools/virsh.c:15684 tools/virsh.c:15689
 #, c-format
 msgid "[--%s] <string>"
 msgstr ""
 
-#: tools/virsh.c:14603
+#: tools/virsh.c:15689
 #, c-format
 msgid "<%s>"
 msgstr ""
 
-#: tools/virsh.c:7746
+#: tools/virsh.c:16052
 #, c-format
 msgid "internal error: virsh %s: no %s VSH_OT_DATA option"
 msgstr ""
 
-#: tools/virsh.c:7795
+#: tools/virsh.c:16100
 #, c-format
 msgid "failed to get domain '%s'"
 msgstr "failed to get domain '%s'"
 
-#: tools/virsh.c:7835
+#: tools/virsh.c:16138
 #, c-format
 msgid "failed to get network '%s'"
 msgstr ""
 
-#: tools/virsh.c:15091
+#: tools/virsh.c:16177
 #, c-format
 msgid "failed to get nwfilter '%s'"
 msgstr ""
 
-#: tools/virsh.c:7875
+#: tools/virsh.c:16218
 #, c-format
 msgid "failed to get interface '%s'"
 msgstr ""
 
-#: tools/virsh.c:7912
+#: tools/virsh.c:16253
 #, c-format
 msgid "failed to get pool '%s'"
 msgstr ""
 
-#: tools/virsh.c:15219
+#: tools/virsh.c:16308
 #, c-format
 msgid "failed to get vol '%s', specifying --%s might help"
 msgstr ""
 
-#: tools/virsh.c:7997
+#: tools/virsh.c:16340
 #, c-format
 msgid "failed to get secret '%s'"
 msgstr ""
 
-#: tools/virsh.c:8028
+#: tools/virsh.c:16387
 #, c-format
 msgid ""
 "\n"
@@ -23126,213 +24178,213 @@
 "(Time: %.3f ms)\n"
 "\n"
 
-#: tools/virsh.c:8168
+#: tools/virsh.c:16457
 #, c-format
 msgid "unknown command: '%s'"
 msgstr "unknown command: '%s'"
 
-#: tools/virsh.c:8191
+#: tools/virsh.c:16496
 #, c-format
 msgid "expected syntax: --%s <%s>"
 msgstr "expected syntax: --%s <%s>"
 
-#: tools/virsh.c:8194
+#: tools/virsh.c:16499
 msgid "number"
 msgstr "number"
 
-#: tools/virsh.c:8194
+#: tools/virsh.c:16499
 msgid "string"
 msgstr "string"
 
-#: tools/virsh.c:15418
+#: tools/virsh.c:16507
 #, c-format
 msgid "invalid '=' after option --%s"
 msgstr ""
 
-#: tools/virsh.c:8200
+#: tools/virsh.c:16521
 #, c-format
 msgid "unexpected data '%s'"
 msgstr "unexpected data '%s'"
 
-#: tools/virsh.c:15454
+#: tools/virsh.c:16543
 msgid "optdata"
 msgstr ""
 
-#: tools/virsh.c:15454
+#: tools/virsh.c:16543
 msgid "bool"
 msgstr ""
 
-#: tools/virsh.c:15455
+#: tools/virsh.c:16544
 msgid "(none)"
 msgstr ""
 
-#: tools/virsh.c:15571
+#: tools/virsh.c:16660
 msgid "dangling \\"
 msgstr ""
 
-#: tools/virsh.c:8102
+#: tools/virsh.c:16673
 msgid "missing \""
 msgstr "missing \""
 
-#: tools/virsh.c:8273 tools/virsh.c:8295
+#: tools/virsh.c:16736 tools/virsh.c:16945
 msgid "idle"
 msgstr ""
 
-#: tools/virsh.c:8275
+#: tools/virsh.c:16738
 msgid "paused"
 msgstr "paused"
 
-#: tools/virsh.c:8277
+#: tools/virsh.c:16740
 msgid "in shutdown"
 msgstr "in shutdown"
 
-#: tools/virsh.c:8279
+#: tools/virsh.c:16742
 msgid "shut off"
 msgstr "shut off"
 
-#: tools/virsh.c:8281
+#: tools/virsh.c:16744 tools/virsh.c:16830
 msgid "crashed"
 msgstr "crashed"
 
-#: tools/virsh.c:691 tools/virsh.c:713 tools/virsh.c:8285 tools/virsh.c:8301
+#: tools/virsh.c:16749 tools/virsh.c:16951
 msgid "no state"
 msgstr "no state"
 
-#: tools/virsh.c:15677
+#: tools/virsh.c:16766
 msgid "booted"
 msgstr ""
 
-#: tools/virsh.c:15679 tools/virsh.c:15743
+#: tools/virsh.c:16768 tools/virsh.c:16832
 msgid "migrated"
 msgstr ""
 
-#: tools/virsh.c:15681
+#: tools/virsh.c:16770
 msgid "restored"
 msgstr ""
 
-#: tools/virsh.c:15683 tools/virsh.c:15717 tools/virsh.c:15749
+#: tools/virsh.c:16772 tools/virsh.c:16806 tools/virsh.c:16838
 msgid "from snapshot"
 msgstr ""
 
-#: tools/virsh.c:15685
+#: tools/virsh.c:16774
 msgid "unpaused"
 msgstr ""
 
-#: tools/virsh.c:15687
+#: tools/virsh.c:16776
 msgid "migration canceled"
 msgstr ""
 
-#: tools/virsh.c:15689
+#: tools/virsh.c:16778
 msgid "save canceled"
 msgstr ""
 
-#: tools/virsh.c:15705 tools/virsh.c:15728
+#: tools/virsh.c:16794 tools/virsh.c:16817
 msgid "user"
 msgstr ""
 
-#: tools/virsh.c:15707
+#: tools/virsh.c:16796
 msgid "migrating"
 msgstr ""
 
-#: tools/virsh.c:15709
+#: tools/virsh.c:16798
 msgid "saving"
 msgstr ""
 
-#: tools/virsh.c:15711
+#: tools/virsh.c:16800
 msgid "dumping"
 msgstr ""
 
-#: tools/virsh.c:15713
+#: tools/virsh.c:16802
 msgid "I/O error"
 msgstr ""
 
-#: tools/virsh.c:15715
+#: tools/virsh.c:16804
 msgid "watchdog"
 msgstr ""
 
-#: tools/virsh.c:15719
+#: tools/virsh.c:16808
 msgid "shutting down"
 msgstr ""
 
-#: tools/virsh.c:15737
+#: tools/virsh.c:16826
 msgid "shutdown"
 msgstr ""
 
-#: tools/virsh.c:15739
+#: tools/virsh.c:16828
 msgid "destroyed"
 msgstr ""
 
-#: tools/virsh.c:15747
+#: tools/virsh.c:16836
 msgid "failed"
 msgstr ""
 
-#: tools/virsh.c:15804
+#: tools/virsh.c:16893
 msgid "unimplemented block statistics parameter type"
 msgstr ""
 
-#: tools/virsh.c:15837
+#: tools/virsh.c:16926
 msgid "ok"
 msgstr ""
 
-#: tools/virsh.c:15839
+#: tools/virsh.c:16928
 msgid "background job"
 msgstr ""
 
-#: tools/virsh.c:15841
+#: tools/virsh.c:16930
 msgid "occupied"
 msgstr ""
 
-#: tools/virsh.c:8293
+#: tools/virsh.c:16943
 msgid "offline"
 msgstr "offline"
 
-#: tools/virsh.c:8312
+#: tools/virsh.c:16961
 msgid "no valid connection"
 msgstr "no valid connection"
 
-#: tools/virsh.c:8358
+#: tools/virsh.c:17032
 msgid "error: "
 msgstr "error: "
 
-#: tools/virsh.c:15976
+#: tools/virsh.c:17085
 msgid "VIRSH_DEBUG not set with a valid numeric value"
 msgstr ""
 
-#: tools/virsh.c:8443
+#: tools/virsh.c:17128
 msgid "failed to connect to the hypervisor"
 msgstr "failed to connect to the hypervisor"
 
-#: tools/virsh.c:8475
+#: tools/virsh.c:17158
 msgid "failed to get the log file information"
 msgstr ""
 
-#: tools/virsh.c:8480
+#: tools/virsh.c:17163
 msgid "the log path is not a file"
 msgstr ""
 
-#: tools/virsh.c:8488
+#: tools/virsh.c:17171
 msgid "failed to open the log file. check the log file path"
 msgstr ""
 
-#: tools/virsh.c:8557
+#: tools/virsh.c:17253
 msgid "failed to write the log file"
 msgstr ""
 
-#: tools/virsh.c:8572
+#: tools/virsh.c:17268
 #, c-format
 msgid "%s: failed to write log file: %s"
 msgstr ""
 
-#: tools/virsh.c:16303
+#: tools/virsh.c:17416
 msgid "Could not determine home directory"
 msgstr ""
 
-#: tools/virsh.c:16332
+#: tools/virsh.c:17445
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr ""
 
-#: tools/virsh.c:16413
+#: tools/virsh.c:17551
 #, c-format
 msgid ""
 "\n"
@@ -23340,89 +24392,100 @@
 "%s [options]... <command> [args...]\n"
 "\n"
 "  options:\n"
-"    -c | --connect <uri>    hypervisor connection URI\n"
+"    -c | --connect=URI      hypervisor connection URI\n"
 "    -r | --readonly         connect readonly\n"
-"    -d | --debug <num>      debug level [0-4]\n"
+"    -d | --debug=NUM        debug level [0-4]\n"
 "    -h | --help             this help\n"
 "    -q | --quiet            quiet mode\n"
 "    -t | --timing           print timing information\n"
-"    -l | --log <file>       output logging to file\n"
-"    -v | --version[=short]  program version\n"
-"    -V | --version=long     version and full options\n"
+"    -l | --log=FILE         output logging to file\n"
+"    -v                      short version\n"
+"    -V                      long version\n"
+"         --version[=TYPE]   version, TYPE is short or long (default short)\n"
+"    -e | --escape <char>    set escape sequence for console\n"
 "\n"
 "  commands (non interactive mode):\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16428
+#: tools/virsh.c:17568
 #, c-format
 msgid " %s (help keyword '%s')\n"
 msgstr ""
 
-#: tools/virsh.c:16438
+#: tools/virsh.c:17578
 msgid ""
 "\n"
 "  (specify help <group> for details about the commands in the group)\n"
 msgstr ""
 
-#: tools/virsh.c:8783
+#: tools/virsh.c:17580
 msgid ""
 "\n"
 "  (specify help <command> for details about the command)\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16451
+#: tools/virsh.c:17591
 #, c-format
 msgid "Virsh command line tool of libvirt %s\n"
 msgstr ""
 
-#: tools/virsh.c:16452
+#: tools/virsh.c:17592
 #, c-format
 msgid ""
 "See web site at %s\n"
 "\n"
 msgstr ""
 
-#: tools/virsh.c:16454
+#: tools/virsh.c:17594
 msgid "Compiled with support for:\n"
 msgstr ""
 
-#: tools/virsh.c:16455
+#: tools/virsh.c:17595
 msgid " Hypervisors:"
 msgstr ""
 
-#: tools/virsh.c:16491
+#: tools/virsh.c:17631
 msgid " Networking:"
 msgstr ""
 
-#: tools/virsh.c:16518
+#: tools/virsh.c:17658
 msgid " Storage:"
 msgstr ""
 
-#: tools/virsh.c:16542
+#: tools/virsh.c:17682
 msgid " Miscellaneous:"
 msgstr ""
 
-#: tools/virsh.c:16595
+#: tools/virsh.c:17736
 msgid "option -d takes a numeric argument"
 msgstr ""
 
-#: tools/virsh.c:8875
+#: tools/virsh.c:17774
+#, c-format
+msgid "Invalid string '%s' for escape sequence"
+msgstr ""
+
+#: tools/virsh.c:17780
 #, c-format
 msgid "unsupported option '-%c'. See --help."
 msgstr "unsupported option '-%c'. See --help."
 
-#: tools/virsh.c:8882
+#: tools/virsh.c:17787
 #, c-format
 msgid "extra argument '%s'. See --help."
 msgstr ""
 
-#: tools/virsh.c:16682
+#: tools/virsh.c:17837
+msgid "Failed to initialize mutex"
+msgstr ""
+
+#: tools/virsh.c:17842
 msgid "Failed to initialize libvirt"
 msgstr ""
 
-#: tools/virsh.c:8966
+#: tools/virsh.c:17871
 #, c-format
 msgid ""
 "Welcome to %s, the virtualization interactive terminal.\n"
@@ -23431,7 +24494,7 @@
 "Welcome to %s, the virtualization interactive terminal.\n"
 "\n"
 
-#: tools/virsh.c:8969
+#: tools/virsh.c:17874
 msgid ""
 "Type:  'help' for help with commands\n"
 "       'quit' to quit\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/lightdm.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/lightdm.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/lightdm.po	2012-01-02 17:51:15.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/lightdm.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,244 +0,0 @@
-# Slovak translation for lightdm
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the lightdm package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: lightdm\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-02 23:36+0000\n"
-"PO-Revision-Date: 2011-11-11 22:21+0000\n"
-"Last-Translator: Peter Mráz <Unknown>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:25+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../greeters/gtk/greeter.ui.h:1
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: ../greeters/gtk/greeter.ui.h:2
-msgid "Hibernate"
-msgstr "Hibernovať"
-
-#: ../greeters/gtk/greeter.ui.h:3
-msgid "High Contrast"
-msgstr "Vysoký kontrast"
-
-#: ../greeters/gtk/greeter.ui.h:4
-msgid "Large Font"
-msgstr "Veľké písmo"
-
-#: ../greeters/gtk/greeter.ui.h:5
-msgid "Login"
-msgstr "Prihlásiť sa"
-
-#: ../greeters/gtk/greeter.ui.h:6
-msgid "Restart..."
-msgstr "Reštartovať..."
-
-#: ../greeters/gtk/greeter.ui.h:7
-msgid "Shutdown..."
-msgstr "Vypnúť..."
-
-#: ../greeters/gtk/greeter.ui.h:8
-msgid "Suspend"
-msgstr "Uspať"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:224
-msgid "Failed to start session"
-msgstr "Zlyhalo spustenie relácie"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:340
-msgid "Incorrect password, please try again"
-msgstr "Nepsrávne heslo, prosím, skúste to znovu"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:344
-msgid "Failed to authenticate"
-msgstr "Zlyhalo overenie totožnosti"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:409
-msgid "Are you sure you want to close all programs and restart the computer?"
-msgstr ""
-"Ste si istý, že chcete zavrieť všetky programy a reštartovať počítač?"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:410
-#: ../greeters/gtk/lightdm-gtk-greeter.c:435
-msgid "Return To Login"
-msgstr "Vrátiť sa na prihlásenie"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:410
-msgid "Restart"
-msgstr "Reštartovať"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:434
-msgid ""
-"Are you sure you want to close all programs and shutdown the computer?"
-msgstr "Ste si istý, že chcete zavrieť všetky programy a vypnúť počítač?"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:435
-msgid "Shutdown"
-msgstr "Vypnúť"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:612
-msgid "Guest Account"
-msgstr "Účet pre hosťa"
-
-#: ../greeters/gtk/lightdm-gtk-greeter.c:621
-msgid "Other..."
-msgstr "Niekto iný..."
-
-#. Help string for command line --config flag
-#: ../src/lightdm.c:883
-msgid "Use configuration file"
-msgstr "Použije konfiguračný súbor"
-
-#. Help string for command line --debug flag
-#: ../src/lightdm.c:886
-msgid "Print debugging messages"
-msgstr "Vypíše správy ladenia"
-
-#. Help string for command line --test-mode flag
-#: ../src/lightdm.c:889
-msgid "Run as unprivileged user, skipping things that require root access"
-msgstr ""
-"Spustí sa pod neprivilegovaným používateľom a preskočí veci, ktoré vyžadujú "
-"používateľa root"
-
-#. Help string for command line --use-passwd flag
-#: ../src/lightdm.c:892
-msgid ""
-"Use the given password file for authentication (for testing, requires --no-"
-"root)"
-msgstr ""
-"Použije na overenie totožnosti zadaný súbor s heslom (na testovanie, "
-"vyžaduje --no-root)"
-
-#. Help string for command line --pid-file flag
-#: ../src/lightdm.c:895
-msgid "File to write PID into"
-msgstr "Súbor, do ktorého sa má zapísať identifikátor procesu"
-
-#. Help string for command line --xserver-command flag
-#: ../src/lightdm.c:898
-msgid "Command to run X servers"
-msgstr "Príkaz na spustenie X serverov"
-
-#. Help string for command line --greeter-session flag
-#: ../src/lightdm.c:901
-msgid "Greeter session"
-msgstr "Uvítacia relácia"
-
-#. Help string for command line --user-session flag
-#: ../src/lightdm.c:904
-msgid "User session"
-msgstr "Používateľská relácia"
-
-#. Help string for command line --session-wrapper flag
-#: ../src/lightdm.c:907
-msgid "Session wrapper"
-msgstr "Obaľovač relácie"
-
-#. Help string for command line --minimum-vt flag
-#: ../src/lightdm.c:910
-msgid "Minimum VT to use for X servers"
-msgstr "Minimálny počet VT, ktoré sa majú použiť pre X servery"
-
-#. Help string for command line --minimum-display-number flag
-#: ../src/lightdm.c:913
-msgid "Minimum display number to use for X servers"
-msgstr "Minimálne číslo displeja, ktoré sa má použiť pre X servery"
-
-#. Help string for command line --xsessions-dir flag
-#: ../src/lightdm.c:916
-msgid "Directory to load X sessions from"
-msgstr "Adresár, z ktorého sa má načítať relácia systému X"
-
-#. Help string for command line --xgreeters-dir flag
-#: ../src/lightdm.c:919
-msgid "Directory to load X greeters from"
-msgstr "Adresár, z ktorého sa majú načítať uvítania systému X"
-
-#. Help string for command line --log-dir flag
-#: ../src/lightdm.c:922
-msgid "Directory to write logs to"
-msgstr "Adresár, do ktorého sa majú zapisovať záznamy"
-
-#. Help string for command line --run-dir flag
-#: ../src/lightdm.c:925
-msgid "Directory to store running state"
-msgstr "Adresár, do ktorého sa má ukladať bežiaci stav"
-
-#. Help string for command line --cache-dir flag
-#: ../src/lightdm.c:928
-msgid "Directory to cached information"
-msgstr "Adresár, ktorý sa má používať ako vyrovnávacia pamäť informácií"
-
-#. Help string for command line --version flag
-#: ../src/lightdm.c:931
-msgid "Show release version"
-msgstr "Zobrazí verziu vydania"
-
-#. Arguments and description for --help test
-#: ../src/lightdm.c:943
-msgid "- Display Manager"
-msgstr "- Správca prihlásenia"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../src/lightdm.c:953
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options."
-msgstr ""
-"Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
-"--help“."
-
-#: ../utils/lightdm-set-defaults.c:37
-msgid "Enable debugging"
-msgstr "Povolí ladenie"
-
-#: ../utils/lightdm-set-defaults.c:38
-msgid "Only update if no default already set"
-msgstr "Aktualizuje, iba ka nie je nastavená predvolená hodnota"
-
-#: ../utils/lightdm-set-defaults.c:39
-msgid "Remove default value if it's the current one"
-msgstr "Odstráni predvolenú hodnotu, ak to nie je táto"
-
-#: ../utils/lightdm-set-defaults.c:40
-msgid "Set default session"
-msgstr "Nastaví predvolenú reláciu"
-
-#: ../utils/lightdm-set-defaults.c:41
-msgid "Set default greeter"
-msgstr "Nastaví  predvolené uvítanie"
-
-#: ../utils/lightdm-set-defaults.c:115
-msgid "- set lightdm default values"
-msgstr "- nastaví predovlené hodnoty lightdm"
-
-#: ../utils/lightdm-set-defaults.c:118
-#, c-format
-msgid "option parsing failed: %s\n"
-msgstr "spracovanie voľby zlyhalo: %s\n"
-
-#: ../utils/lightdm-set-defaults.c:124
-#, c-format
-msgid ""
-"Wrong usage of the command\n"
-"%s"
-msgstr ""
-"Chybné použitie príkazu\n"
-"%s"
-
-#. Text printed out when an unknown command-line argument provided
-#: ../utils/dm-tool.c:28
-#, c-format
-msgid ""
-"Run 'dm-tool --help' to see a full list of available command line options."
-msgstr ""
-"Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „dm-"
-"tool --help“."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/Linux-PAM.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/Linux-PAM.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/Linux-PAM.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/Linux-PAM.po	2012-02-23 06:55:34.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libpam_misc/misc_conv.c:33
 msgid "...Time is running out...\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ltsp.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ltsp.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ltsp.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ltsp.po	2012-02-23 06:55:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: \n"
 
 #: ../server/configs/ALTLinux/ltsp-login.sh:30
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/lynx.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/lynx.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/lynx.po	2012-01-02 17:51:00.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/lynx.po	2012-02-23 06:55:47.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:48+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:47+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/mailman.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/mailman.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/mailman.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/mailman.po	2012-02-23 06:55:34.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: Mailman/Archiver/HyperArch.py:123
 msgid "size not available"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/make.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/make.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/make.po	2012-01-02 17:51:03.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/make.po	2012-02-23 06:55:50.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:38+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ar.c:53
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/man-db-gnulib.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/man-db-gnulib.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/man-db-gnulib.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/man-db-gnulib.po	2012-02-23 06:55:34.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:01+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:50+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: gnulib/lib/argp-help.c:147
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/mutt.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/mutt.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/mutt.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/mutt.po	2012-02-23 06:55:34.000000000 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: 0.95.6i\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-09-15 10:09-0700\n"
-"PO-Revision-Date: 2011-01-17 04:15+0000\n"
+"PO-Revision-Date: 2012-01-10 12:42+0000\n"
 "Last-Translator: Miroslav Vasko <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: account.c:163
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/nano.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/nano.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/nano.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/nano.po	2012-02-23 06:55:34.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:04+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/browser.c:220
 msgid "Go To Directory"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/net-tools.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/net-tools.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/net-tools.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/net-tools.po	2012-02-23 06:55:34.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:05+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../arp.c:112 ../arp.c:279
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/NetworkManager.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/NetworkManager.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/NetworkManager.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/NetworkManager.po	2012-02-23 06:55:48.000000000 +0000
@@ -9,101 +9,198 @@
 msgstr ""
 "Project-Id-Version: NetworkManager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-21 07:43+0000\n"
-"PO-Revision-Date: 2011-12-21 04:56+0000\n"
+"POT-Creation-Date: 2012-02-18 20:54+0000\n"
+"PO-Revision-Date: 2012-02-18 23:28+0000\n"
 "Last-Translator: Marcel Telka <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:06+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../cli/src/connections.c:55 ../cli/src/connections.c:70
-#: ../cli/src/devices.c:103 ../cli/src/devices.c:116 ../cli/src/devices.c:126
-#: ../cli/src/devices.c:136 ../cli/src/devices.c:150 ../cli/src/devices.c:164
-#: ../cli/src/devices.c:175 ../cli/src/devices.c:186 ../cli/src/devices.c:195
-#: ../cli/src/devices.c:204 ../cli/src/devices.c:226
+#: ../cli/src/common.c:32 ../cli/src/common.c:44 ../cli/src/common.c:52
+#: ../cli/src/common.c:63 ../cli/src/connections.c:119
+#: ../cli/src/connections.c:153
+msgid "GROUP"
+msgstr ""
+
+#. 0
+#: ../cli/src/common.c:33 ../cli/src/common.c:53
+msgid "ADDRESS"
+msgstr ""
+
+#. 1
+#: ../cli/src/common.c:34 ../cli/src/common.c:54
+msgid "ROUTE"
+msgstr ""
+
+#. 2
+#: ../cli/src/common.c:35 ../cli/src/common.c:55
+msgid "DNS"
+msgstr ""
+
+#. 3
+#: ../cli/src/common.c:36 ../cli/src/common.c:56
+msgid "DOMAIN"
+msgstr ""
+
+#. 4
+#: ../cli/src/common.c:37
+msgid "WINS"
+msgstr ""
+
+#. 0
+#: ../cli/src/common.c:45 ../cli/src/common.c:64
+msgid "OPTION"
+msgstr ""
+
+#. 0
+#. used only for 'GENERAL' group listing
+#: ../cli/src/connections.c:56 ../cli/src/connections.c:120
+#: ../cli/src/devices.c:100 ../cli/src/devices.c:121 ../cli/src/devices.c:131
+#: ../cli/src/devices.c:141 ../cli/src/devices.c:155 ../cli/src/devices.c:169
+#: ../cli/src/devices.c:191
 msgid "NAME"
 msgstr ""
 
 #. 0
-#: ../cli/src/connections.c:56 ../cli/src/connections.c:71
+#. 1
+#: ../cli/src/connections.c:57 ../cli/src/connections.c:121
 msgid "UUID"
 msgstr ""
 
 #. 1
-#: ../cli/src/connections.c:57
-msgid "DEVICES"
+#. 0
+#. 1
+#. 2
+#: ../cli/src/connections.c:58 ../cli/src/connections.c:154
+#: ../cli/src/devices.c:66 ../cli/src/devices.c:102 ../cli/src/devices.c:194
+msgid "TYPE"
 msgstr ""
 
 #. 2
-#: ../cli/src/connections.c:58
-msgid "DEFAULT"
+#: ../cli/src/connections.c:59
+msgid "TIMESTAMP"
 msgstr ""
 
 #. 3
-#: ../cli/src/connections.c:59
-msgid "SPEC-OBJECT"
+#: ../cli/src/connections.c:60
+msgid "TIMESTAMP-REAL"
 msgstr ""
 
 #. 4
-#: ../cli/src/connections.c:60
-msgid "VPN"
+#: ../cli/src/connections.c:61
+msgid "AUTOCONNECT"
 msgstr ""
 
 #. 5
+#: ../cli/src/connections.c:62
+msgid "READONLY"
+msgstr ""
+
 #. 6
+#. 8
 #. 2
 #. 11
 #. 5
-#: ../cli/src/connections.c:61 ../cli/src/connections.c:77
-#: ../cli/src/devices.c:71 ../cli/src/devices.c:216 ../cli/src/devices.c:232
+#: ../cli/src/connections.c:63 ../cli/src/connections.c:128
+#: ../cli/src/devices.c:68 ../cli/src/devices.c:181 ../cli/src/devices.c:197
 msgid "DBUS-PATH"
 msgstr ""
 
+#. 2
+#: ../cli/src/connections.c:122
+msgid "DEVICES"
+msgstr ""
+
+#. 3
+#. 1
 #. 6
-#: ../cli/src/connections.c:62
-msgid "ZONE"
+#. 1
+#: ../cli/src/connections.c:123 ../cli/src/devices.c:67
+#: ../cli/src/devices.c:107 ../cli/src/network-manager.c:39
+msgid "STATE"
+msgstr ""
+
+#. 4
+#: ../cli/src/connections.c:124
+msgid "DEFAULT"
+msgstr ""
+
+#. 5
+#: ../cli/src/connections.c:125
+msgid "DEFAULT6"
+msgstr ""
+
+#. 6
+#: ../cli/src/connections.c:126
+msgid "SPEC-OBJECT"
 msgstr ""
 
+#. 7
 #. 1
+#: ../cli/src/connections.c:127 ../cli/src/connections.c:141
+msgid "VPN"
+msgstr ""
+
+#. 9
+#: ../cli/src/connections.c:129
+msgid "CON-PATH"
+msgstr ""
+
+#. 10
+#: ../cli/src/connections.c:130
+msgid "ZONE"
+msgstr ""
+
+#. 11
+#: ../cli/src/connections.c:131
+msgid "MASTER-PATH"
+msgstr ""
+
+#: ../cli/src/connections.c:139 ../cli/src/devices.c:77
+msgid "GENERAL"
+msgstr ""
+
 #. 0
+#: ../cli/src/connections.c:140
+msgid "IP"
+msgstr ""
+
 #. 1
-#. 2
-#: ../cli/src/connections.c:72 ../cli/src/devices.c:69
-#: ../cli/src/devices.c:105 ../cli/src/devices.c:229
-msgid "TYPE"
+#: ../cli/src/connections.c:155
+msgid "USERNAME"
 msgstr ""
 
 #. 2
-#: ../cli/src/connections.c:73
-msgid "TIMESTAMP"
+#: ../cli/src/connections.c:156
+msgid "GATEWAY"
 msgstr ""
 
 #. 3
-#: ../cli/src/connections.c:74
-msgid "TIMESTAMP-REAL"
+#: ../cli/src/connections.c:157
+msgid "BANNER"
 msgstr ""
 
 #. 4
-#: ../cli/src/connections.c:75
-msgid "AUTOCONNECT"
+#: ../cli/src/connections.c:158
+msgid "VPN-STATE"
 msgstr ""
 
 #. 5
-#: ../cli/src/connections.c:76
-msgid "READONLY"
+#: ../cli/src/connections.c:159
+msgid "CFG"
 msgstr ""
 
-#: ../cli/src/connections.c:147
+#: ../cli/src/connections.c:180
 #, c-format
 msgid ""
 "Usage: nmcli con { COMMAND | help }\n"
 "  COMMAND := { list | status | up | down | delete }\n"
 "\n"
 "  list [id <id> | uuid <id>]\n"
-"  status\n"
+"  status [id <id> | uuid <id> | path <path>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [nsp <name>] [--"
 "nowait] [--timeout <timeout>]\n"
 "  up id <id> | uuid <id> [iface <iface>] [ap <BSSID>] [--nowait] [--timeout "
@@ -112,353 +209,376 @@
 "  delete id <id> | uuid <id>\n"
 msgstr ""
 
-#: ../cli/src/connections.c:201 ../cli/src/connections.c:534
+#: ../cli/src/connections.c:234 ../cli/src/connections.c:567
 #, c-format
 msgid "Error: 'con list': %s"
 msgstr ""
 
-#: ../cli/src/connections.c:203 ../cli/src/connections.c:536
+#: ../cli/src/connections.c:236 ../cli/src/connections.c:569
 #, c-format
 msgid "Error: 'con list': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/connections.c:211
+#: ../cli/src/connections.c:244
 msgid "Connection details"
 msgstr ""
 
-#: ../cli/src/connections.c:409
+#: ../cli/src/connections.c:442
 msgid "never"
 msgstr ""
 
 #. "CAPABILITIES"
 #. Print header
 #. "WIFI-PROPERTIES"
-#: ../cli/src/connections.c:410 ../cli/src/connections.c:411
-#: ../cli/src/connections.c:589 ../cli/src/connections.c:591
-#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:683
-#: ../cli/src/devices.c:709 ../cli/src/devices.c:710 ../cli/src/devices.c:711
-#: ../cli/src/devices.c:712 ../cli/src/devices.c:713 ../cli/src/settings.c:572
-#: ../cli/src/settings.c:642 ../cli/src/settings.c:761
-#: ../cli/src/settings.c:1043 ../cli/src/settings.c:1044
-#: ../cli/src/settings.c:1046 ../cli/src/settings.c:1048
-#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1177
-#: ../cli/src/settings.c:1178 ../cli/src/settings.c:1179
-#: ../cli/src/settings.c:1180 ../cli/src/settings.c:1255
-#: ../cli/src/settings.c:1256 ../cli/src/settings.c:1257
-#: ../cli/src/settings.c:1258 ../cli/src/settings.c:1259
+#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
+#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
+#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
+#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
+#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
+#: ../cli/src/settings.c:576 ../cli/src/settings.c:646
+#: ../cli/src/settings.c:766 ../cli/src/settings.c:1048
+#: ../cli/src/settings.c:1049 ../cli/src/settings.c:1051
+#: ../cli/src/settings.c:1053 ../cli/src/settings.c:1054
+#: ../cli/src/settings.c:1182 ../cli/src/settings.c:1183
+#: ../cli/src/settings.c:1184 ../cli/src/settings.c:1185
 #: ../cli/src/settings.c:1260 ../cli/src/settings.c:1261
 #: ../cli/src/settings.c:1262 ../cli/src/settings.c:1263
 #: ../cli/src/settings.c:1264 ../cli/src/settings.c:1265
 #: ../cli/src/settings.c:1266 ../cli/src/settings.c:1267
-#: ../cli/src/settings.c:1338
+#: ../cli/src/settings.c:1268 ../cli/src/settings.c:1269
+#: ../cli/src/settings.c:1270 ../cli/src/settings.c:1271
+#: ../cli/src/settings.c:1272 ../cli/src/settings.c:1343
 msgid "yes"
 msgstr ""
 
-#: ../cli/src/connections.c:410 ../cli/src/connections.c:411
-#: ../cli/src/connections.c:589 ../cli/src/connections.c:591
-#: ../cli/src/devices.c:503 ../cli/src/devices.c:556 ../cli/src/devices.c:683
-#: ../cli/src/devices.c:709 ../cli/src/devices.c:710 ../cli/src/devices.c:711
-#: ../cli/src/devices.c:712 ../cli/src/devices.c:713 ../cli/src/settings.c:572
-#: ../cli/src/settings.c:574 ../cli/src/settings.c:642
-#: ../cli/src/settings.c:761 ../cli/src/settings.c:1043
-#: ../cli/src/settings.c:1044 ../cli/src/settings.c:1046
+#: ../cli/src/connections.c:443 ../cli/src/connections.c:444
+#: ../cli/src/connections.c:681 ../cli/src/connections.c:682
+#: ../cli/src/connections.c:684 ../cli/src/devices.c:586
+#: ../cli/src/devices.c:639 ../cli/src/devices.c:750 ../cli/src/devices.c:751
+#: ../cli/src/devices.c:783 ../cli/src/devices.c:809 ../cli/src/devices.c:810
+#: ../cli/src/devices.c:811 ../cli/src/devices.c:812 ../cli/src/devices.c:813
+#: ../cli/src/settings.c:576 ../cli/src/settings.c:578
+#: ../cli/src/settings.c:646 ../cli/src/settings.c:766
 #: ../cli/src/settings.c:1048 ../cli/src/settings.c:1049
-#: ../cli/src/settings.c:1177 ../cli/src/settings.c:1178
-#: ../cli/src/settings.c:1179 ../cli/src/settings.c:1180
-#: ../cli/src/settings.c:1255 ../cli/src/settings.c:1256
-#: ../cli/src/settings.c:1257 ../cli/src/settings.c:1258
-#: ../cli/src/settings.c:1259 ../cli/src/settings.c:1260
+#: ../cli/src/settings.c:1051 ../cli/src/settings.c:1053
+#: ../cli/src/settings.c:1054 ../cli/src/settings.c:1182
+#: ../cli/src/settings.c:1183 ../cli/src/settings.c:1184
+#: ../cli/src/settings.c:1185 ../cli/src/settings.c:1260
 #: ../cli/src/settings.c:1261 ../cli/src/settings.c:1262
 #: ../cli/src/settings.c:1263 ../cli/src/settings.c:1264
 #: ../cli/src/settings.c:1265 ../cli/src/settings.c:1266
-#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1338
+#: ../cli/src/settings.c:1267 ../cli/src/settings.c:1268
+#: ../cli/src/settings.c:1269 ../cli/src/settings.c:1270
+#: ../cli/src/settings.c:1271 ../cli/src/settings.c:1272
+#: ../cli/src/settings.c:1343
 msgid "no"
 msgstr ""
 
-#: ../cli/src/connections.c:485
+#: ../cli/src/connections.c:518
 msgid "Connection list"
 msgstr ""
 
-#: ../cli/src/connections.c:498 ../cli/src/connections.c:1410
-#: ../cli/src/connections.c:1425 ../cli/src/connections.c:1434
-#: ../cli/src/connections.c:1444 ../cli/src/connections.c:1456
-#: ../cli/src/connections.c:1551 ../cli/src/connections.c:1634
-#: ../cli/src/devices.c:1186 ../cli/src/devices.c:1196
-#: ../cli/src/devices.c:1310 ../cli/src/devices.c:1318
-#: ../cli/src/devices.c:1531 ../cli/src/devices.c:1538
+#: ../cli/src/connections.c:531 ../cli/src/connections.c:1064
+#: ../cli/src/connections.c:1808 ../cli/src/connections.c:1823
+#: ../cli/src/connections.c:1832 ../cli/src/connections.c:1842
+#: ../cli/src/connections.c:1854 ../cli/src/connections.c:1949
+#: ../cli/src/connections.c:2051 ../cli/src/devices.c:1190
+#: ../cli/src/devices.c:1200 ../cli/src/devices.c:1314
+#: ../cli/src/devices.c:1322 ../cli/src/devices.c:1535
+#: ../cli/src/devices.c:1542
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr ""
 
-#: ../cli/src/connections.c:511
+#: ../cli/src/connections.c:544
 #, c-format
 msgid "Error: %s - no such connection."
 msgstr ""
 
-#: ../cli/src/connections.c:517 ../cli/src/connections.c:1469
-#: ../cli/src/connections.c:1568 ../cli/src/connections.c:1641
-#: ../cli/src/devices.c:983 ../cli/src/devices.c:1063
-#: ../cli/src/devices.c:1210 ../cli/src/devices.c:1324
-#: ../cli/src/devices.c:1544
+#: ../cli/src/connections.c:550 ../cli/src/connections.c:1867
+#: ../cli/src/connections.c:1966 ../cli/src/connections.c:2058
+#: ../cli/src/devices.c:987 ../cli/src/devices.c:1067
+#: ../cli/src/devices.c:1214 ../cli/src/devices.c:1328
+#: ../cli/src/devices.c:1548
 #, c-format
 msgid "Unknown parameter: %s\n"
 msgstr ""
 
-#: ../cli/src/connections.c:526
+#: ../cli/src/connections.c:559
 #, c-format
 msgid "Error: no valid parameter specified."
 msgstr ""
 
-#: ../cli/src/connections.c:541 ../cli/src/connections.c:1722
-#: ../cli/src/devices.c:1752 ../cli/src/network-manager.c:456
+#: ../cli/src/connections.c:574 ../cli/src/connections.c:2151
+#: ../cli/src/devices.c:1756 ../cli/src/network-manager.c:456
 #, c-format
 msgid "Error: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:630
-#, c-format
-msgid "Error: 'con status': %s"
+#: ../cli/src/connections.c:587
+msgid "activating"
 msgstr ""
 
-#: ../cli/src/connections.c:632
-#, c-format
-msgid "Error: 'con status': %s; allowed fields: %s"
+#: ../cli/src/connections.c:589
+msgid "activated"
 msgstr ""
 
-#: ../cli/src/connections.c:640 ../cli/src/connections.c:1484
-#: ../cli/src/connections.c:1583 ../cli/src/connections.c:1655
-#: ../cli/src/devices.c:1010 ../cli/src/devices.c:1072
-#: ../cli/src/devices.c:1225 ../cli/src/devices.c:1354
-#: ../cli/src/devices.c:1573
-#, c-format
-msgid "Error: Can't find out if NetworkManager is running: %s."
+#: ../cli/src/connections.c:591 ../cli/src/devices.c:261
+msgid "deactivating"
 msgstr ""
 
-#: ../cli/src/connections.c:644 ../cli/src/connections.c:1488
-#: ../cli/src/connections.c:1587 ../cli/src/connections.c:1659
-#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076
-#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358
-#: ../cli/src/devices.c:1577
-#, c-format
-msgid "Error: NetworkManager is not running."
+#: ../cli/src/connections.c:594 ../cli/src/connections.c:617
+#: ../cli/src/connections.c:1680 ../cli/src/devices.c:265
+#: ../cli/src/devices.c:784 ../cli/src/network-manager.c:111
+#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
+#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
+#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
+#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:531
+#: ../cli/src/utils.c:499 ../src/main.c:438 ../src/main.c:457
+msgid "unknown"
 msgstr ""
 
-#: ../cli/src/connections.c:652
-msgid "Active connections"
+#: ../cli/src/connections.c:603
+msgid "VPN connecting (prepare)"
 msgstr ""
 
-#: ../cli/src/connections.c:1127
-#, c-format
-msgid "no active connection on device '%s'"
+#: ../cli/src/connections.c:605
+msgid "VPN connecting (need authentication)"
 msgstr ""
 
-#: ../cli/src/connections.c:1135
-#, c-format
-msgid "no active connection or device"
+#: ../cli/src/connections.c:607
+msgid "VPN connecting"
 msgstr ""
 
-#: ../cli/src/connections.c:1206
-#, c-format
-msgid "device '%s' not compatible with connection '%s'"
+#: ../cli/src/connections.c:609
+msgid "VPN connecting (getting IP configuration)"
+msgstr ""
+
+#: ../cli/src/connections.c:611
+msgid "VPN connected"
+msgstr ""
+
+#: ../cli/src/connections.c:613
+msgid "VPN connection failed"
+msgstr ""
+
+#: ../cli/src/connections.c:615
+msgid "VPN disconnected"
 msgstr ""
 
-#: ../cli/src/connections.c:1208
+#: ../cli/src/connections.c:868 ../cli/src/connections.c:1092
 #, c-format
-msgid "no device found for connection '%s'"
+msgid "Error: 'con status': %s"
 msgstr ""
 
-#: ../cli/src/connections.c:1219
-msgid "activating"
+#: ../cli/src/connections.c:870 ../cli/src/connections.c:1094
+#, c-format
+msgid "Error: 'con status': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/connections.c:1221
-msgid "activated"
+#: ../cli/src/connections.c:878
+msgid "Active connection details"
 msgstr ""
 
-#: ../cli/src/connections.c:1223 ../cli/src/devices.c:296
-msgid "deactivating"
+#: ../cli/src/connections.c:1014 ../cli/src/connections.c:1882
+#: ../cli/src/connections.c:1981 ../cli/src/connections.c:2072
+#: ../cli/src/devices.c:1014 ../cli/src/devices.c:1076
+#: ../cli/src/devices.c:1229 ../cli/src/devices.c:1358
+#: ../cli/src/devices.c:1577
+#, c-format
+msgid "Error: Can't find out if NetworkManager is running: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:1226 ../cli/src/connections.c:1249
-#: ../cli/src/connections.c:1282 ../cli/src/devices.c:300
-#: ../cli/src/devices.c:684 ../cli/src/network-manager.c:111
-#: ../cli/src/network-manager.c:173 ../cli/src/network-manager.c:176
-#: ../cli/src/network-manager.c:185 ../cli/src/network-manager.c:291
-#: ../cli/src/network-manager.c:346 ../cli/src/network-manager.c:384
-#: ../cli/src/network-manager.c:423 ../cli/src/settings.c:527
-#: ../cli/src/utils.c:397
-msgid "unknown"
+#: ../cli/src/connections.c:1018 ../cli/src/connections.c:1886
+#: ../cli/src/connections.c:1985 ../cli/src/connections.c:2076
+#: ../cli/src/devices.c:1018 ../cli/src/devices.c:1080
+#: ../cli/src/devices.c:1233 ../cli/src/devices.c:1362
+#: ../cli/src/devices.c:1581
+#, c-format
+msgid "Error: NetworkManager is not running."
 msgstr ""
 
-#: ../cli/src/connections.c:1235
-msgid "VPN connecting (prepare)"
+#: ../cli/src/connections.c:1050
+msgid "Active connections"
 msgstr ""
 
-#: ../cli/src/connections.c:1237
-msgid "VPN connecting (need authentication)"
+#: ../cli/src/connections.c:1075
+#, c-format
+msgid "Error: '%s' is not an active connection."
 msgstr ""
 
-#: ../cli/src/connections.c:1239
-msgid "VPN connecting"
+#: ../cli/src/connections.c:1080
+#, c-format
+msgid "Error: unknown parameter: %s"
 msgstr ""
 
-#: ../cli/src/connections.c:1241
-msgid "VPN connecting (getting IP configuration)"
+#: ../cli/src/connections.c:1564
+#, c-format
+msgid "no active connection on device '%s'"
 msgstr ""
 
-#: ../cli/src/connections.c:1243
-msgid "VPN connected"
+#: ../cli/src/connections.c:1572
+#, c-format
+msgid "no active connection or device"
 msgstr ""
 
-#: ../cli/src/connections.c:1245
-msgid "VPN connection failed"
+#: ../cli/src/connections.c:1643
+#, c-format
+msgid "device '%s' not compatible with connection '%s'"
 msgstr ""
 
-#: ../cli/src/connections.c:1247
-msgid "VPN disconnected"
+#: ../cli/src/connections.c:1645
+#, c-format
+msgid "no device found for connection '%s'"
 msgstr ""
 
-#: ../cli/src/connections.c:1258
+#: ../cli/src/connections.c:1656
 msgid "unknown reason"
 msgstr ""
 
-#: ../cli/src/connections.c:1260
+#: ../cli/src/connections.c:1658
 msgid "none"
 msgstr "nič"
 
-#: ../cli/src/connections.c:1262
+#: ../cli/src/connections.c:1660
 msgid "the user was disconnected"
 msgstr ""
 
-#: ../cli/src/connections.c:1264
+#: ../cli/src/connections.c:1662
 msgid "the base network connection was interrupted"
 msgstr ""
 
-#: ../cli/src/connections.c:1266
+#: ../cli/src/connections.c:1664
 msgid "the VPN service stopped unexpectedly"
 msgstr ""
 
-#: ../cli/src/connections.c:1268
+#: ../cli/src/connections.c:1666
 msgid "the VPN service returned invalid configuration"
 msgstr ""
 
-#: ../cli/src/connections.c:1270
+#: ../cli/src/connections.c:1668
 msgid "the connection attempt timed out"
 msgstr ""
 
-#: ../cli/src/connections.c:1272
+#: ../cli/src/connections.c:1670
 msgid "the VPN service did not start in time"
 msgstr ""
 
-#: ../cli/src/connections.c:1274
+#: ../cli/src/connections.c:1672
 msgid "the VPN service failed to start"
 msgstr ""
 
-#: ../cli/src/connections.c:1276
+#: ../cli/src/connections.c:1674
 msgid "no valid VPN secrets"
 msgstr ""
 
-#: ../cli/src/connections.c:1278
+#: ../cli/src/connections.c:1676
 msgid "invalid VPN secrets"
 msgstr ""
 
-#: ../cli/src/connections.c:1280
+#: ../cli/src/connections.c:1678
 msgid "the connection was removed"
 msgstr ""
 
-#: ../cli/src/connections.c:1294
+#: ../cli/src/connections.c:1692
 #, c-format
 msgid "state: %s\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1297 ../cli/src/connections.c:1323
+#: ../cli/src/connections.c:1695 ../cli/src/connections.c:1721
 #, c-format
 msgid "Connection activated\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1300
+#: ../cli/src/connections.c:1698
 #, c-format
 msgid "Error: Connection activation failed."
 msgstr ""
 
-#: ../cli/src/connections.c:1319
+#: ../cli/src/connections.c:1717
 #, c-format
 msgid "state: %s (%d)\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1329
+#: ../cli/src/connections.c:1727
 #, c-format
 msgid "Error: Connection activation failed: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:1346 ../cli/src/devices.c:1132
+#: ../cli/src/connections.c:1744 ../cli/src/devices.c:1136
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr ""
 
-#: ../cli/src/connections.c:1359
+#: ../cli/src/connections.c:1757
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr ""
 
-#: ../cli/src/connections.c:1365
+#: ../cli/src/connections.c:1763
 #, c-format
 msgid "Active connection state: %s\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1366
+#: ../cli/src/connections.c:1764
 #, c-format
 msgid "Active connection path: %s\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1418 ../cli/src/connections.c:1559
-#: ../cli/src/connections.c:1668
+#: ../cli/src/connections.c:1816 ../cli/src/connections.c:1957
+#: ../cli/src/connections.c:2085
 #, c-format
 msgid "Error: Unknown connection: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:1464 ../cli/src/devices.c:1204
+#: ../cli/src/connections.c:1862 ../cli/src/devices.c:1208
 #, c-format
 msgid "Error: timeout value '%s' is not valid."
 msgstr ""
 
-#: ../cli/src/connections.c:1477 ../cli/src/connections.c:1576
-#: ../cli/src/connections.c:1648
+#: ../cli/src/connections.c:1875 ../cli/src/connections.c:1974
+#: ../cli/src/connections.c:2065
 #, c-format
 msgid "Error: id or uuid has to be specified."
 msgstr ""
 
-#: ../cli/src/connections.c:1505
+#: ../cli/src/connections.c:1903
 #, c-format
 msgid "Error: No suitable device found: %s."
 msgstr ""
 
-#: ../cli/src/connections.c:1507
+#: ../cli/src/connections.c:1905
 #, c-format
 msgid "Error: No suitable device found."
 msgstr ""
 
-#: ../cli/src/connections.c:1612
+#: ../cli/src/connections.c:2010
 #, c-format
 msgid "Warning: Connection not active\n"
 msgstr ""
 
-#: ../cli/src/connections.c:1713
+#: ../cli/src/connections.c:2024
+#, c-format
+msgid "Error: Connection deletion failed: %s"
+msgstr ""
+
+#: ../cli/src/connections.c:2142
 #, c-format
 msgid "Error: 'con' command '%s' is not valid."
 msgstr ""
 
-#: ../cli/src/connections.c:1778
+#: ../cli/src/connections.c:2207
 #, c-format
 msgid "Error: could not connect to D-Bus."
 msgstr ""
 
-#: ../cli/src/connections.c:1786
+#: ../cli/src/connections.c:2215
 #, c-format
 msgid "Error: Could not get system settings."
 msgstr ""
 
-#: ../cli/src/connections.c:1796
+#: ../cli/src/connections.c:2225
 #, c-format
 msgid "Error: Can't obtain connections: settings service is not running."
 msgstr ""
@@ -466,222 +586,230 @@
 #. 0
 #. 9
 #. 3
-#: ../cli/src/devices.c:68 ../cli/src/devices.c:104 ../cli/src/devices.c:214
-#: ../cli/src/devices.c:230
+#: ../cli/src/devices.c:65 ../cli/src/devices.c:101 ../cli/src/devices.c:179
+#: ../cli/src/devices.c:195
 msgid "DEVICE"
 msgstr ""
 
-#. 1
-#. 4
-#. 1
-#: ../cli/src/devices.c:70 ../cli/src/devices.c:108
-#: ../cli/src/network-manager.c:39
-msgid "STATE"
-msgstr ""
-
-#: ../cli/src/devices.c:80
-msgid "GENERAL"
-msgstr ""
-
 #. 0
-#: ../cli/src/devices.c:81
+#: ../cli/src/devices.c:78
 msgid "CAPABILITIES"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:82
+#: ../cli/src/devices.c:79
 msgid "WIFI-PROPERTIES"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:83
+#: ../cli/src/devices.c:80
 msgid "AP"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:84
+#: ../cli/src/devices.c:81
 msgid "WIRED-PROPERTIES"
 msgstr ""
 
 #. 4
-#: ../cli/src/devices.c:85
+#: ../cli/src/devices.c:82
 msgid "WIMAX-PROPERTIES"
 msgstr ""
 
 #. 5
 #. 0
-#: ../cli/src/devices.c:86 ../cli/src/devices.c:227
+#: ../cli/src/devices.c:83 ../cli/src/devices.c:192
 msgid "NSP"
 msgstr ""
 
 #. 6
-#: ../cli/src/devices.c:87
-msgid "IP4-SETTINGS"
+#: ../cli/src/devices.c:84
+msgid "IP4"
 msgstr ""
 
 #. 7
-#: ../cli/src/devices.c:88
-msgid "IP4-DNS"
+#: ../cli/src/devices.c:85
+msgid "DHCP4"
 msgstr ""
 
 #. 8
-#: ../cli/src/devices.c:89
-msgid "IP6-SETTINGS"
+#: ../cli/src/devices.c:86
+msgid "IP6"
 msgstr ""
 
 #. 9
-#: ../cli/src/devices.c:90
-msgid "IP6-DNS"
+#: ../cli/src/devices.c:87
+msgid "DHCP6"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:106
-msgid "DRIVER"
+#: ../cli/src/devices.c:103
+msgid "VENDOR"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:107
+#: ../cli/src/devices.c:104
+msgid "PRODUCT"
+msgstr ""
+
+#. 4
+#: ../cli/src/devices.c:105
+msgid "DRIVER"
+msgstr ""
+
+#. 5
+#: ../cli/src/devices.c:106
 msgid "HWADDR"
 msgstr ""
 
+#. 7
+#: ../cli/src/devices.c:108
+msgid "REASON"
+msgstr ""
+
+#. 8
+#: ../cli/src/devices.c:109
+msgid "UDI"
+msgstr ""
+
+#. 9
+#: ../cli/src/devices.c:110
+msgid "IP-IFACE"
+msgstr ""
+
+#. 10
+#: ../cli/src/devices.c:111
+msgid "NM-MANAGED"
+msgstr ""
+
+#. 11
+#: ../cli/src/devices.c:112
+msgid "FIRMWARE-MISSING"
+msgstr ""
+
+#. 12
+#: ../cli/src/devices.c:113
+msgid "CONNECTION"
+msgstr ""
+
 #. 0
-#: ../cli/src/devices.c:117
+#: ../cli/src/devices.c:122
 msgid "CARRIER-DETECT"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:118
+#: ../cli/src/devices.c:123
 msgid "SPEED"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:127
+#: ../cli/src/devices.c:132
 msgid "CARRIER"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:137
+#: ../cli/src/devices.c:142
 msgid "WEP"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:138
+#: ../cli/src/devices.c:143
 msgid "WPA"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:139
+#: ../cli/src/devices.c:144
 msgid "WPA2"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:140
+#: ../cli/src/devices.c:145
 msgid "TKIP"
 msgstr "TKIP"
 
 #. 4
-#: ../cli/src/devices.c:141
+#: ../cli/src/devices.c:146
 msgid "CCMP"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:151
+#: ../cli/src/devices.c:156
 msgid "CTR-FREQ"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:152
+#: ../cli/src/devices.c:157
 msgid "RSSI"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:153
+#: ../cli/src/devices.c:158
 msgid "CINR"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:154
+#: ../cli/src/devices.c:159
 msgid "TX-POW"
 msgstr ""
 
 #. 4
-#: ../cli/src/devices.c:155
+#: ../cli/src/devices.c:160
 msgid "BSID"
 msgstr ""
 
 #. 0
-#: ../cli/src/devices.c:165 ../cli/src/devices.c:176
-msgid "ADDRESS"
-msgstr ""
-
-#. 1
-#: ../cli/src/devices.c:166 ../cli/src/devices.c:177
-msgid "PREFIX"
-msgstr ""
-
-#. 2
-#: ../cli/src/devices.c:167 ../cli/src/devices.c:178
-msgid "GATEWAY"
-msgstr ""
-
-#. 0
-#: ../cli/src/devices.c:187 ../cli/src/devices.c:196
-msgid "DNS"
-msgstr ""
-
-#. 0
-#: ../cli/src/devices.c:205
+#: ../cli/src/devices.c:170
 msgid "SSID"
 msgstr ""
 
 #. 1
-#: ../cli/src/devices.c:206
+#: ../cli/src/devices.c:171
 msgid "BSSID"
 msgstr ""
 
 #. 2
-#: ../cli/src/devices.c:207
+#: ../cli/src/devices.c:172
 msgid "MODE"
 msgstr ""
 
 #. 3
-#: ../cli/src/devices.c:208
+#: ../cli/src/devices.c:173
 msgid "FREQ"
 msgstr ""
 
 #. 4
-#: ../cli/src/devices.c:209
+#: ../cli/src/devices.c:174
 msgid "RATE"
 msgstr ""
 
 #. 5
 #. 1
-#: ../cli/src/devices.c:210 ../cli/src/devices.c:228
+#: ../cli/src/devices.c:175 ../cli/src/devices.c:193
 msgid "SIGNAL"
 msgstr ""
 
 #. 6
-#: ../cli/src/devices.c:211
+#: ../cli/src/devices.c:176
 msgid "SECURITY"
 msgstr ""
 
 #. 7
-#: ../cli/src/devices.c:212
+#: ../cli/src/devices.c:177
 msgid "WPA-FLAGS"
 msgstr ""
 
 #. 8
-#: ../cli/src/devices.c:213
+#: ../cli/src/devices.c:178
 msgid "RSN-FLAGS"
 msgstr ""
 
 #. 10
 #. 4
-#: ../cli/src/devices.c:215 ../cli/src/devices.c:231
+#: ../cli/src/devices.c:180 ../cli/src/devices.c:196
 msgid "ACTIVE"
 msgstr ""
 
-#: ../cli/src/devices.c:248
+#: ../cli/src/devices.c:213
 #, c-format
 msgid ""
 "Usage: nmcli dev { COMMAND | help }\n"
@@ -698,257 +826,457 @@
 "\n"
 msgstr ""
 
-#: ../cli/src/devices.c:276
+#: ../cli/src/devices.c:241
 msgid "unmanaged"
 msgstr ""
 
-#: ../cli/src/devices.c:278
+#: ../cli/src/devices.c:243
 msgid "unavailable"
 msgstr ""
 
-#: ../cli/src/devices.c:280 ../cli/src/network-manager.c:108
+#: ../cli/src/devices.c:245 ../cli/src/network-manager.c:108
 msgid "disconnected"
 msgstr ""
 
-#: ../cli/src/devices.c:282
+#: ../cli/src/devices.c:247
 msgid "connecting (prepare)"
 msgstr ""
 
-#: ../cli/src/devices.c:284
+#: ../cli/src/devices.c:249
 msgid "connecting (configuring)"
 msgstr ""
 
-#: ../cli/src/devices.c:286
+#: ../cli/src/devices.c:251
 msgid "connecting (need authentication)"
 msgstr ""
 
-#: ../cli/src/devices.c:288
+#: ../cli/src/devices.c:253
 msgid "connecting (getting IP configuration)"
 msgstr ""
 
-#: ../cli/src/devices.c:290
+#: ../cli/src/devices.c:255
 msgid "connecting (checking IP connectivity)"
 msgstr ""
 
-#: ../cli/src/devices.c:292
+#: ../cli/src/devices.c:257
 msgid "connecting (starting secondary connections)"
 msgstr ""
 
-#: ../cli/src/devices.c:294 ../cli/src/network-manager.c:104
+#: ../cli/src/devices.c:259 ../cli/src/network-manager.c:104
 msgid "connected"
 msgstr ""
 
-#: ../cli/src/devices.c:298
+#: ../cli/src/devices.c:263
 msgid "connection failed"
 msgstr ""
 
-#: ../cli/src/devices.c:323 ../cli/src/devices.c:335 ../cli/src/devices.c:495
-#: ../cli/src/devices.c:539
+#: ../cli/src/devices.c:274
+msgid "No reason given"
+msgstr ""
+
+#: ../cli/src/devices.c:277
+msgid "Unknown error"
+msgstr ""
+
+#: ../cli/src/devices.c:280
+msgid "Device is now managed"
+msgstr ""
+
+#: ../cli/src/devices.c:283
+msgid "Device is now unmanaged"
+msgstr ""
+
+#: ../cli/src/devices.c:286
+msgid "The device could not be readied for configuration"
+msgstr ""
+
+#: ../cli/src/devices.c:289
+msgid ""
+"IP configuration could not be reserved (no available address, timeout, etc)"
+msgstr ""
+
+#: ../cli/src/devices.c:292
+msgid "The IP configuration is no longer valid"
+msgstr ""
+
+#: ../cli/src/devices.c:295
+msgid "Secrets were required, but not provided"
+msgstr ""
+
+#: ../cli/src/devices.c:298
+msgid "802.1X supplicant disconnected"
+msgstr ""
+
+#: ../cli/src/devices.c:301
+msgid "802.1X supplicant configuration failed"
+msgstr ""
+
+#: ../cli/src/devices.c:304
+msgid "802.1X supplicant failed"
+msgstr ""
+
+#: ../cli/src/devices.c:307
+msgid "802.1X supplicant took too long to authenticate"
+msgstr ""
+
+#: ../cli/src/devices.c:310
+msgid "PPP service failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:313
+msgid "PPP service disconnected"
+msgstr ""
+
+#: ../cli/src/devices.c:316
+msgid "PPP failed"
+msgstr ""
+
+#: ../cli/src/devices.c:319
+msgid "DHCP client failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:322
+msgid "DHCP client error"
+msgstr ""
+
+#: ../cli/src/devices.c:325
+msgid "DHCP client failed"
+msgstr ""
+
+#: ../cli/src/devices.c:328
+msgid "Shared connection service failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:331
+msgid "Shared connection service failed"
+msgstr ""
+
+#: ../cli/src/devices.c:334
+msgid "AutoIP service failed to start"
+msgstr ""
+
+#: ../cli/src/devices.c:337
+msgid "AutoIP service error"
+msgstr ""
+
+#: ../cli/src/devices.c:340
+msgid "AutoIP service failed"
+msgstr ""
+
+#: ../cli/src/devices.c:343
+msgid "The line is busy"
+msgstr ""
+
+#: ../cli/src/devices.c:346
+msgid "No dial tone"
+msgstr ""
+
+#: ../cli/src/devices.c:349
+msgid "No carrier could be established"
+msgstr ""
+
+#: ../cli/src/devices.c:352
+msgid "The dialing request timed out"
+msgstr ""
+
+#: ../cli/src/devices.c:355
+msgid "The dialing attempt failed"
+msgstr ""
+
+#: ../cli/src/devices.c:358
+msgid "Modem initialization failed"
+msgstr ""
+
+#: ../cli/src/devices.c:361
+msgid "Failed to select the specified APN"
+msgstr ""
+
+#: ../cli/src/devices.c:364
+msgid "Not searching for networks"
+msgstr ""
+
+#: ../cli/src/devices.c:367
+msgid "Network registration denied"
+msgstr ""
+
+#: ../cli/src/devices.c:370
+msgid "Network registration timed out"
+msgstr ""
+
+#: ../cli/src/devices.c:373
+msgid "Failed to register with the requested network"
+msgstr ""
+
+#: ../cli/src/devices.c:376
+msgid "PIN check failed"
+msgstr ""
+
+#: ../cli/src/devices.c:379
+msgid "Necessary firmware for the device may be missing"
+msgstr ""
+
+#: ../cli/src/devices.c:382
+msgid "The device was removed"
+msgstr ""
+
+#: ../cli/src/devices.c:385
+msgid "NetworkManager went to sleep"
+msgstr ""
+
+#: ../cli/src/devices.c:388
+msgid "The device's active connection disappeared"
+msgstr ""
+
+#: ../cli/src/devices.c:391
+msgid "Device disconnected by user or client"
+msgstr ""
+
+#: ../cli/src/devices.c:394
+msgid "Carrier/link changed"
+msgstr ""
+
+#: ../cli/src/devices.c:397
+msgid "The device's existing connection was assumed"
+msgstr ""
+
+#: ../cli/src/devices.c:400
+msgid "The supplicant is now available"
+msgstr ""
+
+#: ../cli/src/devices.c:403
+msgid "The modem could not be found"
+msgstr ""
+
+#: ../cli/src/devices.c:406
+msgid "The Bluetooth connection failed or timed out"
+msgstr ""
+
+#: ../cli/src/devices.c:409
+msgid "GSM Modem's SIM card not inserted"
+msgstr ""
+
+#: ../cli/src/devices.c:412
+msgid "GSM Modem's SIM PIN required"
+msgstr ""
+
+#: ../cli/src/devices.c:415
+msgid "GSM Modem's SIM PUK required"
+msgstr ""
+
+#: ../cli/src/devices.c:418
+msgid "GSM Modem's SIM wrong"
+msgstr ""
+
+#: ../cli/src/devices.c:421
+msgid "Infiniband device does not support connected mode"
+msgstr ""
+
+#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
+#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: ../cli/src/devices.c:368
+#: ../cli/src/devices.c:491
 msgid "(none)"
 msgstr ""
 
-#: ../cli/src/devices.c:393
-#, c-format
-msgid "%s: error converting IP4 address 0x%X"
-msgstr ""
-
-#: ../cli/src/devices.c:464
+#: ../cli/src/devices.c:547
 #, c-format
 msgid "%u MHz"
 msgstr ""
 
-#: ../cli/src/devices.c:465
+#: ../cli/src/devices.c:548
 #, c-format
 msgid "%u MB/s"
 msgstr ""
 
-#: ../cli/src/devices.c:474
+#: ../cli/src/devices.c:557
 msgid "Encrypted: "
 msgstr ""
 
-#: ../cli/src/devices.c:479
+#: ../cli/src/devices.c:562
 msgid "WEP "
 msgstr ""
 
-#: ../cli/src/devices.c:481
+#: ../cli/src/devices.c:564
 msgid "WPA "
 msgstr ""
 
-#: ../cli/src/devices.c:483
+#: ../cli/src/devices.c:566
 msgid "WPA2 "
 msgstr ""
 
-#: ../cli/src/devices.c:486
+#: ../cli/src/devices.c:569
 msgid "Enterprise "
 msgstr ""
 
-#: ../cli/src/devices.c:495
+#: ../cli/src/devices.c:578
 msgid "Ad-Hoc"
 msgstr ""
 
-#: ../cli/src/devices.c:495
+#: ../cli/src/devices.c:578
 msgid "Infrastructure"
 msgstr ""
 
-#: ../cli/src/devices.c:530
+#: ../cli/src/devices.c:613
 msgid "Home"
 msgstr ""
 
-#: ../cli/src/devices.c:533
+#: ../cli/src/devices.c:616
 msgid "Partner"
 msgstr ""
 
-#: ../cli/src/devices.c:536
+#: ../cli/src/devices.c:619
 msgid "Roaming"
 msgstr ""
 
-#: ../cli/src/devices.c:606
+#: ../cli/src/devices.c:691
 #, c-format
 msgid "Error: 'dev list': %s"
 msgstr ""
 
-#: ../cli/src/devices.c:608
+#: ../cli/src/devices.c:693
 #, c-format
 msgid "Error: 'dev list': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:617
+#: ../cli/src/devices.c:702
 msgid "Device details"
 msgstr ""
 
-#: ../cli/src/devices.c:653 ../cli/src/devices.c:654 ../cli/src/devices.c:1148
-#: ../cli/src/utils.c:343
+#: ../cli/src/devices.c:744 ../cli/src/devices.c:745 ../cli/src/devices.c:1152
+#: ../cli/src/utils.c:445
 msgid "(unknown)"
 msgstr "(neznáme)"
 
-#: ../cli/src/devices.c:680
+#: ../cli/src/devices.c:753
+msgid "not connected"
+msgstr ""
+
+#: ../cli/src/devices.c:780
 #, c-format
 msgid "%u Mb/s"
 msgstr ""
 
 #. Print header
 #. "WIRED-PROPERTIES"
-#: ../cli/src/devices.c:753
+#: ../cli/src/devices.c:853
 msgid "on"
 msgstr ""
 
-#: ../cli/src/devices.c:753
+#: ../cli/src/devices.c:853
 msgid "off"
 msgstr ""
 
-#: ../cli/src/devices.c:1000
+#: ../cli/src/devices.c:1004
 #, c-format
 msgid "Error: 'dev status': %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1002
+#: ../cli/src/devices.c:1006
 #, c-format
 msgid "Error: 'dev status': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1025
+#: ../cli/src/devices.c:1029
 msgid "Status of devices"
 msgstr ""
 
-#: ../cli/src/devices.c:1056
+#: ../cli/src/devices.c:1060
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr ""
 
-#: ../cli/src/devices.c:1097 ../cli/src/devices.c:1249
-#: ../cli/src/devices.c:1386 ../cli/src/devices.c:1605
+#: ../cli/src/devices.c:1101 ../cli/src/devices.c:1253
+#: ../cli/src/devices.c:1390 ../cli/src/devices.c:1609
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr ""
 
-#: ../cli/src/devices.c:1120
+#: ../cli/src/devices.c:1124
 #, c-format
 msgid "Success: Device '%s' successfully disconnected."
 msgstr ""
 
-#: ../cli/src/devices.c:1145
+#: ../cli/src/devices.c:1149
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1153
+#: ../cli/src/devices.c:1157
 #, c-format
 msgid "Device state: %d (%s)\n"
 msgstr ""
 
-#: ../cli/src/devices.c:1218
+#: ../cli/src/devices.c:1222
 #, c-format
 msgid "Error: iface has to be specified."
 msgstr ""
 
-#: ../cli/src/devices.c:1344
+#: ../cli/src/devices.c:1348
 #, c-format
 msgid "Error: 'dev wifi': %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1346
+#: ../cli/src/devices.c:1350
 #, c-format
 msgid "Error: 'dev wifi': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1369
+#: ../cli/src/devices.c:1373
 msgid "WiFi scan list"
 msgstr ""
 
-#: ../cli/src/devices.c:1406 ../cli/src/devices.c:1460
+#: ../cli/src/devices.c:1410 ../cli/src/devices.c:1464
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr ""
 
-#: ../cli/src/devices.c:1423
+#: ../cli/src/devices.c:1427
 #, c-format
 msgid "Error: Device '%s' is not a WiFi device."
 msgstr ""
 
-#: ../cli/src/devices.c:1487
+#: ../cli/src/devices.c:1491
 #, c-format
 msgid "Error: 'dev wifi' command '%s' is not valid."
 msgstr ""
 
-#: ../cli/src/devices.c:1563
+#: ../cli/src/devices.c:1567
 #, c-format
 msgid "Error: 'dev wimax': %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1565
+#: ../cli/src/devices.c:1569
 #, c-format
 msgid "Error: 'dev wimax': %s; allowed fields: %s"
 msgstr ""
 
-#: ../cli/src/devices.c:1588
+#: ../cli/src/devices.c:1592
 msgid "WiMAX NSP list"
 msgstr ""
 
-#: ../cli/src/devices.c:1625
+#: ../cli/src/devices.c:1629
 #, c-format
 msgid "Error: NSP with name '%s' not found."
 msgstr ""
 
-#: ../cli/src/devices.c:1636
+#: ../cli/src/devices.c:1640
 #, c-format
 msgid "Error: Device '%s' is not a WiMAX device."
 msgstr ""
 
-#: ../cli/src/devices.c:1667
+#: ../cli/src/devices.c:1671
 #, c-format
 msgid "Error: Access point with nsp '%s' not found."
 msgstr ""
 
-#: ../cli/src/devices.c:1694
+#: ../cli/src/devices.c:1698
 #, c-format
 msgid "Error: 'dev wimax' command '%s' is not valid."
 msgstr ""
 
-#: ../cli/src/devices.c:1744
+#: ../cli/src/devices.c:1748
 #, c-format
 msgid "Error: 'dev' command '%s' is not valid."
 msgstr ""
@@ -1077,7 +1405,7 @@
 msgid "not running"
 msgstr ""
 
-#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:323
+#: ../cli/src/network-manager.c:215 ../cli/src/utils.c:425
 #, c-format
 msgid "Error: Couldn't connect to system bus: %s"
 msgstr ""
@@ -1236,130 +1564,140 @@
 msgid "Success"
 msgstr ""
 
-#: ../cli/src/settings.c:461
+#: ../cli/src/settings.c:465
 #, c-format
 msgid "%d (hex-ascii-key)"
 msgstr ""
 
-#: ../cli/src/settings.c:463
+#: ../cli/src/settings.c:467
 #, c-format
 msgid "%d (104/128-bit passphrase)"
 msgstr ""
 
-#: ../cli/src/settings.c:466
+#: ../cli/src/settings.c:470
 #, c-format
 msgid "%d (unknown)"
 msgstr ""
 
-#: ../cli/src/settings.c:492
+#: ../cli/src/settings.c:496
 msgid "0 (unknown)"
 msgstr ""
 
-#: ../cli/src/settings.c:498
+#: ../cli/src/settings.c:502
 msgid "any, "
 msgstr ""
 
-#: ../cli/src/settings.c:500
+#: ../cli/src/settings.c:504
 msgid "900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:502
+#: ../cli/src/settings.c:506
 msgid "1800 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:504
+#: ../cli/src/settings.c:508
 msgid "1900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:506
+#: ../cli/src/settings.c:510
 msgid "850 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:508
+#: ../cli/src/settings.c:512
 msgid "WCDMA 3GPP UMTS 2100 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:510
+#: ../cli/src/settings.c:514
 msgid "WCDMA 3GPP UMTS 1800 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:512
+#: ../cli/src/settings.c:516
 msgid "WCDMA 3GPP UMTS 1700/2100 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:514
+#: ../cli/src/settings.c:518
 msgid "WCDMA 3GPP UMTS 800 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:516
+#: ../cli/src/settings.c:520
 msgid "WCDMA 3GPP UMTS 850 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:518
+#: ../cli/src/settings.c:522
 msgid "WCDMA 3GPP UMTS 900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:520
+#: ../cli/src/settings.c:524
 msgid "WCDMA 3GPP UMTS 1700 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:522
+#: ../cli/src/settings.c:526
 msgid "WCDMA 3GPP UMTS 1900 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:524
+#: ../cli/src/settings.c:528
 msgid "WCDMA 3GPP UMTS 2600 MHz, "
 msgstr ""
 
-#: ../cli/src/settings.c:646 ../cli/src/settings.c:841
-#: ../cli/src/settings.c:1545
+#: ../cli/src/settings.c:650 ../cli/src/settings.c:846
+#: ../cli/src/settings.c:1550
 msgid "auto"
 msgstr ""
 
-#: ../cli/src/settings.c:835 ../cli/src/settings.c:838
-#: ../cli/src/settings.c:839 ../cli/src/utils.c:176
+#: ../cli/src/settings.c:840 ../cli/src/settings.c:843
+#: ../cli/src/settings.c:844 ../cli/src/utils.c:247
 msgid "not set"
 msgstr ""
 
-#: ../cli/src/utils.c:128
+#: ../cli/src/utils.c:103
 #, c-format
-msgid "field '%s' has to be alone"
+msgid "Error converting IP4 address '0x%X' to text form"
 msgstr ""
 
 #: ../cli/src/utils.c:131
 #, c-format
+msgid "Error converting IP6 address '%s' to text form"
+msgstr ""
+
+#: ../cli/src/utils.c:200
+#, c-format
+msgid "field '%s' has to be alone"
+msgstr ""
+
+#: ../cli/src/utils.c:203
+#, c-format
 msgid "invalid field '%s'"
 msgstr ""
 
-#: ../cli/src/utils.c:150
+#: ../cli/src/utils.c:222
 #, c-format
 msgid "Option '--terse' requires specifying '--fields'"
 msgstr ""
 
-#: ../cli/src/utils.c:154
+#: ../cli/src/utils.c:226
 #, c-format
 msgid ""
 "Option '--terse' requires specific '--fields' option values , not '%s'"
 msgstr ""
 
-#: ../cli/src/utils.c:334
+#: ../cli/src/utils.c:436
 #, c-format
 msgid "Error: Couldn't create D-Bus object proxy for org.freedesktop.DBus"
 msgstr ""
 
-#: ../cli/src/utils.c:342
+#: ../cli/src/utils.c:444
 #, c-format
 msgid "Error: NameHasOwner request failed: %s"
 msgstr ""
 
-#: ../cli/src/utils.c:387
+#: ../cli/src/utils.c:489
 #, c-format
 msgid ""
 "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --"
 "nocheck to suppress the warning.\n"
 msgstr ""
 
-#: ../cli/src/utils.c:396
+#: ../cli/src/utils.c:498
 #, c-format
 msgid ""
 "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force "
@@ -1708,26 +2046,26 @@
 msgid "Could not generate random data."
 msgstr ""
 
-#: ../libnm-util/nm-utils.c:2003
+#: ../libnm-util/nm-utils.c:2034
 #, c-format
 msgid "Not enough memory to make encryption key."
 msgstr ""
 
-#: ../libnm-util/nm-utils.c:2113
+#: ../libnm-util/nm-utils.c:2144
 msgid "Could not allocate memory for PEM file creation."
 msgstr ""
 
-#: ../libnm-util/nm-utils.c:2125
+#: ../libnm-util/nm-utils.c:2156
 #, c-format
 msgid "Could not allocate memory for writing IV to PEM file."
 msgstr ""
 
-#: ../libnm-util/nm-utils.c:2137
+#: ../libnm-util/nm-utils.c:2168
 #, c-format
 msgid "Could not allocate memory for writing encrypted key to PEM file."
 msgstr ""
 
-#: ../libnm-util/nm-utils.c:2156
+#: ../libnm-util/nm-utils.c:2187
 #, c-format
 msgid "Could not allocate memory for PEM file data."
 msgstr ""
@@ -1833,16 +2171,136 @@
 msgid "System policy prevents use of user-specific connections"
 msgstr ""
 
+#: ../src/main.c:143
+#, c-format
+msgid "Failed to initialize SIGTERM pipe: %d"
+msgstr ""
+
+#: ../src/main.c:169
+#, c-format
+msgid "Opening %s failed: %s\n"
+msgstr ""
+
+#: ../src/main.c:175
+#, c-format
+msgid "Writing to %s failed: %s\n"
+msgstr ""
+
+#: ../src/main.c:180
+#, c-format
+msgid "Closing %s failed: %s\n"
+msgstr ""
+
+#: ../src/main.c:223
+#, c-format
+msgid "NetworkManager is already running (pid %ld)\n"
+msgstr ""
+
+#: ../src/main.c:360
+msgid "Print NetworkManager version and exit"
+msgstr ""
+
+#: ../src/main.c:361
+msgid "Don't become a daemon"
+msgstr ""
+
+#: ../src/main.c:362
+msgid "Make all warnings fatal"
+msgstr ""
+
+#: ../src/main.c:363
+msgid "Specify the location of a PID file"
+msgstr ""
+
+#: ../src/main.c:363
+msgid "filename"
+msgstr ""
+
+#: ../src/main.c:364
+msgid "State file location"
+msgstr ""
+
+#: ../src/main.c:364
+msgid "/path/to/state.file"
+msgstr ""
+
+#: ../src/main.c:365
+msgid "Config file location"
+msgstr ""
+
+#: ../src/main.c:365
+msgid "/path/to/config.file"
+msgstr ""
+
+#: ../src/main.c:366
+msgid "List of plugins separated by ','"
+msgstr ""
+
+#: ../src/main.c:366
+msgid "plugin1,plugin2"
+msgstr ""
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:368
+msgid "Log level: one of [ERR, WARN, INFO, DEBUG]"
+msgstr ""
+
+#. Translators: Do not translate the values in the square brackets
+#: ../src/main.c:371
+msgid ""
+"Log domains separated by ',': any combination of\n"
+"                                          "
+"[NONE,HW,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,\n"
+"                                           "
+"WIFI_SCAN,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,\n"
+"                                           "
+"AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,\n"
+"                                           INFINIBAND,FIREWALL]"
+msgstr ""
+
+#: ../src/main.c:381
+#, c-format
+msgid "GModules are not supported on your platform!\n"
+msgstr ""
+
 #: ../src/main.c:400
+msgid ""
+"NetworkManager monitors all network connections and automatically\n"
+"chooses the best connection to use.  It also allows the user to\n"
+"specify wireless access points which wireless cards in the computer\n"
+"should associate with."
+msgstr ""
+
+#: ../src/main.c:406
 #, c-format
 msgid "Invalid option.  Please use --help to see a list of valid options.\n"
 msgstr ""
 
-#: ../src/main.c:441
+#: ../src/main.c:416
+#, c-format
+msgid "You must be root to run NetworkManager!\n"
+msgstr ""
+
+#: ../src/main.c:436
+#, c-format
+msgid "Failed to read configuration: (%d) %s\n"
+msgstr ""
+
+#: ../src/main.c:447
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr ""
 
+#: ../src/main.c:454
+#, c-format
+msgid "State file %s parsing failed: (%d) %s\n"
+msgstr ""
+
+#: ../src/main.c:471
+#, c-format
+msgid "Could not daemonize: %s [error %u]\n"
+msgstr ""
+
 #: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:62
 msgid "# Created by NetworkManager\n"
 msgstr ""
@@ -1854,19 +2312,19 @@
 "\n"
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:284
+#: ../src/dhcp-manager/nm-dhcp-manager.c:266
 msgid "no usable DHCP client could be found."
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:293
+#: ../src/dhcp-manager/nm-dhcp-manager.c:275
 msgid "'dhclient' could be found."
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:303
+#: ../src/dhcp-manager/nm-dhcp-manager.c:285
 msgid "'dhcpcd' could be found."
 msgstr ""
 
-#: ../src/dhcp-manager/nm-dhcp-manager.c:311
+#: ../src/dhcp-manager/nm-dhcp-manager.c:293
 #, c-format
 msgid "unsupported DHCP client '%s'"
 msgstr ""
@@ -1879,57 +2337,57 @@
 msgid "The nameservers listed below may not be recognized."
 msgstr ""
 
-#: ../src/logging/nm-logging.c:154
+#: ../src/logging/nm-logging.c:130
 #, c-format
 msgid "Unknown log level '%s'"
 msgstr ""
 
-#: ../src/logging/nm-logging.c:179
+#: ../src/logging/nm-logging.c:155
 #, c-format
 msgid "Unknown log domain '%s'"
 msgstr ""
 
-#: ../src/modem-manager/nm-modem-cdma.c:296 ../src/nm-device-bt.c:354
+#: ../src/modem-manager/nm-modem-cdma.c:279 ../src/nm-device-bt.c:324
 #, c-format
 msgid "CDMA connection %d"
 msgstr ""
 
-#: ../src/modem-manager/nm-modem-gsm.c:521 ../src/nm-device-bt.c:350
+#: ../src/modem-manager/nm-modem-gsm.c:512 ../src/nm-device-bt.c:320
 #, c-format
 msgid "GSM connection %d"
 msgstr ""
 
-#: ../src/nm-device-bt.c:325
+#: ../src/nm-device-bt.c:295
 #, c-format
 msgid "PAN connection %d"
 msgstr ""
 
-#: ../src/nm-device-bt.c:358
+#: ../src/nm-device-bt.c:328
 #, c-format
 msgid "DUN connection %d"
 msgstr ""
 
-#: ../src/nm-device-ethernet.c:1425
+#: ../src/nm-device-ethernet.c:1354
 #, c-format
 msgid "PPPoE connection %d"
 msgstr ""
 
-#: ../src/nm-device-ethernet.c:1425 ../src/settings/nm-settings-utils.c:50
+#: ../src/nm-device-ethernet.c:1354 ../src/settings/nm-settings-utils.c:50
 #, c-format
 msgid "Wired connection %d"
 msgstr ""
 
-#: ../src/nm-device-infiniband.c:292
+#: ../src/nm-device-infiniband.c:302
 #, c-format
 msgid "Infiniband connection %d"
 msgstr ""
 
-#: ../src/nm-device-olpc-mesh.c:323
+#: ../src/nm-device-olpc-mesh.c:293
 #, c-format
 msgid "Mesh %d"
 msgstr ""
 
-#: ../src/nm-manager.c:689
+#: ../src/nm-manager.c:642
 #, c-format
 msgid "VPN connection %d"
 msgstr ""
@@ -1974,11 +2432,11 @@
 msgid "error updating link cache: %s"
 msgstr ""
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:97
+#: ../src/settings/plugins/ifcfg-rh/reader.c:91
 #: ../src/settings/plugins/ifnet/connection_parser.c:51
 msgid "System"
 msgstr ""
 
-#: ../src/settings/plugins/ifcfg-rh/reader.c:3557
+#: ../src/settings/plugins/ifcfg-rh/reader.c:3648
 msgid "Bond"
 msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/newt.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/newt.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/newt.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/newt.po	2012-02-23 06:55:33.000000000 +0000
@@ -11,8 +11,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:43+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493
 msgid "Ok"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/notify-osd-icons.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/notify-osd-icons.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/notify-osd-icons.po	2012-01-02 17:51:15.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/notify-osd-icons.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-# Slovak translation for notify-osd-icons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the notify-osd-icons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: notify-osd-icons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-09-24 10:57+0000\n"
-"PO-Revision-Date: 2010-09-16 12:50+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:02+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#: ../index.theme.in.h:1
-msgid "Ubuntu default theme for Notify-OSD"
-msgstr "Predvolená Ubuntu téma pre Notify-OSD"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/oneconf.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/oneconf.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/oneconf.po	2012-01-02 17:51:16.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/oneconf.po	2012-02-23 06:56:01.000000000 +0000
@@ -7,42 +7,42 @@
 msgstr ""
 "Project-Id-Version: oneconf\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-23 16:42+0000\n"
+"POT-Creation-Date: 2012-02-20 07:46+0000\n"
 "PO-Revision-Date: 2011-09-27 20:49+0000\n"
 "Last-Translator: Peter Mráz <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:29+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:07+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: .././oneconf-service:66 .././oneconf-query:88
+#: .././oneconf-service:67 .././oneconf-query:89
 #, c-format
 msgid "usage: %prog [options]"
 msgstr "Použitie: %prog [voľby]"
 
-#: .././oneconf-service:69
+#: .././oneconf-service:70
 msgid "enable debug mode"
 msgstr "povolí ladiaci režim"
 
-#: .././oneconf-service:71
+#: .././oneconf-service:72
 msgid "use the mock infrastructure"
 msgstr "použije infraštruktúru mock"
 
-#: .././oneconf-service:92
+#: .././oneconf-service:99
 msgid ""
 "An OneConf service is already running, shut it down with oneconf-query --stop"
 msgstr ""
 "Služba OneConf už beží, vypnete ju pomocou príkazu oneconf-query --stop"
 
-#: .././oneconf-query:74
+#: .././oneconf-query:75
 msgid ""
 "you can't define --all-packages, --manual-packages or --hosts together."
 msgstr ""
 "voľby --all-packages, --manual-packages a --hosts nie je možné použiť súčasne"
 
-#: .././oneconf-query:78
+#: .././oneconf-query:79
 msgid ""
 "you can't define --list, --diff, --update, --async-update, --share-"
 "inventory, --stop, --get-last-sync together."
@@ -50,95 +50,95 @@
 "voľby --list, --diff, --update, --async-update, --share-inventory, --stop, --"
 "get-last-sync nie je možné použiť súčasne"
 
-#: .././oneconf-query:82
+#: .././oneconf-query:83
 #, c-format
 msgid "%s isn't compatible with %s"
 msgstr "voľba %s nie je kompatibilná s %s"
 
-#: .././oneconf-query:92
+#: .././oneconf-query:93
 msgid ""
 "Current diff between this machine and another provided by hostname/hostid"
 msgstr ""
 "Aktuálny rozdiel medzi týmto strojom a strojom zadaným pomocou voľby "
 "hostname alebo hostid"
 
-#: .././oneconf-query:96
+#: .././oneconf-query:97
 msgid "List stored package (default for local hostid) or host lists"
 msgstr ""
 "Vpíše zoznam uložených balíkov (predvolené pri voľbe hostid) alebo zoznam "
 "hostiteľov"
 
-#: .././oneconf-query:99
+#: .././oneconf-query:100
 msgid "Get last sync date"
 msgstr "Získa dátum poslednej synchronizácie"
 
-#: .././oneconf-query:101
+#: .././oneconf-query:102
 msgid "Update the package list in store"
 msgstr "Aktualizuje zoznam balíkov v úložisku"
 
-#: .././oneconf-query:104
+#: .././oneconf-query:105
 msgid "Perform async update of the package list in store"
 msgstr "Vykoná asynchrónnu aktualizáciu zoznamu balíkov v úložisku"
 
-#: .././oneconf-query:106
+#: .././oneconf-query:107
 msgid "Stop oneconf service"
 msgstr "Zastaví službu oneconf"
 
-#: .././oneconf-query:108
+#: .././oneconf-query:109
 msgid "enable debug mode (use --direct)"
 msgstr "povolí režim ladenia (použije --direct)"
 
-#: .././oneconf-query:110
+#: .././oneconf-query:111
 msgid "don't use dbus for the request"
 msgstr "nepoužije dbus na spracovanie požiadaviek"
 
-#: .././oneconf-query:115
+#: .././oneconf-query:116
 msgid "get all installed packages from storage"
 msgstr "získa všetky nainštalované balíky z úložiska"
 
-#: .././oneconf-query:118
+#: .././oneconf-query:119
 msgid "get only manual installed packages from storage"
 msgstr "získa iba ručne nainštalované balíky z úložiska"
 
-#: .././oneconf-query:121
+#: .././oneconf-query:122
 msgid "all available hosts from storage (only with list)"
 msgstr "všetky dostupné hostiteľské stanice z úložiska (iba s voľbou list)"
 
-#: .././oneconf-query:124
+#: .././oneconf-query:125
 msgid "This host (only with list)"
 msgstr "Tásto hostiteľská stanica (iba s  voľobu list)"
 
-#: .././oneconf-query:130 .././oneconf-query:132
+#: .././oneconf-query:131 .././oneconf-query:133
 msgid "specify target host"
 msgstr "Určuje ceiľovú hostiteľskú stanicu"
 
-#: .././oneconf-query:138
+#: .././oneconf-query:139
 msgid "share this inventory on the web"
 msgstr "sprístupní tento inventár na webe"
 
-#: .././oneconf-query:142
+#: .././oneconf-query:143
 msgid "hide this inventory on the web"
 msgstr "zneprístupní tento inventár na webe"
 
-#: .././oneconf-query:219
+#: .././oneconf-query:225
 msgid "hostid and hostname can't be provided together"
 msgstr "Voľby hostid a hostname nemôžu byť poskytnuté spolu"
 
-#: .././oneconf-query:224 .././oneconf-query:234
+#: .././oneconf-query:230 .././oneconf-query:240
 msgid "You can't use hostid or hostname when updating"
 msgstr "Voľby hostid a hostname nemôžete použiť pri aktualizovaní"
 
-#: .././oneconf-query:227 .././oneconf-query:237
+#: .././oneconf-query:233 .././oneconf-query:243
 msgid "You can't define --package, --host or --hosts when updating"
 msgstr ""
 "Voľby --package, --host a --hosts nemôžete definovať pri aktualizovaní"
 
-#: .././oneconf-query:258
+#: .././oneconf-query:264
 msgid "You have to provide either hostid or hostname for getting a diff"
 msgstr ""
 "Pre získanie rozdielu je potrebné poskytnúť buď hostname alebo hostid"
 
-#: .././oneconf-query:276 .././oneconf-query:285
+#: .././oneconf-query:282 .././oneconf-query:291
 msgid ""
 "You can't define --package, --host or --hosts when changing show inventory "
 "status"
@@ -146,26 +146,26 @@
 "Voľby --package, --host a --hosts nemôžete definovať pri zmene zobrazenia "
 "stavu inventára"
 
-#: .././oneconf-query:282
+#: .././oneconf-query:288
 msgid "You can't use hostid or hostname when changing show inventory status"
 msgstr ""
 "Voľby hostid a hostname nemôžete použiť pri zmene zobrazenia stavu inventára"
 
-#: .././oneconf/directconnect.py:88
-msgid ""
-"Nothing done: in direct mode, there is no communication with the service"
-msgstr "Nevykonalo sa nič: v režime direct neprebieha komunikácia so službou"
-
 #: .././oneconf/dbusconnect.py:200
 #, python-format
 msgid "Wasn't able to request stopping the service: %s"
 msgstr "Nebolo možné požiadať o zastavenie služby: %s"
 
-#: .././oneconf/hosts.py:198
+#: .././oneconf/directconnect.py:88
+msgid ""
+"Nothing done: in direct mode, there is no communication with the service"
+msgstr "Nevykonalo sa nič: v režime direct neprebieha komunikácia so službou"
+
+#: .././oneconf/hosts.py:206 .././oneconf/networksync/hosts.py:206
 msgid "No hostname registered for this id"
 msgstr "Pre tento identifikátor nebol zaregistrovaný názov hosteľa"
 
-#: .././oneconf/hosts.py:220
+#: .././oneconf/hosts.py:228 .././oneconf/networksync/hosts.py:228
 msgid ""
 "Multiple hostid registered for this hostname. Use --list --host to get the "
 "hostid and use the --hostid option."
@@ -174,10 +174,10 @@
 "hostid. Pomocou volieb --list --host získajtet správny identifikátor hostid, "
 "a potom použite voľbu --hostid."
 
-#: .././oneconf/hosts.py:224
+#: .././oneconf/hosts.py:232 .././oneconf/networksync/hosts.py:232
 msgid "No hostid registered for this hostname"
 msgstr "Pre tento názov hostiteľa nebol zaregistrovaný identifikátor hostid"
 
-#: .././oneconf/hosts.py:295
+#: .././oneconf/hosts.py:304 .././oneconf/networksync/hosts.py:304
 msgid "Was never synced"
 msgstr "Nebol nikdy synchronizovaný"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/parted.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/parted.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/parted.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/parted.po	2012-02-23 06:55:34.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: parted 2.2\n"
 "Report-Msgid-Bugs-To: bug-parted@gnu.org\n"
 "POT-Creation-Date: 2010-05-28 20:30+0200\n"
-"PO-Revision-Date: 2011-12-05 21:08+0000\n"
+"PO-Revision-Date: 2012-01-28 01:03+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: lib/argmatch.c:133
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pidgin-libnotify.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pidgin-libnotify.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pidgin-libnotify.po	2012-01-02 17:51:08.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pidgin-libnotify.po	2012-02-23 06:55:55.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: pidgin-libnotify\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-26 14:09+0000\n"
+"POT-Creation-Date: 2012-02-13 06:57+0000\n"
 "PO-Revision-Date: 2010-02-21 18:58+0000\n"
 "Last-Translator: Marián Bača <majoobaca@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:52+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../src/pidgin-libnotify.c:95
 msgid "New messages"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pidgin.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pidgin.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pidgin.po	2012-01-02 17:51:08.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pidgin.po	2012-02-23 06:55:54.000000000 +0000
@@ -11,16 +11,16 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-03 13:48+0000\n"
-"PO-Revision-Date: 2011-12-07 02:13+0000\n"
+"POT-Creation-Date: 2012-01-05 16:39+0000\n"
+"PO-Revision-Date: 2012-01-05 18:26+0000\n"
 "Last-Translator: Martin <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:47+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:47+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #. Translators may want to transliterate the name.
@@ -80,7 +80,7 @@
 #: ../libpurple/protocols/jabber/jutil.c:665
 #: ../libpurple/protocols/mxit/login.c:523
 #: ../libpurple/protocols/mxit/protocol.c:2442
-#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:77 ../libpurple/protocols/silc/ops.c:1476
 #: ../libpurple/protocols/silc10/ops.c:1451
 #: ../pidgin/plugins/disco/xmppdisco.c:514
 #: ../pidgin/plugins/disco/xmppdisco.c:519
@@ -196,18 +196,17 @@
 #: ../libpurple/protocols/myspace/user.c:885
 #: ../libpurple/protocols/oscar/oscar.c:5251
 #: ../libpurple/protocols/oscar/peer.c:1066
-#: ../libpurple/protocols/sametime/sametime.c:3467
-#: ../libpurple/protocols/sametime/sametime.c:3553
-#: ../libpurple/protocols/sametime/sametime.c:3727
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/sametime/sametime.c:5570
-#: ../libpurple/protocols/sametime/sametime.c:5695
+#: ../libpurple/protocols/sametime/sametime.c:3472
+#: ../libpurple/protocols/sametime/sametime.c:3558
+#: ../libpurple/protocols/sametime/sametime.c:5457
+#: ../libpurple/protocols/sametime/sametime.c:5547
+#: ../libpurple/protocols/sametime/sametime.c:5672
 #: ../libpurple/protocols/silc/buddy.c:459
 #: ../libpurple/protocols/silc/buddy.c:1084
 #: ../libpurple/protocols/silc/buddy.c:1199
 #: ../libpurple/protocols/silc/chat.c:622
 #: ../libpurple/protocols/silc/chat.c:756
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1836
 #: ../libpurple/protocols/silc/silc.c:1063
 #: ../libpurple/protocols/silc/silc.c:1271
 #: ../libpurple/protocols/silc10/buddy.c:468
@@ -288,7 +287,7 @@
 #: ../finch/gntblist.c:3069 ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:452
 #: ../finch/gntpounce.c:727 ../finch/gntroomlist.c:276
 #: ../finch/gntstatus.c:201 ../libpurple/protocols/gg/gg.c:871
-#: ../libpurple/protocols/sametime/sametime.c:5569
+#: ../libpurple/protocols/sametime/sametime.c:5546
 #: ../libpurple/protocols/silc/chat.c:621
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2479
 #: ../pidgin/gtkblist.c:7333 ../pidgin/gtkconv.c:1696
@@ -388,10 +387,10 @@
 #: ../libpurple/protocols/jabber/jabber.c:1403
 #: ../libpurple/protocols/oscar/oscar.c:3032
 #: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1202
-#: ../libpurple/protocols/silc/ops.c:1338
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1216
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc/silc.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1559
 #: ../libpurple/protocols/silc10/ops.c:1191
@@ -499,8 +498,8 @@
 msgstr "Zadajte názov skupiny, ktorú chcete pridať."
 
 #: ../finch/gntblist.c:852 ../finch/gntblist.c:1263
-#: ../libpurple/protocols/sametime/sametime.c:5479
-#: ../libpurple/protocols/sametime/sametime.c:5567 ../pidgin/gtkblist.c:7330
+#: ../libpurple/protocols/sametime/sametime.c:5456
+#: ../libpurple/protocols/sametime/sametime.c:5544 ../pidgin/gtkblist.c:7330
 msgid "Add Group"
 msgstr "Pridať skupinu"
 
@@ -635,9 +634,9 @@
 #: ../libpurple/protocols/jabber/jabber.c:2445
 #: ../libpurple/protocols/msn/msn.c:2265 ../libpurple/protocols/msn/msn.c:2435
 #: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1005
-#: ../libpurple/protocols/silc/ops.c:1188
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1019
+#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1340
 #: ../libpurple/protocols/silc10/buddy.c:1555
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
@@ -723,8 +722,8 @@
 #: ../libpurple/protocols/silc/chat.c:451
 #: ../libpurple/protocols/silc/chat.c:488
 #: ../libpurple/protocols/silc/chat.c:755
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1821
+#: ../libpurple/protocols/silc/ops.c:1309
+#: ../libpurple/protocols/silc/ops.c:1835
 #: ../libpurple/protocols/silc/silc.c:1062
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
@@ -1290,8 +1289,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:2296
 #: ../libpurple/protocols/oscar/oscar.c:2319
 #: ../libpurple/protocols/oscar/userinfo.c:303
-#: ../libpurple/protocols/sametime/sametime.c:3342
-#: ../libpurple/protocols/sametime/sametime.c:4234
+#: ../libpurple/protocols/sametime/sametime.c:3347
+#: ../libpurple/protocols/sametime/sametime.c:4198
 #: ../libpurple/protocols/yahoo/libymsg.c:4030 ../pidgin/gtkblist.c:3877
 #: ../pidgin/gtkblist.c:3891 ../pidgin/gtkblist.c:3893
 #: ../pidgin/gtksavedstatuses.c:970 ../pidgin/gtksavedstatuses.c:1120
@@ -1512,7 +1511,7 @@
 msgstr "Napísať správu"
 
 #: ../finch/gntnotify.c:464 ../libpurple/conversation.c:2138
-#: ../libpurple/protocols/sametime/sametime.c:3552
+#: ../libpurple/protocols/sametime/sametime.c:3557
 msgid "Invite"
 msgstr "Pozvať"
 
@@ -2116,10 +2115,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:4871
 #: ../libpurple/protocols/oscar/oscar.c:4878
 #: ../libpurple/protocols/oscar/oscar.c:4885
-#: ../libpurple/protocols/sametime/sametime.c:3365
-#: ../libpurple/protocols/sametime/sametime.c:3371
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/sametime/sametime.c:3456
+#: ../libpurple/protocols/sametime/sametime.c:3370
+#: ../libpurple/protocols/sametime/sametime.c:3376
+#: ../libpurple/protocols/sametime/sametime.c:3382
+#: ../libpurple/protocols/sametime/sametime.c:3461
 #: ../libpurple/protocols/silc/buddy.c:1566
 #: ../libpurple/protocols/silc10/buddy.c:1571
 #: ../libpurple/protocols/simple/simple.c:247
@@ -3005,168 +3004,168 @@
 msgstr "Prenos súboru od používateľa %s zlyhal."
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
-msgid "Run the command in a terminal"
-msgstr "Spustiť príkaz v termináli"
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „aim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
-msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „aim“, ak je povolené."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „aim“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
-msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „gg“, ak je povolené."
+msgid "The handler for \"aim\" URLs"
+msgstr "Príkaz pre adresy „aim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
-msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „icq“, ak je povolené."
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „aim“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
-msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „irc“, ak je povolené."
+msgid "Run the command in a terminal"
+msgstr "Spustiť príkaz v termináli"
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
-msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „msnim“, ak je povolené."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+"Pravda, ak bude príkaz používaný na spracovanie tohto druhu adries spustený "
+"v termináli."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
-msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „sip“, ak je povolené."
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „gg“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
-msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „xmpp“, ak je povolené."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „aim“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
-msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Príkaz na obsluhu adries typu „ymsgr“, ak je povolené."
+msgid "The handler for \"gg\" URLs"
+msgstr "Príkaz pre adresy „gg“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
-msgid "The handler for \"aim\" URLs"
-msgstr "Príkaz pre adresy „aim“"
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „gg“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
-msgid "The handler for \"gg\" URLs"
-msgstr "Príkaz pre adresy „gg“"
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „icq“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
-msgid "The handler for \"icq\" URLs"
-msgstr "Príkaz pre adresy „icq“"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „icq“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
-msgid "The handler for \"irc\" URLs"
-msgstr "Príkaz pre adresy „irc“"
+msgid "The handler for \"icq\" URLs"
+msgstr "Príkaz pre adresy „icq“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
-msgid "The handler for \"msnim\" URLs"
-msgstr "Príkaz pre adresy „msnim“"
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „icq“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
-msgid "The handler for \"sip\" URLs"
-msgstr "Príkaz pre adresy „sip“"
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „irc“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
-msgid "The handler for \"xmpp\" URLs"
-msgstr "Príkaz pre adresy „xmpp“"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „irc“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
-msgid "The handler for \"ymsgr\" URLs"
-msgstr "Príkaz pre adresy „ymsgr“"
+msgid "The handler for \"irc\" URLs"
+msgstr "Príkaz pre adresy „irc“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „aim“."
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „irc“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „aim“."
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „msnim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
+"True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „icq“."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „msnim“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „irc“."
+msgid "The handler for \"msnim\" URLs"
+msgstr "Príkaz pre adresy „msnim“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „msnim“."
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „msnim“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „sip“."
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „sip“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „xmpp“."
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „sip“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
-"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „ymsgr“."
+msgid "The handler for \"sip\" URLs"
+msgstr "Príkaz pre adresy „sip“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
-"Pravda, ak bude príkaz používaný na spracovanie tohto druhu adries spustený "
-"v termináli."
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „sip“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
-msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „aim“"
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „xmpp“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
-msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „gg“"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „xmpp“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
-msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „icq“"
+msgid "The handler for \"xmpp\" URLs"
+msgstr "Príkaz pre adresy „xmpp“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
-msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „irc“"
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „xmpp“, ak je povolené."
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
-msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „msnim“"
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr "Či má zadaný príkaz obsluhovať adresy „ymsgr“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
-msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „sip“"
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+"Pravda, ak príkaz zadaný v kľúči „command“ má spracovávať URL adresy „ymsgr“."
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
-msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „xmpp“"
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "Príkaz pre adresy „ymsgr“"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
-msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Či má zadaný príkaz obsluhovať adresy „ymsgr“"
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr "Príkaz na obsluhu adries typu „ymsgr“, ak je povolené."
 
 #: ../libpurple/log.c:198
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -4206,7 +4205,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:2006
 #: ../libpurple/protocols/jabber/jabber.c:1320
 #: ../libpurple/protocols/mxit/actions.c:275
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/silc/ops.c:1058
 #: ../libpurple/protocols/silc/silc.c:1010
 #: ../libpurple/protocols/silc/silc.c:1251
 #: ../libpurple/protocols/silc/util.c:562
@@ -4264,8 +4263,8 @@
 #: ../libpurple/protocols/bonjour/jabber.c:493
 #: ../libpurple/protocols/bonjour/jabber.c:558
 #: ../libpurple/protocols/bonjour/jabber.c:603
-#: ../libpurple/protocols/bonjour/jabber.c:876
-#: ../libpurple/protocols/bonjour/jabber.c:897
+#: ../libpurple/protocols/bonjour/jabber.c:880
+#: ../libpurple/protocols/bonjour/jabber.c:901
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nepodarilo sa odoslať správu, rozhovor sa nezačal."
 
@@ -4541,7 +4540,7 @@
 #: ../libpurple/protocols/mxit/roster.c:57
 #: ../libpurple/protocols/oscar/oscar.c:159
 #: ../libpurple/protocols/oscar/oscar.c:4877
-#: ../libpurple/protocols/sametime/sametime.c:3376
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Do Not Disturb"
 msgstr "Nerušiť"
 
@@ -4580,7 +4579,7 @@
 #: ../libpurple/protocols/mxit/profile.c:187
 #: ../libpurple/protocols/mxit/profile.c:290
 #: ../libpurple/protocols/oscar/userinfo.c:416
-#: ../libpurple/protocols/silc/ops.c:993
+#: ../libpurple/protocols/silc/ops.c:1007
 #: ../libpurple/protocols/silc10/ops.c:1024
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:544
 msgid "First Name"
@@ -4637,7 +4636,7 @@
 #. * we're ready for it (session key, userid, username all setup).
 #: ../libpurple/protocols/gg/gg.c:1915
 #: ../libpurple/protocols/myspace/myspace.c:1159
-#: ../libpurple/protocols/sametime/sametime.c:1574
+#: ../libpurple/protocols/sametime/sametime.c:1579
 msgid "Connected"
 msgstr "Prihlásený"
 
@@ -4669,7 +4668,7 @@
 #: ../libpurple/protocols/myspace/myspace.c:2206
 #: ../libpurple/protocols/novell/novell.c:2203
 #: ../libpurple/protocols/oscar/oscar.c:834
-#: ../libpurple/protocols/sametime/sametime.c:3806
+#: ../libpurple/protocols/sametime/sametime.c:3770
 #: ../libpurple/protocols/simple/simple.c:1960
 #: ../libpurple/protocols/yahoo/libymsg.c:3682
 #: ../libpurple/protocols/zephyr/zephyr.c:1583 ../pidgin/gtkstatusbox.c:716
@@ -4836,7 +4835,7 @@
 #: ../libpurple/protocols/myspace/myspace.c:2070
 #: ../libpurple/protocols/oscar/flap_connection.c:474
 #: ../libpurple/protocols/sametime/sametime.c:412
-#: ../libpurple/protocols/sametime/sametime.c:1775
+#: ../libpurple/protocols/sametime/sametime.c:1780
 #: ../libpurple/protocols/simple/simple.c:433
 #: ../libpurple/protocols/yahoo/libymsg.c:3148
 #: ../libpurple/protocols/yahoo/libymsg.c:3302
@@ -4884,7 +4883,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:829
 #: ../libpurple/protocols/oscar/oscar.c:1051
 #: ../libpurple/protocols/oscar/oscar.c:1172
-#: ../libpurple/protocols/sametime/sametime.c:3810
+#: ../libpurple/protocols/sametime/sametime.c:3774
 #: ../libpurple/protocols/silc/silc.c:451
 #: ../libpurple/protocols/simple/simple.c:482
 #: ../libpurple/protocols/simple/simple.c:1860
@@ -4905,7 +4904,7 @@
 #: ../libpurple/protocols/irc/irc.c:491
 #: ../libpurple/protocols/myspace/myspace.c:2163
 #: ../libpurple/protocols/oscar/flap_connection.c:479
-#: ../libpurple/protocols/sametime/sametime.c:1800
+#: ../libpurple/protocols/sametime/sametime.c:1805
 #: ../libpurple/protocols/simple/simple.c:452
 #: ../libpurple/protocols/simple/simple.c:1740
 #: ../libpurple/protocols/yahoo/libymsg.c:3237
@@ -4919,7 +4918,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:727
 #: ../libpurple/protocols/myspace/myspace.c:2079
 #: ../libpurple/protocols/oscar/flap_connection.c:472
-#: ../libpurple/protocols/sametime/sametime.c:1767
+#: ../libpurple/protocols/sametime/sametime.c:1772
 #: ../libpurple/protocols/yahoo/libymsg.c:3155
 #: ../libpurple/protocols/yahoo/libymsg.c:3309
 #: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:884
@@ -4937,9 +4936,9 @@
 msgstr "Používatelia"
 
 #: ../libpurple/protocols/irc/irc.c:879
-#: ../libpurple/protocols/sametime/sametime.c:3453
+#: ../libpurple/protocols/sametime/sametime.c:3458
 #: ../libpurple/protocols/silc/chat.c:1408
-#: ../libpurple/protocols/silc/ops.c:1395
+#: ../libpurple/protocols/silc/ops.c:1409
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1546
@@ -4963,13 +4962,13 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Modul pre IRC protokol, ktorý menej padá"
 
-#. host to connect to
+#. set up account ID as user:server
 #: ../libpurple/protocols/irc/irc.c:1049 ../libpurple/protocols/irc/msgs.c:377
 #: ../libpurple/protocols/msn/msn.c:3046
 #: ../libpurple/protocols/oscar/oscar.c:5785
-#: ../libpurple/protocols/sametime/sametime.c:5810
-#: ../libpurple/protocols/silc/ops.c:1251
-#: ../libpurple/protocols/silc/ops.c:1345
+#: ../libpurple/protocols/sametime/sametime.c:5784
+#: ../libpurple/protocols/silc/ops.c:1265
+#: ../libpurple/protocols/silc/ops.c:1359
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
 #: ../libpurple/protocols/simple/simple.c:2164
@@ -4979,7 +4978,7 @@
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:1052 ../libpurple/protocols/msn/msn.c:3051
 #: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/sametime/sametime.c:5815
+#: ../libpurple/protocols/sametime/sametime.c:5793
 #: ../libpurple/protocols/silc/silc.c:2197
 #: ../libpurple/protocols/silc10/silc.c:1910
 msgid "Port"
@@ -5049,13 +5048,13 @@
 
 #: ../libpurple/protocols/irc/msgs.c:357
 #: ../libpurple/protocols/oscar/userinfo.c:406
-#: ../libpurple/protocols/silc/ops.c:1424
+#: ../libpurple/protocols/silc/ops.c:1438
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Prezývka"
 
 #: ../libpurple/protocols/irc/msgs.c:383
-#: ../libpurple/protocols/silc/ops.c:1270
+#: ../libpurple/protocols/silc/ops.c:1284
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Momentálne na"
@@ -5156,7 +5155,7 @@
 #. Remove user from channel
 #: ../libpurple/protocols/irc/msgs.c:962
 #: ../libpurple/protocols/jabber/presence.c:747
-#: ../libpurple/protocols/silc/ops.c:716
+#: ../libpurple/protocols/silc/ops.c:730
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
@@ -5228,7 +5227,7 @@
 msgstr "Nedá sa pripojiť do %s: Je potrebné sa zaregistrovať."
 
 #: ../libpurple/protocols/irc/msgs.c:1308
-#: ../libpurple/protocols/silc/ops.c:1095
+#: ../libpurple/protocols/silc/ops.c:1109
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nepodarilo sa pripojiť na kanál"
@@ -5686,15 +5685,15 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:350
 #: ../libpurple/protocols/jabber/buddy.c:1024
-#: ../libpurple/protocols/sametime/sametime.c:4212
-#: ../libpurple/protocols/silc/ops.c:989
+#: ../libpurple/protocols/sametime/sametime.c:4176
+#: ../libpurple/protocols/silc/ops.c:1003
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Celé meno"
 
 #: ../libpurple/protocols/jabber/buddy.c:351
 #: ../libpurple/protocols/jabber/buddy.c:1035
-#: ../libpurple/protocols/silc/ops.c:1001
+#: ../libpurple/protocols/silc/ops.c:1015
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Priezvisko"
@@ -5769,7 +5768,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1163
 #: ../libpurple/protocols/msn/msn.c:2525
 #: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/silc/ops.c:1013
+#: ../libpurple/protocols/silc/ops.c:1027
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Názov zamestnania"
@@ -5853,7 +5852,7 @@
 msgstr "%s dozadu"
 
 #: ../libpurple/protocols/jabber/buddy.c:1039
-#: ../libpurple/protocols/silc/ops.c:997
+#: ../libpurple/protocols/silc/ops.c:1011
 #: ../libpurple/protocols/silc10/ops.c:1028
 #: ../libpurple/protocols/yahoo/yahoo_aliases.c:547
 msgid "Middle Name"
@@ -5863,7 +5862,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1324
 #: ../libpurple/protocols/oscar/userinfo.c:466
 #: ../libpurple/protocols/oscar/userinfo.c:474
-#: ../libpurple/protocols/silc/ops.c:1033
+#: ../libpurple/protocols/silc/ops.c:1047
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresa"
@@ -5988,7 +5987,7 @@
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/sametime/sametime.c:5694
+#: ../libpurple/protocols/sametime/sametime.c:5671
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:476
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -6082,7 +6081,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:813
 #: ../libpurple/protocols/jabber/chat.c:824
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1476
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Chyba počas prijímania zoznamu miestností"
@@ -6193,7 +6192,7 @@
 msgstr "Poštový kód"
 
 #: ../libpurple/protocols/jabber/jabber.c:1328
-#: ../libpurple/protocols/silc/ops.c:1038
+#: ../libpurple/protocols/silc/ops.c:1052
 #: ../libpurple/protocols/silc/silc.c:1012
 #: ../libpurple/protocols/silc/util.c:564
 #: ../libpurple/protocols/silc10/ops.c:1069
@@ -6306,7 +6305,7 @@
 #: ../libpurple/protocols/mxit/profile.c:210
 #: ../libpurple/protocols/oscar/userinfo.c:298
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1214
+#: ../libpurple/protocols/silc/ops.c:1228
 #: ../libpurple/protocols/silc10/buddy.c:1577
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
@@ -8305,7 +8304,7 @@
 msgstr "Naposledy aktualizované"
 
 #: ../libpurple/protocols/msn/msn.c:2683
-#: ../libpurple/protocols/silc/ops.c:1029
+#: ../libpurple/protocols/silc/ops.c:1043
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Domovská stránka"
@@ -8396,7 +8395,7 @@
 
 #: ../libpurple/protocols/msn/notification.c:831
 #: ../libpurple/protocols/msn/notification.c:855
-#: ../libpurple/protocols/sametime/sametime.c:4509
+#: ../libpurple/protocols/sametime/sametime.c:4473
 msgid "Unable to add user"
 msgstr "Nebolo možné pridať používateľa"
 
@@ -9888,7 +9887,7 @@
 msgstr "Pošta"
 
 #: ../libpurple/protocols/novell/novell.c:1515
-#: ../libpurple/protocols/sametime/sametime.c:4206
+#: ../libpurple/protocols/sametime/sametime.c:4170
 msgid "User ID"
 msgstr "ID používateľa"
 
@@ -11477,128 +11476,128 @@
 msgid "These buddies will always see you as offline"
 msgstr "Títo priatelia vás vždy uvidia odhlásených."
 
-#: ../libpurple/protocols/sametime/sametime.c:1316
+#: ../libpurple/protocols/sametime/sametime.c:1321
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Názov skupiny:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1317
+#: ../libpurple/protocols/sametime/sametime.c:1322
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID Notes skupiny:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1319
+#: ../libpurple/protocols/sametime/sametime.c:1324
 #, c-format
 msgid "Info for Group %s"
 msgstr "Podrobnosti o skupine %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1321
+#: ../libpurple/protocols/sametime/sametime.c:1326
 msgid "Notes Address Book Information"
 msgstr "Informácie o Notes zozname adries"
 
-#: ../libpurple/protocols/sametime/sametime.c:1353
+#: ../libpurple/protocols/sametime/sametime.c:1358
 msgid "Invite Group to Conference..."
 msgstr "Pozvať skupinu na konferenciu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1363
+#: ../libpurple/protocols/sametime/sametime.c:1368
 msgid "Get Notes Address Book Info"
 msgstr "Získať informácie o Notes zozname adries"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Sending Handshake"
 msgstr "Posiela sa prevzatie"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Čaká sa na potvrdenie prevzatia"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1549
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Prevzatie potvrdené, posiela sa prihlásenie"
 
-#: ../libpurple/protocols/sametime/sametime.c:1549
+#: ../libpurple/protocols/sametime/sametime.c:1554
 msgid "Waiting for Login Acknowledgement"
 msgstr "Čaká sa na potvrdenie prihlásenia"
 
-#: ../libpurple/protocols/sametime/sametime.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1559
 msgid "Login Redirected"
 msgstr "Prihlásenie presmerované"
 
-#: ../libpurple/protocols/sametime/sametime.c:1560
+#: ../libpurple/protocols/sametime/sametime.c:1565
 msgid "Forcing Login"
 msgstr "Vynútenie prihlásenia"
 
-#: ../libpurple/protocols/sametime/sametime.c:1564
+#: ../libpurple/protocols/sametime/sametime.c:1569
 msgid "Login Acknowledged"
 msgstr "Prihlásenie potvrdené"
 
-#: ../libpurple/protocols/sametime/sametime.c:1569
+#: ../libpurple/protocols/sametime/sametime.c:1574
 msgid "Starting Services"
 msgstr "Spúšťajú sa služby"
 
-#: ../libpurple/protocols/sametime/sametime.c:1706
+#: ../libpurple/protocols/sametime/sametime.c:1711
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Administrátor Sametime vystavil na serveri %s nasledujúce oznámenie"
 
-#: ../libpurple/protocols/sametime/sametime.c:1711
+#: ../libpurple/protocols/sametime/sametime.c:1716
 msgid "Sametime Administrator Announcement"
 msgstr "Oznámenie administrátora Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1843
+#: ../libpurple/protocols/sametime/sametime.c:1848
 #, c-format
 msgid "Announcement from %s"
 msgstr "Oznámenie od %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:2017
+#: ../libpurple/protocols/sametime/sametime.c:2022
 msgid "Conference Closed"
 msgstr "Konferencia zrušená"
 
-#: ../libpurple/protocols/sametime/sametime.c:2482
+#: ../libpurple/protocols/sametime/sametime.c:2487
 msgid "Unable to send message: "
 msgstr "Nepodarilo sa odoslať správu: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2488
+#: ../libpurple/protocols/sametime/sametime.c:2493
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Nemôžem poslať správu k %s:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3038
+#: ../libpurple/protocols/sametime/sametime.c:3043
 msgid "Place Closed"
 msgstr "Miesto uzavreté"
 
-#: ../libpurple/protocols/sametime/sametime.c:3308
+#: ../libpurple/protocols/sametime/sametime.c:3313
 msgid "Microphone"
 msgstr "Mikrofón"
 
-#: ../libpurple/protocols/sametime/sametime.c:3309
+#: ../libpurple/protocols/sametime/sametime.c:3314
 msgid "Speakers"
 msgstr "Reproduktory"
 
-#: ../libpurple/protocols/sametime/sametime.c:3310
+#: ../libpurple/protocols/sametime/sametime.c:3315
 msgid "Video Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3314
+#: ../libpurple/protocols/sametime/sametime.c:3319
 msgid "File Transfer"
 msgstr "Prenos súborov"
 
-#: ../libpurple/protocols/sametime/sametime.c:3348
-#: ../libpurple/protocols/sametime/sametime.c:4229
+#: ../libpurple/protocols/sametime/sametime.c:3353
+#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Supports"
 msgstr "Podporuje"
 
-#: ../libpurple/protocols/sametime/sametime.c:3353
-#: ../libpurple/protocols/sametime/sametime.c:4203
+#: ../libpurple/protocols/sametime/sametime.c:3358
+#: ../libpurple/protocols/sametime/sametime.c:4167
 msgid "External User"
 msgstr "Externý používateľ"
 
-#: ../libpurple/protocols/sametime/sametime.c:3459
+#: ../libpurple/protocols/sametime/sametime.c:3464
 msgid "Create conference with user"
 msgstr "Vytvoriť konferenciu s používateľom"
 
-#: ../libpurple/protocols/sametime/sametime.c:3460
+#: ../libpurple/protocols/sametime/sametime.c:3465
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -11607,27 +11606,27 @@
 "Zadajte, prosím, tému pre novú konferenciu, a pozývaciu správu pre "
 "používateľa %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3464
+#: ../libpurple/protocols/sametime/sametime.c:3469
 msgid "New Conference"
 msgstr "Nová konferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: ../libpurple/protocols/sametime/sametime.c:3531
+#: ../libpurple/protocols/sametime/sametime.c:3536
 msgid "Available Conferences"
 msgstr "Dostupné konferencie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3537
+#: ../libpurple/protocols/sametime/sametime.c:3542
 msgid "Create New Conference..."
 msgstr "Vytvoriť novú konferenciu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3544
+#: ../libpurple/protocols/sametime/sametime.c:3549
 msgid "Invite user to a conference"
 msgstr "Pozvať používateľa na konferenciu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3545
+#: ../libpurple/protocols/sametime/sametime.c:3550
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11638,71 +11637,50 @@
 "%s. Vyberte „Vytvoriť novú konferenciu“, ak chcete vytvoriť novú "
 "konferenciu, kam chcete pozvať tohto používateľa."
 
-#: ../libpurple/protocols/sametime/sametime.c:3550
+#: ../libpurple/protocols/sametime/sametime.c:3555
 msgid "Invite to Conference"
 msgstr "Pozvať na konferenciu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3646
 msgid "Invite to Conference..."
 msgstr "Pozvať na konferenciu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:3651
 msgid "Send TEST Announcement"
 msgstr "Poslať ohlásenie TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3665 ../pidgin/gtkconv.c:4685
+#: ../libpurple/protocols/sametime/sametime.c:3670 ../pidgin/gtkconv.c:4685
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3693
-msgid "No Sametime Community Server specified"
-msgstr "Nebol určený žiadny server komunity rovnakého času"
-
-#: ../libpurple/protocols/sametime/sametime.c:3718
-#, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
+#: ../libpurple/protocols/sametime/sametime.c:3730
+msgid "A server is required to connect this account"
 msgstr ""
-"Žiadny hostiteľ ani IP adresa neboli nastavené pre Meanwhile účet %s. "
-"Zadajte, prosím, jeden nižšie pre pokračovanie prihlásenia."
-
-#: ../libpurple/protocols/sametime/sametime.c:3723
-msgid "Meanwhile Connection Setup"
-msgstr "Nastavenie spojenia Meanwhile"
-
-#: ../libpurple/protocols/sametime/sametime.c:3724
-msgid "No Sametime Community Server Specified"
-msgstr "Nebol určený žiadny server komunity rovnakého času"
 
-#: ../libpurple/protocols/sametime/sametime.c:3726
-msgid "Connect"
-msgstr "Pripojiť"
-
-#: ../libpurple/protocols/sametime/sametime.c:4219
+#: ../libpurple/protocols/sametime/sametime.c:4183
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Neznáme (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4221
+#: ../libpurple/protocols/sametime/sametime.c:4185
 msgid "Last Known Client"
 msgstr "Posledný známy klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
-#: ../libpurple/protocols/sametime/sametime.c:5589
+#: ../libpurple/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:5566
 msgid "User Name"
 msgstr "Meno používateľa"
 
-#: ../libpurple/protocols/sametime/sametime.c:4388
-#: ../libpurple/protocols/sametime/sametime.c:5592
+#: ../libpurple/protocols/sametime/sametime.c:4352
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4412
+#: ../libpurple/protocols/sametime/sametime.c:4376
 msgid "An ambiguous user ID was entered"
 msgstr "Bolo zadané nejednoznačné používateľské ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4413
+#: ../libpurple/protocols/sametime/sametime.c:4377
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -11712,15 +11690,15 @@
 "používateľov. Vyberte, prosím, správneho používateľa zo zoznamu nižšie a "
 "pridajte ho do svojho zoznamu priateľov."
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4382
 msgid "Select User"
 msgstr "Vyberte používateľa"
 
-#: ../libpurple/protocols/sametime/sametime.c:4502
+#: ../libpurple/protocols/sametime/sametime.c:4466
 msgid "Unable to add user: user not found"
 msgstr "Nebolo možné pridať používateľa: používateľ nebol nájdený"
 
-#: ../libpurple/protocols/sametime/sametime.c:4504
+#: ../libpurple/protocols/sametime/sametime.c:4468
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -11729,7 +11707,7 @@
 "Identifikátoru „%s“ nevyhovujú žiadni používatelia vo vašej Sametime "
 "komunite. Tento záznam bol odstránený z vášho zoznamu priateľov."
 
-#: ../libpurple/protocols/sametime/sametime.c:5093
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -11738,63 +11716,63 @@
 "Chyba pri čítaní súboru %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Remotely Stored Buddy List"
 msgstr "Vzdialene uložený zoznam priateľov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5234
+#: ../libpurple/protocols/sametime/sametime.c:5211
 msgid "Buddy List Storage Mode"
 msgstr "Umiestnenie zoznamu priateľov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5237
+#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Local Buddy List Only"
 msgstr "Iba miestny zoznam priateľov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5239
+#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Merge List from Server"
 msgstr "Spojiť so zoznamom zo servera"
 
-#: ../libpurple/protocols/sametime/sametime.c:5241
+#: ../libpurple/protocols/sametime/sametime.c:5218
 msgid "Merge and Save List to Server"
 msgstr "Spojiť zoznam a uložiť na server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5243
+#: ../libpurple/protocols/sametime/sametime.c:5220
 msgid "Synchronize List with Server"
 msgstr "Synchronizovať zoznam so serverom"
 
-#: ../libpurple/protocols/sametime/sametime.c:5298
+#: ../libpurple/protocols/sametime/sametime.c:5275
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importovať zoznam Sametime do účtu %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5338
+#: ../libpurple/protocols/sametime/sametime.c:5315
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportovať zoznam Sametime z účtu %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5392
+#: ../libpurple/protocols/sametime/sametime.c:5369
 msgid "Unable to add group: group exists"
 msgstr "Nepodarilo sa pridať skupinu: skupina existuje"
 
-#: ../libpurple/protocols/sametime/sametime.c:5393
+#: ../libpurple/protocols/sametime/sametime.c:5370
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Skupina s názvom „%s“ sa už nachádza vo vašom zozname priateľov."
 
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5526
+#: ../libpurple/protocols/sametime/sametime.c:5373
+#: ../libpurple/protocols/sametime/sametime.c:5503
 msgid "Unable to add group"
 msgstr "Nepodarilo sa pridať skupinu"
 
-#: ../libpurple/protocols/sametime/sametime.c:5455
+#: ../libpurple/protocols/sametime/sametime.c:5432
 msgid "Possible Matches"
 msgstr "Možné výskyty"
 
-#: ../libpurple/protocols/sametime/sametime.c:5471
+#: ../libpurple/protocols/sametime/sametime.c:5448
 msgid "Notes Address Book group results"
 msgstr "Výsledky skupiny Notes zoznamu adries"
 
-#: ../libpurple/protocols/sametime/sametime.c:5472
+#: ../libpurple/protocols/sametime/sametime.c:5449
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -11805,15 +11783,15 @@
 "Notes zoznamu adries. Vyberte, prosím, správneho používateľa zo zoznamu "
 "nižšie a pridajte ho do svojho zoznamu priateľov."
 
-#: ../libpurple/protocols/sametime/sametime.c:5477
+#: ../libpurple/protocols/sametime/sametime.c:5454
 msgid "Select Notes Address Book"
 msgstr "Vyberte Notes zoznam adries"
 
-#: ../libpurple/protocols/sametime/sametime.c:5520
+#: ../libpurple/protocols/sametime/sametime.c:5497
 msgid "Unable to add group: group not found"
 msgstr "Nepodarilo sa pridať skupinu: skupina nenájdená"
 
-#: ../libpurple/protocols/sametime/sametime.c:5522
+#: ../libpurple/protocols/sametime/sametime.c:5499
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -11822,11 +11800,11 @@
 "Identifikátoru „%s“ nevyhovujú žiadne skupiny Notes zoznamu adries vo vašej "
 "Sametime komunite."
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5540
 msgid "Notes Address Book Group"
 msgstr "Skupina Notes zoznamu adries"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5541
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -11834,12 +11812,12 @@
 "Zadajte názov skupiny Notes zoznamu adries do políčka, ktoré sa nachádza "
 "nižšie, a skupina spolu s jej členmi sa pridá do vášho zoznamu priateľov."
 
-#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/sametime/sametime.c:5590
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Výsledky vyhľadávania „%s“"
 
-#: ../libpurple/protocols/sametime/sametime.c:5614
+#: ../libpurple/protocols/sametime/sametime.c:5591
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -11850,15 +11828,15 @@
 "ho pridať do vášho zoznamu priateľov, alebo mu odoslať správu pomocou "
 "tlačidiel, ktoré sú nižšie."
 
-#: ../libpurple/protocols/sametime/sametime.c:5621 ../pidgin/gtknotify.c:972
+#: ../libpurple/protocols/sametime/sametime.c:5598 ../pidgin/gtknotify.c:972
 msgid "Search Results"
 msgstr "Výsledky vyhľadávania"
 
-#: ../libpurple/protocols/sametime/sametime.c:5646
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "No matches"
 msgstr "Žiadne výskyty"
 
-#: ../libpurple/protocols/sametime/sametime.c:5647
+#: ../libpurple/protocols/sametime/sametime.c:5624
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community."
@@ -11866,15 +11844,15 @@
 "Identifikátoru „%s“ nevyhovujú žiadni používatelia vo vašej Sametime "
 "komunite."
 
-#: ../libpurple/protocols/sametime/sametime.c:5651
+#: ../libpurple/protocols/sametime/sametime.c:5628
 msgid "No Matches"
 msgstr "Žiadne výskyty"
 
-#: ../libpurple/protocols/sametime/sametime.c:5688
+#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "Search for a user"
 msgstr "Hľadanie používateľa"
 
-#: ../libpurple/protocols/sametime/sametime.c:5689
+#: ../libpurple/protocols/sametime/sametime.c:5666
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -11882,32 +11860,32 @@
 "Zadajte meno, alebo čiastočné ID do políčka nachádzajúceho sa nižšie pre "
 "vyhľadanie vyhovujúcich používateľov vo vašej Sametime komunite."
 
-#: ../libpurple/protocols/sametime/sametime.c:5692
+#: ../libpurple/protocols/sametime/sametime.c:5669
 msgid "User Search"
 msgstr "Hľadanie používateľov"
 
-#: ../libpurple/protocols/sametime/sametime.c:5705
+#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Import Sametime List..."
 msgstr "Importovať zoznam Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5709
+#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Export Sametime List..."
 msgstr "Exportovať zoznam Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5713
+#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "Add Notes Address Book Group..."
 msgstr "Pridať skupinu Notes zoznamu adries...."
 
-#: ../libpurple/protocols/sametime/sametime.c:5717
+#: ../libpurple/protocols/sametime/sametime.c:5694
 msgid "User Search..."
 msgstr "Hľadanie používateľov..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5823
+#: ../libpurple/protocols/sametime/sametime.c:5801
 msgid "Force login (ignore server redirects)"
 msgstr "Vynútiť prihlásenie (ignorovať presmerovania serverom)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5833
+#: ../libpurple/protocols/sametime/sametime.c:5811
 msgid "Hide client identity"
 msgstr "Skryť identitu klienta"
 
@@ -12038,8 +12016,8 @@
 #: ../libpurple/protocols/silc/buddy.c:500
 #: ../libpurple/protocols/silc/buddy.c:511
 #: ../libpurple/protocols/silc/buddy.c:544
-#: ../libpurple/protocols/silc/ops.c:1505
-#: ../libpurple/protocols/silc/ops.c:1516
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1530
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -12048,8 +12026,8 @@
 msgstr "Získať verejný kľúč"
 
 #: ../libpurple/protocols/silc/buddy.c:545
-#: ../libpurple/protocols/silc/ops.c:1506
-#: ../libpurple/protocols/silc/ops.c:1517
+#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1531
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -12073,11 +12051,11 @@
 msgstr "Nepodarilo sa načítať verejný kľúč"
 
 #: ../libpurple/protocols/silc/buddy.c:706
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/ops.c:1170
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1311
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/ops.c:1184
+#: ../libpurple/protocols/silc/ops.c:1306
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1325
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -12088,8 +12066,8 @@
 msgstr "Podrobnosti o používateľovi"
 
 #: ../libpurple/protocols/silc/buddy.c:707
-#: ../libpurple/protocols/silc/ops.c:1171
-#: ../libpurple/protocols/silc/ops.c:1312
+#: ../libpurple/protocols/silc/ops.c:1185
+#: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -12192,35 +12170,35 @@
 msgstr "Robot"
 
 #: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1209
+#: ../libpurple/protocols/silc/ops.c:1223
 #: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Režimy používateľa"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1226
+#: ../libpurple/protocols/silc/ops.c:1240
 #: ../libpurple/protocols/silc10/buddy.c:1582
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferovaný kontakt"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1231
+#: ../libpurple/protocols/silc/ops.c:1245
 #: ../libpurple/protocols/silc10/buddy.c:1587
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferovaný jazyk"
 
 #: ../libpurple/protocols/silc/buddy.c:1587
-#: ../libpurple/protocols/silc/ops.c:1236
+#: ../libpurple/protocols/silc/ops.c:1250
 #: ../libpurple/protocols/silc10/buddy.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Zariadenie"
 
 #: ../libpurple/protocols/silc/buddy.c:1592
-#: ../libpurple/protocols/silc/ops.c:1241
+#: ../libpurple/protocols/silc/ops.c:1255
 #: ../libpurple/protocols/silc10/buddy.c:1597
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:747
@@ -12229,7 +12207,7 @@
 msgstr "Časová zóna"
 
 #: ../libpurple/protocols/silc/buddy.c:1597
-#: ../libpurple/protocols/silc/ops.c:1246
+#: ../libpurple/protocols/silc/ops.c:1260
 #: ../libpurple/protocols/silc10/buddy.c:1602
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
@@ -12256,7 +12234,7 @@
 msgstr "Získať verejný kľúč..."
 
 #: ../libpurple/protocols/silc/buddy.c:1684
-#: ../libpurple/protocols/silc/ops.c:1614
+#: ../libpurple/protocols/silc/ops.c:1628
 #: ../libpurple/protocols/silc10/buddy.c:1687
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
@@ -12410,7 +12388,7 @@
 msgstr "Názov skupiny"
 
 #: ../libpurple/protocols/silc/chat.c:607
-#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/ops.c:1833
 #: ../libpurple/protocols/silc/silc.c:1260
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1907
@@ -12616,8 +12594,8 @@
 msgid "Error occurred"
 msgstr "Vyskytla sa chyba"
 
-#: ../libpurple/protocols/silc/ops.c:550 ../libpurple/protocols/silc/ops.c:559
-#: ../libpurple/protocols/silc/ops.c:568
+#: ../libpurple/protocols/silc/ops.c:564 ../libpurple/protocols/silc/ops.c:573
+#: ../libpurple/protocols/silc/ops.c:582
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
 #: ../libpurple/protocols/silc10/ops.c:572
@@ -12625,38 +12603,38 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s zmenil tému <I>%s</I> na: %s"
 
-#: ../libpurple/protocols/silc/ops.c:634
+#: ../libpurple/protocols/silc/ops.c:648
 #: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "Používateľ <I>%s</I> nastavil režimy kanálu <I>%s</I> na: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:652
 #: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "Používateľ <I>%s</I> odstránil všetky režimy kanálu <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:671
+#: ../libpurple/protocols/silc/ops.c:685
 #: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "Používateľ <I>%s</I> nastavil režimy používateľa <I>%s</I> na: %s"
 
-#: ../libpurple/protocols/silc/ops.c:679
+#: ../libpurple/protocols/silc/ops.c:693
 #: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "Používateľ <I>%s</I> odstránil všetky režimy používateľa <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:708
+#: ../libpurple/protocols/silc/ops.c:722
 #: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Boli ste vykopnutý z kanálu <I>%s</I> používateľom <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:735 ../libpurple/protocols/silc/ops.c:740
-#: ../libpurple/protocols/silc/ops.c:745
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
 #: ../libpurple/protocols/silc10/ops.c:752
@@ -12664,8 +12642,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "Boli ste zabitý používateľom %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:766 ../libpurple/protocols/silc/ops.c:771
-#: ../libpurple/protocols/silc/ops.c:776
+#: ../libpurple/protocols/silc/ops.c:780 ../libpurple/protocols/silc/ops.c:785
+#: ../libpurple/protocols/silc/ops.c:790
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
 #: ../libpurple/protocols/silc10/ops.c:783
@@ -12673,157 +12651,157 @@
 msgid "Killed by %s (%s)"
 msgstr "Zabitý používateľom %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:813
+#: ../libpurple/protocols/silc/ops.c:827
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Odhlásenie zo servera"
 
-#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc/ops.c:1000
 #: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: ../libpurple/protocols/silc/ops.c:1009
+#: ../libpurple/protocols/silc/ops.c:1023
 #: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Narodeniny"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1031
 #: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Úloha zamestnania"
 
-#: ../libpurple/protocols/silc/ops.c:1021
+#: ../libpurple/protocols/silc/ops.c:1035
 #: ../libpurple/protocols/silc/silc.c:1253
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "Organizácia"
 
-#: ../libpurple/protocols/silc/ops.c:1025
+#: ../libpurple/protocols/silc/ops.c:1039
 #: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Jednotka"
 
-#: ../libpurple/protocols/silc/ops.c:1049
+#: ../libpurple/protocols/silc/ops.c:1063
 #: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Poznámka"
 
-#: ../libpurple/protocols/silc/ops.c:1095
+#: ../libpurple/protocols/silc/ops.c:1109
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Pripojiť sa k rozhovoru"
 
-#: ../libpurple/protocols/silc/ops.c:1129
+#: ../libpurple/protocols/silc/ops.c:1143
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Ste zakladateľom kanálu na <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1133
+#: ../libpurple/protocols/silc/ops.c:1147
 #: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Zakladateľ kanálu na <I>%s</I> je <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1192
-#: ../libpurple/protocols/silc/ops.c:1330
+#: ../libpurple/protocols/silc/ops.c:1206
+#: ../libpurple/protocols/silc/ops.c:1344
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1070
 msgid "Real Name"
 msgstr "Skutočné meno"
 
-#: ../libpurple/protocols/silc/ops.c:1220
+#: ../libpurple/protocols/silc/ops.c:1234
 #: ../libpurple/protocols/silc10/ops.c:1213 ../pidgin/gtkblist-theme.c:467
 msgid "Status Text"
 msgstr "Text statusu"
 
-#: ../libpurple/protocols/silc/ops.c:1282
-#: ../libpurple/protocols/silc/ops.c:1356
+#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1370
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Digitálny odtlačok verejného kľúča"
 
-#: ../libpurple/protocols/silc/ops.c:1283
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1371
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint verejného kľúča"
 
-#: ../libpurple/protocols/silc/ops.c:1296
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "Viac..."
 
-#: ../libpurple/protocols/silc/ops.c:1375
+#: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc/silc.c:1317
 #: ../libpurple/protocols/silc10/ops.c:1371
 #: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "Odpojiť zo servera"
 
-#: ../libpurple/protocols/silc/ops.c:1375
+#: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Nepodarilo sa odpojiť"
 
-#: ../libpurple/protocols/silc/ops.c:1395
+#: ../libpurple/protocols/silc/ops.c:1409
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Nepodarilo sa nastaviť tému"
 
-#: ../libpurple/protocols/silc/ops.c:1424
+#: ../libpurple/protocols/silc/ops.c:1438
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Nepodarilo sa zmeniť prezývku"
 
-#: ../libpurple/protocols/silc/ops.c:1473
+#: ../libpurple/protocols/silc/ops.c:1487
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Zoznam miestností"
 
-#: ../libpurple/protocols/silc/ops.c:1473
+#: ../libpurple/protocols/silc/ops.c:1487
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nepodarilo sa získať zoznam miestností"
 
-#: ../libpurple/protocols/silc/ops.c:1474
+#: ../libpurple/protocols/silc/ops.c:1488
 msgid "Network is empty"
 msgstr "Sieť je prázdna"
 
-#: ../libpurple/protocols/silc/ops.c:1518
+#: ../libpurple/protocols/silc/ops.c:1532
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nebol prijatý žiadny verejný kľúč"
 
-#: ../libpurple/protocols/silc/ops.c:1530
-#: ../libpurple/protocols/silc/ops.c:1543
+#: ../libpurple/protocols/silc/ops.c:1544
+#: ../libpurple/protocols/silc/ops.c:1557
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Podrobnosti o serveri"
 
-#: ../libpurple/protocols/silc/ops.c:1531
+#: ../libpurple/protocols/silc/ops.c:1545
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nepodarilo sa zobraziť podrobnosti o serveri"
 
-#: ../libpurple/protocols/silc/ops.c:1554
+#: ../libpurple/protocols/silc/ops.c:1568
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Štatistiky servera"
 
-#: ../libpurple/protocols/silc/ops.c:1555
+#: ../libpurple/protocols/silc/ops.c:1569
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nepodarilo sa zobraziť štatistiky servera"
 
-#: ../libpurple/protocols/silc/ops.c:1562
+#: ../libpurple/protocols/silc/ops.c:1576
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -12859,43 +12837,43 @@
 "Celkom operátorov servera: %d\n"
 "Celkom operátorov routeru: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1594
+#: ../libpurple/protocols/silc/ops.c:1608
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Sieťové štatistiky"
 
-#: ../libpurple/protocols/silc/ops.c:1602
-#: ../libpurple/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1616
+#: ../libpurple/protocols/silc/ops.c:1621
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1602
+#: ../libpurple/protocols/silc/ops.c:1616
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping zlyhal"
 
-#: ../libpurple/protocols/silc/ops.c:1607
+#: ../libpurple/protocols/silc/ops.c:1621
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Bola prijatá odpoveď na ping zo servera"
 
-#: ../libpurple/protocols/silc/ops.c:1615
+#: ../libpurple/protocols/silc/ops.c:1629
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Nie je možné zabiť používateľa"
 
-#: ../libpurple/protocols/silc/ops.c:1654
+#: ../libpurple/protocols/silc/ops.c:1668
 msgid "WATCH"
 msgstr "SLEDOVAŤ"
 
-#: ../libpurple/protocols/silc/ops.c:1654
+#: ../libpurple/protocols/silc/ops.c:1668
 msgid "Cannot watch user"
 msgstr "Nie je možné sledovať používateľa"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc/ops.c:1781
+#: ../libpurple/protocols/silc/ops.c:1744
+#: ../libpurple/protocols/silc/ops.c:1795
 #: ../libpurple/protocols/silc/silc.c:396
 #: ../libpurple/protocols/silc10/ops.c:1817
 #: ../libpurple/protocols/silc10/ops.c:1864
@@ -12903,17 +12881,17 @@
 msgid "Resuming session"
 msgstr "Obnovuje sa relácia"
 
-#: ../libpurple/protocols/silc/ops.c:1732
+#: ../libpurple/protocols/silc/ops.c:1746
 #: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Auntentifikácia spojenia"
 
-#: ../libpurple/protocols/silc/ops.c:1783
+#: ../libpurple/protocols/silc/ops.c:1797
 #: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Overuje sa verejný kľúč servera"
 
-#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1834
 #: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Je vyžadované heslo"
@@ -14813,18 +14791,18 @@
 "súbor bol premenovaný na %s~."
 
 #: ../pidgin.desktop.in.h:1
-msgid ""
-"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
-msgstr ""
-"Chat cez IM.  Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a ďalšie"
+msgid "Pidgin Internet Messenger"
+msgstr "Internetový komunikátor Pidgin"
 
 #: ../pidgin.desktop.in.h:2
 msgid "Internet Messenger"
 msgstr "Internetový komunikátor"
 
 #: ../pidgin.desktop.in.h:3
-msgid "Pidgin Internet Messenger"
-msgstr "Internetový komunikátor Pidgin"
+msgid ""
+"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgstr ""
+"Chat cez IM.  Podporuje AIM, Google Talk, Jabber/XMPP, MSN, Yahoo a ďalšie"
 
 #. Build the login options frame.
 #: ../pidgin/gtkaccount.c:448
@@ -17613,10 +17591,18 @@
 msgid "Incoming Call"
 msgstr "Prichádzajúci hovor"
 
+#: ../pidgin/gtkmedia.c:792
+msgid "_Hold"
+msgstr ""
+
 #: ../pidgin/gtkmedia.c:863 ../pidgin/pidginstock.c:92
 msgid "_Pause"
 msgstr "_Pozastaviť"
 
+#: ../pidgin/gtkmedia.c:881
+msgid "_Mute"
+msgstr ""
+
 #: ../pidgin/gtknotify.c:752
 #, c-format
 msgid "%s has %d new message."
@@ -17894,7 +17880,7 @@
 msgstr "(Vlastné)"
 
 #: ../pidgin/gtkprefs.c:423 ../pidgin/gtkprefs.c:543 ../pidgin/gtkprefs.c:551
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "Penguin Pimps"
 msgstr "Autori Pidginu"
 
@@ -18913,14 +18899,14 @@
 msgid "Pidgin smileys"
 msgstr "Smajlíci programu Pidgin"
 
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "none"
+msgstr "žiadne"
+
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Vyberte túto možnosť, ak nechcete grafických smajlíkov."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-msgid "none"
-msgstr "žiadne"
-
 #: ../pidgin/pixmaps/emotes/small/16/small.theme.in.h:1
 msgid "Small"
 msgstr "Malé"
@@ -20394,106 +20380,104 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Tento modul je vhodný na ladenie XMPP serverov alebo klientov."
 
-#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:1
+msgid "The installer is already running."
+msgstr "Inštalácia je už spustená"
+
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:2
 msgid ""
+"An instance of Pidgin is currently running.  Please exit Pidgin and try "
+"again."
+msgstr "Pidgin je práve spustený. Vypnite ho a skúste znova."
+
+#. "Next >" appears on a button on the License Page of the Installer
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4
+msgid "Next >"
+msgstr "Ďalej >"
+
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."  DO NOT translate the CLICK in $_CLICK.  It will break the installer.
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:6
+msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
 "$(^Name) je vydaný pod GPL licenciou. Táto licencia je len pre informačné "
 "účely. $_CLICK"
 
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:4
-msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr "Multiplatformové GUI nástroje, používané Pidgin-om"
-
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:5
-msgid ""
-"An instance of Pidgin is currently running.  Please exit Pidgin and try "
-"again."
-msgstr "Pidgin je práve spustený. Vypnite ho a skúste znova."
-
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:7
-msgid "Core Pidgin files and dlls"
-msgstr "Jadro Pidgin-u a nevyhnutné DLL súbory"
-
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:9
-msgid "Create a Start Menu entry for Pidgin"
-msgstr "Vytvoriť odkaz na Pidgin v Štart Menu"
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:8
+msgid "Pidgin Instant Messaging Client (required)"
+msgstr "Pidgin Instant Messaging Klient (nevyhnutné)"
 
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:11
-msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr "Vytvoriť zástupcu pre Pidgin na pracovnej ploche"
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:10
+msgid "GTK+ Runtime (required if not present)"
+msgstr "GTK+ Runtime (vyžadované ak nedostupné)"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:13
-msgid "Debug Symbols (for reporting crashes)"
-msgstr "Ladiace symboly (na nahlasovanie chýb)"
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:12
+msgid "Shortcuts"
+msgstr "Zástupcovia"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:15
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:14
 msgid "Desktop"
 msgstr "Plocha"
 
-#. $R2 will display the URL that the GTK+ Runtime failed to download from
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:17
-msgid ""
-"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
-"function; if retrying fails, you may need to use the 'Offline Installer' "
-"from http://pidgin.im/download/windows/ ."
-msgstr ""
-"Chyba sťahovania prostredia GTK+ Runtime ($R2).$\\rJe vyžadované na "
-"fungovanie programu Pidgin; ak všetko zlyhá, môžete použiť 'Offline "
-"inštalátor' z http://pidgin.im/download/windows/ ."
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:16
+msgid "Start Menu"
+msgstr "Štart Menu"
 
-#. $R2 will display the URL that the Debug Symbols failed to download from
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:19
-msgid ""
-"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
-"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
-msgstr ""
-"Chyba inštalácie Ladiacich symbolov ($R2).$\\rAk všetko zlyhá, môžete použiť "
-"'Offline inštalátor' z http://pidgin.im/download/windows/ ."
+#. Installer Subsection Text
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:18
+msgid "Localizations"
+msgstr "Lokalizácie"
 
-#. $R3 will display the URL that the Dictionary failed to download from
+#. Installer Subsection Detailed Description
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:20
+msgid "Core Pidgin files and dlls"
+msgstr "Jadro Pidgin-u a nevyhnutné DLL súbory"
+
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:22
-#, no-c-format
-msgid ""
-"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: "
-"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
-"nstallation"
-msgstr ""
-"Chyba inštalácie kontroly pravopisu ($R3).$\\rAk všetko zlyhá, návod na "
-"inštaláciu je na adrese: "
-"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
-"nstallation"
+msgid "Shortcuts for starting Pidgin"
+msgstr "Zástupcovia pre Pidgin"
 
-#. Installer Subsection Text
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:24
-msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ Runtime (vyžadované ak nedostupné)"
+msgid "Create a shortcut to Pidgin on the Desktop"
+msgstr "Vytvoriť zástupcu pre Pidgin na pracovnej ploche"
 
-#. Installer Subsection Text
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:26
-msgid "Localizations"
-msgstr "Lokalizácie"
+msgid "Create a Start Menu entry for Pidgin"
+msgstr "Vytvoriť odkaz na Pidgin v Štart Menu"
 
-#. "Next >" appears on a button on the License Page of the Installer
+#. Installer Subsection Detailed Description
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:28
-msgid "Next >"
-msgstr "Ďalej >"
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "Multiplatformové GUI nástroje, používané Pidgin-om"
 
 #. Installer Subsection Text
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:30
-msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Pidgin Instant Messaging Klient (nevyhnutné)"
+msgid "Debug Symbols (for reporting crashes)"
+msgstr "Ladiace symboly (na nahlasovanie chýb)"
+
+#. Text displayed on Installer Finish Page
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:32
+msgid "Visit the Pidgin Web Page"
+msgstr "Navštíviť webstránku Windows Pidgin"
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:31
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33
+msgid ""
+"Unable to uninstall the currently installed version of Pidgin. The new "
+"version will be installed without removing the currently installed version."
+msgstr ""
+"Nedá sa odinštalovať momentálne nainštalovanú verziu Pidgin. Nová verzia "
+"bude nainštalovaná bez odstraňovania starej verzie."
+
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:34
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
@@ -20503,60 +20487,62 @@
 "dostupné).$\\rNaozaj chcete preskočiť inštalovanie GTK+ prostredia?"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:33
-msgid "Shortcuts"
-msgstr "Zástupcovia"
-
-#. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:35
-msgid "Shortcuts for starting Pidgin"
-msgstr "Zástupcovia pre Pidgin"
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:36
+msgid "URI Handlers"
+msgstr "URI handlery"
 
 #. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:37
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:38
 msgid "Spellchecking Support"
 msgstr "Podpora kontroly pravopisu"
 
-#. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:39
-msgid "Start Menu"
-msgstr "Štart Menu"
+#. $R3 will display the URL that the Dictionary failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:41
+#, no-c-format
+msgid ""
+"Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
+"installation instructions are at: "
+"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
+"nstallation"
+msgstr ""
+"Chyba inštalácie kontroly pravopisu ($R3).$\\rAk všetko zlyhá, návod na "
+"inštaláciu je na adrese: "
+"http://developer.pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_i"
+"nstallation"
 
 #. Installer Subsection Detailed Description
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:41
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:43
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr "Podpora kontroly pravopisu (Nutné pripojenie k Internetu)"
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:42
-msgid "The installer is already running."
-msgstr "Inštalácia je už spustená"
-
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:43
+#. $R2 will display the URL that the Debug Symbols failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:45
 msgid ""
-"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
-"that another user installed this application."
+"Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
+"use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-"Inštalátoru sa nepodarilo nájsť položky v registri pre Pidgin.$\\rJe možné, "
-"že túto aplikáciu nainštaloval iný používateľ."
-
-#. Installer Subsection Text
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:45
-msgid "URI Handlers"
-msgstr "URI handlery"
+"Chyba inštalácie Ladiacich symbolov ($R2).$\\rAk všetko zlyhá, môžete použiť "
+"'Offline inštalátor' z http://pidgin.im/download/windows/ ."
 
-#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:46
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
+#: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:47
 msgid ""
-"Unable to uninstall the currently installed version of Pidgin. The new "
-"version will be installed without removing the currently installed version."
+"Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
+"function; if retrying fails, you may need to use the 'Offline Installer' "
+"from http://pidgin.im/download/windows/ ."
 msgstr ""
-"Nedá sa odinštalovať momentálne nainštalovanú verziu Pidgin. Nová verzia "
-"bude nainštalovaná bez odstraňovania starej verzie."
+"Chyba sťahovania prostredia GTK+ Runtime ($R2).$\\rJe vyžadované na "
+"fungovanie programu Pidgin; ak všetko zlyhá, môžete použiť 'Offline "
+"inštalátor' z http://pidgin.im/download/windows/ ."
 
-#. Text displayed on Installer Finish Page
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:48
-msgid "Visit the Pidgin Web Page"
-msgstr "Navštíviť webstránku Windows Pidgin"
+msgid ""
+"The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
+"that another user installed this application."
+msgstr ""
+"Inštalátoru sa nepodarilo nájsť položky v registri pre Pidgin.$\\rJe možné, "
+"že túto aplikáciu nainštaloval iný používateľ."
 
 #: ../pidgin/win32/nsis/nsis_translations.desktop.in.h:49
 msgid "You do not have permission to uninstall this application."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/popt.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/popt.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/popt.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/popt.po	2012-02-23 06:55:34.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:44+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: popt.c:47
 msgid "unknown errno"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/powertop.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/powertop.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/powertop.po	2012-01-02 17:51:08.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/powertop.po	2012-02-23 06:55:54.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:49+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: process/do_process.cpp:664
 msgid "                Usage       Events/s    Category       Description\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pppconfig.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pppconfig.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pppconfig.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pppconfig.po	2012-02-23 06:55:34.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:06+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #. Arbitrary upper limits on option and chat files.
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pulseaudio.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pulseaudio.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/pulseaudio.po	2012-01-02 17:51:06.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/pulseaudio.po	2012-02-23 06:55:52.000000000 +0000
@@ -7,17 +7,17 @@
 msgstr ""
 "Project-Id-Version: pulseaudio\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-14 23:49+0000\n"
+"POT-Creation-Date: 2012-02-18 20:17+0000\n"
 "PO-Revision-Date: 2011-10-18 18:54+0000\n"
 "Last-Translator: Peter Mráz <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:21+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3211
+#: ../src/modules/alsa/alsa-util.c:885 ../src/pulsecore/sink.c:3215
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -101,11 +101,11 @@
 msgid "Null Output"
 msgstr "Nulový výstup"
 
-#: ../src/pulsecore/sink.c:3195
-msgid "Internal Audio"
-msgstr "Vnútorný zvuk"
+#: ../src/pulsecore/sink.c:3199
+msgid "Built-in Audio"
+msgstr ""
 
-#: ../src/pulsecore/sink.c:3200
+#: ../src/pulsecore/sink.c:3204
 msgid "Modem"
 msgstr "Modem"
 
@@ -1276,7 +1276,7 @@
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "Operácia pa_stream_connect_record() zlyhala: %s"
 
-#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1241
+#: ../src/utils/pacat.c:512 ../src/utils/pactl.c:1271
 #, c-format
 msgid "Connection failure: %s"
 msgstr "Spojenie zlyhalo: %s"
@@ -1385,7 +1385,7 @@
 "Preložené spolu s libpulse %s\n"
 "Spojené s libpulse %s\n"
 
-#: ../src/utils/pacat.c:817 ../src/utils/pactl.c:1387
+#: ../src/utils/pacat.c:817 ../src/utils/pactl.c:1417
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "Neplatný názov klienta „%s“"
@@ -1454,7 +1454,7 @@
 "Upozornenie: zadaná špecifikácia vzorky bude nahradená špecifikáciou zo "
 "súboru"
 
-#: ../src/utils/pacat.c:1037 ../src/utils/pactl.c:1454
+#: ../src/utils/pacat.c:1037 ../src/utils/pactl.c:1484
 msgid "Failed to determine sample specification from file."
 msgstr "Nepodarilo sa určiť špecifikáciu vzorky zo súboru."
 
@@ -1485,7 +1485,7 @@
 msgid "playback"
 msgstr "prehrávanie"
 
-#: ../src/utils/pacat.c:1110 ../src/utils/pactl.c:1764
+#: ../src/utils/pacat.c:1110 ../src/utils/pactl.c:1794
 msgid "pa_mainloop_new() failed."
 msgstr "Operácia pa_mainloop_new() zlyhala."
 
@@ -1493,11 +1493,11 @@
 msgid "io_new() failed."
 msgstr "Operácia io_new() zlyhala."
 
-#: ../src/utils/pacat.c:1136 ../src/utils/pactl.c:1776
+#: ../src/utils/pacat.c:1136 ../src/utils/pactl.c:1806
 msgid "pa_context_new() failed."
 msgstr "Operácia pa_context_new() zlyhala."
 
-#: ../src/utils/pacat.c:1144 ../src/utils/pactl.c:1782
+#: ../src/utils/pacat.c:1144 ../src/utils/pactl.c:1812
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "Operácia pa_context_connect() zlyhala: %s"
@@ -1506,7 +1506,7 @@
 msgid "pa_context_rttime_new() failed."
 msgstr "Operácia pa_context_rttime_new() zlyhala."
 
-#: ../src/utils/pacat.c:1157 ../src/utils/pactl.c:1787
+#: ../src/utils/pacat.c:1157 ../src/utils/pactl.c:1817
 msgid "pa_mainloop_run() failed."
 msgstr "Operácia pa_mainloop_run() zlyhala."
 
@@ -1647,12 +1647,12 @@
 "Cookie: %04x:%04x\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:235 ../src/utils/pactl.c:819
+#: ../src/utils/pactl.c:244 ../src/utils/pactl.c:849
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "Nepodarilo sa získať iformácie o cieli: %s"
 
-#: ../src/utils/pactl.c:261
+#: ../src/utils/pactl.c:270
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -1674,27 +1674,27 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:309 ../src/utils/pactl.c:420
+#: ../src/utils/pactl.c:318 ../src/utils/pactl.c:430 ../src/utils/pactl.c:588
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\tPorty:\n"
 
-#: ../src/utils/pactl.c:315 ../src/utils/pactl.c:426
+#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:437
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\tAktívny port: %s\n"
 
-#: ../src/utils/pactl.c:321 ../src/utils/pactl.c:432
+#: ../src/utils/pactl.c:331 ../src/utils/pactl.c:443
 #, c-format
 msgid "\tFormats:\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:347 ../src/utils/pactl.c:838
+#: ../src/utils/pactl.c:357 ../src/utils/pactl.c:868
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "Nepodarilo sa získať informácie o zdroji: %s"
 
-#: ../src/utils/pactl.c:373
+#: ../src/utils/pactl.c:383
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -1733,20 +1733,20 @@
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:405 ../src/utils/pactl.c:474 ../src/utils/pactl.c:517
-#: ../src/utils/pactl.c:559 ../src/utils/pactl.c:629 ../src/utils/pactl.c:630
-#: ../src/utils/pactl.c:641 ../src/utils/pactl.c:700 ../src/utils/pactl.c:701
-#: ../src/utils/pactl.c:712 ../src/utils/pactl.c:764 ../src/utils/pactl.c:765
-#: ../src/utils/pactl.c:772
+#: ../src/utils/pactl.c:415 ../src/utils/pactl.c:485 ../src/utils/pactl.c:528
+#: ../src/utils/pactl.c:570 ../src/utils/pactl.c:659 ../src/utils/pactl.c:660
+#: ../src/utils/pactl.c:671 ../src/utils/pactl.c:730 ../src/utils/pactl.c:731
+#: ../src/utils/pactl.c:742 ../src/utils/pactl.c:794 ../src/utils/pactl.c:795
+#: ../src/utils/pactl.c:802
 msgid "n/a"
 msgstr "-"
 
-#: ../src/utils/pactl.c:443
+#: ../src/utils/pactl.c:454
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "Nepodarilo sa získať informácie o module: %s"
 
-#: ../src/utils/pactl.c:466
+#: ../src/utils/pactl.c:477
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -1763,12 +1763,12 @@
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:485
+#: ../src/utils/pactl.c:496
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "Nepodarilo sa získať informácie o klientovi: %s"
 
-#: ../src/utils/pactl.c:511
+#: ../src/utils/pactl.c:522
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -1783,12 +1783,12 @@
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:528
+#: ../src/utils/pactl.c:539
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "Nepodarilo sa získať informácie o karte: %s"
 
-#: ../src/utils/pactl.c:551
+#: ../src/utils/pactl.c:562
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -1805,22 +1805,32 @@
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:565
+#: ../src/utils/pactl.c:576
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\tProfily:\n"
 
-#: ../src/utils/pactl.c:571
+#: ../src/utils/pactl.c:582
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\tAktívny profil: %s\n"
 
-#: ../src/utils/pactl.c:582 ../src/utils/pactl.c:857
+#: ../src/utils/pactl.c:591
+#, c-format
+msgid "\t\t%s: %s (priority %u)\n"
+msgstr ""
+
+#: ../src/utils/pactl.c:593
+#, c-format
+msgid "\t\t\tPart of profile(s): %s"
+msgstr ""
+
+#: ../src/utils/pactl.c:612 ../src/utils/pactl.c:887
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "Nepodarilo sa získať informácie o vstupe cieľa: %s"
 
-#: ../src/utils/pactl.c:611
+#: ../src/utils/pactl.c:641
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -1842,12 +1852,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:652 ../src/utils/pactl.c:876
+#: ../src/utils/pactl.c:682 ../src/utils/pactl.c:906
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "Nepodarilo sa získať informácie o výstupe zdroja: %s"
 
-#: ../src/utils/pactl.c:682
+#: ../src/utils/pactl.c:712
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -1869,12 +1879,12 @@
 "\t\t%s\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:723
+#: ../src/utils/pactl.c:753
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "Nepodarilo sa získať informácie o vzorke: %s"
 
-#: ../src/utils/pactl.c:750
+#: ../src/utils/pactl.c:780
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -1905,160 +1915,160 @@
 "\tVlastnosti:\n"
 "\t\t%s\n"
 
-#: ../src/utils/pactl.c:780 ../src/utils/pactl.c:790
+#: ../src/utils/pactl.c:810 ../src/utils/pactl.c:820
 #, c-format
 msgid "Failure: %s"
 msgstr "Zlyhanie: %s"
 
-#: ../src/utils/pactl.c:904
+#: ../src/utils/pactl.c:934
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr ""
 
-#: ../src/utils/pactl.c:943
+#: ../src/utils/pactl.c:973
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "Nahranie vzorky zlyhalo: %s"
 
-#: ../src/utils/pactl.c:960
+#: ../src/utils/pactl.c:990
 msgid "Premature end of file"
 msgstr "Predčasný koniec súboru"
 
-#: ../src/utils/pactl.c:980
+#: ../src/utils/pactl.c:1010
 msgid "new"
 msgstr ""
 
-#: ../src/utils/pactl.c:983
+#: ../src/utils/pactl.c:1013
 msgid "change"
 msgstr ""
 
-#: ../src/utils/pactl.c:986
+#: ../src/utils/pactl.c:1016
 msgid "remove"
 msgstr ""
 
-#: ../src/utils/pactl.c:989 ../src/utils/pactl.c:1024
+#: ../src/utils/pactl.c:1019 ../src/utils/pactl.c:1054
 msgid "unknown"
 msgstr ""
 
-#: ../src/utils/pactl.c:997
+#: ../src/utils/pactl.c:1027
 msgid "sink"
 msgstr "cieľ"
 
-#: ../src/utils/pactl.c:1000
+#: ../src/utils/pactl.c:1030
 msgid "source"
 msgstr "zdroj"
 
-#: ../src/utils/pactl.c:1003
+#: ../src/utils/pactl.c:1033
 msgid "sink-input"
 msgstr ""
 
-#: ../src/utils/pactl.c:1006
+#: ../src/utils/pactl.c:1036
 msgid "source-output"
 msgstr ""
 
-#: ../src/utils/pactl.c:1009
+#: ../src/utils/pactl.c:1039
 msgid "module"
 msgstr ""
 
-#: ../src/utils/pactl.c:1012
+#: ../src/utils/pactl.c:1042
 msgid "client"
 msgstr ""
 
-#: ../src/utils/pactl.c:1015
+#: ../src/utils/pactl.c:1045
 msgid "sample-cache"
 msgstr ""
 
-#: ../src/utils/pactl.c:1018 ../src/utils/pactl.c:1021
+#: ../src/utils/pactl.c:1048 ../src/utils/pactl.c:1051
 msgid "server"
 msgstr ""
 
-#: ../src/utils/pactl.c:1030
+#: ../src/utils/pactl.c:1060
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1247
+#: ../src/utils/pactl.c:1277
 msgid "Got SIGINT, exiting."
 msgstr "Prevzatý SIGINT, ukončuje sa."
 
-#: ../src/utils/pactl.c:1274
+#: ../src/utils/pactl.c:1304
 msgid "Invalid volume specification"
 msgstr "Neplatná špecifikácia hlasitosti"
 
-#: ../src/utils/pactl.c:1297
+#: ../src/utils/pactl.c:1327
 msgid "Volume outside permissible range.\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1308 ../src/utils/pactl.c:1309
-#: ../src/utils/pactl.c:1310 ../src/utils/pactl.c:1311
-#: ../src/utils/pactl.c:1312 ../src/utils/pactl.c:1313
-#: ../src/utils/pactl.c:1314 ../src/utils/pactl.c:1315
-#: ../src/utils/pactl.c:1316 ../src/utils/pactl.c:1317
-#: ../src/utils/pactl.c:1318 ../src/utils/pactl.c:1319
-#: ../src/utils/pactl.c:1320 ../src/utils/pactl.c:1321
-#: ../src/utils/pactl.c:1322 ../src/utils/pactl.c:1323
-#: ../src/utils/pactl.c:1324 ../src/utils/pactl.c:1325
-#: ../src/utils/pactl.c:1326
+#: ../src/utils/pactl.c:1338 ../src/utils/pactl.c:1339
+#: ../src/utils/pactl.c:1340 ../src/utils/pactl.c:1341
+#: ../src/utils/pactl.c:1342 ../src/utils/pactl.c:1343
+#: ../src/utils/pactl.c:1344 ../src/utils/pactl.c:1345
+#: ../src/utils/pactl.c:1346 ../src/utils/pactl.c:1347
+#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1349
+#: ../src/utils/pactl.c:1350 ../src/utils/pactl.c:1351
+#: ../src/utils/pactl.c:1352 ../src/utils/pactl.c:1353
+#: ../src/utils/pactl.c:1354 ../src/utils/pactl.c:1355
+#: ../src/utils/pactl.c:1356
 msgid "[options]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1310
+#: ../src/utils/pactl.c:1340
 msgid "[TYPE]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1312
+#: ../src/utils/pactl.c:1342
 msgid "FILENAME [NAME]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1313
+#: ../src/utils/pactl.c:1343
 msgid "NAME [SINK]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1314
+#: ../src/utils/pactl.c:1344
 msgid "NAME"
 msgstr ""
 
-#: ../src/utils/pactl.c:1315
+#: ../src/utils/pactl.c:1345
 msgid "NAME [ARGS ...]"
 msgstr ""
 
-#: ../src/utils/pactl.c:1316
+#: ../src/utils/pactl.c:1346
 msgid "#N"
 msgstr ""
 
-#: ../src/utils/pactl.c:1317
+#: ../src/utils/pactl.c:1347
 msgid "#N SINK|SOURCE"
 msgstr ""
 
-#: ../src/utils/pactl.c:1318 ../src/utils/pactl.c:1323
+#: ../src/utils/pactl.c:1348 ../src/utils/pactl.c:1353
 msgid "NAME|#N 1|0"
 msgstr ""
 
-#: ../src/utils/pactl.c:1319
+#: ../src/utils/pactl.c:1349
 msgid "CARD PROFILE"
 msgstr ""
 
-#: ../src/utils/pactl.c:1320
+#: ../src/utils/pactl.c:1350
 msgid "NAME|#N PORT"
 msgstr ""
 
-#: ../src/utils/pactl.c:1321
+#: ../src/utils/pactl.c:1351
 msgid "NAME|#N VOLUME"
 msgstr ""
 
-#: ../src/utils/pactl.c:1322
+#: ../src/utils/pactl.c:1352
 msgid "#N VOLUME"
 msgstr ""
 
-#: ../src/utils/pactl.c:1324
+#: ../src/utils/pactl.c:1354
 msgid "#N 1|0"
 msgstr ""
 
-#: ../src/utils/pactl.c:1325
+#: ../src/utils/pactl.c:1355
 msgid "#N FORMATS"
 msgstr ""
 
-#: ../src/utils/pactl.c:1328
+#: ../src/utils/pactl.c:1358
 #, c-format
 msgid ""
 "\n"
@@ -2071,7 +2081,7 @@
 "server\n"
 msgstr ""
 
-#: ../src/utils/pactl.c:1367
+#: ../src/utils/pactl.c:1397
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2082,55 +2092,55 @@
 "Preložené spolu s libpulse %s\n"
 "Spojené s libpulse %s\n"
 
-#: ../src/utils/pactl.c:1426
+#: ../src/utils/pactl.c:1456
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr ""
 
-#: ../src/utils/pactl.c:1436
+#: ../src/utils/pactl.c:1466
 msgid "Please specify a sample file to load"
 msgstr "Určte súbor vzorky, ktorá sa má načítať"
 
-#: ../src/utils/pactl.c:1449
+#: ../src/utils/pactl.c:1479
 msgid "Failed to open sound file."
 msgstr "Otvorenie zvukového súboru zlyhalo."
 
-#: ../src/utils/pactl.c:1461
+#: ../src/utils/pactl.c:1491
 msgid "Warning: Failed to determine sample specification from file."
 msgstr "Upozornenie: Nepodarilo sa určiť špecifikáciu vzorky zo súboru."
 
-#: ../src/utils/pactl.c:1471
+#: ../src/utils/pactl.c:1501
 msgid "You have to specify a sample name to play"
 msgstr "Musíte zadať názov vzorky, ktorá sa má prehrať"
 
-#: ../src/utils/pactl.c:1483
+#: ../src/utils/pactl.c:1513
 msgid "You have to specify a sample name to remove"
 msgstr "Musíte zadať názov vzorky, ktorá sa má odstrániť"
 
-#: ../src/utils/pactl.c:1492
+#: ../src/utils/pactl.c:1522
 msgid "You have to specify a sink input index and a sink"
 msgstr "Musíte zadať index vstupu cieľa a cieľ"
 
-#: ../src/utils/pactl.c:1502
+#: ../src/utils/pactl.c:1532
 msgid "You have to specify a source output index and a source"
 msgstr "Musíte zadať index výstupu zdroja a zdroj"
 
-#: ../src/utils/pactl.c:1517
+#: ../src/utils/pactl.c:1547
 msgid "You have to specify a module name and arguments."
 msgstr "Musíte zadať názov modulu a parametre."
 
-#: ../src/utils/pactl.c:1537
+#: ../src/utils/pactl.c:1567
 msgid "You have to specify a module index"
 msgstr "Musíte zadať index modulu"
 
-#: ../src/utils/pactl.c:1547
+#: ../src/utils/pactl.c:1577
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr ""
 "Nie je možné zadať viac ako jeden cieľ. Je potrebné zadať logickú hodnotu "
 "(true/false)."
 
-#: ../src/utils/pactl.c:1560
+#: ../src/utils/pactl.c:1590
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
@@ -2138,83 +2148,83 @@
 "Nemôžete zadať viac ako jeden zdroj. Je potrebné zadať logickú hodnotu "
 "(true/false)."
 
-#: ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1602
 msgid "You have to specify a card name/index and a profile name"
 msgstr "Musíte zadať index alebo názov karty a názov profilu"
 
-#: ../src/utils/pactl.c:1583
+#: ../src/utils/pactl.c:1613
 msgid "You have to specify a sink name/index and a port name"
 msgstr "Musíte zadať index alebo názov cieľa a názov portu"
 
-#: ../src/utils/pactl.c:1594
+#: ../src/utils/pactl.c:1624
 msgid "You have to specify a source name/index and a port name"
 msgstr "Musíte zadať index alebo názov zdroja a názov portu"
 
-#: ../src/utils/pactl.c:1605
+#: ../src/utils/pactl.c:1635
 msgid "You have to specify a sink name/index and a volume"
 msgstr "Musíte zadať index alebo názov cieľa a hlasitosť"
 
-#: ../src/utils/pactl.c:1618
+#: ../src/utils/pactl.c:1648
 msgid "You have to specify a source name/index and a volume"
 msgstr "Musíte zadať index alebo názov zdroja a hlasitosť"
 
-#: ../src/utils/pactl.c:1631
+#: ../src/utils/pactl.c:1661
 msgid "You have to specify a sink input index and a volume"
 msgstr "Musíte zadať index alebo názov cieľa a hlasitosť"
 
-#: ../src/utils/pactl.c:1636
+#: ../src/utils/pactl.c:1666
 msgid "Invalid sink input index"
 msgstr "Neplatný index vstupu cieľa"
 
-#: ../src/utils/pactl.c:1647
+#: ../src/utils/pactl.c:1677
 msgid "You have to specify a source output index and a volume"
 msgstr ""
 
-#: ../src/utils/pactl.c:1652
+#: ../src/utils/pactl.c:1682
 msgid "Invalid source output index"
 msgstr ""
 
-#: ../src/utils/pactl.c:1664
+#: ../src/utils/pactl.c:1694
 msgid "You have to specify a sink name/index and a mute boolean"
 msgstr ""
 "Musíte zadať index alebo názov cieľa a stlmenie ako logickú hodnotu "
 "(true/false)"
 
-#: ../src/utils/pactl.c:1669 ../src/utils/pactl.c:1686
-#: ../src/utils/pactl.c:1708 ../src/utils/pactl.c:1729
+#: ../src/utils/pactl.c:1699 ../src/utils/pactl.c:1716
+#: ../src/utils/pactl.c:1738 ../src/utils/pactl.c:1759
 msgid "Invalid mute specification"
 msgstr ""
 
-#: ../src/utils/pactl.c:1681
+#: ../src/utils/pactl.c:1711
 msgid "You have to specify a source name/index and a mute boolean"
 msgstr ""
 "Musíte zadať index alebo názov zdroja a hodnotu stlmenia typu boolean"
 
-#: ../src/utils/pactl.c:1698
+#: ../src/utils/pactl.c:1728
 msgid "You have to specify a sink input index and a mute boolean"
 msgstr ""
 "Je potrebné zadať index vstupu cieľa a stlmenie ako logickú hodnotu "
 "(true/false)"
 
-#: ../src/utils/pactl.c:1703
+#: ../src/utils/pactl.c:1733
 msgid "Invalid sink input index specification"
 msgstr "Neplatná špecifikácia indexu vstupu cieľa"
 
-#: ../src/utils/pactl.c:1719
+#: ../src/utils/pactl.c:1749
 msgid "You have to specify a source output index and a mute boolean"
 msgstr ""
 
-#: ../src/utils/pactl.c:1724
+#: ../src/utils/pactl.c:1754
 msgid "Invalid source output index specification"
 msgstr ""
 
-#: ../src/utils/pactl.c:1743
+#: ../src/utils/pactl.c:1773
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr ""
 
-#: ../src/utils/pactl.c:1759
+#: ../src/utils/pactl.c:1789
 msgid "No valid command specified."
 msgstr "Nie je zadaný žiadny platný príkaz."
 
@@ -2373,9 +2383,9 @@
 "Inicializovaná bola sada POLLIN -- no následná operácia snd_pcm_avail() "
 "vrátila 0 alebo inú hodnotu menšiu ako je povolená."
 
-#: ../src/modules/alsa/module-alsa-card.c:163
+#: ../src/modules/alsa/module-alsa-card.c:168
 #: ../src/modules/bluetooth/module-bluetooth-device.c:2707
-#: ../src/modules/alsa/alsa-mixer.c:3902
+#: ../src/modules/alsa/alsa-mixer.c:4007
 msgid "Off"
 msgstr "Vypnuté"
 
@@ -2415,242 +2425,238 @@
 msgid "Audio on @HOSTNAME@"
 msgstr "Zvuk na @HOSTNAME@"
 
-#: ../src/modules/alsa/alsa-mixer.c:2220
+#: ../src/modules/alsa/alsa-mixer.c:2294
 msgid "Input"
 msgstr "Vstup"
 
-#: ../src/modules/alsa/alsa-mixer.c:2221
+#: ../src/modules/alsa/alsa-mixer.c:2295
 msgid "Docking Station Input"
 msgstr "Vstup dokovacej stanice"
 
-#: ../src/modules/alsa/alsa-mixer.c:2222 ../src/modules/alsa/alsa-mixer.c:2306
+#: ../src/modules/alsa/alsa-mixer.c:2296
 msgid "Docking Station Microphone"
 msgstr "Mikrofón dokovacej stanice"
 
-#: ../src/modules/alsa/alsa-mixer.c:2223
-msgid "Docking Station Line-In"
+#: ../src/modules/alsa/alsa-mixer.c:2297
+msgid "Docking Station Line In"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2224
-msgid "Line-In"
-msgstr "Linkový vstup"
+#: ../src/modules/alsa/alsa-mixer.c:2298 ../src/modules/alsa/alsa-mixer.c:2382
+msgid "Line In"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2225
+#: ../src/modules/alsa/alsa-mixer.c:2299 ../src/modules/alsa/alsa-mixer.c:2377
 msgid "Microphone"
 msgstr "Mikrofón"
 
-#: ../src/modules/alsa/alsa-mixer.c:2226 ../src/modules/alsa/alsa-mixer.c:2304
+#: ../src/modules/alsa/alsa-mixer.c:2300 ../src/modules/alsa/alsa-mixer.c:2378
 msgid "Front Microphone"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2227 ../src/modules/alsa/alsa-mixer.c:2305
+#: ../src/modules/alsa/alsa-mixer.c:2301 ../src/modules/alsa/alsa-mixer.c:2379
 msgid "Rear Microphone"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2228
+#: ../src/modules/alsa/alsa-mixer.c:2302
 msgid "External Microphone"
 msgstr "Externý mikrofón"
 
-#: ../src/modules/alsa/alsa-mixer.c:2229 ../src/modules/alsa/alsa-mixer.c:2307
+#: ../src/modules/alsa/alsa-mixer.c:2303 ../src/modules/alsa/alsa-mixer.c:2381
 msgid "Internal Microphone"
 msgstr "Interný mikrofón"
 
-#: ../src/modules/alsa/alsa-mixer.c:2230
+#: ../src/modules/alsa/alsa-mixer.c:2304 ../src/modules/alsa/alsa-mixer.c:2383
 msgid "Radio"
 msgstr "Rádio"
 
-#: ../src/modules/alsa/alsa-mixer.c:2231
+#: ../src/modules/alsa/alsa-mixer.c:2305 ../src/modules/alsa/alsa-mixer.c:2384
 msgid "Video"
 msgstr "Obraz"
 
-#: ../src/modules/alsa/alsa-mixer.c:2232
+#: ../src/modules/alsa/alsa-mixer.c:2306
 msgid "Automatic Gain Control"
 msgstr "Automatické ovládanie zosilnenia"
 
-#: ../src/modules/alsa/alsa-mixer.c:2233
+#: ../src/modules/alsa/alsa-mixer.c:2307
 msgid "No Automatic Gain Control"
 msgstr "Bez automatického ovládania zosilnenia"
 
-#: ../src/modules/alsa/alsa-mixer.c:2234
+#: ../src/modules/alsa/alsa-mixer.c:2308
 msgid "Boost"
 msgstr "Zosilnenie"
 
-#: ../src/modules/alsa/alsa-mixer.c:2235
+#: ../src/modules/alsa/alsa-mixer.c:2309
 msgid "No Boost"
 msgstr "Bez zosilnenia"
 
-#: ../src/modules/alsa/alsa-mixer.c:2236
+#: ../src/modules/alsa/alsa-mixer.c:2310
 msgid "Amplifier"
 msgstr "Zosilňovač"
 
-#: ../src/modules/alsa/alsa-mixer.c:2237
+#: ../src/modules/alsa/alsa-mixer.c:2311
 msgid "No Amplifier"
 msgstr "Bez zosilňovača"
 
-#: ../src/modules/alsa/alsa-mixer.c:2238
+#: ../src/modules/alsa/alsa-mixer.c:2312
 msgid "Bass Boost"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2239
+#: ../src/modules/alsa/alsa-mixer.c:2313
 msgid "No Bass Boost"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2240
+#: ../src/modules/alsa/alsa-mixer.c:2314
 msgid "Speaker"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2241
+#: ../src/modules/alsa/alsa-mixer.c:2315 ../src/modules/alsa/alsa-mixer.c:2386
 msgid "Headphones"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2302
+#: ../src/modules/alsa/alsa-mixer.c:2376
 msgid "Analog Input"
 msgstr "Analógový vstup"
 
-#: ../src/modules/alsa/alsa-mixer.c:2303
-msgid "Analog Microphone"
-msgstr "Analógový mikrofón"
-
-#: ../src/modules/alsa/alsa-mixer.c:2308
-msgid "Analog Line-In"
-msgstr "Analógový linkový vstup"
-
-#: ../src/modules/alsa/alsa-mixer.c:2309
-msgid "Analog Radio"
-msgstr "Analógové rádio"
-
-#: ../src/modules/alsa/alsa-mixer.c:2310
-msgid "Analog Video"
-msgstr "Analógový obraz"
+#: ../src/modules/alsa/alsa-mixer.c:2380
+msgid "Dock Microphone"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2311
+#: ../src/modules/alsa/alsa-mixer.c:2385
 msgid "Analog Output"
 msgstr "Analógový výstup"
 
-#: ../src/modules/alsa/alsa-mixer.c:2312
-msgid "Analog Headphones"
-msgstr "Analógová slúchadlá"
+#: ../src/modules/alsa/alsa-mixer.c:2387
+msgid "LFE on Separate Mono Output"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2313
-msgid "Analog Output (LFE)"
-msgstr "Analógový výstup (LFE)"
+#: ../src/modules/alsa/alsa-mixer.c:2388
+msgid "Line Out"
+msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2314
+#: ../src/modules/alsa/alsa-mixer.c:2389
 msgid "Analog Mono Output"
 msgstr "Analógový mono výstup"
 
-#: ../src/modules/alsa/alsa-mixer.c:2315
-msgid "Analog Speakers"
+#: ../src/modules/alsa/alsa-mixer.c:2390
+msgid "Speakers"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2316
-msgid "Digital Output (IEC958)"
+#: ../src/modules/alsa/alsa-mixer.c:2391
+msgid "HDMI / DisplayPort"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2317
-msgid "Digital Passthrough (IEC958)"
+#: ../src/modules/alsa/alsa-mixer.c:2392
+msgid "Digital Output (S/PDIF)"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:2526
+#: ../src/modules/alsa/alsa-mixer.c:2393
+msgid "Digital Passthrough (S/PDIF)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-mixer.c:2599
 #, c-format
 msgid "%s+%s"
 msgstr "%s+%s"
 
-#: ../src/modules/alsa/alsa-mixer.c:2529 ../src/modules/alsa/alsa-mixer.c:4440
+#: ../src/modules/alsa/alsa-mixer.c:2602 ../src/modules/alsa/alsa-mixer.c:4567
 #, c-format
 msgid "%s / %s"
 msgstr "%s / %s"
 
-#: ../src/modules/alsa/alsa-mixer.c:3761
+#: ../src/modules/alsa/alsa-mixer.c:3865
 msgid "Analog Mono"
 msgstr "Analógové mono"
 
-#: ../src/modules/alsa/alsa-mixer.c:3762
+#: ../src/modules/alsa/alsa-mixer.c:3866
 msgid "Analog Stereo"
 msgstr "Analógové stereo"
 
-#: ../src/modules/alsa/alsa-mixer.c:3763
+#: ../src/modules/alsa/alsa-mixer.c:3867
 msgid "Analog Surround 2.1"
 msgstr "Analógový Surround 2.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3764
+#: ../src/modules/alsa/alsa-mixer.c:3868
 msgid "Analog Surround 3.0"
 msgstr "Analógový Surround 3.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3765
+#: ../src/modules/alsa/alsa-mixer.c:3869
 msgid "Analog Surround 3.1"
 msgstr "Analógový Surround 3.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3766
+#: ../src/modules/alsa/alsa-mixer.c:3870
 msgid "Analog Surround 4.0"
 msgstr "Analógový Surround 4.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3767
+#: ../src/modules/alsa/alsa-mixer.c:3871
 msgid "Analog Surround 4.1"
 msgstr "Analógový Surround 4.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3768
+#: ../src/modules/alsa/alsa-mixer.c:3872
 msgid "Analog Surround 5.0"
 msgstr "Analógový Surround 5.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3769
+#: ../src/modules/alsa/alsa-mixer.c:3873
 msgid "Analog Surround 5.1"
 msgstr "Analógový Surround 5.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3770
+#: ../src/modules/alsa/alsa-mixer.c:3874
 msgid "Analog Surround 6.0"
 msgstr "Analógový Surround 6.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3771
+#: ../src/modules/alsa/alsa-mixer.c:3875
 msgid "Analog Surround 6.1"
 msgstr "Analógový Surround 6.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3772
+#: ../src/modules/alsa/alsa-mixer.c:3876
 msgid "Analog Surround 7.0"
 msgstr "Analógový Surround 7.0"
 
-#: ../src/modules/alsa/alsa-mixer.c:3773
+#: ../src/modules/alsa/alsa-mixer.c:3877
 msgid "Analog Surround 7.1"
 msgstr "Analógový Surround 7.1"
 
-#: ../src/modules/alsa/alsa-mixer.c:3774
+#: ../src/modules/alsa/alsa-mixer.c:3878
 msgid "Digital Stereo (IEC958)"
 msgstr "Digitálne stereo (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3775
+#: ../src/modules/alsa/alsa-mixer.c:3879
 msgid "Digital Passthrough  (IEC958)"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:3776
+#: ../src/modules/alsa/alsa-mixer.c:3880
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "Digitálny Surround 4.0 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3777
+#: ../src/modules/alsa/alsa-mixer.c:3881
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "Digitálny Surround 5.1 (IEC958/AC3)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3778
+#: ../src/modules/alsa/alsa-mixer.c:3882
 msgid "Digital Stereo (HDMI)"
 msgstr "Digitálne stereo (HDMI)"
 
-#: ../src/modules/alsa/alsa-mixer.c:3899
+#: ../src/modules/alsa/alsa-mixer.c:3883
+msgid "Digital Surround 5.1 (HDMI)"
+msgstr ""
+
+#: ../src/modules/alsa/alsa-mixer.c:4004
 msgid "Analog Mono Duplex"
 msgstr "Analógové duplexné mono"
 
-#: ../src/modules/alsa/alsa-mixer.c:3900
+#: ../src/modules/alsa/alsa-mixer.c:4005
 msgid "Analog Stereo Duplex"
 msgstr "Analógové duplexné stereo"
 
-#: ../src/modules/alsa/alsa-mixer.c:3901
+#: ../src/modules/alsa/alsa-mixer.c:4006
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "Digitálne duplexné stereo (IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:4001
+#: ../src/modules/alsa/alsa-mixer.c:4106
 #, c-format
 msgid "%s Output"
 msgstr ""
 
-#: ../src/modules/alsa/alsa-mixer.c:4009
+#: ../src/modules/alsa/alsa-mixer.c:4114
 #, c-format
 msgid "%s Input"
 msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/python-apt.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/python-apt.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/python-apt.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/python-apt.po	2012-02-23 06:55:34.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-09 12:08+0000\n"
+"POT-Creation-Date: 2012-02-15 09:31+0000\n"
 "PO-Revision-Date: 2011-06-28 16:47+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:07+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:54+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. ChangelogURI
 #: ../data/templates/Ubuntu.info.in.h:4
@@ -412,7 +412,7 @@
 msgstr "Softvér nekompatibilný s DFSG"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:210 ../aptsources/distro.py:438
+#: ../aptsources/distro.py:206 ../aptsources/distro.py:434
 #, python-format
 msgid "Server for %s"
 msgstr "Server pre %s"
@@ -420,35 +420,35 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:228 ../aptsources/distro.py:234
-#: ../aptsources/distro.py:250
+#: ../aptsources/distro.py:224 ../aptsources/distro.py:230
+#: ../aptsources/distro.py:246
 msgid "Main server"
 msgstr "Hlavný server"
 
-#: ../aptsources/distro.py:254
+#: ../aptsources/distro.py:250
 msgid "Custom servers"
 msgstr "Vlastné servery"
 
-#: ../apt/progress/gtk2.py:261 ../apt/progress/gtk2.py:317
+#: ../apt/progress/gtk2.py:258 ../apt/progress/gtk2.py:314
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Sťahuje sa súbor %(current)li z %(total)li pri %(speed)s/s"
 
-#: ../apt/progress/gtk2.py:267 ../apt/progress/gtk2.py:323
+#: ../apt/progress/gtk2.py:264 ../apt/progress/gtk2.py:320
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Sťahuje sa súbor %(current)li z %(total)li"
 
 #. Setup some child widgets
-#: ../apt/progress/gtk2.py:343
+#: ../apt/progress/gtk2.py:340
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../apt/progress/gtk2.py:431
+#: ../apt/progress/gtk2.py:428
 msgid "Starting..."
 msgstr "Spúšťa sa ..."
 
-#: ../apt/progress/gtk2.py:437
+#: ../apt/progress/gtk2.py:434
 msgid "Complete"
 msgstr "Dokončené"
 
@@ -457,11 +457,11 @@
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr "Naplatný znak Unicode v popise „%s“ (%s). Ohláste to, prosím."
 
-#: ../apt/package.py:1074 ../apt/package.py:1180
+#: ../apt/package.py:1085 ../apt/package.py:1191
 msgid "The list of changes is not available"
 msgstr "Zoznam zmien nie je k dispozícii"
 
-#: ../apt/package.py:1186
+#: ../apt/package.py:1197
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -474,7 +474,7 @@
 "Použite, prosím, http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "pokým nebudú dostupné zmeny alebo to neskôr skúste znovu."
 
-#: ../apt/package.py:1193
+#: ../apt/package.py:1204
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -482,23 +482,28 @@
 "Nepodarilo sa stiahnuť zoznam zmien. \n"
 "Skontrolujte svoje pripojenie k internetu."
 
-#: ../apt/debfile.py:85
+#: ../apt/debfile.py:82
 #, python-format
 msgid "List of files for '%s' could not be read"
 msgstr "Zoznam súborov „%s“ nebolo možné načítať"
 
-#: ../apt/debfile.py:205
+#: ../apt/debfile.py:93
+#, python-format
+msgid "List of control files for '%s' could not be read"
+msgstr ""
+
+#: ../apt/debfile.py:211
 #, python-format
 msgid "Dependency is not satisfiable: %s\n"
 msgstr "Závislosť nemožno uspokojiť: %s\n"
 
-#: ../apt/debfile.py:226
+#: ../apt/debfile.py:232
 #, python-format
 msgid "Conflicts with the installed package '%s'"
 msgstr "Je v konflikte s nainštalovaným  balíkom „%s“"
 
 #. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:371
+#: ../apt/debfile.py:373
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' dependency %(depname)s "
@@ -508,7 +513,7 @@
 "(%(deprelation)s %(depversion)s)"
 
 #. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:387
+#: ../apt/debfile.py:389
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
@@ -517,7 +522,7 @@
 "Poškodí závislosti existujúceho balíka „%(pkgname)s“ konflikt: %(targetpkg)s "
 "(%(comptype)s %(targetver)s)"
 
-#: ../apt/debfile.py:397
+#: ../apt/debfile.py:399
 #, python-format
 msgid ""
 "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
@@ -526,35 +531,31 @@
 "Poškodí závislosti existujúceho balíka „%(pkgname)s“, ktoré sú v konflikte: "
 "%(targetpkg)s. Ale „%(debfile)s“ ich poskytuje prostredníctvom „%(provides)s“"
 
-#: ../apt/debfile.py:445
+#: ../apt/debfile.py:447
 msgid "No Architecture field in the package"
 msgstr "Balík neobsahuje pole Architektúra"
 
-#: ../apt/debfile.py:455
+#: ../apt/debfile.py:457
 #, python-format
 msgid "Wrong architecture '%s'"
 msgstr "Nesprávna architektúra „%s“"
 
 #. the deb is older than the installed
-#: ../apt/debfile.py:462
+#: ../apt/debfile.py:464
 msgid "A later version is already installed"
 msgstr "Novšia verzia je už nainštalovaná"
 
-#: ../apt/debfile.py:487
+#: ../apt/debfile.py:489
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr ""
 "Nepodarilo sa uspokojiť všetky závislosti (poškodená vyrovnávacia pamäť)"
 
-#: ../apt/debfile.py:517
+#: ../apt/debfile.py:519
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "Nie je možné nainštalovať „%s“"
 
-#: ../apt/debfile.py:561
-msgid "Python-debian module not available"
-msgstr "Modul python-debian nie je dostupný"
-
-#: ../apt/debfile.py:604
+#: ../apt/debfile.py:593
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -562,18 +563,18 @@
 "Automaticky rozbalené:\n"
 "\n"
 
-#: ../apt/debfile.py:610
+#: ../apt/debfile.py:599
 msgid "Automatically converted to printable ascii:\n"
 msgstr "Automaticky prevedené na tlačiteľné ASCII:\n"
 
-#: ../apt/debfile.py:700
+#: ../apt/debfile.py:689
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr ""
 "Nainštalovať Build-Dependencies zdrojového balíka „%s“, z ktorého sa "
 "zostavuje %s\n"
 
-#: ../apt/debfile.py:711
+#: ../apt/debfile.py:700
 msgid "An essential package would be removed"
 msgstr "Bol by odstránený nevyhnutný balík"
 
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/recode.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/recode.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/recode.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/recode.po	2012-02-23 06:55:34.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/main.c:142
 msgid "No error"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/rpm.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/rpm.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/rpm.po	2012-01-02 17:50:44.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/rpm.po	2012-02-23 06:55:34.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:45+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: cliutils.c:20 lib/poptI.c:29
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/screen-resolution-extra.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/screen-resolution-extra.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/screen-resolution-extra.po	2012-01-02 17:51:10.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/screen-resolution-extra.po	2012-02-23 06:55:56.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: screen-resolution-extra\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-19 17:01+0000\n"
+"POT-Creation-Date: 2012-01-13 09:12+0000\n"
 "PO-Revision-Date: 2010-09-16 14:09+0000\n"
 "Last-Translator: Marián Bača <majoobaca@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:17+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ScreenResolution/ui.py:59
 msgid ""
@@ -58,13 +58,13 @@
 msgstr "Zmeniť Nastavenia rozlíšenia obrazovky"
 
 #: ../screenresolution-mechanism.policy.in.h:2
-msgid "Change the effect of Ctrl+Alt+Backspace"
-msgstr "Zmeniť význam klávesovej skratky Ctrl+Alt+Backspace"
-
-#: ../screenresolution-mechanism.policy.in.h:3
 msgid "Changing the Screen Resolution configuration requires privileges."
 msgstr "Zmena nastavenií rozlíšenia obrazovky vyžaduje potrebné oprávnenia."
 
+#: ../screenresolution-mechanism.policy.in.h:3
+msgid "Change the effect of Ctrl+Alt+Backspace"
+msgstr "Zmeniť význam klávesovej skratky Ctrl+Alt+Backspace"
+
 #: ../screenresolution-mechanism.policy.in.h:4
 msgid "Changing the effect of Ctrl+Alt+Backspace requires privileges."
 msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/sed.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/sed.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/sed.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/sed.po	2012-02-23 06:55:35.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: sed/compile.c:161
 msgid "multiple `!'s"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/shared-mime-info.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/shared-mime-info.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/shared-mime-info.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/shared-mime-info.po	2012-02-23 06:55:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: shared-mime-info\n"
 "Report-Msgid-Bugs-To: http://bugzilla.freedesktop.org/\n"
-"POT-Creation-Date: 2011-11-29 06:49+0000\n"
+"POT-Creation-Date: 2012-02-08 16:48+0000\n"
 "PO-Revision-Date: 2011-12-07 20:49+0000\n"
 "Last-Translator: Bastien Nocera <Unknown>\n"
 "Language-Team: Slovak "
@@ -16,2663 +16,2667 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:11+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:57+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: ../freedesktop.org.xml.in.h:1
-msgid "3D Studio image"
-msgstr "Obrázok 3D Studio"
+msgid "ATK inset"
+msgstr "Vložka ATK"
 
 #: ../freedesktop.org.xml.in.h:2
-msgid "3GPP multimedia file"
-msgstr "Súbor multimédií 3GPP"
+msgid "electronic book document"
+msgstr "Dokument elektronickej knihy"
 
 #: ../freedesktop.org.xml.in.h:3
-msgid "3GPP2 multimedia file"
-msgstr "Súbor multimédií 3GPP2"
+msgid "Adobe Illustrator document"
+msgstr "Dokument Adobe Illustrator"
 
 #: ../freedesktop.org.xml.in.h:4
-msgid "7-zip archive"
-msgstr "Archív 7-zip"
+msgid "Macintosh BinHex-encoded file"
+msgstr "Súbor kódovaný pomocou Macintosh BinHex"
 
 #: ../freedesktop.org.xml.in.h:5
-msgid "ACE archive"
-msgstr "Archív ACE"
+msgid "Mathematica Notebook"
+msgstr "Zošit Mathematica"
 
 #: ../freedesktop.org.xml.in.h:6
-msgid "AIFC audio"
-msgstr "Zvuk AIFC"
+msgid "MathML document"
+msgstr "Dokument MathML"
 
 #: ../freedesktop.org.xml.in.h:7
-msgid "AIFF audio"
-msgstr "Zvuk AIFF"
+msgid "mailbox file"
+msgstr "Súbor mailbox"
 
 #: ../freedesktop.org.xml.in.h:8
-msgid "AIFF/Amiga/Mac audio"
-msgstr "Zvuk AIFF/Amiga/Mac"
+msgid "Metalink file"
+msgstr "Súbor Metalink"
 
 #: ../freedesktop.org.xml.in.h:9
-msgid "AMR audio"
-msgstr "Zvuk AMR"
+msgid "unknown"
+msgstr "Neznámy"
 
 #: ../freedesktop.org.xml.in.h:10
-msgid "AMR-WB audio"
-msgstr "Zvuk AMR-WB"
+msgid "ODA document"
+msgstr "Dokument ODA"
 
 #: ../freedesktop.org.xml.in.h:11
-msgid "ANIM animation"
-msgstr "Animácia ANIM"
+msgid "WWF document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:12
-msgid "AR archive"
-msgstr "Archív AR"
+msgid "PDF document"
+msgstr "Dokument PDF"
 
 #: ../freedesktop.org.xml.in.h:13
-msgid "ARC archive"
-msgstr "Archív ARC"
+msgid "XSPF playlist"
+msgstr "Zoznam skladieb XSPF"
 
 #: ../freedesktop.org.xml.in.h:14
-msgid "ARJ archive"
-msgstr "Archív ARJ"
+msgid "Microsoft Windows theme pack"
+msgstr "Balík tém Microsoft Windows"
 
 #: ../freedesktop.org.xml.in.h:15
-msgid "ASF video"
-msgstr "Video ASF"
+msgid "GSM 06.10 audio"
+msgstr "Zvuk GSM 06.10"
 
 #: ../freedesktop.org.xml.in.h:16
-msgid "ASP page"
-msgstr "Stránka ASP"
+msgid "iRiver Playlist"
+msgstr "Zoznam skladieb iRiver"
 
 #: ../freedesktop.org.xml.in.h:17
-msgid "ATK inset"
-msgstr "Vložka ATK"
+msgid "PGP/MIME-encrypted message header"
+msgstr "Hlavičke správy zašifrovaná pomocou PGP/MIME"
 
 #: ../freedesktop.org.xml.in.h:18
-msgid "AVI video"
-msgstr "Video AVI"
+msgid "PGP keys"
+msgstr "Kľúče PGP"
 
 #: ../freedesktop.org.xml.in.h:19
-msgid "AWK script"
-msgstr "Skript AWK"
+msgid "detached OpenPGP signature"
+msgstr "Oddelený podpis OpenPGP"
 
 #: ../freedesktop.org.xml.in.h:20
-msgid "AbiWord document"
-msgstr "Dokument AbiWord"
+msgid "S/MIME file"
+msgstr "Súbor S/MIME"
 
 #: ../freedesktop.org.xml.in.h:21
-msgid "Ada source code"
-msgstr "Zdrojový kód jazyka Ada"
+msgid "detached S/MIME signature"
+msgstr "Oddelený podpis S/MIME"
 
 #: ../freedesktop.org.xml.in.h:22
-msgid "Adobe DNG negative"
-msgstr "Adobe Digital Negative (DNG)"
+msgid "PKCS#8 private key"
+msgstr "Súkromný kľúč PKCS#8"
 
 #: ../freedesktop.org.xml.in.h:23
-msgid "Adobe FrameMaker MIF document"
-msgstr "Dokument Adobe FrameMaker MIF"
+msgid "PKCS#10 certification request"
+msgstr "Požiadavka na certifikát PKCS#10"
 
 #: ../freedesktop.org.xml.in.h:24
-msgid "Adobe FrameMaker document"
-msgstr "Dokument Adobe FrameMaker"
+msgid "X.509 certificate"
+msgstr "Certifikát X.509"
 
 #: ../freedesktop.org.xml.in.h:25
-msgid "Adobe FrameMaker font"
-msgstr "Písmo Adobe FrameMaker"
+msgid "Certificate revocation list"
+msgstr "Zoznam zrušených certifikátov"
 
 #: ../freedesktop.org.xml.in.h:26
-msgid "Adobe Illustrator document"
-msgstr "Dokument Adobe Illustrator"
+msgid "PkiPath certification path"
+msgstr "Cesta k certifikátu PkiPath"
 
 #: ../freedesktop.org.xml.in.h:27
-msgid "Adobe font metrics"
-msgstr "Metrika písma Adobe"
+msgid "PS document"
+msgstr "Dokument PS"
 
 #: ../freedesktop.org.xml.in.h:28
-msgid "Alzip archive"
-msgstr "Archív Alzip"
+msgid "Plucker document"
+msgstr "Dokument Plucker"
 
 #: ../freedesktop.org.xml.in.h:29
-msgid "Amiga SoundTracker audio"
-msgstr "Zvuk Amiga SoundTracker"
+msgid "RELAX NG XML schema"
+msgstr "XML schéma RELAX NG"
 
 #: ../freedesktop.org.xml.in.h:30
-msgid "Android package"
-msgstr ""
+msgid "RTF document"
+msgstr "Dokument RTF"
 
 #: ../freedesktop.org.xml.in.h:31
-msgid "Annodex Audio"
-msgstr "Zvuk Annodex"
+msgid "Sieve mail filter script"
+msgstr "Skript poštového filtra Sieve"
 
 #: ../freedesktop.org.xml.in.h:32
-msgid "Annodex Video"
-msgstr "Video Annodex"
+msgid "SMIL document"
+msgstr "Dokument SMIL"
 
 #: ../freedesktop.org.xml.in.h:33
-msgid "Annodex exchange format"
-msgstr "Formát pre výmenu Annodex"
+msgid "WPL playlist"
+msgstr "Zoznam skladieb WPL"
 
 #: ../freedesktop.org.xml.in.h:34
-msgid "AportisDoc document"
-msgstr "Dokument AportisDoc"
+msgid "SQLite2 database"
+msgstr "Databáza SQLite2"
 
 #: ../freedesktop.org.xml.in.h:35
-msgid "Apple disk image"
-msgstr "Obraz disku Apple"
+msgid "SQLite3 database"
+msgstr "Databáza SQLite3"
 
 #: ../freedesktop.org.xml.in.h:36
-msgid "Applix Graphics image"
-msgstr "Obrázok Applix Graphics"
+msgid "GEDCOM family history"
+msgstr "Rodokmeň GEDCOM"
 
 #: ../freedesktop.org.xml.in.h:37
-msgid "Applix Spreadsheets spreadsheet"
-msgstr "Zošit Applix Spreadsheets"
+msgid "Flash video"
+msgstr "Video Flash"
 
 #: ../freedesktop.org.xml.in.h:38
-msgid "Applix Words document"
-msgstr "Dokument Applix Words"
-
-#: ../freedesktop.org.xml.in.h:39
-msgid "Atom syndication feed"
-msgstr "Kanál Atom"
-
-#: ../freedesktop.org.xml.in.h:40
-msgid "AutoCAD image"
-msgstr "Obrázok AutoCAD"
-
-#: ../freedesktop.org.xml.in.h:41
-msgid "BCPIO document"
-msgstr "Dokument BCPIO"
+msgid "JavaFX video"
+msgstr "Video JavaFX"
 
+#. translators: a record is in this context a description of a board game
+#. that has been played, and that can be played back again:
+#. http://www.red-bean.com/sgf/
 #: ../freedesktop.org.xml.in.h:42
-msgid "BDF font"
-msgstr "Písmo BDF"
+msgid "SGF record"
+msgstr "Záznam SGF"
 
 #: ../freedesktop.org.xml.in.h:43
-msgid "BibTeX document"
-msgstr "Dokument BibTeX"
+msgid "XLIFF translation file"
+msgstr "Súbor prekladu XLIFF"
 
 #: ../freedesktop.org.xml.in.h:44
-msgid "BitTorrent seed file"
-msgstr "Súbor BitTorrent"
+msgid "YAML document"
+msgstr "Dokument YAML"
 
 #: ../freedesktop.org.xml.in.h:45
-msgid "Blender scene"
-msgstr "Scéna Blender"
+msgid "Corel Draw drawing"
+msgstr "Kresba Corel Draw"
+
+#: ../freedesktop.org.xml.in.h:46
+msgid "HPGL file"
+msgstr "Súbor HPGL"
+
+#: ../freedesktop.org.xml.in.h:47
+msgid "PCL file"
+msgstr "Súbor PCL"
 
-#. http://en.wikipedia.org/wiki/Blu-ray_Disc
-#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
 #: ../freedesktop.org.xml.in.h:48
-msgid "Blu-ray video disc"
-msgstr "Videodisk Blu-ray"
+msgid "Lotus 1-2-3 spreadsheet"
+msgstr "Zošit Lotus 1-2-3"
 
 #: ../freedesktop.org.xml.in.h:49
-msgid "Bzip archive"
-msgstr "Archív bzip"
+msgid "JET database"
+msgstr "Databáza JET"
 
 #: ../freedesktop.org.xml.in.h:50
-msgid "C header"
-msgstr "Hlavičky jazyka C"
+msgid "Microsoft Cabinet archive"
+msgstr "Archív Microsoft Cabinet"
 
 #: ../freedesktop.org.xml.in.h:51
-msgid "C shell script"
-msgstr "Skript shellu C"
+msgid "Excel spreadsheet"
+msgstr "Zošit Excel"
 
 #: ../freedesktop.org.xml.in.h:52
-msgid "C source code"
-msgstr "Zdrojový kód jazyka C"
+msgid "Excel add-in"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:53
-msgid "C# source code"
-msgstr "Zdrojový kód jazyka C#"
+msgid "Excel 2007 binary spreadsheet"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:54
-msgid "C++ header"
-msgstr "Hlavičky jazyka C++"
+msgid "Excel macro-enabled spreadsheet"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:55
-msgid "C++ source code"
-msgstr "Zdrojový kód jazyka C++"
+msgid "Excel macro-enabled spreadsheet template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:56
-msgid "CCITT G3 fax"
-msgstr "Fax CCITT G3"
+msgid "PowerPoint presentation"
+msgstr "Prezentácia PowerPoint"
 
 #: ../freedesktop.org.xml.in.h:57
-msgid "CD Table Of Contents"
-msgstr "Obsah CD"
+msgid "PowerPoint add-in"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:58
-msgid "CD image cuesheet"
-msgstr "Rozvrhnutie stôp obrazu CD"
+msgid "PowerPoint macro-enabled presentation"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:59
-msgid "CHM document"
-msgstr "Dokument CHM"
+msgid "PowerPoint macro-enabled slide"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:60
-msgid "CMU raster image"
-msgstr "Rastrový obrázok CMU"
+msgid "PowerPoint macro-enabled presentation template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:61
-msgid "CMake source code"
-msgstr "Zdrojový kód CMake"
+msgid "Word macro-enabled document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:62
-msgid "COBOL source file"
+msgid "Word macro-enabled document template"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:63
-msgid "CPIO archive"
-msgstr "Archív CPIO"
+msgid "XPS document"
+msgstr "Dokument XPS"
 
 #: ../freedesktop.org.xml.in.h:64
-msgid "CPIO archive (gzip-compressed)"
-msgstr "Archív CPIO (komprimovaný pomocou gzip)"
+msgid "Microsoft Works document"
+msgstr "Dokument Microsoft Works"
 
 #: ../freedesktop.org.xml.in.h:65
-msgid "CSS stylesheet"
-msgstr "Štýly CSS"
+msgid "Microsoft Visio document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:66
-msgid "CSV document"
-msgstr "Dokument CSV"
+msgid "Word document"
+msgstr "Dokument Word"
 
 #: ../freedesktop.org.xml.in.h:67
-msgid "Canon CR2 raw image"
-msgstr "Surový obrázok Canon CR2"
+msgid "Word template"
+msgstr "Šablóna Word"
 
 #: ../freedesktop.org.xml.in.h:68
-msgid "Canon CRW raw image"
-msgstr "Surový obrázok Canon CRW"
+msgid "GNUnet search file"
+msgstr "Vyhľadávací súbor GNUnet"
 
 #: ../freedesktop.org.xml.in.h:69
-msgid "Certificate revocation list"
-msgstr "Zoznam zrušených certifikátov"
+msgid "TNEF message"
+msgstr "Správa TNEF"
 
 #: ../freedesktop.org.xml.in.h:70
-msgid "ChangeLog document"
-msgstr "Dokument ChangeLog"
+msgid "StarCalc spreadsheet"
+msgstr "Zošit StarCalc"
 
 #: ../freedesktop.org.xml.in.h:71
-msgid "Cisco VPN Settings"
-msgstr "Nastavenia Cisco VPN"
+msgid "StarChart chart"
+msgstr "Graf StarChart"
 
 #: ../freedesktop.org.xml.in.h:72
-msgid "Citrix ICA settings file"
-msgstr "Súbor nastavení Citrix ICA"
+msgid "StarDraw drawing"
+msgstr "Kresba StarDraw"
 
 #: ../freedesktop.org.xml.in.h:73
-msgid "Commodore 64 audio"
-msgstr "Zvuk Commodore 64"
+msgid "StarImpress presentation"
+msgstr "Prezentácia StarImpress"
 
 #: ../freedesktop.org.xml.in.h:74
-msgid "Computer Graphics Metafile"
-msgstr "Computer Graphics Metafile"
+msgid "StarMail email"
+msgstr "E-mail StarMail"
 
 #: ../freedesktop.org.xml.in.h:75
-msgid "Corel Draw drawing"
-msgstr "Kresba Corel Draw"
+msgid "StarMath formula"
+msgstr "Vzorec StarMath"
 
 #: ../freedesktop.org.xml.in.h:76
-msgid "D source code"
-msgstr "Zdrojový kód jazyka D"
+msgid "StarWriter document"
+msgstr "Dokument StarWriter"
 
 #: ../freedesktop.org.xml.in.h:77
-msgid "DAR archive"
-msgstr "Archív DAR"
+msgid "OpenOffice Calc spreadsheet"
+msgstr "Zošit OpenOffice Calc"
 
 #: ../freedesktop.org.xml.in.h:78
-msgid "DCL script"
-msgstr "Skript DCL"
+msgid "OpenOffice Calc template"
+msgstr "Šablóna OpenOffice Calc"
 
 #: ../freedesktop.org.xml.in.h:79
-msgid "DER/PEM/Netscape-encoded X.509 certificate"
-msgstr "Certifikát X.509 kódovaný ako DER/PEM/Netscape"
+msgid "OpenOffice Draw drawing"
+msgstr "Kresba OpenOffice Draw"
 
 #: ../freedesktop.org.xml.in.h:80
-msgid "DIB image"
-msgstr "Obrázok DIB"
+msgid "OpenOffice Draw template"
+msgstr "Šablóna OpenOffice Draw"
 
 #: ../freedesktop.org.xml.in.h:81
-msgid "DICOM image"
-msgstr "Obrázok DICOM"
+msgid "OpenOffice Impress presentation"
+msgstr "Prezentácia OpenOffice Impress"
 
 #: ../freedesktop.org.xml.in.h:82
-msgid "DOS font"
-msgstr "Písmo pre DOS"
+msgid "OpenOffice Impress template"
+msgstr "Šablóna OpenOffice Impress"
 
 #: ../freedesktop.org.xml.in.h:83
-msgid "DOS/Windows executable"
-msgstr "Spustiteľný súbor pre DOS/Windows"
+msgid "OpenOffice Math formula"
+msgstr "Vzorec OpenOffice Math"
 
 #: ../freedesktop.org.xml.in.h:84
-msgid "DPX image"
-msgstr "Obrázok DPX"
+msgid "OpenOffice Writer document"
+msgstr "Dokument OpenOffice Writer"
 
 #: ../freedesktop.org.xml.in.h:85
-msgid "DSSSL document"
-msgstr "Dokument DSSSL"
+msgid "OpenOffice Writer global document"
+msgstr "Globálny dokument OpenOffice Writer"
 
 #: ../freedesktop.org.xml.in.h:86
-msgid "DTD file"
-msgstr "Súbor DTD"
+msgid "OpenOffice Writer template"
+msgstr "Šablóna OpenOffice Writer"
 
 #: ../freedesktop.org.xml.in.h:87
-msgid "DV video"
-msgstr "Video DV"
+msgid "ODT document"
+msgstr "Dokument ODT"
 
 #: ../freedesktop.org.xml.in.h:88
-msgid "DXF vector image"
-msgstr "Vektorový obrázok DXF"
+msgid "ODT document (Flat XML)"
+msgstr "Dokument ODT (čisté XML)"
 
 #: ../freedesktop.org.xml.in.h:89
-msgid "Debian package"
-msgstr "Balíček Debianu"
+msgid "ODT template"
+msgstr "Šablóna ODT"
 
 #: ../freedesktop.org.xml.in.h:90
-msgid "Dia diagram"
-msgstr "Diagram Dia"
+msgid "OTH template"
+msgstr "Šablóna OTH"
 
 #: ../freedesktop.org.xml.in.h:91
-msgid "Dia shape"
-msgstr ""
+msgid "ODM document"
+msgstr "Dokument ODM"
 
 #: ../freedesktop.org.xml.in.h:92
-msgid "DirectDraw surface"
-msgstr "Plocha DirectDraw"
+msgid "ODG drawing"
+msgstr "Kresba ODG"
 
 #: ../freedesktop.org.xml.in.h:93
-msgid "DjVu image"
-msgstr "Obrázok DjVu"
+msgid "ODG drawing (Flat XML)"
+msgstr "Kresba ODG (čisté XML)"
 
 #: ../freedesktop.org.xml.in.h:94
-msgid "DocBook document"
-msgstr "Dokument DocBook"
+msgid "ODG template"
+msgstr "Šablóna ODG"
 
 #: ../freedesktop.org.xml.in.h:95
-msgid "Dolby Digital audio"
-msgstr "Zvuk Dolby Digital"
+msgid "ODP presentation"
+msgstr "Prezentácia ODP"
 
 #: ../freedesktop.org.xml.in.h:96
-msgid "Dreamcast ROM"
-msgstr "ROM pre Dreamcast"
+msgid "ODP presentation (Flat XML)"
+msgstr "Prezentácia ODP (čisté XML)"
 
 #: ../freedesktop.org.xml.in.h:97
-msgid "ECMAScript program"
-msgstr "Program ECMAScript"
+msgid "ODP template"
+msgstr "Šablóna ODP"
 
 #: ../freedesktop.org.xml.in.h:98
-msgid "EMF image"
-msgstr "Obrázok EMF"
+msgid "ODS spreadsheet"
+msgstr "Zošit ODS"
 
 #: ../freedesktop.org.xml.in.h:99
-msgid "EPS image"
-msgstr "Obrázok EPS"
+msgid "ODS spreadsheet (Flat XML)"
+msgstr "Zošit ODS (čisté XML)"
 
 #: ../freedesktop.org.xml.in.h:100
-msgid "EPS image (bzip-compressed)"
-msgstr "Obrázok EPS (komprimovaný pomocou bzip)"
+msgid "ODS template"
+msgstr "Šablóna ODS"
 
 #: ../freedesktop.org.xml.in.h:101
-msgid "EPS image (gzip-compressed)"
-msgstr "Obrázok EPS (komprimovaný pomocou gzip)"
+msgid "ODC chart"
+msgstr "Graf ODC"
 
 #: ../freedesktop.org.xml.in.h:102
-msgid "EXR image"
-msgstr "Obrázok EXR"
+msgid "ODC template"
+msgstr "Šablóna ODC"
 
 #: ../freedesktop.org.xml.in.h:103
-msgid "Egon Animator animation"
-msgstr "Animácia Egon Animator"
+msgid "ODF formula"
+msgstr "Vzorec ODF"
 
 #: ../freedesktop.org.xml.in.h:104
-msgid "Eiffel source code"
-msgstr "Zdrojový kód Eiffel"
+msgid "ODF template"
+msgstr "Šablóna ODF"
 
 #: ../freedesktop.org.xml.in.h:105
-msgid "Emacs Lisp source code"
-msgstr "Zdrojový kód Emacs Lisp"
+msgid "ODB database"
+msgstr "Databáza ODB"
 
 #: ../freedesktop.org.xml.in.h:106
-msgid "Enlightenment theme"
-msgstr "Motív Enlightenment"
+msgid "ODI image"
+msgstr "Obrázok ODI"
 
 #: ../freedesktop.org.xml.in.h:107
-msgid "Erlang source code"
-msgstr "Zdrojový kód Erlang"
+msgid "OpenOffice.org extension"
+msgstr "Rozšírenie OpenOffice.org"
 
 #: ../freedesktop.org.xml.in.h:108
-msgid "Excel 2007 binary spreadsheet"
+msgid "Android package"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:109
-msgid "Excel 2007 spreadsheet"
-msgstr "Zošit Excel 2007"
+msgid "SIS package"
+msgstr "Balíček SIS"
 
 #: ../freedesktop.org.xml.in.h:110
-msgid "Excel 2007 spreadsheet template"
-msgstr ""
+msgid "SISX package"
+msgstr "Balíček SISX"
 
 #: ../freedesktop.org.xml.in.h:111
-msgid "Excel add-in"
+msgid "Network Packet Capture"
 msgstr ""
 
 #: ../freedesktop.org.xml.in.h:112
-msgid "Excel macro-enabled spreadsheet"
-msgstr ""
+msgid "WordPerfect document"
+msgstr "Dokument WordPerfect"
 
 #: ../freedesktop.org.xml.in.h:113
-msgid "Excel macro-enabled spreadsheet template"
-msgstr ""
+msgid "SPSS Portable Data File"
+msgstr "Súbor prenosných dát SPSS"
 
 #: ../freedesktop.org.xml.in.h:114
-msgid "Excel spreadsheet"
-msgstr "Zošit Excel"
+msgid "SPSS Data File"
+msgstr "Dátový súbor SPSS"
 
 #: ../freedesktop.org.xml.in.h:115
-msgid "FITS document"
-msgstr "Dokument FITS"
+msgid "XBEL bookmarks"
+msgstr "Záložky XBEL"
 
 #: ../freedesktop.org.xml.in.h:116
-msgid "FLAC audio"
-msgstr "Zvuk FLAC"
+msgid "7-zip archive"
+msgstr "Archív 7-zip"
 
 #: ../freedesktop.org.xml.in.h:117
-msgid "FLIC animation"
-msgstr "Animácia FLIC"
+msgid "AbiWord document"
+msgstr "Dokument AbiWord"
 
 #: ../freedesktop.org.xml.in.h:118
-msgid "FLTK Fluid file"
-msgstr "Súbor FLTK Fluid"
+msgid "CD image cuesheet"
+msgstr "Rozvrhnutie stôp obrazu CD"
 
 #: ../freedesktop.org.xml.in.h:119
-msgid "FPX image"
-msgstr "Obrázok FPX"
+msgid "Lotus AmiPro document"
+msgstr "Dokument Lotus AmiPro"
 
 #: ../freedesktop.org.xml.in.h:120
-msgid "FastTracker II audio"
-msgstr "Zvuk FastTracker II"
+msgid "AportisDoc document"
+msgstr "Dokument AportisDoc"
 
 #: ../freedesktop.org.xml.in.h:121
-msgid "FictionBook document"
-msgstr "Dokument FictionBook"
+msgid "Applix Spreadsheets spreadsheet"
+msgstr "Zošit Applix Spreadsheets"
 
 #: ../freedesktop.org.xml.in.h:122
-msgid "Flash video"
-msgstr "Video Flash"
+msgid "Applix Words document"
+msgstr "Dokument Applix Words"
 
 #: ../freedesktop.org.xml.in.h:123
-msgid "Fortran source code"
-msgstr "Zdrojový kód Fortran"
+msgid "ARC archive"
+msgstr "Archív ARC"
 
 #: ../freedesktop.org.xml.in.h:124
-msgid "Fuji RAF raw image"
-msgstr "Surový obrázok Fuji RAF"
+msgid "AR archive"
+msgstr "Archív AR"
 
 #: ../freedesktop.org.xml.in.h:125
-msgid "G3 fax image"
-msgstr "Obrázok fax G3"
+msgid "ARJ archive"
+msgstr "Archív ARJ"
 
 #: ../freedesktop.org.xml.in.h:126
-msgid "GDBM database"
-msgstr "Databáza GDBM"
+msgid "ASP page"
+msgstr "Stránka ASP"
 
 #: ../freedesktop.org.xml.in.h:127
-msgid "GEDCOM family history"
-msgstr "Rodokmeň GEDCOM"
+msgid "AWK script"
+msgstr "Skript AWK"
 
 #: ../freedesktop.org.xml.in.h:128
-msgid "GIF image"
-msgstr "Obrázok GIF"
+msgid "BCPIO document"
+msgstr "Dokument BCPIO"
 
 #: ../freedesktop.org.xml.in.h:129
-msgid "GIMP image"
-msgstr "Obrázok GIMP"
+msgid "BitTorrent seed file"
+msgstr "Súbor BitTorrent"
 
 #: ../freedesktop.org.xml.in.h:130
-msgid "GMC link"
-msgstr "Odkaz GMC"
-
+msgid "Blender scene"
+msgstr "Scéna Blender"
+
 #: ../freedesktop.org.xml.in.h:131
-msgid "GNU Oleo spreadsheet"
-msgstr "Zošit GNU Oleo"
+msgid "TeX DVI document (bzip-compressed)"
+msgstr "Dokument TeX DVI (komprimovaný pomocou bzip)"
 
 #: ../freedesktop.org.xml.in.h:132
-msgid "GNU mail message"
-msgstr "Správa GNU mail"
+msgid "Bzip archive"
+msgstr "Archív bzip"
 
 #: ../freedesktop.org.xml.in.h:133
-msgid "GNUnet search file"
-msgstr "Vyhľadávací súbor GNUnet"
+msgid "Tar archive (bzip-compressed)"
+msgstr "Archív tar (komprimovaný pomocou bzip)"
 
 #: ../freedesktop.org.xml.in.h:134
-msgid "GSM 06.10 audio"
-msgstr "Zvuk GSM 06.10"
+msgid "PDF document (bzip-compressed)"
+msgstr "Dokument PDF (komprimovaný pomocou bzip)"
 
 #: ../freedesktop.org.xml.in.h:135
-msgid "GTKtalog catalog"
-msgstr "Katalóg GTKtalog"
+msgid "PostScript document (bzip-compressed)"
+msgstr "Dokument PostScript (komprimovaný pomocou bzip)"
 
 #: ../freedesktop.org.xml.in.h:136
-msgid "Game Boy Advance ROM"
-msgstr "ROM pre Game Boy Advance"
+msgid "comic book archive"
+msgstr "Archív knihy komiksov"
 
 #: ../freedesktop.org.xml.in.h:137
-msgid "Game Boy ROM"
-msgstr "ROM pre Game Boy"
+msgid "Lrzip archive"
+msgstr "Archív Lrzip"
+
+#: ../freedesktop.org.xml.in.h:138
+msgid "Tar archive (lrzip-compressed)"
+msgstr "Archív tar (komprimovaný pomocou lrzip)"
+
+#: ../freedesktop.org.xml.in.h:139
+msgid "Apple disk image"
+msgstr "Obraz disku Apple"
 
-#. Translate this to Megadrive if the console was known as such in your locale
-#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History
 #: ../freedesktop.org.xml.in.h:140
-msgid "Genesis ROM"
-msgstr "ROM pre Megadrive"
+msgid "raw CD image"
+msgstr "Surový obraz CD"
 
 #: ../freedesktop.org.xml.in.h:141
-msgid "Glade project"
-msgstr "Projekt Glade"
+msgid "CD Table Of Contents"
+msgstr "Obsah CD"
 
 #: ../freedesktop.org.xml.in.h:142
-msgid "GnuCash financial data"
-msgstr "Finančné údaje GnuCash"
+msgid "PGN chess game notation"
+msgstr "Šachová notácia PGN"
 
 #: ../freedesktop.org.xml.in.h:143
-msgid "Gnumeric spreadsheet"
-msgstr "Zošit Gnumeric"
+msgid "CHM document"
+msgstr "Dokument CHM"
 
 #: ../freedesktop.org.xml.in.h:144
-msgid "Gnuplot document"
-msgstr "Dokument Gnuplot"
+msgid "Java byte code"
+msgstr "Bajtový kód Java"
 
 #: ../freedesktop.org.xml.in.h:145
-msgid "Go source code"
-msgstr ""
+msgid "UNIX-compressed file"
+msgstr "Súbor komprimovaný v Unixe"
 
 #: ../freedesktop.org.xml.in.h:146
-msgid "Google Video Pointer"
-msgstr "Google Video Pointer"
+msgid "Tar archive (gzip-compressed)"
+msgstr "Archív tar (komprimovaný pomocou gzip)"
 
 #: ../freedesktop.org.xml.in.h:147
-msgid "Graphite scientific graph"
-msgstr "Vedecký graf Graphite"
+msgid "program crash data"
+msgstr "Údaje o páde programu"
 
 #: ../freedesktop.org.xml.in.h:148
-msgid "Graphviz DOT graph"
-msgstr "Graf Graphviz DOT"
+msgid "CPIO archive"
+msgstr "Archív CPIO"
 
 #: ../freedesktop.org.xml.in.h:149
-msgid "Gzip archive"
-msgstr "Archív gzip"
+msgid "CPIO archive (gzip-compressed)"
+msgstr "Archív CPIO (komprimovaný pomocou gzip)"
+
+#: ../freedesktop.org.xml.in.h:150
+msgid "C shell script"
+msgstr "Skript shellu C"
+
+#: ../freedesktop.org.xml.in.h:151
+msgid "Xbase document"
+msgstr "Dokument Xbase"
 
-#. http://en.wikipedia.org/wiki/HD_DVD
-#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
 #: ../freedesktop.org.xml.in.h:152
-msgid "HD DVD video disc"
-msgstr "Videodisk HD DVD"
+msgid "ECMAScript program"
+msgstr "Program ECMAScript"
 
 #: ../freedesktop.org.xml.in.h:153
-msgid "HDF document"
-msgstr "Dokument HDF"
+msgid "Dreamcast ROM"
+msgstr "ROM pre Dreamcast"
 
 #: ../freedesktop.org.xml.in.h:154
-msgid "HPGL file"
-msgstr "Súbor HPGL"
+msgid "Nintendo DS ROM"
+msgstr "ROM pre Nintendo DS"
 
 #: ../freedesktop.org.xml.in.h:155
-msgid "HTML document"
-msgstr "Dokument HTML"
+msgid "Debian package"
+msgstr "Balíček Debianu"
 
 #: ../freedesktop.org.xml.in.h:156
-msgid "HTTP Live Streaming playlist"
-msgstr ""
+msgid "Qt Designer file"
+msgstr "Súbor Qt Designer"
 
 #: ../freedesktop.org.xml.in.h:157
-msgid "Haansoft Hangul document"
-msgstr "Dokument Haansoft Hangul"
+msgid "Qt Markup Language file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:158
-msgid "Haansoft Hangul document template"
-msgstr "Šablóna dokumentu Haansoft Hangul"
+msgid "desktop configuration file"
+msgstr "Súbor nastavení pracovnej plochy"
 
 #: ../freedesktop.org.xml.in.h:159
-msgid "Haskell source code"
-msgstr "Zdrojový kód Haskell"
+msgid "FictionBook document"
+msgstr "Dokument FictionBook"
 
 #: ../freedesktop.org.xml.in.h:160
-msgid "ICC profile"
-msgstr "Profil farieb ICC"
+msgid "Dia diagram"
+msgstr "Diagram Dia"
 
 #: ../freedesktop.org.xml.in.h:161
-msgid "IDL document"
-msgstr "Dokument IDL"
+msgid "Dia shape"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:162
-msgid "IEF image"
-msgstr "Obrázok IEF"
+msgid "TeX DVI document"
+msgstr "Dokument TeX DVI"
 
 #: ../freedesktop.org.xml.in.h:163
-msgid "IFF image"
-msgstr "Obrázok IFF"
+msgid "Enlightenment theme"
+msgstr "Motív Enlightenment"
 
 #: ../freedesktop.org.xml.in.h:164
-msgid "ILBM image"
-msgstr "Obrázok ILMB"
+msgid "Egon Animator animation"
+msgstr "Animácia Egon Animator"
 
 #: ../freedesktop.org.xml.in.h:165
-msgid "ISI video"
-msgstr "Video ISI"
+msgid "executable"
+msgstr "Spustiteľný súbor"
 
 #: ../freedesktop.org.xml.in.h:166
-msgid "IT 8.7 color calibration file"
-msgstr ""
+msgid "FLTK Fluid file"
+msgstr "Súbor FLTK Fluid"
 
 #: ../freedesktop.org.xml.in.h:167
-msgid "Impulse Tracker audio"
-msgstr "Zvuk Impulse Tracker"
+msgid "Postscript type-1 font"
+msgstr "Písmo Postscript type-1"
 
 #: ../freedesktop.org.xml.in.h:168
-msgid "Internet shortcut"
-msgstr "Internetový odkaz"
+msgid "Adobe font metrics"
+msgstr "Metrika písma Adobe"
 
 #: ../freedesktop.org.xml.in.h:169
-msgid "JAD document"
-msgstr "Dokument JAD"
+msgid "BDF font"
+msgstr "Písmo BDF"
 
 #: ../freedesktop.org.xml.in.h:170
-msgid "JBuilder project"
-msgstr "Projekt JBuilder"
+msgid "DOS font"
+msgstr "Písmo pre DOS"
 
 #: ../freedesktop.org.xml.in.h:171
-msgid "JET database"
-msgstr "Databáza JET"
+msgid "Adobe FrameMaker font"
+msgstr "Písmo Adobe FrameMaker"
 
 #: ../freedesktop.org.xml.in.h:172
-msgid "JNG image"
-msgstr "Obrázok JNG"
+msgid "LIBGRX font"
+msgstr "Písmo LIBGRX"
 
 #: ../freedesktop.org.xml.in.h:173
-msgid "JNLP file"
-msgstr "Súbor JNLP"
+msgid "Linux PSF console font"
+msgstr "Písmo PSF pre konzolu Linuxu"
 
 #: ../freedesktop.org.xml.in.h:174
-msgid "JPEG image"
-msgstr "Obrázok JPEG"
+msgid "Linux PSF console font (gzip-compressed)"
+msgstr "Písmo PSF pre konzolu Linuxu (komprimované pomocou gzip)"
 
 #: ../freedesktop.org.xml.in.h:175
-msgid "JPEG-2000 image"
-msgstr "Obrázok JPEG-2000"
+msgid "PCF font"
+msgstr "Písmo PCF"
 
 #: ../freedesktop.org.xml.in.h:176
-msgid "Java JCE keystore"
-msgstr "Úložisko kľúčov Java JCE"
+msgid "OpenType font"
+msgstr "Písmo OpenType"
 
 #: ../freedesktop.org.xml.in.h:177
-msgid "Java archive"
-msgstr "Archív Java"
+msgid "Speedo font"
+msgstr "Písmo Speedo"
 
 #: ../freedesktop.org.xml.in.h:178
-msgid "Java byte code"
-msgstr "Bajtový kód Java"
+msgid "SunOS News font"
+msgstr "Písmo SunOS News"
 
 #: ../freedesktop.org.xml.in.h:179
-msgid "Java class"
-msgstr "Trieda Java"
+msgid "TeX font"
+msgstr "Písmo TeX"
 
 #: ../freedesktop.org.xml.in.h:180
-msgid "Java keystore"
-msgstr "Úložisko kľúčov Java"
+msgid "TeX font metrics"
+msgstr "Metrika písma TeX"
 
 #: ../freedesktop.org.xml.in.h:181
-msgid "Java source code"
-msgstr "Zdrojový kód Java"
+msgid "TrueType font"
+msgstr "Písmo TrueType"
 
 #: ../freedesktop.org.xml.in.h:182
-msgid "JavaFX video"
-msgstr "Video JavaFX"
+msgid "TrueType XML font"
+msgstr "Písmo TrueType XML"
 
 #: ../freedesktop.org.xml.in.h:183
-msgid "JavaScript program"
-msgstr "Program jazyka JavaScript"
+msgid "V font"
+msgstr "Písmo V"
 
 #: ../freedesktop.org.xml.in.h:184
-msgid "KChart chart"
-msgstr "Graf KChart"
+msgid "Adobe FrameMaker document"
+msgstr "Dokument Adobe FrameMaker"
 
 #: ../freedesktop.org.xml.in.h:185
-msgid "KFormula formula"
-msgstr "Vzorec KFormula"
+msgid "Game Boy ROM"
+msgstr "ROM pre Game Boy"
 
 #: ../freedesktop.org.xml.in.h:186
-msgid "KIllustrator drawing"
-msgstr "Kresba KIllustrator"
+msgid "Game Boy Advance ROM"
+msgstr "ROM pre Game Boy Advance"
 
 #: ../freedesktop.org.xml.in.h:187
-msgid "KML geographic compressed data"
-msgstr "Komprimované zemepisné údaje KML"
-
-#: ../freedesktop.org.xml.in.h:188
-msgid "KML geographic data"
-msgstr "Zemepisné údaje KML"
-
-#: ../freedesktop.org.xml.in.h:189
-msgid "KPovModeler scene"
-msgstr "Scéna KPovModeler"
+msgid "GDBM database"
+msgstr "Databáza GDBM"
 
+#. Translate this to Megadrive if the console was known as such in your locale
+#. Should be Megadrive in all but en_US: http://en.wikipedia.org/wiki/Megadrive#History
 #: ../freedesktop.org.xml.in.h:190
-msgid "KPresenter presentation"
-msgstr "Prezentácia KPresenter"
+msgid "Genesis ROM"
+msgstr "ROM pre Megadrive"
 
 #: ../freedesktop.org.xml.in.h:191
-msgid "KSpread spreadsheet"
-msgstr "Zošit KSpread"
+msgid "translated messages (machine-readable)"
+msgstr "Preložené správy (strojovo čitateľné)"
 
 #: ../freedesktop.org.xml.in.h:192
-msgid "KSpread spreadsheet (encrypted)"
-msgstr "Zošit KSpread (šifrovaný)"
+msgid "Glade project"
+msgstr "Projekt Glade"
 
 #: ../freedesktop.org.xml.in.h:193
-msgid "KSysV init package"
-msgstr "Balíček KSysV init"
+msgid "GMC link"
+msgstr "Odkaz GMC"
 
 #: ../freedesktop.org.xml.in.h:194
-msgid "KWord document"
-msgstr "Dokument KWord"
+msgid "GnuCash financial data"
+msgstr "Finančné údaje GnuCash"
 
 #: ../freedesktop.org.xml.in.h:195
-msgid "KWord document (encrypted)"
-msgstr "Dokument KWord (šifrovaný)"
+msgid "Gnumeric spreadsheet"
+msgstr "Zošit Gnumeric"
 
 #: ../freedesktop.org.xml.in.h:196
-msgid "Karbon14 drawing"
-msgstr "Kresba Karbon14"
+msgid "Gnuplot document"
+msgstr "Dokument Gnuplot"
 
 #: ../freedesktop.org.xml.in.h:197
-msgid "Kexi database file-based project"
-msgstr ""
+msgid "Graphite scientific graph"
+msgstr "Vedecký graf Graphite"
 
 #: ../freedesktop.org.xml.in.h:198
-msgid "Kexi settings for database server connection"
-msgstr "Nastavenia Kexi pre pripojenie k databázovému serveru"
+msgid "GTKtalog catalog"
+msgstr "Katalóg GTKtalog"
 
 #: ../freedesktop.org.xml.in.h:199
-msgid "Kivio flowchart"
-msgstr "Vývojový diagram Kivio"
+msgid "TeX DVI document (gzip-compressed)"
+msgstr "Dokument TeX DVI (komprimovaný pomocou gzip)"
 
 #: ../freedesktop.org.xml.in.h:200
-msgid "Kodak DCR raw image"
-msgstr "Surový obrázok Kodak DCR"
+msgid "Gzip archive"
+msgstr "Archív gzip"
 
 #: ../freedesktop.org.xml.in.h:201
-msgid "Kodak K25 raw image"
-msgstr "Surový obrázok Kodak K25"
+msgid "PDF document (gzip-compressed)"
+msgstr "Dokument PDF (komprimovaný pomocou gzip)"
 
 #: ../freedesktop.org.xml.in.h:202
-msgid "Kodak KDC raw image"
-msgstr "Surový obrázok Kodak KDC"
+msgid "PostScript document (gzip-compressed)"
+msgstr "Dokument PostScript (komprimovaný pomocou gzip)"
 
 #: ../freedesktop.org.xml.in.h:203
-msgid "Kontour drawing"
-msgstr "Kresba Kontour"
+msgid "HDF document"
+msgstr "Dokument HDF"
 
 #: ../freedesktop.org.xml.in.h:204
-msgid "Krita document"
-msgstr "Dokument Krita"
+msgid "iPod firmware"
+msgstr "Firmware iPod"
 
 #: ../freedesktop.org.xml.in.h:205
-msgid "Kugar document"
-msgstr "Dokument Kugar"
+msgid "Java archive"
+msgstr "Archív Java"
 
 #: ../freedesktop.org.xml.in.h:206
-msgid "LDIF address book"
-msgstr "Adresár LDIF"
+msgid "Java class"
+msgstr "Trieda Java"
 
 #: ../freedesktop.org.xml.in.h:207
-msgid "LHA archive"
-msgstr "Archív LHA"
+msgid "JNLP file"
+msgstr "Súbor JNLP"
 
 #: ../freedesktop.org.xml.in.h:208
-msgid "LHS source code"
-msgstr "Zdrojový kód LHS"
+msgid "Java keystore"
+msgstr "Úložisko kľúčov Java"
 
 #: ../freedesktop.org.xml.in.h:209
-msgid "LHZ archive"
-msgstr "Archív LHZ"
+msgid "Java JCE keystore"
+msgstr "Úložisko kľúčov Java JCE"
 
 #: ../freedesktop.org.xml.in.h:210
-msgid "LIBGRX font"
-msgstr "Písmo LIBGRX"
+msgid "Pack200 Java archive"
+msgstr "Archív Java Pack200"
 
 #: ../freedesktop.org.xml.in.h:211
-msgid "LZMA archive"
-msgstr "Archív LZMA"
+msgid "JavaScript program"
+msgstr "Program jazyka JavaScript"
 
 #: ../freedesktop.org.xml.in.h:212
-msgid "LZO archive"
-msgstr "Archív LZO"
+msgid "JBuilder project"
+msgstr "Projekt JBuilder"
 
 #: ../freedesktop.org.xml.in.h:213
-msgid "LightWave object"
-msgstr "Objekt LightWave"
+msgid "Karbon14 drawing"
+msgstr "Kresba Karbon14"
 
 #: ../freedesktop.org.xml.in.h:214
-msgid "LightWave scene"
-msgstr "Scéna LightWave"
+msgid "KChart chart"
+msgstr "Graf KChart"
 
 #: ../freedesktop.org.xml.in.h:215
-msgid "Lilypond music sheet"
-msgstr "Notový papier Lilypond"
+msgid "Kexi settings for database server connection"
+msgstr "Nastavenia Kexi pre pripojenie k databázovému serveru"
 
 #: ../freedesktop.org.xml.in.h:216
-msgid "Linear and integer program expression format"
-msgstr "Lineárny a celočíselný formát výrazu programu"
+msgid "shortcut to Kexi project on database server"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:217
-msgid "Linux PSF console font"
-msgstr "Písmo PSF pre konzolu Linuxu"
+msgid "Kexi database file-based project"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:218
-msgid "Linux PSF console font (gzip-compressed)"
-msgstr "Písmo PSF pre konzolu Linuxu (komprimované pomocou gzip)"
+msgid "KFormula formula"
+msgstr "Vzorec KFormula"
 
 #: ../freedesktop.org.xml.in.h:219
-msgid "Lotus 1-2-3 spreadsheet"
-msgstr "Zošit Lotus 1-2-3"
+msgid "KIllustrator drawing"
+msgstr "Kresba KIllustrator"
 
 #: ../freedesktop.org.xml.in.h:220
-msgid "Lotus AmiPro document"
-msgstr "Dokument Lotus AmiPro"
+msgid "Kivio flowchart"
+msgstr "Vývojový diagram Kivio"
 
 #: ../freedesktop.org.xml.in.h:221
-msgid "Lrzip archive"
-msgstr "Archív Lrzip"
+msgid "Kontour drawing"
+msgstr "Kresba Kontour"
 
 #: ../freedesktop.org.xml.in.h:222
-msgid "Lua script"
-msgstr "Skript Lua"
+msgid "KPovModeler scene"
+msgstr "Scéna KPovModeler"
 
 #: ../freedesktop.org.xml.in.h:223
-msgid "LyX document"
-msgstr "Dokument LyX"
+msgid "KPresenter presentation"
+msgstr "Prezentácia KPresenter"
 
 #: ../freedesktop.org.xml.in.h:224
-msgid "Lzip archive"
-msgstr "Archív Lzip"
+msgid "Krita document"
+msgstr "Dokument Krita"
 
 #: ../freedesktop.org.xml.in.h:225
-msgid "M4 macro"
-msgstr "Makro M4"
+msgid "KSpread spreadsheet"
+msgstr "Zošit KSpread"
 
 #: ../freedesktop.org.xml.in.h:226
-msgid "MATLAB script/function"
-msgstr "Skript/funkcia MATLAB"
+msgid "KSpread spreadsheet (encrypted)"
+msgstr "Zošit KSpread (šifrovaný)"
 
 #: ../freedesktop.org.xml.in.h:227
-msgid "MIDI audio"
-msgstr "Zvuk MIDI"
+msgid "KSysV init package"
+msgstr "Balíček KSysV init"
 
 #: ../freedesktop.org.xml.in.h:228
-msgid "MNG animation"
-msgstr "Animácia MNG"
+msgid "Kugar document"
+msgstr "Dokument Kugar"
 
 #: ../freedesktop.org.xml.in.h:229
-msgid "MP2 audio"
-msgstr "Zvuk MP2"
+msgid "KWord document"
+msgstr "Dokument KWord"
 
 #: ../freedesktop.org.xml.in.h:230
-msgid "MP3 ShoutCast playlist"
-msgstr "Zoznam skladieb MP3 ShoutCast"
+msgid "KWord document (encrypted)"
+msgstr "Dokument KWord (šifrovaný)"
 
 #: ../freedesktop.org.xml.in.h:231
-msgid "MP3 audio"
-msgstr "Zvuk MP3"
+msgid "LHA archive"
+msgstr "Archív LHA"
 
 #: ../freedesktop.org.xml.in.h:232
-msgid "MP3 audio (streamed)"
-msgstr "Zvuk MP3 (streamovaný)"
+msgid "LHZ archive"
+msgstr "Archív LHZ"
 
 #: ../freedesktop.org.xml.in.h:233
-msgid "MPEG video"
-msgstr "Video MPEG"
+msgid "message catalog"
+msgstr "Katalóg správ"
 
 #: ../freedesktop.org.xml.in.h:234
-msgid "MPEG video (streamed)"
-msgstr ""
+msgid "LyX document"
+msgstr "Dokument LyX"
 
 #: ../freedesktop.org.xml.in.h:235
-msgid "MPEG-2 transport stream"
-msgstr ""
+msgid "Lzip archive"
+msgstr "Archív Lzip"
 
 #: ../freedesktop.org.xml.in.h:236
-msgid "MPEG-4 audio"
-msgstr "Zvuk MPEG-4"
+msgid "LZMA archive"
+msgstr "Archív LZMA"
 
 #: ../freedesktop.org.xml.in.h:237
-msgid "MPEG-4 audio book"
-msgstr "Zvuková kniha MPEG-4"
+msgid "Tar archive (LZMA-compressed)"
+msgstr "Archív tar (komprimovaný pomocou LZMA)"
 
 #: ../freedesktop.org.xml.in.h:238
-msgid "MPEG-4 video"
-msgstr "Video MPEG-4"
+msgid "LZO archive"
+msgstr "Archív LZO"
 
 #: ../freedesktop.org.xml.in.h:239
-msgid "MPSub subtitles"
-msgstr "Titulky MPSub"
+msgid "MagicPoint presentation"
+msgstr "Prezentácia MagicPoint"
 
 #: ../freedesktop.org.xml.in.h:240
-msgid "MRML playlist"
-msgstr "Zoznam skladieb MRML"
+msgid "Macintosh MacBinary file"
+msgstr "Súbor pre Macintosh MacBinary"
 
 #: ../freedesktop.org.xml.in.h:241
-msgid "MSX ROM"
-msgstr "ROM pre MSX"
+msgid "Matroska stream"
+msgstr "Stream Matroska"
 
 #: ../freedesktop.org.xml.in.h:242
-msgid "MXF video"
-msgstr "Video MXF"
+msgid "Matroska video"
+msgstr "Video Matroska"
 
 #: ../freedesktop.org.xml.in.h:243
-msgid "MacOS X icon"
-msgstr "Ikona MacOS X"
+msgid "Matroska audio"
+msgstr "Zvuk Matroska"
 
 #: ../freedesktop.org.xml.in.h:244
-msgid "MacPaint Bitmap image"
-msgstr "Obrázok MacPaint Bitmap"
+msgid "WebM video"
+msgstr "Video WebM"
 
 #: ../freedesktop.org.xml.in.h:245
-msgid "Macintosh AppleDouble-encoded file"
-msgstr "Súbor kódovaný pomocou Macintosh AppleDouble"
+msgid "WebM audio"
+msgstr "Zvuk WebM"
 
 #: ../freedesktop.org.xml.in.h:246
-msgid "Macintosh BinHex-encoded file"
-msgstr "Súbor kódovaný pomocou Macintosh BinHex"
+msgid "MXF video"
+msgstr "Video MXF"
 
 #: ../freedesktop.org.xml.in.h:247
-msgid "Macintosh MacBinary file"
-msgstr "Súbor pre Macintosh MacBinary"
+msgid "OCL file"
+msgstr "Súbor OCL"
 
 #: ../freedesktop.org.xml.in.h:248
-msgid "Macintosh Quickdraw/PICT drawing"
-msgstr "Kresba Macintosh QuickDraw/PICT"
+msgid "COBOL source file"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:249
-msgid "MagicPoint presentation"
-msgstr "Prezentácia MagicPoint"
+msgid "Mobipocket e-book"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:250
-msgid "Makefile"
-msgstr "Makefile"
+msgid "Adobe FrameMaker MIF document"
+msgstr "Dokument Adobe FrameMaker MIF"
 
 #: ../freedesktop.org.xml.in.h:251
-msgid "Managed Object Format"
-msgstr "Formát Managed Object"
+msgid "Mozilla bookmarks"
+msgstr "Záložky Mozilla"
 
 #: ../freedesktop.org.xml.in.h:252
-msgid "Markaby script"
-msgstr "Skript Markaby"
+msgid "DOS/Windows executable"
+msgstr "Spustiteľný súbor pre DOS/Windows"
 
 #: ../freedesktop.org.xml.in.h:253
-msgid "Markdown document"
-msgstr ""
+msgid "Internet shortcut"
+msgstr "Internetový odkaz"
 
 #: ../freedesktop.org.xml.in.h:254
-msgid "MathML document"
-msgstr "Dokument MathML"
+msgid "WRI document"
+msgstr "Dokument WRI"
 
 #: ../freedesktop.org.xml.in.h:255
-msgid "Mathematica Notebook"
-msgstr "Zošit Mathematica"
+msgid "MSX ROM"
+msgstr "ROM pre MSX"
 
 #: ../freedesktop.org.xml.in.h:256
-msgid "Matroska audio"
-msgstr "Zvuk Matroska"
+msgid "M4 macro"
+msgstr "Makro M4"
 
 #: ../freedesktop.org.xml.in.h:257
-msgid "Matroska stream"
-msgstr "Stream Matroska"
+msgid "Nintendo64 ROM"
+msgstr "ROM pre Nintendo64"
 
 #: ../freedesktop.org.xml.in.h:258
-msgid "Matroska video"
-msgstr "Video Matroska"
-
-#: ../freedesktop.org.xml.in.h:259
-msgid "Metalink file"
-msgstr "Súbor Metalink"
+msgid "Nautilus link"
+msgstr "Odkaz Nautilus"
 
+#. Translate this to Famicom if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:260
-msgid "MicroDVD subtitles"
-msgstr "Titulky MicroDVD"
+msgid "NES ROM"
+msgstr "ROM pre NES"
 
 #: ../freedesktop.org.xml.in.h:261
-msgid "Microsoft ASX playlist"
-msgstr "Zoznam skladieb Microsoft ASX"
+msgid "Unidata NetCDF document"
+msgstr "Dokument Unidata NetCDF"
 
 #: ../freedesktop.org.xml.in.h:262
-msgid "Microsoft Cabinet archive"
-msgstr "Archív Microsoft Cabinet"
+msgid "NewzBin usenet index"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:263
-msgid "Microsoft Document Imaging format"
-msgstr "Formát Microsoft Document Imaging"
+msgid "object code"
+msgstr "Objektový kód"
 
 #: ../freedesktop.org.xml.in.h:264
-msgid "Microsoft Windows theme pack"
-msgstr "Balík tém Microsoft Windows"
+msgid "Annodex exchange format"
+msgstr "Formát pre výmenu Annodex"
 
 #: ../freedesktop.org.xml.in.h:265
-msgid "Microsoft Works document"
-msgstr "Dokument Microsoft Works"
+msgid "Annodex Video"
+msgstr "Video Annodex"
 
 #: ../freedesktop.org.xml.in.h:266
-msgid "Microsoft icon"
-msgstr "Ikona Microsoft"
+msgid "Annodex Audio"
+msgstr "Zvuk Annodex"
 
 #: ../freedesktop.org.xml.in.h:267
-msgid "MiniPSF audio"
-msgstr "Zvuk MiniPSF"
+msgid "Ogg multimedia file"
+msgstr "Súbor multimédií Ogg"
 
 #: ../freedesktop.org.xml.in.h:268
-msgid "Minolta MRW raw image"
-msgstr "Surový obrázok Minolta MRW"
+msgid "Ogg Audio"
+msgstr "Zvuk Ogg"
 
 #: ../freedesktop.org.xml.in.h:269
-msgid "Mobipocket e-book"
-msgstr ""
+msgid "Ogg Video"
+msgstr "Video Ogg"
 
 #: ../freedesktop.org.xml.in.h:270
-msgid "Monkey's audio"
-msgstr "Zvuk Monkey's"
+msgid "Ogg Vorbis audio"
+msgstr "Zvuk Ogg Vorbis"
 
 #: ../freedesktop.org.xml.in.h:271
-msgid "Mozilla bookmarks"
-msgstr "Záložky Mozilla"
+msgid "Ogg FLAC audio"
+msgstr "Zvuk Ogg FLAC"
 
 #: ../freedesktop.org.xml.in.h:272
-msgid "Mup publication"
-msgstr "Publikácie Mup"
+msgid "Ogg Speex audio"
+msgstr "Zvuk Ogg Speex"
 
 #: ../freedesktop.org.xml.in.h:273
-msgid "Musepack audio"
-msgstr "Zvuk Musepack"
+msgid "Speex audio"
+msgstr "Zvuk Speex"
+
+#: ../freedesktop.org.xml.in.h:274
+msgid "Ogg Theora video"
+msgstr "Video Ogg Theora"
 
-#. Translate this to Famicom if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:275
-msgid "NES ROM"
-msgstr "ROM pre NES"
+msgid "OGM video"
+msgstr "Video OGM"
 
 #: ../freedesktop.org.xml.in.h:276
-msgid "NFO document"
-msgstr "Dokument NFO"
+msgid "OLE2 compound document storage"
+msgstr "Úložisko zloženého dokumentu OLE2"
 
 #: ../freedesktop.org.xml.in.h:277
-msgid "NIFF image"
-msgstr "Obrázok NIFF"
+msgid "Windows Installer package"
+msgstr "Balík Windows Installer"
 
 #: ../freedesktop.org.xml.in.h:278
-msgid "Nautilus link"
-msgstr "Odkaz Nautilus"
+msgid "GNU Oleo spreadsheet"
+msgstr "Zošit GNU Oleo"
 
 #: ../freedesktop.org.xml.in.h:279
-msgid "Network Packet Capture"
-msgstr ""
+msgid "PAK archive"
+msgstr "Archív PAK"
 
 #: ../freedesktop.org.xml.in.h:280
-msgid "NewzBin usenet index"
-msgstr ""
+msgid "Palm OS database"
+msgstr "Databáza Palm OS"
 
 #: ../freedesktop.org.xml.in.h:281
-msgid "Nikon NEF raw image"
-msgstr "Surový obrázok Nikon NEF"
+msgid "Parchive archive"
+msgstr "Archív Parchive"
 
 #: ../freedesktop.org.xml.in.h:282
-msgid "Nintendo DS ROM"
-msgstr "ROM pre Nintendo DS"
+msgid "PEF executable"
+msgstr "Spustiteľný súbor PEF"
 
 #: ../freedesktop.org.xml.in.h:283
-msgid "Nintendo64 ROM"
-msgstr "ROM pre Nintendo64"
+msgid "Perl script"
+msgstr "Skript jazyka Perl"
 
 #: ../freedesktop.org.xml.in.h:284
-msgid "NullSoft video"
-msgstr "Video NullSoft"
+msgid "PHP script"
+msgstr "Skript PHP"
 
 #: ../freedesktop.org.xml.in.h:285
-msgid "OCL file"
-msgstr "Súbor OCL"
+msgid "PKCS#7 certificate bundle"
+msgstr "Zväzok certifikátov PKCS#7"
 
 #: ../freedesktop.org.xml.in.h:286
-msgid "OCaml source code"
-msgstr "Zdrojový kód OCaml"
+msgid "PKCS#12 certificate bundle"
+msgstr "Zväzok certifikátov PKCS#12"
 
 #: ../freedesktop.org.xml.in.h:287
-msgid "ODA document"
-msgstr "Dokument ODA"
+msgid "PlanPerfect spreadsheet"
+msgstr "Zošit PlanPerfect"
 
 #: ../freedesktop.org.xml.in.h:288
-msgid "ODB database"
-msgstr "Databáza ODB"
+msgid "Pocket Word document"
+msgstr "Dokument Pocket Word"
 
 #: ../freedesktop.org.xml.in.h:289
-msgid "ODC chart"
-msgstr "Graf ODC"
+msgid "Linear and integer program expression format"
+msgstr "Lineárny a celočíselný formát výrazu programu"
 
 #: ../freedesktop.org.xml.in.h:290
-msgid "ODC template"
-msgstr "Šablóna ODC"
+msgid "profiler results"
+msgstr "Výsledky profilera"
 
 #: ../freedesktop.org.xml.in.h:291
-msgid "ODF formula"
-msgstr "Vzorec ODF"
+msgid "Pathetic Writer document"
+msgstr "Dokument Pathetic Writer"
 
 #: ../freedesktop.org.xml.in.h:292
-msgid "ODF template"
-msgstr "Šablóna ODF"
+msgid "Python bytecode"
+msgstr "Bajtový kód Python"
 
 #: ../freedesktop.org.xml.in.h:293
-msgid "ODG drawing"
-msgstr "Kresba ODG"
+msgid "Quattro Pro spreadsheet"
+msgstr "Zošit Quattro Pro"
 
 #: ../freedesktop.org.xml.in.h:294
-msgid "ODG drawing (Flat XML)"
-msgstr "Kresba ODG (čisté XML)"
+msgid "QuickTime metalink playlist"
+msgstr "Zoznam skladieb metalink QuickTime"
 
 #: ../freedesktop.org.xml.in.h:295
-msgid "ODG template"
-msgstr "Šablóna ODG"
+msgid "Quicken document"
+msgstr "Dokument Quicken"
 
 #: ../freedesktop.org.xml.in.h:296
-msgid "ODI image"
-msgstr "Obrázok ODI"
+msgid "RAR archive"
+msgstr "Archív RAR"
 
 #: ../freedesktop.org.xml.in.h:297
-msgid "ODM document"
-msgstr "Dokument ODM"
+msgid "DAR archive"
+msgstr "Archív DAR"
 
 #: ../freedesktop.org.xml.in.h:298
-msgid "ODP presentation"
-msgstr "Prezentácia ODP"
+msgid "Alzip archive"
+msgstr "Archív Alzip"
 
 #: ../freedesktop.org.xml.in.h:299
-msgid "ODP presentation (Flat XML)"
-msgstr "Prezentácia ODP (čisté XML)"
+msgid "rejected patch"
+msgstr "Odmietnutá záplata"
 
 #: ../freedesktop.org.xml.in.h:300
-msgid "ODP template"
-msgstr "Šablóna ODP"
+msgid "RPM package"
+msgstr "Balík RPM"
 
 #: ../freedesktop.org.xml.in.h:301
-msgid "ODS spreadsheet"
-msgstr "Zošit ODS"
+msgid "Ruby script"
+msgstr "Skript Ruby"
 
 #: ../freedesktop.org.xml.in.h:302
-msgid "ODS spreadsheet (Flat XML)"
-msgstr "Zošit ODS (čisté XML)"
+msgid "Markaby script"
+msgstr "Skript Markaby"
 
 #: ../freedesktop.org.xml.in.h:303
-msgid "ODS template"
-msgstr "Šablóna ODS"
+msgid "SC/Xspread spreadsheet"
+msgstr "Zošit SC/Xspread"
 
 #: ../freedesktop.org.xml.in.h:304
-msgid "ODT document"
-msgstr "Dokument ODT"
+msgid "shell archive"
+msgstr "Archív shellu"
 
 #: ../freedesktop.org.xml.in.h:305
-msgid "ODT document (Flat XML)"
-msgstr "Dokument ODT (čisté XML)"
+msgid "libtool shared library"
+msgstr "Zdieľaná knižnica libtool"
 
 #: ../freedesktop.org.xml.in.h:306
-msgid "ODT template"
-msgstr "Šablóna ODT"
+msgid "shared library"
+msgstr "Zdieľaná knižnica"
 
 #: ../freedesktop.org.xml.in.h:307
-msgid "OGM video"
-msgstr "Video OGM"
+msgid "shell script"
+msgstr "Skript shellu"
 
 #: ../freedesktop.org.xml.in.h:308
-msgid "OLE2 compound document storage"
-msgstr "Úložisko zloženého dokumentu OLE2"
-
-#: ../freedesktop.org.xml.in.h:309
-msgid "OOC source code"
-msgstr ""
+msgid "Shockwave Flash file"
+msgstr "Súbor Shockwave Flash"
 
+#. translators: "Shorten" is the name of an audio codec
 #: ../freedesktop.org.xml.in.h:310
-msgid "OPML syndication feed"
-msgstr "Kanál OPML"
+msgid "Shorten audio"
+msgstr "Zvuk Shorten"
 
 #: ../freedesktop.org.xml.in.h:311
-msgid "OTH template"
-msgstr "Šablóna OTH"
+msgid "Siag spreadsheet"
+msgstr "Zošit Siag"
 
 #: ../freedesktop.org.xml.in.h:312
-msgid "Objective-C source code"
-msgstr "Zdrojový kód Objective-C"
+msgid "Skencil document"
+msgstr "Dokument Skencil"
 
 #: ../freedesktop.org.xml.in.h:313
-msgid "Office drawing"
-msgstr "Kresba Office"
+msgid "Stampede package"
+msgstr "Balíček Stampede"
 
 #: ../freedesktop.org.xml.in.h:314
-msgid "Ogg Audio"
-msgstr "Zvuk Ogg"
-
-#: ../freedesktop.org.xml.in.h:315
-msgid "Ogg FLAC audio"
-msgstr "Zvuk Ogg FLAC"
+msgid "Sega Master System/Game Gear ROM"
+msgstr "ROM pre Sega Master System/Game Gear"
 
+#. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:316
-msgid "Ogg Speex audio"
-msgstr "Zvuk Ogg Speex"
+msgid "Super NES ROM"
+msgstr "ROM pre Super Nintendo"
 
 #: ../freedesktop.org.xml.in.h:317
-msgid "Ogg Theora video"
-msgstr "Video Ogg Theora"
+msgid "StuffIt archive"
+msgstr "Archív StuffIt"
 
 #: ../freedesktop.org.xml.in.h:318
-msgid "Ogg Video"
-msgstr "Video Ogg"
+msgid "SubRip subtitles"
+msgstr "Titulky SubRip"
 
 #: ../freedesktop.org.xml.in.h:319
-msgid "Ogg Vorbis audio"
-msgstr "Zvuk Ogg Vorbis"
+msgid "WebVTT subtitles"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:320
-msgid "Ogg multimedia file"
-msgstr "Súbor multimédií Ogg"
+msgid "SAMI subtitles"
+msgstr "Titulky SAMI"
 
 #: ../freedesktop.org.xml.in.h:321
-msgid "Olympus ORF raw image"
-msgstr "Surový obrázok Olympus ORF"
+msgid "MicroDVD subtitles"
+msgstr "Titulky MicroDVD"
 
 #: ../freedesktop.org.xml.in.h:322
-msgid "OpenOffice Calc spreadsheet"
-msgstr "Zošit OpenOffice Calc"
+msgid "MPSub subtitles"
+msgstr "Titulky MPSub"
 
 #: ../freedesktop.org.xml.in.h:323
-msgid "OpenOffice Calc template"
-msgstr "Šablóna OpenOffice Calc"
+msgid "SSA subtitles"
+msgstr "Titulky SSA"
 
 #: ../freedesktop.org.xml.in.h:324
-msgid "OpenOffice Draw drawing"
-msgstr "Kresba OpenOffice Draw"
+msgid "SubViewer subtitles"
+msgstr "Titulky SubViewer"
 
 #: ../freedesktop.org.xml.in.h:325
-msgid "OpenOffice Draw template"
-msgstr "Šablóna OpenOffice Draw"
+msgid "iMelody ringtone"
+msgstr "Vyzváňacie melódie iMelody"
 
 #: ../freedesktop.org.xml.in.h:326
-msgid "OpenOffice Impress presentation"
-msgstr "Prezentácia OpenOffice Impress"
+msgid "SMAF audio"
+msgstr "Zvuk SMAF"
 
 #: ../freedesktop.org.xml.in.h:327
-msgid "OpenOffice Impress template"
-msgstr "Šablóna OpenOffice Impress"
+msgid "MRML playlist"
+msgstr "Zoznam skladieb MRML"
 
 #: ../freedesktop.org.xml.in.h:328
-msgid "OpenOffice Math formula"
-msgstr "Vzorec OpenOffice Math"
+msgid "XMF audio"
+msgstr "Zvuk XMF"
 
 #: ../freedesktop.org.xml.in.h:329
-msgid "OpenOffice Writer document"
-msgstr "Dokument OpenOffice Writer"
+msgid "SV4 CPIO archive"
+msgstr "Archív SV4 CPIO"
 
 #: ../freedesktop.org.xml.in.h:330
-msgid "OpenOffice Writer global document"
-msgstr "Globálny dokument OpenOffice Writer"
+msgid "SV4 CPIO archive (with CRC)"
+msgstr "Archív SV4 CPIO (s CRC)"
 
 #: ../freedesktop.org.xml.in.h:331
-msgid "OpenOffice Writer template"
-msgstr "Šablóna OpenOffice Writer"
+msgid "Tar archive"
+msgstr "Archív tar"
 
 #: ../freedesktop.org.xml.in.h:332
-msgid "OpenOffice.org extension"
-msgstr "Rozšírenie OpenOffice.org"
+msgid "Tar archive (compressed)"
+msgstr "Archív tar (komprimovaný)"
 
 #: ../freedesktop.org.xml.in.h:333
-msgid "OpenRaster archiving image"
-msgstr ""
+msgid "generic font file"
+msgstr "Obyčajný súbor písma"
 
 #: ../freedesktop.org.xml.in.h:334
-msgid "OpenType font"
-msgstr "Písmo OpenType"
+msgid "packed font file"
+msgstr "Komprimovaný súbor písma"
 
 #: ../freedesktop.org.xml.in.h:335
-msgid "PAK archive"
-msgstr "Archív PAK"
+msgid "TGIF document"
+msgstr "Dokument TGIF"
 
 #: ../freedesktop.org.xml.in.h:336
-msgid "PBM image"
-msgstr "Obrázok PBM"
+msgid "theme"
+msgstr "Motív"
 
 #: ../freedesktop.org.xml.in.h:337
-msgid "PCD image"
-msgstr "Obrázok PCD"
+msgid "ToutDoux document"
+msgstr "Dokument ToutDoux"
 
 #: ../freedesktop.org.xml.in.h:338
-msgid "PCF font"
-msgstr "Písmo PCF"
+msgid "backup file"
+msgstr "Záložný súbor"
 
 #: ../freedesktop.org.xml.in.h:339
-msgid "PCL file"
-msgstr "Súbor PCL"
+msgid "Troff document"
+msgstr "Dokument troff"
 
 #: ../freedesktop.org.xml.in.h:340
-msgid "PCM audio"
-msgstr "Zvuk PCM"
+msgid "Troff document (with manpage macros)"
+msgstr "Dokument troff (s makrami pre manuálové stránky)"
 
 #: ../freedesktop.org.xml.in.h:341
-msgid "PCX image"
-msgstr "Obrázok PCX"
+msgid "manual page (compressed)"
+msgstr "Manuálová stránka (komprimovaná)"
 
 #: ../freedesktop.org.xml.in.h:342
-msgid "PDF document"
-msgstr "Dokument PDF"
+msgid "Tar archive (LZO-compressed)"
+msgstr "Archív tar (komprimovaný pomocou LZO)"
 
 #: ../freedesktop.org.xml.in.h:343
-msgid "PDF document (XZ-compressed)"
-msgstr ""
+msgid "XZ archive"
+msgstr "Archív XZ"
 
 #: ../freedesktop.org.xml.in.h:344
-msgid "PDF document (bzip-compressed)"
-msgstr "Dokument PDF (komprimovaný pomocou bzip)"
+msgid "Tar archive (XZ-compressed)"
+msgstr "Archív tar (komprimovaný pomocou XZ)"
 
 #: ../freedesktop.org.xml.in.h:345
-msgid "PDF document (gzip-compressed)"
-msgstr "Dokument PDF (komprimovaný pomocou gzip)"
+msgid "PDF document (XZ-compressed)"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:346
-msgid "PEF executable"
-msgstr "Spustiteľný súbor PEF"
+msgid "Ustar archive"
+msgstr "Archív ustar"
 
 #: ../freedesktop.org.xml.in.h:347
-msgid "PGM image"
-msgstr "Obrázok PGM"
+msgid "WAIS source code"
+msgstr "Zdrojový kód WAIS"
 
 #: ../freedesktop.org.xml.in.h:348
-msgid "PGN chess game notation"
-msgstr "Šachová notácia PGN"
+msgid "WordPerfect/Drawperfect image"
+msgstr "Obrázok WordPerfect/Drawperfect"
 
 #: ../freedesktop.org.xml.in.h:349
-msgid "PGP keys"
-msgstr "Kľúče PGP"
+msgid "DER/PEM/Netscape-encoded X.509 certificate"
+msgstr "Certifikát X.509 kódovaný ako DER/PEM/Netscape"
 
 #: ../freedesktop.org.xml.in.h:350
-msgid "PGP/MIME-encrypted message header"
-msgstr "Hlavičke správy zašifrovaná pomocou PGP/MIME"
+msgid "empty document"
+msgstr "Prázdny dokument"
 
 #: ../freedesktop.org.xml.in.h:351
-msgid "PHP script"
-msgstr "Skript PHP"
+msgid "Zoo archive"
+msgstr "Archív zoo"
 
 #: ../freedesktop.org.xml.in.h:352
-msgid "PKCS#10 certification request"
-msgstr "Požiadavka na certifikát PKCS#10"
+msgid "XHTML page"
+msgstr "Stránka XHTML"
 
 #: ../freedesktop.org.xml.in.h:353
-msgid "PKCS#12 certificate bundle"
-msgstr "Zväzok certifikátov PKCS#12"
+msgid "Zip archive"
+msgstr "Archív ZIP"
 
 #: ../freedesktop.org.xml.in.h:354
-msgid "PKCS#7 certificate bundle"
-msgstr "Zväzok certifikátov PKCS#7"
+msgid "Windows Imaging Format Disk Image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:355
-msgid "PKCS#8 private key"
-msgstr "Súkromný kľúč PKCS#8"
+msgid "Dolby Digital audio"
+msgstr "Zvuk Dolby Digital"
 
 #: ../freedesktop.org.xml.in.h:356
-msgid "PNG image"
-msgstr "Obrázok PNG"
+msgid "AMR audio"
+msgstr "Zvuk AMR"
 
 #: ../freedesktop.org.xml.in.h:357
-msgid "PNM image"
-msgstr "Obrázok PNM"
+msgid "AMR-WB audio"
+msgstr "Zvuk AMR-WB"
 
 #: ../freedesktop.org.xml.in.h:358
-msgid "PPM image"
-msgstr "Obrázok PPM"
+msgid "ULAW (Sun) audio"
+msgstr "Zvuk ULAW (Sun)"
 
 #: ../freedesktop.org.xml.in.h:359
-msgid "PS document"
-msgstr "Dokument PS"
+msgid "Commodore 64 audio"
+msgstr "Zvuk Commodore 64"
 
 #: ../freedesktop.org.xml.in.h:360
-msgid "PSF audio"
-msgstr "Zvuk PSF"
+msgid "PCM audio"
+msgstr "Zvuk PCM"
 
 #: ../freedesktop.org.xml.in.h:361
-msgid "PSFlib audio library"
-msgstr "Zvuková knižnica PSFlib"
+msgid "AIFC audio"
+msgstr "Zvuk AIFC"
 
 #: ../freedesktop.org.xml.in.h:362
-msgid "Pack200 Java archive"
-msgstr "Archív Java Pack200"
+msgid "AIFF/Amiga/Mac audio"
+msgstr "Zvuk AIFF/Amiga/Mac"
 
 #: ../freedesktop.org.xml.in.h:363
-msgid "Palm OS database"
-msgstr "Databáza Palm OS"
+msgid "AIFF audio"
+msgstr "Zvuk AIFF"
 
 #: ../freedesktop.org.xml.in.h:364
-msgid "Panasonic raw image"
-msgstr "Surový obrázok Panasonic"
+msgid "Monkey's audio"
+msgstr "Zvuk Monkey's"
 
 #: ../freedesktop.org.xml.in.h:365
-msgid "Panasonic raw2 image"
-msgstr "Surový obrázok Panasonic raw2"
+msgid "Impulse Tracker audio"
+msgstr "Zvuk Impulse Tracker"
 
 #: ../freedesktop.org.xml.in.h:366
-msgid "Parchive archive"
-msgstr "Archív Parchive"
+msgid "FLAC audio"
+msgstr "Zvuk FLAC"
 
 #: ../freedesktop.org.xml.in.h:367
-msgid "Pascal source code"
-msgstr "Zdrojový kód Pascal"
+msgid "WavPack audio"
+msgstr "Zvuk WavPack"
 
 #: ../freedesktop.org.xml.in.h:368
-msgid "Pathetic Writer document"
-msgstr "Dokument Pathetic Writer"
+msgid "WavPack audio correction file"
+msgstr "Opravný zvukový súbor WavPack"
 
 #: ../freedesktop.org.xml.in.h:369
-msgid "Pentax PEF raw image"
-msgstr "Surový obrázok Pentax PEF"
+msgid "MIDI audio"
+msgstr "Zvuk MIDI"
 
 #: ../freedesktop.org.xml.in.h:370
-msgid "Perl script"
-msgstr "Skript jazyka Perl"
+msgid "compressed Tracker audio"
+msgstr "Komprimovaný zvuk Tracker"
 
 #: ../freedesktop.org.xml.in.h:371
-msgid "Photoshop image"
-msgstr "Obrázok Photoshop"
+msgid "MPEG-4 audio"
+msgstr "Zvuk MPEG-4"
+
+#: ../freedesktop.org.xml.in.h:372
+msgid "MPEG-4 video"
+msgstr "Video MPEG-4"
+
+#: ../freedesktop.org.xml.in.h:373
+msgid "MPEG-4 audio book"
+msgstr "Zvuková kniha MPEG-4"
+
+#: ../freedesktop.org.xml.in.h:374
+msgid "3GPP multimedia file"
+msgstr "Súbor multimédií 3GPP"
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Picture_CD
-#. http://www.re.org/kristin/picturecd.html
 #: ../freedesktop.org.xml.in.h:375
-msgid "Picture CD"
-msgstr "Picture CD"
+msgid "3GPP2 multimedia file"
+msgstr "Súbor multimédií 3GPP2"
 
 #: ../freedesktop.org.xml.in.h:376
-msgid "PkiPath certification path"
-msgstr "Cesta k certifikátu PkiPath"
+msgid "Amiga SoundTracker audio"
+msgstr "Zvuk Amiga SoundTracker"
 
 #: ../freedesktop.org.xml.in.h:377
-msgid "PlanPerfect spreadsheet"
-msgstr "Zošit PlanPerfect"
+msgid "MP2 audio"
+msgstr "Zvuk MP2"
 
 #: ../freedesktop.org.xml.in.h:378
-msgid "Plucker document"
-msgstr "Dokument Plucker"
+msgid "MP3 audio"
+msgstr "Zvuk MP3"
 
 #: ../freedesktop.org.xml.in.h:379
-msgid "Pocket Word document"
-msgstr "Dokument Pocket Word"
+msgid "MP3 audio (streamed)"
+msgstr "Zvuk MP3 (streamovaný)"
 
 #: ../freedesktop.org.xml.in.h:380
-msgid "PostScript document (bzip-compressed)"
-msgstr "Dokument PostScript (komprimovaný pomocou bzip)"
+msgid "HTTP Live Streaming playlist"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:381
-msgid "PostScript document (gzip-compressed)"
-msgstr "Dokument PostScript (komprimovaný pomocou gzip)"
+msgid "Microsoft ASX playlist"
+msgstr "Zoznam skladieb Microsoft ASX"
 
 #: ../freedesktop.org.xml.in.h:382
-msgid "Postscript type-1 font"
-msgstr "Písmo Postscript type-1"
+msgid "PSF audio"
+msgstr "Zvuk PSF"
 
 #: ../freedesktop.org.xml.in.h:383
-msgid "PowerPoint 2007 presentation"
-msgstr "Prezentácia PowerPoint 2007"
+msgid "MiniPSF audio"
+msgstr "Zvuk MiniPSF"
 
 #: ../freedesktop.org.xml.in.h:384
-msgid "PowerPoint 2007 presentation template"
-msgstr ""
+msgid "PSFlib audio library"
+msgstr "Zvuková knižnica PSFlib"
 
 #: ../freedesktop.org.xml.in.h:385
-msgid "PowerPoint 2007 show"
-msgstr "Ukážka PowerPoint 2007"
+msgid "Windows Media audio"
+msgstr "Zvuk Windows Media"
 
 #: ../freedesktop.org.xml.in.h:386
-msgid "PowerPoint 2007 slide"
-msgstr ""
+msgid "Musepack audio"
+msgstr "Zvuk Musepack"
 
 #: ../freedesktop.org.xml.in.h:387
-msgid "PowerPoint add-in"
-msgstr ""
+msgid "RealAudio document"
+msgstr "Dokument RealAudio"
 
 #: ../freedesktop.org.xml.in.h:388
-msgid "PowerPoint macro-enabled presentation"
-msgstr ""
+msgid "RealMedia Metafile"
+msgstr "RealMedia Metafile"
 
 #: ../freedesktop.org.xml.in.h:389
-msgid "PowerPoint macro-enabled presentation template"
-msgstr ""
+msgid "RealVideo document"
+msgstr "Dokument RealVideo"
 
 #: ../freedesktop.org.xml.in.h:390
-msgid "PowerPoint macro-enabled slide"
-msgstr ""
+msgid "RealMedia document"
+msgstr "Dokument RealMedia"
 
 #: ../freedesktop.org.xml.in.h:391
-msgid "PowerPoint presentation"
-msgstr "Prezentácia PowerPoint"
+msgid "RealPix document"
+msgstr "Dokument RealPix"
 
 #: ../freedesktop.org.xml.in.h:392
-msgid "Python bytecode"
-msgstr "Bajtový kód Python"
+msgid "RealText document"
+msgstr "Dokument RealText"
 
 #: ../freedesktop.org.xml.in.h:393
-msgid "Python script"
-msgstr "Skript Python"
+msgid "RIFF audio"
+msgstr "Zvuk RIFF"
 
 #: ../freedesktop.org.xml.in.h:394
-msgid "Qt Designer file"
-msgstr "Súbor Qt Designer"
+msgid "Scream Tracker 3 audio"
+msgstr "Skladba Scream Tracker 3"
 
 #: ../freedesktop.org.xml.in.h:395
-msgid "Qt MOC file"
-msgstr "Súbor Qt MOC"
+msgid "MP3 ShoutCast playlist"
+msgstr "Zoznam skladieb MP3 ShoutCast"
 
 #: ../freedesktop.org.xml.in.h:396
-msgid "Qt Markup Language file"
-msgstr ""
+msgid "Scream Tracker audio"
+msgstr "Skladba Scream Tracker"
 
 #: ../freedesktop.org.xml.in.h:397
-msgid "Quattro Pro spreadsheet"
-msgstr "Zošit Quattro Pro"
+msgid "VOC audio"
+msgstr "Zvuk VOC"
 
 #: ../freedesktop.org.xml.in.h:398
-msgid "QuickTime image"
-msgstr "Obrázok QuickTime"
+msgid "WAV audio"
+msgstr "Zvuk WAV"
 
 #: ../freedesktop.org.xml.in.h:399
-msgid "QuickTime metalink playlist"
-msgstr "Zoznam skladieb metalink QuickTime"
+msgid "Scream Tracker instrument"
+msgstr "Nástroj pre Scream Tracker"
 
 #: ../freedesktop.org.xml.in.h:400
-msgid "QuickTime video"
-msgstr "Video QuickTime"
+msgid "FastTracker II audio"
+msgstr "Zvuk FastTracker II"
 
 #: ../freedesktop.org.xml.in.h:401
-msgid "Quicken document"
-msgstr "Dokument Quicken"
+msgid "TrueAudio audio"
+msgstr "Zvuk TrueAudio"
 
 #: ../freedesktop.org.xml.in.h:402
-msgid "RAR archive"
-msgstr "Archív RAR"
+msgid "Windows BMP image"
+msgstr "Obrázok Windows BMP"
 
 #: ../freedesktop.org.xml.in.h:403
-msgid "RDF file"
-msgstr "Súbor RDF"
+msgid "WBMP image"
+msgstr "Obrázok WBMP"
 
 #: ../freedesktop.org.xml.in.h:404
-msgid "README document"
-msgstr "Dokument README"
+msgid "Computer Graphics Metafile"
+msgstr "Computer Graphics Metafile"
 
 #: ../freedesktop.org.xml.in.h:405
-msgid "RELAX NG XML schema"
-msgstr "XML schéma RELAX NG"
+msgid "CCITT G3 fax"
+msgstr "Fax CCITT G3"
 
 #: ../freedesktop.org.xml.in.h:406
-msgid "RGB image"
-msgstr "Obrázok RGB"
+msgid "G3 fax image"
+msgstr "Obrázok fax G3"
 
 #: ../freedesktop.org.xml.in.h:407
-msgid "RIFF audio"
-msgstr "Zvuk RIFF"
+msgid "GIF image"
+msgstr "Obrázok GIF"
 
 #: ../freedesktop.org.xml.in.h:408
-msgid "RPM package"
-msgstr "Balík RPM"
+msgid "IEF image"
+msgstr "Obrázok IEF"
 
 #: ../freedesktop.org.xml.in.h:409
-msgid "RPM spec file"
-msgstr "Súbor RPM spec"
+msgid "JPEG image"
+msgstr "Obrázok JPEG"
 
 #: ../freedesktop.org.xml.in.h:410
-msgid "RSS summary"
-msgstr "Súhrn RSS"
+msgid "JPEG-2000 image"
+msgstr "Obrázok JPEG-2000"
 
 #: ../freedesktop.org.xml.in.h:411
-msgid "RTF document"
-msgstr "Dokument RTF"
+msgid "OpenRaster archiving image"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:412
-msgid "RealAudio document"
-msgstr "Dokument RealAudio"
+msgid "DirectDraw surface"
+msgstr "Plocha DirectDraw"
 
 #: ../freedesktop.org.xml.in.h:413
-msgid "RealMedia Metafile"
-msgstr "RealMedia Metafile"
+msgid "X11 cursor"
+msgstr "Kurzor X11"
 
 #: ../freedesktop.org.xml.in.h:414
-msgid "RealMedia document"
-msgstr "Dokument RealMedia"
+msgid "EXR image"
+msgstr "Obrázok EXR"
 
 #: ../freedesktop.org.xml.in.h:415
-msgid "RealPix document"
-msgstr "Dokument RealPix"
+msgid "Macintosh Quickdraw/PICT drawing"
+msgstr "Kresba Macintosh QuickDraw/PICT"
 
 #: ../freedesktop.org.xml.in.h:416
-msgid "RealText document"
-msgstr "Dokument RealText"
+msgid "UFRaw ID image"
+msgstr "Obrázok ID UFRaw"
 
 #: ../freedesktop.org.xml.in.h:417
-msgid "RealVideo document"
-msgstr "Dokument RealVideo"
+msgid "digital raw image"
+msgstr "Digitálny surový obrázok"
 
 #: ../freedesktop.org.xml.in.h:418
-msgid "Ruby script"
-msgstr "Skript Ruby"
+msgid "Adobe DNG negative"
+msgstr "Adobe Digital Negative (DNG)"
 
 #: ../freedesktop.org.xml.in.h:419
-msgid "Run Length Encoded bitmap image"
-msgstr "Bitmapový obrázok Run Length Encoded"
+msgid "Canon CRW raw image"
+msgstr "Surový obrázok Canon CRW"
 
 #: ../freedesktop.org.xml.in.h:420
-msgid "S/MIME file"
-msgstr "Súbor S/MIME"
+msgid "Canon CR2 raw image"
+msgstr "Surový obrázok Canon CR2"
 
 #: ../freedesktop.org.xml.in.h:421
-msgid "SAMI subtitles"
-msgstr "Titulky SAMI"
+msgid "Fuji RAF raw image"
+msgstr "Surový obrázok Fuji RAF"
 
 #: ../freedesktop.org.xml.in.h:422
-msgid "SC/Xspread spreadsheet"
-msgstr "Zošit SC/Xspread"
+msgid "Kodak DCR raw image"
+msgstr "Surový obrázok Kodak DCR"
 
 #: ../freedesktop.org.xml.in.h:423
-msgid "SDP multicast stream file"
-msgstr "Súbor viacsmerového vysielania prúdu SDP"
+msgid "Kodak K25 raw image"
+msgstr "Surový obrázok Kodak K25"
+
+#: ../freedesktop.org.xml.in.h:424
+msgid "Kodak KDC raw image"
+msgstr "Surový obrázok Kodak KDC"
+
+#: ../freedesktop.org.xml.in.h:425
+msgid "Minolta MRW raw image"
+msgstr "Surový obrázok Minolta MRW"
+
+#: ../freedesktop.org.xml.in.h:426
+msgid "Nikon NEF raw image"
+msgstr "Surový obrázok Nikon NEF"
 
-#. translators: a record is in this context a description of a board game
-#. that has been played, and that can be played back again:
-#. http://www.red-bean.com/sgf/
 #: ../freedesktop.org.xml.in.h:427
-msgid "SGF record"
-msgstr "Záznam SGF"
+msgid "Olympus ORF raw image"
+msgstr "Surový obrázok Olympus ORF"
 
 #: ../freedesktop.org.xml.in.h:428
-msgid "SGI image"
-msgstr "Obrázok SGI"
+msgid "Panasonic raw image"
+msgstr "Surový obrázok Panasonic"
 
 #: ../freedesktop.org.xml.in.h:429
-msgid "SGI video"
-msgstr "Video SGI"
+msgid "Panasonic raw2 image"
+msgstr "Surový obrázok Panasonic raw2"
 
 #: ../freedesktop.org.xml.in.h:430
-msgid "SGML document"
-msgstr "Dokument SGML"
+msgid "Pentax PEF raw image"
+msgstr "Surový obrázok Pentax PEF"
 
 #: ../freedesktop.org.xml.in.h:431
-msgid "SIS package"
-msgstr "Balíček SIS"
+msgid "Sigma X3F raw image"
+msgstr "Surový obrázok Sigma X3F"
 
 #: ../freedesktop.org.xml.in.h:432
-msgid "SISX package"
-msgstr "Balíček SISX"
+msgid "Sony SRF raw image"
+msgstr "Surový obrázok Sony SRF"
 
 #: ../freedesktop.org.xml.in.h:433
-msgid "SMAF audio"
-msgstr "Zvuk SMAF"
+msgid "Sony SR2 raw image"
+msgstr "Surový obrázok Sony SR2"
 
 #: ../freedesktop.org.xml.in.h:434
-msgid "SMIL document"
-msgstr "Dokument SMIL"
+msgid "Sony ARW raw image"
+msgstr "Surový obrázok Sony ARW"
 
 #: ../freedesktop.org.xml.in.h:435
-msgid "SPSS Data File"
-msgstr "Dátový súbor SPSS"
+msgid "PNG image"
+msgstr "Obrázok PNG"
 
 #: ../freedesktop.org.xml.in.h:436
-msgid "SPSS Portable Data File"
-msgstr "Súbor prenosných dát SPSS"
+msgid "Run Length Encoded bitmap image"
+msgstr "Bitmapový obrázok Run Length Encoded"
 
 #: ../freedesktop.org.xml.in.h:437
-msgid "SQL code"
-msgstr "Kód SQL"
+msgid "SVG image"
+msgstr "Obrázok SVG"
 
 #: ../freedesktop.org.xml.in.h:438
-msgid "SQLite2 database"
-msgstr "Databáza SQLite2"
+msgid "compressed SVG image"
+msgstr "Komprimovaný obrázok SVG"
 
 #: ../freedesktop.org.xml.in.h:439
-msgid "SQLite3 database"
-msgstr "Databáza SQLite3"
+msgid "TIFF image"
+msgstr "Obrázok TIFF"
 
 #: ../freedesktop.org.xml.in.h:440
-msgid "SSA subtitles"
-msgstr "Titulky SSA"
+msgid "AutoCAD image"
+msgstr "Obrázok AutoCAD"
 
 #: ../freedesktop.org.xml.in.h:441
-msgid "SV4 CPIO archive"
-msgstr "Archív SV4 CPIO"
+msgid "DXF vector image"
+msgstr "Vektorový obrázok DXF"
 
 #: ../freedesktop.org.xml.in.h:442
-msgid "SV4 CPIO archive (with CRC)"
-msgstr "Archív SV4 CPIO (s CRC)"
+msgid "Microsoft Document Imaging format"
+msgstr "Formát Microsoft Document Imaging"
 
 #: ../freedesktop.org.xml.in.h:443
-msgid "SVG image"
-msgstr "Obrázok SVG"
+msgid "3D Studio image"
+msgstr "Obrázok 3D Studio"
 
 #: ../freedesktop.org.xml.in.h:444
-msgid "Scala source code"
-msgstr ""
+msgid "Applix Graphics image"
+msgstr "Obrázok Applix Graphics"
 
 #: ../freedesktop.org.xml.in.h:445
-msgid "Scheme source code"
-msgstr "Zdrojový kód Scheme"
+msgid "EPS image (bzip-compressed)"
+msgstr "Obrázok EPS (komprimovaný pomocou bzip)"
 
 #: ../freedesktop.org.xml.in.h:446
-msgid "Scream Tracker 3 audio"
-msgstr "Skladba Scream Tracker 3"
+msgid "CMU raster image"
+msgstr "Rastrový obrázok CMU"
 
 #: ../freedesktop.org.xml.in.h:447
-msgid "Scream Tracker audio"
-msgstr "Skladba Scream Tracker"
+msgid "compressed GIMP image"
+msgstr "Komprimovaný obrázok GIMP"
 
 #: ../freedesktop.org.xml.in.h:448
-msgid "Scream Tracker instrument"
-msgstr "Nástroj pre Scream Tracker"
+msgid "DICOM image"
+msgstr "Obrázok DICOM"
 
 #: ../freedesktop.org.xml.in.h:449
-msgid "Sega Master System/Game Gear ROM"
-msgstr "ROM pre Sega Master System/Game Gear"
+msgid "DocBook document"
+msgstr "Dokument DocBook"
 
 #: ../freedesktop.org.xml.in.h:450
-msgid "Setext document"
-msgstr "Dokument Setext"
+msgid "DIB image"
+msgstr "Obrázok DIB"
 
 #: ../freedesktop.org.xml.in.h:451
-msgid "Shockwave Flash file"
-msgstr "Súbor Shockwave Flash"
+msgid "DjVu image"
+msgstr "Obrázok DjVu"
+
+#: ../freedesktop.org.xml.in.h:452
+msgid "DPX image"
+msgstr "Obrázok DPX"
 
-#. translators: "Shorten" is the name of an audio codec
 #: ../freedesktop.org.xml.in.h:453
-msgid "Shorten audio"
-msgstr "Zvuk Shorten"
+msgid "EPS image"
+msgstr "Obrázok EPS"
 
 #: ../freedesktop.org.xml.in.h:454
-msgid "Siag spreadsheet"
-msgstr "Zošit Siag"
+msgid "FITS document"
+msgstr "Dokument FITS"
 
 #: ../freedesktop.org.xml.in.h:455
-msgid "Sieve mail filter script"
-msgstr "Skript poštového filtra Sieve"
+msgid "FPX image"
+msgstr "Obrázok FPX"
 
 #: ../freedesktop.org.xml.in.h:456
-msgid "Sigma X3F raw image"
-msgstr "Surový obrázok Sigma X3F"
+msgid "EPS image (gzip-compressed)"
+msgstr "Obrázok EPS (komprimovaný pomocou gzip)"
 
 #: ../freedesktop.org.xml.in.h:457
-msgid "Skencil document"
-msgstr "Dokument Skencil"
+msgid "Microsoft icon"
+msgstr "Ikona Microsoft"
 
 #: ../freedesktop.org.xml.in.h:458
-msgid "Sony ARW raw image"
-msgstr "Surový obrázok Sony ARW"
+msgid "MacOS X icon"
+msgstr "Ikona MacOS X"
 
 #: ../freedesktop.org.xml.in.h:459
-msgid "Sony SR2 raw image"
-msgstr "Surový obrázok Sony SR2"
+msgid "IFF image"
+msgstr "Obrázok IFF"
 
 #: ../freedesktop.org.xml.in.h:460
-msgid "Sony SRF raw image"
-msgstr "Surový obrázok Sony SRF"
+msgid "ILBM image"
+msgstr "Obrázok ILMB"
 
 #: ../freedesktop.org.xml.in.h:461
-msgid "Speedo font"
-msgstr "Písmo Speedo"
+msgid "JNG image"
+msgstr "Obrázok JNG"
 
 #: ../freedesktop.org.xml.in.h:462
-msgid "Speex audio"
-msgstr "Zvuk Speex"
+msgid "LightWave object"
+msgstr "Objekt LightWave"
 
 #: ../freedesktop.org.xml.in.h:463
-msgid "Stampede package"
-msgstr "Balíček Stampede"
+msgid "LightWave scene"
+msgstr "Scéna LightWave"
 
 #: ../freedesktop.org.xml.in.h:464
-msgid "StarCalc spreadsheet"
-msgstr "Zošit StarCalc"
+msgid "MacPaint Bitmap image"
+msgstr "Obrázok MacPaint Bitmap"
 
 #: ../freedesktop.org.xml.in.h:465
-msgid "StarChart chart"
-msgstr "Graf StarChart"
+msgid "Office drawing"
+msgstr "Kresba Office"
 
 #: ../freedesktop.org.xml.in.h:466
-msgid "StarDraw drawing"
-msgstr "Kresba StarDraw"
+msgid "NIFF image"
+msgstr "Obrázok NIFF"
 
 #: ../freedesktop.org.xml.in.h:467
-msgid "StarImpress presentation"
-msgstr "Prezentácia StarImpress"
+msgid "PCX image"
+msgstr "Obrázok PCX"
 
 #: ../freedesktop.org.xml.in.h:468
-msgid "StarMail email"
-msgstr "E-mail StarMail"
+msgid "PCD image"
+msgstr "Obrázok PCD"
 
 #: ../freedesktop.org.xml.in.h:469
-msgid "StarMath formula"
-msgstr "Vzorec StarMath"
+msgid "PNM image"
+msgstr "Obrázok PNM"
 
 #: ../freedesktop.org.xml.in.h:470
-msgid "StarWriter document"
-msgstr "Dokument StarWriter"
+msgid "PBM image"
+msgstr "Obrázok PBM"
 
 #: ../freedesktop.org.xml.in.h:471
-msgid "StuffIt archive"
-msgstr "Archív StuffIt"
+msgid "PGM image"
+msgstr "Obrázok PGM"
 
 #: ../freedesktop.org.xml.in.h:472
-msgid "SubRip subtitles"
-msgstr "Titulky SubRip"
+msgid "PPM image"
+msgstr "Obrázok PPM"
 
 #: ../freedesktop.org.xml.in.h:473
-msgid "SubViewer subtitles"
-msgstr "Titulky SubViewer"
+msgid "Photoshop image"
+msgstr "Obrázok Photoshop"
 
 #: ../freedesktop.org.xml.in.h:474
-msgid "Sun raster image"
-msgstr "Rastrový obrázok Sun"
+msgid "RGB image"
+msgstr "Obrázok RGB"
 
 #: ../freedesktop.org.xml.in.h:475
-msgid "SunOS News font"
-msgstr "Písmo SunOS News"
+msgid "SGI image"
+msgstr "Obrázok SGI"
+
+#: ../freedesktop.org.xml.in.h:476
+msgid "Sun raster image"
+msgstr "Rastrový obrázok Sun"
 
-#. Translate this as Super Famicom (in Far East Asia) or Super Nintendo (in Europe) if the console was known as such in your locale
 #: ../freedesktop.org.xml.in.h:477
-msgid "Super NES ROM"
-msgstr "ROM pre Super Nintendo"
+msgid "TGA image"
+msgstr "Obrázok TGA"
+
+#: ../freedesktop.org.xml.in.h:478
+msgid "Windows cursor"
+msgstr "Kurzor Windows"
+
+#: ../freedesktop.org.xml.in.h:479
+msgid "Windows animated cursor"
+msgstr "Animovaný kurzor Windows"
+
+#: ../freedesktop.org.xml.in.h:480
+msgid "EMF image"
+msgstr "Obrázok EMF"
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Super_Video_CD
-#. http://everything2.com/index.pl?node_id=1009222
 #: ../freedesktop.org.xml.in.h:481
-msgid "Super Video CD"
-msgstr "Super Video CD"
+msgid "WMF image"
+msgstr "Obrázok WMF"
 
 #: ../freedesktop.org.xml.in.h:482
-msgid "SystemVerilog header"
-msgstr "Hlavičky SystemVerilog"
+msgid "XBM image"
+msgstr "Obrázok XBM"
 
 #: ../freedesktop.org.xml.in.h:483
-msgid "SystemVerilog source code"
-msgstr "Zdrojový kód SystemVerilog"
+msgid "GIMP image"
+msgstr "Obrázok GIMP"
 
 #: ../freedesktop.org.xml.in.h:484
-msgid "T602 document"
-msgstr "Dokument T602"
+msgid "XFig image"
+msgstr "Obrázok XFig"
 
 #: ../freedesktop.org.xml.in.h:485
-msgid "TGA image"
-msgstr "Obrázok TGA"
+msgid "XPM image"
+msgstr "Obrázok XPM"
 
 #: ../freedesktop.org.xml.in.h:486
-msgid "TGIF document"
-msgstr "Dokument TGIF"
+msgid "X window image"
+msgstr "Obrázok X window"
 
 #: ../freedesktop.org.xml.in.h:487
-msgid "TIFF image"
-msgstr "Obrázok TIFF"
+msgid "block device"
+msgstr "Blokové zariadenie"
 
 #: ../freedesktop.org.xml.in.h:488
-msgid "TNEF message"
-msgstr "Správa TNEF"
+msgid "character device"
+msgstr "Znakové zariadenie"
 
 #: ../freedesktop.org.xml.in.h:489
-msgid "TSV document"
-msgstr "Dokument TSV"
+msgid "folder"
+msgstr "Priečinok"
 
 #: ../freedesktop.org.xml.in.h:490
-msgid "Tar archive"
-msgstr "Archív tar"
+msgid "pipe"
+msgstr "Rúra"
 
 #: ../freedesktop.org.xml.in.h:491
-msgid "Tar archive (LZMA-compressed)"
-msgstr "Archív tar (komprimovaný pomocou LZMA)"
+msgid "mount point"
+msgstr "Miesto pripojenia"
 
 #: ../freedesktop.org.xml.in.h:492
-msgid "Tar archive (LZO-compressed)"
-msgstr "Archív tar (komprimovaný pomocou LZO)"
+msgid "socket"
+msgstr "Soket"
 
 #: ../freedesktop.org.xml.in.h:493
-msgid "Tar archive (XZ-compressed)"
-msgstr "Archív tar (komprimovaný pomocou XZ)"
+msgid "symbolic link"
+msgstr "Symbolický odkaz"
 
 #: ../freedesktop.org.xml.in.h:494
-msgid "Tar archive (bzip-compressed)"
-msgstr "Archív tar (komprimovaný pomocou bzip)"
+msgid "mail delivery report"
+msgstr "Správa o doručení pošty"
 
 #: ../freedesktop.org.xml.in.h:495
-msgid "Tar archive (compressed)"
-msgstr "Archív tar (komprimovaný)"
+msgid "mail disposition report"
+msgstr "Správa o odovzdaní pošty"
 
 #: ../freedesktop.org.xml.in.h:496
-msgid "Tar archive (gzip-compressed)"
-msgstr "Archív tar (komprimovaný pomocou gzip)"
+msgid "reference to remote file"
+msgstr "Odkaz na vzdialený súbor"
 
 #: ../freedesktop.org.xml.in.h:497
-msgid "Tar archive (lrzip-compressed)"
-msgstr "Archív tar (komprimovaný pomocou lrzip)"
+msgid "Usenet news message"
+msgstr "Príspevok do diskusných skupín Usenet"
 
 #: ../freedesktop.org.xml.in.h:498
-msgid "Tcl script"
-msgstr "Skript Tcl"
+msgid "partial email message"
+msgstr "Čiastočná e-mailová správa"
 
 #: ../freedesktop.org.xml.in.h:499
-msgid "TeX DVI document"
-msgstr "Dokument TeX DVI"
+msgid "email message"
+msgstr "E-mailová správa"
 
 #: ../freedesktop.org.xml.in.h:500
-msgid "TeX DVI document (bzip-compressed)"
-msgstr "Dokument TeX DVI (komprimovaný pomocou bzip)"
+msgid "GNU mail message"
+msgstr "Správa GNU mail"
 
 #: ../freedesktop.org.xml.in.h:501
-msgid "TeX DVI document (gzip-compressed)"
-msgstr "Dokument TeX DVI (komprimovaný pomocou gzip)"
+msgid "VRML document"
+msgstr "Dokument VRML"
 
 #: ../freedesktop.org.xml.in.h:502
-msgid "TeX document"
-msgstr "Dokument TeX"
+msgid "message in several formats"
+msgstr "Správa v niekoľkých formátoch"
 
 #: ../freedesktop.org.xml.in.h:503
-msgid "TeX font"
-msgstr "Písmo TeX"
+msgid "Macintosh AppleDouble-encoded file"
+msgstr "Súbor kódovaný pomocou Macintosh AppleDouble"
 
 #: ../freedesktop.org.xml.in.h:504
-msgid "TeX font metrics"
-msgstr "Metrika písma TeX"
+msgid "message digest"
+msgstr "Prehľad správ"
 
 #: ../freedesktop.org.xml.in.h:505
-msgid "TeXInfo document"
-msgstr "Dokument TeXInfo"
+msgid "encrypted message"
+msgstr "Zašifrovaná správa"
 
 #: ../freedesktop.org.xml.in.h:506
-msgid "ToutDoux document"
-msgstr "Dokument ToutDoux"
+msgid "compound documents"
+msgstr "Zložené dokumenty"
 
 #: ../freedesktop.org.xml.in.h:507
-msgid "Troff ME input document"
-msgstr "Vstupný dokument Troff ME"
+msgid "compound document"
+msgstr "Zložený dokument"
 
 #: ../freedesktop.org.xml.in.h:508
-msgid "Troff MM input document"
-msgstr "Vstupný dokument Troff MM"
+msgid "mail system report"
+msgstr "Správa poštového systému"
 
 #: ../freedesktop.org.xml.in.h:509
-msgid "Troff MS input document"
-msgstr "Vstupný dokument Troff MS"
+msgid "signed message"
+msgstr "Podpísaná správa"
 
 #: ../freedesktop.org.xml.in.h:510
-msgid "Troff document"
-msgstr "Dokument troff"
+msgid "stream of data (server push)"
+msgstr "Prúd dát (posielaný serverom)"
 
 #: ../freedesktop.org.xml.in.h:511
-msgid "Troff document (with manpage macros)"
-msgstr "Dokument troff (s makrami pre manuálové stránky)"
+msgid "VCS/ICS calendar"
+msgstr "Kalendár VCS/ICS"
 
 #: ../freedesktop.org.xml.in.h:512
-msgid "TrueAudio audio"
-msgstr "Zvuk TrueAudio"
+msgid "CSS stylesheet"
+msgstr "Štýly CSS"
 
 #: ../freedesktop.org.xml.in.h:513
-msgid "TrueType XML font"
-msgstr "Písmo TrueType XML"
+msgid "electronic business card"
+msgstr "Elektronická vizitka"
 
 #: ../freedesktop.org.xml.in.h:514
-msgid "TrueType font"
-msgstr "Písmo TrueType"
+msgid "txt2tags document"
+msgstr "Dokument txt2tags"
 
 #: ../freedesktop.org.xml.in.h:515
-msgid "UFRaw ID image"
-msgstr "Obrázok ID UFRaw"
+msgid "Verilog source code"
+msgstr "Zdrojový kód Verilog"
 
 #: ../freedesktop.org.xml.in.h:516
-msgid "ULAW (Sun) audio"
-msgstr "Zvuk ULAW (Sun)"
+msgid "SystemVerilog header"
+msgstr "Hlavičky SystemVerilog"
+
+#: ../freedesktop.org.xml.in.h:517
+msgid "SystemVerilog source code"
+msgstr "Zdrojový kód SystemVerilog"
+
+#: ../freedesktop.org.xml.in.h:518
+msgid "VHDL source code"
+msgstr "Zdrojový kód VHDL"
 
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:519
-msgid "UNIX software"
-msgstr "Softvér UNIX"
+msgid "enriched text document"
+msgstr "Rozšírený textový dokument"
 
 #: ../freedesktop.org.xml.in.h:520
-msgid "UNIX-compressed file"
-msgstr "Súbor komprimovaný v Unixe"
+msgid "help page"
+msgstr "Stránka Pomocníka"
 
 #: ../freedesktop.org.xml.in.h:521
-msgid "Unidata NetCDF document"
-msgstr "Dokument Unidata NetCDF"
+msgid "plain text document"
+msgstr "Obyčajný textový dokument"
 
 #: ../freedesktop.org.xml.in.h:522
-msgid "Usenet news message"
-msgstr "Príspevok do diskusných skupín Usenet"
+msgid "RDF file"
+msgstr "Súbor RDF"
 
 #: ../freedesktop.org.xml.in.h:523
-msgid "Ustar archive"
-msgstr "Archív ustar"
+msgid "email headers"
+msgstr "Hlavičky e-mailu"
 
 #: ../freedesktop.org.xml.in.h:524
-msgid "V font"
-msgstr "Písmo V"
+msgid "rich text document"
+msgstr "Textový dokument RTF"
 
 #: ../freedesktop.org.xml.in.h:525
-msgid "VCS/ICS calendar"
-msgstr "Kalendár VCS/ICS"
+msgid "RSS summary"
+msgstr "Súhrn RSS"
 
 #: ../freedesktop.org.xml.in.h:526
-msgid "VHDL source code"
-msgstr "Zdrojový kód VHDL"
+msgid "Atom syndication feed"
+msgstr "Kanál Atom"
 
 #: ../freedesktop.org.xml.in.h:527
-msgid "VOC audio"
-msgstr "Zvuk VOC"
+msgid "OPML syndication feed"
+msgstr "Kanál OPML"
 
 #: ../freedesktop.org.xml.in.h:528
-msgid "VRML document"
-msgstr "Dokument VRML"
+msgid "SGML document"
+msgstr "Dokument SGML"
 
 #: ../freedesktop.org.xml.in.h:529
-msgid "Vala source code"
-msgstr "Zdrojový kód Vala"
+msgid "spreadsheet interchange document"
+msgstr "Zošitový prenosový dokument"
 
 #: ../freedesktop.org.xml.in.h:530
-msgid "Verilog source code"
-msgstr "Zdrojový kód Verilog"
+msgid "TSV document"
+msgstr "Dokument TSV"
+
+#: ../freedesktop.org.xml.in.h:531
+msgid "Graphviz DOT graph"
+msgstr "Graf Graphviz DOT"
+
+#: ../freedesktop.org.xml.in.h:532
+msgid "JAD document"
+msgstr "Dokument JAD"
+
+#: ../freedesktop.org.xml.in.h:533
+msgid "WML document"
+msgstr "Dokument WML"
 
-#. TRANSLATORS: This is a brand-name, not a generic term. Please see
-#. http://en.wikipedia.org/wiki/Video_CD
-#. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
 #: ../freedesktop.org.xml.in.h:534
-msgid "Video CD"
-msgstr "Video CD"
+msgid "WMLScript program"
+msgstr "Program WMLScript"
 
 #: ../freedesktop.org.xml.in.h:535
-msgid "Vivo video"
-msgstr "Video Vivo"
+msgid "ACE archive"
+msgstr "Archív ACE"
 
 #: ../freedesktop.org.xml.in.h:536
-msgid "WAIS source code"
-msgstr "Zdrojový kód WAIS"
+msgid "Ada source code"
+msgstr "Zdrojový kód jazyka Ada"
 
 #: ../freedesktop.org.xml.in.h:537
-msgid "WAV audio"
-msgstr "Zvuk WAV"
+msgid "author list"
+msgstr "Zoznam autorov"
 
 #: ../freedesktop.org.xml.in.h:538
-msgid "WBMP image"
-msgstr "Obrázok WBMP"
+msgid "BibTeX document"
+msgstr "Dokument BibTeX"
 
 #: ../freedesktop.org.xml.in.h:539
-msgid "WMF image"
-msgstr "Obrázok WMF"
+msgid "C++ header"
+msgstr "Hlavičky jazyka C++"
 
 #: ../freedesktop.org.xml.in.h:540
-msgid "WML document"
-msgstr "Dokument WML"
+msgid "C++ source code"
+msgstr "Zdrojový kód jazyka C++"
 
 #: ../freedesktop.org.xml.in.h:541
-msgid "WMLScript program"
-msgstr "Program WMLScript"
+msgid "ChangeLog document"
+msgstr "Dokument ChangeLog"
 
 #: ../freedesktop.org.xml.in.h:542
-msgid "WPL playlist"
-msgstr "Zoznam skladieb WPL"
+msgid "C header"
+msgstr "Hlavičky jazyka C"
 
 #: ../freedesktop.org.xml.in.h:543
-msgid "WRI document"
-msgstr "Dokument WRI"
+msgid "CMake source code"
+msgstr "Zdrojový kód CMake"
 
 #: ../freedesktop.org.xml.in.h:544
-msgid "WWF document"
-msgstr ""
+msgid "CSV document"
+msgstr "Dokument CSV"
 
 #: ../freedesktop.org.xml.in.h:545
-msgid "WavPack audio"
-msgstr "Zvuk WavPack"
+msgid "license terms"
+msgstr "Licenčné podmienky"
 
 #: ../freedesktop.org.xml.in.h:546
-msgid "WavPack audio correction file"
-msgstr "Opravný zvukový súbor WavPack"
+msgid "author credits"
+msgstr "Autorské zásluhy"
 
 #: ../freedesktop.org.xml.in.h:547
-msgid "Wavelet video"
-msgstr "Video Wavelet"
+msgid "C source code"
+msgstr "Zdrojový kód jazyka C"
 
 #: ../freedesktop.org.xml.in.h:548
-msgid "Web application cache manifest"
-msgstr ""
+msgid "C# source code"
+msgstr "Zdrojový kód jazyka C#"
 
 #: ../freedesktop.org.xml.in.h:549
-msgid "WebM audio"
-msgstr "Zvuk WebM"
+msgid "Vala source code"
+msgstr "Zdrojový kód Vala"
 
 #: ../freedesktop.org.xml.in.h:550
-msgid "WebM video"
-msgstr "Video WebM"
+msgid "OOC source code"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:551
-msgid "WebVTT subtitles"
-msgstr ""
+msgid "DCL script"
+msgstr "Skript DCL"
 
 #: ../freedesktop.org.xml.in.h:552
-msgid "Windows BMP image"
-msgstr "Obrázok Windows BMP"
+msgid "DSSSL document"
+msgstr "Dokument DSSSL"
 
 #: ../freedesktop.org.xml.in.h:553
-msgid "Windows Imaging Format Disk Image"
-msgstr ""
+msgid "D source code"
+msgstr "Zdrojový kód jazyka D"
 
 #: ../freedesktop.org.xml.in.h:554
-msgid "Windows Installer package"
-msgstr "Balík Windows Installer"
+msgid "DTD file"
+msgstr "Súbor DTD"
 
 #: ../freedesktop.org.xml.in.h:555
-msgid "Windows Media Station file"
-msgstr "Súbor Windows Media Station"
+msgid "Eiffel source code"
+msgstr "Zdrojový kód Eiffel"
 
 #: ../freedesktop.org.xml.in.h:556
-msgid "Windows Media audio"
-msgstr "Zvuk Windows Media"
+msgid "Emacs Lisp source code"
+msgstr "Zdrojový kód Emacs Lisp"
 
 #: ../freedesktop.org.xml.in.h:557
-msgid "Windows Media video"
-msgstr "Video Windows Media"
+msgid "Erlang source code"
+msgstr "Zdrojový kód Erlang"
 
 #: ../freedesktop.org.xml.in.h:558
-msgid "Windows Registry extract"
-msgstr "Časť registrov Windows"
+msgid "Fortran source code"
+msgstr "Zdrojový kód Fortran"
 
 #: ../freedesktop.org.xml.in.h:559
-msgid "Windows animated cursor"
-msgstr "Animovaný kurzor Windows"
+msgid "translation file"
+msgstr "Súbor prekladu"
 
 #: ../freedesktop.org.xml.in.h:560
-msgid "Windows cursor"
-msgstr "Kurzor Windows"
+msgid "translation template"
+msgstr "Šablóna prekladu"
+
+#: ../freedesktop.org.xml.in.h:561
+msgid "HTML document"
+msgstr "Dokument HTML"
+
+#: ../freedesktop.org.xml.in.h:562
+msgid "Web application cache manifest"
+msgstr ""
 
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:563
-msgid "Windows software"
-msgstr "Softvér Windows"
+msgid "Google Video Pointer"
+msgstr "Google Video Pointer"
 
 #: ../freedesktop.org.xml.in.h:564
-msgid "Word 2007 document"
-msgstr "Dokument Word 2007"
+msgid "Haskell source code"
+msgstr "Zdrojový kód Haskell"
 
 #: ../freedesktop.org.xml.in.h:565
-msgid "Word 2007 document template"
-msgstr ""
+msgid "IDL document"
+msgstr "Dokument IDL"
 
 #: ../freedesktop.org.xml.in.h:566
-msgid "Word document"
-msgstr "Dokument Word"
+msgid "installation instructions"
+msgstr "Návod na inštaláciu"
 
 #: ../freedesktop.org.xml.in.h:567
-msgid "Word macro-enabled document"
-msgstr ""
+msgid "Java source code"
+msgstr "Zdrojový kód Java"
 
 #: ../freedesktop.org.xml.in.h:568
-msgid "Word macro-enabled document template"
-msgstr ""
+msgid "LDIF address book"
+msgstr "Adresár LDIF"
 
 #: ../freedesktop.org.xml.in.h:569
-msgid "Word template"
-msgstr "Šablóna Word"
+msgid "Lilypond music sheet"
+msgstr "Notový papier Lilypond"
 
 #: ../freedesktop.org.xml.in.h:570
-msgid "WordPerfect document"
-msgstr "Dokument WordPerfect"
+msgid "LHS source code"
+msgstr "Zdrojový kód LHS"
 
 #: ../freedesktop.org.xml.in.h:571
-msgid "WordPerfect/Drawperfect image"
-msgstr "Obrázok WordPerfect/Drawperfect"
+msgid "application log"
+msgstr "Záznam aplikácie"
 
 #: ../freedesktop.org.xml.in.h:572
-msgid "X window image"
-msgstr "Obrázok X window"
+msgid "Makefile"
+msgstr "Makefile"
 
 #: ../freedesktop.org.xml.in.h:573
-msgid "X-Motif UIL table"
-msgstr "Tabuľka X-Motif UIL"
+msgid "Markdown document"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:574
-msgid "X.509 certificate"
-msgstr "Certifikát X.509"
+msgid "Qt MOC file"
+msgstr "Súbor Qt MOC"
 
 #: ../freedesktop.org.xml.in.h:575
-msgid "X11 cursor"
-msgstr "Kurzor X11"
+msgid "Windows Registry extract"
+msgstr "Časť registrov Windows"
 
 #: ../freedesktop.org.xml.in.h:576
-msgid "XBEL bookmarks"
-msgstr "Záložky XBEL"
+msgid "Managed Object Format"
+msgstr "Formát Managed Object"
 
 #: ../freedesktop.org.xml.in.h:577
-msgid "XBM image"
-msgstr "Obrázok XBM"
+msgid "Mup publication"
+msgstr "Publikácie Mup"
 
 #: ../freedesktop.org.xml.in.h:578
-msgid "XFig image"
-msgstr "Obrázok XFig"
+msgid "Objective-C source code"
+msgstr "Zdrojový kód Objective-C"
 
 #: ../freedesktop.org.xml.in.h:579
-msgid "XHTML page"
-msgstr "Stránka XHTML"
+msgid "OCaml source code"
+msgstr "Zdrojový kód OCaml"
 
 #: ../freedesktop.org.xml.in.h:580
-msgid "XLIFF translation file"
-msgstr "Súbor prekladu XLIFF"
+msgid "MATLAB script/function"
+msgstr "Skript/funkcia MATLAB"
 
 #: ../freedesktop.org.xml.in.h:581
-msgid "XMCD CD database"
-msgstr "Databáza XMCD CD"
+msgid "Pascal source code"
+msgstr "Zdrojový kód Pascal"
 
 #: ../freedesktop.org.xml.in.h:582
-msgid "XMF audio"
-msgstr "Zvuk XMF"
+msgid "differences between files"
+msgstr "Rozdiely medzi súbormi"
 
 #: ../freedesktop.org.xml.in.h:583
-msgid "XMI file"
-msgstr "Súbor XMI"
+msgid "Go source code"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:584
-msgid "XML document"
-msgstr "Dokument XML"
+msgid "Python script"
+msgstr "Skript Python"
 
 #: ../freedesktop.org.xml.in.h:585
-msgid "XML entities document"
-msgstr "Dokument entít XML"
+msgid "Lua script"
+msgstr "Skript Lua"
 
 #: ../freedesktop.org.xml.in.h:586
-msgid "XPInstall installer module"
-msgstr "Modul inštalátora XPInstall"
+msgid "README document"
+msgstr "Dokument README"
 
 #: ../freedesktop.org.xml.in.h:587
-msgid "XPM image"
-msgstr "Obrázok XPM"
+msgid "NFO document"
+msgstr "Dokument NFO"
 
 #: ../freedesktop.org.xml.in.h:588
-msgid "XPS document"
-msgstr "Dokument XPS"
+msgid "RPM spec file"
+msgstr "Súbor RPM spec"
 
 #: ../freedesktop.org.xml.in.h:589
-msgid "XSL FO file"
-msgstr "Súbor XSL FO"
+msgid "Scala source code"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:590
-msgid "XSLT stylesheet"
-msgstr "Štýl XSLT"
+msgid "Scheme source code"
+msgstr "Zdrojový kód Scheme"
 
 #: ../freedesktop.org.xml.in.h:591
-msgid "XSPF playlist"
-msgstr "Zoznam skladieb XSPF"
+msgid "Setext document"
+msgstr "Dokument Setext"
 
 #: ../freedesktop.org.xml.in.h:592
-msgid "XUL interface document"
-msgstr "Dokument rozhrania XUL"
+msgid "SQL code"
+msgstr "Kód SQL"
 
 #: ../freedesktop.org.xml.in.h:593
-msgid "XZ archive"
-msgstr "Archív XZ"
+msgid "Tcl script"
+msgstr "Skript Tcl"
 
 #: ../freedesktop.org.xml.in.h:594
-msgid "Xbase document"
-msgstr "Dokument Xbase"
+msgid "TeX document"
+msgstr "Dokument TeX"
 
 #: ../freedesktop.org.xml.in.h:595
-msgid "YAML document"
-msgstr "Dokument YAML"
+msgid "TeXInfo document"
+msgstr "Dokument TeXInfo"
 
 #: ../freedesktop.org.xml.in.h:596
-msgid "Zip archive"
-msgstr "Archív ZIP"
+msgid "Troff ME input document"
+msgstr "Vstupný dokument Troff ME"
 
 #: ../freedesktop.org.xml.in.h:597
-msgid "Zoo archive"
-msgstr "Archív zoo"
+msgid "Troff MM input document"
+msgstr "Vstupný dokument Troff MM"
 
 #: ../freedesktop.org.xml.in.h:598
-msgid "application log"
-msgstr "Záznam aplikácie"
+msgid "Troff MS input document"
+msgstr "Vstupný dokument Troff MS"
+
+#: ../freedesktop.org.xml.in.h:599
+msgid "X-Motif UIL table"
+msgstr "Tabuľka X-Motif UIL"
 
-#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../freedesktop.org.xml.in.h:600
-msgid "audio CD"
-msgstr "Zvukové CD"
+msgid "resource location"
+msgstr "Umiestnenie zdroja"
+
+#: ../freedesktop.org.xml.in.h:601
+msgid "XMI file"
+msgstr "Súbor XMI"
 
-#. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../freedesktop.org.xml.in.h:602
-msgid "audio DVD"
-msgstr "Zvukové DVD"
+msgid "XSL FO file"
+msgstr "Súbor XSL FO"
 
 #: ../freedesktop.org.xml.in.h:603
-msgid "author credits"
-msgstr "Autorské zásluhy"
+msgid "iptables configuration file"
+msgstr "Súbor nastavení iptables"
 
 #: ../freedesktop.org.xml.in.h:604
-msgid "author list"
-msgstr "Zoznam autorov"
+msgid "XSLT stylesheet"
+msgstr "Štýl XSLT"
 
 #: ../freedesktop.org.xml.in.h:605
-msgid "backup file"
-msgstr "Záložný súbor"
+msgid "XMCD CD database"
+msgstr "Databáza XMCD CD"
+
+#: ../freedesktop.org.xml.in.h:606
+msgid "XML document"
+msgstr "Dokument XML"
 
-#. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../freedesktop.org.xml.in.h:607
-msgid "blank Blu-ray disc"
-msgstr "Prázdny disk Blu-ray"
+msgid "XML entities document"
+msgstr "Dokument entít XML"
+
+#: ../freedesktop.org.xml.in.h:608
+msgid "DV video"
+msgstr "Video DV"
 
-#. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../freedesktop.org.xml.in.h:609
-msgid "blank CD disc"
-msgstr "Prázdny disk CD"
+msgid "ISI video"
+msgstr "Video ISI"
+
+#: ../freedesktop.org.xml.in.h:610
+msgid "MPEG-2 transport stream"
+msgstr ""
 
-#. http://en.wikipedia.org/wiki/DVD
 #: ../freedesktop.org.xml.in.h:611
-msgid "blank DVD disc"
-msgstr "Prázdny disk DVD"
+msgid "MPEG video"
+msgstr "Video MPEG"
+
+#: ../freedesktop.org.xml.in.h:612
+msgid "MPEG video (streamed)"
+msgstr ""
 
-#. http://en.wikipedia.org/wiki/HD_DVD
 #: ../freedesktop.org.xml.in.h:613
-msgid "blank HD DVD disc"
-msgstr "Prázdny disk HD DVD"
+msgid "QuickTime video"
+msgstr "Video QuickTime"
 
 #: ../freedesktop.org.xml.in.h:614
-msgid "block device"
-msgstr "Blokové zariadenie"
+msgid "QuickTime image"
+msgstr "Obrázok QuickTime"
 
 #: ../freedesktop.org.xml.in.h:615
-msgid "character device"
-msgstr "Znakové zariadenie"
+msgid "Vivo video"
+msgstr "Video Vivo"
 
 #: ../freedesktop.org.xml.in.h:616
-msgid "comic book archive"
-msgstr "Archív knihy komiksov"
+msgid "Wavelet video"
+msgstr "Video Wavelet"
 
 #: ../freedesktop.org.xml.in.h:617
-msgid "compound document"
-msgstr "Zložený dokument"
+msgid "ANIM animation"
+msgstr "Animácia ANIM"
 
 #: ../freedesktop.org.xml.in.h:618
-msgid "compound documents"
-msgstr "Zložené dokumenty"
+msgid "FLIC animation"
+msgstr "Animácia FLIC"
 
 #: ../freedesktop.org.xml.in.h:619
-msgid "compressed GIMP image"
-msgstr "Komprimovaný obrázok GIMP"
+msgid "Haansoft Hangul document"
+msgstr "Dokument Haansoft Hangul"
 
 #: ../freedesktop.org.xml.in.h:620
-msgid "compressed SVG image"
-msgstr "Komprimovaný obrázok SVG"
+msgid "Haansoft Hangul document template"
+msgstr "Šablóna dokumentu Haansoft Hangul"
 
 #: ../freedesktop.org.xml.in.h:621
-msgid "compressed Tracker audio"
-msgstr "Komprimovaný zvuk Tracker"
+msgid "MNG animation"
+msgstr "Animácia MNG"
 
 #: ../freedesktop.org.xml.in.h:622
-msgid "desktop configuration file"
-msgstr "Súbor nastavení pracovnej plochy"
+msgid "ASF video"
+msgstr "Video ASF"
 
 #: ../freedesktop.org.xml.in.h:623
-msgid "detached OpenPGP signature"
-msgstr "Oddelený podpis OpenPGP"
+msgid "Windows Media Station file"
+msgstr "Súbor Windows Media Station"
 
 #: ../freedesktop.org.xml.in.h:624
-msgid "detached S/MIME signature"
-msgstr "Oddelený podpis S/MIME"
+msgid "Windows Media video"
+msgstr "Video Windows Media"
 
 #: ../freedesktop.org.xml.in.h:625
-msgid "differences between files"
-msgstr "Rozdiely medzi súbormi"
+msgid "AVI video"
+msgstr "Video AVI"
+
+#: ../freedesktop.org.xml.in.h:626
+msgid "NullSoft video"
+msgstr "Video NullSoft"
 
-#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../freedesktop.org.xml.in.h:627
-msgid "digital photos"
-msgstr "Digitálne fotografie"
+msgid "SDP multicast stream file"
+msgstr "Súbor viacsmerového vysielania prúdu SDP"
 
 #: ../freedesktop.org.xml.in.h:628
-msgid "digital raw image"
-msgstr "Digitálny surový obrázok"
+msgid "SGI video"
+msgstr "Video SGI"
+
+#: ../freedesktop.org.xml.in.h:629
+msgid "eMusic download package"
+msgstr "Balíček sťahovania eMusic"
 
-#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:630
-msgid "e-book reader"
-msgstr ""
+msgid "KML geographic data"
+msgstr "Zemepisné údaje KML"
 
 #: ../freedesktop.org.xml.in.h:631
-msgid "eMusic download package"
-msgstr "Balíček sťahovania eMusic"
+msgid "KML geographic compressed data"
+msgstr "Komprimované zemepisné údaje KML"
 
 #: ../freedesktop.org.xml.in.h:632
-msgid "electronic book document"
-msgstr "Dokument elektronickej knihy"
+msgid "Citrix ICA settings file"
+msgstr "Súbor nastavení Citrix ICA"
 
 #: ../freedesktop.org.xml.in.h:633
-msgid "electronic business card"
-msgstr "Elektronická vizitka"
+msgid "XUL interface document"
+msgstr "Dokument rozhrania XUL"
 
 #: ../freedesktop.org.xml.in.h:634
-msgid "email headers"
-msgstr "Hlavičky e-mailu"
+msgid "XPInstall installer module"
+msgstr "Modul inštalátora XPInstall"
 
 #: ../freedesktop.org.xml.in.h:635
-msgid "email message"
-msgstr "E-mailová správa"
+msgid "Word 2007 document"
+msgstr "Dokument Word 2007"
 
 #: ../freedesktop.org.xml.in.h:636
-msgid "empty document"
-msgstr "Prázdny dokument"
+msgid "Word 2007 document template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:637
-msgid "encrypted message"
-msgstr "Zašifrovaná správa"
+msgid "PowerPoint 2007 presentation"
+msgstr "Prezentácia PowerPoint 2007"
 
 #: ../freedesktop.org.xml.in.h:638
-msgid "enriched text document"
-msgstr "Rozšírený textový dokument"
+msgid "PowerPoint 2007 slide"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:639
-msgid "executable"
-msgstr "Spustiteľný súbor"
+msgid "PowerPoint 2007 show"
+msgstr "Ukážka PowerPoint 2007"
 
 #: ../freedesktop.org.xml.in.h:640
-msgid "folder"
-msgstr "Priečinok"
+msgid "PowerPoint 2007 presentation template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:641
-msgid "generic font file"
-msgstr "Obyčajný súbor písma"
+msgid "Excel 2007 spreadsheet"
+msgstr "Zošit Excel 2007"
 
 #: ../freedesktop.org.xml.in.h:642
-msgid "help page"
-msgstr "Stránka Pomocníka"
+msgid "Excel 2007 spreadsheet template"
+msgstr ""
 
 #: ../freedesktop.org.xml.in.h:643
-msgid "iMelody ringtone"
-msgstr "Vyzváňacie melódie iMelody"
+msgid "T602 document"
+msgstr "Dokument T602"
 
 #: ../freedesktop.org.xml.in.h:644
-msgid "iPod firmware"
-msgstr "Firmware iPod"
+msgid "Cisco VPN Settings"
+msgstr "Nastavenia Cisco VPN"
 
 #: ../freedesktop.org.xml.in.h:645
-msgid "iRiver Playlist"
-msgstr "Zoznam skladieb iRiver"
+msgid "ICC profile"
+msgstr "Profil farieb ICC"
 
 #: ../freedesktop.org.xml.in.h:646
-msgid "installation instructions"
-msgstr "Návod na inštaláciu"
-
-#: ../freedesktop.org.xml.in.h:647
-msgid "iptables configuration file"
-msgstr "Súbor nastavení iptables"
+msgid "IT 8.7 color calibration file"
+msgstr ""
 
+#. http://en.wikipedia.org/wiki/Design_rule_for_Camera_File_system
 #: ../freedesktop.org.xml.in.h:648
-msgid "libtool shared library"
-msgstr "Zdieľaná knižnica libtool"
-
-#: ../freedesktop.org.xml.in.h:649
-msgid "license terms"
-msgstr "Licenčné podmienky"
-
-#: ../freedesktop.org.xml.in.h:650
-msgid "mail delivery report"
-msgstr "Správa o doručení pošty"
-
-#: ../freedesktop.org.xml.in.h:651
-msgid "mail disposition report"
-msgstr "Správa o odovzdaní pošty"
+msgid "digital photos"
+msgstr "Digitálne fotografie"
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Video_CD
+#. http://www.herongyang.com/CD-DVD/VCD-Movie-File-Directory-Structure.html
 #: ../freedesktop.org.xml.in.h:652
-msgid "mail system report"
-msgstr "Správa poštového systému"
-
-#: ../freedesktop.org.xml.in.h:653
-msgid "mailbox file"
-msgstr "Súbor mailbox"
-
-#: ../freedesktop.org.xml.in.h:654
-msgid "manual page (compressed)"
-msgstr "Manuálová stránka (komprimovaná)"
-
-#: ../freedesktop.org.xml.in.h:655
-msgid "message catalog"
-msgstr "Katalóg správ"
+msgid "Video CD"
+msgstr "Video CD"
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Super_Video_CD
+#. http://everything2.com/index.pl?node_id=1009222
 #: ../freedesktop.org.xml.in.h:656
-msgid "message digest"
-msgstr "Prehľad správ"
-
-#: ../freedesktop.org.xml.in.h:657
-msgid "message in several formats"
-msgstr "Správa v niekoľkých formátoch"
+msgid "Super Video CD"
+msgstr "Super Video CD"
 
+#. http://en.wikipedia.org/wiki/DVD-Video
 #: ../freedesktop.org.xml.in.h:658
-msgid "mount point"
-msgstr "Miesto pripojenia"
-
-#: ../freedesktop.org.xml.in.h:659
-msgid "object code"
-msgstr "Objektový kód"
+msgid "video DVD"
+msgstr "DVD-Video"
 
+#. http://en.wikipedia.org/wiki/Red_Book_(audio_CD_standard)
 #: ../freedesktop.org.xml.in.h:660
-msgid "packed font file"
-msgstr "Komprimovaný súbor písma"
-
-#: ../freedesktop.org.xml.in.h:661
-msgid "partial email message"
-msgstr "Čiastočná e-mailová správa"
+msgid "audio CD"
+msgstr "Zvukové CD"
 
+#. http://en.wikipedia.org/wiki/Compact_Disc
 #: ../freedesktop.org.xml.in.h:662
-msgid "pipe"
-msgstr "Rúra"
-
-#: ../freedesktop.org.xml.in.h:663
-msgid "plain text document"
-msgstr "Obyčajný textový dokument"
+msgid "blank CD disc"
+msgstr "Prázdny disk CD"
 
-#. see fd.o hal spec
-#: ../freedesktop.org.xml.in.h:665
-msgid "portable audio player"
-msgstr "Prenosný hudobný prehrávač"
+#. http://en.wikipedia.org/wiki/DVD
+#: ../freedesktop.org.xml.in.h:664
+msgid "blank DVD disc"
+msgstr "Prázdny disk DVD"
 
+#. http://en.wikipedia.org/wiki/Blu-ray_Disc
 #: ../freedesktop.org.xml.in.h:666
-msgid "profiler results"
-msgstr "Výsledky profilera"
-
-#: ../freedesktop.org.xml.in.h:667
-msgid "program crash data"
-msgstr "Údaje o páde programu"
+msgid "blank Blu-ray disc"
+msgstr "Prázdny disk Blu-ray"
 
+#. http://en.wikipedia.org/wiki/HD_DVD
 #: ../freedesktop.org.xml.in.h:668
-msgid "raw CD image"
-msgstr "Surový obraz CD"
-
-#: ../freedesktop.org.xml.in.h:669
-msgid "reference to remote file"
-msgstr "Odkaz na vzdialený súbor"
+msgid "blank HD DVD disc"
+msgstr "Prázdny disk HD DVD"
 
+#. http://en.wikipedia.org/wiki/DVD-Audio
 #: ../freedesktop.org.xml.in.h:670
-msgid "rejected patch"
-msgstr "Odmietnutá záplata"
-
-#: ../freedesktop.org.xml.in.h:671
-msgid "resource location"
-msgstr "Umiestnenie zdroja"
-
-#: ../freedesktop.org.xml.in.h:672
-msgid "rich text document"
-msgstr "Textový dokument RTF"
+msgid "audio DVD"
+msgstr "Zvukové DVD"
 
+#. http://en.wikipedia.org/wiki/Blu-ray_Disc
+#. http://www.blu-raydisc.com/Section-13470/Section-13890/Index.html
 #: ../freedesktop.org.xml.in.h:673
-msgid "shared library"
-msgstr "Zdieľaná knižnica"
-
-#: ../freedesktop.org.xml.in.h:674
-msgid "shell archive"
-msgstr "Archív shellu"
-
-#: ../freedesktop.org.xml.in.h:675
-msgid "shell script"
-msgstr "Skript shellu"
+msgid "Blu-ray video disc"
+msgstr "Videodisk Blu-ray"
 
+#. http://en.wikipedia.org/wiki/HD_DVD
+#. http://www.dvdafteredit.com/wiki/The_HVDVD_TS_Folder
 #: ../freedesktop.org.xml.in.h:676
-msgid "shortcut to Kexi project on database server"
-msgstr ""
-
-#: ../freedesktop.org.xml.in.h:677
-msgid "signed message"
-msgstr "Podpísaná správa"
+msgid "HD DVD video disc"
+msgstr "Videodisk HD DVD"
 
+#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:678
-msgid "socket"
-msgstr "Soket"
-
-#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
-#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
-#: ../freedesktop.org.xml.in.h:681
-msgid "software"
-msgstr "Softvér"
+msgid "e-book reader"
+msgstr ""
 
+#. TRANSLATORS: This is a brand-name, not a generic term. Please see
+#. http://en.wikipedia.org/wiki/Picture_CD
+#. http://www.re.org/kristin/picturecd.html
 #: ../freedesktop.org.xml.in.h:682
-msgid "spreadsheet interchange document"
-msgstr "Zošitový prenosový dokument"
-
-#: ../freedesktop.org.xml.in.h:683
-msgid "stream of data (server push)"
-msgstr "Prúd dát (posielaný serverom)"
+msgid "Picture CD"
+msgstr "Picture CD"
 
+#. see fd.o hal spec
 #: ../freedesktop.org.xml.in.h:684
-msgid "symbolic link"
-msgstr "Symbolický odkaz"
-
-#: ../freedesktop.org.xml.in.h:685
-msgid "theme"
-msgstr "Motív"
-
-#: ../freedesktop.org.xml.in.h:686
-msgid "translated messages (machine-readable)"
-msgstr "Preložené správy (strojovo čitateľné)"
+msgid "portable audio player"
+msgstr "Prenosný hudobný prehrávač"
 
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:687
-msgid "translation file"
-msgstr "Súbor prekladu"
-
-#: ../freedesktop.org.xml.in.h:688
-msgid "translation template"
-msgstr "Šablóna prekladu"
-
-#: ../freedesktop.org.xml.in.h:689
-msgid "txt2tags document"
-msgstr "Dokument txt2tags"
+msgid "software"
+msgstr "Softvér"
 
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
 #: ../freedesktop.org.xml.in.h:690
-msgid "unknown"
-msgstr "Neznámy"
+msgid "UNIX software"
+msgstr "Softvér UNIX"
 
-#. http://en.wikipedia.org/wiki/DVD-Video
-#: ../freedesktop.org.xml.in.h:692
-msgid "video DVD"
-msgstr "DVD-Video"
+#. http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html
+#. http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3
+#: ../freedesktop.org.xml.in.h:693
+msgid "Windows software"
+msgstr "Softvér Windows"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/software-properties.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/software-properties.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/software-properties.po	2012-01-02 17:51:07.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/software-properties.po	2012-02-23 06:55:53.000000000 +0000
@@ -8,38 +8,38 @@
 msgstr ""
 "Project-Id-Version: update-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-21 15:45+0000\n"
-"PO-Revision-Date: 2011-12-07 20:36+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2012-02-03 21:11+0000\n"
+"PO-Revision-Date: 2012-02-04 01:13+0000\n"
+"Last-Translator: Peter Chabada <chabada.peter@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:27+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:28+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
-msgid "To change software repository settings, you need to authenticate."
-msgstr ""
-
-#: ../data/com.ubuntu.softwareproperties.policy.in.h:2
 msgid "Write Configuration"
 msgstr "Zapísať konfiguráciu"
 
+#: ../data/com.ubuntu.softwareproperties.policy.in.h:2
+msgid "To change software repository settings, you need to authenticate."
+msgstr ""
+
 #: ../data/software-properties-gtk.desktop.in.h:1
 #: ../data/software-properties-kde.desktop.in.h:1
-msgid "Configure the sources for installable software and updates"
-msgstr "Nastaviť zdroje pre inštalovateľný softvér a aktualizácie"
-
-#: ../data/software-properties-gtk.desktop.in.h:2
-#: ../data/software-properties-kde.desktop.in.h:2
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:582
 #: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:602
-#: ../data/gtkbuilder/main.ui.h:29
+#: ../data/gtkbuilder/main.ui.h:14
 msgid "Software Sources"
 msgstr "Zdroje softvéru"
 
+#: ../data/software-properties-gtk.desktop.in.h:2
+#: ../data/software-properties-kde.desktop.in.h:2
+msgid "Configure the sources for installable software and updates"
+msgstr "Nastaviť zdroje pre inštalovateľný softvér a aktualizácie"
+
 #: ../add-apt-repository:35
 #, c-format
 msgid "The %s named '%s' has no PPA named '%s'"
@@ -82,32 +82,43 @@
 msgstr ""
 
 #: ../add-apt-repository:136
+#, c-format
+msgid ""
+"Cannot access PPA (%s) to get PPA information, please check your internet "
+"connection."
+msgstr ""
+
+#: ../add-apt-repository:142
+msgid "Adding private PPAs is not supported currently"
+msgstr ""
+
+#: ../add-apt-repository:146
 msgid "You are about to remove the following PPA from your system:"
 msgstr ""
 
-#: ../add-apt-repository:138
+#: ../add-apt-repository:148
 msgid "You are about to add the following PPA to your system:"
 msgstr "Chystáte sa do systému pridať nasledovné PPA:"
 
-#: ../add-apt-repository:140
+#: ../add-apt-repository:150
 #, c-format
 msgid " More info: %s"
 msgstr " Ďalšie informácie: %s"
 
-#: ../add-apt-repository:144
+#: ../add-apt-repository:154
 msgid "Press [ENTER] to continue or ctrl-c to cancel removing it"
 msgstr ""
 
-#: ../add-apt-repository:146
+#: ../add-apt-repository:156
 msgid "Press [ENTER] to continue or ctrl-c to cancel adding it"
 msgstr "Stlačením [ENTER] pokračujte alebo ctrl-c zrušte pridávanie"
 
-#: ../add-apt-repository:160 ../add-apt-repository:164
+#: ../add-apt-repository:170 ../add-apt-repository:174
 #, c-format
 msgid "Error: '%s' doesn't exist in a sourcelist file"
 msgstr "Chyba: „%s“ neexistuje v súbore zdrojov"
 
-#: ../add-apt-repository:168
+#: ../add-apt-repository:178
 #, c-format
 msgid "Error: '%s' invalid"
 msgstr "Chyba: „%s“ nie je platné"
@@ -191,17 +202,17 @@
 msgstr "Denne"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
-#: ../data/gtkbuilder/main.ui.h:17
+#: ../data/gtkbuilder/main.ui.h:10
 msgid "Every two days"
 msgstr "Každý druhý deň"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:166
-#: ../data/gtkbuilder/main.ui.h:35
+#: ../data/gtkbuilder/main.ui.h:11
 msgid "Weekly"
 msgstr "Raz za týždeň"
 
 #: ../softwareproperties/kde/SoftwarePropertiesKDE.py:167
-#: ../data/gtkbuilder/main.ui.h:18
+#: ../data/gtkbuilder/main.ui.h:12
 msgid "Every two weeks"
 msgstr "Každý druhý týždeň"
 
@@ -330,11 +341,11 @@
 "APT riadok vloží typ, umiestnenie a komponenty zo zdrojov, napr. „%s“."
 
 #: ../softwareproperties/kde/DialogEdit.py:41
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:6
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:1
 msgid "Binary"
 msgstr "Binárny"
 
-#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:30
+#: ../softwareproperties/kde/DialogEdit.py:42 ../data/gtkbuilder/main.ui.h:15
 msgid "Source code"
 msgstr "Zdrojový kód"
 
@@ -425,17 +436,13 @@
 msgid "Ubuntu CD Image Automatic Signing Key <cdimage@ubuntu.com>"
 msgstr "Autentifikačný kľúč Ubuntu CD <cdimage@ubuntu.com>"
 
-#: ../data/gtkbuilder/dialog-edit-source.ui.h:1
-msgid "<b>Comment:</b>"
-msgstr "<b>Komentár:</b>"
-
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:2
-msgid "<b>Components:</b>"
-msgstr "<b>Súčasti:</b>"
+msgid "Source"
+msgstr "Zdroj"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:3
-msgid "<b>Distribution:</b>"
-msgstr "<b>Distribúcia:</b>"
+msgid "Edit Source"
+msgstr "Upraviť zdroj"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:4
 msgid "<b>Type:</b>"
@@ -445,13 +452,17 @@
 msgid "<b>URI:</b>"
 msgstr "<b>URI:</b>"
 
+#: ../data/gtkbuilder/dialog-edit-source.ui.h:6
+msgid "<b>Distribution:</b>"
+msgstr "<b>Distribúcia:</b>"
+
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:7
-msgid "Edit Source"
-msgstr "Upraviť zdroj"
+msgid "<b>Components:</b>"
+msgstr "<b>Súčasti:</b>"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:8
-msgid "Source"
-msgstr "Zdroj"
+msgid "<b>Comment:</b>"
+msgstr "<b>Komentár:</b>"
 
 #: ../data/gtkbuilder/dialog-add-sources-list.ui.h:1
 msgid "_Replace"
@@ -462,139 +473,139 @@
 msgstr "Prehľadáva sa CD"
 
 #: ../data/gtkbuilder/main.ui.h:1
-msgid "    "
-msgstr "    "
+msgid "Display immediately"
+msgstr "Zobraziť okamžite"
 
 #: ../data/gtkbuilder/main.ui.h:2
-msgid "<b>Downloadable from the Internet</b>"
-msgstr "<b>Stiahnuteľné z internetu</b>"
+msgid "Display weekly"
+msgstr "Zobraziť každý týždeň"
 
 #: ../data/gtkbuilder/main.ui.h:3
-msgid "<b>Installable from CD-ROM/DVD</b>"
-msgstr "<b>Inštalovateľné z CD-ROM/DVD</b>"
+msgid "Display every two weeks"
+msgstr "Zobraziť každé dva týždne"
 
 #: ../data/gtkbuilder/main.ui.h:4
-msgid "<b>Trusted software providers</b>"
-msgstr "<b>Dôveryhodní poskytovatelia softvéru</b>"
+msgid "For any new version"
+msgstr "Pri akejkoľvek novej verzii"
 
 #: ../data/gtkbuilder/main.ui.h:5
-msgid "Add Volume..."
-msgstr "Pridať zväzok..."
+msgid "For long-term support versions"
+msgstr "Pri verziách s predĺženou podporou"
 
 #: ../data/gtkbuilder/main.ui.h:6
-msgid "Add..."
-msgstr "Pridať..."
+msgid "Never"
+msgstr "Nikdy"
 
 #: ../data/gtkbuilder/main.ui.h:7
-msgid "Authentication"
-msgstr "Autentifikácia"
+msgid "Download automatically"
+msgstr "Automaticky stiahnuť"
 
 #: ../data/gtkbuilder/main.ui.h:8
-msgid "Automatically check for updates:"
-msgstr "Automaticky kontrolovať aktualizácie:"
-
-#: ../data/gtkbuilder/main.ui.h:10
-msgid "Display every two weeks"
-msgstr "Zobraziť každé dva týždne"
-
-#: ../data/gtkbuilder/main.ui.h:11
-msgid "Display immediately"
-msgstr "Zobraziť okamžite"
-
-#: ../data/gtkbuilder/main.ui.h:12
-msgid "Display weekly"
-msgstr "Zobraziť každý týždeň"
-
-#: ../data/gtkbuilder/main.ui.h:13
 msgid "Download and install automatically"
 msgstr "Automaticky stiahnuť a nainštalovať"
 
-#: ../data/gtkbuilder/main.ui.h:14
-msgid "Download automatically"
-msgstr "Automaticky stiahnuť"
+#: ../data/gtkbuilder/main.ui.h:13
+msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
+msgstr "Ak chcete inštalovať z CD-ROM alebo DVD, vložte nosič do mechaniky."
 
-#: ../data/gtkbuilder/main.ui.h:15
+#: ../data/gtkbuilder/main.ui.h:16
 msgid "Download from:"
 msgstr "Sťahovať z:"
 
-#: ../data/gtkbuilder/main.ui.h:16
-msgid "Edit..."
-msgstr "Upraviť..."
+#: ../data/gtkbuilder/main.ui.h:17
+msgid "<b>Downloadable from the Internet</b>"
+msgstr "<b>Stiahnuteľné z internetu</b>"
+
+#: ../data/gtkbuilder/main.ui.h:18
+msgid "<b>Installable from CD-ROM/DVD</b>"
+msgstr "<b>Inštalovateľné z CD-ROM/DVD</b>"
 
 #: ../data/gtkbuilder/main.ui.h:19
-msgid "For any new version"
-msgstr "Pri akejkoľvek novej verzii"
+msgid "Add..."
+msgstr "Pridať..."
 
 #: ../data/gtkbuilder/main.ui.h:20
-msgid "For long-term support versions"
-msgstr "Pri verziách s predĺženou podporou"
+msgid "Edit..."
+msgstr "Upraviť..."
 
 #: ../data/gtkbuilder/main.ui.h:21
-msgid "Import the public key from a trusted software provider"
-msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru"
+msgid "Add Volume..."
+msgstr "Pridať zväzok..."
 
 #: ../data/gtkbuilder/main.ui.h:22
-msgid "Install updates from:"
-msgstr "Inštalovať aktualizácie z:"
+msgid "Other Software"
+msgstr "Ďalší softvér"
 
 #: ../data/gtkbuilder/main.ui.h:23
-msgid ""
-"Keys are used to authenticate the correct source of software and so protect "
-"your computer from malicious software"
-msgstr ""
-"Kľúče sa používajú na autorizovanie správnych zdrojov a tiež chránia váš "
-"počítač pred škodlivými programami"
+msgid "Install updates from:"
+msgstr "Inštalovať aktualizácie z:"
 
 #: ../data/gtkbuilder/main.ui.h:24
-msgid "Never"
-msgstr "Nikdy"
+msgid "Automatically check for updates:"
+msgstr "Automaticky kontrolovať aktualizácie:"
 
 #: ../data/gtkbuilder/main.ui.h:25
-msgid "Notify me of a new Ubuntu version:"
-msgstr "Upozorniť ma na novú verziu Ubuntu:"
+msgid "When there are security updates:"
+msgstr "Keď sú dostupné bezpečnostné aktualizácie:"
 
 #: ../data/gtkbuilder/main.ui.h:26
-msgid "Other Software"
-msgstr "Ďalší softvér"
+msgid "When there are other updates:"
+msgstr "Keď sú dostupné ďalšie aktualizácie:"
 
 #: ../data/gtkbuilder/main.ui.h:27
-msgid "Restore _Defaults"
-msgstr "_Obnoviť predvolené"
+msgid "Notify me of a new Ubuntu version:"
+msgstr "Upozorniť ma na novú verziu Ubuntu:"
 
 #: ../data/gtkbuilder/main.ui.h:28
-msgid "Restore the default keys of your distribution"
-msgstr "Obnoviť pôvodné kľúče distribúcie"
+msgid "Updates"
+msgstr "Aktualizácie"
+
+#: ../data/gtkbuilder/main.ui.h:29
+msgid "<b>Trusted software providers</b>"
+msgstr "<b>Dôveryhodní poskytovatelia softvéru</b>"
+
+#: ../data/gtkbuilder/main.ui.h:30
+msgid "    "
+msgstr "    "
 
 #: ../data/gtkbuilder/main.ui.h:31
-msgid "Statistics"
-msgstr "Štatistika"
+msgid ""
+"Keys are used to authenticate the correct source of software and so protect "
+"your computer from malicious software"
+msgstr ""
+"Kľúče sa používajú na autorizovanie správnych zdrojov a tiež chránia váš "
+"počítač pred škodlivými programami"
 
 #: ../data/gtkbuilder/main.ui.h:32
-msgid "Submit statistical information"
-msgstr "Poslať štatistické informácie"
+msgid "_Import Key File..."
+msgstr "_Importovať súbor s kľúčom..."
 
 #: ../data/gtkbuilder/main.ui.h:33
-msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
-msgstr "Ak chcete inštalovať z CD-ROM alebo DVD, vložte nosič do mechaniky."
+msgid "Import the public key from a trusted software provider"
+msgstr "Importovať verejný kľúč dôveryhodného poskytovateľa softvéru"
 
 #: ../data/gtkbuilder/main.ui.h:34
-msgid "Updates"
-msgstr "Aktualizácie"
+msgid "Restore _Defaults"
+msgstr "_Obnoviť predvolené"
+
+#: ../data/gtkbuilder/main.ui.h:35
+msgid "Restore the default keys of your distribution"
+msgstr "Obnoviť pôvodné kľúče distribúcie"
 
 #: ../data/gtkbuilder/main.ui.h:36
-msgid "When there are other updates:"
-msgstr "Keď sú dostupné ďalšie aktualizácie:"
+msgid "Authentication"
+msgstr "Autentifikácia"
 
 #: ../data/gtkbuilder/main.ui.h:37
-msgid "When there are security updates:"
-msgstr "Keď sú dostupné bezpečnostné aktualizácie:"
+msgid "Submit statistical information"
+msgstr "Poslať štatistické informácie"
 
 #: ../data/gtkbuilder/main.ui.h:38
-msgid "_Import Key File..."
-msgstr "_Importovať súbor s kľúčom..."
+msgid "Statistics"
+msgstr "Štatistika"
 
 #: ../data/gtkbuilder/dialog-cache-outofdate.ui.h:1
-#: ../data/gtkbuilder/dialog-mirror.ui.h:1
+#: ../data/gtkbuilder/dialog-mirror.ui.h:6
 msgid " "
 msgstr " "
 
@@ -602,7 +613,29 @@
 msgid "_Reload"
 msgstr "_Obnoviť"
 
+#: ../data/gtkbuilder/dialog-mirror.ui.h:1
+msgid "Choose a Download Server"
+msgstr "Vybrať server na sťahovnie"
+
 #: ../data/gtkbuilder/dialog-mirror.ui.h:2
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:3
+msgid "_Select Best Server"
+msgstr "Vybrať najlepší _server"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:4
+msgid "Performs a connection test to find the best mirror for your location"
+msgstr ""
+"Vykonať test pripojenia, ktorý nájde najvhodnejšie zrkadlo pre miesto, kde "
+"sa nachádzate"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:5
+msgid "Choose _Server"
+msgstr "Vybrať _server"
+
+#: ../data/gtkbuilder/dialog-mirror.ui.h:7
 msgid ""
 "<b><big>Testing download servers</big></b>\n"
 "\n"
@@ -614,28 +647,6 @@
 "Spustí sa séria testov, ktorá nájde najvhodnejšie zrkadlo pre vaše "
 "umiestnenie."
 
-#: ../data/gtkbuilder/dialog-mirror.ui.h:5
-msgid "Choose _Server"
-msgstr "Vybrať _server"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:6
-msgid "Choose a Download Server"
-msgstr "Vybrať server na sťahovnie"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:7
-msgid "Performs a connection test to find the best mirror for your location"
-msgstr ""
-"Vykonať test pripojenia, ktorý nájde najvhodnejšie zrkadlo pre miesto, kde "
-"sa nachádzate"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:8
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: ../data/gtkbuilder/dialog-mirror.ui.h:9
-msgid "_Select Best Server"
-msgstr "Vybrať najlepší _server"
-
 #: ../data/gtkbuilder/dialog-add.ui.h:2
 msgid "APT line:"
 msgstr "Riadok APT:"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/sysstat.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/sysstat.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/sysstat.po	2012-01-02 17:51:00.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/sysstat.po	2012-02-23 06:55:47.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:52+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: cifsiostat.c:69 iostat.c:80 mpstat.c:86 nfsiostat.c:68 pidstat.c:78
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/system-config-cluster.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/system-config-cluster.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/system-config-cluster.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/system-config-cluster.po	2012-02-23 06:55:48.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:10+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/clui.glade.h:1
 msgid "1"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/system-service.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/system-service.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/system-service.po	2012-01-02 17:51:12.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/system-service.po	2012-02-23 06:55:58.000000000 +0000
@@ -7,62 +7,62 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-service\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-28 10:51+0000\n"
+"POT-Creation-Date: 2012-01-10 09:07+0000\n"
 "PO-Revision-Date: 2010-04-17 07:25+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:56+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:49+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:1
-msgid "Check if the package system is locked"
-msgstr "Zistiť či je systém pre správu balíkov uzamknutý"
+msgid "Get current global proxy"
+msgstr "Zistiť aktuálne globálne proxy"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:2
-msgid "Get current global keyboard"
-msgstr "Zistiť aktuálnu globálnu klávesnicu"
+msgid "System policy prevents querying proxy settings"
+msgstr "Systémová politika zabraňuje zisťovanie nastavenia proxy"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:3
-msgid "Get current global proxy"
-msgstr "Zistiť aktuálne globálne proxy"
+msgid "Set current global proxy"
+msgstr "Nastaviť aktuálne globálne proxy"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:4
-msgid "Set current global keyboard"
-msgstr "Nastaviť aktuálnu globálnu klávesnicu"
+msgid "System policy prevents setting proxy settings"
+msgstr "Systémová politika zabraňuje nastaveniu proxy predvolieb"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:5
-msgid "Set current global proxy"
-msgstr "Nastaviť aktuálne globálne proxy"
-
-#: ../backend/com.ubuntu.systemservice.policy.in.h:6
 msgid "Set current global proxy exception"
 msgstr "Nastaviť výnimku pre aktuálne globálne proxy"
 
+#: ../backend/com.ubuntu.systemservice.policy.in.h:6
+msgid "System policy prevents setting no_proxy settings"
+msgstr "Systémová politika zabraňuje nastavenie no_proxy predvolieb"
+
 #: ../backend/com.ubuntu.systemservice.policy.in.h:7
-msgid "System policy prevents querying keyboard settings"
-msgstr "Systémová politika zabraňuje zisťovanie nastavenia klávesnice"
+msgid "Set current global keyboard"
+msgstr "Nastaviť aktuálnu globálnu klávesnicu"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:8
-msgid "System policy prevents querying package system lock"
+msgid "System policy prevents setting global keyboard settings"
 msgstr ""
-"Systémová politika zabraňuje zisťovanie uzamknutia systému pre správu balíkov"
+"Systémová politika zabraňuje nastaveniu globálnych nastavení klávesnice"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:9
-msgid "System policy prevents querying proxy settings"
-msgstr "Systémová politika zabraňuje zisťovanie nastavenia proxy"
+msgid "Get current global keyboard"
+msgstr "Zistiť aktuálnu globálnu klávesnicu"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:10
-msgid "System policy prevents setting global keyboard settings"
-msgstr ""
-"Systémová politika zabraňuje nastaveniu globálnych nastavení klávesnice"
+msgid "System policy prevents querying keyboard settings"
+msgstr "Systémová politika zabraňuje zisťovanie nastavenia klávesnice"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:11
-msgid "System policy prevents setting no_proxy settings"
-msgstr "Systémová politika zabraňuje nastavenie no_proxy predvolieb"
+msgid "Check if the package system is locked"
+msgstr "Zistiť či je systém pre správu balíkov uzamknutý"
 
 #: ../backend/com.ubuntu.systemservice.policy.in.h:12
-msgid "System policy prevents setting proxy settings"
-msgstr "Systémová politika zabraňuje nastaveniu proxy predvolieb"
+msgid "System policy prevents querying package system lock"
+msgstr ""
+"Systémová politika zabraňuje zisťovanie uzamknutia systému pre správu balíkov"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/tar.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/tar.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/tar.po	2012-01-02 17:50:45.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/tar.po	2012-02-23 06:55:35.000000000 +0000
@@ -14,8 +14,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:13+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:58+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: gnu/argmatch.c:135
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/tasksel.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/tasksel.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/tasksel.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/tasksel.po	2012-02-23 06:55:47.000000000 +0000
@@ -11,8 +11,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:53+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../tasksel.pl:433
 msgid ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/texinfo.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/texinfo.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/texinfo.po	2012-01-02 17:50:42.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/texinfo.po	2012-02-23 06:55:31.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 10:29+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 18:25+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: gnulib/lib/error.c:125
 msgid "Unknown system error"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/tmispell-voikko.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/tmispell-voikko.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/tmispell-voikko.po	2012-01-02 17:51:06.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/tmispell-voikko.po	2012-02-23 06:55:52.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:22+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/charset.cc:73
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/transmission-gtk.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/transmission-gtk.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/transmission-gtk.po	2012-01-02 17:51:07.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/transmission-gtk.po	2012-02-23 06:55:52.000000000 +0000
@@ -7,235 +7,253 @@
 msgstr ""
 "Project-Id-Version: transmission\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-05 07:23+0000\n"
-"PO-Revision-Date: 2011-09-08 12:46+0000\n"
+"POT-Creation-Date: 2012-02-15 12:23+0000\n"
+"PO-Revision-Date: 2012-01-12 07:41+0000\n"
 "Last-Translator: Peter Mráz <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:23+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:23+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: SLOVAKIA\n"
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../gtk/actions.c:49
+#: ../gtk/actions.c:45
 msgid "Sort by _Activity"
 msgstr "Usporiadať podľa _aktivity"
 
-#: ../gtk/actions.c:50
+#: ../gtk/actions.c:46
 msgid "Sort by _Name"
 msgstr "Usporiadať podľa _názvu"
 
-#: ../gtk/actions.c:51
+#: ../gtk/actions.c:47
 msgid "Sort by _Progress"
 msgstr "Usporiadať podľa _dokončenosti"
 
-#: ../gtk/actions.c:52
+#: ../gtk/actions.c:48
+msgid "Sort by _Queue"
+msgstr "Usporiadať podľa _zaradenia na spracovanie"
+
+#: ../gtk/actions.c:49
 msgid "Sort by Rati_o"
 msgstr "Usporiadať podľa _pomeru"
 
-#: ../gtk/actions.c:53
+#: ../gtk/actions.c:50
 msgid "Sort by Stat_e"
 msgstr "Usporiadať podľa _stavu"
 
-#: ../gtk/actions.c:54
+#: ../gtk/actions.c:51
 msgid "Sort by A_ge"
 msgstr "Usporiadať podľa _veku"
 
-#: ../gtk/actions.c:55
+#: ../gtk/actions.c:52
 msgid "Sort by Time _Left"
 msgstr "Usporiadať podľa _zostávajúceho času"
 
-#: ../gtk/actions.c:56
+#: ../gtk/actions.c:53
 msgid "Sort by Si_ze"
 msgstr "Usporiadať podľa veľ_kosti"
 
-#: ../gtk/actions.c:73
+#: ../gtk/actions.c:70
 msgid "_Show Transmission"
 msgstr "_Zobraziť Transmission"
 
-#: ../gtk/actions.c:74
+#: ../gtk/actions.c:71
 msgid "Message _Log"
 msgstr "_Záznamník"
 
-#: ../gtk/actions.c:89
+#: ../gtk/actions.c:86
 msgid "Enable Alternative Speed _Limits"
 msgstr "Povoliť alternatívne _obmedzenia rýchlosti"
 
-#: ../gtk/actions.c:90
+#: ../gtk/actions.c:87
 msgid "_Compact View"
 msgstr "_Kompaktné zobrazenie"
 
-#: ../gtk/actions.c:91
+#: ../gtk/actions.c:88
 msgid "Re_verse Sort Order"
 msgstr "_Obrátiť poradie usporiadania"
 
-#: ../gtk/actions.c:92
+#: ../gtk/actions.c:89
 msgid "_Filterbar"
 msgstr "Lišta _filtrov"
 
-#: ../gtk/actions.c:93
+#: ../gtk/actions.c:90
 msgid "_Statusbar"
 msgstr "Stavová _lišta"
 
-#: ../gtk/actions.c:94
+#: ../gtk/actions.c:91
 msgid "_Toolbar"
 msgstr "Lišta nás_trojov"
 
-#: ../gtk/actions.c:99
+#: ../gtk/actions.c:96
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../gtk/actions.c:100
+#: ../gtk/actions.c:97
 msgid "_Torrent"
 msgstr "_Torrent"
 
-#: ../gtk/actions.c:101
+#: ../gtk/actions.c:98
 msgid "_View"
 msgstr "_Zobraziť"
 
-#: ../gtk/actions.c:102
+#: ../gtk/actions.c:99
 msgid "_Sort Torrents By"
 msgstr "_Usporiadať torrenty podľa"
 
-#: ../gtk/actions.c:103 ../gtk/details.c:2444
+#: ../gtk/actions.c:100
+msgid "_Queue"
+msgstr "_Zaradiť do poradia"
+
+#: ../gtk/actions.c:101 ../gtk/details.c:2436
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../gtk/actions.c:104
+#: ../gtk/actions.c:102
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../gtk/actions.c:105
+#: ../gtk/actions.c:103
 msgid "Copy _Magnet Link to Clipboard"
 msgstr "Kopírovať odkaz _Magnet do schránky"
 
-#: ../gtk/actions.c:106
-msgid "Open _URL..."
-msgstr "Otvoriť _URL..."
-
-#: ../gtk/actions.c:106
-msgid "Open URL..."
-msgstr "Otvoriť URL..."
+#: ../gtk/actions.c:104
+msgid "Open _URL…"
+msgstr ""
+
+#: ../gtk/actions.c:104
+msgid "Open URL…"
+msgstr ""
 
-#: ../gtk/actions.c:107 ../gtk/actions.c:108
+#: ../gtk/actions.c:105 ../gtk/actions.c:106
 msgid "Open a torrent"
 msgstr "Otvoriť torrent"
 
-#: ../gtk/actions.c:109
+#: ../gtk/actions.c:107
 msgid "_Start"
 msgstr "_Spustiť"
 
-#: ../gtk/actions.c:109
+#: ../gtk/actions.c:107
 msgid "Start torrent"
 msgstr "Spustiť torrent"
 
-#: ../gtk/actions.c:110
+#: ../gtk/actions.c:108
+msgid "Start _Now"
+msgstr "Spustiť _teraz"
+
+#: ../gtk/actions.c:108
+msgid "Start torrent now"
+msgstr "Spustí torrent teraz"
+
+#: ../gtk/actions.c:109
 msgid "_Statistics"
 msgstr "Š_tatistiky"
 
-#: ../gtk/actions.c:111
+#: ../gtk/actions.c:110
 msgid "_Donate"
 msgstr "P_rispieť"
 
-#: ../gtk/actions.c:112
+#: ../gtk/actions.c:111
 msgid "_Verify Local Data"
 msgstr "_Overiť lokálne dáta"
 
-#: ../gtk/actions.c:113
+#: ../gtk/actions.c:112
 msgid "_Pause"
 msgstr "_Pozastaviť"
 
-#: ../gtk/actions.c:113
+#: ../gtk/actions.c:112
 msgid "Pause torrent"
 msgstr "Pozastaviť torrent"
 
-#: ../gtk/actions.c:114
+#: ../gtk/actions.c:113
 msgid "_Pause All"
 msgstr "_Pozastaviť všetko"
 
-#: ../gtk/actions.c:114
+#: ../gtk/actions.c:113
 msgid "Pause all torrents"
 msgstr "Pozastaviť všetky torrenty"
 
-#: ../gtk/actions.c:115
+#: ../gtk/actions.c:114
 msgid "_Start All"
 msgstr "_Spustiť všetko"
 
-#: ../gtk/actions.c:115
+#: ../gtk/actions.c:114
 msgid "Start all torrents"
 msgstr "Spustiť všetky torrenty"
 
-#: ../gtk/actions.c:116
-msgid "Set _Location..."
-msgstr "_Nastaviť umiestnenie..."
+#: ../gtk/actions.c:115
+msgid "Set _Location…"
+msgstr ""
 
-#: ../gtk/actions.c:117
+#: ../gtk/actions.c:116
 msgid "Remove torrent"
 msgstr "Zmazať torrent"
 
-#: ../gtk/actions.c:118
+#: ../gtk/actions.c:117
 msgid "_Delete Files and Remove"
 msgstr "_Zmazať a odstrániť súbory"
 
-#: ../gtk/actions.c:119
-msgid "_New..."
-msgstr "_Nový..."
+#: ../gtk/actions.c:118
+msgid "_New…"
+msgstr ""
 
-#: ../gtk/actions.c:119
+#: ../gtk/actions.c:118
 msgid "Create a torrent"
 msgstr "Vytvoriť torrent"
 
-#: ../gtk/actions.c:120
+#: ../gtk/actions.c:119
 msgid "_Quit"
 msgstr "_Ukončiť"
 
-#: ../gtk/actions.c:121
+#: ../gtk/actions.c:120
 msgid "Select _All"
 msgstr "Označiť _všetko"
 
-#: ../gtk/actions.c:122
+#: ../gtk/actions.c:121
 msgid "Dese_lect All"
 msgstr "_Odznačiť všetko"
 
-#: ../gtk/actions.c:124
+#: ../gtk/actions.c:123
 msgid "Torrent properties"
 msgstr "Vlastnosti torrentu"
 
-#: ../gtk/actions.c:125
+#: ../gtk/actions.c:124
 msgid "Open Fold_er"
 msgstr "_Otvoriť priečinok"
 
-#: ../gtk/actions.c:127
+#: ../gtk/actions.c:126
 msgid "_Contents"
 msgstr "O_bsah"
 
-#: ../gtk/actions.c:128
+#: ../gtk/actions.c:127
 msgid "Ask Tracker for _More Peers"
 msgstr "Požiadať tracker o viac partnerov"
 
-#: ../gtk/conf.c:62 ../libtransmission/fdlimit.c:369
-#: ../libtransmission/metainfo.c:112 ../libtransmission/utils.c:556
-#: ../libtransmission/utils.c:567
-#, c-format
-msgid "Couldn't create \"%1$s\": %2$s"
-msgstr "Nepodarilo sa vytvoriť \"%1$s\": %2$s"
+#: ../gtk/actions.c:128
+msgid "Move to _Top"
+msgstr "Presunúť na_hor"
 
-#: ../gtk/conf.c:85 ../libtransmission/fdlimit.c:359
-#: ../libtransmission/fdlimit.c:390
-#, c-format
-msgid "Couldn't open \"%1$s\": %2$s"
-msgstr "Nepodarilo sa otvoriť \"%1$s\": %2$s"
+#: ../gtk/actions.c:129
+msgid "Move _Up"
+msgstr "Posunúť _vyššie"
+
+#: ../gtk/actions.c:130
+msgid "Move _Down"
+msgstr "Posunúť _nižšie"
+
+#: ../gtk/actions.c:131
+msgid "Move to _Bottom"
+msgstr "Presunúť na_dol"
 
-#: ../gtk/conf.c:90
-#, c-format
-msgid "%s is already running."
-msgstr "%s je už spustený."
+#: ../gtk/actions.c:132
+msgid "Present Main Window"
+msgstr ""
 
-#: ../gtk/conf.c:401 ../gtk/conf.c:406
+#: ../gtk/conf.c:317 ../gtk/conf.c:322
 #, c-format
 msgid "Importing \"%s\""
 msgstr "Importuje sa \"%s\""
@@ -260,7 +278,7 @@
 msgid "Stop seeding if idle for N minutes:"
 msgstr "Ukončiť zdieľanie po N minútach nečinnosti:"
 
-#: ../gtk/details.c:478 ../gtk/tr-prefs.c:1251
+#: ../gtk/details.c:478 ../gtk/tr-prefs.c:1287
 msgid "Speed"
 msgstr "Rýchlosť"
 
@@ -302,70 +320,81 @@
 msgid "_Maximum peers:"
 msgstr "_Maximálny počet partnerov:"
 
-#: ../gtk/details.c:560 ../gtk/torrent-cell-renderer.c:220
-msgid "Waiting to verify local data"
-msgstr "Čaká sa na overenie lokálnych dát"
+#: ../gtk/details.c:560 ../gtk/torrent-cell-renderer.c:201
+#: ../libtransmission/verify.c:260
+msgid "Queued for verification"
+msgstr "Zaradený do radu na overenie"
 
 #: ../gtk/details.c:561
 msgid "Verifying local data"
 msgstr "Overujú sa lokálne dáta"
 
-#: ../gtk/details.c:562 ../gtk/filter.c:699 ../gtk/tr-prefs.c:295
+#: ../gtk/details.c:562 ../gtk/torrent-cell-renderer.c:204
+msgid "Queued for download"
+msgstr "Zaradené na sťahovanie"
+
+#: ../gtk/details.c:563 ../gtk/filter.c:698
+msgctxt "Verb"
 msgid "Downloading"
-msgstr "Sťahované"
+msgstr ""
 
-#: ../gtk/details.c:563 ../gtk/filter.c:700 ../gtk/tr-prefs.c:319
+#: ../gtk/details.c:564 ../gtk/torrent-cell-renderer.c:207
+msgid "Queued for seeding"
+msgstr "Zaradené na zdieľanie"
+
+#: ../gtk/details.c:565 ../gtk/filter.c:699
+msgctxt "Verb"
 msgid "Seeding"
-msgstr "Zdieľané"
+msgstr ""
 
-#: ../gtk/details.c:564 ../gtk/filter.c:702 ../gtk/torrent-cell-renderer.c:214
+#: ../gtk/details.c:566 ../gtk/filter.c:701 ../gtk/torrent-cell-renderer.c:198
 msgid "Finished"
 msgstr "Dokončené"
 
-#: ../gtk/details.c:564 ../gtk/filter.c:701 ../gtk/torrent-cell-renderer.c:216
+#: ../gtk/details.c:566 ../gtk/filter.c:700 ../gtk/torrent-cell-renderer.c:198
 msgid "Paused"
 msgstr "Pozastavené"
 
-#: ../gtk/details.c:597
+#: ../gtk/details.c:599
 msgid "N/A"
 msgstr "-"
 
-#: ../gtk/details.c:609 ../gtk/file-list.c:618
+#: ../gtk/details.c:611 ../gtk/file-list.c:605
 msgid "Mixed"
 msgstr "Zmiešaná"
 
-#: ../gtk/details.c:610
+#: ../gtk/details.c:612
 msgid "No Torrents Selected"
 msgstr "Žiadne vybrané torrenty"
 
-#: ../gtk/details.c:632
+#: ../gtk/details.c:634
 msgid "Private to this tracker -- DHT and PEX disabled"
 msgstr "Len pre tento tracker -- DHT a PEX vypnuté"
 
-#: ../gtk/details.c:634
+#: ../gtk/details.c:636
 msgid "Public torrent"
 msgstr "Verejný torrent"
 
-#: ../gtk/details.c:657
+#: ../gtk/details.c:659
 #, c-format
 msgid "Created by %1$s"
 msgstr "Vytvoril %1$s"
 
-#: ../gtk/details.c:659
+#: ../gtk/details.c:661
 #, c-format
 msgid "Created on %1$s"
 msgstr "Vytvorené %1$s"
 
-#: ../gtk/details.c:661
+#: ../gtk/details.c:663
 #, c-format
 msgid "Created by %1$s on %2$s"
 msgstr "Vytvoril %1$s dňa %2$s"
 
-#: ../gtk/details.c:747
+#: ../gtk/details.c:749
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../gtk/details.c:775
+#: ../gtk/details.c:777
 #, c-format
 msgid "%1$s (%2$'d piece @ %3$s)"
 msgid_plural "%1$s (%2$'d pieces @ %3$s)"
@@ -373,7 +402,7 @@
 msgstr[1] "%1$s (%2$'d časť @ %3$s)"
 msgstr[2] "%1$s (%2$'d časti @ %3$s)"
 
-#: ../gtk/details.c:781
+#: ../gtk/details.c:783
 #, c-format
 msgid "%1$s (%2$'d piece)"
 msgid_plural "%1$s (%2$'d pieces)"
@@ -381,295 +410,295 @@
 msgstr[1] "%1$s (%2$'d časť)"
 msgstr[2] "%1$s (%2$'d časti)"
 
-#: ../gtk/details.c:818
+#: ../gtk/details.c:817
 #, c-format
 msgid "%1$s (%2$s%%)"
 msgstr "%1$s (%2$s%%)"
 
-#: ../gtk/details.c:820
+#: ../gtk/details.c:819
 #, c-format
 msgid "%1$s (%2$s%% of %3$s%% Available)"
 msgstr "%1$s (%2$s%% z %3$s%% dostupných)"
 
-#: ../gtk/details.c:822
+#: ../gtk/details.c:821
 #, c-format
 msgid "%1$s (%2$s%% of %3$s%% Available); %4$s Unverified"
 msgstr "%1$s (%2$s%% z %3$s%% dostupných); %4$s neoverených"
 
-#: ../gtk/details.c:841
+#: ../gtk/details.c:840
 #, c-format
 msgid "%1$s (+%2$s corrupt)"
 msgstr "%1$s (+%2$s poškodené)"
 
-#: ../gtk/details.c:863
+#: ../gtk/details.c:862
 #, c-format
 msgid "%s (Ratio: %s)"
 msgstr "%s (Pomer: %s)"
 
-#: ../gtk/details.c:891
+#: ../gtk/details.c:890
 msgid "No errors"
 msgstr "Žiadne chyby"
 
-#: ../gtk/details.c:904
+#: ../gtk/details.c:903
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../gtk/details.c:908
+#: ../gtk/details.c:907
 msgid "Active now"
 msgstr "Teraz aktívny"
 
-#: ../gtk/details.c:912
+#: ../gtk/details.c:911
 #, c-format
 msgid "%1$s ago"
 msgstr "pred %1$s"
 
-#: ../gtk/details.c:931
+#: ../gtk/details.c:930
 msgid "Activity"
 msgstr "Aktivita"
 
-#: ../gtk/details.c:936
+#: ../gtk/details.c:935
 msgid "Torrent size:"
 msgstr "Veľkosť torentu:"
 
-#: ../gtk/details.c:941
+#: ../gtk/details.c:940
 msgid "Have:"
 msgstr "Uložených:"
 
-#: ../gtk/details.c:946 ../gtk/stats.c:155 ../gtk/stats.c:172
+#: ../gtk/details.c:945 ../gtk/stats.c:155 ../gtk/stats.c:172
 msgid "Downloaded:"
 msgstr "Stiahnutých:"
 
-#: ../gtk/details.c:951 ../gtk/stats.c:152 ../gtk/stats.c:169
+#: ../gtk/details.c:950 ../gtk/stats.c:152 ../gtk/stats.c:169
 msgid "Uploaded:"
 msgstr "Odoslaných:"
 
-#: ../gtk/details.c:956
+#: ../gtk/details.c:955
 msgid "State:"
 msgstr "Stav:"
 
-#: ../gtk/details.c:961
+#: ../gtk/details.c:960
 msgid "Running time:"
 msgstr "Uplynutý čas:"
 
-#: ../gtk/details.c:966
+#: ../gtk/details.c:965
 msgid "Remaining time:"
 msgstr "Zostávajúci čas:"
 
-#: ../gtk/details.c:971
+#: ../gtk/details.c:970
 msgid "Last activity:"
 msgstr "Posledná aktivita:"
 
-#: ../gtk/details.c:977
+#: ../gtk/details.c:976
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../gtk/details.c:982
+#: ../gtk/details.c:981
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../gtk/details.c:988
+#: ../gtk/details.c:987
 msgid "Location:"
 msgstr "Umiestnenie:"
 
-#: ../gtk/details.c:995
+#: ../gtk/details.c:994
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../gtk/details.c:1001
+#: ../gtk/details.c:1000
 msgid "Privacy:"
 msgstr "Prístup:"
 
-#: ../gtk/details.c:1008
+#: ../gtk/details.c:1007
 msgid "Origin:"
 msgstr "Pôvod:"
 
-#: ../gtk/details.c:1025
+#: ../gtk/details.c:1024
 msgid "Comment:"
 msgstr "Komentár:"
 
-#: ../gtk/details.c:1057
+#: ../gtk/details.c:1056
 msgid "Webseeds"
 msgstr "Webové zdroje"
 
-#: ../gtk/details.c:1059 ../gtk/details.c:1112
+#: ../gtk/details.c:1058 ../gtk/details.c:1111
 msgid "Down"
 msgstr "Stiahnutých"
 
-#: ../gtk/details.c:1110
+#: ../gtk/details.c:1109
 msgid "Address"
 msgstr "Adresa"
 
-#: ../gtk/details.c:1114
+#: ../gtk/details.c:1113
 msgid "Up"
 msgstr "Odoslaných"
 
-#: ../gtk/details.c:1115
+#: ../gtk/details.c:1114
 msgid "Client"
 msgstr "Klient"
 
-#: ../gtk/details.c:1116
+#: ../gtk/details.c:1115
 msgid "%"
 msgstr "%"
 
-#: ../gtk/details.c:1118
+#: ../gtk/details.c:1117
 msgid "Up Reqs"
 msgstr "Požiadaviek"
 
-#: ../gtk/details.c:1120
+#: ../gtk/details.c:1119
 msgid "Dn Reqs"
 msgstr "Požiadaviek"
 
-#: ../gtk/details.c:1122
+#: ../gtk/details.c:1121
 msgid "Dn Blocks"
 msgstr "Blokovaní"
 
-#: ../gtk/details.c:1124
+#: ../gtk/details.c:1123
 msgid "Up Blocks"
 msgstr "Blokovaní"
 
-#: ../gtk/details.c:1126
+#: ../gtk/details.c:1125
 msgid "We Cancelled"
 msgstr "Zrušili sme"
 
-#: ../gtk/details.c:1128
+#: ../gtk/details.c:1127
 msgid "They Cancelled"
 msgstr "Oni zrušili"
 
-#: ../gtk/details.c:1129
+#: ../gtk/details.c:1128
 msgid "Flags"
 msgstr "Príznaky"
 
-#: ../gtk/details.c:1485
+#: ../gtk/details.c:1483
 msgid "Optimistic unchoke"
 msgstr "Optimistické odblokovanie"
 
-#: ../gtk/details.c:1486
+#: ../gtk/details.c:1484
 msgid "Downloading from this peer"
 msgstr "Od tohto partnera sa sťahuje"
 
-#: ../gtk/details.c:1487
+#: ../gtk/details.c:1485
 msgid "We would download from this peer if they would let us"
 msgstr "Od tohto partnera by sme sťahovali, keby nám to dovolil"
 
-#: ../gtk/details.c:1488
+#: ../gtk/details.c:1486
 msgid "Uploading to peer"
 msgstr "Odosielanie partnerovi"
 
-#: ../gtk/details.c:1489
+#: ../gtk/details.c:1487
 msgid "We would upload to this peer if they asked"
 msgstr "Tomuto partnerovi by sme odosielali, keby o to požiadal"
 
-#: ../gtk/details.c:1490
+#: ../gtk/details.c:1488
 msgid "Peer has unchoked us, but we're not interested"
 msgstr "Partner nás odblokoval, ale my nemáme záujem"
 
-#: ../gtk/details.c:1491
+#: ../gtk/details.c:1489
 msgid "We unchoked this peer, but they're not interested"
 msgstr "Tohto partnera sme odblokovali, ale nemá záujem"
 
-#: ../gtk/details.c:1492
+#: ../gtk/details.c:1490
 msgid "Encrypted connection"
 msgstr "Šifrované pripojenie"
 
-#: ../gtk/details.c:1493
+#: ../gtk/details.c:1491
 msgid "Peer was found through Peer Exchange (PEX)"
 msgstr "Partner bol nájdený cez PEX"
 
-#: ../gtk/details.c:1494
+#: ../gtk/details.c:1492
 msgid "Peer was found through DHT"
 msgstr "Partner bol nájdený cez DHT"
 
-#: ../gtk/details.c:1495
+#: ../gtk/details.c:1493
 msgid "Peer is an incoming connection"
 msgstr "Partner je prichádzajúce spojenie"
 
-#: ../gtk/details.c:1496
+#: ../gtk/details.c:1494
 msgid "Peer is connected over µTP"
 msgstr "Partner je pripojený cez µTP"
 
-#: ../gtk/details.c:1751 ../gtk/details.c:2459
+#: ../gtk/details.c:1743 ../gtk/details.c:2451
 msgid "Show _more details"
 msgstr "Zobraziť _viac podrobností"
 
-#: ../gtk/details.c:1822
+#: ../gtk/details.c:1814
 #, c-format
 msgid "Got a list of %1$s%2$'d peers%3$s %4$s ago"
 msgstr ""
 "Od posledného získania zoznamu %1$s%2$'d partnerov prešiel čas: %3$s %4$s"
 
-#: ../gtk/details.c:1826
+#: ../gtk/details.c:1818
 #, c-format
 msgid "Peer list request %1$stimed out%2$s %3$s ago; will retry"
 msgstr ""
 "Požiadavka na zoznam partnerov %1$s vypršala %2$s pred časom %3$s; obnoví sa"
 
-#: ../gtk/details.c:1829
+#: ../gtk/details.c:1821
 #, c-format
 msgid "Got an error %1$s\"%2$s\"%3$s %4$s ago"
 msgstr "Získali sme chybu %1$s\"%2$s\"%3$s pred %4$s"
 
-#: ../gtk/details.c:1837
+#: ../gtk/details.c:1829
 msgid "No updates scheduled"
 msgstr "Žiadne plánované aktualizácie"
 
-#: ../gtk/details.c:1842
+#: ../gtk/details.c:1834
 #, c-format
 msgid "Asking for more peers in %s"
 msgstr "Požiadanie o viac partnerov za čas: %s"
 
-#: ../gtk/details.c:1846
+#: ../gtk/details.c:1838
 msgid "Queued to ask for more peers"
 msgstr "Zaradený do radu na požiadanie o viac partnerov"
 
-#: ../gtk/details.c:1851
+#: ../gtk/details.c:1843
 #, c-format
-msgid "Asking for more peers now... <small>%s</small>"
-msgstr "Prebieha žiadanie o viac partnerov... <small>%s</small>"
+msgid "Asking for more peers now… <small>%s</small>"
+msgstr ""
 
-#: ../gtk/details.c:1861
+#: ../gtk/details.c:1853
 #, c-format
 msgid "Tracker had %s%'d seeders and %'d leechers%s %s ago"
 msgstr ""
 "Od doby, kedy mal tracker %s%'d zdieľajúcich a %'d sťahujúcich ubehol čas: "
 "%s %s"
 
-#: ../gtk/details.c:1865
+#: ../gtk/details.c:1857
 #, c-format
 msgid "Got a scrape error \"%s%s%s\" %s ago"
 msgstr "Dotaz na tracker viedlo k chybe \"%s%s%s\" pred časom: %s."
 
-#: ../gtk/details.c:1875
+#: ../gtk/details.c:1867
 #, c-format
 msgid "Asking for peer counts in %s"
 msgstr "Zistenie počtu partnerov za čas: %s"
 
-#: ../gtk/details.c:1879
+#: ../gtk/details.c:1871
 msgid "Queued to ask for peer counts"
 msgstr "Zaradený do radu na zistenie počtu partnerov"
 
-#: ../gtk/details.c:1884
+#: ../gtk/details.c:1876
 #, c-format
-msgid "Asking for peer counts now... <small>%s</small>"
-msgstr "Prebieha zisťovanie počtu partnerov... <small>%s</small>"
+msgid "Asking for peer counts now… <small>%s</small>"
+msgstr ""
 
-#: ../gtk/details.c:2154
+#: ../gtk/details.c:2146
 msgid "List contains invalid URLs"
 msgstr "Zoznam obsahuje neplatné URL adresy"
 
-#: ../gtk/details.c:2159
+#: ../gtk/details.c:2151
 msgid "Please correct the errors and try again."
 msgstr "Prosím, opravte chyby a skúste to znova."
 
-#: ../gtk/details.c:2209
+#: ../gtk/details.c:2201
 #, c-format
 msgid "%s - Edit Trackers"
 msgstr "%s - Upraviť trackery"
 
-#: ../gtk/details.c:2219
+#: ../gtk/details.c:2211
 msgid "Tracker Announce URLs"
 msgstr "Oznamovacie URL adresy trackera"
 
-#: ../gtk/details.c:2222 ../gtk/makemeta-ui.c:496
+#: ../gtk/details.c:2214 ../gtk/makemeta-ui.c:490
 msgid ""
 "To add a backup URL, add it on the line after the primary URL.\n"
 "To add another primary URL, add it after a blank line."
@@ -677,63 +706,63 @@
 "Záložnú URL adresu pridajte do riadka za hlavnú URL adresu.\n"
 "Pred ďalšou hlavnou URL adresou vložte prázdny riadok."
 
-#: ../gtk/details.c:2320
+#: ../gtk/details.c:2312
 #, c-format
 msgid "%s - Add Tracker"
 msgstr "%s - Pridať tracker"
 
-#: ../gtk/details.c:2334
+#: ../gtk/details.c:2326
 msgid "Tracker"
 msgstr "Tracker"
 
-#: ../gtk/details.c:2340
+#: ../gtk/details.c:2332
 msgid "_Announce URL:"
 msgstr "_Oznamovacia URL:"
 
-#: ../gtk/details.c:2415 ../gtk/details.c:2559 ../gtk/filter.c:322
+#: ../gtk/details.c:2407 ../gtk/details.c:2551 ../gtk/filter.c:322
 msgid "Trackers"
 msgstr "Trackery"
 
-#: ../gtk/details.c:2439
+#: ../gtk/details.c:2431
 msgid "_Add"
 msgstr "_Pridať"
 
-#: ../gtk/details.c:2450
+#: ../gtk/details.c:2442
 msgid "_Remove"
 msgstr "_Zmazať"
 
-#: ../gtk/details.c:2466
+#: ../gtk/details.c:2458
 msgid "Show _backup trackers"
 msgstr "Zobraziť _záložné trackery"
 
-#: ../gtk/details.c:2551 ../gtk/msgwin.c:418
+#: ../gtk/details.c:2543 ../gtk/msgwin.c:429
 msgid "Information"
 msgstr "Informácia"
 
-#: ../gtk/details.c:2555
+#: ../gtk/details.c:2547
 msgid "Peers"
 msgstr "Partneri"
 
-#: ../gtk/details.c:2564
+#: ../gtk/details.c:2556
 msgid "File listing not available for combined torrent properties"
 msgstr ""
 "Výpis zoznamu súborov nie je podporovaný pri kombinovaných vlastnostiach "
 "torrentov"
 
-#: ../gtk/details.c:2568 ../gtk/makemeta-ui.c:443
+#: ../gtk/details.c:2560 ../gtk/makemeta-ui.c:437
 msgid "Files"
 msgstr "Súbory"
 
-#: ../gtk/details.c:2572 ../gtk/tr-prefs.c:1209 ../gtk/tr-window.c:638
+#: ../gtk/details.c:2564 ../gtk/tr-prefs.c:1242 ../gtk/tr-window.c:664
 msgid "Options"
 msgstr "Voľby"
 
-#: ../gtk/details.c:2596
+#: ../gtk/details.c:2588
 #, c-format
 msgid "%s Properties"
 msgstr "Vlastnosti %s"
 
-#: ../gtk/details.c:2607
+#: ../gtk/details.c:2599
 #, c-format
 msgid "%'d Torrent Properties"
 msgstr "Vlastnosti torrentu %'d"
@@ -799,47 +828,47 @@
 msgstr[1] "Jeden z týchto torrentov sa ešte nestiahol."
 msgstr[2] "Niektoré z týchto torrentov sa ešte nestiahli."
 
-#: ../gtk/file-list.c:615 ../gtk/filter.c:347 ../gtk/util.c:636
+#: ../gtk/file-list.c:602 ../gtk/filter.c:347 ../gtk/util.c:465
 msgid "High"
 msgstr "Vysoká"
 
-#: ../gtk/file-list.c:616 ../gtk/filter.c:351 ../gtk/util.c:637
+#: ../gtk/file-list.c:603 ../gtk/filter.c:351 ../gtk/util.c:466
 msgid "Normal"
 msgstr "Normálna"
 
-#: ../gtk/file-list.c:617 ../gtk/filter.c:355 ../gtk/util.c:638
+#: ../gtk/file-list.c:604 ../gtk/filter.c:355 ../gtk/util.c:467
 msgid "Low"
 msgstr "Nízka"
 
-#: ../gtk/file-list.c:835 ../gtk/msgwin.c:295
+#: ../gtk/file-list.c:822 ../gtk/msgwin.c:295
 msgid "Name"
 msgstr "Názov"
 
 #. add "size" column
-#: ../gtk/file-list.c:850
+#: ../gtk/file-list.c:837
 msgid "Size"
 msgstr "Veľkosť"
 
 #. add "progress" column
-#: ../gtk/file-list.c:865
+#: ../gtk/file-list.c:852
 msgid "Have"
 msgstr "Dokončenosť"
 
 #. add "enabled" column
-#: ../gtk/file-list.c:878
+#: ../gtk/file-list.c:865
 msgid "Download"
 msgstr "Stiahnuť"
 
 #. add priority column
-#: ../gtk/file-list.c:894 ../gtk/filter.c:342
+#: ../gtk/file-list.c:881 ../gtk/filter.c:342
 msgid "Priority"
 msgstr "Priorita"
 
-#: ../gtk/filter.c:314 ../gtk/filter.c:696
+#: ../gtk/filter.c:314 ../gtk/filter.c:695
 msgid "All"
 msgstr "Všetky"
 
-#: ../gtk/filter.c:328 ../gtk/tr-prefs.c:537 ../gtk/tr-prefs.c:1254
+#: ../gtk/filter.c:328 ../gtk/tr-prefs.c:570 ../gtk/tr-prefs.c:1290
 msgid "Privacy"
 msgstr "Súkromie"
 
@@ -851,35 +880,32 @@
 msgid "Private"
 msgstr "Súkromné"
 
-#: ../gtk/filter.c:698
+#: ../gtk/filter.c:697
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../gtk/filter.c:703
-msgid "Queued"
-msgstr "Zaradené na spracovanie"
-
-#: ../gtk/filter.c:704
+#: ../gtk/filter.c:702
+msgctxt "Verb"
 msgid "Verifying"
-msgstr "Overované"
+msgstr ""
 
-#: ../gtk/filter.c:705 ../gtk/msgwin.c:417
+#: ../gtk/filter.c:703 ../gtk/msgwin.c:428
 msgid "Error"
 msgstr "Chybné"
 
 #. add the activity combobox
-#: ../gtk/filter.c:984
+#: ../gtk/filter.c:990
 msgid "_Show:"
 msgstr "_Zobraziť:"
 
-#: ../gtk/main.c:374
+#: ../gtk/main.c:307
 #, c-format
 msgid "Error registering Transmission as x-scheme-handler/magnet handler: %s"
 msgstr ""
 "Chyba pri registrovaní programu Transmission pre spracovanie x-scheme-"
 "handler/magnet: %s"
 
-#: ../gtk/main.c:542
+#: ../gtk/main.c:472
 #, c-format
 msgid ""
 "Got signal %d; trying to shut down cleanly. Do it again if it gets stuck."
@@ -887,43 +913,42 @@
 "Program dostal signál %d; snaží sa o korektné vypnutie. Ak to uviazne, "
 "urobte to znova."
 
-#: ../gtk/main.c:627
+#: ../gtk/main.c:604
+msgid "Where to look for configuration files"
+msgstr "Kde hľadať konfiguračné súbory"
+
+#: ../gtk/main.c:605
 msgid "Start with all torrents paused"
 msgstr "Spustiť s pozastavenými všetkými torrentmi"
 
-#: ../gtk/main.c:629
-msgid "Show version number and exit"
-msgstr "Zobraziť číslo verzie a skončiť"
-
-#: ../gtk/main.c:633
+#: ../gtk/main.c:606
 msgid "Start minimized in notification area"
 msgstr "Spustiť minimalizovaný v oblasti upozornení"
 
-#: ../gtk/main.c:636
-msgid "Where to look for configuration files"
-msgstr "Kde hľadať konfiguračné súbory"
+#: ../gtk/main.c:607
+msgid "Show version number and exit"
+msgstr "Zobraziť číslo verzie a skončiť"
 
-#: ../gtk/main.c:645 ../gtk/transmission-gtk.desktop.in.h:3
+#: ../gtk/main.c:625 ../gtk/transmission-gtk.desktop.in.h:1
 msgid "Transmission"
 msgstr "Transmission"
 
-#: ../gtk/main.c:655
+#. parse the command line
+#: ../gtk/main.c:629
 msgid "[torrent files or urls]"
 msgstr "[súbory s torentami alebo URL adresy]"
 
-#: ../gtk/main.c:718
+#: ../gtk/main.c:633
+#, c-format
 msgid ""
-"Transmission is already running, but is not responding. To start a new "
-"session, you must first close the existing Transmission process."
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
 msgstr ""
-"Transmission je už spustený, ale neodpovedá. Ak chcete začať novú reláciu, "
-"musíte najprv ukončiť existujúci proces Transmission."
-
-#: ../gtk/main.c:783
-msgid "Transmission cannot be started."
-msgstr "Transmission sa nedá spustiť."
+"%s\n"
+"Úplný zoznam dostupných volieb príkazového riadka zobrazíte spustením „%s --"
+"help“.\n"
 
-#: ../gtk/main.c:859
+#: ../gtk/main.c:730
 msgid ""
 "Transmission is a file-sharing program. When you run a torrent, its data "
 "will be made available to others by means of upload. You and you alone are "
@@ -934,54 +959,54 @@
 "jeho dáta sprístupnené ostatným formou odosielania. Vy a len vy sami ste "
 "plne zodpovedný dodržiavanie miestnych zákonov a právnych predpisov."
 
-#: ../gtk/main.c:861
+#: ../gtk/main.c:732
 msgid "I _Accept"
 msgstr "_Súhlasím"
 
-#: ../gtk/main.c:1073
+#: ../gtk/main.c:941
 msgid "<b>Closing Connections</b>"
 msgstr "<b>Ukončovanie spojení</b>"
 
-#: ../gtk/main.c:1077
-msgid "Sending upload/download totals to tracker..."
-msgstr "Odosielanie súčtu odosielania/sťahovania trackeru..."
+#: ../gtk/main.c:945
+msgid "Sending upload/download totals to tracker…"
+msgstr ""
 
-#: ../gtk/main.c:1082
+#: ../gtk/main.c:950
 msgid "_Quit Now"
 msgstr "_Ukončiť ihneď"
 
-#: ../gtk/main.c:1140
+#: ../gtk/main.c:1008
 msgid "Couldn't add corrupt torrent"
 msgid_plural "Couldn't add corrupt torrents"
 msgstr[0] "Nepodarilo sa pridať poškodené torrenty"
 msgstr[1] "Nepodarilo sa pridať poškodený torrent"
 msgstr[2] "Nepodarilo sa pridať poškodené torrenty"
 
-#: ../gtk/main.c:1147
+#: ../gtk/main.c:1015
 msgid "Couldn't add duplicate torrent"
 msgid_plural "Couldn't add duplicate torrents"
 msgstr[0] "Nepodarilo sa pridať rovnaké torrenty"
 msgstr[1] "Nepodarilo sa pridať rovnaký torrent"
 msgstr[2] "Nepodarilo sa pridať rovnaké torrenty"
 
-#: ../gtk/main.c:1443
+#: ../gtk/main.c:1316
 msgid "A fast and easy BitTorrent client"
 msgstr "Rýchly a jednoduchý BitTorrent klient"
 
-#: ../gtk/main.c:1444
+#: ../gtk/main.c:1317
 msgid "Copyright (c) The Transmission Project"
 msgstr "Copyright (c) The Transmission Project"
 
 #. Translators: translate "translator-credits" as your name
 #. to have it appear in the credits in the "About"
 #. dialog
-#: ../gtk/main.c:1450
+#: ../gtk/main.c:1323
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Krzysztof Klimonda https://launchpad.net/~kklimonda\n"
 "  Matej Krajčovič https://launchpad.net/~elbarto512\n"
-"  Pavol Klacansky https://launchpad.net/~pavolzetor\n"
+"  Pavol Klačanský https://launchpad.net/~pavolzetor\n"
 "  Peter Mráz https://launchpad.net/~etki\n"
 "  mirek https://launchpad.net/~bletvaska"
 
@@ -1021,13 +1046,13 @@
 msgid "Scanned %s"
 msgstr "Prezretých %s"
 
-#: ../gtk/makemeta-ui.c:167 ../gtk/makemeta-ui.c:431
+#: ../gtk/makemeta-ui.c:167 ../gtk/makemeta-ui.c:425
 msgid "New Torrent"
 msgstr "Nový torrent"
 
 #: ../gtk/makemeta-ui.c:183
-msgid "Creating torrent..."
-msgstr "Vytvára sa torrent...."
+msgid "Creating torrent…"
+msgstr ""
 
 #: ../gtk/makemeta-ui.c:292
 msgid "No source selected"
@@ -1049,35 +1074,35 @@
 msgstr[1] "%1$'d časť @ %2$s"
 msgstr[2] "%1$'d časti @ %2$s"
 
-#: ../gtk/makemeta-ui.c:445
+#: ../gtk/makemeta-ui.c:439
 msgid "Sa_ve to:"
 msgstr "_Uložiť do:"
 
-#: ../gtk/makemeta-ui.c:451
+#: ../gtk/makemeta-ui.c:445
 msgid "Source F_older:"
 msgstr "Zdrojový _priečinok:"
 
-#: ../gtk/makemeta-ui.c:463
+#: ../gtk/makemeta-ui.c:457
 msgid "Source _File:"
 msgstr "_Zdrojový súbor:"
 
-#: ../gtk/makemeta-ui.c:475
+#: ../gtk/makemeta-ui.c:469
 msgid "<i>No source selected</i>"
 msgstr "<i>Nebol zvolený žiadny zdroj</i>"
 
-#: ../gtk/makemeta-ui.c:479
+#: ../gtk/makemeta-ui.c:473
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../gtk/makemeta-ui.c:481
+#: ../gtk/makemeta-ui.c:475
 msgid "_Trackers:"
 msgstr "_Trackery:"
 
-#: ../gtk/makemeta-ui.c:503
+#: ../gtk/makemeta-ui.c:497
 msgid "Co_mment:"
 msgstr "_Poznámka:"
 
-#: ../gtk/makemeta-ui.c:512
+#: ../gtk/makemeta-ui.c:506
 msgid "_Private torrent"
 msgstr "_Súkromný torrent"
 
@@ -1098,43 +1123,39 @@
 msgid "Message"
 msgstr "Správa"
 
-#: ../gtk/msgwin.c:419
+#: ../gtk/msgwin.c:430
 msgid "Debug"
 msgstr "Ladenie"
 
-#: ../gtk/msgwin.c:445
+#: ../gtk/msgwin.c:456
 msgid "Message Log"
 msgstr "Záznamník"
 
-#: ../gtk/msgwin.c:478
+#: ../gtk/msgwin.c:493
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../gtk/notify.c:159
-msgid "Download complete"
-msgstr "Sťahovanie dokončené"
-
-#: ../gtk/notify.c:169
-msgid "Torrent Complete"
-msgstr "Torrent bol dokončený"
-
-#: ../gtk/notify.c:177
+#: ../gtk/notify.c:213
 msgid "Open File"
 msgstr "Otvoriť súbor"
 
-#: ../gtk/notify.c:183
+#: ../gtk/notify.c:218
 msgid "Open Folder"
 msgstr "Otvoriť priečinok"
 
-#: ../gtk/notify.c:198
+#: ../gtk/notify.c:226
+msgid "Torrent Complete"
+msgstr "Torrent bol dokončený"
+
+#: ../gtk/notify.c:248
 msgid "Torrent Added"
 msgstr "Torrent pridaný"
 
-#: ../gtk/open-dialog.c:239
+#: ../gtk/open-dialog.c:240
 msgid "Torrent files"
 msgstr "Súbory s torrentmi"
 
-#: ../gtk/open-dialog.c:244
+#: ../gtk/open-dialog.c:245
 msgid "All files"
 msgstr "Všetky súbory"
 
@@ -1143,11 +1164,11 @@
 msgid "Torrent Options"
 msgstr "Voľby torrentu"
 
-#: ../gtk/open-dialog.c:293 ../gtk/tr-prefs.c:280
+#: ../gtk/open-dialog.c:293 ../gtk/tr-prefs.c:335
 msgid "Mo_ve .torrent file to the trash"
 msgstr "_Presunúť súbor .torrent do Koša"
 
-#: ../gtk/open-dialog.c:295 ../gtk/tr-prefs.c:272
+#: ../gtk/open-dialog.c:295 ../gtk/tr-prefs.c:327
 msgid "_Start when added"
 msgstr "_Spustiť po pridaní"
 
@@ -1167,23 +1188,23 @@
 msgid "Select Destination Folder"
 msgstr "Vybrať cieľový priečinok"
 
-#: ../gtk/open-dialog.c:424
+#: ../gtk/open-dialog.c:427
 msgid "Open a Torrent"
 msgstr "Otvoriť torrent"
 
-#: ../gtk/open-dialog.c:440 ../gtk/tr-prefs.c:276
+#: ../gtk/open-dialog.c:443 ../gtk/tr-prefs.c:331
 msgid "Show _options dialog"
 msgstr "Zobraziť okno s _voľbami"
 
-#: ../gtk/open-dialog.c:495
+#: ../gtk/open-dialog.c:487
 msgid "Open URL"
 msgstr "Otvoriť URL"
 
-#: ../gtk/open-dialog.c:508
+#: ../gtk/open-dialog.c:500
 msgid "Open torrent from URL"
 msgstr "Otvoriť torrent z URL adrsy"
 
-#: ../gtk/open-dialog.c:513
+#: ../gtk/open-dialog.c:505
 msgid "_URL"
 msgstr "_URL"
 
@@ -1197,14 +1218,14 @@
 msgstr "Nepodarilo sa presunúť torrent"
 
 #: ../gtk/relocate.c:125
-msgid "This may take a moment..."
-msgstr "Toto môže chvíľu trvať..."
+msgid "This may take a moment…"
+msgstr ""
 
 #: ../gtk/relocate.c:156 ../gtk/relocate.c:176
 msgid "Set Torrent Location"
 msgstr "Nastaviť umiestnenie torentu"
 
-#: ../gtk/relocate.c:172
+#: ../gtk/relocate.c:172 ../gtk/tr-prefs.c:269
 msgid "Location"
 msgstr "Umiestnenie"
 
@@ -1244,7 +1265,7 @@
 msgid "_Reset"
 msgstr "_Vynulovať"
 
-#: ../gtk/stats.c:134 ../gtk/tr-window.c:679
+#: ../gtk/stats.c:134 ../gtk/tr-window.c:705
 msgid "Statistics"
 msgstr "Štatistiky"
 
@@ -1267,7 +1288,7 @@
 #. %1$s is how much we've got,
 #. %2$s is how much we'll have when done,
 #. %3$s%% is a percentage of the two
-#: ../gtk/torrent-cell-renderer.c:77
+#: ../gtk/torrent-cell-renderer.c:61
 #, c-format
 msgid "%1$s of %2$s (%3$s%%)"
 msgstr "%1$s z %2$s (%3$s%%)"
@@ -1278,7 +1299,7 @@
 #. %4$s is how much we've uploaded,
 #. %5$s is our upload-to-download ratio,
 #. %6$s is the ratio we want to reach before we stop uploading
-#: ../gtk/torrent-cell-renderer.c:93
+#: ../gtk/torrent-cell-renderer.c:77
 #, c-format
 msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s Goal: %6$s)"
 msgstr "%1$s z %2$s (%3$s%%), odoslaných %4$s (Pomer: %5$s Cieľ: %6$s)"
@@ -1288,7 +1309,7 @@
 #. %3$s%% is a percentage of the two,
 #. %4$s is how much we've uploaded,
 #. %5$s is our upload-to-download ratio
-#: ../gtk/torrent-cell-renderer.c:109
+#: ../gtk/torrent-cell-renderer.c:93
 #, c-format
 msgid "%1$s of %2$s (%3$s%%), uploaded %4$s (Ratio: %5$s)"
 msgstr "%1$s z %2$s (%3$s%%), odoslaných %4$s (Pomer: %5$s)"
@@ -1297,7 +1318,7 @@
 #. %2$s is how much we've uploaded,
 #. %3$s is our upload-to-download ratio,
 #. %4$s is the ratio we want to reach before we stop uploading
-#: ../gtk/torrent-cell-renderer.c:126
+#: ../gtk/torrent-cell-renderer.c:110
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s Goal: %4$s)"
 msgstr "%1$s, odoslaných %2$s (Pomer: %3$s Limit: %4$s)"
@@ -1305,64 +1326,67 @@
 #. %1$s is the torrent's total size,
 #. %2$s is how much we've uploaded,
 #. %3$s is our upload-to-download ratio
-#: ../gtk/torrent-cell-renderer.c:138
+#: ../gtk/torrent-cell-renderer.c:122
 #, c-format
 msgid "%1$s, uploaded %2$s (Ratio: %3$s)"
 msgstr "%1$s, odoslaných %2$s (Pomer: %3$s)"
 
-#: ../gtk/torrent-cell-renderer.c:152
+#: ../gtk/torrent-cell-renderer.c:136
 msgid "Remaining time unknown"
 msgstr "Zostávajúci čas je neznámy"
 
 #. time remaining
-#: ../gtk/torrent-cell-renderer.c:158
+#: ../gtk/torrent-cell-renderer.c:142
 #, c-format
 msgid "%s remaining"
 msgstr "Zostáva %s"
 
 #. 1==down arrow, 2==down speed, 3==up arrow, 4==down speed
-#: ../gtk/torrent-cell-renderer.c:183
+#: ../gtk/torrent-cell-renderer.c:167
 #, c-format
 msgid "%1$s %2$s, %3$s %4$s"
 msgstr "%1$s %2$s, %3$s %4$s"
 
 #. bandwidth speed + unicode arrow
-#: ../gtk/torrent-cell-renderer.c:188 ../gtk/torrent-cell-renderer.c:192
+#: ../gtk/torrent-cell-renderer.c:172 ../gtk/torrent-cell-renderer.c:176
 #, c-format
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#. the torrent isn't uploading or downloading
-#: ../gtk/torrent-cell-renderer.c:196 ../gtk/tr-icon.c:74
+#: ../gtk/torrent-cell-renderer.c:179
+msgid "Stalled"
+msgstr "Preťažený"
+
+#: ../gtk/torrent-cell-renderer.c:181 ../gtk/tr-icon.c:69
 msgid "Idle"
 msgstr "Nečinný"
 
-#: ../gtk/torrent-cell-renderer.c:225
+#: ../gtk/torrent-cell-renderer.c:211
 #, c-format
 msgid "Verifying local data (%.1f%% tested)"
 msgstr "Overujú sa lokálne dáta (%.1f%% skontrolovaných)"
 
-#: ../gtk/torrent-cell-renderer.c:236
+#: ../gtk/torrent-cell-renderer.c:222
 #, c-format
 msgid "Ratio %s"
 msgstr "Pomer %s"
 
-#: ../gtk/torrent-cell-renderer.c:262
+#: ../gtk/torrent-cell-renderer.c:244
 #, c-format
 msgid "Tracker gave a warning: \"%s\""
 msgstr "Tracker vydal varovanie: \"%s\""
 
-#: ../gtk/torrent-cell-renderer.c:263
+#: ../gtk/torrent-cell-renderer.c:245
 #, c-format
 msgid "Tracker gave an error: \"%s\""
 msgstr "Tracker oznámil chybu: \"%s\""
 
-#: ../gtk/torrent-cell-renderer.c:264
+#: ../gtk/torrent-cell-renderer.c:246
 #, c-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: ../gtk/torrent-cell-renderer.c:282
+#: ../gtk/torrent-cell-renderer.c:266
 #, c-format
 msgid "Downloading from %1$'d of %2$'d connected peer"
 msgid_plural "Downloading from %1$'d of %2$'d connected peers"
@@ -1370,7 +1394,7 @@
 msgstr[1] "Sťahuje sa od %1$'d z celkového počtu %2$'d pripojený partner"
 msgstr[2] "Sťahuje sa od %1$'d z celkového počtu %2$'d pripojený partneri"
 
-#: ../gtk/torrent-cell-renderer.c:291
+#: ../gtk/torrent-cell-renderer.c:275
 #, c-format
 msgid "Downloading metadata from %1$'d peer (%2$d%% done)"
 msgid_plural "Downloading metadata from %1$'d peers (%2$d%% done)"
@@ -1378,7 +1402,7 @@
 msgstr[1] "Sťahovanie metadát od %1$'d partnera (%2$d%% dokončených)"
 msgstr[2] "Sťahovanie metadát od %1$'d partnerov (%2$d%% dokončených)"
 
-#: ../gtk/torrent-cell-renderer.c:302
+#: ../gtk/torrent-cell-renderer.c:286
 #, c-format
 msgid "Seeding to %1$'d of %2$'d connected peer"
 msgid_plural "Seeding to %1$'d of %2$'d connected peers"
@@ -1386,40 +1410,42 @@
 msgstr[1] "Zdieľa sa %1$'d s %2$'d pripojeným partnerom"
 msgstr[2] "Zdieľa sa %1$'d s %2$'d pripojenými partnermi"
 
-#: ../gtk/transmission-gtk.desktop.in.h:1
+#: ../gtk/transmission-gtk.desktop.in.h:2
 msgid "BitTorrent Client"
 msgstr "BitTorrent klient"
 
-#: ../gtk/transmission-gtk.desktop.in.h:2
-msgid "Download and share files over BitTorrent"
-msgstr "Sťahujte a zdieľajte súbory cez BitTorrent"
-
-#: ../gtk/transmission-gtk.desktop.in.h:4
+#: ../gtk/transmission-gtk.desktop.in.h:3
 msgid "Transmission BitTorrent Client"
 msgstr "Transmission - klient siete BitTorrent"
 
-#: ../gtk/tr-core.c:1531
-msgid "Transmission Bittorrent Client"
-msgstr "Transmission - klient siete BitTorrent"
+#: ../gtk/transmission-gtk.desktop.in.h:4
+msgid "Download and share files over BitTorrent"
+msgstr "Sťahujte a zdieľajte súbory cez BitTorrent"
 
-#: ../gtk/tr-core.c:1532
-msgid "BitTorrent Activity"
-msgstr "Aktivita BitTorrent-u"
+#: ../gtk/tr-core.c:1083
+#, c-format
+msgid "Couldn't read \"%s\": %s"
+msgstr "Nepodarilo sa načítať „%s“:%s"
+
+#: ../gtk/tr-core.c:1175
+#, c-format
+msgid "Skipping unknown torrent \"%s\""
+msgstr "Preskakuje sa neznámy torrent „%s“"
 
-#: ../gtk/tr-core.c:1545
-msgid "Disallowing desktop hibernation"
-msgstr "Zakazuje sa hibernácia počítača"
+#: ../gtk/tr-core.c:1411
+msgid "Inhibiting desktop hibernation"
+msgstr "Potláča sa hibernácia pracovného prostredia"
 
-#: ../gtk/tr-core.c:1548
+#: ../gtk/tr-core.c:1413
 #, c-format
-msgid "Couldn't disable desktop hibernation: %s"
-msgstr "Nepodarilo sa zakázať hibernáciu počítača: %s"
+msgid "Couldn't inhibit desktop hibernation: %s"
+msgstr "Nepodarilo sa potlačiť hibernáciu pracovného prostredia: %s"
 
-#: ../gtk/tr-core.c:1572
+#: ../gtk/tr-core.c:1446
 msgid "Allowing desktop hibernation"
 msgstr "Povoľuje sa hibernácia počítača"
 
-#: ../gtk/tr-icon.c:91 ../gtk/tr-icon.c:107
+#: ../gtk/tr-icon.c:86 ../gtk/tr-icon.c:102
 #, c-format
 msgid "(Limit: %s)"
 msgstr "(Limit: %s)"
@@ -1428,7 +1454,7 @@
 #. * %2$s: current upload limit, if any
 #. * %3$s: current download speed
 #. * %4$s: current download limit, if any
-#: ../gtk/tr-icon.c:114
+#: ../gtk/tr-icon.c:109
 #, c-format
 msgid ""
 "Transmission\n"
@@ -1439,59 +1465,89 @@
 "Odosielanie: %1$s %2$s\n"
 "Sťahovanie: %3$s %4$s"
 
-#: ../gtk/tr-prefs.c:270
-msgid "Adding"
-msgstr "Pridávanie"
+#: ../gtk/tr-prefs.c:272
+msgid "Save to _Location:"
+msgstr "Uložiť do _umiestnenia:"
 
-#: ../gtk/tr-prefs.c:285
-msgid "Automatically _add torrents from:"
-msgstr "_Automaticky pridávať torrenty z:"
+#: ../gtk/tr-prefs.c:275
+msgid "Queue"
+msgstr "Poradie"
+
+#: ../gtk/tr-prefs.c:277
+msgid "Maximum active _downloads:"
+msgstr "Maximum aktívnych _sťahovaní:"
 
-#: ../gtk/tr-prefs.c:297
+#: ../gtk/tr-prefs.c:281
+msgid "Downloads sharing data in the last N minutes are _active:"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:286 ../libtransmission/torrent.c:1903
+msgid "Incomplete"
+msgstr "Neúplný"
+
+#: ../gtk/tr-prefs.c:288
 msgid "Append \"._part\" to incomplete files' names"
 msgstr "_K názvom neúplných súborov pripojiť \".part\""
 
-#: ../gtk/tr-prefs.c:302
-msgid "Save to _Location:"
-msgstr "Uložiť do _umiestnenia:"
-
-#: ../gtk/tr-prefs.c:304
+#: ../gtk/tr-prefs.c:292
 msgid "Keep _incomplete torrents in:"
 msgstr "_Neúplné torrenty uchovávať v:"
 
-#: ../gtk/tr-prefs.c:311
-msgid "Call scrip_t when torrent is completed:"
-msgstr "Zavolať s_kript po dokončení torrentu:"
+#: ../gtk/tr-prefs.c:299
+msgid "Call _script when torrent is completed:"
+msgstr "Spustiť _skript pro dokončení torrentu:"
+
+#: ../gtk/tr-prefs.c:325
+msgctxt "Gerund"
+msgid "Adding"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:339
+msgid "Automatically _add torrents from:"
+msgstr "_Automaticky pridávať torrenty z:"
+
+#: ../gtk/tr-prefs.c:347
+msgctxt "Gerund"
+msgid "Seeding"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:321
+#: ../gtk/tr-prefs.c:349
 msgid "Stop seeding at _ratio:"
 msgstr "Ukončiť zdieľanie pri p_omere:"
 
-#: ../gtk/tr-prefs.c:328
+#: ../gtk/tr-prefs.c:356
 msgid "Stop seeding if idle for _N minutes:"
 msgstr "Ukončiť zdieľanie po N _minútach nečinnosti:"
 
-#: ../gtk/tr-prefs.c:352 ../gtk/tr-prefs.c:1260
+#: ../gtk/tr-prefs.c:380 ../gtk/tr-prefs.c:1296
 msgid "Desktop"
 msgstr "Pracovné prostredie"
 
-#: ../gtk/tr-prefs.c:354
-msgid "Inhibit _hibernation when torrents are active"
-msgstr "Potlačiť _hibernáciu keď sú torrenty aktívne"
+#: ../gtk/tr-prefs.c:382
+msgid "_Inhibit hibernation when torrents are active"
+msgstr "_Potlačiť hibernáciu, keď sú torrenty aktívne"
 
-#: ../gtk/tr-prefs.c:358
+#: ../gtk/tr-prefs.c:386
 msgid "Show Transmission icon in the _notification area"
 msgstr "Zobraziť _ikonu Transmission v oblasti upozornení"
 
-#: ../gtk/tr-prefs.c:362
-msgid "Show _popup notifications"
-msgstr "Zobrazovať _vyskakujúce upozornenia"
-
-#: ../gtk/tr-prefs.c:367
-msgid "Play _sound when downloads are complete"
-msgstr "Prehrať _zvuk po dokončení sťahovania"
+#: ../gtk/tr-prefs.c:391
+msgid "Notification"
+msgstr "Upozornenie"
+
+#: ../gtk/tr-prefs.c:393
+msgid "Show a notification when torrents are a_dded"
+msgstr "Zobraziť upozornenie, keď sú torenty pri_dané"
 
 #: ../gtk/tr-prefs.c:397
+msgid "Show a notification when torrents _finish"
+msgstr "Zobraziť upozornenie, keď sú torenty do_končené"
+
+#: ../gtk/tr-prefs.c:401
+msgid "Play a _sound when torrents finish"
+msgstr "Prehrať _zvuk, kteč sú torenty dokončené"
+
+#: ../gtk/tr-prefs.c:430
 #, c-format
 msgid "Blocklist contains %'d rule"
 msgid_plural "Blocklist contains %'d rules"
@@ -1499,7 +1555,7 @@
 msgstr[1] "Zoznam blokovaní obsahuje %'d pravidlo"
 msgstr[2] "Zoznam blokovaní obsahuje %'d pravidlá"
 
-#: ../gtk/tr-prefs.c:430
+#: ../gtk/tr-prefs.c:463
 #, c-format
 msgid "Blocklist has %'d rule."
 msgid_plural "Blocklist has %'d rules."
@@ -1507,303 +1563,308 @@
 msgstr[1] "Zoznam blokovaní má %'d pravidlo"
 msgstr[2] "Zoznam blokovaní má %'d pravidlá"
 
-#: ../gtk/tr-prefs.c:434
+#: ../gtk/tr-prefs.c:467
 msgid "<b>Update succeeded!</b>"
 msgstr "<b>Aktualizácia úspešná!</b>"
 
-#: ../gtk/tr-prefs.c:434
+#: ../gtk/tr-prefs.c:467
 msgid "<b>Unable to update.</b>"
 msgstr "<b>Nemožno aktualizovať .</b>"
 
-#: ../gtk/tr-prefs.c:449
+#: ../gtk/tr-prefs.c:482
 msgid "Update Blocklist"
 msgstr "Aktualizovať zoznam blokovaní"
 
-#: ../gtk/tr-prefs.c:451
-msgid "Getting new blocklist..."
-msgstr "Získava sa nový zoznam blokovaní..."
+#: ../gtk/tr-prefs.c:484
+msgid "Getting new blocklist…"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:479
+#: ../gtk/tr-prefs.c:512
 msgid "Allow encryption"
 msgstr "Umožniť šifrovanie"
 
-#: ../gtk/tr-prefs.c:480
+#: ../gtk/tr-prefs.c:513
 msgid "Prefer encryption"
 msgstr "Uprednostniť šifrovanie"
 
-#: ../gtk/tr-prefs.c:481
+#: ../gtk/tr-prefs.c:514
 msgid "Require encryption"
 msgstr "Vyžadovať šiforvanie"
 
-#: ../gtk/tr-prefs.c:505
+#: ../gtk/tr-prefs.c:538
 msgid "Blocklist"
 msgstr "Zoznam blokovaní"
 
-#: ../gtk/tr-prefs.c:507
+#: ../gtk/tr-prefs.c:540
 msgid "Enable _blocklist:"
 msgstr "Povoliť zoznam _blokovaní:"
 
-#: ../gtk/tr-prefs.c:521
+#: ../gtk/tr-prefs.c:554
 msgid "_Update"
 msgstr "_Aktualizovať"
 
-#: ../gtk/tr-prefs.c:531
+#: ../gtk/tr-prefs.c:564
 msgid "Enable _automatic updates"
 msgstr "Povoliť _automatické aktualizácie"
 
-#: ../gtk/tr-prefs.c:539
+#: ../gtk/tr-prefs.c:572
 msgid "_Encryption mode:"
 msgstr "_Režim šifrovania:"
 
-#: ../gtk/tr-prefs.c:543
+#: ../gtk/tr-prefs.c:576
 msgid "Use PE_X to find more peers"
 msgstr "Použiť _PEX na nájdenie ďalších partnerov"
 
-#: ../gtk/tr-prefs.c:545
+#: ../gtk/tr-prefs.c:578
 msgid ""
 "PEX is a tool for exchanging peer lists with the peers you're connected to."
 msgstr ""
 "PEX je nástroj na výmenu zoznamov partnerov s partnermi, ku ktorým ste "
 "pripojení."
 
-#: ../gtk/tr-prefs.c:549
+#: ../gtk/tr-prefs.c:582
 msgid "Use _DHT to find more peers"
 msgstr "Použiť _DHT na nájdenie ďalších partnerov"
 
-#: ../gtk/tr-prefs.c:551
+#: ../gtk/tr-prefs.c:584
 msgid "DHT is a tool for finding peers without a tracker."
 msgstr "DHT je nástroj na hľadanie partnerov bez trackera."
 
-#: ../gtk/tr-prefs.c:555
+#: ../gtk/tr-prefs.c:588
 msgid "Use _Local Peer Discovery to find more peers"
 msgstr "Použiť _LPD na nájdenie ďalších partnerov"
 
-#: ../gtk/tr-prefs.c:557
+#: ../gtk/tr-prefs.c:590
 msgid "LPD is a tool for finding peers on your local network."
 msgstr "LPD je nástroj na hľadanie partnerov v lokálnej sieti."
 
-#: ../gtk/tr-prefs.c:774
+#: ../gtk/tr-prefs.c:807
 msgid "Web Client"
 msgstr "Webový klient"
 
 #. "enabled" checkbutton
-#: ../gtk/tr-prefs.c:777
+#: ../gtk/tr-prefs.c:810
 msgid "_Enable web client"
 msgstr "_Povoliť webového klienta"
 
-#: ../gtk/tr-prefs.c:783
+#: ../gtk/tr-prefs.c:816
 msgid "_Open web client"
 msgstr "_Otvoriť webového klienta"
 
-#: ../gtk/tr-prefs.c:792
+#: ../gtk/tr-prefs.c:825
 msgid "HTTP _port:"
 msgstr "HTTP _port:"
 
 #. require authentication
-#: ../gtk/tr-prefs.c:796
+#: ../gtk/tr-prefs.c:829
 msgid "Use _authentication"
 msgstr "Použiť overenie _totožnosti"
 
 #. username
-#: ../gtk/tr-prefs.c:804
+#: ../gtk/tr-prefs.c:837
 msgid "_Username:"
 msgstr "_Používateľské meno:"
 
 #. password
-#: ../gtk/tr-prefs.c:811
+#: ../gtk/tr-prefs.c:844
 msgid "Pass_word:"
 msgstr "_Heslo:"
 
 #. require authentication
-#: ../gtk/tr-prefs.c:819
+#: ../gtk/tr-prefs.c:852
 msgid "Only allow these IP a_ddresses to connect:"
 msgstr "Povoliť pripojenie iba z týchto IP _adries:"
 
-#: ../gtk/tr-prefs.c:844
+#: ../gtk/tr-prefs.c:877
 msgid "IP addresses may use wildcards, such as 192.168.*.*"
 msgstr "IP adresy môžu používať zástupné znaky, ako napr. 192.168.*.*"
 
-#: ../gtk/tr-prefs.c:866
+#: ../gtk/tr-prefs.c:899
 msgid "Addresses:"
 msgstr "Adresy:"
 
-#: ../gtk/tr-prefs.c:984
+#: ../gtk/tr-prefs.c:1017
 msgid "Every Day"
 msgstr "Každý deň"
 
-#: ../gtk/tr-prefs.c:985
+#: ../gtk/tr-prefs.c:1018
 msgid "Weekdays"
 msgstr "Dni v týždni"
 
-#: ../gtk/tr-prefs.c:986
+#: ../gtk/tr-prefs.c:1019
 msgid "Weekends"
 msgstr "Víkendy"
 
-#: ../gtk/tr-prefs.c:987
+#: ../gtk/tr-prefs.c:1020
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: ../gtk/tr-prefs.c:988
+#: ../gtk/tr-prefs.c:1021
 msgid "Monday"
 msgstr "Pondelok"
 
-#: ../gtk/tr-prefs.c:989
+#: ../gtk/tr-prefs.c:1022
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: ../gtk/tr-prefs.c:990
+#: ../gtk/tr-prefs.c:1023
 msgid "Wednesday"
 msgstr "Streda"
 
-#: ../gtk/tr-prefs.c:991
+#: ../gtk/tr-prefs.c:1024
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: ../gtk/tr-prefs.c:992
+#: ../gtk/tr-prefs.c:1025
 msgid "Friday"
 msgstr "Piatok"
 
-#: ../gtk/tr-prefs.c:993
+#: ../gtk/tr-prefs.c:1026
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../gtk/tr-prefs.c:1024
+#: ../gtk/tr-prefs.c:1057
 msgid "Speed Limits"
 msgstr "Obmedzenia rýchlosti"
 
-#: ../gtk/tr-prefs.c:1026
+#: ../gtk/tr-prefs.c:1059
 #, c-format
 msgid "_Upload (%s):"
 msgstr "_Odoslané (%s):"
 
-#: ../gtk/tr-prefs.c:1033
+#: ../gtk/tr-prefs.c:1066
 #, c-format
 msgid "_Download (%s):"
 msgstr "_Stiahnuté (%s):"
 
-#: ../gtk/tr-prefs.c:1044
+#: ../gtk/tr-prefs.c:1077
 msgid "Alternative Speed Limits"
 msgstr "Altrnatívne obmedzenia rýchlosti"
 
-#: ../gtk/tr-prefs.c:1051
+#: ../gtk/tr-prefs.c:1084
 msgid "Override normal speed limits manually or at scheduled times"
 msgstr "Ručne alebo v naplánovaný čas nahradí bežné obmedzenia rýchlosti"
 
-#: ../gtk/tr-prefs.c:1058
+#: ../gtk/tr-prefs.c:1091
 #, c-format
 msgid "U_pload (%s):"
 msgstr "O_dosielané (%s):"
 
-#: ../gtk/tr-prefs.c:1062
+#: ../gtk/tr-prefs.c:1095
 #, c-format
 msgid "Do_wnload (%s):"
 msgstr "St_iahnuté (%s):"
 
-#: ../gtk/tr-prefs.c:1066
+#: ../gtk/tr-prefs.c:1099
 msgid "_Scheduled times:"
 msgstr "_Naplánované časy:"
 
-#: ../gtk/tr-prefs.c:1071
+#: ../gtk/tr-prefs.c:1104
 msgid " _to "
 msgstr " _do "
 
-#: ../gtk/tr-prefs.c:1082
+#: ../gtk/tr-prefs.c:1115
 msgid "_On days:"
 msgstr "_V dňoch:"
 
-#: ../gtk/tr-prefs.c:1116 ../gtk/tr-prefs.c:1182
+#: ../gtk/tr-prefs.c:1149 ../gtk/tr-prefs.c:1215
 msgid "Status unknown"
 msgstr "Neznámy stav"
 
-#: ../gtk/tr-prefs.c:1138
+#: ../gtk/tr-prefs.c:1171
 msgid "Port is <b>open</b>"
 msgstr "Port je <b>otvorený</b>"
 
-#: ../gtk/tr-prefs.c:1138
+#: ../gtk/tr-prefs.c:1171
 msgid "Port is <b>closed</b>"
 msgstr "Port je <b>zatvorený</b>"
 
-#: ../gtk/tr-prefs.c:1152
-msgid "<i>Testing TCP port...</i>"
-msgstr "<i>Testuje sa TCP port...</i>"
+#: ../gtk/tr-prefs.c:1185
+msgid "<i>Testing TCP port…</i>"
+msgstr ""
 
-#: ../gtk/tr-prefs.c:1175
+#: ../gtk/tr-prefs.c:1208
 msgid "Listening Port"
 msgstr "Načúvací port"
 
-#: ../gtk/tr-prefs.c:1177
+#: ../gtk/tr-prefs.c:1210
 msgid "_Port used for incoming connections:"
 msgstr "_Port používaný na prichádzajúce spojenia:"
 
-#: ../gtk/tr-prefs.c:1185
+#: ../gtk/tr-prefs.c:1218
 msgid "Te_st Port"
 msgstr "_Otestovať port"
 
-#: ../gtk/tr-prefs.c:1192
+#: ../gtk/tr-prefs.c:1225
 msgid "Pick a _random port every time Transmission is started"
 msgstr "_Vybrať náhodný port pri každom spustení Transmission"
 
-#: ../gtk/tr-prefs.c:1196
+#: ../gtk/tr-prefs.c:1229
 msgid "Use UPnP or NAT-PMP port _forwarding from my router"
 msgstr "Použiť pre_smerovanie portu UPnP alebo NAT-PMP z môjho smerovača"
 
-#: ../gtk/tr-prefs.c:1201
+#: ../gtk/tr-prefs.c:1234
 msgid "Peer Limits"
 msgstr "Obmedzenia počtu partnerov"
 
-#: ../gtk/tr-prefs.c:1204
+#: ../gtk/tr-prefs.c:1237
 msgid "Maximum peers per _torrent:"
 msgstr "Maximálny počet partnerov na _torrent:"
 
-#: ../gtk/tr-prefs.c:1206
+#: ../gtk/tr-prefs.c:1239
 msgid "Maximum peers _overall:"
 msgstr "Maximálny počet _všetkých partnerov:"
 
-#: ../gtk/tr-prefs.c:1212
+#: ../gtk/tr-prefs.c:1245
 msgid "Enable _uTP for peer communication"
 msgstr "Povoliť _uTP pro komunikáciu s partnermi"
 
-#: ../gtk/tr-prefs.c:1214
+#: ../gtk/tr-prefs.c:1247
 msgid "uTP is a tool for reducing network congestion."
 msgstr "uTP je nástroj znižujúci zahltenie siete."
 
-#: ../gtk/tr-prefs.c:1234
+#: ../gtk/tr-prefs.c:1267
 msgid "Transmission Preferences"
 msgstr "Transmission - Predvoľby"
 
-#: ../gtk/tr-prefs.c:1248
+#: ../gtk/tr-prefs.c:1281
 msgid "Torrents"
 msgstr "Torrenty"
 
-#: ../gtk/tr-prefs.c:1257
+#: ../gtk/tr-prefs.c:1284
+msgctxt "Gerund"
+msgid "Downloading"
+msgstr ""
+
+#: ../gtk/tr-prefs.c:1293
 msgid "Network"
 msgstr "Sieť"
 
-#: ../gtk/tr-prefs.c:1263
+#: ../gtk/tr-prefs.c:1299
 msgid "Web"
 msgstr "Web"
 
-#: ../gtk/tr-window.c:123
+#: ../gtk/tr-window.c:148
 msgid "Torrent"
 msgstr "Torrent"
 
-#: ../gtk/tr-window.c:227
+#: ../gtk/tr-window.c:256
 msgid "Total Ratio"
 msgstr "Celkový pomer"
 
-#: ../gtk/tr-window.c:228
+#: ../gtk/tr-window.c:257
 msgid "Session Ratio"
 msgstr "Pomer relácie"
 
-#: ../gtk/tr-window.c:229
+#: ../gtk/tr-window.c:258
 msgid "Total Transfer"
 msgstr "Celkový prenos"
 
-#: ../gtk/tr-window.c:230
+#: ../gtk/tr-window.c:259
 msgid "Session Transfer"
 msgstr "Prenos relácie"
 
-#: ../gtk/tr-window.c:259
+#: ../gtk/tr-window.c:288
 #, c-format
 msgid ""
 "Click to disable Alternative Speed Limits\n"
@@ -1812,7 +1873,7 @@
 "Kliknutím vypnete alternatívne obmedzenia rýchlosti\n"
 "(%1$s sťahovanie, %2$s odosielanie)"
 
-#: ../gtk/tr-window.c:260
+#: ../gtk/tr-window.c:289
 #, c-format
 msgid ""
 "Click to enable Alternative Speed Limits\n"
@@ -1821,37 +1882,37 @@
 "Kliknutím zapnete alternatívne obmedzenia rýchlosti\n"
 "(%1$s sťahovanie, %2$s odosielanie)"
 
-#: ../gtk/tr-window.c:327
+#: ../gtk/tr-window.c:354
 #, c-format
 msgid "Tracker will allow requests in %s"
 msgstr "Tracker dovolí požiadavky za %s"
 
-#: ../gtk/tr-window.c:398
+#: ../gtk/tr-window.c:423
 msgid "Unlimited"
 msgstr "Neobmedzene"
 
-#: ../gtk/tr-window.c:465
+#: ../gtk/tr-window.c:490
 msgid "Seed Forever"
 msgstr "Zdielať stále"
 
-#: ../gtk/tr-window.c:503
+#: ../gtk/tr-window.c:528
 msgid "Limit Download Speed"
 msgstr "Obmedziť rýchlosť sťahovania"
 
-#: ../gtk/tr-window.c:507
+#: ../gtk/tr-window.c:532
 msgid "Limit Upload Speed"
 msgstr "Obmedziť rýchlosť odosielania"
 
-#: ../gtk/tr-window.c:514
+#: ../gtk/tr-window.c:539
 msgid "Stop Seeding at Ratio"
 msgstr "Zastaviť zdielanie pri pomere"
 
-#: ../gtk/tr-window.c:548
+#: ../gtk/tr-window.c:573
 #, c-format
 msgid "Stop at Ratio (%s)"
 msgstr "Zastaviť pri pomere (%s)"
 
-#: ../gtk/tr-window.c:751
+#: ../gtk/tr-window.c:777
 #, c-format
 msgid "%1$'d of %2$'d Torrent"
 msgid_plural "%1$'d of %2$'d Torrents"
@@ -1859,7 +1920,7 @@
 msgstr[1] "%1$'d z %2$'d torrentu"
 msgstr[2] "%1$'d z %2$'d torrentov"
 
-#: ../gtk/tr-window.c:757
+#: ../gtk/tr-window.c:783
 #, c-format
 msgid "%'d Torrent"
 msgid_plural "%'d Torrents"
@@ -1867,53 +1928,74 @@
 msgstr[1] "%'d torrent"
 msgstr[2] "%'d torrenty"
 
-#: ../gtk/tr-window.c:777 ../gtk/tr-window.c:805
+#: ../gtk/tr-window.c:803 ../gtk/tr-window.c:831
 #, c-format
 msgid "Ratio: %s"
 msgstr "Pomer: %s"
 
-#: ../gtk/tr-window.c:788 ../gtk/tr-window.c:799
+#: ../gtk/tr-window.c:814
+#, c-format
+msgid "Down: %1$s, Up: %2$s"
+msgstr "Stihnuté: %1$s, Odoslané: %2$s"
+
+#: ../gtk/tr-window.c:825
 #, c-format
 msgid "size|Down: %1$s, Up: %2$s"
 msgstr "Stiahnuté: %1$s, Odoslané: %2$s"
 
-#: ../gtk/util.c:45 ../gtk/util.c:51
+#: ../gtk/util.c:38
 msgid "KiB"
 msgstr "KiB"
 
-#: ../gtk/util.c:46 ../gtk/util.c:52
+#: ../gtk/util.c:39
 msgid "MiB"
 msgstr "MiB"
 
-#: ../gtk/util.c:47 ../gtk/util.c:53
+#: ../gtk/util.c:40
 msgid "GiB"
 msgstr "GiB"
 
-#: ../gtk/util.c:48 ../gtk/util.c:54
+#: ../gtk/util.c:41
 msgid "TiB"
 msgstr "TiB"
 
-#: ../gtk/util.c:57
-msgid "KiB/s"
-msgstr "KiB/s"
-
-#: ../gtk/util.c:58
-msgid "MiB/s"
-msgstr "MiB/s"
-
-#: ../gtk/util.c:59
-msgid "GiB/s"
-msgstr "GiB/s"
-
-#: ../gtk/util.c:60
-msgid "TiB/s"
-msgstr "TiB/s"
-
-#: ../gtk/util.c:142
-msgid "size|None"
-msgstr "Žiadna"
+#: ../gtk/util.c:44
+msgid "kB"
+msgstr ""
+
+#: ../gtk/util.c:45
+msgid "MB"
+msgstr ""
+
+#: ../gtk/util.c:46
+msgid "GB"
+msgstr ""
+
+#: ../gtk/util.c:47
+msgid "TB"
+msgstr ""
+
+#: ../gtk/util.c:50
+msgid "kB/s"
+msgstr ""
 
-#: ../gtk/util.c:163
+#: ../gtk/util.c:51
+msgid "MB/s"
+msgstr ""
+
+#: ../gtk/util.c:52
+msgid "GB/s"
+msgstr ""
+
+#: ../gtk/util.c:53
+msgid "TB/s"
+msgstr ""
+
+#: ../gtk/util.c:87 ../libtransmission/utils.c:1485
+msgid "None"
+msgstr "Nič"
+
+#: ../gtk/util.c:108
 #, c-format
 msgid "%'d day"
 msgid_plural "%'d days"
@@ -1921,7 +2003,7 @@
 msgstr[1] "%'d dňom"
 msgstr[2] "%'d dňami"
 
-#: ../gtk/util.c:164
+#: ../gtk/util.c:109
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
@@ -1929,7 +2011,7 @@
 msgstr[1] "%'d hodina"
 msgstr[2] "%'d hodiny"
 
-#: ../gtk/util.c:165
+#: ../gtk/util.c:110
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
@@ -1937,7 +2019,7 @@
 msgstr[1] "%'d minúta"
 msgstr[2] "%'d minúty"
 
-#: ../gtk/util.c:166
+#: ../gtk/util.c:111
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
@@ -1945,45 +2027,45 @@
 msgstr[1] "%'d sekunda"
 msgstr[2] "%'d sekundy"
 
-#: ../gtk/util.c:286
+#: ../gtk/util.c:221
 #, c-format
 msgid "The torrent file \"%s\" contains invalid data."
 msgstr "Súbor s torrentom \"%s\" obsahuje neplatné dáta."
 
-#: ../gtk/util.c:287
+#: ../gtk/util.c:222
 #, c-format
 msgid "The torrent file \"%s\" is already in use."
 msgstr "Súbor s torrentom \"%s\" sa už používa."
 
-#: ../gtk/util.c:288
+#: ../gtk/util.c:223
 #, c-format
 msgid "The torrent file \"%s\" encountered an unknown error."
 msgstr "V súbore s torrentom \"%s\" došlo k neznámej chybe."
 
-#: ../gtk/util.c:296
+#: ../gtk/util.c:231
 msgid "Error opening torrent"
 msgstr "Chyba pri otváraní torrentu."
 
-#: ../gtk/util.c:810
+#: ../gtk/util.c:554
 #, c-format
 msgid "Error opening \"%s\""
 msgstr "Chyba pri otváraní \"%s\""
 
-#: ../gtk/util.c:813
+#: ../gtk/util.c:557
 #, c-format
 msgid "Server returned \"%1$ld %2$s\""
 msgstr "Server vrátil \"%1$ld %2$s\""
 
-#: ../gtk/util.c:833
+#: ../gtk/util.c:577
 msgid "Unrecognized URL"
 msgstr "Nerozpoznaná URL adresa"
 
-#: ../gtk/util.c:835
+#: ../gtk/util.c:579
 #, c-format
 msgid "Transmission doesn't know how to use \"%s\""
 msgstr "Transmission nevie, ako má použiť \"%s\""
 
-#: ../gtk/util.c:840
+#: ../gtk/util.c:584
 #, c-format
 msgid ""
 "This magnet link appears to be intended for something other than BitTorrent. "
@@ -1997,17 +2079,17 @@
 msgid "Invalid metadata"
 msgstr "Nesprávne metadáta"
 
-#: ../libtransmission/bencode.c:1706 ../libtransmission/bencode.c:1734
+#: ../libtransmission/bencode.c:1716 ../libtransmission/bencode.c:1744
 #, c-format
 msgid "Couldn't save temporary file \"%1$s\": %2$s"
 msgstr "Nepodarilo sa uložiť dočasný súbor \"%1$s\": %2$s"
 
-#: ../libtransmission/bencode.c:1721
+#: ../libtransmission/bencode.c:1731
 #, c-format
 msgid "Saved \"%s\""
 msgstr "Uložený \"%s\""
 
-#: ../libtransmission/bencode.c:1726 ../libtransmission/blocklist.c:417
+#: ../libtransmission/bencode.c:1736 ../libtransmission/blocklist.c:417
 #, c-format
 msgid "Couldn't save file \"%1$s\": %2$s"
 msgstr "Nepodarilo sa uložiť súbor \"%1$s\": %2$s"
@@ -2034,12 +2116,23 @@
 msgid "Blocklist \"%s\" updated with %zu entries"
 msgstr "Zoznam blokovaní \"%s\" bol aktualizovaný %zu položkami"
 
-#: ../libtransmission/fdlimit.c:405
+#: ../libtransmission/fdlimit.c:360 ../libtransmission/metainfo.c:112
+#: ../libtransmission/utils.c:568 ../libtransmission/utils.c:579
+#, c-format
+msgid "Couldn't create \"%1$s\": %2$s"
+msgstr "Nepodarilo sa vytvoriť \"%1$s\": %2$s"
+
+#: ../libtransmission/fdlimit.c:381
+#, c-format
+msgid "Couldn't open \"%1$s\": %2$s"
+msgstr "Nepodarilo sa otvoriť \"%1$s\": %2$s"
+
+#: ../libtransmission/fdlimit.c:396
 #, c-format
 msgid "Couldn't truncate \"%1$s\": %2$s"
 msgstr "Nepodarilo sa skrátiť \"%1$s\": %2$s"
 
-#: ../libtransmission/fdlimit.c:686
+#: ../libtransmission/fdlimit.c:682
 #, c-format
 msgid "Couldn't create socket: %s"
 msgstr "Nepodarilo sa vytvoriť soket: %s"
@@ -2049,7 +2142,7 @@
 msgid "Torrent Creator is skipping file \"%s\": %s"
 msgstr "Pri vytváraní torrentu bol preskočený súbor \"%s\": %s"
 
-#: ../libtransmission/metainfo.c:559
+#: ../libtransmission/metainfo.c:587
 #, c-format
 msgid "Invalid metadata entry \"%s\""
 msgstr "Neplatné metadáta položky \"%s\""
@@ -2078,31 +2171,31 @@
 msgid "Port %d forwarded successfully"
 msgstr "Port %d bol úspešne presmerovaný"
 
-#: ../libtransmission/net.c:268
+#: ../libtransmission/net.c:266
 #, c-format
 msgid "Couldn't set source address %s on %d: %s"
 msgstr "Nepodarilo sa nastaviť adresu zdroja %s na %d: %s"
 
-#: ../libtransmission/net.c:284
+#: ../libtransmission/net.c:282
 #, c-format
 msgid "Couldn't connect socket %d to %s, port %d (errno %d - %s)"
 msgstr "Nepodarilo sa pripojiť soket %d na %s, port %d (chyba č. %d - %s)"
 
-#: ../libtransmission/net.c:356
+#: ../libtransmission/net.c:354
 msgid "Is another copy of Transmission already running?"
 msgstr "Je už spustená aj iná kópia programu Transmission?"
 
-#: ../libtransmission/net.c:361
+#: ../libtransmission/net.c:359
 #, c-format
 msgid "Couldn't bind port %d on %s: %s"
 msgstr "Nepodarilo sa naviazať port %d na %s: %s"
 
-#: ../libtransmission/net.c:363
+#: ../libtransmission/net.c:361
 #, c-format
 msgid "Couldn't bind port %d on %s: %s (%s)"
 msgstr "Nepodarilo sa naviazať port %d na %s: %s (%s)"
 
-#: ../libtransmission/peer-msgs.c:1891
+#: ../libtransmission/peer-msgs.c:1893
 #, c-format
 msgid "Please Verify Local Data! Piece #%zu is corrupt."
 msgstr "Prosím, overte miestne dáta! Časť #%zu je poškodená."
@@ -2127,7 +2220,7 @@
 msgid "Not forwarded"
 msgstr "Nepresmerovaný"
 
-#: ../libtransmission/port-forwarding.c:91 ../libtransmission/torrent.c:1953
+#: ../libtransmission/port-forwarding.c:91 ../libtransmission/torrent.c:2040
 #, c-format
 msgid "State changed from \"%1$s\" to \"%2$s\""
 msgstr "Stav sa zmenil zo stavu \"%1$s\" na \"%2$s\""
@@ -2138,27 +2231,27 @@
 
 #. first %s is the application name
 #. second %s is the version number
-#: ../libtransmission/session.c:704
+#: ../libtransmission/session.c:718
 #, c-format
 msgid "%s %s started"
 msgstr "%s %s spustený"
 
-#: ../libtransmission/session.c:1905
+#: ../libtransmission/session.c:1937
 #, c-format
 msgid "Loaded %d torrents"
 msgstr "Počet načítaných torrentov je %d"
 
-#: ../libtransmission/torrent.c:527
+#: ../libtransmission/torrent.c:524
 #, c-format
 msgid "Tracker warning: \"%s\""
 msgstr "Varovanie trackera: \"%s\""
 
-#: ../libtransmission/torrent.c:534
+#: ../libtransmission/torrent.c:531
 #, c-format
 msgid "Tracker error: \"%s\""
 msgstr "Chyba trackera: \"%s\""
 
-#: ../libtransmission/torrent.c:781
+#: ../libtransmission/torrent.c:778
 msgid ""
 "No data found! Ensure your drives are connected or use \"Set Location\". To "
 "re-download, remove the torrent and re-add it."
@@ -2167,58 +2260,54 @@
 "alebo použite \"Nastaviť umiestnenie\". Ak chcete dáta znova stiahnuť, "
 "odstráňte torrent a pridajte ho znova."
 
-#: ../libtransmission/torrent.c:1582
+#: ../libtransmission/torrent.c:1661
 msgid "Restarted manually -- disabling its seed ratio"
 msgstr "Ručne reštartovaný - vypnutiie jeho pomeru zdieľania"
 
-#: ../libtransmission/torrent.c:1726
+#: ../libtransmission/torrent.c:1813
 msgid "Removing torrent"
 msgstr "Odstraňuje sa torrent"
 
-#: ../libtransmission/torrent.c:1810
+#: ../libtransmission/torrent.c:1897
 msgid "Done"
 msgstr "Dokončený"
 
-#: ../libtransmission/torrent.c:1813
+#: ../libtransmission/torrent.c:1900
 msgid "Complete"
 msgstr "Úplný"
 
-#: ../libtransmission/torrent.c:1816
-msgid "Incomplete"
-msgstr "Neúplný"
-
-#: ../libtransmission/upnp.c:26
+#: ../libtransmission/upnp.c:35
 msgid "Port Forwarding (UPnP)"
 msgstr "Presmerovanie portu (UPnP)"
 
-#: ../libtransmission/upnp.c:112
+#: ../libtransmission/upnp.c:201
 #, c-format
 msgid "Found Internet Gateway Device \"%s\""
 msgstr "Bolo nájdené zariadenie brány do internetu \"%s\""
 
-#: ../libtransmission/upnp.c:115
+#: ../libtransmission/upnp.c:204
 #, c-format
 msgid "Local Address is \"%s\""
 msgstr "Lokálna adresa je \"%s\""
 
-#: ../libtransmission/upnp.c:151
+#: ../libtransmission/upnp.c:233
 #, c-format
 msgid "Port %d isn't forwarded"
 msgstr "Port %d nie je presmerovaný"
 
-#: ../libtransmission/upnp.c:168
+#: ../libtransmission/upnp.c:244
 #, c-format
 msgid "Stopping port forwarding through \"%s\", service \"%s\""
 msgstr "Zastavuje sa presmerovanie portu cez \"%s\", služba \"%s\""
 
-#: ../libtransmission/upnp.c:219
+#: ../libtransmission/upnp.c:277
 #, c-format
 msgid ""
 "Port forwarding through \"%s\", service \"%s\". (local address: %s:%d)"
 msgstr ""
 "Port presmerovaný  cez \"%s\", služba \"%s\". (lokálna addresa: %s:%d)"
 
-#: ../libtransmission/upnp.c:224
+#: ../libtransmission/upnp.c:282
 msgid "Port forwarding successful!"
 msgstr "Presmerovanie portu úspešné!"
 
@@ -2231,19 +2320,11 @@
 msgstr "Alokácia pamäte zlyhala"
 
 #. Node exists but isn't a folder
-#: ../libtransmission/utils.c:566
+#: ../libtransmission/utils.c:578
 #, c-format
 msgid "File \"%s\" is in the way"
 msgstr "Súbor \"%s\" je na ceste"
 
-#: ../libtransmission/utils.c:1457
-msgid "None"
-msgstr "Nič"
-
 #: ../libtransmission/verify.c:218
 msgid "Verifying torrent"
 msgstr "Overuje sa torrent"
-
-#: ../libtransmission/verify.c:260
-msgid "Queued for verification"
-msgstr "Zaradený do radu na overenie"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntuone-client.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntuone-client.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntuone-client.po	2012-01-02 17:51:13.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntuone-client.po	2012-02-23 06:55:58.000000000 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-client\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-23 16:27+0000\n"
+"POT-Creation-Date: 2012-02-21 05:09+0000\n"
 "PO-Revision-Date: 2011-09-26 09:20+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 18:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 01:08+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntuone/clientdefs.py.in:39
 #: ../ubuntuone/platform/credentials/__init__.py:69
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntuone-control-panel.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntuone-control-panel.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntuone-control-panel.po	2012-01-02 17:51:16.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntuone-control-panel.po	2012-02-23 06:56:02.000000000 +0000
@@ -7,49 +7,49 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-control-panel\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-23 21:52+0000\n"
-"PO-Revision-Date: 2011-09-30 09:51+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"POT-Creation-Date: 2012-02-16 16:32+0000\n"
+"PO-Revision-Date: 2012-01-06 23:01+0000\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:35+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:13+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:75
+#: ../ubuntuone/controlpanel/gui/__init__.py:74
 msgid "Always in sync"
 msgstr "Vždy synchronizovať"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:76
+#: ../ubuntuone/controlpanel/gui/__init__.py:75
 msgid "Connect to Ubuntu One"
 msgstr "Pripojiť sa k Ubuntu One"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:77
+#: ../ubuntuone/controlpanel/gui/__init__.py:76
 msgid "Thunderbird plug-in"
 msgstr "Zásuvný modul pre Thunderbird"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:78
+#: ../ubuntuone/controlpanel/gui/__init__.py:77
 msgid "There was a problem while retrieving the credentials."
 msgstr "Vyskytla sa chyba pri získavaní poverení."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:79
+#: ../ubuntuone/controlpanel/gui/__init__.py:78
 msgid "View your personal details and service summary"
 msgstr "Zobraziť vaše osobné údaje a súhrn služby"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:81
+#: ../ubuntuone/controlpanel/gui/__init__.py:80
 msgid "Welcome to Ubuntu One!"
 msgstr "Vitajte v Ubuntu One!"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:82
+#: ../ubuntuone/controlpanel/gui/__init__.py:81
 msgid ""
 "The information could not be retrieved. Maybe your internet connection is "
 "down?"
 msgstr ""
 "Nepodarilo sa získať informácie. Možno vám spadlo internetové pripojenie?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:85
-#: ../ubuntuone/controlpanel/gui/__init__.py:161
+#: ../ubuntuone/controlpanel/gui/__init__.py:84
+#: ../ubuntuone/controlpanel/gui/__init__.py:160
 msgid ""
 "The settings could not be changed,\n"
 "previous values were restored."
@@ -57,36 +57,36 @@
 "Nepodarilo sa zmeniť nastavenia,\n"
 "budú obnovené predchádzajúce hodnoty."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:87
+#: ../ubuntuone/controlpanel/gui/__init__.py:86
 msgid "Are you sure you want to remove this device from Ubuntu One?"
 msgstr "Ste si istý, že chcete odstrániť toto zariadenie z Ubuntu One?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:90
+#: ../ubuntuone/controlpanel/gui/__init__.py:89
 msgid "The device could not be removed."
 msgstr "Nedá sa odstrániť zariadenie."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:91
+#: ../ubuntuone/controlpanel/gui/__init__.py:90
 msgid "Manage devices registered with your personal cloud"
 msgstr "Spravovať zariadenia zaregistrované k vášmu osobnému cloudu"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:93
+#: ../ubuntuone/controlpanel/gui/__init__.py:92
 msgid "The devices connected with your personal cloud are listed below."
 msgstr "Zariadenia pripojené k vášmu osobnému cloudu sú uvedené nižšie."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:95
+#: ../ubuntuone/controlpanel/gui/__init__.py:94
 msgid "Explore"
 msgstr "Preskúmať"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:96
+#: ../ubuntuone/controlpanel/gui/__init__.py:95
 #, python-format
 msgid "<i>%(package_name)s</i> could not be installed"
 msgstr "nepodarilo sa nainštalovať <i>%(package_name)s</i>"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:97
+#: ../ubuntuone/controlpanel/gui/__init__.py:96
 msgid "Sync another folder with your cloud"
 msgstr "Synchronizovať akýkoľvek priečinok s vaším cloudom"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:98
+#: ../ubuntuone/controlpanel/gui/__init__.py:97
 #, python-format
 msgid ""
 "The chosen directory \"%(folder_path)s\" is not valid. \n"
@@ -99,16 +99,16 @@
 "Prosím, zvoľte priečinok v vašom adresári \"%(home_folder)s\", ktorý sa "
 "neprekrýva s existujúcim cloudovým priečinkom."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:103
+#: ../ubuntuone/controlpanel/gui/__init__.py:102
 msgid "My personal folders"
 msgstr "Moje osobné priečinky"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:104
+#: ../ubuntuone/controlpanel/gui/__init__.py:103
 #, python-format
 msgid "Shared by %(other_user_display_name)s"
 msgstr "Zdieľané používateľom %(other_user_display_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:105
+#: ../ubuntuone/controlpanel/gui/__init__.py:104
 #, python-format
 msgid ""
 "The contents of your cloud folder will be merged with your local folder "
@@ -119,115 +119,115 @@
 "priečinkom \"%(folder_path)s\".\n"
 "Chcete sa prihlásiť k tomuto priečinku v cloude?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:109
+#: ../ubuntuone/controlpanel/gui/__init__.py:108
 msgid "Manage your cloud folders"
 msgstr "Spravovať vaše priečinky v cloude"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:111
+#: ../ubuntuone/controlpanel/gui/__init__.py:110
 msgid ""
 "Select which folders from your cloud you want to sync with this computer"
 msgstr ""
 "Vyberte priečinky z cloudu, ktoré majú byť synchronizované s týmto počítačom."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:113
+#: ../ubuntuone/controlpanel/gui/__init__.py:112
 msgid "Connect"
 msgstr "Pripojiť"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:114
+#: ../ubuntuone/controlpanel/gui/__init__.py:113
 msgid "Connect the file sync service with your personal cloud"
 msgstr "Pripojiť službu synchronizácie súborov k vášmu osobnému cloudu"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:116
+#: ../ubuntuone/controlpanel/gui/__init__.py:115
 msgid "File Sync is disabled."
 msgstr "Synchronizácia súborov je zakázaná."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:117
+#: ../ubuntuone/controlpanel/gui/__init__.py:116
 msgid "Disconnect"
 msgstr "Odpojiť"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:118
+#: ../ubuntuone/controlpanel/gui/__init__.py:117
 msgid "Disconnect the file sync service from your personal cloud"
 msgstr "Odpojiť službu synchronizácie súborov z vášho osobného cloudu"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:120
+#: ../ubuntuone/controlpanel/gui/__init__.py:119
 msgid "File Sync is disconnected."
 msgstr "Synchronizácia súborov je odpojená."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:121
+#: ../ubuntuone/controlpanel/gui/__init__.py:120
 msgid "Enable"
 msgstr "Povoliť"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:122
+#: ../ubuntuone/controlpanel/gui/__init__.py:121
 msgid "Enable the file sync service"
 msgstr "Povoliť službu synchronizácie súborov"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:123
+#: ../ubuntuone/controlpanel/gui/__init__.py:122
 msgid "File Sync error."
 msgstr "Chyba synchronizácie súborov."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:124
+#: ../ubuntuone/controlpanel/gui/__init__.py:123
 msgid "File Sync is up-to-date."
 msgstr "Synchronizácia súborov je aktuálna"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:125
+#: ../ubuntuone/controlpanel/gui/__init__.py:124
 msgid "Restart"
 msgstr "Reštartovať"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:126
+#: ../ubuntuone/controlpanel/gui/__init__.py:125
 msgid "Restart the file sync service"
 msgstr "Reštartovať službu synchronizácie súborov"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:127
+#: ../ubuntuone/controlpanel/gui/__init__.py:126
 msgid "File Sync"
 msgstr "Synchronizácia súborov"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:128
+#: ../ubuntuone/controlpanel/gui/__init__.py:127
 msgid "Start"
 msgstr "Spustiť"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:129
+#: ../ubuntuone/controlpanel/gui/__init__.py:128
 msgid "Start the file sync service"
 msgstr "Spustiť službu synchronizácie súborov"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:130
+#: ../ubuntuone/controlpanel/gui/__init__.py:129
 msgid "File Sync starting..."
 msgstr "Spúšťa sa synchronizácia súborov..."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:131
+#: ../ubuntuone/controlpanel/gui/__init__.py:130
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:132
+#: ../ubuntuone/controlpanel/gui/__init__.py:131
 msgid "Stop the file sync service"
 msgstr "Zastaviť službu synchronizácie súborov"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:133
+#: ../ubuntuone/controlpanel/gui/__init__.py:132
 msgid "File Sync is stopped."
 msgstr "Synchronizácia súborov je zastavená."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:134
+#: ../ubuntuone/controlpanel/gui/__init__.py:133
 msgid "File Sync in progress..."
 msgstr "Prebieha synchronizácia súborov..."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:135
+#: ../ubuntuone/controlpanel/gui/__init__.py:134
 #, python-format
 msgid "%(free_space)s available storage"
 msgstr "%(free_space)s dostupného miesta"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:136
+#: ../ubuntuone/controlpanel/gui/__init__.py:135
 msgid "Ubuntu One experienced an error"
-msgstr ""
+msgstr "Vyskytla sa chyba v Ubuntu One"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:137
+#: ../ubuntuone/controlpanel/gui/__init__.py:136
 msgid "Sorry, an error has occurred and Ubuntu One needs to close."
-msgstr ""
+msgstr "Prepáčte, vyskytla sa chyba a Ubuntu One sa potrebuje ukončiť."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:139
+#: ../ubuntuone/controlpanel/gui/__init__.py:138
 #, python-format
 msgid "Hi %(user_display_name)s"
 msgstr "Ahoj %(user_display_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:140
+#: ../ubuntuone/controlpanel/gui/__init__.py:139
 #, python-format
 msgid ""
 "You need to install the package <i>%(package_name)s</i> in order to enable "
@@ -236,39 +236,39 @@
 "Potrebujete nainštalovať balík <i>%(package_name)s</i> aby ste mohli povoliť "
 "viac synchronizačných služieb."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:142
+#: ../ubuntuone/controlpanel/gui/__init__.py:141
 #, python-format
 msgid "Install the %(plugin_name)s for the sync service: %(service_name)s"
 msgstr ""
 "Nainštalovať %(plugin_name)s pre synchronizačnú službu: %(service_name)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:144
+#: ../ubuntuone/controlpanel/gui/__init__.py:143
 #, python-format
 msgid "Installation of <i>%(package_name)s</i> in progress"
 msgstr "Prebieha inštalácia <i>%(package_name)s</i>"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:145
+#: ../ubuntuone/controlpanel/gui/__init__.py:144
 msgid "Loading..."
 msgstr "Načítava sa..."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:146
+#: ../ubuntuone/controlpanel/gui/__init__.py:145
 #, python-format
 msgid "%(app_name)s Control Panel"
 msgstr "%(app_name)s  ovládací panel"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:147
+#: ../ubuntuone/controlpanel/gui/__init__.py:146
 msgid "My folders"
 msgstr "Moje priečinky"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:148
+#: ../ubuntuone/controlpanel/gui/__init__.py:147
 msgid "[unknown user name]"
 msgstr "[neznáme používateľské meno]"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:149
+#: ../ubuntuone/controlpanel/gui/__init__.py:148
 msgid "Purchased Music"
 msgstr "Zakúpená hudba"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:151
+#: ../ubuntuone/controlpanel/gui/__init__.py:150
 #, python-format
 msgid ""
 "An internet connection is required to join or sign in to %(app_name)s."
@@ -276,63 +276,63 @@
 "Internetové pripojenie je vyžadované na registráciu alebo prihlásenie k "
 "%(app_name)s."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:153
+#: ../ubuntuone/controlpanel/gui/__init__.py:152
 msgid "No devices to show."
 msgstr "Žiadne zariadenia na zobrazenie."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:154
+#: ../ubuntuone/controlpanel/gui/__init__.py:153
 msgid "No folders to show."
 msgstr "Žiadne priečinky na zobrazenie."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:155
+#: ../ubuntuone/controlpanel/gui/__init__.py:154
 msgid "There is no Ubuntu One pairing record."
 msgstr "Nie je tu žiadny párovací záznam Ubuntu One."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:156
+#: ../ubuntuone/controlpanel/gui/__init__.py:155
 #, python-format
 msgid "%(percentage)s used"
 msgstr "%(percentage)s využitých"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:157
+#: ../ubuntuone/controlpanel/gui/__init__.py:156
 #, python-format
 msgid "Using %(used)s of %(total)s (%(percentage).0f%%)"
 msgstr "Využíva sa %(used)s z %(total)s (%(percentage).0f%%)"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:158
+#: ../ubuntuone/controlpanel/gui/__init__.py:157
 #, python-format
 msgid "%(used)s of %(total)s"
 msgstr "%(used)s z %(total)s"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:159
+#: ../ubuntuone/controlpanel/gui/__init__.py:158
 msgid "Manage the sync services"
 msgstr "Spravovať synchronizačné služby"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:160
+#: ../ubuntuone/controlpanel/gui/__init__.py:159
 msgid "Enable the sync services for this computer."
 msgstr "Povoliť synchronizačné služby pre tento počítač."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:163
+#: ../ubuntuone/controlpanel/gui/__init__.py:162
 msgid "Manage the shares offered to others"
 msgstr "Spravovať zdieľania poskytnuté ostatným"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:164
+#: ../ubuntuone/controlpanel/gui/__init__.py:163
 msgid "Manage permissions for shares made to other users."
 msgstr "Spravovať oprávnenia zdieľania s inými používateľmi"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:165
+#: ../ubuntuone/controlpanel/gui/__init__.py:164
 #, python-format
 msgid "<i>%(package_name)s</i> was successfully installed"
 msgstr "balík <i>%(package_name)s</i> bol úspešne nainštalovaný"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:166 ../data/gtk/volumes.ui.h:1
+#: ../ubuntuone/controlpanel/gui/__init__.py:165 ../data/gtk/volumes.ui.h:1
 msgid "Sync locally?"
 msgstr "Synchronizovať lokálne?"
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:167
+#: ../ubuntuone/controlpanel/gui/__init__.py:166
 msgid "Value could not be retrieved."
 msgstr "Nedá sa získať hodnota."
 
-#: ../ubuntuone/controlpanel/gui/__init__.py:168
+#: ../ubuntuone/controlpanel/gui/__init__.py:167
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntuone-installer.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntuone-installer.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntuone-installer.po	2012-01-02 17:51:28.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntuone-installer.po	2012-02-23 06:56:14.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ubuntuone-installer\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-21 10:31+0000\n"
+"POT-Creation-Date: 2012-02-15 20:51+0000\n"
 "PO-Revision-Date: 2011-09-25 12:44+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-30 01:36+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 06:46+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntuone-installer.desktop.in.h:1
 msgid "Configure and manage your Ubuntu One account"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntu-sso-client.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntu-sso-client.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntu-sso-client.po	2012-01-02 17:51:15.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntu-sso-client.po	2012-02-23 06:56:01.000000000 +0000
@@ -9,13 +9,13 @@
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-09-19 07:17+0000\n"
 "PO-Revision-Date: 2010-12-15 16:10+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:24+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../ubuntu_sso/gtk/gui.py:152
 msgid "Type the characters above"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntu-wallpapers.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntu-wallpapers.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ubuntu-wallpapers.po	2012-01-02 17:51:09.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ubuntu-wallpapers.po	2012-02-23 06:55:55.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:03+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:02+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: ../ubuntu-wallpapers.xml.in.h:1
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ufw.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ufw.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/ufw.po	2012-01-02 17:51:10.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/ufw.po	2012-02-23 06:55:55.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: ufw\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-03-22 10:34-0500\n"
-"PO-Revision-Date: 2010-12-26 10:55+0000\n"
-"Last-Translator: Bilal Akhtar <bilalakhtar@ubuntu.com>\n"
+"PO-Revision-Date: 2011-12-31 04:57+0000\n"
+"Last-Translator: Matthias Klose <doko@ubuntu.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:11+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: src/ufw:46
 msgid ": Need at least python 2.5)\n"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/unity-2d.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/unity-2d.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/unity-2d.po	2012-01-02 17:51:16.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/unity-2d.po	2012-02-23 06:56:02.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 19:41+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 02:18+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: libunity-2d-private/src/launcherdevice.cpp:273
 msgid "Eject"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/update-manager.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/update-manager.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/update-manager.po	2012-01-02 17:50:46.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/update-manager.po	2012-02-23 06:55:35.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: sk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 19:09+0000\n"
+"POT-Creation-Date: 2012-02-17 03:06+0000\n"
 "PO-Revision-Date: 2011-12-06 06:42+0000\n"
 "Last-Translator: helix84 <Unknown>\n"
 "Language-Team: <en@li.org>\n"
@@ -19,33 +19,25 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:16+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
-
-#. TRANSLATORS: download size is 0
-#: ../DistUpgrade/utils.py:392 ../UpdateManager/Core/utils.py:392
-msgid "0 kB"
-msgstr "0 kB"
-
-#. TRANSLATORS: download size of very small updates
-#: ../DistUpgrade/utils.py:395 ../UpdateManager/Core/utils.py:395
-msgid "1 kB"
-msgstr "1 kB"
+"X-Launchpad-Export-Date: 2012-02-21 19:00+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #. TRANSLATORS: download size of small updates, e.g. "250 kB"
-#: ../DistUpgrade/utils.py:398 ../UpdateManager/Core/utils.py:398
+#: ../DistUpgrade/utils.py:397 ../UpdateManager/Core/utils.py:397
 #, python-format
-msgid "%.0f kB"
-msgstr "%.0f kB"
+msgid "%(size).0f kB"
+msgid_plural "%(size).0f kB"
+msgstr[0] ""
+msgstr[1] ""
 
 #. TRANSLATORS: download size of updates, e.g. "2.3 MB"
-#: ../DistUpgrade/utils.py:401 ../UpdateManager/Core/utils.py:401
+#: ../DistUpgrade/utils.py:352 ../UpdateManager/Core/utils.py:352
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
 #. TRANSLATORS: %s is a country
-#: ../DistUpgrade/distro.py:210 ../DistUpgrade/distro.py:438
+#: ../DistUpgrade/distro.py:208 ../DistUpgrade/distro.py:423
 #, python-format
 msgid "Server for %s"
 msgstr "Server pre %s"
@@ -53,20 +45,20 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../DistUpgrade/distro.py:228 ../DistUpgrade/distro.py:234
-#: ../DistUpgrade/distro.py:250
+#: ../DistUpgrade/distro.py:226 ../DistUpgrade/distro.py:232
+#: ../DistUpgrade/distro.py:248
 msgid "Main server"
 msgstr "Hlavný server"
 
-#: ../DistUpgrade/distro.py:254
+#: ../DistUpgrade/distro.py:252
 msgid "Custom servers"
 msgstr "Vlastné servery"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:141
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:131
 msgid "Could not calculate sources.list entry"
 msgstr "Nemožno vypočítať položku v sources.list"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:244
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:234
 msgid ""
 "Unable to locate any package files, perhaps this is not a Ubuntu Disc or the "
 "wrong architecture?"
@@ -74,11 +66,11 @@
 "Nemožno lokalizovať žiadne balíčky súborov. Pravdepodobne toto nie je CD/DVD "
 "Ubuntu alebo je určené pre inú architektúru."
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:287
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:277
 msgid "Failed to add the CD"
 msgstr "Zlyhalo pridanie CD"
 
-#: ../DistUpgrade/DistUpgradeAptCdrom.py:288
+#: ../DistUpgrade/DistUpgradeAptCdrom.py:278
 #, python-format
 msgid ""
 "There was a error adding the CD, the upgrade will abort. Please report this "
@@ -93,14 +85,14 @@
 "Chybová správa bola:\n"
 "'%s'"
 
-#: ../DistUpgrade/DistUpgradeCache.py:147
+#: ../DistUpgrade/DistUpgradeCache.py:130
 msgid "Remove package in bad state"
 msgid_plural "Remove packages in bad state"
 msgstr[0] "Odstrániť balíky v zlom stave"
 msgstr[1] "Odstrániť balík v zlom stave"
 msgstr[2] "Odstrániť balíky v zlom stave"
 
-#: ../DistUpgrade/DistUpgradeCache.py:150
+#: ../DistUpgrade/DistUpgradeCache.py:133
 #, python-format
 msgid ""
 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -125,15 +117,15 @@
 
 #. FIXME: not ideal error message, but we just reuse a
 #. existing one here to avoid a new string
-#: ../DistUpgrade/DistUpgradeCache.py:248
+#: ../DistUpgrade/DistUpgradeCache.py:231
 msgid "The server may be overloaded"
 msgstr "Server môže byť preťažený"
 
-#: ../DistUpgrade/DistUpgradeCache.py:361
+#: ../DistUpgrade/DistUpgradeCache.py:341
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: ../DistUpgrade/DistUpgradeCache.py:362
+#: ../DistUpgrade/DistUpgradeCache.py:342
 msgid ""
 "Your system contains broken packages that couldn't be fixed with this "
 "software. Please fix them first using synaptic or apt-get before proceeding."
@@ -142,7 +134,7 @@
 "opravené. Pred pokračovaním ich opravte programom synaptic alebo apt-get."
 
 #. FIXME: change the text to something more useful
-#: ../DistUpgrade/DistUpgradeCache.py:659
+#: ../DistUpgrade/DistUpgradeCache.py:631
 #, python-format
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade:\n"
@@ -163,11 +155,11 @@
 "* používate neoficiálne balíky softvéru, ktoré neposkytuje tím Ubuntu\n"
 "\n"
 
-#: ../DistUpgrade/DistUpgradeCache.py:669
+#: ../DistUpgrade/DistUpgradeCache.py:641
 msgid "This is most likely a transient problem, please try again later."
 msgstr "Toto je pravdepodobne dočasný problém, prosím skúste to neskôr."
 
-#: ../DistUpgrade/DistUpgradeCache.py:672
+#: ../DistUpgrade/DistUpgradeCache.py:673
 msgid ""
 "If none of this applies, then please report this bug using the command "
 "'ubuntu-bug update-manager' in a terminal."
@@ -175,16 +167,16 @@
 "Ak nič z tohto nie je relevantné, prosím, pošlite toto hlásenie o chybe "
 "príkazom „ubuntu-bug update-manager“ v termináli."
 
-#: ../DistUpgrade/DistUpgradeCache.py:677
-#: ../UpdateManager/UpdateManager.py:1034
+#: ../DistUpgrade/DistUpgradeCache.py:650
+#: ../UpdateManager/UpdateManager.py:772
 msgid "Could not calculate the upgrade"
 msgstr "Nepodarilo sa vypočítať aktualizáciu"
 
-#: ../DistUpgrade/DistUpgradeCache.py:728
+#: ../DistUpgrade/DistUpgradeCache.py:700
 msgid "Error authenticating some packages"
 msgstr "Chyba pri overovaní niektorých balíkov"
 
-#: ../DistUpgrade/DistUpgradeCache.py:729
+#: ../DistUpgrade/DistUpgradeCache.py:701
 msgid ""
 "It was not possible to authenticate some packages. This may be a transient "
 "network problem. You may want to try again later. See below for a list of "
@@ -194,7 +186,7 @@
 "sieťou. Môžete to opäť skúsiť neskôr. Nižšie je uvedený zoznam neoverených "
 "balíkov."
 
-#: ../DistUpgrade/DistUpgradeCache.py:749
+#: ../DistUpgrade/DistUpgradeCache.py:721
 #, python-format
 msgid ""
 "The package '%s' is marked for removal but it is in the removal blacklist."
@@ -202,22 +194,22 @@
 "Balík „%s“ je označený na odstránenie ale nachádza sa na zozname balíkov, "
 "ktoré sa nemajú odstraňovať."
 
-#: ../DistUpgrade/DistUpgradeCache.py:753
+#: ../DistUpgrade/DistUpgradeCache.py:725
 #, python-format
 msgid "The essential package '%s' is marked for removal."
 msgstr "Nevyhnutný balík „%s“ je označený na odstránenie."
 
-#: ../DistUpgrade/DistUpgradeCache.py:762
+#: ../DistUpgrade/DistUpgradeCache.py:734
 #, python-format
 msgid "Trying to install blacklisted version '%s'"
 msgstr "Pokus o nainštalovanie verzie „%s“ z čiernej listiny"
 
-#: ../DistUpgrade/DistUpgradeCache.py:880
+#: ../DistUpgrade/DistUpgradeCache.py:851
 #, python-format
 msgid "Can't install '%s'"
 msgstr "Nie je možné nainštalovať „%s“"
 
-#: ../DistUpgrade/DistUpgradeCache.py:881
+#: ../DistUpgrade/DistUpgradeCache.py:882
 msgid ""
 "It was impossible to install a required package. Please report this as a bug "
 "using 'ubuntu-bug update-manager' in a terminal."
@@ -226,11 +218,11 @@
 "príkazom „ubuntu-bug update-manager“ v termináli."
 
 #. FIXME: provide a list
-#: ../DistUpgrade/DistUpgradeCache.py:892
+#: ../DistUpgrade/DistUpgradeCache.py:861
 msgid "Can't guess meta-package"
 msgstr "Nie je možné odhadnúť meta-balík"
 
-#: ../DistUpgrade/DistUpgradeCache.py:893
+#: ../DistUpgrade/DistUpgradeCache.py:862
 msgid ""
 "Your system does not contain a ubuntu-desktop, kubuntu-desktop, xubuntu-"
 "desktop or edubuntu-desktop package and it was not possible to detect which "
@@ -244,15 +236,15 @@
 " Prosím, než budete pokračovať, najprv nainštalujte jeden z vyššie uvedených "
 "balíkov pomocou Synaptic alebo apt-get."
 
-#: ../DistUpgrade/DistUpgradeController.py:100
+#: ../DistUpgrade/DistUpgradeController.py:86
 msgid "Reading cache"
 msgstr "Číta sa vyrovnávacia pamäť"
 
-#: ../DistUpgrade/DistUpgradeController.py:210
+#: ../DistUpgrade/DistUpgradeController.py:189
 msgid "Unable to get exclusive lock"
 msgstr "Nepodarilo sa uzamknúť databázu softvéru"
 
-#: ../DistUpgrade/DistUpgradeController.py:211
+#: ../DistUpgrade/DistUpgradeController.py:190
 msgid ""
 "This usually means that another package management application (like apt-get "
 "or aptitude) already running. Please close that application first."
@@ -260,12 +252,12 @@
 "Zvyčajne to znamená, že je už spustená iná aplikácia na správu balíkov (ako "
 "apt-get alebo aptitude). Prosím, najskôr ukončite danú aplikáciu."
 
-#: ../DistUpgrade/DistUpgradeController.py:244
+#: ../DistUpgrade/DistUpgradeController.py:236
 msgid "Upgrading over remote connection not supported"
 msgstr ""
 "Aktualizácia prostredníctvom vzdialeného pripojenia nie je podporovaná"
 
-#: ../DistUpgrade/DistUpgradeController.py:245
+#: ../DistUpgrade/DistUpgradeController.py:237
 msgid ""
 "You are running the upgrade over a remote ssh connection with a frontend "
 "that does not support this. Please try a text mode upgrade with 'do-release-"
@@ -279,11 +271,11 @@
 "\n"
 "Táto aktualizácia sa teraz preruší. Prosím, skúste to bez použitia ssh."
 
-#: ../DistUpgrade/DistUpgradeController.py:259
+#: ../DistUpgrade/DistUpgradeController.py:251
 msgid "Continue running under SSH?"
 msgstr "Pokračovať v spojení cez SSH?"
 
-#: ../DistUpgrade/DistUpgradeController.py:260
+#: ../DistUpgrade/DistUpgradeController.py:252
 #, python-format
 msgid ""
 "This session appears to be running under ssh. It is not recommended to "
@@ -299,11 +291,11 @@
 "Ak chcete pokračovať, na porte „%s“ sa spustí ďalší ssh démon.\n"
 "Chcete pokračovať?"
 
-#: ../DistUpgrade/DistUpgradeController.py:274
+#: ../DistUpgrade/DistUpgradeController.py:267
 msgid "Starting additional sshd"
 msgstr "Štartuje sa ďalší sshd"
 
-#: ../DistUpgrade/DistUpgradeController.py:275
+#: ../DistUpgrade/DistUpgradeController.py:268
 #, python-format
 msgid ""
 "To make recovery in case of failure easier, an additional sshd will be "
@@ -314,7 +306,7 @@
 "porte „%s“. Ak nastane problém s momentálne bežiacim ssh môžete sa stále "
 "pripojiť k tomuto ďalšiemu.\n"
 
-#: ../DistUpgrade/DistUpgradeController.py:283
+#: ../DistUpgrade/DistUpgradeController.py:282
 #, python-format
 msgid ""
 "If you run a firewall, you may need to temporarily open this port. As this "
@@ -327,55 +319,50 @@
 "môžete otvoriť napr. pomocou:\n"
 "„%s“"
 
-#: ../DistUpgrade/DistUpgradeController.py:355
-#: ../DistUpgrade/DistUpgradeController.py:400
+#: ../DistUpgrade/DistUpgradeController.py:339
+#: ../DistUpgrade/DistUpgradeController.py:384
 msgid "Can not upgrade"
 msgstr "Nie je možné vykonať prechod na novšiu verziu"
 
-#: ../DistUpgrade/DistUpgradeController.py:356
+#: ../DistUpgrade/DistUpgradeController.py:340
 #, python-format
 msgid "An upgrade from '%s' to '%s' is not supported with this tool."
 msgstr "Tento nástroj nepodporuje aktualizáciu z '%s' na '%s'."
 
-#: ../DistUpgrade/DistUpgradeController.py:365
+#: ../DistUpgrade/DistUpgradeController.py:349
 msgid "Sandbox setup failed"
 msgstr "Zlyhalo vytvorenie pieskoviska"
 
-#: ../DistUpgrade/DistUpgradeController.py:366
+#: ../DistUpgrade/DistUpgradeController.py:350
 msgid "It was not possible to create the sandbox environment."
 msgstr "Nebolo možné vytvoriť prostredie pieskoviska."
 
-#: ../DistUpgrade/DistUpgradeController.py:372
+#: ../DistUpgrade/DistUpgradeController.py:356
 msgid "Sandbox mode"
 msgstr "Režim pieskoviska"
 
-#: ../DistUpgrade/DistUpgradeController.py:373
+#: ../DistUpgrade/DistUpgradeController.py:372
 #, python-format
 msgid ""
 "This upgrade is running in sandbox (test) mode. All changes are written to "
 "'%s' and will be lost on the next reboot.\n"
 "\n"
-"*No* changes written to a systemdir from now until the next reboot are "
-"permanent."
+"*No* changes written to a system directory from now until the next reboot "
+"are permanent."
 msgstr ""
-"Táto aktualizácia beží v režime pieskoviska (v testovacom režime). Akékoľvek "
-"zmeny budú zapísané do „%s“ a stratia sa pri ďalšom reštarte.\n"
-"\n"
-"*Žiadne* zmeny zapísané do systémového priečinka odteraz do ďalšieho "
-"reštartu za nezachovajú."
 
-#: ../DistUpgrade/DistUpgradeController.py:401
+#: ../DistUpgrade/DistUpgradeController.py:385
 msgid ""
 "Your python install is corrupted. Please fix the '/usr/bin/python' symlink."
 msgstr ""
 "Vaša inštalácia Pythonu je pokazená. Prosím, opravte symbolický odkaz "
 "„/usr/bin/python“."
 
-#: ../DistUpgrade/DistUpgradeController.py:427
+#: ../DistUpgrade/DistUpgradeController.py:411
 msgid "Package 'debsig-verify' is installed"
 msgstr "Balík 'debsig-verify' je nainštalovaný"
 
-#: ../DistUpgrade/DistUpgradeController.py:428
+#: ../DistUpgrade/DistUpgradeController.py:412
 msgid ""
 "The upgrade can not continue with that package installed.\n"
 "Please remove it with synaptic or 'apt-get remove debsig-verify' first and "
@@ -385,24 +372,24 @@
 "Najprv ho, prosím, odstránte pomocou programu synaptic alebo 'apt-get remove "
 "debsig-verify' a spustite aktualizáciu znovu."
 
-#: ../DistUpgrade/DistUpgradeController.py:440
+#: ../DistUpgrade/DistUpgradeController.py:439
 #, python-format
 msgid "Can not write to '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:441
+#: ../DistUpgrade/DistUpgradeController.py:440
 #, python-format
 msgid ""
-"Its not possible to write to the systemdir '%s' on your system. The upgrade "
-"can not continue.\n"
-"Please make sure that the system dir is writable."
+"Its not possible to write to the system directory '%s' on your system. The "
+"upgrade can not continue.\n"
+"Please make sure that the system directory is writable."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:452
+#: ../DistUpgrade/DistUpgradeController.py:422
 msgid "Include latest updates from the Internet?"
 msgstr "Použiť najnovšie aktualizácie z internetu?"
 
-#: ../DistUpgrade/DistUpgradeController.py:453
+#: ../DistUpgrade/DistUpgradeController.py:423
 msgid ""
 "The upgrade system can use the internet to automatically download the latest "
 "updates and install them during the upgrade.  If you have a network "
@@ -422,16 +409,16 @@
 "najnovšie aktualizácie čo najskôr po aktualizácii systému.\n"
 "Ak na túto možnosť odpoviete „Nie“, sieť nebude vôbec použitá."
 
-#: ../DistUpgrade/DistUpgradeController.py:673
+#: ../DistUpgrade/DistUpgradeController.py:647
 #, python-format
 msgid "disabled on upgrade to %s"
 msgstr "vypnuté pri aktualizácii na %s"
 
-#: ../DistUpgrade/DistUpgradeController.py:700
+#: ../DistUpgrade/DistUpgradeController.py:674
 msgid "No valid mirror found"
 msgstr "Nebol nájdený vhodný server"
 
-#: ../DistUpgrade/DistUpgradeController.py:701
+#: ../DistUpgrade/DistUpgradeController.py:675
 #, python-format
 msgid ""
 "While scanning your repository information no mirror entry for the upgrade "
@@ -451,11 +438,11 @@
 "Ak zvolíte „Nie“, aktualizácia sa preruší."
 
 #. hm, still nothing useful ...
-#: ../DistUpgrade/DistUpgradeController.py:721
+#: ../DistUpgrade/DistUpgradeController.py:695
 msgid "Generate default sources?"
 msgstr "Vytvoriť štandardný zoznam zdrojov softvéru?"
 
-#: ../DistUpgrade/DistUpgradeController.py:722
+#: ../DistUpgrade/DistUpgradeController.py:696
 #, python-format
 msgid ""
 "After scanning your 'sources.list' no valid entry for '%s' was found.\n"
@@ -469,25 +456,21 @@
 "Majú sa pridať štandardné záznamy pre „%s“? Ak zvolíte „Nie“, aktualizácia "
 "sa preruší."
 
-#: ../DistUpgrade/DistUpgradeController.py:757
+#: ../DistUpgrade/DistUpgradeController.py:731
 msgid "Repository information invalid"
 msgstr "Neplatná informácia o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeController.py:758
+#: ../DistUpgrade/DistUpgradeController.py:757
 msgid ""
-"Upgrading the repository information resulted in a invalid file. Please "
-"report this as a bug using the command 'ubuntu-bug update-manager' in a "
-"terminal."
+"Upgrading the repository information resulted in a invalid file so a bug "
+"reporting process is being started."
 msgstr ""
-"Aktualizácia informácií zdroja softvéru mala za výsledok neplatný súbor. "
-"Prosím, nahláste to ako chybu príkazom „ubuntu-bug update-manager“ v "
-"termináli."
 
-#: ../DistUpgrade/DistUpgradeController.py:766
+#: ../DistUpgrade/DistUpgradeController.py:738
 msgid "Third party sources disabled"
 msgstr "Zdroje tretích strán sú zakázané"
 
-#: ../DistUpgrade/DistUpgradeController.py:767
+#: ../DistUpgrade/DistUpgradeController.py:739
 msgid ""
 "Some third party entries in your sources.list were disabled. You can re-"
 "enable them after the upgrade with the 'software-properties' tool or your "
@@ -497,14 +480,14 @@
 "prechode na novšiu verziu ich môžete znova zapnúť nástrojom 'software-"
 "properties' vášho správcu balíkov."
 
-#: ../DistUpgrade/DistUpgradeController.py:807
+#: ../DistUpgrade/DistUpgradeController.py:779
 msgid "Package in inconsistent state"
 msgid_plural "Packages in inconsistent state"
 msgstr[0] "Balíky sú v nekonzistentnom stave"
 msgstr[1] "Balík je v nekonzistentnom stave"
 msgstr[2] "Balíky sú v nekonzistentnom stave"
 
-#: ../DistUpgrade/DistUpgradeController.py:810
+#: ../DistUpgrade/DistUpgradeController.py:782
 #, python-format
 msgid ""
 "The package '%s' is in an inconsistent state and needs to be reinstalled, "
@@ -527,11 +510,11 @@
 "neboli pre ne nájdené žiadne archívy. Prosím, preinštalujte balíky ručne "
 "alebo ich odstráňte zo systému."
 
-#: ../DistUpgrade/DistUpgradeController.py:858
+#: ../DistUpgrade/DistUpgradeController.py:830
 msgid "Error during update"
 msgstr "Chyba počas aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeController.py:859
+#: ../DistUpgrade/DistUpgradeController.py:831
 msgid ""
 "A problem occurred during the update. This is usually some sort of network "
 "problem, please check your network connection and retry."
@@ -541,12 +524,12 @@
 "znova."
 
 #. print "on_button_install_clicked"
-#: ../DistUpgrade/DistUpgradeController.py:868
-#: ../UpdateManager/UpdateManager.py:759
+#: ../DistUpgrade/DistUpgradeController.py:840
+#: ../UpdateManager/UpdateManager.py:577
 msgid "Not enough free disk space"
 msgstr "Nedostatok voľného miesta na disku"
 
-#: ../DistUpgrade/DistUpgradeController.py:869
+#: ../DistUpgrade/DistUpgradeController.py:867
 #, python-format
 msgid ""
 "The upgrade has aborted. The upgrade needs a total of %s free space on disk "
@@ -561,21 +544,21 @@
 
 #. calc the dist-upgrade and see if the removals are ok/expected
 #. do the dist-upgrade
-#: ../DistUpgrade/DistUpgradeController.py:898
-#: ../DistUpgrade/DistUpgradeController.py:1643
+#: ../DistUpgrade/DistUpgradeController.py:869
+#: ../DistUpgrade/DistUpgradeController.py:1610
 msgid "Calculating the changes"
 msgstr "Počítajú sa zmeny"
 
-#. ask the user
-#: ../DistUpgrade/DistUpgradeController.py:930
+#. ask the user if he wants to do the changes
+#: ../DistUpgrade/DistUpgradeController.py:920
 msgid "Do you want to start the upgrade?"
 msgstr "Chcete začať s aktualizáciou?"
 
-#: ../DistUpgrade/DistUpgradeController.py:996
+#: ../DistUpgrade/DistUpgradeController.py:985
 msgid "Upgrade canceled"
 msgstr "Aktualizácia zrušená"
 
-#: ../DistUpgrade/DistUpgradeController.py:997
+#: ../DistUpgrade/DistUpgradeController.py:995
 msgid ""
 "The upgrade will cancel now and the original system state will be restored. "
 "You can resume the upgrade at a later time."
@@ -583,12 +566,12 @@
 "Aktualizácia sa teraz preruší a obnoví sa pôvodný stav systému. V "
 "aktualizácii môžete neskôr pokračovať."
 
-#: ../DistUpgrade/DistUpgradeController.py:1003
-#: ../DistUpgrade/DistUpgradeController.py:1129
+#: ../DistUpgrade/DistUpgradeController.py:991
+#: ../DistUpgrade/DistUpgradeController.py:1097
 msgid "Could not download the upgrades"
 msgstr "Nebolo možné stiahnuť aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeController.py:1004
+#: ../DistUpgrade/DistUpgradeController.py:1002
 msgid ""
 "The upgrade has aborted. Please check your Internet connection or "
 "installation media and try again. All files downloaded so far have been kept."
@@ -599,27 +582,27 @@
 
 #. FIXME: strings are not good, but we are in string freeze
 #. currently
-#: ../DistUpgrade/DistUpgradeController.py:1080
-#: ../DistUpgrade/DistUpgradeController.py:1117
-#: ../DistUpgrade/DistUpgradeController.py:1222
+#: ../DistUpgrade/DistUpgradeController.py:1049
+#: ../DistUpgrade/DistUpgradeController.py:1085
+#: ../DistUpgrade/DistUpgradeController.py:1190
 msgid "Error during commit"
 msgstr "Chyba počas potvrdzovania"
 
 #. generate a new cache
-#: ../DistUpgrade/DistUpgradeController.py:1082
-#: ../DistUpgrade/DistUpgradeController.py:1119
-#: ../DistUpgrade/DistUpgradeController.py:1261
+#: ../DistUpgrade/DistUpgradeController.py:1051
+#: ../DistUpgrade/DistUpgradeController.py:1087
+#: ../DistUpgrade/DistUpgradeController.py:1229
 msgid "Restoring original system state"
 msgstr "Obnovuje sa pôvodný stav systému"
 
-#: ../DistUpgrade/DistUpgradeController.py:1083
-#: ../DistUpgrade/DistUpgradeController.py:1098
-#: ../DistUpgrade/DistUpgradeController.py:1120
+#: ../DistUpgrade/DistUpgradeController.py:1052
+#: ../DistUpgrade/DistUpgradeController.py:1066
+#: ../DistUpgrade/DistUpgradeController.py:1088
 msgid "Could not install the upgrades"
 msgstr "Nebolo možné nainštalovať aktualizácie"
 
 #. invoke the frontend now and show a error message
-#: ../DistUpgrade/DistUpgradeController.py:1088
+#: ../DistUpgrade/DistUpgradeController.py:1086
 msgid ""
 "The upgrade has aborted. Your system could be in an unusable state. A "
 "recovery will run now (dpkg --configure -a)."
@@ -627,22 +610,18 @@
 "Aktualizácia bola prerušená. Váš systém sa môže nachádzať v nepoužiteľnom "
 "stave. Teraz sa spustí pokus o obnovenie (dpkg --configure -a)."
 
-#: ../DistUpgrade/DistUpgradeController.py:1093
+#: ../DistUpgrade/DistUpgradeController.py:1091
 #, python-format
 msgid ""
 "\n"
 "\n"
-"Please report this bug using the command 'ubuntu-bug update-manager' in a "
-"terminal and include the files in /var/log/dist-upgrade/ in the bug report.\n"
+"Please report this bug in a browser at "
+"http://bugs.launchpad.net/ubuntu/+source/update-manager/+filebug and attach "
+"the files in /var/log/dist-upgrade/ to the bug report.\n"
 "%s"
 msgstr ""
-"\n"
-"\n"
-"Prosím, nahláste to ako chybu príkazom „ubuntu-bug update-manager“ v "
-"termináli a priložte do hlásenia súbory z /var/log/dist-upgrade/\n"
-"%s"
 
-#: ../DistUpgrade/DistUpgradeController.py:1130
+#: ../DistUpgrade/DistUpgradeController.py:1128
 msgid ""
 "The upgrade has aborted. Please check your Internet connection or "
 "installation media and try again. "
@@ -650,20 +629,20 @@
 "Aktualizácia bola prerušená. Prosím, skontrolujte svoje pripojenie k "
 "internetu alebo inštalačné médium a skúste to znova. "
 
-#: ../DistUpgrade/DistUpgradeController.py:1210
+#: ../DistUpgrade/DistUpgradeController.py:1178
 msgid "Remove obsolete packages?"
 msgstr "Odstrániť zastarané balíky?"
 
-#: ../DistUpgrade/DistUpgradeController.py:1211
-#: ../DistUpgrade/DistUpgrade.ui.h:8
+#: ../DistUpgrade/DistUpgradeController.py:1179
+#: ../DistUpgrade/DistUpgrade.ui.h:22
 msgid "_Keep"
 msgstr "_Ponechať"
 
-#: ../DistUpgrade/DistUpgradeController.py:1211
+#: ../DistUpgrade/DistUpgradeController.py:1179
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../DistUpgrade/DistUpgradeController.py:1223
+#: ../DistUpgrade/DistUpgradeController.py:1191
 msgid ""
 "A problem occurred during the clean-up. Please see the below message for "
 "more information. "
@@ -673,126 +652,109 @@
 
 #. FIXME: instead of error out, fetch and install it
 #. here
-#: ../DistUpgrade/DistUpgradeController.py:1299
+#: ../DistUpgrade/DistUpgradeController.py:1267
 msgid "Required depends is not installed"
 msgstr "Požadované závislosti nie sú nainštalované"
 
-#: ../DistUpgrade/DistUpgradeController.py:1300
+#: ../DistUpgrade/DistUpgradeController.py:1268
 #, python-format
 msgid "The required dependency '%s' is not installed. "
 msgstr "Požadovaná závislosť '%s' nie je nainštalovaná. "
 
 #. sanity check (check for ubuntu-desktop, brokenCache etc)
 #. then open the cache (again)
-#: ../DistUpgrade/DistUpgradeController.py:1540
-#: ../DistUpgrade/DistUpgradeController.py:1610
+#: ../DistUpgrade/DistUpgradeController.py:1513
+#: ../DistUpgrade/DistUpgradeController.py:1580
 msgid "Checking package manager"
 msgstr "Kontroluje sa správca balíkov"
 
-#: ../DistUpgrade/DistUpgradeController.py:1545
+#: ../DistUpgrade/DistUpgradeController.py:1518
 msgid "Preparing the upgrade failed"
 msgstr "Príprava prechodu na vyššiu verziu zlyhala"
 
-#: ../DistUpgrade/DistUpgradeController.py:1546
+#: ../DistUpgrade/DistUpgradeController.py:1543
 msgid ""
-"Preparing the system for the upgrade failed. Please report this using the "
-"command 'ubuntu-bug update-manager' in a terminal and include the files in "
-"/var/log/dist-upgrade/ in the bug report."
+"Preparing the system for the upgrade failed so a bug reporting process "
+"isbeing started."
 msgstr ""
-"Príprava systému na aktualizáciu zlyhala. Prosím, nahláste to ako chybu "
-"príkazom „ubuntu-bug update-manager“ v termináli a priložte do hlásenia "
-"súbory z /var/log/dist-upgrade/"
 
-#: ../DistUpgrade/DistUpgradeController.py:1562
+#: ../DistUpgrade/DistUpgradeController.py:1535
 msgid "Getting upgrade prerequisites failed"
 msgstr "Zisťovanie predpokladov aktualizácie zlyhalo"
 
-#: ../DistUpgrade/DistUpgradeController.py:1563
+#: ../DistUpgrade/DistUpgradeController.py:1558
 msgid ""
 "The system was unable to get the prerequisites for the upgrade. The upgrade "
 "will abort now and restore the original system state.\n"
 "\n"
-"Please report this as a bug using the command 'ubuntu-bug update-manager' in "
-"a terminal and include the files in /var/log/dist-upgrade/ in the bug report."
+"Additionally, a bug reporting process is being started."
 msgstr ""
-"Systému sa nepodarilo získať predpoklady pre aktualizáciu. Aktualizácia sa "
-"teraz preruší a obnoví sa pôvodný stav systému.\n"
-"\n"
-"Prosím, nahláste to ako chybu príkazom „ubuntu-bug update-manager“ v "
-"termináli a priložte do hlásenia súbory z /var/log/dist-upgrade/"
 
-#: ../DistUpgrade/DistUpgradeController.py:1594
+#: ../DistUpgrade/DistUpgradeController.py:1566
 msgid "Updating repository information"
 msgstr "Aktualizujú sa informácie o zdrojoch softvéru"
 
-#: ../DistUpgrade/DistUpgradeController.py:1601
+#: ../DistUpgrade/DistUpgradeController.py:1593
 msgid "Failed to add the cdrom"
 msgstr "Nepodarilo sa pridať CD-ROM"
 
-#: ../DistUpgrade/DistUpgradeController.py:1602
+#: ../DistUpgrade/DistUpgradeController.py:1594
 msgid "Sorry, adding the cdrom was not successful."
 msgstr "Ľutujeme, pridanie CD-ROM neprebehlo úspešne"
 
-#: ../DistUpgrade/DistUpgradeController.py:1630
+#: ../DistUpgrade/DistUpgradeController.py:1598
 msgid "Invalid package information"
 msgstr "Neplatná informácia o balíku"
 
-#: ../DistUpgrade/DistUpgradeController.py:1631
+#: ../DistUpgrade/DistUpgradeController.py:1623
 #, python-format
 msgid ""
 "After your package information was updated the essential package '%s' can "
-"not be found anymore.\n"
-"This indicates a serious error, please report this bug using the command "
-"'ubuntu-bug update-manager' in a terminal and include the files in "
-"/var/log/dist-upgrade/ in the bug report."
-msgstr ""
-"Potom ako boli aktualizované vaše informácie o balíkoch už nie je možné "
-"nájsť nevyhnutný balík „%s“.\n"
-"Prosím, nahláste to ako chybu príkazom „ubuntu-bug update-manager“ v "
-"termináli a priložte do hlásenia súbory z /var/log/dist-upgrade/"
+"not be found anymore so a bug reporting process is being started."
+msgstr ""
 
-#: ../DistUpgrade/DistUpgradeController.py:1649
-#: ../DistUpgrade/DistUpgradeController.py:1702
+#: ../DistUpgrade/DistUpgradeController.py:1616
+#: ../DistUpgrade/DistUpgradeController.py:1664
 msgid "Fetching"
 msgstr "Sťahuje sa"
 
-#: ../DistUpgrade/DistUpgradeController.py:1655
-#: ../DistUpgrade/DistUpgradeController.py:1706
+#: ../DistUpgrade/DistUpgradeController.py:1622
+#: ../DistUpgrade/DistUpgradeController.py:1668
 msgid "Upgrading"
 msgstr "Prebieha prechod na novšiu verziu"
 
 #. don't abort here, because it would restore the sources.list
-#: ../DistUpgrade/DistUpgradeController.py:1660
-#: ../DistUpgrade/DistUpgradeController.py:1708
-#: ../DistUpgrade/DistUpgradeController.py:1715
-#: ../DistUpgrade/DistUpgradeController.py:1726
+#: ../DistUpgrade/DistUpgradeController.py:1627
+#: ../DistUpgrade/DistUpgradeController.py:1670
+#: ../DistUpgrade/DistUpgradeController.py:1677
+#: ../DistUpgrade/DistUpgradeController.py:1688
 msgid "Upgrade complete"
 msgstr "Aktualizácia dokončená"
 
-#: ../DistUpgrade/DistUpgradeController.py:1661
-#: ../DistUpgrade/DistUpgradeController.py:1709
-#: ../DistUpgrade/DistUpgradeController.py:1716
+#: ../DistUpgrade/DistUpgradeController.py:1651
+#: ../DistUpgrade/DistUpgradeController.py:1699
+#: ../DistUpgrade/DistUpgradeController.py:1706
 msgid ""
 "The upgrade has completed but there were errors during the upgrade process."
 msgstr "Aktualizácia bola dokončená, ale počas nej sa vyskytli chyby."
 
-#: ../DistUpgrade/DistUpgradeController.py:1668
+#: ../DistUpgrade/DistUpgradeController.py:1635
 msgid "Searching for obsolete software"
 msgstr "Vyhľadávanie zastaraného softvéru"
 
-#: ../DistUpgrade/DistUpgradeController.py:1677
+#: ../DistUpgrade/DistUpgradeController.py:1640
 msgid "System upgrade is complete."
 msgstr "Aktualizácia systému je dokončená."
 
-#: ../DistUpgrade/DistUpgradeController.py:1727
+#: ../DistUpgrade/DistUpgradeController.py:1689
 msgid "The partial upgrade was completed."
 msgstr "Čiastočná aktualizácia je dokončená."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:202
+#: ../DistUpgrade/DistUpgradeQuirks.py:168
 msgid "evms in use"
 msgstr "používa sa evms"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:203
+#: ../DistUpgrade/DistUpgradeQuirks.py:169
 msgid ""
 "Your system uses the 'evms' volume manager in /proc/mounts. The 'evms' "
 "software is no longer supported, please switch it off and run the upgrade "
@@ -802,11 +764,11 @@
 "ďalej nie je podporovaný. Vypnite ho prosím a následne znova spustite "
 "aktualizáciu."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:508
+#: ../DistUpgrade/DistUpgradeQuirks.py:496
 msgid "Your graphics hardware may not be fully supported in Ubuntu 11.04."
 msgstr "Ubuntu 11.04 nemusí plne podporovať váš grafický hardvér."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:510
+#: ../DistUpgrade/DistUpgradeQuirks.py:498
 msgid ""
 "The support in Ubuntu 11.04 for your intel graphics hardware is limited and "
 "you may encounter problems after the upgrade. Do you want to continue with "
@@ -815,9 +777,9 @@
 "Podpora vášho grafického hardvéru Intel v Ubuntu 11.04 je obmedzená a po "
 "aktualizácii môžete naraziť na problémy. Chcete pokračovať v aktualizácii?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:530
-#: ../DistUpgrade/DistUpgradeQuirks.py:558
-#: ../DistUpgrade/DistUpgradeQuirks.py:585
+#: ../DistUpgrade/DistUpgradeQuirks.py:444
+#: ../DistUpgrade/DistUpgradeQuirks.py:472
+#: ../DistUpgrade/DistUpgradeQuirks.py:499
 msgid ""
 "Upgrading may reduce desktop effects, and performance in games and other "
 "graphically intensive programs."
@@ -825,8 +787,8 @@
 "Aktualizácia systému môže vypnúť niektoré efekty prostredia a znížiť výkon "
 "hier a iných graficky náročných programov."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:534
-#: ../DistUpgrade/DistUpgradeQuirks.py:562
+#: ../DistUpgrade/DistUpgradeQuirks.py:448
+#: ../DistUpgrade/DistUpgradeQuirks.py:476
 msgid ""
 "This computer is currently using the NVIDIA 'nvidia' graphics driver. No "
 "version of this driver is available that works with your video card in "
@@ -840,7 +802,7 @@
 "\n"
 "Chcete pokračovať?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:589
+#: ../DistUpgrade/DistUpgradeQuirks.py:503
 msgid ""
 "This computer is currently using the AMD 'fglrx' graphics driver. No version "
 "of this driver is available that works with your hardware in Ubuntu 10.04 "
@@ -854,11 +816,11 @@
 "\n"
 "Chcete pokračovať?"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:619
+#: ../DistUpgrade/DistUpgradeQuirks.py:607
 msgid "No i686 CPU"
 msgstr "CPU nie je i686"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:620
+#: ../DistUpgrade/DistUpgradeQuirks.py:608
 msgid ""
 "Your system uses an i586 CPU or a CPU that does not have the 'cmov' "
 "extension. All packages were built with optimizations requiring i686 as the "
@@ -869,11 +831,11 @@
 "vytvorené a optimalizované pre procesory i686 alebo vyššie. Nie je možné "
 "nainštalovať nové vydanie Ubuntu na tento hardvér."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:656
+#: ../DistUpgrade/DistUpgradeQuirks.py:530
 msgid "No ARMv6 CPU"
 msgstr "Neobsahuje procesor ARMv6"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:657
+#: ../DistUpgrade/DistUpgradeQuirks.py:531
 msgid ""
 "Your system uses an ARM CPU that is older than the ARMv6 architecture. All "
 "packages in karmic were built with optimizations requiring ARMv6 as the "
@@ -885,11 +847,11 @@
 "architektúru ARMv6 alebo lepšiu. Na tomto hardvéri nie je možné aktualizovať "
 "váš systém na nové vydanie Ubuntu."
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:677
+#: ../DistUpgrade/DistUpgradeQuirks.py:551
 msgid "No init available"
 msgstr "Nie je dostupný žiaden init"
 
-#: ../DistUpgrade/DistUpgradeQuirks.py:678
+#: ../DistUpgrade/DistUpgradeQuirks.py:552
 msgid ""
 "Your system appears to be a virtualised environment without an init daemon, "
 "e.g. Linux-VServer. Ubuntu 10.04 LTS cannot function within this type of "
@@ -904,15 +866,15 @@
 "\n"
 "Ste si istý, že chcete pokračovať?"
 
-#: ../DistUpgrade/DistUpgradeMain.py:63
+#: ../DistUpgrade/DistUpgradeMain.py:48
 msgid "Sandbox upgrade using aufs"
 msgstr "Aktualizácia v pieskovisku pomocou aufs"
 
-#: ../DistUpgrade/DistUpgradeMain.py:65
+#: ../DistUpgrade/DistUpgradeMain.py:50
 msgid "Use the given path to search for a cdrom with upgradable packages"
 msgstr "Použiť zadanú cestu na hľadanie CD s aktualizačnými balíkami"
 
-#: ../DistUpgrade/DistUpgradeMain.py:71
+#: ../DistUpgrade/DistUpgradeMain.py:56
 msgid ""
 "Use frontend. Currently available: \n"
 "DistUpgradeViewText, DistUpgradeViewGtk, DistUpgradeViewKDE"
@@ -924,7 +886,7 @@
 msgid "*DEPRECATED* this option will be ignored"
 msgstr "*ZAVRHOVANÉ* táto voľba bude ignorovaná"
 
-#: ../DistUpgrade/DistUpgradeMain.py:77
+#: ../DistUpgrade/DistUpgradeMain.py:62
 msgid "Perform a partial upgrade only (no sources.list rewriting)"
 msgstr "Vykonať iba čiastočnú aktualizáciu (bez prepísania sources.list)"
 
@@ -932,45 +894,39 @@
 msgid "Disable GNU screen support"
 msgstr "Vypnúť podporu GNU screen"
 
-#: ../DistUpgrade/DistUpgradeMain.py:82
+#: ../DistUpgrade/DistUpgradeMain.py:64
 msgid "Set datadir"
 msgstr "Nastaviť dátový priečinok"
 
 #. print "mediaChange %s %s" % (medium, drive)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:114
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:117
-#: ../DistUpgrade/DistUpgradeViewKDE.py:189
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:147
+#: ../DistUpgrade/DistUpgradeViewGtk.py:109
+#: ../DistUpgrade/DistUpgradeViewKDE.py:190
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:148
 #, python-format
 msgid "Please insert '%s' into the drive '%s'"
 msgstr "Prosím, vložte „%s“ do mechaniky „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:135
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:138
-#: ../DistUpgrade/DistUpgradeViewKDE.py:203
+#: ../DistUpgrade/DistUpgradeViewGtk.py:130
+#: ../DistUpgrade/DistUpgradeViewKDE.py:204
 msgid "Fetching is complete"
 msgstr "Sťahovanie je dokončené"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:146
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:149
-#: ../DistUpgrade/DistUpgradeViewKDE.py:216
+#: ../DistUpgrade/DistUpgradeViewGtk.py:142
+#: ../DistUpgrade/DistUpgradeViewKDE.py:217
 #, python-format
 msgid "Fetching file %li of %li at %sB/s"
 msgstr "Získava sa súbor %li z %li rýchlosťou %sB/s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:149
-#: ../DistUpgrade/DistUpgradeViewGtk.py:295
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:301
-#: ../DistUpgrade/DistUpgradeViewKDE.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:361
+#: ../DistUpgrade/DistUpgradeViewGtk.py:143
+#: ../DistUpgrade/DistUpgradeViewGtk.py:280
+#: ../DistUpgrade/DistUpgradeViewKDE.py:218
+#: ../DistUpgrade/DistUpgradeViewKDE.py:358
 #, python-format
 msgid "About %s remaining"
 msgstr "Zostáva približne %s"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:152
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:155
-#: ../DistUpgrade/DistUpgradeViewKDE.py:219
+#: ../DistUpgrade/DistUpgradeViewGtk.py:145
+#: ../DistUpgrade/DistUpgradeViewKDE.py:220
 #, python-format
 msgid "Fetching file %li of %li"
 msgstr "Sťahuje sa súbor %li z %li"
@@ -978,29 +934,25 @@
 #. FIXME: add support for the timeout
 #. of the terminal (to display something useful then)
 #. -> longer term, move this code into python-apt
-#: ../DistUpgrade/DistUpgradeViewGtk.py:183
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:186
-#: ../DistUpgrade/DistUpgradeViewKDE.py:253
+#: ../DistUpgrade/DistUpgradeViewGtk.py:177
+#: ../DistUpgrade/DistUpgradeViewKDE.py:254
 msgid "Applying changes"
 msgstr "Aplikujú sa zmeny"
 
 #. we do not report followup errors from earlier failures
-#: ../DistUpgrade/DistUpgradeViewGtk.py:208
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:211
-#: ../DistUpgrade/DistUpgradeViewKDE.py:266
+#: ../DistUpgrade/DistUpgradeViewGtk.py:202
+#: ../DistUpgrade/DistUpgradeViewKDE.py:267
 msgid "dependency problems - leaving unconfigured"
 msgstr "problém so závislosťami - ponecháva sa nenakonfigurované"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:213
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:216
-#: ../DistUpgrade/DistUpgradeViewKDE.py:268
+#: ../DistUpgrade/DistUpgradeViewGtk.py:207
+#: ../DistUpgrade/DistUpgradeViewKDE.py:269
 #, python-format
 msgid "Could not install '%s'"
 msgstr "Nebolo možné nainštalovať „%s“"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:214
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:217
-#: ../DistUpgrade/DistUpgradeViewKDE.py:269
+#: ../DistUpgrade/DistUpgradeViewGtk.py:208
+#: ../DistUpgrade/DistUpgradeViewKDE.py:270
 #, python-format
 msgid ""
 "The upgrade will continue but the '%s' package may not be in a working "
@@ -1010,9 +962,8 @@
 "stave. Zvážte prosím zaslanie hlásenia o chybe."
 
 #. self.expander.set_expanded(True)
-#: ../DistUpgrade/DistUpgradeViewGtk.py:231
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:234
-#: ../DistUpgrade/DistUpgradeViewKDE.py:290
+#: ../DistUpgrade/DistUpgradeViewGtk.py:225
+#: ../DistUpgrade/DistUpgradeViewKDE.py:291
 #, python-format
 msgid ""
 "Replace the customized configuration file\n"
@@ -1021,9 +972,8 @@
 "Nahradiť upravený konfiguračný súbor\n"
 "„%s“?"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:232
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:235
-#: ../DistUpgrade/DistUpgradeViewKDE.py:291
+#: ../DistUpgrade/DistUpgradeViewGtk.py:226
+#: ../DistUpgrade/DistUpgradeViewKDE.py:292
 msgid ""
 "You will lose any changes you have made to this configuration file if you "
 "choose to replace it with a newer version."
@@ -1031,15 +981,13 @@
 "Ak si vyberiete nahradiť novšou verziou, stratíte všetky zmeny, ktoré ste "
 "spravili v tejto konfigurácii."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:250
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:253
-#: ../DistUpgrade/DistUpgradeViewKDE.py:313
+#: ../DistUpgrade/DistUpgradeViewGtk.py:240
+#: ../DistUpgrade/DistUpgradeViewKDE.py:310
 msgid "The 'diff' command was not found"
 msgstr "Príkaz „diff“ nebol nájdený."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:463
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:469
-#: ../DistUpgrade/DistUpgradeViewText.py:90
+#: ../DistUpgrade/DistUpgradeViewGtk.py:445
+#: ../DistUpgrade/DistUpgradeViewText.py:88
 msgid "A fatal error occurred"
 msgstr "Vyskytla sa nenapraviteľná chyba"
 
@@ -1057,13 +1005,11 @@
 "Váš pôvodný súbor sources.list bol uložený ako "
 "/etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:481
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:487
+#: ../DistUpgrade/DistUpgradeViewGtk.py:463
 msgid "Ctrl-c pressed"
 msgstr "Stlačené Ctrl-c"
 
-#: ../DistUpgrade/DistUpgradeViewGtk.py:482
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:488
+#: ../DistUpgrade/DistUpgradeViewGtk.py:464
 msgid ""
 "This will abort the operation and may leave the system in a broken state. "
 "Are you sure you want to do that?"
@@ -1072,8 +1018,7 @@
 "si istý, že to chcete?"
 
 #. append warning
-#: ../DistUpgrade/DistUpgradeViewGtk.py:630
-#: ../DistUpgrade/DistUpgradeViewGtk3.py:621
+#: ../DistUpgrade/DistUpgradeViewGtk.py:611
 msgid "To prevent data loss close all open applications and documents."
 msgstr ""
 "Aby ste zamedzili strate údajov, zatvorte všetky otvorené aplikácie a "
@@ -1116,92 +1061,96 @@
 msgstr "Aktualizovať (%s)"
 
 #. change = QMessageBox.question(None, _("Media Change"), msg, QMessageBox.Ok, QMessageBox.Cancel)
-#: ../DistUpgrade/DistUpgradeViewKDE.py:190
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:149
+#: ../DistUpgrade/DistUpgradeViewKDE.py:191
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:150
 msgid "Media Change"
 msgstr "Výmena nosiča"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:325
+#: ../DistUpgrade/DistUpgradeViewKDE.py:322
 msgid "Show Difference >>>"
 msgstr "Zobraziť rozdiel >>>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:328
+#: ../DistUpgrade/DistUpgradeViewKDE.py:325
 msgid "<<< Hide Difference"
 msgstr "<<< Skryť rozdiel"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:543
+#: ../DistUpgrade/DistUpgradeViewKDE.py:539
 msgid "Error"
 msgstr "Chyba"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:555
+#: ../DistUpgrade/DistUpgradeViewKDE.py:551
 msgid "&Cancel"
 msgstr "&Zrušiť"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:557
-#: ../DistUpgrade/DistUpgradeViewKDE.py:799
+#: ../DistUpgrade/DistUpgradeViewKDE.py:553
+#: ../DistUpgrade/DistUpgradeViewKDE.py:792
 msgid "&Close"
 msgstr "&Zavrieť"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:603
+#: ../DistUpgrade/DistUpgradeViewKDE.py:599
 msgid "Show Terminal >>>"
 msgstr "Zobraziť Terminál >>>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:606
+#: ../DistUpgrade/DistUpgradeViewKDE.py:602
 msgid "<<< Hide Terminal"
 msgstr "<<< Skryť Terminál"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:686
+#: ../DistUpgrade/DistUpgradeViewKDE.py:682
 msgid "Information"
 msgstr "Informácie"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:737
-#: ../DistUpgrade/DistUpgradeViewKDE.py:782
-#: ../DistUpgrade/DistUpgradeViewKDE.py:785 ../DistUpgrade/DistUpgrade.ui.h:7
+#: ../DistUpgrade/DistUpgradeViewKDE.py:732
+#: ../DistUpgrade/DistUpgradeViewKDE.py:775
+#: ../DistUpgrade/DistUpgradeViewKDE.py:778 ../DistUpgrade/DistUpgrade.ui.h:11
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:763
+#: ../DistUpgrade/DistUpgradeViewKDE.py:767
 #, python-format
 msgid "No longer supported %s"
 msgstr "Už nie je podporované %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:765
+#: ../DistUpgrade/DistUpgradeViewGtk.py:627
+#: ../DistUpgrade/DistUpgradeViewKDE.py:758
 #, python-format
 msgid "Remove %s"
 msgstr "Odstrániť %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:767
-#: ../DistUpgrade/DistUpgradeViewText.py:179
+#: ../DistUpgrade/DistUpgradeViewGtk.py:632
+#: ../DistUpgrade/DistUpgradeViewKDE.py:760
+#: ../DistUpgrade/DistUpgradeViewText.py:169
 #, python-format
 msgid "Remove (was auto installed) %s"
 msgstr "Odstrániť (bol nainštalovaný automaticky) %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:769
+#: ../DistUpgrade/DistUpgradeViewGtk.py:635
+#: ../DistUpgrade/DistUpgradeViewKDE.py:762
 #, python-format
 msgid "Install %s"
 msgstr "Inštalovať %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:771
+#: ../DistUpgrade/DistUpgradeViewGtk.py:637
+#: ../DistUpgrade/DistUpgradeViewKDE.py:764
 #, python-format
 msgid "Upgrade %s"
 msgstr "Aktualizovať %s"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:795
-#: ../DistUpgrade/DistUpgradeViewText.py:227
+#: ../DistUpgrade/DistUpgradeViewKDE.py:788
+#: ../DistUpgrade/DistUpgradeViewText.py:217
 msgid "Restart required"
 msgstr "Je potrebný reštart"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:795
+#: ../DistUpgrade/DistUpgradeViewKDE.py:788
 msgid "<b><big>Restart the system to complete the upgrade</big></b>"
 msgstr "<b><big>Pre dokončenie aktualizácie reštartujte počítač</big></b>"
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:798 ../DistUpgrade/DistUpgrade.ui.h:14
-#: ../data/gtkbuilder/UpdateManager.ui.h:26
+#: ../DistUpgrade/DistUpgradeViewKDE.py:791 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../data/glade/UpdateManager.ui.h:31
 msgid "_Restart Now"
 msgstr "_Reštartovať teraz"
 
 #. FIXME make this user friendly
-#: ../DistUpgrade/DistUpgradeViewKDE.py:816
+#: ../DistUpgrade/DistUpgradeViewKDE.py:809
 msgid ""
 "<b><big>Cancel the running upgrade?</big></b>\n"
 "\n"
@@ -1213,11 +1162,11 @@
 "Ak zrušíte prebiehajúcu aktualizáciu, môže to ponechať systém v "
 "nepoužiteľnom stave. Dôrazne sa odporúča pokračovať v aktualizácii systému."
 
-#: ../DistUpgrade/DistUpgradeViewKDE.py:820
+#: ../DistUpgrade/DistUpgradeViewKDE.py:813
 msgid "Cancel Upgrade?"
 msgstr "Zrušiť prechod na novšiu verziu?"
 
-#: ../DistUpgrade/DistUpgradeView.py:59
+#: ../DistUpgrade/DistUpgradeView.py:60
 #, python-format
 msgid "%li day"
 msgid_plural "%li days"
@@ -1225,7 +1174,7 @@
 msgstr[1] "deň"
 msgstr[2] "%li dni"
 
-#: ../DistUpgrade/DistUpgradeView.py:61
+#: ../DistUpgrade/DistUpgradeView.py:62
 #, python-format
 msgid "%li hour"
 msgid_plural "%li hours"
@@ -1233,7 +1182,7 @@
 msgstr[1] "hodina"
 msgstr[2] "%li hodiny"
 
-#: ../DistUpgrade/DistUpgradeView.py:63
+#: ../DistUpgrade/DistUpgradeView.py:64
 #, python-format
 msgid "%li minute"
 msgid_plural "%li minutes"
@@ -1241,7 +1190,7 @@
 msgstr[1] "minúta"
 msgstr[2] "%li minúty"
 
-#: ../DistUpgrade/DistUpgradeView.py:64
+#: ../DistUpgrade/DistUpgradeView.py:65
 #, python-format
 msgid "%li second"
 msgid_plural "%li seconds"
@@ -1258,7 +1207,7 @@
 #. plural form
 #. 
 #. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:80
+#: ../DistUpgrade/DistUpgradeView.py:78
 #, python-format
 msgid "%(str_days)s %(str_hours)s"
 msgstr "%(str_days)s, %(str_hours)s"
@@ -1272,14 +1221,14 @@
 #. plural form
 #. 
 #. Note: most western languages will not need to change this
-#: ../DistUpgrade/DistUpgradeView.py:98
+#: ../DistUpgrade/DistUpgradeView.py:93
 #, python-format
 msgid "%(str_hours)s %(str_minutes)s"
 msgstr "%(str_hours)s %(str_minutes)s"
 
 #. 56 kbit
 #. 1Mbit = 1024 kbit
-#: ../DistUpgrade/DistUpgradeView.py:147
+#: ../DistUpgrade/DistUpgradeView.py:128
 #, python-format
 msgid ""
 "This download will take about %s with a 1Mbit DSL connection and about %s "
@@ -1288,32 +1237,32 @@
 "Sťahovanie potrvá asi %s na 1Mbit DSL pripojení a asi %s na 56k modeme."
 
 #. if we have a estimated speed, use it
-#: ../DistUpgrade/DistUpgradeView.py:151
+#: ../DistUpgrade/DistUpgradeView.py:132
 #, python-format
 msgid "This download will take about %s with your connection. "
 msgstr "Sťahovanie s vaším pripojením bude trvať asi %s. "
 
-#: ../DistUpgrade/DistUpgradeView.py:253 ../DistUpgrade/DistUpgrade.ui.h:21
+#: ../DistUpgrade/DistUpgradeView.py:234 ../DistUpgrade/DistUpgrade.ui.h:16
 msgid "Preparing to upgrade"
 msgstr "Prebieha príprava aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeView.py:254
+#: ../DistUpgrade/DistUpgradeView.py:235
 msgid "Getting new software channels"
 msgstr "Získavajú sa softvérové kanály"
 
-#: ../DistUpgrade/DistUpgradeView.py:255 ../DistUpgrade/DistUpgrade.ui.h:23
+#: ../DistUpgrade/DistUpgradeView.py:236 ../DistUpgrade/DistUpgrade.ui.h:14
 msgid "Getting new packages"
 msgstr "Prijímajú sa nové balíky"
 
-#: ../DistUpgrade/DistUpgradeView.py:256 ../DistUpgrade/DistUpgrade.ui.h:26
+#: ../DistUpgrade/DistUpgradeView.py:237 ../DistUpgrade/DistUpgrade.ui.h:15
 msgid "Installing the upgrades"
 msgstr "Inštalujú sa aktualizácie"
 
-#: ../DistUpgrade/DistUpgradeView.py:257 ../DistUpgrade/DistUpgrade.ui.h:25
+#: ../DistUpgrade/DistUpgradeView.py:238 ../DistUpgrade/DistUpgrade.ui.h:10
 msgid "Cleaning up"
 msgstr "Prebieha čistenie"
 
-#: ../DistUpgrade/DistUpgradeView.py:342
+#: ../DistUpgrade/DistUpgradeView.py:344
 #, python-format
 msgid ""
 "%(amount)d installed package is no longer supported by Canonical. You can "
@@ -1333,7 +1282,7 @@
 
 #. FIXME: make those two separate lines to make it clear
 #. that the "%" applies to the result of ngettext
-#: ../DistUpgrade/DistUpgradeView.py:351
+#: ../DistUpgrade/DistUpgradeView.py:322
 #, python-format
 msgid "%d package is going to be removed."
 msgid_plural "%d packages are going to be removed."
@@ -1341,7 +1290,7 @@
 msgstr[1] "Bude odstránený %d balík."
 msgstr[2] "Budú odstránené %d balíky."
 
-#: ../DistUpgrade/DistUpgradeView.py:356
+#: ../DistUpgrade/DistUpgradeView.py:327
 #, python-format
 msgid "%d new package is going to be installed."
 msgid_plural "%d new packages are going to be installed."
@@ -1349,7 +1298,7 @@
 msgstr[1] "Bude nainštalovaný %d nový balík."
 msgstr[2] "Budú nainštalované %d nové balíky."
 
-#: ../DistUpgrade/DistUpgradeView.py:362
+#: ../DistUpgrade/DistUpgradeView.py:333
 #, python-format
 msgid "%d package is going to be upgraded."
 msgid_plural "%d packages are going to be upgraded."
@@ -1357,7 +1306,7 @@
 msgstr[1] "Bude aktualizovaný %d balík."
 msgstr[2] "Budú aktualizované %d balíky."
 
-#: ../DistUpgrade/DistUpgradeView.py:367
+#: ../DistUpgrade/DistUpgradeView.py:338
 #, python-format
 msgid ""
 "\n"
@@ -1368,20 +1317,28 @@
 "\n"
 "Musíte stiahnuť celkom %s. "
 
-#: ../DistUpgrade/DistUpgradeView.py:371
+#: ../DistUpgrade/DistUpgradeView.py:374
+msgid ""
+"Installing the upgrade can take several hours. Once the download has "
+"finished, the process cannot be canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:378
 msgid ""
 "Fetching and installing the upgrade can take several hours. Once the "
-"download has finished, the process cannot be cancelled."
+"download has finished, the process cannot be canceled."
+msgstr ""
+
+#: ../DistUpgrade/DistUpgradeView.py:383
+msgid "Removing the packages can take several hours. "
 msgstr ""
-"Sťahovanie a inštalácia aktualizácie môže trvať niekoľko hodín a nemôže byť "
-"neskôr prerušená."
 
 #. FIXME: this should go into DistUpgradeController
-#: ../DistUpgrade/DistUpgradeView.py:377 ../UpdateManager/UpdateManager.py:676
+#: ../DistUpgrade/DistUpgradeView.py:388 ../UpdateManager/UpdateManager.py:675
 msgid "The software on this computer is up to date."
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeView.py:378
+#: ../DistUpgrade/DistUpgradeView.py:349
 msgid ""
 "There are no upgrades available for your system. The upgrade will now be "
 "canceled."
@@ -1389,11 +1346,11 @@
 "Pre váš systém nie sú dostupné žiadne aktualizácie. Proces aktualizácie bude "
 "zrušený."
 
-#: ../DistUpgrade/DistUpgradeView.py:391
+#: ../DistUpgrade/DistUpgradeView.py:362
 msgid "Reboot required"
 msgstr "Je potrebný reštart"
 
-#: ../DistUpgrade/DistUpgradeView.py:392
+#: ../DistUpgrade/DistUpgradeView.py:363
 msgid ""
 "The upgrade is finished and a reboot is required. Do you want to do this now?"
 msgstr ""
@@ -1412,10 +1369,10 @@
 msgid "extracting '%s'"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:130
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:131
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:130
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:131
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:132
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:133
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:132
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:133
 msgid "Could not run the upgrade tool"
 msgstr "Nebolo možné spustiť aktualizačný program"
 
@@ -1428,34 +1385,34 @@
 "Toto je pravdepodobne chyba v nástroji na aktualizáciu. Prosím, nahláste to "
 "ako chybu príkazom „ubuntu-bug update-manager“."
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:206
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:206
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:202
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:202
 msgid "Upgrade tool signature"
 msgstr "Podpis aktualizačného programu"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:213
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:213
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:205
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:205
 msgid "Upgrade tool"
 msgstr "Aktualizačný nástroj"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:247
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:247
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:234
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:234
 msgid "Failed to fetch"
 msgstr "Zlyhalo získavanie"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:248
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:248
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:235
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:235
 msgid "Fetching the upgrade failed. There may be a network problem. "
 msgstr ""
 "Zlyhalo získavanie aktualizácie. Môže to byť spôsobené sieťovým problémom. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:239
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:239
 msgid "Authentication failed"
 msgstr "Autentifikácia neúspešná"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:253
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:253
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:240
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:240
 msgid ""
 "Authenticating the upgrade failed. There may be a problem with the network "
 "or with the server. "
@@ -1463,13 +1420,13 @@
 "Zlyhalo overenie pravost aktualizácie. Môže to byť spôsobené sieťovým "
 "problémom alebo nedostupnosťou servera. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:258
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:258
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:245
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:245
 msgid "Failed to extract"
 msgstr "Chyba pri rozbaľovaní"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:259
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:259
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:246
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:246
 msgid ""
 "Extracting the upgrade failed. There may be a problem with the network or "
 "with the server. "
@@ -1477,13 +1434,13 @@
 "Nebolo možné rozbaliť aktualizáciu. Môže to byť spôsobené sieťovým problémom "
 "alebo nedostupnosťou servera. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:264
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:264
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:251
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:251
 msgid "Verification failed"
 msgstr "Overenie zlyhalo"
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:265
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:265
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:252
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:252
 msgid ""
 "Verifying the upgrade failed.  There may be a problem with the network or "
 "with the server. "
@@ -1491,10 +1448,10 @@
 "Zlyhalo overenie aktualizácie. Mohol to spôsobiť problém siete alebo "
 "servera. "
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:279
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:285
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:279
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:285
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:266
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:272
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:266
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:272
 msgid "Can not run the upgrade"
 msgstr "Nie je možné spustiť aktualizáciu systému"
 
@@ -1507,8 +1464,8 @@
 "To zvyčajne spôsobuje systém, kde je /tmp pripojený s príznakom noexec. "
 "Prosím, znova ho pripojte bez príznaku noexec a znova spustite aktualizáciu."
 
-#: ../DistUpgrade/DistUpgradeFetcherCore.py:286
-#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:286
+#: ../DistUpgrade/DistUpgradeFetcherCore.py:273
+#: ../UpdateManager/Core/DistUpgradeFetcherCore.py:273
 #, python-format
 msgid "The error message is '%s'."
 msgstr "Chybová správa je '%s'."
@@ -1526,11 +1483,11 @@
 "Váš pôvodný súbor sources.list bol uložený ako "
 "/etc/apt/sources.list.distUpgrade."
 
-#: ../DistUpgrade/DistUpgradeViewText.py:115
+#: ../DistUpgrade/DistUpgradeViewText.py:113
 msgid "Aborting"
 msgstr "Ruší sa"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:120
+#: ../DistUpgrade/DistUpgradeViewText.py:118
 msgid "Demoted:\n"
 msgstr "Znížená verzia:\n"
 
@@ -1538,33 +1495,33 @@
 msgid "To continue please press [ENTER]"
 msgstr "Prosím, pokračujte stlačením [ENTER]"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:155
-#: ../DistUpgrade/DistUpgradeViewText.py:193
-#: ../DistUpgrade/DistUpgradeViewText.py:200
+#: ../DistUpgrade/DistUpgradeViewText.py:150
+#: ../DistUpgrade/DistUpgradeViewText.py:183
+#: ../DistUpgrade/DistUpgradeViewText.py:190
 msgid "Continue [yN] "
 msgstr "Pokračovať [aN] "
 
-#: ../DistUpgrade/DistUpgradeViewText.py:155
-#: ../DistUpgrade/DistUpgradeViewText.py:193
+#: ../DistUpgrade/DistUpgradeViewText.py:150
+#: ../DistUpgrade/DistUpgradeViewText.py:183
 msgid "Details [d]"
 msgstr "Podrobnosti [p]"
 
 #. TRANSLATORS: the "y" is "yes"
 #. TRANSLATORS: first letter of a positive (yes) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:159
-#: ../DistUpgrade/DistUpgradeViewText.py:203
+#: ../DistUpgrade/DistUpgradeViewText.py:154
+#: ../DistUpgrade/DistUpgradeViewText.py:193
 msgid "y"
 msgstr "a"
 
 #. TRANSLATORS: the "n" is "no"
 #. TRANSLATORS: first letter of a negative (no) answer
-#: ../DistUpgrade/DistUpgradeViewText.py:162
-#: ../DistUpgrade/DistUpgradeViewText.py:210
+#: ../DistUpgrade/DistUpgradeViewText.py:157
+#: ../DistUpgrade/DistUpgradeViewText.py:200
 msgid "n"
 msgstr "n"
 
 #. TRANSLATORS: the "d" is "details"
-#: ../DistUpgrade/DistUpgradeViewText.py:165
+#: ../DistUpgrade/DistUpgradeViewText.py:160
 msgid "d"
 msgstr "p"
 
@@ -1573,26 +1530,26 @@
 msgid "No longer supported: %s\n"
 msgstr "Už nie je podporované: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:175
+#: ../DistUpgrade/DistUpgradeViewText.py:165
 #, python-format
 msgid "Remove: %s\n"
 msgstr "Odstrániť: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:185
+#: ../DistUpgrade/DistUpgradeViewText.py:175
 #, python-format
 msgid "Install: %s\n"
 msgstr "Inštalovať: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:190
+#: ../DistUpgrade/DistUpgradeViewText.py:180
 #, python-format
 msgid "Upgrade: %s\n"
 msgstr "Aktualizovať: %s\n"
 
-#: ../DistUpgrade/DistUpgradeViewText.py:207
+#: ../DistUpgrade/DistUpgradeViewText.py:197
 msgid "Continue [Yn] "
 msgstr "Pokračovať [An] "
 
-#: ../DistUpgrade/DistUpgradeViewText.py:228
+#: ../DistUpgrade/DistUpgradeViewText.py:218
 msgid ""
 "To finish the upgrade, a restart is required.\n"
 "If you select 'y' the system will be restarted."
@@ -1600,15 +1557,15 @@
 "Pre dokončenie aktualizácie je vyžadovaný reštart.\n"
 "Ak zvolíte 'y' systém sa reštartuje."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:1
+#: ../DistUpgrade/DistUpgrade.ui.h:20
 msgid "_Cancel Upgrade"
 msgstr "_Zrušiť aktualizáciu"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:2
+#: ../DistUpgrade/DistUpgrade.ui.h:26
 msgid "_Resume Upgrade"
 msgstr "_Pokračovať v aktualizácii"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:3
+#: ../DistUpgrade/DistUpgrade.ui.h:2
 msgid ""
 "<b><big>Cancel the running upgrade?</big></b>\n"
 "\n"
@@ -1620,31 +1577,31 @@
 "Ak prerušíte aktualizáciu, systém môže zostať v nestabilnom stave. Dôrazne "
 "sa odporúča pokračovať v aktualizácii."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:6
+#: ../DistUpgrade/DistUpgrade.ui.h:27
 msgid "_Start Upgrade"
 msgstr "_Začať aktualizáciu"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:9
+#: ../DistUpgrade/DistUpgrade.ui.h:23
 msgid "_Replace"
 msgstr "_Nahradiť"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:10
+#: ../DistUpgrade/DistUpgrade.ui.h:12
 msgid "Difference between the files"
 msgstr "Rozdiel medzi súbormi"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:11
+#: ../DistUpgrade/DistUpgrade.ui.h:24
 msgid "_Report Bug"
 msgstr "_Oznámiť chybu"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:12
+#: ../DistUpgrade/DistUpgrade.ui.h:21
 msgid "_Continue"
 msgstr "_Pokračovať"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:13
+#: ../DistUpgrade/DistUpgrade.ui.h:8
 msgid "<b><big>Start the upgrade?</big></b>"
 msgstr "<b><big>Spustiť aktualizáciu?</big></b>"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:15
+#: ../DistUpgrade/DistUpgrade.ui.h:5
 msgid ""
 "<b><big>Restart the system to complete the upgrade</big></b>\n"
 "\n"
@@ -1654,7 +1611,7 @@
 "\n"
 "Prosím, uložte rozrobenú prácu predtým, než budete pokračovať."
 
-#: ../DistUpgrade/DistUpgrade.ui.h:18
+#: ../DistUpgrade/DistUpgrade.ui.h:13
 msgid "Distribution Upgrade"
 msgstr "Prechod na vyššiu verziu distribúcie"
 
@@ -1662,100 +1619,100 @@
 msgid "<b><big>Upgrading Ubuntu to version 12.04</big></b>"
 msgstr ""
 
-#: ../DistUpgrade/DistUpgrade.ui.h:20
+#: ../DistUpgrade/DistUpgrade.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../DistUpgrade/DistUpgrade.ui.h:22
+#: ../DistUpgrade/DistUpgrade.ui.h:18
 msgid "Setting new software channels"
 msgstr "Nastavujú sa softvérové kanály"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:24
+#: ../DistUpgrade/DistUpgrade.ui.h:17
 msgid "Restarting the computer"
 msgstr "Reštartovanie systému"
 
-#: ../DistUpgrade/DistUpgrade.ui.h:27
+#: ../DistUpgrade/DistUpgrade.ui.h:19
 msgid "Terminal"
 msgstr "Terminál"
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:60
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:42
 msgid "Please wait, this can take some time."
 msgstr "Čakajte prosím, toto môže chvíľu trvať."
 
-#: ../UpdateManager/backend/InstallBackendSynaptic.py:62
+#: ../UpdateManager/backend/InstallBackendSynaptic.py:44
 msgid "Update is complete"
 msgstr "Aktualizácia je dokončená"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:108
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:102
+#: ../UpdateManager/DistUpgradeFetcher.py:85
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
 msgid "Could not find the release notes"
 msgstr "Nebolo možné nájsť poznámky k vydaniu"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:109
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:103
+#: ../UpdateManager/DistUpgradeFetcher.py:86
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:104
 msgid "The server may be overloaded. "
 msgstr "Server môže byť preťažený. "
 
-#: ../UpdateManager/DistUpgradeFetcher.py:119
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:107
+#: ../UpdateManager/DistUpgradeFetcher.py:96
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
 msgid "Could not download the release notes"
 msgstr "Nebolo možné stiahnuť poznámky k vydaniu"
 
-#: ../UpdateManager/DistUpgradeFetcher.py:120
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:108
+#: ../UpdateManager/DistUpgradeFetcher.py:97
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:109
 msgid "Please check your internet connection."
 msgstr "Skontrolujte si internetové pripojenie."
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:61
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:84
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:62
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:85
 msgid "Upgrade"
 msgstr "Aktualizovať"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:88
-#: ../data/gtkbuilder/UpdateManager.ui.h:20
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:2
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:89
+#: ../data/glade/UpdateManager.ui.h:12
+#: ../data/glade/UpgradePromptDialog.ui.h:4
 msgid "Release Notes"
 msgstr "Poznámky k vydaniu"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:127
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:140
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:142
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:128
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
 msgid "Downloading additional package files..."
 msgstr "Sťahujú sa ďalšie balíky..."
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:140
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:141
 #, python-format
 msgid "File %s of %s at %sB/s"
 msgstr "Súbor %s z %s, %sB/s"
 
-#: ../UpdateManager/DistUpgradeFetcherKDE.py:142
+#: ../UpdateManager/DistUpgradeFetcherKDE.py:143
 #, python-format
 msgid "File %s of %s"
 msgstr "Súbor %s z %s"
 
-#: ../UpdateManager/ChangelogViewer.py:73
+#: ../UpdateManager/ChangelogViewer.py:70
 msgid "Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: ../UpdateManager/ChangelogViewer.py:76
+#: ../UpdateManager/ChangelogViewer.py:72
 msgid "Copy Link to Clipboard"
 msgstr "Skopírovať odkaz do schránky"
 
-#: ../UpdateManager/GtkProgress.py:159
+#: ../UpdateManager/GtkProgress.py:116
 #, python-format
 msgid "Downloading file %(current)li of %(total)li with %(speed)s/s"
 msgstr "Sťahuje sa súbor %(current)li z %(total)li s %(speed)s/s"
 
-#: ../UpdateManager/GtkProgress.py:164
+#: ../UpdateManager/GtkProgress.py:121
 #, python-format
 msgid "Downloading file %(current)li of %(total)li"
 msgstr "Sťahuje sa súbor %(current)li z %(total)li"
 
-#: ../UpdateManager/UpdateManager.py:105 ../do-release-upgrade:96
+#: ../UpdateManager/UpdateManager.py:104 ../do-release-upgrade:95
 msgid "Your Ubuntu release is not supported anymore."
 msgstr "Vaše vydanie Ubuntu už nie je podporované."
 
-#: ../UpdateManager/UpdateManager.py:106
+#: ../UpdateManager/UpdateManager.py:105
 msgid ""
 "You will not get any further security fixes or critical updates. Please "
 "upgrade to a later version of Ubuntu Linux."
@@ -1763,36 +1720,35 @@
 "Nedostanete žiadne ďalšie bezpečnostné aktualizácie ani dôležité "
 "aktualizácie. Prosím, aktualizujte na novšiu verziu Ubuntu Linux."
 
-#: ../UpdateManager/UpdateManager.py:114
+#: ../UpdateManager/UpdateManager.py:827
 msgid "Upgrade information"
 msgstr "Informácie o prechode na novšiu verziu"
 
-#. upload_archive = version_match.group(2).strip()
-#: ../UpdateManager/UpdateManager.py:389
+#: ../UpdateManager/UpdateManager.py:308
 #, python-format
 msgid "Version %s: \n"
 msgstr "Verzia %s: \n"
 
-#: ../UpdateManager/UpdateManager.py:446
+#: ../UpdateManager/UpdateManager.py:445
 msgid ""
 "No network connection detected, you can not download changelog information."
 msgstr ""
 "Nebolo nájdené žiadne pripojenie k sieti, preto nie je možné stiahnuť záznam "
 "zmien."
 
-#: ../UpdateManager/UpdateManager.py:454
+#: ../UpdateManager/UpdateManager.py:365
 msgid "Downloading list of changes..."
 msgstr "Sťahuje sa zoznam zmien..."
 
-#: ../UpdateManager/UpdateManager.py:498
+#: ../UpdateManager/UpdateManager.py:497
 msgid "_Deselect All"
 msgstr "_Zrušiť výber všetkých"
 
-#: ../UpdateManager/UpdateManager.py:504
+#: ../UpdateManager/UpdateManager.py:503
 msgid "Select _All"
 msgstr "Vybrať _všetky"
 
-#: ../UpdateManager/UpdateManager.py:564
+#: ../UpdateManager/UpdateManager.py:563
 #, python-format
 msgid "%(count)s update has been selected."
 msgid_plural "%(count)s updates have been selected."
@@ -1800,34 +1756,33 @@
 msgstr[1] "Bola vybraná %(count)s aktualizácia."
 msgstr[2] "Boli vybrané %(count)s aktualizácie."
 
-#: ../UpdateManager/UpdateManager.py:568
+#: ../UpdateManager/UpdateManager.py:567
 #, python-format
 msgid "%s will be downloaded."
 msgstr "%s sa stiahne."
 
-#: ../UpdateManager/UpdateManager.py:580
-msgid "The update has already been downloaded, but not installed"
-msgid_plural "The updates have already been downloaded, but not installed"
-msgstr[0] "Aktualizácie boli stiahnuté, ale nie nainštalované."
-msgstr[1] "Aktualizácia bola stiahnutá, ale nie nainštalovaná."
-msgstr[2] "Aktualizácie boli stiahnuté, ale nie nainštalované."
-
-#: ../UpdateManager/UpdateManager.py:585
-msgid "There are no updates to install"
-msgstr "Žiadne aktualizácie nečakajú na inštaláciu"
+#: ../UpdateManager/UpdateManager.py:579
+msgid "The update has already been downloaded, but not installed."
+msgid_plural "The updates have already been downloaded, but not installed."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../UpdateManager/UpdateManager.py:584
+msgid "There are no updates to install."
+msgstr ""
 
 #. TRANSLATORS: this allows to switch the order of the count of
 #. updates and the download size string (if needed)
-#: ../UpdateManager/UpdateManager.py:591
+#: ../UpdateManager/UpdateManager.py:590
 #, python-format
 msgid "%(count_str)s %(download_str)s"
 msgstr "%(count_str)s %(download_str)s"
 
-#: ../UpdateManager/UpdateManager.py:598
+#: ../UpdateManager/UpdateManager.py:597
 msgid "Unknown download size."
 msgstr "Neznáma veľkosť na stiahnutie."
 
-#: ../UpdateManager/UpdateManager.py:624
+#: ../UpdateManager/UpdateManager.py:623
 msgid ""
 "It is unknown when the package information was updated last. Please click "
 "the 'Check' button to update the information."
@@ -1835,7 +1790,7 @@
 "Nie je známe, kedy boli informácie balíka naposledy aktualizované. Prosím, "
 "aktualizujte informácie kliknutím  na tlačidlo „Skontrolovať“."
 
-#: ../UpdateManager/UpdateManager.py:630
+#: ../UpdateManager/UpdateManager.py:629
 #, python-format
 msgid ""
 "The package information was last updated %(days_ago)s days ago.\n"
@@ -1845,7 +1800,7 @@
 "Nové aktualizácie môžete skontrolovať teraz stlačením tlačidla "
 "„Skontrolovať“."
 
-#: ../UpdateManager/UpdateManager.py:635
+#: ../UpdateManager/UpdateManager.py:634
 #, python-format
 msgid "The package information was last updated %(days_ago)s day ago."
 msgid_plural ""
@@ -1857,7 +1812,7 @@
 msgstr[2] ""
 "Informácie o balíkoch boli naposledy aktualizované pred %(days_ago)s dňami."
 
-#: ../UpdateManager/UpdateManager.py:639
+#: ../UpdateManager/UpdateManager.py:638
 #, python-format
 msgid "The package information was last updated %(hours_ago)s hour ago."
 msgid_plural ""
@@ -1873,18 +1828,17 @@
 "hodinami."
 
 #. TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-#: ../UpdateManager/UpdateManager.py:644 ../UpdateManager/UpdateManager.py:646
-#: ../UpdateManager/UpdateManager.py:648
+#: ../UpdateManager/UpdateManager.py:643 ../UpdateManager/UpdateManager.py:645
+#: ../UpdateManager/UpdateManager.py:647
 #, python-format
 msgid "The package information was last updated about %s minutes ago."
 msgstr "Informácie balíka naposledy aktualizované pred %s minútami."
 
-#: ../UpdateManager/UpdateManager.py:650
+#: ../UpdateManager/UpdateManager.py:649
 msgid "The package information was just updated."
 msgstr "Informácie balíka boli práve aktualizované."
 
-#: ../UpdateManager/UpdateManager.py:670
-#: ../data/gtkbuilder/UpdateManager.ui.h:2
+#: ../UpdateManager/UpdateManager.py:505 ../data/glade/UpdateManager.ui.h:23
 msgid ""
 "Software updates correct errors, eliminate security vulnerabilities and "
 "provide new features."
@@ -1892,15 +1846,15 @@
 "Softvérové aktualizácie opravujú chyby, odstraňujú bezpečnostné "
 "zraniteľnosti alebo poskytujú nové vlastnosti."
 
-#: ../UpdateManager/UpdateManager.py:689
+#: ../UpdateManager/UpdateManager.py:688
 msgid "Software updates may be available for your computer."
 msgstr "Pre váš počítač môžu byť dostupné aktualizácie softvéru."
 
-#: ../UpdateManager/UpdateManager.py:697
+#: ../UpdateManager/UpdateManager.py:524
 msgid "Welcome to Ubuntu"
 msgstr "Vitajte v Ubuntu"
 
-#: ../UpdateManager/UpdateManager.py:699
+#: ../UpdateManager/UpdateManager.py:698
 msgid ""
 "These software updates have been issued since this version of Ubuntu was "
 "released. If you don't want to install them now, choose \"Update Manager\" "
@@ -1910,7 +1864,7 @@
 "ich nechcete nainštalovať teraz, zvoľte neskôr „Správca aktualizácií“ z "
 "Aplikácií."
 
-#: ../UpdateManager/UpdateManager.py:701
+#: ../UpdateManager/UpdateManager.py:700
 msgid ""
 "These software updates have been issued since this version of Ubuntu was "
 "released. If you don't want to install them now, choose \"Update Manager\" "
@@ -1920,11 +1874,11 @@
 "ich nechcete nainštalovať teraz, zvoľte neskôr „Správca aktualizácií“ z menu "
 "Správa."
 
-#: ../UpdateManager/UpdateManager.py:704
+#: ../UpdateManager/UpdateManager.py:528
 msgid "Software updates are available for this computer"
 msgstr "Pre tento počítač sú dostupné aktualizácie"
 
-#: ../UpdateManager/UpdateManager.py:706
+#: ../UpdateManager/UpdateManager.py:705
 msgid ""
 "If you don't want to install them now, choose \"Update Manager\" from "
 "Applications later."
@@ -1932,7 +1886,7 @@
 "Ak ich nechcete inštalovať teraz, zvoľte „Správca aktualizácií“ neskôr z "
 "menu Aplikácie."
 
-#: ../UpdateManager/UpdateManager.py:708
+#: ../UpdateManager/UpdateManager.py:529
 msgid ""
 "If you don't want to install them now, choose \"Update Manager\" from the "
 "Administration menu later."
@@ -1940,7 +1894,7 @@
 "Ak si neželáte ich inštalovať teraz, zvoľte neskôr „Správca aktualizácií“ z "
 "ponuky Správa."
 
-#: ../UpdateManager/UpdateManager.py:760
+#: ../UpdateManager/UpdateManager.py:578
 #, python-format
 msgid ""
 "The upgrade needs a total of %s free space on disk '%s'. Please free at "
@@ -1951,7 +1905,7 @@
 "aspoň ďalších %s miesta na disku „%s“. Vyprázdnite odpadkový kôš a odstráňte "
 "dočasné balíky z predošlých aktualizácií príkazom „sudo apt-get clean“."
 
-#: ../UpdateManager/UpdateManager.py:785
+#: ../data/glade/UpdateManager.ui.h:24
 msgid ""
 "The computer needs to restart to finish installing updates. Please save your "
 "work before continuing."
@@ -1959,25 +1913,26 @@
 "Je potrebné reštartovať počítač aby sa dokončila inštalácia aktualizácií. "
 "Prosím, uložte svoju prácu než budete pokračovať."
 
-#: ../UpdateManager/UpdateManager.py:849
+#: ../UpdateManager/UpdateManager.py:637
+#: ../UpdateManagerHildon/UpdateManagerHildon.py:114
 msgid "Reading package information"
 msgstr "Načítavajú sa informácie o balíku"
 
-#: ../UpdateManager/UpdateManager.py:864
+#: ../UpdateManager/UpdateManager.py:863
 msgid "Connecting..."
 msgstr "Pripája sa..."
 
-#: ../UpdateManager/UpdateManager.py:881
+#: ../UpdateManager/UpdateManager.py:880
 msgid "You may not be able to check for updates or download new updates."
 msgstr ""
 "Je možné, že nebudete môcť kontrolovať aktualizácie alebo sťahovať nové "
 "aktualizácie."
 
-#: ../UpdateManager/UpdateManager.py:1005
+#: ../UpdateManager/UpdateManager.py:750
 msgid "Could not initialize the package information"
 msgstr "Nebolo možné inicializovať informácie o balíku"
 
-#: ../UpdateManager/UpdateManager.py:1006
+#: ../UpdateManager/UpdateManager.py:751
 msgid ""
 "An unresolvable problem occurred while initializing the package "
 "information.\n"
@@ -1990,7 +1945,7 @@
 "Prosím, nahláste to ako problém voči balíku „update-manager“ a priložte "
 "nasledovnú chybovú správu:\n"
 
-#: ../UpdateManager/UpdateManager.py:1035
+#: ../UpdateManager/UpdateManager.py:773
 msgid ""
 "An unresolvable problem occurred while calculating the upgrade.\n"
 "\n"
@@ -2002,31 +1957,31 @@
 "Prosím, nahláste to ako problém voči balíku „update-manager“ a priložte "
 "nasledovnú chybovú správu:"
 
-#: ../UpdateManager/UpdateManager.py:1060
+#: ../UpdateManager/UpdateManager.py:796
 msgid " (New install)"
 msgstr " (Nová inštalácia)"
 
 #. TRANSLATORS: the b stands for Bytes
-#: ../UpdateManager/UpdateManager.py:1067
+#: ../UpdateManager/UpdateManager.py:800
 #, python-format
 msgid "(Size: %s)"
 msgstr "(Veľkosť: %s)"
 
-#: ../UpdateManager/UpdateManager.py:1069
+#: ../UpdateManager/UpdateManager.py:802
 #, python-format
 msgid "From version %(old_version)s to %(new_version)s"
 msgstr "Z verzie %(old_version)s na verziu %(new_version)s"
 
-#: ../UpdateManager/UpdateManager.py:1073
+#: ../UpdateManager/UpdateManager.py:806
 #, python-format
 msgid "Version %s"
 msgstr "Verzia %s"
 
-#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108
+#: ../UpdateManager/UpdateManager.py:1103 ../do-release-upgrade:107
 msgid "Release upgrade not possible right now"
 msgstr "Aktualizácia vydania nie je práve teraz možná"
 
-#: ../UpdateManager/UpdateManager.py:1105 ../do-release-upgrade:109
+#: ../UpdateManager/UpdateManager.py:1104 ../do-release-upgrade:108
 #, c-format, python-format
 msgid ""
 "The release upgrade can not be performed currently, please try again later. "
@@ -2035,21 +1990,22 @@
 "Aktualizáciu vydania momentálne nie je možné vykonať. Prosím, skúste to "
 "znova neskôr. Server oznámil „%s“"
 
-#: ../UpdateManager/UpdateManager.py:1107 ../check-new-release-gtk:116
+#. print "on_button_dist_upgrade_clicked"
+#: ../UpdateManager/UpdateManager.py:847 ../check-new-release-gtk:87
 msgid "Downloading the release upgrade tool"
 msgstr "Sťahuje sa nástroj na prechod na vyššiu verziu distribúcie."
 
-#: ../UpdateManager/UpdateManager.py:1114
+#: ../UpdateManager/UpdateManager.py:854
 #, python-format
 msgid "<b>New Ubuntu release '%s' is available</b>"
 msgstr "<b>Je dostupné nové vydanie Ubuntu „%s“</b>"
 
 #. we assert a clean cache
-#: ../UpdateManager/UpdateManager.py:1153
+#: ../UpdateManager/UpdateManager.py:893
 msgid "Software index is broken"
 msgstr "Index softvéru je poškodený"
 
-#: ../UpdateManager/UpdateManager.py:1154
+#: ../UpdateManager/UpdateManager.py:894
 msgid ""
 "It is impossible to install or remove any software. Please use the package "
 "manager \"Synaptic\" or run \"sudo apt-get install -f\" in a terminal to fix "
@@ -2067,11 +2023,11 @@
 msgid "Install All Available Updates"
 msgstr "Nainštalovať všetky dostupné aktualizácie"
 
-#: ../UpdateManagerText/UpdateManagerText.py:31
+#: ../UpdateManagerText/UpdateManagerText.py:26
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../UpdateManagerText/UpdateManagerText.py:32
+#: ../UpdateManagerText/UpdateManagerText.py:27
 msgid "Install"
 msgstr "Nainštalovať"
 
@@ -2083,11 +2039,11 @@
 msgid "Updates"
 msgstr ""
 
-#: ../UpdateManagerText/UpdateManagerText.py:50
+#: ../UpdateManagerText/UpdateManagerText.py:45
 msgid "Building Updates List"
 msgstr "Zostavuje sa zoznam aktualizácií"
 
-#: ../UpdateManagerText/UpdateManagerText.py:53
+#: ../UpdateManagerText/UpdateManagerText.py:48
 msgid ""
 "\n"
 "A normal upgrade can not be calculated, please run: \n"
@@ -2111,11 +2067,11 @@
 "* neoficiálne balíky softvéru, ktoré neposkytol tím Ubuntu\n"
 "* bežné zmeny zatiaľ nevydanej novej verzie Ubuntu"
 
-#: ../UpdateManagerText/UpdateManagerText.py:122
+#: ../UpdateManagerText/UpdateManagerText.py:117
 msgid "Downloading changelog"
 msgstr "Sťahuje sa záznam zmien"
 
-#: ../UpdateManager/Core/MyCache.py:130
+#: ../UpdateManager/Core/MyCache.py:124
 #, python-format
 msgid "Other updates (%s)"
 msgstr "Ďalšie aktualizácie (%s)"
@@ -2137,7 +2093,7 @@
 msgid "This update does not come from a source that supports changelogs."
 msgstr "Aktualizácia nepochádza zo zdroja, ktorý podporuje záznamy zmien."
 
-#: ../UpdateManager/Core/MyCache.py:305 ../UpdateManager/Core/MyCache.py:326
+#: ../UpdateManager/Core/MyCache.py:297
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -2145,7 +2101,7 @@
 "Nepodarilo sa stiahnuť zoznam zmien. \n"
 "Skontrolujte svoje pripojenie k internetu."
 
-#: ../UpdateManager/Core/MyCache.py:315
+#: ../UpdateManager/Core/MyCache.py:286
 #, python-format
 msgid ""
 "The changelog does not contain any relevant changes.\n"
@@ -2158,7 +2114,7 @@
 "Použite prosím http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "kým nebude zoznam zmien dostupný alebo to skúste znova."
 
-#: ../UpdateManager/Core/MyCache.py:320
+#: ../UpdateManager/Core/MyCache.py:291
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -2171,52 +2127,52 @@
 "Použite, prosím, http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "pokiaľ nebudú dostupné zmeny alebo to neskôr skúste znovu."
 
-#: ../UpdateManager/Core/UpdateList.py:49
+#: ../UpdateManager/Core/UpdateList.py:50
 msgid "Failed to detect distribution"
 msgstr "Zlyhalo zistenie distribúcie"
 
-#: ../UpdateManager/Core/UpdateList.py:50
+#: ../UpdateManager/Core/UpdateList.py:51
 #, python-format
 msgid "A error '%s' occurred while checking what system you are using."
 msgstr "Chyba '%s' sa vyskytla počas kontroly systému, ktorý používate."
 
-#: ../UpdateManager/Core/UpdateList.py:61
+#: ../UpdateManager/Core/UpdateList.py:62
 msgid "Important security updates"
 msgstr "Dôležité bezpečnostné aktualizácie"
 
-#: ../UpdateManager/Core/UpdateList.py:62
+#: ../UpdateManager/Core/UpdateList.py:63
 msgid "Recommended updates"
 msgstr "Odporúčané aktualizácie"
 
-#: ../UpdateManager/Core/UpdateList.py:63
+#: ../UpdateManager/Core/UpdateList.py:64
 msgid "Proposed updates"
 msgstr "Navrhované aktualizácie"
 
-#: ../UpdateManager/Core/UpdateList.py:64
+#: ../UpdateManager/Core/UpdateList.py:65
 msgid "Backports"
 msgstr "Backporty"
 
-#: ../UpdateManager/Core/UpdateList.py:65
+#: ../UpdateManager/Core/UpdateList.py:66
 msgid "Distribution updates"
 msgstr "Aktualizácie distribúcie"
 
-#: ../UpdateManager/Core/UpdateList.py:70
+#: ../UpdateManager/Core/UpdateList.py:71
 msgid "Other updates"
 msgstr "Ďalšie aktualizácie"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:1
+#: ../data/glade/UpdateManager.ui.h:6
 msgid "<big><b>Starting Update Manager</b></big>"
 msgstr "<big><b>Spúšťa sa Správca aktualizácií</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:3
+#: ../data/glade/UpdateManager.ui.h:30
 msgid "_Partial Upgrade"
 msgstr "Č_iastočná aktualizácia"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:4
+#: ../data/glade/UpdateManager.ui.h:4
 msgid "<big><b>Not all updates can be installed</b></big>"
 msgstr "<big><b>Nie všetky aktualizácie môžu byť nainštalované</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:5
+#: ../data/glade/UpdateManager.ui.h:14
 msgid ""
 "Run a partial upgrade, to install as many updates as possible. \n"
 "\n"
@@ -2235,11 +2191,11 @@
 " * Neoficiálne balíky softvéru, ktoré nepochádzajú z Ubuntu\n"
 " * Bežné zmeny vo verzii Ubuntu pred vydaním"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:12
+#: ../data/glade/UpdateManager.ui.h:8
 msgid "Chec_k"
 msgstr "_Skontrolovať"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:13
+#: ../data/glade/UpdateManager.ui.h:1
 msgid ""
 "<b><big>You must check for updates manually</big></b>\n"
 "\n"
@@ -2252,33 +2208,33 @@
 "správanie môžete nastaviť v <i>Zdroje  softvéru</i> na karte "
 "<i>Aktualizácie</i>."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:16
+#: ../data/glade/UpdateManager.ui.h:28
 msgid "_Hide this information in the future"
 msgstr "_Túto správu už viac nezobrazovať"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:17
+#: ../data/glade/UpdateManager.ui.h:9
 msgid "Co_ntinue"
 msgstr "_Pokračovať"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:18
+#: ../data/glade/UpdateManager.ui.h:5
 msgid "<big><b>Running on battery</b></big>"
 msgstr "<big><b>Beží na batériu</b></big>"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:19
+#: ../data/glade/UpdateManager.ui.h:27
 msgid "Your system is running on battery. Are you sure you want to continue?"
 msgstr "Váš systém je napájaný z batérie. Ste si istý, že chcete pokračovať?"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:21
+#: ../data/glade/UpdateManager.ui.h:32
 msgid "_Upgrade"
 msgstr "_Aktualizovať"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:22
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:8
+#: ../data/glade/UpdateManager.ui.h:22
+#: ../data/glade/UpgradePromptDialog.ui.h:5
 msgid "Show progress of individual files"
 msgstr "Zobraziť priebeh jednotlivých súborov"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:23
-#: ../data/update-manager.desktop.in.h:1
+#: ../data/glade/UpdateManager.ui.h:26 ../data/update-manager.desktop.in.h:3
+#: ../data/update-manager-hildon.desktop.in.h:3
 msgid "Update Manager"
 msgstr "Správca aktualizácií"
 
@@ -2286,11 +2242,11 @@
 msgid "Starting Update Manager"
 msgstr "Spúšťa sa Správca aktualizácií"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:25
+#: ../data/glade/UpdateManager.ui.h:25
 msgid "U_pgrade"
 msgstr "_Aktualizovať"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:27
+#: ../data/glade/UpdateManager.ui.h:33
 msgid "updates"
 msgstr "aktualizácie"
 
@@ -2312,19 +2268,19 @@
 "Je bezpečnejšie pred aktualizáciou pripojiť počítač na napájanie z "
 "elektrickej siete."
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:31
+#: ../data/glade/UpdateManager.ui.h:29
 msgid "_Install Updates"
 msgstr "_Nainštalovať aktualizácie"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:32
+#: ../data/glade/UpdateManager.ui.h:7
 msgid "Changes"
 msgstr "Zmeny"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:33
+#: ../data/glade/UpdateManager.ui.h:10
 msgid "Description"
 msgstr "Popis"
 
-#: ../data/gtkbuilder/UpdateManager.ui.h:34
+#: ../data/glade/UpdateManager.ui.h:11
 msgid "Description of update"
 msgstr "Popis aktualizácie"
 
@@ -2332,29 +2288,29 @@
 msgid "_Settings..."
 msgstr "Na_stavenia..."
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:1
+#: ../data/glade/UpgradePromptDialog.ui.h:1
 msgid ""
 "<b>A new version of Ubuntu is available. Would you like to upgrade?</b>"
 msgstr ""
 "<b>Je dostupná novšia verzia Ubuntu. Želáte si prejsť na novšiu verziu?</b>"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:3
+#: ../data/glade/UpgradePromptDialog.ui.h:3
 msgid "Don't Upgrade"
 msgstr "Neaktualizovať"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:4
+#: ../data/glade/UpgradePromptDialog.ui.h:2
 msgid "Ask Me Later"
 msgstr "Spýtať sa neskôr"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:5
+#: ../data/glade/UpgradePromptDialog.ui.h:6
 msgid "Yes, Upgrade Now"
 msgstr "Áno, aktualizovať teraz"
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:6
+#: ../data/glade/UpgradePromptDialog.ui.h:8
 msgid "You have declined to upgrade to the new Ubuntu"
 msgstr "Odmietlu ste aktualizovať na novšiu verziu Ubuntu."
 
-#: ../data/gtkbuilder/UpgradePromptDialog.ui.h:7
+#: ../data/glade/UpgradePromptDialog.ui.h:7
 msgid ""
 "You can upgrade at a later time by opening Update Manager and click on "
 "\"Upgrade\"."
@@ -2363,40 +2319,42 @@
 "„Aktualizovať“."
 
 #: ../data/update-manager.desktop.in.h:2
+#: ../data/update-manager-hildon.desktop.in.h:2
 msgid "Software Updates"
 msgstr "Aktualizácie softvéru"
 
-#: ../data/update-manager.desktop.in.h:3
+#: ../data/update-manager.desktop.in.h:1
+#: ../data/update-manager-hildon.desktop.in.h:1
 msgid "Show and install available updates"
 msgstr "Zobraziť a nainštalovať dostupné aktualizácie"
 
-#: ../update-manager:61 ../update-manager-text:49 ../do-release-upgrade:47
+#: ../update-manager:53 ../do-release-upgrade:33
 msgid "Show version and exit"
 msgstr "Zobraziť verziu a skončiť"
 
-#: ../update-manager:64
+#: ../update-manager:56
 msgid "Directory that contains the data files"
 msgstr "Adresár s dátovými súbormi"
 
-#: ../update-manager:67
+#: ../update-manager:59
 msgid "Check if a new Ubuntu release is available"
 msgstr "Skontrolovať dostupnosť nového vydania Ubuntu"
 
-#: ../update-manager:70 ../do-release-upgrade:50 ../check-new-release-gtk:180
+#: ../update-manager:62 ../do-release-upgrade:36 ../check-new-release-gtk:138
 msgid "Check if upgrading to the latest devel release is possible"
 msgstr ""
 "Skontrolovať, či je možné aktualizovať na najnovšiu vývojársku verziu"
 
-#: ../update-manager:74
+#: ../update-manager:66
 msgid "Upgrade using the latest proposed version of the release upgrader"
 msgstr ""
 "Aktualizovať pomocou poslednej navrhovanej verzie aktualizátora vydania"
 
-#: ../update-manager:81
+#: ../update-manager:73
 msgid "Do not focus on map when starting"
 msgstr "Pri štarte nezameriavať vstup na mapu"
 
-#: ../update-manager:84
+#: ../update-manager:76
 msgid "Try to run a dist-upgrade"
 msgstr "Skúste spustiť dist-upgrade"
 
@@ -2404,26 +2362,26 @@
 msgid "Do not check for updates when starting"
 msgstr "Nekontrolovať pri spustení aktualizácie"
 
-#: ../update-manager:91 ../do-release-upgrade:66
+#: ../update-manager:80 ../do-release-upgrade:52
 msgid "Test upgrade with a sandbox aufs overlay"
 msgstr "Otestovať aktualizáciu v pieskovisku aufs"
 
-#: ../update-manager:111
+#: ../update-manager:100
 msgid "Running partial upgrade"
 msgstr "Prebieha čiastočná aktualizácia"
 
-#: ../update-manager-text:53
+#: ../update-manager-text:54
 msgid "Show description of the package instead of the changelog"
 msgstr ""
 
-#: ../do-release-upgrade:54 ../check-new-release-gtk:184
+#: ../do-release-upgrade:40 ../check-new-release-gtk:142
 msgid ""
 "Try upgrading to the latest release using the upgrader from $distro-proposed"
 msgstr ""
 "Pokúste sa aktualizovať na poslednú verziu použitím aktualizátora z $distro-"
 "proposed"
 
-#: ../do-release-upgrade:58
+#: ../do-release-upgrade:44
 msgid ""
 "Run in a special upgrade mode.\n"
 "Currently 'desktop' for regular upgrades of a desktop system and 'server' "
@@ -2433,11 +2391,11 @@
 "Momentálne sú podporované normálne aktualizácie pracovnej stanice a "
 "serverových systémov."
 
-#: ../do-release-upgrade:64
+#: ../do-release-upgrade:50
 msgid "Run the specified frontend"
 msgstr "Spustiť uvedený frontend."
 
-#: ../do-release-upgrade:69
+#: ../do-release-upgrade:55
 msgid ""
 "Check only if a new distribution release is available and report the result "
 "via the exit code"
@@ -2445,11 +2403,11 @@
 "Skontrolovať iba ak je dostupné nové vydanie distribúcie a oznámiť výsledok "
 "návratovou hodnotou"
 
-#: ../do-release-upgrade:83
-msgid "Checking for a new ubuntu release"
-msgstr "Kontroluje sa, či existuje novšia verzia distribúcie Ubuntu"
+#: ../do-release-upgrade:82
+msgid "Checking for a new Ubuntu release"
+msgstr ""
 
-#: ../do-release-upgrade:97
+#: ../do-release-upgrade:96
 msgid ""
 "For upgrade information, please visit:\n"
 "%(url)s\n"
@@ -2457,87 +2415,87 @@
 "Informácie o aktualizáciách nájdete na:\n"
 "%(url)s\n"
 
-#: ../do-release-upgrade:103
+#: ../do-release-upgrade:79
 msgid "No new release found"
 msgstr "Žiadne nové vydanie nebolo nájdené"
 
-#: ../do-release-upgrade:115
+#: ../do-release-upgrade:84
 #, c-format
 msgid "New release '%s' available."
 msgstr "Je dostupné nové vydanie „%s“."
 
-#: ../do-release-upgrade:116
+#: ../do-release-upgrade:85
 msgid "Run 'do-release-upgrade' to upgrade to it."
 msgstr "Ak naň chcete aktualizovať systém, spustite „do-release-upgrade“."
 
-#: ../check-new-release-gtk:91
+#: ../check-new-release-gtk:67
 msgid "Ubuntu %(version)s Upgrade Available"
 msgstr "Dostupná nová verzia Ubuntu %(version)s"
 
-#: ../check-new-release-gtk:132
+#: ../check-new-release-gtk:103
 #, c-format
 msgid "You have declined the upgrade to Ubuntu %s"
 msgstr "Odmietli ste aktualizovať na Ubuntu %s"
 
-#: ../check-new-release-gtk:190
+#: ../check-new-release-gtk:192
 msgid "Add debug output"
 msgstr ""
 
-#: ../ubuntu-support-status:81
+#: ../ubuntu-support-status:79
 msgid "Show unsupported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:84
+#: ../ubuntu-support-status:82
 msgid "Show supported packages on this machine"
 msgstr ""
 
-#: ../ubuntu-support-status:87
+#: ../ubuntu-support-status:85
 msgid "Show all packages with their status"
 msgstr ""
 
-#: ../ubuntu-support-status:90
+#: ../ubuntu-support-status:88
 msgid "Show all packages in a list"
 msgstr ""
 
-#: ../ubuntu-support-status:132
+#: ../ubuntu-support-status:130
 #, c-format
 msgid "Support status summary of '%s':"
 msgstr ""
 
-#: ../ubuntu-support-status:135
+#: ../ubuntu-support-status:133
 msgid "You have %(num)s packages (%(percent).1f%%) supported until %(time)s"
 msgstr ""
 
-#: ../ubuntu-support-status:141
+#: ../ubuntu-support-status:139
 msgid ""
 "You have %(num)s packages (%(percent).1f%%) that can not/no-longer be "
 "downloaded"
 msgstr ""
 
-#: ../ubuntu-support-status:144
+#: ../ubuntu-support-status:142
 msgid "You have %(num)s packages (%(percent).1f%%) that are unsupported"
 msgstr ""
 
-#: ../ubuntu-support-status:152
+#: ../ubuntu-support-status:150
 msgid ""
 "Run with --show-unsupported, --show-supported or --show-all to see more "
 "details"
 msgstr ""
 
-#: ../ubuntu-support-status:156
+#: ../ubuntu-support-status:154
 msgid "No longer downloadable:"
 msgstr ""
 
-#: ../ubuntu-support-status:159
+#: ../ubuntu-support-status:157
 msgid "Unsupported: "
 msgstr ""
 
-#: ../ubuntu-support-status:164
+#: ../ubuntu-support-status:162
 #, c-format
 msgid "Supported until %s:"
 msgstr ""
 
-#: ../ubuntu-support-status:173
+#: ../ubuntu-support-status:171
 msgid "Unsupported"
 msgstr ""
 
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/usbcreator.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/usbcreator.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/usbcreator.po	2012-01-02 17:51:12.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/usbcreator.po	2012-02-23 06:55:58.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: usb-creator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-07 12:02+0000\n"
+"POT-Creation-Date: 2012-01-13 09:16+0000\n"
 "PO-Revision-Date: 2011-07-05 15:05+0000\n"
-"Last-Translator: Pavol Klacansky <pavol@klacansky.com>\n"
+"Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 17:58+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-22 00:51+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: .././usbcreator/install.py:133
 #, python-format
@@ -168,7 +168,7 @@
 msgstr "Maže sa..."
 
 #: .././usbcreator/frontends/gtk/frontend.py:481
-#: .././gui/usbcreator-gtk.ui.h:4 usbcreator-kde.ui.py:42
+#: .././gui/usbcreator-gtk.ui.h:15 usbcreator-kde.ui.py:42
 msgid "Erase Disk"
 msgstr "Vymazať disk"
 
@@ -250,7 +250,7 @@
 #. set title of progress window (same as gtk frontend)
 #: .././usbcreator/frontends/winui/install_window.py:23
 #: .././usbcreator/frontends/kde/frontend.py:180
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:180
+#: .././gui/usbcreator-gtk.ui.h:7 usbcreator/frontends/kde/frontend.py:180
 msgid "Installing"
 msgstr "Inštaluje sa"
 
@@ -287,7 +287,7 @@
 msgstr "Vytvoriť štartovací disk"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:21
-#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:6
+#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:6
 msgid ""
 "To try or install Ubuntu from a removable disk, it needs to be set up as a "
 "startup disk."
@@ -296,7 +296,7 @@
 "byť nastavený ako štartovací disk."
 
 #: .././usbcreator/frontends/winui/main_dialog.py:24
-#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:9
+#: .././gui/usbcreator-gtk.ui.h:12 usbcreator-kde.ui.py:9
 msgid "Source disc image (.iso) or CD:"
 msgstr "Zdrojový obraz disku (.iso) alebo CD:"
 
@@ -305,7 +305,7 @@
 msgstr "Obraz disku"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:32
-#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:24
+#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:24
 msgid "Other..."
 msgstr "Ďalšie..."
 
@@ -314,7 +314,7 @@
 msgstr "Použiť vymeniteľný disk:"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:42
-#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:45
+#: .././gui/usbcreator-gtk.ui.h:16 usbcreator-kde.ui.py:45
 msgid "When starting up from this disk, documents and settings will be:"
 msgstr "Pri spustení z tohto disku, dokumenty a nastavenia budú:"
 
@@ -323,12 +323,12 @@
 msgstr "Uložené na rezervovanom mieste"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:46
-#: .././gui/usbcreator-gtk.ui.h:5 usbcreator-kde.ui.py:51
+#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:51
 msgid "How much:"
 msgstr "Koľko:"
 
 #: .././usbcreator/frontends/winui/main_dialog.py:52
-#: .././gui/usbcreator-gtk.ui.h:1 usbcreator-kde.ui.py:57
+#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:57
 msgid "Discarded on shutdown, unless you save them elsewhere"
 msgstr "Po vypnutí stratené, ak ich neuložíte na iné miesto"
 
@@ -361,38 +361,46 @@
 msgstr "Skúsiť znovu?"
 
 #: .././usbcreator/frontends/kde/frontend.py:481
-#: .././gui/usbcreator-gtk.ui.h:12 usbcreator/frontends/kde/frontend.py:481
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:481
 msgid "Quit the installation?"
 msgstr "Ukončiť inštaláciu?"
 
 #: .././usbcreator/frontends/kde/frontend.py:482
-#: .././gui/usbcreator-gtk.ui.h:3 usbcreator/frontends/kde/frontend.py:482
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:482
 msgid "Do you really want to quit the installation now?"
 msgstr "Skutočne chcete teraz ukončiť inštaláciu?"
 
 #: .././desktop/usb-creator-kde.desktop.in.h:1
 #: .././desktop/usb-creator-gtk.desktop.in.h:1
-msgid "Create a startup disk using a CD or disc image"
-msgstr "Vytvorte štartovací disk pomocou CD alebo obrazu disku"
+msgid "Startup Disk Creator"
+msgstr "Tvorca štartovacieho disku"
 
 #: .././desktop/usb-creator-kde.desktop.in.h:2
 #: .././desktop/usb-creator-gtk.desktop.in.h:2
-msgid "Startup Disk Creator"
-msgstr "Tvorca štartovacieho disku"
+msgid "Create a startup disk using a CD or disc image"
+msgstr "Vytvorte štartovací disk pomocou CD alebo obrazu disku"
 
-#: .././gui/usbcreator-gtk.ui.h:2 usbcreator-kde.ui.py:27
-msgid "Disk to use:"
-msgstr "Použiť USB disk:"
+#: .././gui/usbcreator-gtk.ui.h:1
+msgid "Installation Failed"
+msgstr "Inštalácia zlyhala"
 
-#: .././gui/usbcreator-gtk.ui.h:6
+#: .././gui/usbcreator-gtk.ui.h:2
+msgid ""
+"The installation failed.  Please see ~/.cache/usb-creator.log for more "
+"details.\n"
+msgstr ""
+"Inštalácia sa nepodarila. Prosím, pozrite tento súbor ~/.cache/usb-"
+"creator.log pre viac informácií.\n"
+
+#: .././gui/usbcreator-gtk.ui.h:4
 msgid "Installation Complete"
 msgstr "Inštalácia dokončená"
 
-#: .././gui/usbcreator-gtk.ui.h:7
-msgid "Installation Failed"
-msgstr "Inštalácia zlyhala"
+#: .././gui/usbcreator-gtk.ui.h:5
+msgid "Test Disk"
+msgstr "Odskúšať disk"
 
-#: .././gui/usbcreator-gtk.ui.h:8
+#: .././gui/usbcreator-gtk.ui.h:6
 msgid ""
 "Installation is complete.  You may now run Ubuntu on other computers by "
 "booting them with this drive inserted."
@@ -400,53 +408,45 @@
 "Inštalácia je dokončená. Môžete teraz spúšťať Ubuntu na iných počítačoch po "
 "naštartovaní z tohoto disku."
 
-#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:48
+#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:27
+msgid "Disk to use:"
+msgstr "Použiť USB disk:"
+
+#: .././gui/usbcreator-gtk.ui.h:17 usbcreator-kde.ui.py:48
 msgid "Stored in reserved extra space"
 msgstr "Uložené na špeciálne vyhradené miesto"
 
-#: .././gui/usbcreator-gtk.ui.h:15
-msgid "Test Disk"
-msgstr "Odskúšať disk"
-
-#: .././gui/usbcreator-gtk.ui.h:16
-msgid ""
-"The installation failed.  Please see ~/.cache/usb-creator.log for more "
-"details.\n"
-msgstr ""
-"Inštalácia sa nepodarila. Prosím, pozrite tento súbor ~/.cache/usb-"
-"creator.log pre viac informácií.\n"
-
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
-msgid "Format the device"
-msgstr "Naformátovať zariadenie"
+msgid "Install the bootloader"
+msgstr "Nainštalovať zavádzač systému"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:2
-msgid "Image the device"
-msgstr "Vytvoriť obraz zariadenia"
+msgid "System policy prevents installing the bootloader"
+msgstr "Systémová politika nedovoľuje nainštalovať zavádzač systému"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:3
-msgid "Install the bootloader"
-msgstr "Nainštalovať zavádzač systému"
+msgid "Format the device"
+msgstr "Naformátovať zariadenie"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:4
-msgid "Mount a device"
-msgstr "Pripojiť zariadenie"
-
-#: .././dbus/com.ubuntu.usbcreator.policy.in.h:5
 msgid "System policy prevents formatting this device"
 msgstr "Systémová politika nedovoľuje naformátovať toto zariadenie"
 
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:5
+msgid "Image the device"
+msgstr "Vytvoriť obraz zariadenia"
+
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:6
-msgid "System policy prevents installing the bootloader"
-msgstr "Systémová politika nedovoľuje nainštalovať zavádzač systému"
+msgid "System policy prevents writing a disk image to this device"
+msgstr "Systémová politika nedovoľuje zapísať obraz disku na toto zariadenie"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:7
-msgid "System policy prevents mounting"
-msgstr "Systémová politika nedovoľuje pripojenie diskov"
+msgid "Mount a device"
+msgstr "Pripojiť zariadenie"
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:8
-msgid "System policy prevents writing a disk image to this device"
-msgstr "Systémová politika nedovoľuje zapísať obraz disku na toto zariadenie"
+msgid "System policy prevents mounting"
+msgstr "Systémová politika nedovoľuje pripojenie diskov"
 
 #: .././main.py:38
 msgid "Please run this program as an administrator to continue."
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/util-linux.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/util-linux.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/util-linux.po	2012-01-02 17:50:37.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/util-linux.po	2012-02-23 06:55:27.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 09:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 17:33+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: disk-utils/blockdev.c:61
 msgid "set read-only"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/virt-manager.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/virt-manager.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/virt-manager.po	2012-01-02 17:51:09.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/virt-manager.po	2012-02-23 06:55:55.000000000 +0000
@@ -7,17 +7,17 @@
 msgstr ""
 "Project-Id-Version: virt-manager\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-12-22 16:26+0000\n"
+"POT-Creation-Date: 2012-02-11 19:13+0000\n"
 "PO-Revision-Date: 2011-08-02 08:34+0000\n"
 "Last-Translator: Peter Mráz <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 16:59+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 23:59+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
-#: ../src/virt-manager.desktop.in.in.h:1 ../src/virtManager/systray.py:131
+#: ../src/virt-manager.desktop.in.in.h:1 ../src/virtManager/systray.py:133
 #: ../src/vmm-manager.glade.h:1
 msgid "Virtual Machine Manager"
 msgstr "Správca virtuálnych strojov"
@@ -289,139 +289,143 @@
 msgid "Default manager window width"
 msgstr "Predvolená šírka okna správcu"
 
-#: ../src/virtManager/addhardware.py:339 ../src/virtManager/create.py:488
-#: ../src/virtManager/create.py:586
+#: ../src/virtManager/addhardware.py:353 ../src/virtManager/create.py:490
+#: ../src/virtManager/create.py:588
 msgid "Connection does not support storage management."
 msgstr "Pripojenie nepodporuje správu úložiska."
 
-#: ../src/virtManager/addhardware.py:353 ../src/virtManager/addhardware.py:358
-#: ../src/virtManager/addhardware.py:361 ../src/virtManager/addhardware.py:365
-#: ../src/virtManager/addhardware.py:369 ../src/virtManager/addhardware.py:386
+#: ../src/virtManager/addhardware.py:367 ../src/virtManager/addhardware.py:372
+#: ../src/virtManager/addhardware.py:375 ../src/virtManager/addhardware.py:379
+#: ../src/virtManager/addhardware.py:383 ../src/virtManager/addhardware.py:400
 msgid "Not supported for this guest type."
 msgstr "Nie je podporovaný pre tento typ hosťa."
 
-#: ../src/virtManager/addhardware.py:373 ../src/virtManager/addhardware.py:377
+#: ../src/virtManager/addhardware.py:387 ../src/virtManager/addhardware.py:391
 msgid "Connection does not support host device enumeration"
 msgstr "Pripojenie nepodporuje vymenovanie zariadení hostiteľa"
 
-#: ../src/virtManager/addhardware.py:383
+#: ../src/virtManager/addhardware.py:397
 msgid "Libvirt version does not support video devices."
 msgstr "Táto verzia Libvirt nepodporuje video zariadenia."
 
-#: ../src/virtManager/addhardware.py:392
+#: ../src/virtManager/addhardware.py:406
 msgid "Not supported for this hypervisor/libvirt combination."
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:515 ../src/virtManager/details.py:2786
+#: ../src/virtManager/addhardware.py:535 ../src/virtManager/details.py:2903
 msgid "EvTouch USB Graphics Tablet"
 msgstr "Grafický USB tablet EvTouch"
 
 #. XXX libvirt needs to support 'model' for input devices to distinguish
 #. wacom from evtouch tablets
 #. model.append([_("Wacom Graphics Tablet"), "tablet", "usb", True])
-#: ../src/virtManager/addhardware.py:519 ../src/virtManager/details.py:2788
+#: ../src/virtManager/addhardware.py:539 ../src/virtManager/details.py:2905
 msgid "Generic USB Mouse"
 msgstr "Bežná USB myš"
 
-#: ../src/virtManager/addhardware.py:523
+#: ../src/virtManager/addhardware.py:543
 msgid "VNC server"
 msgstr "VNC server"
 
-#: ../src/virtManager/addhardware.py:524
+#: ../src/virtManager/addhardware.py:544
 msgid "Spice server"
 msgstr "Spice server"
 
-#: ../src/virtManager/addhardware.py:525
+#: ../src/virtManager/addhardware.py:545
 msgid "Local SDL window"
 msgstr "Lokálne SDL okno"
 
-#: ../src/virtManager/addhardware.py:547
+#: ../src/virtManager/addhardware.py:567
 msgid "No Devices Available"
 msgstr "Žiadne dostupné zariadenie"
 
-#: ../src/virtManager/addhardware.py:796
+#: ../src/virtManager/addhardware.py:868
 #, python-format
 msgid "Uncaught error validating hardware input: %s"
 msgstr "Nezachytená chyba overenia hardvérového vstupu: %s"
 
-#: ../src/virtManager/addhardware.py:808
+#: ../src/virtManager/addhardware.py:880
 #, python-format
 msgid "Unable to add device: %s"
 msgstr "Nepodarilo sa pridať zariadenie: %s"
 
-#: ../src/virtManager/addhardware.py:896
+#: ../src/virtManager/addhardware.py:972
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/virtManager/addhardware.py:898 ../src/vmm-create.glade.h:50
+#: ../src/virtManager/addhardware.py:974 ../src/vmm-create.glade.h:50
 #: ../src/vmm-host.glade.h:45
 msgid "Storage"
 msgstr "Úložiská"
 
-#: ../src/virtManager/addhardware.py:900
+#: ../src/virtManager/addhardware.py:976
 msgid "Network"
 msgstr "Sieť"
 
-#: ../src/virtManager/addhardware.py:902 ../src/virtManager/details.py:3204
+#: ../src/virtManager/addhardware.py:978 ../src/virtManager/details.py:3370
 msgid "Input"
 msgstr "Vstup"
 
-#: ../src/virtManager/addhardware.py:904
+#: ../src/virtManager/addhardware.py:980
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../src/virtManager/addhardware.py:906
+#: ../src/virtManager/addhardware.py:982
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/virtManager/addhardware.py:908
+#: ../src/virtManager/addhardware.py:984
 msgid "Video Device"
 msgstr "Viedo zariadenie"
 
-#: ../src/virtManager/addhardware.py:910
+#: ../src/virtManager/addhardware.py:986
 msgid "Watchdog Device"
 msgstr "Ochranný časovač"
 
-#: ../src/virtManager/addhardware.py:912
+#: ../src/virtManager/addhardware.py:988
 msgid "Filesystem Passthrough"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:914 ../src/virtManager/details.py:3269
+#: ../src/virtManager/addhardware.py:990 ../src/virtManager/details.py:3450
 msgid "Smartcard"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:972
+#: ../src/virtManager/addhardware.py:992
+msgid "USB Redirection"
+msgstr ""
+
+#: ../src/virtManager/addhardware.py:1061
 msgid "Te_mplate:"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:974
+#: ../src/virtManager/addhardware.py:1063
 msgid "_Source path:"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1006
+#: ../src/virtManager/addhardware.py:1125
 msgid "Creating Storage File"
 msgstr "Vytvorenie úložiskového súboru"
 
-#: ../src/virtManager/addhardware.py:1007
+#: ../src/virtManager/addhardware.py:1126
 msgid "Allocation of disk storage may take a few minutes to complete."
 msgstr "Rezervovanie diskového úložiska môže trvať niekoľko minút."
 
-#: ../src/virtManager/addhardware.py:1033
+#: ../src/virtManager/addhardware.py:1152
 msgid "Are you sure you want to add this device?"
 msgstr "Naozaj chcete pridať toto zariadenie?"
 
-#: ../src/virtManager/addhardware.py:1036
+#: ../src/virtManager/addhardware.py:1155
 msgid ""
 "This device could not be attached to the running machine. Would you like to "
 "make the device available after the next guest shutdown?"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1050
+#: ../src/virtManager/addhardware.py:1169
 #, python-format
 msgid "Error adding device: %s"
 msgstr "Chyba pri pridávaní zariadenia: %s"
 
-#: ../src/virtManager/addhardware.py:1125 ../src/virtManager/create.py:1672
+#: ../src/virtManager/addhardware.py:1246 ../src/virtManager/create.py:1681
 #, python-format
 msgid ""
 "The following storage already exists, but is not\n"
@@ -438,120 +442,131 @@
 "\n"
 "Želáte si použiť toto úložisko?"
 
-#: ../src/virtManager/addhardware.py:1133 ../src/virtManager/create.py:1680
+#: ../src/virtManager/addhardware.py:1254 ../src/virtManager/create.py:1689
 msgid "A storage path must be specified."
 msgstr "Musí byť zadaná cesta k úložisku."
 
-#: ../src/virtManager/addhardware.py:1151 ../src/virtManager/create.py:1688
+#: ../src/virtManager/addhardware.py:1272 ../src/virtManager/create.py:1697
 msgid "Storage parameter error."
 msgstr "Chyba parametra úložiska."
 
 #. Fatal errors are reported when setting 'size'
-#: ../src/virtManager/addhardware.py:1165 ../src/virtManager/create.py:1693
+#: ../src/virtManager/addhardware.py:1286 ../src/virtManager/create.py:1702
 msgid "Not Enough Free Space"
 msgstr "Nedostatok voľného priestoru"
 
-#: ../src/virtManager/addhardware.py:1171 ../src/virtManager/create.py:1699
+#: ../src/virtManager/addhardware.py:1292 ../src/virtManager/create.py:1708
 #, python-format
 msgid "Disk \"%s\" is already in use by another guest!"
 msgstr "Disk \"%s\" už používa iný hosť!"
 
-#: ../src/virtManager/addhardware.py:1173 ../src/virtManager/create.py:1701
+#: ../src/virtManager/addhardware.py:1294 ../src/virtManager/create.py:1710
 msgid "Do you really want to use the disk?"
 msgstr "Naozaj chcete disk použiť?"
 
-#: ../src/virtManager/addhardware.py:1190
+#: ../src/virtManager/addhardware.py:1311
 msgid "Network selection error."
 msgstr "Chyba pri výbere siete."
 
-#: ../src/virtManager/addhardware.py:1191
+#: ../src/virtManager/addhardware.py:1312
 msgid "A network source must be selected."
 msgstr "Musí byť vybraný sieťový zdroj."
 
-#: ../src/virtManager/addhardware.py:1194
+#: ../src/virtManager/addhardware.py:1315
 msgid "Invalid MAC address"
 msgstr "Neplatná MAC adresa"
 
-#: ../src/virtManager/addhardware.py:1195
+#: ../src/virtManager/addhardware.py:1316
 msgid "A MAC address must be entered."
 msgstr "Musí byť zadaný MAC adresa."
 
-#: ../src/virtManager/addhardware.py:1227
+#: ../src/virtManager/addhardware.py:1348
 msgid "Graphics device parameter error"
 msgstr "Chyba parametra grafického zariadenia"
 
-#: ../src/virtManager/addhardware.py:1235
+#: ../src/virtManager/addhardware.py:1356
 msgid "Sound device parameter error"
 msgstr "Chyba parametra zvukového zariadenia"
 
-#: ../src/virtManager/addhardware.py:1242
+#: ../src/virtManager/addhardware.py:1363
 msgid "Physical Device Required"
 msgstr "Vyžaduje sa fyzické zariadenie"
 
-#: ../src/virtManager/addhardware.py:1243
+#: ../src/virtManager/addhardware.py:1364
 msgid "A device must be selected."
 msgstr "Musí byť vybrané zariadenie."
 
-#: ../src/virtManager/addhardware.py:1250
+#: ../src/virtManager/addhardware.py:1371
 msgid "Host device parameter error"
 msgstr "Chyba parametra hostiteľského zariadenia"
 
-#: ../src/virtManager/addhardware.py:1292
+#: ../src/virtManager/addhardware.py:1416
 #, python-format
 msgid "%s device parameter error"
 msgstr "Chyba parametra zariadenia %s"
 
-#: ../src/virtManager/addhardware.py:1303
-#: ../src/virtManager/addhardware.py:1350
+#: ../src/virtManager/addhardware.py:1427
 msgid "Video device parameter error"
 msgstr "Chyba parametra video zariadenia"
 
-#: ../src/virtManager/addhardware.py:1316
+#: ../src/virtManager/addhardware.py:1439
 msgid "Watchdog parameter error"
 msgstr "Chyba parametra ochranného časovača"
 
-#: ../src/virtManager/addhardware.py:1327
+#: ../src/virtManager/addhardware.py:1452
 msgid "A filesystem source must be specified"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1329
+#: ../src/virtManager/addhardware.py:1454
 msgid "A filesystem target must be specified"
 msgstr ""
 
-#: ../src/virtManager/addhardware.py:1340
+#: ../src/virtManager/addhardware.py:1457
+msgid "Invalid target path. A filesystem with that target already exists"
+msgstr ""
+
+#: ../src/virtManager/addhardware.py:1475
 msgid "Filesystem parameter error"
 msgstr ""
 
-#: ../src/virtManager/asyncjob.py:175
+#: ../src/virtManager/addhardware.py:1493
+msgid "Smartcard device parameter error"
+msgstr ""
+
+#: ../src/virtManager/addhardware.py:1508
+msgid "USB redirected device parameter error"
+msgstr ""
+
+#: ../src/virtManager/asyncjob.py:243
 msgid "Cancel the job before closing window?"
 msgstr "Zrušiť úlohu pred zatvorením okna?"
 
-#: ../src/virtManager/asyncjob.py:207
+#: ../src/virtManager/asyncjob.py:262
 msgid "Cancelling job..."
 msgstr "Ruší sa úloha..."
 
-#: ../src/virtManager/asyncjob.py:214 ../src/virtManager/asyncjob.py:224
+#: ../src/virtManager/asyncjob.py:273 ../src/virtManager/asyncjob.py:282
 #: ../src/vmm-progress.glade.h:3
 msgid "Processing..."
 msgstr "Spracovávanie..."
 
-#: ../src/virtManager/asyncjob.py:241
+#: ../src/virtManager/asyncjob.py:298
 msgid "Completed"
 msgstr "Hotovo"
 
-#: ../src/virtManager/choosecd.py:96 ../src/virtManager/choosecd.py:102
+#: ../src/virtManager/choosecd.py:100 ../src/virtManager/choosecd.py:106
 msgid "Invalid Media Path"
 msgstr "Neplatná cesta k médiu"
 
-#: ../src/virtManager/choosecd.py:97
+#: ../src/virtManager/choosecd.py:101
 msgid "A media path must be specified."
 msgstr "Musí byť zadaná cesta k médiu."
 
-#: ../src/virtManager/choosecd.py:142
+#: ../src/virtManager/choosecd.py:146
 msgid "Floppy D_rive"
 msgstr "_Disketová mechanika"
 
-#: ../src/virtManager/choosecd.py:143
+#: ../src/virtManager/choosecd.py:147
 msgid "Floppy _Image"
 msgstr "_Obraz diskety"
 
@@ -576,11 +591,11 @@
 "klonovať, musia byť spravované\n"
 "prostredníctvom zväzkov úložísk."
 
-#: ../src/virtManager/clone.py:86 ../src/virtManager/delete.py:334
+#: ../src/virtManager/clone.py:86 ../src/virtManager/delete.py:336
 msgid "No write access to parent directory."
 msgstr "Chýba právo na zápis do rodičovského priečinka."
 
-#: ../src/virtManager/clone.py:88 ../src/virtManager/delete.py:332
+#: ../src/virtManager/clone.py:88 ../src/virtManager/delete.py:334
 msgid "Path does not exist."
 msgstr "Cesta neexistuje."
 
@@ -600,49 +615,49 @@
 msgid "Shareable"
 msgstr "Zdielateľné"
 
-#: ../src/virtManager/clone.py:283 ../src/virtManager/clone.py:529
+#: ../src/virtManager/clone.py:285 ../src/virtManager/clone.py:531
 msgid "Details..."
 msgstr "Podrobnosti..."
 
-#: ../src/virtManager/clone.py:314
+#: ../src/virtManager/clone.py:316
 msgid "Usermode"
 msgstr "Používateľský režim"
 
-#: ../src/virtManager/clone.py:326
+#: ../src/virtManager/clone.py:328
 msgid "Virtual Network"
 msgstr "Virtuálna sieť"
 
-#: ../src/virtManager/clone.py:398
+#: ../src/virtManager/clone.py:400
 msgid "Nothing to clone."
 msgstr "Nie je čo klonovať."
 
-#: ../src/virtManager/clone.py:521
+#: ../src/virtManager/clone.py:523
 msgid "Clone this disk"
 msgstr "Klonovať tento disk"
 
-#: ../src/virtManager/clone.py:525
+#: ../src/virtManager/clone.py:527
 #, python-format
 msgid "Share disk with %s"
 msgstr "Zdieľať disk s %s"
 
-#: ../src/virtManager/clone.py:537
+#: ../src/virtManager/clone.py:539
 msgid "Storage cannot be shared or cloned."
 msgstr "Úložisko sa nedá zdieľať ani klonovať."
 
-#: ../src/virtManager/clone.py:593
+#: ../src/virtManager/clone.py:595
 msgid "One or more disks cannot be cloned or shared."
 msgstr "Jeden alebo viac diskov sa nedá naklonovať alebo nazdielať."
 
-#: ../src/virtManager/clone.py:686
+#: ../src/virtManager/clone.py:688
 #, python-format
 msgid "Error changing MAC address: %s"
 msgstr "Chyba pri zmene MAC adresy: %s"
 
-#: ../src/virtManager/clone.py:713
+#: ../src/virtManager/clone.py:715
 msgid "Cloning will overwrite the existing file"
 msgstr "Klonovanie nahradí existujúci súbor"
 
-#: ../src/virtManager/clone.py:715
+#: ../src/virtManager/clone.py:717
 msgid ""
 "Using an existing image will overwrite the path during the clone process. "
 "Are you sure you want to use this path?"
@@ -650,16 +665,16 @@
 "Pri použití existujúceho obrazu sa počas procesu klonovania obraz prepíše. "
 "Naozaj chcete použiť túto cestu?"
 
-#: ../src/virtManager/clone.py:727
+#: ../src/virtManager/clone.py:729
 #, python-format
 msgid "Error changing storage path: %s"
 msgstr "Chyba pri zmene cesty k úložisku: %s"
 
-#: ../src/virtManager/clone.py:778
+#: ../src/virtManager/clone.py:780
 msgid "Skipping disks may cause data to be overwritten."
 msgstr "Preskakovanie diskov môže mať za následok prepísanie údajov."
 
-#: ../src/virtManager/clone.py:779
+#: ../src/virtManager/clone.py:781
 #, python-format
 msgid ""
 "The following disk devices will not be cloned:\n"
@@ -672,22 +687,22 @@
 "%s\n"
 "Spustením nového hosťa by mohlo prepísať údaje na obrazoch týchto diskov."
 
-#: ../src/virtManager/clone.py:797 ../src/virtManager/createpool.py:441
-#: ../src/virtManager/createvol.py:204 ../src/virtManager/migrate.py:464
+#: ../src/virtManager/clone.py:799 ../src/virtManager/createpool.py:443
+#: ../src/virtManager/createvol.py:215 ../src/virtManager/migrate.py:465
 #, python-format
 msgid "Uncaught error validating input: %s"
 msgstr "Nezachytený chyba overenia vstupu: %s"
 
-#: ../src/virtManager/clone.py:803
+#: ../src/virtManager/clone.py:805
 #, python-format
 msgid "Creating virtual machine clone '%s'"
 msgstr "Vytváranie klonu virtuálneho stroja '%s'"
 
-#: ../src/virtManager/clone.py:807 ../src/virtManager/delete.py:135
+#: ../src/virtManager/clone.py:809 ../src/virtManager/delete.py:137
 msgid " and selected storage (this may take a while)"
 msgstr " a vybraného úložiska (môže chvíľu trvať)"
 
-#: ../src/virtManager/clone.py:816
+#: ../src/virtManager/clone.py:818
 #, python-format
 msgid "Error creating virtual machine clone '%s': %s"
 msgstr "Chyba pri vytváraní klonu virtuálneho stroja '%s': %s"
@@ -700,97 +715,97 @@
 msgid "Locate existing storage"
 msgstr "Nájsť existujúce úložisko"
 
-#: ../src/virtManager/config.py:53
+#: ../src/virtManager/config.py:55
 msgid "Locate ISO media volume"
 msgstr "Nájsť ISO obraz zväzku"
 
-#: ../src/virtManager/config.py:54
+#: ../src/virtManager/config.py:56
 msgid "Locate ISO media"
 msgstr "Nájsť ISO obraz"
 
-#: ../src/virtManager/config.py:59
+#: ../src/virtManager/config.py:61
 msgid "Locate floppy media volume"
 msgstr ""
 
-#: ../src/virtManager/config.py:60
+#: ../src/virtManager/config.py:62
 msgid "Locate floppy media"
 msgstr ""
 
-#: ../src/virtManager/config.py:65 ../src/virtManager/config.py:66
+#: ../src/virtManager/config.py:67 ../src/virtManager/config.py:68
 msgid "Locate directory volume"
 msgstr ""
 
-#: ../src/virtManager/connect.py:333
+#: ../src/virtManager/connect.py:336
 msgid "A hostname is required for remote connections."
 msgstr "Pre vzdialené pripojenie je potrebné hostiteľské meno."
 
-#: ../src/virtManager/connection.py:132
+#: ../src/virtManager/connection.py:161
 #, python-format
 msgid "Could not build physical interface list via libvirt: %s"
 msgstr ""
 "Nepodarilo sa zostaviť zoznam fyzických zariadení prostredníctvom libvirt: %s"
 
-#: ../src/virtManager/connection.py:138
+#: ../src/virtManager/connection.py:167
 msgid "Libvirt version does not support physical interface listing"
 msgstr "Táto verzia libvirt nepodporuje vypísanie zoznamu fyzických rozhraní"
 
-#: ../src/virtManager/connection.py:149
+#: ../src/virtManager/connection.py:178
 #, python-format
 msgid "Could not initialize HAL for interface listing: %s"
 msgstr "Nepodarilo sa inicializovať HAL na zobrazenie zoznamu rozhraní: %s"
 
-#: ../src/virtManager/connection.py:152
+#: ../src/virtManager/connection.py:181
 msgid "Libvirt version does not support physical interface listing."
 msgstr ""
 "Táto verzia libvirt nepodporuje vypísanie zoznamu fyzických rozhraní."
 
-#: ../src/virtManager/connection.py:171
+#: ../src/virtManager/connection.py:200
 #, python-format
 msgid "Could not build media list via libvirt: %s"
 msgstr "Nepodarilo sa zostaviť zoznam médií prostredníctvom libvirt: %s"
 
-#: ../src/virtManager/connection.py:178 ../src/virtManager/connection.py:192
+#: ../src/virtManager/connection.py:207 ../src/virtManager/connection.py:221
 msgid "Libvirt version does not support media listing."
 msgstr "Táto verzia libvirt nepodporuje výpis zoznamu médií."
 
-#: ../src/virtManager/connection.py:189
+#: ../src/virtManager/connection.py:218
 #, python-format
 msgid "Could not initialize HAL for media listing: %s"
 msgstr "Nepodarilo sa inicializovať HAL kvôli vypísaniu médií: %s"
 
-#: ../src/virtManager/connection.py:606
+#: ../src/virtManager/connection.py:643
 msgid "Disconnected"
 msgstr "Odpojené"
 
-#: ../src/virtManager/connection.py:608
+#: ../src/virtManager/connection.py:645
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/virtManager/connection.py:611
+#: ../src/virtManager/connection.py:648
 msgid "Active (RO)"
 msgstr "Aktívne (len čítanie)"
 
-#: ../src/virtManager/connection.py:613 ../src/virtManager/host.py:524
-#: ../src/virtManager/host.py:787 ../src/virtManager/host.py:1035
+#: ../src/virtManager/connection.py:650 ../src/virtManager/host.py:526
+#: ../src/virtManager/host.py:789 ../src/virtManager/host.py:1046
 #: ../src/vmm-host.glade.h:36
 msgid "Active"
 msgstr "Aktívny"
 
-#: ../src/virtManager/connection.py:615 ../src/virtManager/host.py:524
-#: ../src/virtManager/host.py:567 ../src/virtManager/host.py:787
-#: ../src/virtManager/host.py:827 ../src/virtManager/host.py:1035
-#: ../src/virtManager/uihelpers.py:507
+#: ../src/virtManager/connection.py:652 ../src/virtManager/host.py:526
+#: ../src/virtManager/host.py:569 ../src/virtManager/host.py:789
+#: ../src/virtManager/host.py:829 ../src/virtManager/host.py:1046
+#: ../src/virtManager/uihelpers.py:526
 msgid "Inactive"
 msgstr "Neaktívny"
 
-#: ../src/virtManager/connection.py:617 ../src/virtManager/create.py:2016
-#: ../src/virtManager/details.py:2399 ../src/virtManager/details.py:2666
-#: ../src/virtManager/details.py:2867 ../src/virtManager/details.py:2868
-#: ../src/virtManager/host.py:1029
+#: ../src/virtManager/connection.py:654 ../src/virtManager/create.py:2026
+#: ../src/virtManager/details.py:2509 ../src/virtManager/details.py:2783
+#: ../src/virtManager/details.py:2984 ../src/virtManager/details.py:2985
+#: ../src/virtManager/host.py:1040
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../src/virtManager/connection.py:793
+#: ../src/virtManager/connection.py:830
 #, python-format
 msgid ""
 "Domain rename failed. Attempting to recover also failed.\n"
@@ -805,302 +820,282 @@
 "\n"
 "Chyba pri obnove: %s"
 
-#: ../src/virtManager/console.py:324
+#: ../src/virtManager/console.py:323
 msgid "Unable to provide requested credentials to the VNC server"
 msgstr "Nie je možné poskytnúť VNC serveru potrebné doklady o pravosti"
 
-#: ../src/virtManager/console.py:326
+#: ../src/virtManager/console.py:325
 #, python-format
 msgid "The credential type %s is not supported"
 msgstr "Typ dokladu o pravosti %s nie je podporovaný"
 
-#: ../src/virtManager/console.py:328
+#: ../src/virtManager/console.py:327
 msgid "Unable to authenticate"
 msgstr "Nie je možné overiť totožnosť"
 
-#: ../src/virtManager/console.py:335
+#: ../src/virtManager/console.py:334
 msgid "Unsupported console authentication type"
 msgstr "Nepodporovaný typ overenia totožnosti"
 
-#: ../src/virtManager/console.py:382
+#: ../src/virtManager/console.py:381
 #, python-format
 msgid "Error opening socket path '%s': %s"
 msgstr "Chyba pri otváraní soketu '%s': %s"
 
-#: ../src/virtManager/console.py:387
+#: ../src/virtManager/console.py:386
 #, python-format
 msgid "Error opening socket path '%s'"
 msgstr "Chyba pri otváraní soketu '%s'"
 
-#: ../src/virtManager/console.py:621
+#: ../src/virtManager/console.py:629
 msgid "Leave fullscreen"
 msgstr ""
 
-#: ../src/virtManager/console.py:641
+#: ../src/virtManager/console.py:650
 msgid "Send key combination"
 msgstr ""
 
-#: ../src/virtManager/console.py:659 ../src/vmm-details.glade.h:1
+#: ../src/virtManager/console.py:668 ../src/vmm-details.glade.h:1
 msgid "Virtual Machine"
 msgstr "Virtuálny stroj"
 
-#: ../src/virtManager/console.py:663
+#: ../src/virtManager/console.py:672
 #, python-format
 msgid "Press %s to release pointer."
 msgstr "Stlačením %s uvoľníte kurzor."
 
 #. Guest isn't running, schedule another try
-#: ../src/virtManager/console.py:829 ../src/virtManager/console.py:1026
+#: ../src/virtManager/console.py:843 ../src/virtManager/console.py:1036
 msgid "Guest not running"
 msgstr "Hosťujúci stroj nie je spustený"
 
-#: ../src/virtManager/console.py:832
+#: ../src/virtManager/console.py:846
 msgid "Guest has crashed"
 msgstr "Hosťujúci stroj havaroval"
 
-#: ../src/virtManager/console.py:965
+#: ../src/virtManager/console.py:975
 msgid ""
 "Error: viewer connection to hypervisor host got refused or disconnected!"
 msgstr "Chyba: Pripojenie zobrazovača k hypervízoru"
 
-#: ../src/virtManager/console.py:1043
+#: ../src/virtManager/console.py:1053
 msgid "Graphical console not configured for guest"
 msgstr "Grafická konzola pre hosťa nebola nastavená"
 
-#: ../src/virtManager/console.py:1050
+#: ../src/virtManager/console.py:1060
 #, python-format
 msgid "Cannot display graphical console type '%s'"
 msgstr "Nedá sa pripojiť typ grafickej kozoly '%s'"
 
-#: ../src/virtManager/console.py:1060
+#: ../src/virtManager/console.py:1070
 msgid "Graphical console is not yet active for guest"
 msgstr "Grafická konzola nie je na hosťovi zatiaľ aktívna"
 
-#: ../src/virtManager/console.py:1065
+#: ../src/virtManager/console.py:1075
 msgid "Connecting to graphical console for guest"
 msgstr "Pripájanie ku grafickej konzole hosťa"
 
-#: ../src/virtManager/console.py:1101
+#: ../src/virtManager/console.py:1111
 msgid "Error connecting to graphical console"
 msgstr "Chyba pri pripájaní do grafickej kozoly"
 
-#: ../src/virtManager/create.py:357
+#: ../src/virtManager/create.py:359
 msgid "No active connection to install on."
 msgstr "Nie je aktívne spojenie s inštalačným miestom."
 
-#: ../src/virtManager/create.py:419
+#: ../src/virtManager/create.py:421
 msgid "Connection is read only."
 msgstr "Pripojenie je určené len na čítanie."
 
-#: ../src/virtManager/create.py:422
-msgid ""
-"No hypervisor options were found for this\n"
-"connection."
+#: ../src/virtManager/create.py:424
+msgid "No hypervisor options were found for this connection."
 msgstr ""
-"Pre toto spojenie sa nenašla žiaden\n"
-"hypervízor."
 
-#: ../src/virtManager/create.py:427
+#: ../src/virtManager/create.py:429
 msgid ""
-"This usually means that QEMU or KVM is not\n"
-"installed on your machine, or the KVM kernel modules are not loaded."
+"This usually means that QEMU or KVM is not installed on your machine, or the "
+"KVM kernel modules are not loaded."
 msgstr ""
-"Toto zvyčajne znamená, že QEMU alebo KVM\n"
-"nie sú nainštalované na stroji alebo že nie sú nahrané moduly KVM pre jadro."
 
-#: ../src/virtManager/create.py:442
+#: ../src/virtManager/create.py:444
 msgid ""
-"Host supports full virtualization, but\n"
-"no related install options are available.\n"
-"This may mean support is disabled in your\n"
-"system BIOS."
+"Host supports full virtualization, but no related install options are "
+"available. This may mean support is disabled in your system BIOS."
 msgstr ""
-"Hostiteľ plne podporuje virtualizáciu, ale\n"
-"príslušné inštalačné voľby nie sú dostupné.\n"
-"To môže znamenať, že je vypnutá  podpora\n"
-"vo vašom systéme BIOS."
 
-#: ../src/virtManager/create.py:449
+#: ../src/virtManager/create.py:451
 msgid ""
-"Host does not appear to support hardware\n"
-"virtualization. Install options may be limited."
+"Host does not appear to support hardware virtualization. Install options may "
+"be limited."
 msgstr ""
-"Hostiteľ zrejme nepodporuje hardvérovú\n"
-"virtualizáciu. Inštalačné voľby budú\n"
-"obmedzené."
 
-#: ../src/virtManager/create.py:455
+#: ../src/virtManager/create.py:457
 msgid ""
-"KVM is not available. This may mean the KVM\n"
-"package is not installed, or the KVM kernel modules \n"
-"are not loaded. Your virtual machines may perform poorly."
+"KVM is not available. This may mean the KVM package is not installed, or the "
+"KVM kernel modules are not loaded. Your virtual machines may perform poorly."
 msgstr ""
-"KVM nie je dostupné. To môže znamenať, že\n"
-"balík KVM nie je nainštalovaný, alebo že nie\n"
-"sú načítané KVM moduly jadra. Vaše virtuálne\n"
-"stroje budú pracovať chabo."
 
-#: ../src/virtManager/create.py:482
+#: ../src/virtManager/create.py:484
 #, python-format
 msgid "%s installs not available for paravirt guests."
 msgstr "%s inštalácia nie je možná pre paravirtuálnych hostí."
 
-#: ../src/virtManager/create.py:486
+#: ../src/virtManager/create.py:488
 msgid "Libvirt version does not support remote URL installs."
 msgstr ""
 
-#: ../src/virtManager/create.py:500
+#: ../src/virtManager/create.py:502
 msgid "No install options available for this connection."
 msgstr "Pre toto pripojenie nie je možné vybrať žiadny typ inštalácie."
 
-#: ../src/virtManager/create.py:547
+#: ../src/virtManager/create.py:549
 #, python-format
 msgid "Up to %(maxmem)s available on the host"
 msgstr "z %(maxmem)s na hostiteľskej stanici"
 
-#: ../src/virtManager/create.py:561
+#: ../src/virtManager/create.py:563
 #, python-format
 msgid "Hypervisor only supports %d virtual CPUs."
 msgstr "Hypervízor podporuje použitie len %d virtuálnych procesorov."
 
-#: ../src/virtManager/create.py:570
+#: ../src/virtManager/create.py:572
 #, python-format
 msgid "Up to %(numcpus)d available"
 msgstr "z %(numcpus)d dostupných"
 
-#: ../src/virtManager/create.py:659
+#: ../src/virtManager/create.py:661
 msgid "Only URL or import installs are supported for paravirt."
 msgstr ""
 "Pre paravirtuálny stroj je možné použiť iba URL inštaláciu alebo import."
 
-#: ../src/virtManager/create.py:755 ../src/virtManager/create.py:773
-#: ../src/virtManager/create.py:871 ../src/virtManager/create.py:873
+#: ../src/virtManager/create.py:757 ../src/virtManager/create.py:775
+#: ../src/virtManager/create.py:874 ../src/virtManager/create.py:876
 msgid "Generic"
 msgstr "Bežný/á/é"
 
 #. Add action option
-#: ../src/virtManager/create.py:765 ../src/virtManager/create.py:793
+#: ../src/virtManager/create.py:767 ../src/virtManager/create.py:795
 msgid "Show all OS options"
 msgstr ""
 
-#: ../src/virtManager/create.py:842
+#: ../src/virtManager/create.py:845
 msgid "Local CDROM/ISO"
 msgstr "Miestny CDROM/ISO"
 
-#: ../src/virtManager/create.py:844
+#: ../src/virtManager/create.py:847
 msgid "URL Install Tree"
 msgstr "URL inštalačného úložiska"
 
-#: ../src/virtManager/create.py:846
+#: ../src/virtManager/create.py:849
 msgid "PXE Install"
 msgstr "Inštalácia cez PXE"
 
-#: ../src/virtManager/create.py:848
+#: ../src/virtManager/create.py:851
 msgid "Import existing OS image"
 msgstr "Import existujúceho obrazu OS"
 
-#: ../src/virtManager/create.py:850 ../src/vmm-create.glade.h:13
+#: ../src/virtManager/create.py:853 ../src/vmm-create.glade.h:13
 msgid "Application container"
 msgstr ""
 
-#: ../src/virtManager/create.py:852 ../src/vmm-create.glade.h:14
+#: ../src/virtManager/create.py:855 ../src/vmm-create.glade.h:14
 msgid "Operating system container"
 msgstr ""
 
-#: ../src/virtManager/create.py:863
+#: ../src/virtManager/create.py:866
 msgid "Host filesystem"
 msgstr ""
 
-#: ../src/virtManager/create.py:865 ../src/virtManager/details.py:2400
-#: ../src/virtManager/details.py:2461
+#: ../src/virtManager/create.py:868 ../src/virtManager/details.py:2510
+#: ../src/virtManager/details.py:2576
 msgid "None"
 msgstr "Žiadny/a/e"
 
-#: ../src/virtManager/create.py:869
+#: ../src/virtManager/create.py:872
 msgid "Linux"
 msgstr ""
 
-#: ../src/virtManager/create.py:1081
+#: ../src/virtManager/create.py:1084
 msgid "Network selection does not support PXE"
 msgstr "Vybraná sieť nepodporuje PXE"
 
-#: ../src/virtManager/create.py:1348 ../src/virtManager/createinterface.py:886
+#: ../src/virtManager/create.py:1351 ../src/virtManager/createinterface.py:891
 #, python-format
 msgid "Step %(current_page)d of %(max_page)d"
 msgstr "Krok %(current_page)d z %(max_page)d"
 
-#: ../src/virtManager/create.py:1425
+#: ../src/virtManager/create.py:1432
 #, python-format
 msgid "Error setting UUID: %s"
 msgstr "Chyba pri nastavovaní UUID: %s"
 
-#: ../src/virtManager/create.py:1439
+#: ../src/virtManager/create.py:1446
 msgid "Error setting up default devices:"
 msgstr ""
 
-#: ../src/virtManager/create.py:1458 ../src/virtManager/createinterface.py:915
+#: ../src/virtManager/create.py:1465 ../src/virtManager/createinterface.py:920
 #, python-format
 msgid "Uncaught error validating install parameters: %s"
 msgstr "Nezachytená chyba pri overovaní inštalačných parametrov: %s"
 
-#: ../src/virtManager/create.py:1469
+#: ../src/virtManager/create.py:1476
 msgid "Invalid System Name"
 msgstr "Neplatný názov systému"
 
-#: ../src/virtManager/create.py:1490
+#: ../src/virtManager/create.py:1498
 msgid "An install media selection is required."
 msgstr "Je potrebné vybrať inštalačné médium."
 
-#: ../src/virtManager/create.py:1500
+#: ../src/virtManager/create.py:1508
 msgid "An install tree is required."
 msgstr "Je potrebný inštalačný strom."
 
-#: ../src/virtManager/create.py:1513
+#: ../src/virtManager/create.py:1522
 msgid "A storage path to import is required."
 msgstr "Pre import je potrebná cesta k úložisku."
 
-#: ../src/virtManager/create.py:1520
+#: ../src/virtManager/create.py:1529
 msgid "An application path is required."
 msgstr ""
 
-#: ../src/virtManager/create.py:1527
+#: ../src/virtManager/create.py:1536
 msgid "An OS directory path is required."
 msgstr ""
 
-#: ../src/virtManager/create.py:1537
+#: ../src/virtManager/create.py:1547
 msgid "Error setting installer parameters."
 msgstr "Chyba pri nastavovaní parametrov inštalátora."
 
-#: ../src/virtManager/create.py:1565
+#: ../src/virtManager/create.py:1576
 msgid "Error setting install media location."
 msgstr "Chyba pri nastavovaní umiestnenia inštalačného média."
 
-#: ../src/virtManager/create.py:1575
+#: ../src/virtManager/create.py:1585
 msgid "Error setting OS information."
 msgstr "Chyba pri nastavovaní informácií o OS."
 
-#: ../src/virtManager/create.py:1610
+#: ../src/virtManager/create.py:1619
 msgid "Error setting CPUs."
 msgstr "Chyba pri nastavovaní procesorov."
 
-#: ../src/virtManager/create.py:1617
+#: ../src/virtManager/create.py:1626
 msgid "Error setting guest memory."
 msgstr "Chyba pri nastavovaní pamäte hostiteľa."
 
-#: ../src/virtManager/create.py:1732
+#: ../src/virtManager/create.py:1742
 #, python-format
 msgid "Network device required for %s install."
 msgstr "Na inštaláciu %s je potrebné sieťové zariadenie."
 
-#: ../src/virtManager/create.py:1829
+#: ../src/virtManager/create.py:1839
 msgid "Error starting installation: "
 msgstr "Chyba pri spúšťaní inštalácie: "
 
-#: ../src/virtManager/create.py:1866
+#: ../src/virtManager/create.py:1876
 msgid "Creating Virtual Machine"
 msgstr "Vytváranie virtuálneho stroja"
 
-#: ../src/virtManager/create.py:1867
+#: ../src/virtManager/create.py:1877
 msgid ""
 "The virtual machine is now being created. Allocation of disk storage and "
 "retrieval of the installation images may take a few minutes to complete."
@@ -1108,86 +1103,86 @@
 "Virtuálny stroj sa teraz vytvára. Rezervovanie diskového priestoru a "
 "získanie inštalačného obrazu môže trvať niekoľko minút."
 
-#: ../src/virtManager/create.py:1879
+#: ../src/virtManager/create.py:1889
 #, python-format
 msgid "Unable to complete install: '%s'"
 msgstr "Nepodarilo sa dokončiť inštaláciu: '%s'"
 
-#: ../src/virtManager/create.py:1950
+#: ../src/virtManager/create.py:1960
 #, python-format
 msgid "Error continue install: %s"
 msgstr "Chyba pri pokračovaní inštalácie: %s"
 
-#: ../src/virtManager/create.py:2058
+#: ../src/virtManager/create.py:2068
 msgid "Detecting"
 msgstr "Detekcia"
 
-#: ../src/virtManager/createinterface.py:201
-#: ../src/virtManager/uihelpers.py:397
+#: ../src/virtManager/createinterface.py:206
+#: ../src/virtManager/uihelpers.py:416
 msgid "Bridge"
 msgstr "Premostenie"
 
-#: ../src/virtManager/createinterface.py:203
+#: ../src/virtManager/createinterface.py:208
 msgid "Bond"
 msgstr "Zvaizanie"
 
-#: ../src/virtManager/createinterface.py:205
+#: ../src/virtManager/createinterface.py:210
 msgid "Ethernet"
 msgstr "Ethernet"
 
-#: ../src/virtManager/createinterface.py:207
+#: ../src/virtManager/createinterface.py:212
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../src/virtManager/createinterface.py:222 ../src/virtManager/details.py:673
-#: ../src/virtManager/manager.py:366 ../src/virtManager/storagebrowse.py:125
+#: ../src/virtManager/createinterface.py:227 ../src/virtManager/details.py:705
+#: ../src/virtManager/manager.py:371 ../src/virtManager/storagebrowse.py:127
 #: ../src/vmm-create-net.glade.h:14 ../src/vmm-create-pool.glade.h:7
 #: ../src/vmm-create.glade.h:15
 msgid "Name"
 msgstr "Názov"
 
-#: ../src/virtManager/createinterface.py:223
+#: ../src/virtManager/createinterface.py:228
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/virtManager/createinterface.py:224
+#: ../src/virtManager/createinterface.py:229
 msgid "In use by"
 msgstr "Používa"
 
-#: ../src/virtManager/createinterface.py:262
-#: ../src/virtManager/createinterface.py:272
+#: ../src/virtManager/createinterface.py:267
+#: ../src/virtManager/createinterface.py:277
 msgid "System default"
 msgstr "Predvolené systémom"
 
-#: ../src/virtManager/createinterface.py:506
+#: ../src/virtManager/createinterface.py:511
 msgid "Choose interface(s) to bridge:"
 msgstr "Vyberte rozhranie(a) pre premostenie:"
 
-#: ../src/virtManager/createinterface.py:509
+#: ../src/virtManager/createinterface.py:514
 msgid "Choose parent interface:"
 msgstr "Vyberte rodičovské rozhranie:"
 
-#: ../src/virtManager/createinterface.py:511
+#: ../src/virtManager/createinterface.py:516
 msgid "Choose interfaces to bond:"
 msgstr "Vyberte rozhranie pre zviazanie:"
 
-#: ../src/virtManager/createinterface.py:513
+#: ../src/virtManager/createinterface.py:518
 msgid "Choose an unconfigured interface:"
 msgstr "Zvoľte nenakonfigurované rozhranie:"
 
-#: ../src/virtManager/createinterface.py:568
+#: ../src/virtManager/createinterface.py:573
 msgid "No interface selected"
 msgstr "Žiadne vybrané rozhranie"
 
-#: ../src/virtManager/createinterface.py:927
+#: ../src/virtManager/createinterface.py:932
 msgid "An interface name is required."
 msgstr "Vyžaduje sa názov rozhrania."
 
-#: ../src/virtManager/createinterface.py:931
+#: ../src/virtManager/createinterface.py:936
 msgid "An interface must be selected"
 msgstr "Musí byť vybrané rozhranie"
 
-#: ../src/virtManager/createinterface.py:962
+#: ../src/virtManager/createinterface.py:967
 #, python-format
 msgid ""
 "The following interface(s) are already configured:\n"
@@ -1204,120 +1199,120 @@
 "Ich použitím môžete prepísať existujúcu konfiguráciu. Naozaj chcete použiť "
 "vybrané rozhranie(a)?"
 
-#: ../src/virtManager/createinterface.py:1000
+#: ../src/virtManager/createinterface.py:1006
 msgid "Error setting interface parameters."
 msgstr "Chyba pri nastavovaní parametrov rozhrania."
 
-#: ../src/virtManager/createinterface.py:1077
+#: ../src/virtManager/createinterface.py:1082
 #, python-format
 msgid "Error validating IP configuration: %s"
 msgstr "Chyba pri overovaní konfigurácie IP: %s"
 
-#: ../src/virtManager/createinterface.py:1122
+#: ../src/virtManager/createinterface.py:1127
 msgid "Creating virtual interface"
 msgstr "Vytváranie virtuálneho rozhrania"
 
-#: ../src/virtManager/createinterface.py:1123
+#: ../src/virtManager/createinterface.py:1128
 msgid "The virtual interface is now being created."
 msgstr "Teraz sa vytvára virtuálne rozhranie."
 
-#: ../src/virtManager/createinterface.py:1131
+#: ../src/virtManager/createinterface.py:1136
 #, python-format
 msgid "Error creating interface: '%s'"
 msgstr "Chyba pri vytváraní rozhrania: '%s'"
 
-#: ../src/virtManager/createnet.py:104
+#: ../src/virtManager/createnet.py:106
 msgid "Any physical device"
 msgstr "Akékoľvek fyzické zariadenie"
 
-#: ../src/virtManager/createnet.py:107
+#: ../src/virtManager/createnet.py:109
 #, python-format
 msgid "Physical device %s"
 msgstr "Fyzické zariadenie %s"
 
-#: ../src/virtManager/createnet.py:118 ../src/virtManager/network.py:33
+#: ../src/virtManager/createnet.py:120 ../src/virtManager/network.py:33
 msgid "NAT"
 msgstr "Preklad"
 
-#: ../src/virtManager/createnet.py:119
+#: ../src/virtManager/createnet.py:121
 msgid "Routed"
 msgstr "Smerovanie"
 
-#: ../src/virtManager/createnet.py:179
+#: ../src/virtManager/createnet.py:181
 #, python-format
 msgid "%d addresses"
 msgstr "%d adries"
 
-#: ../src/virtManager/createnet.py:183
+#: ../src/virtManager/createnet.py:185
 msgid "Public"
 msgstr "Verejná"
 
-#: ../src/virtManager/createnet.py:185 ../src/vmm-create-net.glade.h:17
+#: ../src/virtManager/createnet.py:187 ../src/vmm-create-net.glade.h:17
 msgid "Private"
 msgstr "Súkromná"
 
-#: ../src/virtManager/createnet.py:187
+#: ../src/virtManager/createnet.py:189
 msgid "Reserved"
 msgstr "Rezervovaná"
 
-#: ../src/virtManager/createnet.py:189
+#: ../src/virtManager/createnet.py:191
 msgid "Other"
 msgstr "Iné"
 
-#: ../src/virtManager/createnet.py:275 ../src/vmm-create-net.glade.h:51
+#: ../src/virtManager/createnet.py:277 ../src/vmm-create-net.glade.h:51
 msgid "Start address:"
 msgstr "Počiatočná adresa:"
 
-#: ../src/virtManager/createnet.py:279 ../src/vmm-details.glade.h:46
+#: ../src/virtManager/createnet.py:281 ../src/vmm-details.glade.h:46
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/virtManager/createnet.py:280 ../src/virtManager/details.py:2486
-#: ../src/virtManager/details.py:2487 ../src/virtManager/details.py:2488
-#: ../src/virtManager/details.py:2489 ../src/virtManager/host.py:547
-#: ../src/virtManager/host.py:548
+#: ../src/virtManager/createnet.py:282 ../src/virtManager/details.py:2601
+#: ../src/virtManager/details.py:2602 ../src/virtManager/details.py:2603
+#: ../src/virtManager/details.py:2604 ../src/virtManager/host.py:549
+#: ../src/virtManager/host.py:550
 msgid "Disabled"
 msgstr "Vypnuté"
 
-#: ../src/virtManager/createnet.py:353
+#: ../src/virtManager/createnet.py:355
 #, python-format
 msgid "Error creating virtual network: %s"
 msgstr "Chyba pri vytváraní virtuálnej siete: %s"
 
-#: ../src/virtManager/createnet.py:362 ../src/virtManager/createnet.py:366
+#: ../src/virtManager/createnet.py:364 ../src/virtManager/createnet.py:368
 msgid "Invalid Network Name"
 msgstr "Neplatný názov siete"
 
-#: ../src/virtManager/createnet.py:363
+#: ../src/virtManager/createnet.py:365
 msgid "Network name must be non-blank and less than 50 characters"
 msgstr "Názov siete nesmie byť prázdny a musí mať menej ako 50 znakov."
 
-#: ../src/virtManager/createnet.py:367
+#: ../src/virtManager/createnet.py:369
 msgid "Network name may contain alphanumeric and '_' characters only"
 msgstr "Názov siete môže obsahovať iba alfanumerické znaky a znak '_'"
 
-#: ../src/virtManager/createnet.py:374 ../src/virtManager/createnet.py:378
-#: ../src/virtManager/createnet.py:382
+#: ../src/virtManager/createnet.py:376 ../src/virtManager/createnet.py:380
+#: ../src/virtManager/createnet.py:384
 msgid "Invalid Network Address"
 msgstr "Neplatná adresa siete"
 
-#: ../src/virtManager/createnet.py:375
+#: ../src/virtManager/createnet.py:377
 msgid "The network address could not be understood"
 msgstr "Sieťovú adresu nebolo možné objasniť"
 
-#: ../src/virtManager/createnet.py:379
+#: ../src/virtManager/createnet.py:381
 msgid "The network must be an IPv4 address"
 msgstr "Sieť musí mať adresu typu IPv4"
 
-#: ../src/virtManager/createnet.py:383
+#: ../src/virtManager/createnet.py:385
 msgid "The network prefix must be at least /4 (16 addresses)"
 msgstr "Predpona siete musí byť najmenej /4 (16 adries)"
 
-#: ../src/virtManager/createnet.py:386
+#: ../src/virtManager/createnet.py:388
 msgid "Check Network Address"
 msgstr "Kontrola sieťovej adresy"
 
-#: ../src/virtManager/createnet.py:387
+#: ../src/virtManager/createnet.py:389
 msgid ""
 "The network should normally use a private IPv4 address. Use this non-private "
 "address anyway?"
@@ -1325,63 +1320,63 @@
 "Sieť by mala používať súkromnú IPv4 adresu. Chcete aj napriek tomu použi "
 "adresu, ktorá nie je súkromná?"
 
-#: ../src/virtManager/createnet.py:401 ../src/virtManager/createnet.py:404
-#: ../src/virtManager/createnet.py:408 ../src/virtManager/createnet.py:412
+#: ../src/virtManager/createnet.py:403 ../src/virtManager/createnet.py:406
+#: ../src/virtManager/createnet.py:410 ../src/virtManager/createnet.py:414
 msgid "Invalid DHCP Address"
 msgstr "Neplatná DHCP adresa"
 
-#: ../src/virtManager/createnet.py:402
+#: ../src/virtManager/createnet.py:404
 msgid "The DHCP start address could not be understood"
 msgstr "Začiatočnú DHCP adresu sa nepodarilo objasniť"
 
-#: ../src/virtManager/createnet.py:405
+#: ../src/virtManager/createnet.py:407
 msgid "The DHCP end address could not be understood"
 msgstr "Koncovú DHCP adresu sa nepodarilo objasniť"
 
-#: ../src/virtManager/createnet.py:409
+#: ../src/virtManager/createnet.py:411
 #, python-format
 msgid "The DHCP start address is not with the network %s"
 msgstr "Začiatočná DHCP adresa nepochádza zo siete %s"
 
-#: ../src/virtManager/createnet.py:413
+#: ../src/virtManager/createnet.py:415
 #, python-format
 msgid "The DHCP end address is not with the network %s"
 msgstr "Koncová DHCP adresa nepochádza zo siete %s"
 
-#: ../src/virtManager/createnet.py:423
+#: ../src/virtManager/createnet.py:425
 msgid "Invalid forwarding mode"
 msgstr "Neplatný režim preposielania"
 
-#: ../src/virtManager/createnet.py:424
+#: ../src/virtManager/createnet.py:426
 msgid "Please select where the traffic should be forwarded"
 msgstr "Zvoľte, kam má byť komunikácia preposielaná"
 
-#: ../src/virtManager/createpool.py:417
+#: ../src/virtManager/createpool.py:419
 msgid "Choose source path"
 msgstr "Zvoľte zdrojovú cestu"
 
-#: ../src/virtManager/createpool.py:423
+#: ../src/virtManager/createpool.py:425
 msgid "Choose target directory"
 msgstr "Zvoľte cieľový priečinok"
 
-#: ../src/virtManager/createpool.py:454
+#: ../src/virtManager/createpool.py:456
 msgid "Creating storage pool..."
 msgstr "Vytvára sa fondu úložísk..."
 
-#: ../src/virtManager/createpool.py:455
+#: ../src/virtManager/createpool.py:457
 msgid "Creating the storage pool may take a while..."
 msgstr "Vytvára sa fond úložísk môže chvíľu trvať..."
 
-#: ../src/virtManager/createpool.py:464
+#: ../src/virtManager/createpool.py:466
 #, python-format
 msgid "Error creating pool: %s"
 msgstr "Chyba pri vytváraní fondu: %s"
 
-#: ../src/virtManager/createpool.py:525 ../src/virtManager/createpool.py:550
+#: ../src/virtManager/createpool.py:527 ../src/virtManager/createpool.py:552
 msgid "Pool Parameter Error"
 msgstr "Chyba parametra fondu"
 
-#: ../src/virtManager/createpool.py:556
+#: ../src/virtManager/createpool.py:558
 msgid ""
 "Building a pool of this type will format the source device. Are you sure you "
 "want to 'build' this pool?"
@@ -1389,92 +1384,92 @@
 "Pri zostavovaní fondu tohto typu sa bude formátovať zdrojové zariadenie. "
 "Naozaj chcete 'zostaviť' tento fond?"
 
-#: ../src/virtManager/createpool.py:573
+#: ../src/virtManager/createpool.py:575
 msgid "Format the source device."
 msgstr "Formát zdrojového zariadenia."
 
-#: ../src/virtManager/createpool.py:575
+#: ../src/virtManager/createpool.py:577
 msgid "Create a logical volume group from the source device."
 msgstr "Vytvoriť logické skupiny zväzkov zo zdrojového zariadenia."
 
-#: ../src/virtManager/createvol.py:214
+#: ../src/virtManager/createvol.py:225
 msgid "Creating storage volume..."
 msgstr "Vytváranie zväzku úložiska..."
 
-#: ../src/virtManager/createvol.py:215
+#: ../src/virtManager/createvol.py:226
 msgid "Creating the storage volume may take a while..."
 msgstr "Vytváranie zväzku úložiska môže chvíľu trvať..."
 
-#: ../src/virtManager/createvol.py:224
+#: ../src/virtManager/createvol.py:235
 #, python-format
 msgid "Error creating vol: %s"
 msgstr "Chyba pri vytváraní zväzku: %s"
 
-#: ../src/virtManager/createvol.py:258
+#: ../src/virtManager/createvol.py:269
 msgid "Volume Parameter Error"
 msgstr "Chyba parametra zväzku"
 
-#: ../src/virtManager/delete.py:94
+#: ../src/virtManager/delete.py:96
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: ../src/virtManager/delete.py:132
+#: ../src/virtManager/delete.py:134
 #, python-format
 msgid "Deleting virtual machine '%s'"
 msgstr "Odstraňovanie virtuálneho stroja '%s'"
 
-#: ../src/virtManager/delete.py:166
+#: ../src/virtManager/delete.py:168
 #, python-format
 msgid "Deleting path '%s'"
 msgstr "Odstraňovanie cesty '%s'"
 
-#: ../src/virtManager/delete.py:177
+#: ../src/virtManager/delete.py:179
 #, python-format
 msgid "Error deleting virtual machine '%s': %s"
 msgstr "Chyba pri odstraňovaní virtuálneho stroja '%s': %s"
 
-#: ../src/virtManager/delete.py:193
+#: ../src/virtManager/delete.py:195
 msgid "Additionally, there were errors removing certain storage devices: \n"
 msgstr ""
 "Okrem toho nastali chyby pri odstraňovaní niektorých úložných zariadení: \n"
 
-#: ../src/virtManager/delete.py:197
+#: ../src/virtManager/delete.py:199
 msgid "Errors encountered while removing certain storage devices."
 msgstr "Nastala chyba počas odstraňovania niktorých úložných zariadení."
 
-#: ../src/virtManager/delete.py:278
+#: ../src/virtManager/delete.py:280
 msgid "Storage Path"
 msgstr "Cesta k úložisku"
 
-#: ../src/virtManager/delete.py:279
+#: ../src/virtManager/delete.py:281
 msgid "Target"
 msgstr "Cieľ"
 
-#: ../src/virtManager/delete.py:327
+#: ../src/virtManager/delete.py:329
 msgid "Cannot delete iscsi share."
 msgstr "Nedá sa odstrániť zdieľanie iscsi."
 
-#: ../src/virtManager/delete.py:330
+#: ../src/virtManager/delete.py:332
 msgid "Cannot delete unmanaged remote storage."
 msgstr "Nedá sa odstrániť nespravované vzdialené úložisko."
 
-#: ../src/virtManager/delete.py:336
+#: ../src/virtManager/delete.py:338
 msgid "Cannot delete unmanaged block device."
 msgstr "Nedá sa odstrániť nespravované blokové zariadenie."
 
-#: ../src/virtManager/delete.py:356
+#: ../src/virtManager/delete.py:358
 msgid "Storage is read-only."
 msgstr "Úložisko je určené len na čítanie."
 
-#: ../src/virtManager/delete.py:358
+#: ../src/virtManager/delete.py:360
 msgid "No write access to path."
 msgstr "Cesta nemá právo na zápis."
 
-#: ../src/virtManager/delete.py:361
+#: ../src/virtManager/delete.py:363
 msgid "Storage is marked as shareable."
 msgstr "Úložisko je označené ako zdielateľné."
 
-#: ../src/virtManager/delete.py:371
+#: ../src/virtManager/delete.py:373
 #, python-format
 msgid ""
 "Storage is in use by the following virtual machines:\n"
@@ -1483,19 +1478,29 @@
 "Úložisko používajú nasledujúce virtuálne stroje:\n"
 "- %s "
 
-#: ../src/virtManager/details.py:573
+#: ../src/virtManager/details.py:189
+#, python-format
+msgid "%s:%s"
+msgstr ""
+
+#: ../src/virtManager/details.py:193
+#, python-format
+msgid "Redirected %s"
+msgstr ""
+
+#: ../src/virtManager/details.py:605
 msgid "_Add Hardware"
 msgstr ""
 
-#: ../src/virtManager/details.py:580
+#: ../src/virtManager/details.py:612
 msgid "_Remove Hardware"
 msgstr ""
 
-#: ../src/virtManager/details.py:674
+#: ../src/virtManager/details.py:706
 msgid "Version"
 msgstr ""
 
-#: ../src/virtManager/details.py:709
+#: ../src/virtManager/details.py:767
 msgid ""
 "Static SELinux security type tells libvirt to always start the guest process "
 "with the specified label. The administrator is responsible for making sure "
@@ -1505,7 +1510,7 @@
 "procesy hosťa so zadaným označením. Za správne označenie obrazov na disku je "
 "zodpovedný správca systému."
 
-#: ../src/virtManager/details.py:711
+#: ../src/virtManager/details.py:769
 msgid ""
 "The dynamic SELinux security type tells libvirt to automatically pick a "
 "unique label for the guest process and guest image, ensuring total isolation "
@@ -1515,69 +1520,69 @@
 "vytvoril jedinečné označenie pre proces hosťovaného stroja a hosťovaného "
 "obrazu, zabezpečujúci úplnú izoláciu stroja. (Predvolené)"
 
-#: ../src/virtManager/details.py:720
+#: ../src/virtManager/details.py:778
 msgid "Libvirt did not detect NUMA capabilities."
 msgstr "Libvirt nezistil funkcie NUMA."
 
-#: ../src/virtManager/details.py:728
+#: ../src/virtManager/details.py:786
 msgid "VCPU"
 msgstr "VCPU"
 
-#: ../src/virtManager/details.py:729
+#: ../src/virtManager/details.py:787
 msgid "On CPU"
 msgstr "K CPU"
 
-#: ../src/virtManager/details.py:730
+#: ../src/virtManager/details.py:788
 msgid "Pinning"
 msgstr "Prepojenie"
 
-#: ../src/virtManager/details.py:987
+#: ../src/virtManager/details.py:1059
 msgid "No text console available"
 msgstr "Žiadna dostupná textová konzola"
 
-#: ../src/virtManager/details.py:1059
+#: ../src/virtManager/details.py:1131
 msgid "No graphical console available"
 msgstr "Žiadna dostupná grafická konzola"
 
-#: ../src/virtManager/details.py:1064
+#: ../src/virtManager/details.py:1136
 #, python-format
 msgid "Graphical Console %s"
 msgstr "Grafická konzola %s"
 
-#: ../src/virtManager/details.py:1147
+#: ../src/virtManager/details.py:1226
 msgid "There are unapplied changes. Would you like to apply them now?"
 msgstr ""
 
-#: ../src/virtManager/details.py:1149
+#: ../src/virtManager/details.py:1228
 msgid "Don't warn me again."
 msgstr ""
 
-#: ../src/virtManager/details.py:1221
+#: ../src/virtManager/details.py:1302
 #, python-format
 msgid "Error refreshing hardware page: %s"
 msgstr "Chyba pri obnovovaní stránky s hardvérom: %s"
 
-#: ../src/virtManager/details.py:1280 ../src/virtManager/manager.py:949
+#: ../src/virtManager/details.py:1361 ../src/virtManager/manager.py:975
 msgid "_Restore"
 msgstr "_Obnoviť"
 
 #. Build VM context menu
-#: ../src/virtManager/details.py:1282 ../src/virtManager/manager.py:315
-#: ../src/virtManager/manager.py:951 ../src/virtManager/systray.py:166
+#: ../src/virtManager/details.py:1363 ../src/virtManager/manager.py:320
+#: ../src/virtManager/manager.py:977 ../src/virtManager/systray.py:169
 #: ../src/vmm-details.glade.h:5 ../src/vmm-manager.glade.h:19
 msgid "_Run"
 msgstr "_Spustiť"
 
-#: ../src/virtManager/details.py:1394
+#: ../src/virtManager/details.py:1476
 #, python-format
 msgid "Error launching hardware dialog: %s"
 msgstr "Chyba pri spúšťaní hardvérového dialógového okna: %s"
 
-#: ../src/virtManager/details.py:1466
+#: ../src/virtManager/details.py:1548
 msgid "Save Virtual Machine Screenshot"
 msgstr "Uložiť snímok obrazovky virtuálneho stroja"
 
-#: ../src/virtManager/details.py:1490
+#: ../src/virtManager/details.py:1572
 #, python-format
 msgid ""
 "The screenshot has been saved to:\n"
@@ -1586,243 +1591,259 @@
 "Snímok obrazovky bude uložený do:\n"
 "%s"
 
-#: ../src/virtManager/details.py:1492
+#: ../src/virtManager/details.py:1574
 msgid "Screenshot saved"
 msgstr "Snímok obrazovky uložený."
 
-#: ../src/virtManager/details.py:1668
-#, python-format
-msgid "Error generating CPU configuration: %s"
-msgstr "Chyba pri generovaní konfigurácie CPU: %s"
+#: ../src/virtManager/details.py:1750
+msgid "Error generating CPU configuration"
+msgstr ""
 
-#: ../src/virtManager/details.py:1702
+#: ../src/virtManager/details.py:1784
 #, python-format
 msgid "Error copying host CPU: %s"
 msgstr "Chyba pri kopírovaní hostiteľského CPU: %s"
 
-#: ../src/virtManager/details.py:1837
+#: ../src/virtManager/details.py:1859
 #, python-format
-msgid "Error apply changes: %s"
+msgid "Error disconnecting media: %s"
 msgstr ""
 
-#: ../src/virtManager/details.py:1964
+#: ../src/virtManager/details.py:1878
 #, python-format
-msgid "Error building pin list: %s"
-msgstr "Chyba pri zostavovaní zoznamu prepojení: %s"
+msgid "Error launching media dialog: %s"
+msgstr ""
 
-#: ../src/virtManager/details.py:1970
+#: ../src/virtManager/details.py:1930
 #, python-format
-msgid "Error pinning vcpus: %s"
-msgstr "Chyba pri prepojovaní vcpu: %s"
+msgid "Error apply changes: %s"
+msgstr ""
 
-#: ../src/virtManager/details.py:2019
+#: ../src/virtManager/details.py:2061
+msgid "Error building pin list"
+msgstr ""
+
+#: ../src/virtManager/details.py:2067
+msgid "Error pinning vcpus"
+msgstr ""
+
+#: ../src/virtManager/details.py:2116
 #, python-format
 msgid "Error changing autostart value: %s"
 msgstr "Chyba pri zmene hodnoty autoštartu: %s"
 
-#: ../src/virtManager/details.py:2037
+#: ../src/virtManager/details.py:2134
 msgid "Cannot set initrd without specifying a kernel path"
 msgstr ""
 
-#: ../src/virtManager/details.py:2040
+#: ../src/virtManager/details.py:2137
 msgid "Cannot set kernel arguments without specifying a kernel path"
 msgstr ""
 
-#: ../src/virtManager/details.py:2047
+#: ../src/virtManager/details.py:2144
 msgid "An init path must be specified"
 msgstr ""
 
-#: ../src/virtManager/details.py:2181
+#: ../src/virtManager/details.py:2278
 #, python-format
 msgid ""
 "You are switching graphics type to %(gtype)s, would you like to %(action)s "
 "Spice agent channels?"
 msgstr ""
 
-#: ../src/virtManager/details.py:2242
+#: ../src/virtManager/details.py:2351
 msgid "Are you sure you want to remove this device?"
 msgstr "Naozaj chcete odstrániť toto zariadenie?"
 
-#: ../src/virtManager/details.py:2249
+#: ../src/virtManager/details.py:2358
 #, python-format
 msgid "Error Removing Device: %s"
 msgstr "Chyba pri odstraňovaní zariadenia: %s"
 
-#: ../src/virtManager/details.py:2265
+#: ../src/virtManager/details.py:2375
 msgid "Device could not be removed from the running machine"
 msgstr "Zariadenie sa nepodarilo z bežiaceho stroja odstrániť"
 
-#: ../src/virtManager/details.py:2267
+#: ../src/virtManager/details.py:2377
 msgid "This change will take effect after the next guest shutdown."
 msgstr ""
 
-#: ../src/virtManager/details.py:2321
+#: ../src/virtManager/details.py:2431
 #, python-format
 msgid "Error changing VM configuration: %s"
 msgstr "Chyba pri nastavovaní stroja: %s"
 
-#: ../src/virtManager/details.py:2331
+#: ../src/virtManager/details.py:2441
 msgid "Some changes may require a guest shutdown to take effect."
 msgstr ""
 
-#: ../src/virtManager/details.py:2334
+#: ../src/virtManager/details.py:2444
 msgid "These changes will take effect after the next guest shutdown."
 msgstr ""
 
-#: ../src/virtManager/details.py:2407 ../src/virtManager/details.py:2411
+#: ../src/virtManager/details.py:2517 ../src/virtManager/details.py:2521
 msgid "unknown"
 msgstr ""
 
-#: ../src/virtManager/details.py:2451 ../src/vmm-add-hardware.glade.h:28
+#: ../src/virtManager/details.py:2562 ../src/vmm-add-hardware.glade.h:28
 msgid "Same as host"
 msgstr "Rovnaké ako hostiteľ"
 
-#: ../src/virtManager/details.py:2551
+#: ../src/virtManager/details.py:2666
 msgid "VCPU info only available for running domain."
 msgstr "Info. o VCPU je dostupné iba na bežiacej doméne."
 
-#: ../src/virtManager/details.py:2556
+#: ../src/virtManager/details.py:2671
 #, python-format
 msgid "Error getting VCPU info: %s"
 msgstr "Chyba pri získavaní info. o VCPU: %s"
 
-#: ../src/virtManager/details.py:2559
+#: ../src/virtManager/details.py:2674
 msgid "Virtual machine does not support runtime VPCU info."
 msgstr "Virtuálny stroj nepodporuje zobrazenie info. o stroji počas behu."
 
-#: ../src/virtManager/details.py:2790
+#: ../src/virtManager/details.py:2907
 msgid "Xen Mouse"
 msgstr "Xen Myš"
 
-#: ../src/virtManager/details.py:2792
+#: ../src/virtManager/details.py:2909
 msgid "PS/2 Mouse"
 msgstr "PS/2 Myš"
 
-#: ../src/virtManager/details.py:2797
+#: ../src/virtManager/details.py:2914
 msgid "Absolute Movement"
 msgstr "Absolútny pohyb"
 
-#: ../src/virtManager/details.py:2799
+#: ../src/virtManager/details.py:2916
 msgid "Relative Movement"
 msgstr "Relatívny pohyb"
 
-#: ../src/virtManager/details.py:2834
+#: ../src/virtManager/details.py:2951
 msgid "Automatically allocated"
 msgstr "Automaticky rezervované"
 
-#: ../src/virtManager/details.py:2842
+#: ../src/virtManager/details.py:2959
 #, python-format
 msgid "%(graphicstype)s Server"
 msgstr "%(graphicstype)s server"
 
-#: ../src/virtManager/details.py:2865
+#: ../src/virtManager/details.py:2982
 msgid "Local SDL Window"
 msgstr "Lokálne SDL okno"
 
-#: ../src/virtManager/details.py:2938
+#: ../src/virtManager/details.py:3069
 msgid "Serial Device"
 msgstr "Sériové zariadenie"
 
-#: ../src/virtManager/details.py:2940
+#: ../src/virtManager/details.py:3071
 msgid "Parallel Device"
 msgstr "Paralelné zariadenie"
 
-#: ../src/virtManager/details.py:2942
+#: ../src/virtManager/details.py:3073
 msgid "Console Device"
 msgstr "Konzolové zariadenie"
 
-#: ../src/virtManager/details.py:2944
+#: ../src/virtManager/details.py:3075
 msgid "Channel Device"
 msgstr "Kanálové zariadenie"
 
-#: ../src/virtManager/details.py:2946
+#: ../src/virtManager/details.py:3077
 #, python-format
 msgid "%s Device"
 msgstr "%s zariadenie"
 
-#: ../src/virtManager/details.py:2951
+#: ../src/virtManager/details.py:3082
 msgid "Primary Console"
 msgstr "Hlavná konzola"
 
-#: ../src/virtManager/details.py:3199
+#: ../src/virtManager/details.py:3155 ../src/virtManager/details.py:3186
+#: ../src/virtManager/details.py:3188 ../src/vmm-add-hardware.glade.h:55
+msgid "Default"
+msgstr ""
+
+#: ../src/virtManager/details.py:3365
 msgid "Tablet"
 msgstr "Tablet"
 
-#: ../src/virtManager/details.py:3202
+#: ../src/virtManager/details.py:3368
 msgid "Mouse"
 msgstr "Myš"
 
-#: ../src/virtManager/details.py:3211
+#: ../src/virtManager/details.py:3377
 #, python-format
 msgid "Display %s"
 msgstr "Displej %s"
 
-#: ../src/virtManager/details.py:3217
+#: ../src/virtManager/details.py:3383
 #, python-format
 msgid "Sound: %s"
 msgstr "Zvuk: %s"
 
-#: ../src/virtManager/details.py:3245
+#: ../src/virtManager/details.py:3422
 msgid "Video"
 msgstr "Video"
 
-#: ../src/virtManager/details.py:3249
+#: ../src/virtManager/details.py:3426
 msgid "Watchdog"
 msgstr "Ochranný časovač"
 
-#: ../src/virtManager/details.py:3256
+#: ../src/virtManager/details.py:3437
 #, python-format
 msgid "Controller %s"
 msgstr "Radič %s"
 
-#: ../src/virtManager/details.py:3263
+#: ../src/virtManager/details.py:3444
 #, python-format
 msgid "Filesystem %s"
 msgstr ""
 
-#: ../src/virtManager/domain.py:316
+#: ../src/virtManager/domain.py:327
 #, python-format
 msgid "Could not find specified device in the inactive VM configuration: %s"
 msgstr ""
 "Nepodarilo sa nájsť zadané zariadenie v konfigurácii neaktívneho stroja: %s"
 
-#: ../src/virtManager/domain.py:374
+#: ../src/virtManager/domain.py:385
 msgid "Cannot rename an active guest"
 msgstr "Aktívny hosť sa nedá premenovať"
 
-#: ../src/virtManager/domain.py:1048
+#: ../src/virtManager/domain.py:1112
 msgid "Cannot start guest while cloning operation in progress"
 msgstr "Počas operácie klonovania sa hosťovaný stroj nedá spustiť"
 
-#: ../src/virtManager/domain.py:1062
+#: ../src/virtManager/domain.py:1131
 msgid "Cannot resume guest while cloning operation in progress"
 msgstr "Počas operácie klonovania sa beh hosťovaného stroja nedá obnoviť"
 
-#: ../src/virtManager/domain.py:1077
+#: ../src/virtManager/domain.py:1146
 msgid "Saving domain to disk"
 msgstr "Ukladanie domény na disk"
 
-#: ../src/virtManager/domain.py:1121
+#: ../src/virtManager/domain.py:1190
 msgid "Migrating domain"
 msgstr "Presúvanie domény"
 
-#: ../src/virtManager/domain.py:1331
+#: ../src/virtManager/domain.py:1400
 msgid "Running"
 msgstr "Spustený"
 
-#: ../src/virtManager/domain.py:1333
+#: ../src/virtManager/domain.py:1402
 msgid "Paused"
 msgstr "Pozastavený"
 
-#: ../src/virtManager/domain.py:1335
+#: ../src/virtManager/domain.py:1404
 msgid "Shutting Down"
 msgstr "Vypínanie"
 
-#: ../src/virtManager/domain.py:1337
+#: ../src/virtManager/domain.py:1407
+msgid "Saved"
+msgstr ""
+
+#: ../src/virtManager/domain.py:1409
 msgid "Shutoff"
 msgstr "Vypnutý"
 
-#: ../src/virtManager/domain.py:1339
+#: ../src/virtManager/domain.py:1411
 msgid "Crashed"
 msgstr "Zhavarovaný"
 
@@ -2069,7 +2090,7 @@
 msgid "Input Error"
 msgstr "Chyba vstupu"
 
-#: ../src/virtManager/error.py:193 ../src/vmm-details.glade.h:29
+#: ../src/virtManager/error.py:204 ../src/vmm-details.glade.h:29
 msgid "Details"
 msgstr "Podrobnosti"
 
@@ -2077,253 +2098,253 @@
 msgid "Copy Volume Path"
 msgstr "Cesta ku kópii zväzku"
 
-#: ../src/virtManager/host.py:370
+#: ../src/virtManager/host.py:372
 #, python-format
 msgid "%(currentmem)s of %(maxmem)s"
 msgstr "%(currentmem)s z %(maxmem)s"
 
-#: ../src/virtManager/host.py:384 ../src/virtManager/host.py:385
-#: ../src/virtManager/host.py:386
+#: ../src/virtManager/host.py:386 ../src/virtManager/host.py:387
+#: ../src/virtManager/host.py:388
 msgid "Connection not active."
 msgstr "pripojenie nie je aktívne."
 
-#: ../src/virtManager/host.py:391
+#: ../src/virtManager/host.py:393
 msgid "Libvirt connection does not support virtual network management."
 msgstr "Pripojenie k libvirt nepodporuje správu virtuálnej siete."
 
-#: ../src/virtManager/host.py:396
+#: ../src/virtManager/host.py:398
 msgid "Libvirt connection does not support storage management."
 msgstr "Pripojenie k libvirt nepodporuje správu úložiska."
 
-#: ../src/virtManager/host.py:400
+#: ../src/virtManager/host.py:402
 msgid "Libvirt connection does not support interface management."
 msgstr "Pripojenie k libvirt nepodporuje správu rozhraní."
 
-#: ../src/virtManager/host.py:415
+#: ../src/virtManager/host.py:417
 #, python-format
 msgid "Are you sure you want to permanently delete the network %s?"
 msgstr "Naozaj chcete natrvalo odstrániť sieť s názvom %s?"
 
-#: ../src/virtManager/host.py:422
+#: ../src/virtManager/host.py:424
 #, python-format
 msgid "Error deleting network '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:431
+#: ../src/virtManager/host.py:433
 #, python-format
 msgid "Error starting network '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:440
+#: ../src/virtManager/host.py:442
 #, python-format
 msgid "Error stopping network '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:449
+#: ../src/virtManager/host.py:451
 #, python-format
 msgid "Error launching network wizard: %s"
 msgstr "Chyba pri spúšťaní sprievodcu sieťou: %s"
 
-#: ../src/virtManager/host.py:461
+#: ../src/virtManager/host.py:463
 #, python-format
 msgid "Error setting net autostart: %s"
 msgstr "Chyba pri zapínaní autoštartu: %s"
 
-#: ../src/virtManager/host.py:468 ../src/virtManager/host.py:539
-#: ../src/virtManager/host.py:740 ../src/virtManager/host.py:789
+#: ../src/virtManager/host.py:470 ../src/virtManager/host.py:541
+#: ../src/virtManager/host.py:742 ../src/virtManager/host.py:791
 msgid "On Boot"
 msgstr "Pri zavádzaní"
 
-#: ../src/virtManager/host.py:469 ../src/virtManager/host.py:539
-#: ../src/virtManager/host.py:573 ../src/virtManager/host.py:741
-#: ../src/virtManager/host.py:789 ../src/virtManager/host.py:829
+#: ../src/virtManager/host.py:471 ../src/virtManager/host.py:541
+#: ../src/virtManager/host.py:575 ../src/virtManager/host.py:743
+#: ../src/virtManager/host.py:791 ../src/virtManager/host.py:831
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../src/virtManager/host.py:503
+#: ../src/virtManager/host.py:505
 msgid "No virtual network selected."
 msgstr "Nebola vybraná virtuálna sieť."
 
-#: ../src/virtManager/host.py:513
+#: ../src/virtManager/host.py:515
 #, python-format
 msgid "Error selecting network: %s"
 msgstr "Chyba pri výbere siete: %s"
 
-#: ../src/virtManager/host.py:581
+#: ../src/virtManager/host.py:583
 msgid "Isolated virtual network"
 msgstr "Izolovaná virtuálna sieť"
 
-#: ../src/virtManager/host.py:614
+#: ../src/virtManager/host.py:616
 #, python-format
 msgid "Error stopping pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:623
+#: ../src/virtManager/host.py:625
 #, python-format
 msgid "Error starting pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:630
+#: ../src/virtManager/host.py:632
 #, python-format
 msgid "Are you sure you want to permanently delete the pool %s?"
 msgstr "Naozaj chcete nenávratne odstrániť fond %s?"
 
-#: ../src/virtManager/host.py:637
+#: ../src/virtManager/host.py:639
 #, python-format
 msgid "Error deleting pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:650
+#: ../src/virtManager/host.py:652
 #, python-format
 msgid "Error refreshing pool '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:657
+#: ../src/virtManager/host.py:659
 #, python-format
 msgid "Are you sure you want to permanently delete the volume %s?"
 msgstr "Naozaj chcete nenávratne odstrániť zväzok %s?"
 
-#: ../src/virtManager/host.py:669
+#: ../src/virtManager/host.py:671
 #, python-format
 msgid "Error refreshing volume '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:678
+#: ../src/virtManager/host.py:680
 #, python-format
 msgid "Error launching pool wizard: %s"
 msgstr "Chyba pri spúšťaní sprievodcu vytvorením fondu: %s"
 
-#: ../src/virtManager/host.py:695 ../src/virtManager/storagebrowse.py:286
+#: ../src/virtManager/host.py:697 ../src/virtManager/storagebrowse.py:289
 #, python-format
 msgid "Error launching volume wizard: %s"
 msgstr "Chyba pri spúšťaní sprievodcu vytvorením zväzku: %s"
 
-#: ../src/virtManager/host.py:733
+#: ../src/virtManager/host.py:735
 #, python-format
 msgid "Error setting pool autostart: %s"
 msgstr "Chyba pri automatickom spúšťaní fondu: %s"
 
-#: ../src/virtManager/host.py:753
+#: ../src/virtManager/host.py:755
 msgid "No storage pool selected."
 msgstr "Žiadny vybraný fond úložísk."
 
-#: ../src/virtManager/host.py:763
+#: ../src/virtManager/host.py:765
 #, python-format
 msgid "Error selecting pool: %s"
 msgstr "Chyba pri vyberaní fondu: %s"
 
-#: ../src/virtManager/host.py:903
+#: ../src/virtManager/host.py:914
 #, python-format
 msgid "Are you sure you want to stop the interface '%s'?"
 msgstr "Naozaj chcete zastaviť rozhranie '%s'?"
 
-#: ../src/virtManager/host.py:909
+#: ../src/virtManager/host.py:920
 #, python-format
 msgid "Error stopping interface '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:918
+#: ../src/virtManager/host.py:929
 #, python-format
 msgid "Are you sure you want to start the interface '%s'?"
 msgstr "Naozaj chcete spustiť rozhranie '%s'?"
 
-#: ../src/virtManager/host.py:924
+#: ../src/virtManager/host.py:935
 #, python-format
 msgid "Error starting interface '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:931
+#: ../src/virtManager/host.py:942
 #, python-format
 msgid "Are you sure you want to permanently delete the interface %s?"
 msgstr "Naozaj chcete natrvalo odstrániť rozhranie %s?"
 
-#: ../src/virtManager/host.py:939
+#: ../src/virtManager/host.py:950
 #, python-format
 msgid "Error deleting interface '%s'"
 msgstr ""
 
-#: ../src/virtManager/host.py:948
+#: ../src/virtManager/host.py:959
 #, python-format
 msgid "Error launching interface wizard: %s"
 msgstr "Chyba pri spúšťaní sprievodcu rozhraním: %s"
 
-#: ../src/virtManager/host.py:981
+#: ../src/virtManager/host.py:992
 #, python-format
 msgid "Error setting interface startmode: %s"
 msgstr "Chyba pri nastavovaní režimu štartu rozhrania: %s"
 
-#: ../src/virtManager/host.py:1000
+#: ../src/virtManager/host.py:1011
 msgid "No interface selected."
 msgstr "Žiadne vybrané rozhranie."
 
-#: ../src/virtManager/host.py:1010
+#: ../src/virtManager/host.py:1021
 #, python-format
 msgid "Error selecting interface: %s"
 msgstr "Chyba pri výbere rozhrania? %s"
 
-#: ../src/virtManager/manager.py:316 ../src/virtManager/systray.py:153
+#: ../src/virtManager/manager.py:321 ../src/virtManager/systray.py:156
 #: ../src/vmm-details.glade.h:6 ../src/vmm-manager.glade.h:21
 msgid "_Pause"
 msgstr "Po_zastaviť"
 
-#: ../src/virtManager/manager.py:317
+#: ../src/virtManager/manager.py:322
 msgid "R_esume"
 msgstr "P_okračovať"
 
-#: ../src/virtManager/manager.py:319 ../src/virtManager/manager.py:322
-#: ../src/virtManager/systray.py:180 ../src/virtManager/systray.py:198
-#: ../src/virtManager/uihelpers.py:830
+#: ../src/virtManager/manager.py:324 ../src/virtManager/manager.py:327
+#: ../src/virtManager/systray.py:183 ../src/virtManager/systray.py:201
+#: ../src/virtManager/uihelpers.py:849
 msgid "_Shut Down"
 msgstr "_Vypnúť"
 
 #. Shutdown menu
-#: ../src/virtManager/manager.py:321 ../src/virtManager/systray.py:173
-#: ../src/virtManager/uihelpers.py:824 ../src/vmm-details.glade.h:8
+#: ../src/virtManager/manager.py:326 ../src/virtManager/systray.py:176
+#: ../src/virtManager/uihelpers.py:843 ../src/vmm-details.glade.h:8
 msgid "_Reboot"
 msgstr "_Reštartovať"
 
-#: ../src/virtManager/manager.py:324 ../src/virtManager/systray.py:187
-#: ../src/virtManager/uihelpers.py:836 ../src/vmm-details.glade.h:9
+#: ../src/virtManager/manager.py:329 ../src/virtManager/systray.py:190
+#: ../src/virtManager/uihelpers.py:855 ../src/vmm-details.glade.h:9
 msgid "_Force Off"
 msgstr "_Natvrdo vypnúť"
 
-#: ../src/virtManager/manager.py:327 ../src/virtManager/uihelpers.py:846
+#: ../src/virtManager/manager.py:332 ../src/virtManager/uihelpers.py:865
 msgid "Sa_ve"
 msgstr "_Uložiť"
 
-#: ../src/virtManager/manager.py:330
+#: ../src/virtManager/manager.py:335
 msgid "_Clone..."
 msgstr "_Klovnovať..."
 
-#: ../src/virtManager/manager.py:331 ../src/vmm-details.glade.h:11
+#: ../src/virtManager/manager.py:336 ../src/vmm-details.glade.h:11
 msgid "_Migrate..."
 msgstr "_Migrovať..."
 
-#: ../src/virtManager/manager.py:332
+#: ../src/virtManager/manager.py:337
 msgid "_Delete"
 msgstr "O_dstrániť"
 
-#: ../src/virtManager/manager.py:346
+#: ../src/virtManager/manager.py:351
 msgid "D_etails"
 msgstr ""
 
-#: ../src/virtManager/manager.py:409
+#: ../src/virtManager/manager.py:414
 msgid "CPU usage"
 msgstr "Využitie procesora"
 
-#: ../src/virtManager/manager.py:413
+#: ../src/virtManager/manager.py:418
 msgid "Host CPU usage"
 msgstr ""
 
-#: ../src/virtManager/manager.py:417
+#: ../src/virtManager/manager.py:422
 msgid "Disk I/O"
 msgstr "Aktivita diskov"
 
-#: ../src/virtManager/manager.py:421
+#: ../src/virtManager/manager.py:426
 msgid "Network I/O"
 msgstr "Aktivita siete"
 
-#: ../src/virtManager/manager.py:549
+#: ../src/virtManager/manager.py:554
 #, python-format
 msgid ""
 "This will remove the connection:\n"
@@ -2338,43 +2359,69 @@
 "\n"
 "Naozaj to chcete?"
 
-#: ../src/virtManager/manager.py:649
+#: ../src/virtManager/manager.py:654
+#, python-format
 msgid ""
-"Unable to open a connection to the Xen hypervisor/daemon.\n"
+"Unable to connect to libvirt:\n"
 "\n"
-msgstr ""
-"Nedá sa otvoriť pripojenie k hypovízoru Xen alebo démonu.\n"
+"%s\n"
 "\n"
-
-#: ../src/virtManager/manager.py:654 ../src/virtManager/manager.py:665
-msgid "Virtual Machine Manager Connection Failure"
-msgstr "Zlyhanie pripojenia k správcovi virtuálnych strojov"
+msgstr ""
 
 #: ../src/virtManager/manager.py:657
 msgid ""
-"Unable to open a connection to the libvirt management daemon.\n"
+"Verify that:\n"
+" - A Xen host kernel was booted\n"
+" - The Xen service has been started\n"
+msgstr ""
+
+#: ../src/virtManager/manager.py:667
+msgid ""
 "\n"
+" - The remote netcat understands the '-U' option"
 msgstr ""
-"Nedá sa otvoriť pripojenie k démonu správcu libvirt.\n"
+
+#: ../src/virtManager/manager.py:670
+msgid ""
+"Could not detect a local session: if you are \n"
+"running virt-manager over ssh -X or VNC, you \n"
+"may not be able to connect to libvirt as a \n"
+"regular user. Try running as root.\n"
 "\n"
+msgstr ""
+
+#: ../src/virtManager/manager.py:675
+msgid "Verify that:\n"
+msgstr ""
 
-#: ../src/virtManager/manager.py:702
+#: ../src/virtManager/manager.py:686
+#, python-format
+msgid ""
+"Libvirt URI is: %s\n"
+"\n"
+msgstr ""
+
+#: ../src/virtManager/manager.py:690
+msgid "Virtual Machine Manager Connection Failure"
+msgstr "Zlyhanie pripojenia k správcovi virtuálnych strojov"
+
+#: ../src/virtManager/manager.py:727
 msgid "Double click to connect"
 msgstr "Dvojitým kliknutím sa pripojíte"
 
-#: ../src/virtManager/manager.py:707
+#: ../src/virtManager/manager.py:734
 msgid "Not Connected"
 msgstr "Nepripojené"
 
-#: ../src/virtManager/manager.py:709
+#: ../src/virtManager/manager.py:736
 msgid "Connecting..."
 msgstr "Pripája sa..."
 
-#: ../src/virtManager/manager.py:1103
+#: ../src/virtManager/manager.py:1129
 msgid "Disabled in preferences dialog."
 msgstr "Zakázané v nastaveniach."
 
-#: ../src/virtManager/manager.py:1109
+#: ../src/virtManager/manager.py:1135
 msgid " (disabled)"
 msgstr " (zakázané)"
 
@@ -2386,19 +2433,19 @@
 msgid "Media Unknown"
 msgstr "Neznáme médium"
 
-#: ../src/virtManager/migrate.py:125
+#: ../src/virtManager/migrate.py:127
 msgid "Migrate"
 msgstr "Presunúť"
 
-#: ../src/virtManager/migrate.py:153
+#: ../src/virtManager/migrate.py:155
 msgid "Libvirt version does not support setting downtime."
 msgstr "Táto verzia libvirt neumožnuje nastaviť čas nedostupnosti."
 
-#: ../src/virtManager/migrate.py:169
+#: ../src/virtManager/migrate.py:171
 msgid "Libvirt version does not support tunnelled migration."
 msgstr "Táto verzia libvirt nepodporuje prenos cez tunel."
 
-#: ../src/virtManager/migrate.py:186
+#: ../src/virtManager/migrate.py:188
 msgid "A valid destination connection must be selected."
 msgstr "Musí byť vybrané platné cieľové pripojenie."
 
@@ -2407,7 +2454,7 @@
 #. /etc/hosts is likely borked and the only hostname it will
 #. give us is localhost. Remember, the dest machine can actually
 #. be our local machine so we may not already know its hostname
-#: ../src/virtManager/migrate.py:267
+#: ../src/virtManager/migrate.py:269
 msgid ""
 "Could not determine remotely accessible hostname for destination connection."
 msgstr "Nebolo možné určiť adresu vzdialenej stanice pre cieľové pripojenie."
@@ -2440,22 +2487,22 @@
 msgid "Port must be greater than 0."
 msgstr "Port musí byť väčší ako 0."
 
-#: ../src/virtManager/migrate.py:482
+#: ../src/virtManager/migrate.py:483
 #, python-format
 msgid "Migrating VM '%s'"
 msgstr "Presúvanie stroja '%s'"
 
-#: ../src/virtManager/migrate.py:483
+#: ../src/virtManager/migrate.py:484
 #, python-format
 msgid "Migrating VM '%s' from %s to %s. This may take awhile."
 msgstr "Presúvanie stroja '%s' z %s do %s. Môže to chvíľu trvať."
 
-#: ../src/virtManager/migrate.py:495
+#: ../src/virtManager/migrate.py:496
 #, python-format
 msgid "Unable to migrate guest: %s"
 msgstr "Nepodarilo sa presunúť hosťovaný stroj: %s"
 
-#: ../src/virtManager/migrate.py:527
+#: ../src/virtManager/migrate.py:528
 #, python-format
 msgid "Error cancelling migrate job: %s"
 msgstr "Chyba pri rušení prsúvania: %s"
@@ -2478,15 +2525,11 @@
 msgid "Isolated network"
 msgstr "Izolovaná sieť"
 
-#: ../src/virtManager/preferences.py:178
-msgid "Installed version of GTK-VNC doesn't support configurable grab keys"
-msgstr "Nainštalovaná verzia GTK-VNC neumožňuje meniť nastavenie kláves"
-
-#: ../src/virtManager/preferences.py:234
+#: ../src/virtManager/preferences.py:248
 msgid "Configure grab key combination"
 msgstr "Nastaviť zachytávajúcu kombináciu kláves"
 
-#: ../src/virtManager/preferences.py:243
+#: ../src/virtManager/preferences.py:257
 msgid ""
 "You can now define grab keys by pressing them.\n"
 "To confirm your selection please click OK button\n"
@@ -2496,54 +2539,62 @@
 "Po dokončení výberu požadovaných kláves,\n"
 "kliknite na tlačidlo OK."
 
-#: ../src/virtManager/preferences.py:246
+#: ../src/virtManager/preferences.py:260
 msgid "Please press desired grab key combination"
 msgstr "Stlačte požadovanú zachytávajúcu kombináciu kláves"
 
-#: ../src/virtManager/serialcon.py:259
+#: ../src/virtManager/serialcon.py:195
+msgid "Cannot open a device with no alias name"
+msgstr ""
+
+#: ../src/virtManager/serialcon.py:267
 msgid "Serial console not yet supported over remote connection"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:262
+#: ../src/virtManager/serialcon.py:270
 msgid "Serial console not available for inactive guest"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:264
+#: ../src/virtManager/serialcon.py:272
 #, python-format
 msgid "Console for device type '%s' not yet supported"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:269
+#: ../src/virtManager/serialcon.py:277
 #, python-format
 msgid "Can not access console path '%s'"
 msgstr ""
 
-#: ../src/virtManager/serialcon.py:371
+#: ../src/virtManager/serialcon.py:381
+msgid "vte2 is required for text console support"
+msgstr ""
+
+#: ../src/virtManager/serialcon.py:388
 #, python-format
 msgid "Error connecting to text console: %s"
 msgstr ""
 
-#: ../src/virtManager/storagebrowse.py:133
+#: ../src/virtManager/storagebrowse.py:135
 msgid "Size"
 msgstr "Veľkosť"
 
-#: ../src/virtManager/storagebrowse.py:141 ../src/vmm-create-pool.glade.h:18
+#: ../src/virtManager/storagebrowse.py:143 ../src/vmm-create-pool.glade.h:18
 msgid "Format"
 msgstr "Formát"
 
-#: ../src/virtManager/storagebrowse.py:149
+#: ../src/virtManager/storagebrowse.py:151
 msgid "Used By"
 msgstr "Používa"
 
-#: ../src/virtManager/storagebrowse.py:189
+#: ../src/virtManager/storagebrowse.py:191
 msgid "Cannot use local storage on remote connection."
 msgstr "Lokálne úložisko sa nedá použiť pri vzdialenom pripojení."
 
-#: ../src/virtManager/systray.py:159
+#: ../src/virtManager/systray.py:162
 msgid "_Resume"
 msgstr "_Pokračovať"
 
-#: ../src/virtManager/systray.py:332 ../src/virtManager/systray.py:384
+#: ../src/virtManager/systray.py:335 ../src/virtManager/systray.py:387
 msgid "No virtual machines"
 msgstr "Žiadne virtuálne stroje"
 
@@ -2577,106 +2628,106 @@
 msgstr "Nebolo možné spustiť fond úložísk '%s': %s"
 
 #. [xml value, label]
-#: ../src/virtManager/uihelpers.py:289
+#: ../src/virtManager/uihelpers.py:308
 msgid "Hypervisor default"
 msgstr "Predvolené hypervízorom"
 
-#: ../src/virtManager/uihelpers.py:393
+#: ../src/virtManager/uihelpers.py:412
 msgid "Usermode networking"
 msgstr "Sieť v používateľskom režime"
 
-#: ../src/virtManager/uihelpers.py:399
+#: ../src/virtManager/uihelpers.py:418
 msgid "Virtual network"
 msgstr "Virtuálna sieť"
 
-#: ../src/virtManager/uihelpers.py:525
+#: ../src/virtManager/uihelpers.py:544
 msgid "No virtual networks available"
 msgstr "Nie sú dostupné žiadne virtuálne siete"
 
-#: ../src/virtManager/uihelpers.py:547
+#: ../src/virtManager/uihelpers.py:566
 msgid "(Empty bridge)"
 msgstr "(Prázdne premostenie)"
 
-#: ../src/virtManager/uihelpers.py:554
+#: ../src/virtManager/uihelpers.py:573
 msgid "macvtap"
 msgstr ""
 
-#: ../src/virtManager/uihelpers.py:557
+#: ../src/virtManager/uihelpers.py:576
 msgid "Not bridged"
 msgstr "Nepremostené"
 
-#: ../src/virtManager/uihelpers.py:559
+#: ../src/virtManager/uihelpers.py:578
 #, python-format
 msgid "Host device %s %s"
 msgstr "Zariadenie hostiteľa %s %s"
 
-#: ../src/virtManager/uihelpers.py:597
+#: ../src/virtManager/uihelpers.py:616
 msgid "No networking"
 msgstr ""
 
 #. After all is said and done, add a manual bridge option
-#: ../src/virtManager/uihelpers.py:602
+#: ../src/virtManager/uihelpers.py:621
 msgid "Specify shared device name"
 msgstr "Určte názov zdielaného zariadenia"
 
-#: ../src/virtManager/uihelpers.py:621
+#: ../src/virtManager/uihelpers.py:640
 msgid "Virtual Network is not active."
 msgstr "Virtuálna sieť nie je aktívna."
 
-#: ../src/virtManager/uihelpers.py:622
+#: ../src/virtManager/uihelpers.py:641
 #, python-format
 msgid ""
 "Virtual Network '%s' is not active. Would you like to start the network now?"
 msgstr ""
 "Virtuálna sieť '%s' nie je aktívna. Chcete aby sa sieť spustila teraz?"
 
-#: ../src/virtManager/uihelpers.py:634
+#: ../src/virtManager/uihelpers.py:653
 #, python-format
 msgid "Could not start virtual network '%s': %s"
 msgstr "Nepodarilo sa spustiť virtuálnu sieť '%s': %s"
 
-#: ../src/virtManager/uihelpers.py:657
+#: ../src/virtManager/uihelpers.py:676
 msgid "Error with network parameters."
 msgstr "Chyba sieťových parametrov."
 
-#: ../src/virtManager/uihelpers.py:662 ../src/virtManager/uihelpers.py:664
+#: ../src/virtManager/uihelpers.py:681 ../src/virtManager/uihelpers.py:683
 msgid "Mac address collision."
 msgstr "Kolízia MAC adries."
 
-#: ../src/virtManager/uihelpers.py:665
+#: ../src/virtManager/uihelpers.py:684
 #, python-format
 msgid "%s Are you sure you want to use this address?"
 msgstr "%s Naozaj chcete použiť túto adresu?"
 
-#: ../src/virtManager/uihelpers.py:717
+#: ../src/virtManager/uihelpers.py:736
 msgid "No device present"
 msgstr "Žiadne zariadenie"
 
-#: ../src/virtManager/uihelpers.py:874
+#: ../src/virtManager/uihelpers.py:893
 #, python-format
 msgid "The emulator may not have search permissions for the path '%s'."
 msgstr "Emulátor možno nemá právo na prechádzanie cesty '%s'."
 
-#: ../src/virtManager/uihelpers.py:876
+#: ../src/virtManager/uihelpers.py:895
 msgid "Do you want to correct this now?"
 msgstr "Chcete to teraz opraviť?"
 
-#: ../src/virtManager/uihelpers.py:877 ../src/virtManager/uihelpers.py:901
+#: ../src/virtManager/uihelpers.py:896 ../src/virtManager/uihelpers.py:920
 msgid "Don't ask about these directories again."
 msgstr "Viac sa to pri týchto priečinkoch nepýtať."
 
-#: ../src/virtManager/uihelpers.py:890
+#: ../src/virtManager/uihelpers.py:909
 msgid ""
 "Errors were encountered changing permissions for the following directories:"
 msgstr ""
 "Nastali chyby pri zmene nastavení oprávnení pre nasledujúce priečinky:"
 
-#: ../src/virtManager/util.py:69
+#: ../src/virtManager/util.py:71
 #, python-format
 msgid "Couldn't create default storage pool '%s': %s"
 msgstr "Nebolo možné vytvoriť predvolený fond úložísk '%s': %s"
 
-#: ../src/virtManager/util.py:378
+#: ../src/virtManager/util.py:384
 msgid "Don't ask me again"
 msgstr ""
 
@@ -2725,9 +2776,9 @@
 msgid "Select _managed or other existing storage"
 msgstr "Vybrať _spravované alebo iné existujúce úložisko"
 
-#: ../src/vmm-add-hardware.glade.h:7 ../src/vmm-create.glade.h:29
-msgid "B_rowse..."
-msgstr "P_rechádzať..."
+#: ../src/vmm-add-hardware.glade.h:7 ../src/vmm-create.glade.h:19
+msgid "Bro_wse..."
+msgstr "_Prechádzať..."
 
 #: ../src/vmm-add-hardware.glade.h:8
 msgid "Device Type Field"
@@ -2737,13 +2788,13 @@
 msgid "_Device type:"
 msgstr "Typ _zariadenia:"
 
-#: ../src/vmm-add-hardware.glade.h:10
-msgid "Cache _mode:"
+#: ../src/vmm-add-hardware.glade.h:10 ../src/vmm-details.glade.h:129
+msgid "Cac_he mode:"
 msgstr "Režim _vyrovnávacej pamäte:"
 
 #: ../src/vmm-add-hardware.glade.h:11
-msgid "Storage _format:"
-msgstr "_Formát úložiska:"
+msgid "S_torage format:"
+msgstr ""
 
 #: ../src/vmm-add-hardware.glade.h:12
 msgid ""
@@ -2774,7 +2825,7 @@
 msgstr "Zariadenie _hostiteľa:"
 
 #: ../src/vmm-add-hardware.glade.h:18 ../src/vmm-create.glade.h:57
-#: ../src/vmm-details.glade.h:136
+#: ../src/vmm-details.glade.h:138
 msgid "_Bridge name:"
 msgstr "_Názov premostenia:"
 
@@ -2822,7 +2873,7 @@
 msgid "Listen on all public network interfaces "
 msgstr "Načúvať na všetkých verejných sieťových rozhraniach "
 
-#: ../src/vmm-add-hardware.glade.h:27 ../src/vmm-details.glade.h:149
+#: ../src/vmm-add-hardware.glade.h:27 ../src/vmm-details.glade.h:151
 msgid "_Keymap:"
 msgstr "_Mapovanie kláves:"
 
@@ -2869,9 +2920,11 @@
 msgid "<b>Character Device</b>"
 msgstr "<b>Znakové zariadenie</b>"
 
-#: ../src/vmm-add-hardware.glade.h:39 ../src/vmm-host.glade.h:19
-msgid "Name:"
-msgstr "Názov:"
+#: ../src/vmm-add-hardware.glade.h:39 ../src/vmm-create-interface.glade.h:35
+#: ../src/vmm-create-pool.glade.h:5 ../src/vmm-create-vol.glade.h:5
+#: ../src/vmm-create.glade.h:5 ../src/vmm-details.glade.h:48
+msgid "_Name:"
+msgstr "_Názov:"
 
 #: ../src/vmm-add-hardware.glade.h:40
 msgid "Use Te_lnet:"
@@ -2903,7 +2956,7 @@
 msgstr "<b>Parametere zariadenia</b>"
 
 #: ../src/vmm-add-hardware.glade.h:47 ../src/vmm-create-pool.glade.h:17
-#: ../src/vmm-details.glade.h:150
+#: ../src/vmm-details.glade.h:64
 msgid "label"
 msgstr "označenie"
 
@@ -2933,25 +2986,41 @@
 "access in the guest."
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:55
-msgid "Default"
+#: ../src/vmm-add-hardware.glade.h:56
+msgid "_Driver:"
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:56
+#: ../src/vmm-add-hardware.glade.h:57
+msgid "_Write Policy:"
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:58
 msgid "Ta_rget path:"
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:57 ../src/vmm-choose-cd.glade.h:2
+#: ../src/vmm-add-hardware.glade.h:59
+msgid "E_xport filesystem as readonly mount"
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:60 ../src/vmm-choose-cd.glade.h:2
 #: ../src/vmm-clone.glade.h:12
 msgid "_Browse..."
 msgstr "_Prechádzať..."
 
-#: ../src/vmm-add-hardware.glade.h:58
+#: ../src/vmm-add-hardware.glade.h:61
 msgid ""
 "Please indicate what smartcard device mode to connect to the virtual machine."
 msgstr ""
 
-#: ../src/vmm-add-hardware.glade.h:59 ../src/vmm-create-interface.glade.h:44
+#: ../src/vmm-add-hardware.glade.h:62
+msgid "Please indicate the parameters of the redirected device."
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:63
+msgid "_Host:"
+msgstr ""
+
+#: ../src/vmm-add-hardware.glade.h:64 ../src/vmm-create-interface.glade.h:44
 #: ../src/vmm-create-net.glade.h:56 ../src/vmm-create-pool.glade.h:19
 #: ../src/vmm-create-vol.glade.h:25 ../src/vmm-create.glade.h:63
 msgid "_Finish"
@@ -3203,12 +3272,6 @@
 msgid "_Interface type:"
 msgstr "_Typ rozhrania:"
 
-#: ../src/vmm-create-interface.glade.h:35 ../src/vmm-create-pool.glade.h:5
-#: ../src/vmm-create-vol.glade.h:5 ../src/vmm-create.glade.h:5
-#: ../src/vmm-details.glade.h:48
-msgid "_Name:"
-msgstr "_Názov:"
-
 #: ../src/vmm-create-interface.glade.h:36
 msgid "_Start mode:"
 msgstr "Režim _spustenia:"
@@ -3324,7 +3387,7 @@
 "You will need to choose an IPv4 address space for the virtual network:"
 msgstr "Je potrebné zadať adresný priestor IPv4 pre vašu virtuálnu sieť:"
 
-#: ../src/vmm-create-net.glade.h:18 ../src/vmm-details.glade.h:68
+#: ../src/vmm-create-net.glade.h:18 ../src/vmm-details.glade.h:70
 msgid "Type:"
 msgstr "Typ:"
 
@@ -3573,7 +3636,7 @@
 msgstr "dostupné miesto:"
 
 #: ../src/vmm-create-vol.glade.h:8 ../src/vmm-create.glade.h:42
-#: ../src/vmm-details.glade.h:104
+#: ../src/vmm-details.glade.h:106
 msgid "MB"
 msgstr "MB"
 
@@ -3674,10 +3737,6 @@
 msgid "Use _ISO image:"
 msgstr "Použiť _ISO obraz:"
 
-#: ../src/vmm-create.glade.h:19
-msgid "Bro_wse..."
-msgstr "_Prechádzať..."
-
 #: ../src/vmm-create.glade.h:20
 msgid "ISO"
 msgstr "ISO"
@@ -3714,6 +3773,10 @@
 msgid "Provide the existing storage path:"
 msgstr "Zadajte cestu k existujúcemu úložisku:"
 
+#: ../src/vmm-create.glade.h:29
+msgid "B_rowse..."
+msgstr "P_rechádzať..."
+
 #: ../src/vmm-create.glade.h:30
 msgid "Provide the _application path:"
 msgstr ""
@@ -4036,30 +4099,34 @@
 msgstr "Posunutie _hodín:"
 
 #: ../src/vmm-details.glade.h:63
+msgid "Machine _Type: "
+msgstr ""
+
+#: ../src/vmm-details.glade.h:65
 msgid "<b>Machine Settings</b>"
 msgstr "<b>Nastavenia stroja</b>"
 
-#: ../src/vmm-details.glade.h:64
+#: ../src/vmm-details.glade.h:66
 msgid "_Label:"
 msgstr "_Označenie:"
 
-#: ../src/vmm-details.glade.h:65
+#: ../src/vmm-details.glade.h:67
 msgid "D_ynamic"
 msgstr "D_ynamické"
 
-#: ../src/vmm-details.glade.h:66
+#: ../src/vmm-details.glade.h:68
 msgid "_Static"
 msgstr "_Statické"
 
-#: ../src/vmm-details.glade.h:67
+#: ../src/vmm-details.glade.h:69
 msgid "M_odel:"
 msgstr "M_odel:"
 
-#: ../src/vmm-details.glade.h:69
+#: ../src/vmm-details.glade.h:71
 msgid "<b>Security</b>"
 msgstr "<b>Zabezpečenie</b>"
 
-#: ../src/vmm-details.glade.h:70
+#: ../src/vmm-details.glade.h:72
 msgid ""
 "CPU\n"
 "usage:"
@@ -4067,7 +4134,7 @@
 "Využitie\n"
 "procesora:"
 
-#: ../src/vmm-details.glade.h:72
+#: ../src/vmm-details.glade.h:74
 msgid ""
 "Memory\n"
 "usage:"
@@ -4075,7 +4142,7 @@
 "Využitie\n"
 "pamäte:"
 
-#: ../src/vmm-details.glade.h:74
+#: ../src/vmm-details.glade.h:76
 msgid ""
 "Disk\n"
 "I/O:"
@@ -4083,7 +4150,7 @@
 "Aktivita\n"
 "disku:"
 
-#: ../src/vmm-details.glade.h:76
+#: ../src/vmm-details.glade.h:78
 msgid ""
 "Network\n"
 "I/O:"
@@ -4091,7 +4158,7 @@
 "Aktivita\n"
 "siete:"
 
-#: ../src/vmm-details.glade.h:78
+#: ../src/vmm-details.glade.h:80
 msgid ""
 "0 KBytes/s\n"
 "0KBytes/s"
@@ -4099,211 +4166,207 @@
 "0 KBajtov/s\n"
 "0KBajtov/s"
 
-#: ../src/vmm-details.glade.h:80 ../src/vmm-host.glade.h:17
+#: ../src/vmm-details.glade.h:82 ../src/vmm-host.glade.h:17
 msgid "<b>Performance</b>"
 msgstr "<b>Výkon</b>"
 
-#: ../src/vmm-details.glade.h:81
+#: ../src/vmm-details.glade.h:83
 msgid "Logical host CPUs:"
 msgstr "Logických CPU hostiteľa:"
 
-#: ../src/vmm-details.glade.h:82
+#: ../src/vmm-details.glade.h:84
 msgid "Maximum allocation:"
 msgstr "Maximálna rezervácia:"
 
-#: ../src/vmm-details.glade.h:83
+#: ../src/vmm-details.glade.h:85
 msgid "Current a_llocation:"
 msgstr "Súčasná _rezervácia:"
 
-#: ../src/vmm-details.glade.h:84
+#: ../src/vmm-details.glade.h:86
 msgid "Virtual CPU Select"
 msgstr "Výber virtuálneho procesora"
 
-#: ../src/vmm-details.glade.h:85
+#: ../src/vmm-details.glade.h:87
 msgid "<small>Overcommitting vCPUs can hurt performance</small>"
 msgstr "<small>Preťaženie virtuálnych CPU môže znížiť výkon</small>"
 
-#: ../src/vmm-details.glade.h:86
+#: ../src/vmm-details.glade.h:88
 msgid "<b>CPUs</b>"
 msgstr "<b>Procesory</b>"
 
-#: ../src/vmm-details.glade.h:87
+#: ../src/vmm-details.glade.h:89
 msgid "Model:"
 msgstr "Model:"
 
-#: ../src/vmm-details.glade.h:88
+#: ../src/vmm-details.glade.h:90
 msgid "Copy host CPU configuration"
 msgstr "Kopírovať konfiguráciu CPU hostiteľa"
 
-#: ../src/vmm-details.glade.h:89
+#: ../src/vmm-details.glade.h:91
 msgid "<b>CPU Features</b>"
 msgstr "<b>Funkcionality CPU</b>"
 
-#: ../src/vmm-details.glade.h:90
+#: ../src/vmm-details.glade.h:92
 msgid "<b>Configuration</b>"
 msgstr "<b>Konfigurácia</b>"
 
-#: ../src/vmm-details.glade.h:91
+#: ../src/vmm-details.glade.h:93
 msgid "Manually set CPU topology"
 msgstr "Nataviť topológiiu CPU ručne"
 
-#: ../src/vmm-details.glade.h:92
+#: ../src/vmm-details.glade.h:94
 msgid "Threads:"
 msgstr "Vlákien:"
 
-#: ../src/vmm-details.glade.h:93
+#: ../src/vmm-details.glade.h:95
 msgid "Cores:"
 msgstr "Jadier:"
 
-#: ../src/vmm-details.glade.h:94
+#: ../src/vmm-details.glade.h:96
 msgid "Sockets:"
 msgstr "Sokety:"
 
-#: ../src/vmm-details.glade.h:95
+#: ../src/vmm-details.glade.h:97
 msgid "<b>Topology</b>"
 msgstr "<b>Topológia</b>"
 
-#: ../src/vmm-details.glade.h:96
+#: ../src/vmm-details.glade.h:98
 msgid "Default _pinning:"
 msgstr "Predvolené _prepojenie:"
 
-#: ../src/vmm-details.glade.h:97
+#: ../src/vmm-details.glade.h:99
 msgid "Virtual CPU Affinity Select"
 msgstr "Výber spriaznenosti virtuálneho procesora"
 
-#: ../src/vmm-details.glade.h:98
+#: ../src/vmm-details.glade.h:100
 msgid "Generate from host _NUMA configuration"
 msgstr "Generovať z _NUMA konfigurácie hostiteľa"
 
-#: ../src/vmm-details.glade.h:99
+#: ../src/vmm-details.glade.h:101
 msgid "R_untime pinning:"
 msgstr "Prepojenie počas _behu:"
 
-#: ../src/vmm-details.glade.h:100
+#: ../src/vmm-details.glade.h:102
 msgid "<b>Pinning</b>"
 msgstr "<b>Prepojenie</b>"
 
-#: ../src/vmm-details.glade.h:101
+#: ../src/vmm-details.glade.h:103
 msgid "Ma_ximum allocation:"
 msgstr "Ma_ximálna rezervácia:"
 
-#: ../src/vmm-details.glade.h:102
+#: ../src/vmm-details.glade.h:104
 msgid "Total host memory:"
 msgstr "Celková pamäť hostiteľa:"
 
-#: ../src/vmm-details.glade.h:103
+#: ../src/vmm-details.glade.h:105
 msgid "Memory Select"
 msgstr "Výber pamäte"
 
-#: ../src/vmm-details.glade.h:105
+#: ../src/vmm-details.glade.h:107
 msgid "Max Memory Select"
 msgstr "Výber maximálnej pamäte"
 
-#: ../src/vmm-details.glade.h:106
+#: ../src/vmm-details.glade.h:108
 msgid "<b>Memory</b>"
 msgstr "<b>Pamäť</b>"
 
-#: ../src/vmm-details.glade.h:107
+#: ../src/vmm-details.glade.h:109
 msgid "Start virt_ual machine on host boot up"
 msgstr "Spustiť virt_uálny stroj pri zavádzaní hostiteľa"
 
-#: ../src/vmm-details.glade.h:108
+#: ../src/vmm-details.glade.h:110
 msgid "<b>Autostart</b>"
 msgstr "<b>Automatické spustenie</b>"
 
-#: ../src/vmm-details.glade.h:109
+#: ../src/vmm-details.glade.h:111
 msgid "Enable boot me_nu"
 msgstr "Povoliť ponuku pri štarte"
 
-#: ../src/vmm-details.glade.h:110
+#: ../src/vmm-details.glade.h:112
 msgid "<b>Boot device order</b>"
 msgstr "<b>Poradie zariadení pri zavádzaní</b>"
 
-#: ../src/vmm-details.glade.h:111
+#: ../src/vmm-details.glade.h:113
 msgid "Kernel path:"
 msgstr "Cesta k jadru:"
 
-#: ../src/vmm-details.glade.h:112
+#: ../src/vmm-details.glade.h:114
 msgid "Initrd path:"
 msgstr "Cesta k initrd:"
 
-#: ../src/vmm-details.glade.h:113
+#: ../src/vmm-details.glade.h:115
 msgid "Browse"
 msgstr "Prechádzať"
 
-#: ../src/vmm-details.glade.h:114
+#: ../src/vmm-details.glade.h:116
 msgid "Kernel arguments:"
 msgstr "Parametre jadra:"
 
-#: ../src/vmm-details.glade.h:115
+#: ../src/vmm-details.glade.h:117
 msgid "<b>Direct kernel boot</b>"
 msgstr "<b>Priame zavedenie jadra</b>"
 
-#: ../src/vmm-details.glade.h:116
+#: ../src/vmm-details.glade.h:118
 msgid "Init path:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:117
+#: ../src/vmm-details.glade.h:119
 msgid "<b>Container init</b>"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:118
+#: ../src/vmm-details.glade.h:120
 msgid "R_eadonly:"
 msgstr "_Iba na čítanie:"
 
-#: ../src/vmm-details.glade.h:119
+#: ../src/vmm-details.glade.h:121
 msgid "Sharea_ble:"
 msgstr "_Zdielateľný"
 
-#: ../src/vmm-details.glade.h:120
+#: ../src/vmm-details.glade.h:122
 msgid "Target device:"
 msgstr "Cieľové zariadenie:"
 
-#: ../src/vmm-details.glade.h:121
+#: ../src/vmm-details.glade.h:123
 msgid "Source path:"
 msgstr "Zdrojová cesta:"
 
-#: ../src/vmm-details.glade.h:122
+#: ../src/vmm-details.glade.h:124
 msgid "Connect or disconnect media"
 msgstr "Pripojiť alebo odpojiť médium"
 
-#: ../src/vmm-details.glade.h:123
+#: ../src/vmm-details.glade.h:125
 msgid "Storage size:"
 msgstr "Veľkosť úložiska:"
 
-#: ../src/vmm-details.glade.h:124
+#: ../src/vmm-details.glade.h:126
 msgid "Storage forma_t:"
 msgstr "_Formát úložiska:"
 
-#: ../src/vmm-details.glade.h:125
+#: ../src/vmm-details.glade.h:127
 msgid "Disk b_us:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:126
+#: ../src/vmm-details.glade.h:128
 msgid "Serial num_ber:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:127
-msgid "Cac_he mode:"
-msgstr "Režim _vyrovnávacej pamäte:"
-
-#: ../src/vmm-details.glade.h:128
+#: ../src/vmm-details.glade.h:130
 msgid "_IO mode:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:129
+#: ../src/vmm-details.glade.h:131
 msgid "_Performance options"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:130
+#: ../src/vmm-details.glade.h:132
 msgid "Advanced _options"
 msgstr "_Pokročilé voľby"
 
-#: ../src/vmm-details.glade.h:131
+#: ../src/vmm-details.glade.h:133
 msgid "<b>Virtual Disk</b>"
 msgstr "<b>Virtuálny disk</b>"
 
-#: ../src/vmm-details.glade.h:132
+#: ../src/vmm-details.glade.h:134
 msgid ""
 "<b>Tip:</b> 'source' refers to information seen from the host OS, while "
 "'target' refers to information seen from the guest OS"
@@ -4312,55 +4375,55 @@
 "operačného systému, zatiaľčo 'target' predstavuje informácie viditeľné z "
 "hosťovaného informačného systému."
 
-#: ../src/vmm-details.glade.h:133
+#: ../src/vmm-details.glade.h:135
 msgid "Source device:"
 msgstr "Zdrojové zariadenie:"
 
-#: ../src/vmm-details.glade.h:134
+#: ../src/vmm-details.glade.h:136
 msgid "MAC address:"
 msgstr "MAC adresa:"
 
-#: ../src/vmm-details.glade.h:135
+#: ../src/vmm-details.glade.h:137
 msgid "Device m_odel:"
 msgstr "_Model zariadenia:"
 
-#: ../src/vmm-details.glade.h:137
+#: ../src/vmm-details.glade.h:139
 msgid "Source mode:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:138
+#: ../src/vmm-details.glade.h:140
 msgid "<b>Virtual Network Interface</b>"
 msgstr "<b>Rozhranie virtuálnej siete</b>"
 
-#: ../src/vmm-details.glade.h:139
+#: ../src/vmm-details.glade.h:141
 msgid "Instance id:"
 msgstr "Idntifikátor inštancie:"
 
-#: ../src/vmm-details.glade.h:140
+#: ../src/vmm-details.glade.h:142
 msgid "Typeid version:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:141
+#: ../src/vmm-details.glade.h:143
 msgid "Typeid:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:142
+#: ../src/vmm-details.glade.h:144
 msgid "Managerid:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:143
+#: ../src/vmm-details.glade.h:145
 msgid "Virtual port"
 msgstr "Virtuálny port"
 
-#: ../src/vmm-details.glade.h:144 ../src/vmm-host.glade.h:50
+#: ../src/vmm-details.glade.h:146 ../src/vmm-host.glade.h:50
 msgid "Mode:"
 msgstr "Režim:"
 
-#: ../src/vmm-details.glade.h:145
+#: ../src/vmm-details.glade.h:147
 msgid "<b>Virtual Pointer</b>"
 msgstr "<b>Virtuálny ukazovateľ</b>"
 
-#: ../src/vmm-details.glade.h:146
+#: ../src/vmm-details.glade.h:148
 msgid ""
 "<b>Tip:</b> A graphics tablet configured as the default pointer in the guest "
 "OS will ensure that the virtual cursor moves in sync with the local desktop "
@@ -4370,90 +4433,114 @@
 "OS zaistí, že sa virtuálny kurzor bude pohybovať synchronizovane s kurzorom "
 "v lokálnom pracovnom prostredí."
 
-#: ../src/vmm-details.glade.h:147
+#: ../src/vmm-details.glade.h:149
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/vmm-details.glade.h:148 ../src/vmm-host.glade.h:51
+#: ../src/vmm-details.glade.h:150 ../src/vmm-host.glade.h:51
 msgid "Address:"
 msgstr "Adresa:"
 
-#: ../src/vmm-details.glade.h:151
+#: ../src/vmm-details.glade.h:152
 msgid "TLS Port:"
 msgstr "TLS Port:"
 
-#: ../src/vmm-details.glade.h:152
+#: ../src/vmm-details.glade.h:153
 msgid "<b>Sound Device</b>"
 msgstr "Zvukové zariadenie"
 
-#: ../src/vmm-details.glade.h:153
+#: ../src/vmm-details.glade.h:154
 msgid "Device type:"
 msgstr "Typ zariadenia:"
 
-#: ../src/vmm-details.glade.h:154
+#: ../src/vmm-details.glade.h:155
 msgid "Bind host:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:155
+#: ../src/vmm-details.glade.h:156
 msgid "Target type:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:156
+#: ../src/vmm-details.glade.h:157
 msgid "Target name:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:157
+#: ../src/vmm-details.glade.h:158
 msgid "Source host:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:158
+#: ../src/vmm-details.glade.h:159
 msgid "<b>insert type</b>"
 msgstr "<b>zadajte typ</b>"
 
-#: ../src/vmm-details.glade.h:159 ../src/vmm-host.glade.h:20
+#: ../src/vmm-details.glade.h:160 ../src/vmm-host.glade.h:20
 msgid "Device:"
 msgstr "Zariadenie:"
 
-#: ../src/vmm-details.glade.h:160
+#: ../src/vmm-details.glade.h:161
 msgid "RAM:"
 msgstr "RAM:"
 
-#: ../src/vmm-details.glade.h:161
+#: ../src/vmm-details.glade.h:162
 msgid "Heads:"
 msgstr "Hláv:"
 
-#: ../src/vmm-details.glade.h:162
+#: ../src/vmm-details.glade.h:163
 msgid "<b>Video</b>"
 msgstr "<b>Video</b>"
 
-#: ../src/vmm-details.glade.h:163
+#: ../src/vmm-details.glade.h:164
 msgid "A_ction:"
 msgstr "Ak_cia:"
 
-#: ../src/vmm-details.glade.h:164
+#: ../src/vmm-details.glade.h:165
 msgid "<b>Controller</b>"
 msgstr "<b>Radič</b>"
 
-#: ../src/vmm-details.glade.h:165
+#: ../src/vmm-details.glade.h:166
+msgid "Driver:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:167
+msgid "Write Policy:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:168
 msgid "Source:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:166
+#: ../src/vmm-details.glade.h:169
 msgid "Target:"
 msgstr "Cieľ:"
 
-#: ../src/vmm-details.glade.h:167
+#: ../src/vmm-details.glade.h:170
+msgid "Readonly Filesystem:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:171
 msgid "<b>Filesystem</b>"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:168
+#: ../src/vmm-details.glade.h:172
 msgid "M_ode:"
 msgstr ""
 
-#: ../src/vmm-details.glade.h:169
+#: ../src/vmm-details.glade.h:173
 msgid "<b>Smartcard Device</b>"
 msgstr ""
 
+#: ../src/vmm-details.glade.h:174
+msgid "T_ype:"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:175
+msgid "foo:12"
+msgstr ""
+
+#: ../src/vmm-details.glade.h:176
+msgid "<b>Redirected device</b>"
+msgstr ""
+
 #: ../src/vmm-host.glade.h:1
 msgid "Connection Details"
 msgstr ""
@@ -4498,6 +4585,10 @@
 msgid "Overview"
 msgstr "Prehľad"
 
+#: ../src/vmm-host.glade.h:19
+msgid "Name:"
+msgstr "Názov:"
+
 #: ../src/vmm-host.glade.h:21
 msgid "State:"
 msgstr "Stav:"
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/vorbis-tools.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/vorbis-tools.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/vorbis-tools.po	2012-01-02 17:50:46.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/vorbis-tools.po	2012-02-23 06:55:35.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:18+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "X-Poedit-Country: SLOVAKIA\n"
 "X-Poedit-Language: Slovak\n"
 
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/w3m.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/w3m.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/w3m.po	2012-01-02 17:50:46.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/w3m.po	2012-02-23 06:55:35.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: menu.c:267
 msgid " Back         (b) "
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/wdiff-gnulib.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/wdiff-gnulib.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/wdiff-gnulib.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/wdiff-gnulib.po	2012-02-23 06:55:47.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: lib/error.c:181
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/wdiff.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/wdiff.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/wdiff.po	2012-01-02 17:51:01.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/wdiff.po	2012-02-23 06:55:47.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 14:54+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 21:53+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: src/mdiff.c:376
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/wget.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/wget.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/wget.po	2012-01-02 17:50:46.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/wget.po	2012-02-23 06:55:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNU wget 1.12-pre7\n"
 "Report-Msgid-Bugs-To: bug-wget@gnu.org\n"
-"POT-Creation-Date: 2011-11-29 08:26+0000\n"
+"POT-Creation-Date: 2012-02-13 07:09+0000\n"
 "PO-Revision-Date: 2011-12-06 06:17+0000\n"
 "Last-Translator: Marcel Telka <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:03+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 "Language: sk\n"
 
 #: lib/error.c:185
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/whois.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/whois.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/whois.po	2012-01-02 17:50:46.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/whois.po	2012-02-23 06:55:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: whois\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-11-29 08:21+0000\n"
+"POT-Creation-Date: 2012-01-02 12:06+0000\n"
 "PO-Revision-Date: 2006-05-27 14:39+0000\n"
 "Last-Translator: Martin <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:19+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:04+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../whois.c:146
 #, c-format
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/xkeyboard-config.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/xkeyboard-config.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/xkeyboard-config.po	2012-01-02 17:51:02.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/xkeyboard-config.po	2012-02-23 06:55:48.000000000 +0000
@@ -7,3799 +7,3914 @@
 msgstr ""
 "Project-Id-Version: xkeyboard-config 1.0-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-05 18:48+0200\n"
-"PO-Revision-Date: 2011-10-05 18:22+0000\n"
+"POT-Creation-Date: 2012-01-23 22:42+0000\n"
+"PO-Revision-Date: 2012-01-24 05:45+0000\n"
 "Last-Translator: Zdenko Podobný <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 15:12+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 22:12+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../rules/base.xml.in.h:1
-msgid "&lt;Less/Greater&gt;"
-msgstr ""
+msgid "Generic 101-key PC"
+msgstr "všeobecná PC 101 kláves"
 
 #: ../rules/base.xml.in.h:2
-msgid ""
-"&lt;Less/Greater&gt; (chooses 3rd level, latches when pressed together with "
-"another 3rd-level-chooser)"
-msgstr ""
+msgid "Generic 102-key (Intl) PC"
+msgstr "všeobecná PC 102 kláves (medz.)"
 
 #: ../rules/base.xml.in.h:3
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level and activates level5-Lock when "
-"pressed together with another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgid "Generic 104-key PC"
+msgstr "všeobecná PC 104 kláves"
 
 #: ../rules/base.xml.in.h:4
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
-"another 5th-level-chooser"
-msgstr ""
+msgid "Generic 105-key (Intl) PC"
+msgstr "všeobecná 105-kláv. (medzinár.) PC"
 
 #: ../rules/base.xml.in.h:5
-msgid ""
-"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
-"another 5th-level-chooser, one press releases the lock"
-msgstr ""
+msgid "Dell 101-key PC"
+msgstr "DELL PC 101 kláves"
 
 #: ../rules/base.xml.in.h:6
-msgid "A4Tech KB-21"
-msgstr "A4Tech KB-21"
+msgid "Dell Latitude series laptop"
+msgstr "Laptop série Dell Latitude"
 
 #: ../rules/base.xml.in.h:7
-msgid "A4Tech KBS-8"
-msgstr "A4Tech KBS-8"
+msgid "Dell Precision M65"
+msgstr ""
 
 #: ../rules/base.xml.in.h:8
-msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "A4Tech Wireless Desktop RFKB-23"
+msgid "Everex STEPnote"
+msgstr "Everex STEPnote"
 
 #: ../rules/base.xml.in.h:9
-msgid "ATM/phone-style"
-msgstr ""
+msgid "Keytronic FlexPro"
+msgstr "Keytronic FlexPro"
 
 #: ../rules/base.xml.in.h:10
-msgid "Acer AirKey V"
-msgstr "Acer AirKey V"
+msgid "Microsoft Natural"
+msgstr "Microsoft Natural"
 
 #: ../rules/base.xml.in.h:11
-msgid "Acer C300"
-msgstr "Acer C300"
+msgid "Northgate OmniKey 101"
+msgstr "Northgate OmniKey 101"
 
 #: ../rules/base.xml.in.h:12
-msgid "Acer Ferrari 4000"
-msgstr "Acer Ferrari 4000"
+msgid "Winbook Model XP5"
+msgstr "Winbook Model XP5"
 
 #: ../rules/base.xml.in.h:13
-msgid "Acer Laptop"
-msgstr ""
+msgid "PC-98xx Series"
+msgstr "Séria PC-98xx"
 
 #: ../rules/base.xml.in.h:14
-msgid "Add the standard behavior to Menu key"
-msgstr ""
+msgid "A4Tech KB-21"
+msgstr "A4Tech KB-21"
 
 #: ../rules/base.xml.in.h:15
-msgid "Adding Esperanto circumflexes (supersigno)"
-msgstr ""
+msgid "A4Tech KBS-8"
+msgstr "A4Tech KBS-8"
 
 #: ../rules/base.xml.in.h:16
-msgid "Adding currency signs to certain keys"
-msgstr ""
+msgid "A4Tech Wireless Desktop RFKB-23"
+msgstr "A4Tech Wireless Desktop RFKB-23"
 
 #: ../rules/base.xml.in.h:17
-msgid "Advance Scorpius KI"
-msgstr "Advance Scorpius KI"
+msgid "Acer AirKey V"
+msgstr "Acer AirKey V"
 
 #: ../rules/base.xml.in.h:18
-msgid "Afghani"
-msgstr ""
+msgid "Azona RF2300 wireless Internet Keyboard"
+msgstr "Azona RF2300 bezdrôtová internetová klávesnica"
 
 #: ../rules/base.xml.in.h:19
-msgid "Akan"
-msgstr "Akan"
+msgid "Advance Scorpius KI"
+msgstr "Advance Scorpius KI"
 
 #: ../rules/base.xml.in.h:20
-msgid "Albanian"
-msgstr ""
+msgid "Brother Internet Keyboard"
+msgstr "Brother Internet Keyboard"
 
 #: ../rules/base.xml.in.h:21
-msgid "Alt and Meta are on Alt keys"
-msgstr ""
+msgid "BTC 5113RF Multimedia"
+msgstr "BTC 5113RF Multimedia"
 
 #: ../rules/base.xml.in.h:22
-msgid "Alt is mapped to Right Win, Super to Menu"
-msgstr ""
+msgid "BTC 5126T"
+msgstr "BTC 5126T"
 
 #: ../rules/base.xml.in.h:23
-msgid "Alt+Caps Lock"
+msgid "BTC 6301URF"
 msgstr ""
 
 #: ../rules/base.xml.in.h:24
-msgid "Alt+Ctrl"
-msgstr ""
+msgid "BTC 9000"
+msgstr "BTC 9000"
 
 #: ../rules/base.xml.in.h:25
-msgid "Alt+Shift"
-msgstr ""
+msgid "BTC 9000A"
+msgstr "BTC 9000A"
 
 #: ../rules/base.xml.in.h:26
-msgid "Alt+Space"
-msgstr ""
+msgid "BTC 9001AH"
+msgstr "BTC 9001AH"
 
 #: ../rules/base.xml.in.h:27
-msgid "Alt/Win key behavior"
-msgstr "Chovanie klávesu Alt/Win"
+msgid "BTC 5090"
+msgstr "BTC 5090"
 
 #: ../rules/base.xml.in.h:28
-msgid "Amharic"
-msgstr ""
+msgid "BTC 9019U"
+msgstr "BTC 9019U"
 
 #: ../rules/base.xml.in.h:29
-msgid "Any Alt key"
+msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr ""
 
 #: ../rules/base.xml.in.h:30
-msgid "Any Win key"
-msgstr ""
+msgid "Cherry Blue Line CyBo@rd"
+msgstr "Cherry Blue Line CyBo@rd"
 
 #: ../rules/base.xml.in.h:31
-msgid "Any Win key (while pressed)"
-msgstr ""
+msgid "Cherry CyMotion Master XPress"
+msgstr "Cherry CyMotion Master XPress"
 
 #: ../rules/base.xml.in.h:32
-msgid "Apple"
-msgstr "Apple"
+msgid "Cherry Blue Line CyBo@rd (alternate option)"
+msgstr "Cherry Blue Line CyBo@rd (alternatívna voľba)"
 
 #: ../rules/base.xml.in.h:33
-msgid "Apple Aluminium Keyboard (ANSI)"
-msgstr ""
+msgid "Cherry CyBo@rd USB-Hub"
+msgstr "Cherry CyBo@rd USB-Hub"
 
 #: ../rules/base.xml.in.h:34
-msgid "Apple Aluminium Keyboard (ISO)"
+msgid "Cherry CyMotion Expert"
 msgstr ""
 
 #: ../rules/base.xml.in.h:35
-msgid "Apple Aluminium Keyboard (JIS)"
+msgid "Cherry B.UNLIMITED"
 msgstr ""
 
 #: ../rules/base.xml.in.h:36
-msgid ""
-"Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
-"Lock)"
-msgstr ""
+msgid "Chicony Internet Keyboard"
+msgstr "Chicony Internet Keyboard"
 
 #: ../rules/base.xml.in.h:37
-msgid "Apple Laptop"
-msgstr "Apple laptop"
+msgid "Chicony KU-0108"
+msgstr ""
 
 #: ../rules/base.xml.in.h:38
-msgid "Arabic"
-msgstr "Arabsky"
+msgid "Chicony KU-0420"
+msgstr ""
 
 #: ../rules/base.xml.in.h:39
-msgid "Arabic (Buckwalter)"
-msgstr ""
+msgid "Chicony KB-9885"
+msgstr "Chicony KB-9885"
 
 #: ../rules/base.xml.in.h:40
-msgid "Arabic (Morocco)"
-msgstr ""
+msgid "Compaq Easy Access Keyboard"
+msgstr "Compaq Easy Access Keyboard"
 
 #: ../rules/base.xml.in.h:41
-msgid "Arabic (Pakistan)"
-msgstr ""
+msgid "Compaq Internet Keyboard (7 keys)"
+msgstr "Compaq Internet Keyboard (7 kláves)"
 
 #: ../rules/base.xml.in.h:42
-msgid "Arabic (Syria)"
-msgstr ""
+msgid "Compaq Internet Keyboard (13 keys)"
+msgstr "Compaq Internet Keyboard (13 kláves)"
 
 #: ../rules/base.xml.in.h:43
-msgid "Arabic (azerty)"
-msgstr ""
+msgid "Compaq Internet Keyboard (18 keys)"
+msgstr "Compaq Internet Keyboard (18 kláves)"
 
 #: ../rules/base.xml.in.h:44
-msgid "Arabic (azerty/digits)"
-msgstr ""
+msgid "Cherry CyMotion Master Linux"
+msgstr "Cherry CyMotion Master Linux"
 
 #: ../rules/base.xml.in.h:45
-msgid "Arabic (digits)"
-msgstr ""
+msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
+msgstr "Laptop/notebook Compaq (napr. Armada) Laptop Keyboard"
 
 #: ../rules/base.xml.in.h:46
-msgid "Arabic (qwerty)"
-msgstr ""
+msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
+msgstr "Laptop/notebook Compaq (napr. Presario) Internet Keyboard"
 
 #: ../rules/base.xml.in.h:47
-msgid "Arabic (qwerty/digits)"
-msgstr ""
+msgid "Compaq iPaq Keyboard"
+msgstr "Compaq iPaq Keyboard"
 
-#: ../rules/base.xml.in.h:48 ../rules/base.extras.xml.in.h:2
-msgid "Armenian"
-msgstr ""
+#: ../rules/base.xml.in.h:48
+msgid "Dell"
+msgstr "Dell"
 
 #: ../rules/base.xml.in.h:49
-msgid "Armenian (alternative eastern)"
+msgid "Dell SK-8125"
 msgstr ""
 
 #: ../rules/base.xml.in.h:50
-msgid "Armenian (alternative phonetic)"
+msgid "Dell SK-8135"
 msgstr ""
 
 #: ../rules/base.xml.in.h:51
-msgid "Armenian (eastern)"
+msgid "Dell USB Multimedia Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:52
-msgid "Armenian (phonetic)"
-msgstr ""
+msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
 
 #: ../rules/base.xml.in.h:53
-msgid "Armenian (western)"
-msgstr ""
+msgid "Dell Laptop/notebook Precision M series"
+msgstr "Dell Laptop/notebook Precision série M"
 
 #: ../rules/base.xml.in.h:54
-msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
-msgstr ""
+msgid "Dexxa Wireless Desktop Keyboard"
+msgstr "Dexxa Wireless Desktop Keyboard"
 
 #: ../rules/base.xml.in.h:55
-msgid "Asus Laptop"
-msgstr ""
+msgid "Diamond 9801 / 9802 series"
+msgstr "Diamond séria 9801 / 9802"
 
 #: ../rules/base.xml.in.h:56
-msgid "At bottom left"
-msgstr ""
+msgid "DTK2000"
+msgstr "DTK2000"
 
 #: ../rules/base.xml.in.h:57
-msgid "At left of 'A'"
-msgstr ""
+msgid "Ennyah DKB-1008"
+msgstr "Ennyah DKB-1008"
 
 #: ../rules/base.xml.in.h:58
-msgid "Avatime"
+msgid "Fujitsu-Siemens Computers AMILO laptop"
 msgstr ""
 
 #: ../rules/base.xml.in.h:59
-msgid "Azerbaijani"
-msgstr ""
+msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
+msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
 
 #: ../rules/base.xml.in.h:60
-msgid "Azerbaijani (Cyrillic)"
-msgstr ""
+msgid "Genius Comfy KB-12e"
+msgstr "Genius Comfy KB-12e"
 
 #: ../rules/base.xml.in.h:61
-msgid "Azona RF2300 wireless Internet Keyboard"
-msgstr "Azona RF2300 bezdrôtová internetová klávesnica"
+msgid "Genius Comfy KB-21e-Scroll"
+msgstr "Genius Comfy KB-21e-Scroll"
 
 #: ../rules/base.xml.in.h:62
-msgid "BTC 5090"
-msgstr "BTC 5090"
+msgid "Genius KB-19e NB"
+msgstr "Genius KB-19e NB"
 
 #: ../rules/base.xml.in.h:63
-msgid "BTC 5113RF Multimedia"
-msgstr "BTC 5113RF Multimedia"
+msgid "Genius KKB-2050HS"
+msgstr ""
 
+# je firma
 #: ../rules/base.xml.in.h:64
-msgid "BTC 5126T"
-msgstr "BTC 5126T"
+msgid "Gyration"
+msgstr "Gyration"
 
 #: ../rules/base.xml.in.h:65
-msgid "BTC 6301URF"
+msgid "HTC Dream"
 msgstr ""
 
 #: ../rules/base.xml.in.h:66
-msgid "BTC 9000"
-msgstr "BTC 9000"
+msgid "Kinesis"
+msgstr ""
 
 #: ../rules/base.xml.in.h:67
-msgid "BTC 9000A"
-msgstr "BTC 9000A"
+msgid "Logitech Generic Keyboard"
+msgstr ""
 
 #: ../rules/base.xml.in.h:68
-msgid "BTC 9001AH"
-msgstr "BTC 9001AH"
+msgid "Logitech G15 extra keys via G15daemon"
+msgstr "Logitech G15 extra klávesy pomocou G15daemon"
 
 #: ../rules/base.xml.in.h:69
-msgid "BTC 9019U"
-msgstr "BTC 9019U"
+msgid "Hewlett-Packard Internet Keyboard"
+msgstr "Hewlett-Packard Internet Keyboard"
 
 #: ../rules/base.xml.in.h:70
-msgid "BTC 9116U Mini Wireless Internet and Gaming"
+msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:71
-msgid "Backslash"
-msgstr ""
+msgid "Hewlett-Packard Omnibook XE3 GC"
+msgstr "Hewlett-Packard Omnibook XE3 GC"
 
 #: ../rules/base.xml.in.h:72
-msgid ""
-"Backslash (chooses 3rd level, latches when pressed together with another 3rd-"
-"level-chooser)"
-msgstr ""
+msgid "Hewlett-Packard Omnibook XE3 GF"
+msgstr "Hewlett-Packard Omnibook XE3 GF"
 
 #: ../rules/base.xml.in.h:73
-msgid "Bambara"
-msgstr ""
+msgid "Hewlett-Packard Omnibook XT1000"
+msgstr "Hewlett-Packard Omnibook XT1000"
 
 #: ../rules/base.xml.in.h:74
-msgid "Bashkirian"
+msgid "Hewlett-Packard Pavilion dv5"
 msgstr ""
 
 #: ../rules/base.xml.in.h:75
-msgid "Belarusian"
-msgstr ""
+msgid "Hewlett-Packard Pavilion ZT11xx"
+msgstr "Hewlett-Packard Pavilion ZT11xx"
 
 #: ../rules/base.xml.in.h:76
-msgid "Belarusian (Latin)"
-msgstr ""
+msgid "Hewlett-Packard Omnibook 500 FA"
+msgstr "Hewlett-Packard Omnibook 500 FA"
 
 #: ../rules/base.xml.in.h:77
-msgid "Belarusian (legacy)"
-msgstr ""
+msgid "Hewlett-Packard Omnibook 5xx"
+msgstr "Hewlett-Packard Omnibook 5xx"
 
 #: ../rules/base.xml.in.h:78
-msgid "Belgian"
-msgstr "Belgická"
+msgid "Hewlett-Packard nx9020"
+msgstr ""
 
 #: ../rules/base.xml.in.h:79
-msgid "Belgian (ISO alternate)"
-msgstr ""
+msgid "Hewlett-Packard Omnibook 6000/6100"
+msgstr "Hewlett-Packard Omnibook 6000/6100"
 
 #: ../rules/base.xml.in.h:80
-msgid "Belgian (Sun dead keys)"
-msgstr ""
+msgid "Honeywell Euroboard"
+msgstr "Honeywell Euroboard"
 
 #: ../rules/base.xml.in.h:81
-msgid "Belgian (Wang model 724 azerty)"
+msgid "Hewlett-Packard Mini 110 Notebook"
 msgstr ""
 
 #: ../rules/base.xml.in.h:82
-msgid "Belgian (alternative)"
-msgstr ""
+msgid "IBM Rapid Access"
+msgstr "IBM Rapid Access"
 
 #: ../rules/base.xml.in.h:83
-msgid "Belgian (alternative, Sun dead keys)"
-msgstr ""
+msgid "IBM Rapid Access II"
+msgstr "IBM Rapid Access II"
 
 #: ../rules/base.xml.in.h:84
-msgid "Belgian (alternative, latin-9 only)"
-msgstr ""
+msgid "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
 #: ../rules/base.xml.in.h:85
-msgid "Belgian (eliminate dead keys)"
+msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr ""
 
 #: ../rules/base.xml.in.h:86
-msgid "BenQ X-Touch"
+msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr ""
 
 #: ../rules/base.xml.in.h:87
-msgid "BenQ X-Touch 730"
-msgstr "BenQ X-Touch 730"
+msgid "IBM Space Saver"
+msgstr ""
 
 #: ../rules/base.xml.in.h:88
-msgid "BenQ X-Touch 800"
-msgstr "BenQ X-Touch 800"
+msgid "Logitech Access Keyboard"
+msgstr "Logitech Access Keyboard"
 
 #: ../rules/base.xml.in.h:89
-msgid "Bengali"
-msgstr "Bengálska"
+msgid "Logitech Cordless Desktop LX-300"
+msgstr "Logitech Cordless Desktop LX-300"
 
 #: ../rules/base.xml.in.h:90
-msgid "Bengali (Probhat)"
+msgid "Logitech Internet 350 Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:91
-msgid "Berber (Morocco, Tifinagh alternative phonetic)"
+msgid "Logitech Media Elite Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:92
-msgid "Berber (Morocco, Tifinagh alternative)"
-msgstr ""
+msgid "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop"
 
 #: ../rules/base.xml.in.h:93
-msgid "Berber (Morocco, Tifinagh extended phonetic)"
-msgstr ""
+msgid "Logitech Cordless Desktop iTouch"
+msgstr "Logitech Cordless Desktop iTouch"
 
 #: ../rules/base.xml.in.h:94
-msgid "Berber (Morocco, Tifinagh extended)"
-msgstr ""
+msgid "Logitech Cordless Desktop Navigator"
+msgstr "Logitech Cordless Desktop Navigator"
 
 #: ../rules/base.xml.in.h:95
-msgid "Berber (Morocco, Tifinagh phonetic)"
-msgstr ""
+msgid "Logitech Cordless Desktop Optical"
+msgstr "Logitech Cordless Desktop Optical"
 
 #: ../rules/base.xml.in.h:96
-msgid "Berber (Morocco, Tifinagh)"
+msgid "Logitech Cordless Desktop (alternate option)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:97
-msgid "Bosnian"
-msgstr "Bosnianske"
+msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:98
-msgid "Bosnian (US keyboard with Bosnian digraphs)"
-msgstr ""
+msgid "Logitech Cordless Freedom/Desktop Navigator"
+msgstr "Logitech Cordless Freedom/Desktop Navigator"
 
 #: ../rules/base.xml.in.h:99
-msgid "Bosnian (US keyboard with Bosnian letters)"
-msgstr ""
+msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
 
 #: ../rules/base.xml.in.h:100
-msgid "Bosnian (use Bosnian digraphs)"
-msgstr ""
+msgid "Logitech Internet Keyboard"
+msgstr "Logitech Internet Keyboard"
 
 #: ../rules/base.xml.in.h:101
-msgid "Bosnian (use guillemets for quotes)"
-msgstr ""
+msgid "Logitech iTouch"
+msgstr "Logitech iTouch"
 
 #: ../rules/base.xml.in.h:102
-msgid "Both Alt keys together"
-msgstr ""
+msgid "Logitech Internet Navigator Keyboard"
+msgstr "Logitech Internet Navigator Keyboard"
 
 #: ../rules/base.xml.in.h:103
-msgid "Both Ctrl keys together"
+msgid "Logitech Cordless Desktop EX110"
 msgstr ""
 
 #: ../rules/base.xml.in.h:104
-msgid "Both Shift keys together"
-msgstr ""
+msgid "Logitech iTouch Internet Navigator Keyboard SE"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE"
 
 #: ../rules/base.xml.in.h:105
-msgid ""
-"Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
-msgstr ""
+msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
 
 #: ../rules/base.xml.in.h:106
-msgid "Both Shift-Keys together toggle Caps Lock"
-msgstr ""
+msgid "Logitech Ultra-X Keyboard"
+msgstr "Logitech Ultra-X Keyboard"
 
 #: ../rules/base.xml.in.h:107
-msgid "Both Shift-Keys together toggle ShiftLock"
+msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:108
-msgid "Braille"
-msgstr "Brailleovo"
+msgid "Logitech diNovo Keyboard"
+msgstr "Logitech diNovo Keyboard"
 
 #: ../rules/base.xml.in.h:109
-msgid "Braille (left hand)"
+msgid "Logitech diNovo Edge Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:110
-msgid "Braille (right hand)"
-msgstr ""
+msgid "Memorex MX1998"
+msgstr "Memorex MX1998"
 
 #: ../rules/base.xml.in.h:111
-msgid "Brother Internet Keyboard"
-msgstr "Brother Internet Keyboard"
+msgid "Memorex MX2500 EZ-Access Keyboard"
+msgstr "Memorex MX2500 EZ-Access Keyboard"
 
 #: ../rules/base.xml.in.h:112
-msgid "Bulgarian"
-msgstr "Bulharské"
+msgid "Memorex MX2750"
+msgstr "Memorex MX2750"
 
 #: ../rules/base.xml.in.h:113
-msgid "Bulgarian (new phonetic)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:114
-msgid "Bulgarian (traditional phonetic)"
+msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:115
-msgid "Burmese"
-msgstr "Burmézsky"
+msgid "Microsoft Internet Keyboard"
+msgstr "Microsoft Internet Keyboard"
 
 #: ../rules/base.xml.in.h:116
-msgid "Canadian Multilingual"
-msgstr ""
+msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
 
 #: ../rules/base.xml.in.h:117
-msgid "Canadian Multilingual (first part)"
-msgstr ""
+msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
 
 #: ../rules/base.xml.in.h:118
-msgid "Canadian Multilingual (second part)"
-msgstr ""
+msgid "Microsoft Natural Keyboard Pro OEM"
+msgstr "Microsoft Natural Keyboard Pro OEM"
 
 #: ../rules/base.xml.in.h:119
-msgid "Caps Lock"
+msgid "ViewSonic KU-306 Internet Keyboard"
 msgstr ""
 
 #: ../rules/base.xml.in.h:120
-msgid ""
-"Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-"
-"level-chooser)"
-msgstr ""
+msgid "Microsoft Internet Keyboard Pro, Swedish"
+msgstr "Microsoft Internet Keyboard Pro, Švédska"
 
 #: ../rules/base.xml.in.h:121
-msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
-msgstr ""
+msgid "Microsoft Office Keyboard"
+msgstr "Microsoft Office Keyboard"
 
 #: ../rules/base.xml.in.h:122
-msgid ""
-"Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
-msgstr ""
+msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
 
 #: ../rules/base.xml.in.h:123
-msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
+msgid "Microsoft Natural Keyboard Elite"
 msgstr ""
 
 #: ../rules/base.xml.in.h:124
-msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
+msgid "Microsoft Comfort Curve Keyboard 2000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:125
-msgid "Caps Lock is disabled"
-msgstr ""
+msgid "Ortek MCK-800 MM/Internet keyboard"
+msgstr "Ortek MCK-800 MM/internetová klávesnica"
 
 #: ../rules/base.xml.in.h:126
-msgid "Caps Lock key behavior"
-msgstr ""
+msgid "Propeller Voyager (KTEZ-1000)"
+msgstr "Propeller Voyager (KTEZ-1000)"
 
 #: ../rules/base.xml.in.h:127
-msgid "Caps Lock toggles Shift so all keys are affected"
-msgstr ""
+msgid "QTronix Scorpius 98N+"
+msgstr "QTronix Scorpius 98N+"
 
 #: ../rules/base.xml.in.h:128
-msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr ""
+msgid "Samsung SDM 4500P"
+msgstr "Samsung SDM 4500P"
 
 #: ../rules/base.xml.in.h:129
-msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
-msgstr ""
+msgid "Samsung SDM 4510P"
+msgstr "Samsung SDM 4510P"
 
 #: ../rules/base.xml.in.h:130
-msgid ""
-"Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
+msgid "Sanwa Supply SKB-KG3"
 msgstr ""
 
 #: ../rules/base.xml.in.h:131
-msgid "Catalan"
-msgstr ""
+msgid "SK-1300"
+msgstr "SK-1300"
 
 #: ../rules/base.xml.in.h:132
-msgid "Catalan (Spain, with middle-dot L)"
-msgstr ""
+msgid "SK-2500"
+msgstr "SK-2500"
 
 #: ../rules/base.xml.in.h:133
-msgid "Cherokee"
-msgstr ""
+msgid "SK-6200"
+msgstr "SK-6200"
 
 #: ../rules/base.xml.in.h:134
-msgid "Cherry B.UNLIMITED"
-msgstr ""
+msgid "SK-7100"
+msgstr "SK-7100"
 
 #: ../rules/base.xml.in.h:135
-msgid "Cherry Blue Line CyBo@rd"
-msgstr "Cherry Blue Line CyBo@rd"
+msgid "Super Power Multimedia Keyboard"
+msgstr "Super Power Multimedia Keyboard"
 
 #: ../rules/base.xml.in.h:136
-msgid "Cherry Blue Line CyBo@rd (alternate option)"
-msgstr "Cherry Blue Line CyBo@rd (alternatívna voľba)"
+msgid "SVEN Ergonomic 2500"
+msgstr "SVEN Ergonomic 2500"
 
 #: ../rules/base.xml.in.h:137
-msgid "Cherry CyBo@rd USB-Hub"
-msgstr "Cherry CyBo@rd USB-Hub"
+msgid "SVEN Slim 303"
+msgstr ""
 
 #: ../rules/base.xml.in.h:138
-msgid "Cherry CyMotion Expert"
-msgstr ""
+msgid "Symplon PaceBook (tablet PC)"
+msgstr "Symplon PaceBook (tablet PC)"
 
 #: ../rules/base.xml.in.h:139
-msgid "Cherry CyMotion Master Linux"
-msgstr "Cherry CyMotion Master Linux"
-
+msgid "Toshiba Satellite S3000"
+msgstr "Toshiba Satellite S3000"
+
 #: ../rules/base.xml.in.h:140
-msgid "Cherry CyMotion Master XPress"
-msgstr "Cherry CyMotion Master XPress"
+msgid "Trust Wireless Keyboard Classic"
+msgstr "Trust Wireless Keyboard Classic"
 
 #: ../rules/base.xml.in.h:141
-msgid "Chicony Internet Keyboard"
-msgstr "Chicony Internet Keyboard"
+msgid "Trust Direct Access Keyboard"
+msgstr "Trust Direct Access Keyboard"
 
 #: ../rules/base.xml.in.h:142
-msgid "Chicony KB-9885"
-msgstr "Chicony KB-9885"
+msgid "Trust Slimline"
+msgstr ""
 
 #: ../rules/base.xml.in.h:143
-msgid "Chicony KU-0108"
+msgid "TypeMatrix EZ-Reach 2020"
 msgstr ""
 
 #: ../rules/base.xml.in.h:144
-msgid "Chicony KU-0420"
+msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr ""
 
 #: ../rules/base.xml.in.h:145
-msgid "Chinese"
+msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr ""
 
 #: ../rules/base.xml.in.h:146
-msgid "Chuvash"
-msgstr "Čuvašské"
+msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:147
-msgid "Chuvash (Latin)"
+msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:148
-msgid "Classmate PC"
-msgstr ""
+msgid "Yahoo! Internet Keyboard"
+msgstr "Yahoo! Internet Keyboard"
 
 #: ../rules/base.xml.in.h:149
-msgid "CloGaelach"
-msgstr "CloGaelach"
+msgid "MacBook/MacBook Pro"
+msgstr "MacBook/MacBook Pro"
 
 #: ../rules/base.xml.in.h:150
-msgid "Compaq Easy Access Keyboard"
-msgstr "Compaq Easy Access Keyboard"
+msgid "MacBook/MacBook Pro (Intl)"
+msgstr "MacBook/MacBook Pro (medzin)"
 
 #: ../rules/base.xml.in.h:151
-msgid "Compaq Internet Keyboard (13 keys)"
-msgstr "Compaq Internet Keyboard (13 kláves)"
+msgid "Macintosh"
+msgstr "Macintosh"
 
 #: ../rules/base.xml.in.h:152
-msgid "Compaq Internet Keyboard (18 keys)"
-msgstr "Compaq Internet Keyboard (18 kláves)"
+msgid "Macintosh Old"
+msgstr "Macintosh staré"
 
 #: ../rules/base.xml.in.h:153
-msgid "Compaq Internet Keyboard (7 keys)"
-msgstr "Compaq Internet Keyboard (7 kláves)"
+msgid "Happy Hacking Keyboard for Mac"
+msgstr ""
 
 #: ../rules/base.xml.in.h:154
-msgid "Compaq iPaq Keyboard"
-msgstr "Compaq iPaq Keyboard"
+msgid "Acer C300"
+msgstr "Acer C300"
 
 #: ../rules/base.xml.in.h:155
-msgid "Compose key position"
-msgstr "Pozícia klávesu Compose"
+msgid "Acer Ferrari 4000"
+msgstr "Acer Ferrari 4000"
 
 #: ../rules/base.xml.in.h:156
-msgid "Control + Alt + Backspace"
+msgid "Acer Laptop"
 msgstr ""
 
 #: ../rules/base.xml.in.h:157
-msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
+msgid "Asus Laptop"
 msgstr ""
 
 #: ../rules/base.xml.in.h:158
-msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
-msgstr ""
+msgid "Apple"
+msgstr "Apple"
 
 #: ../rules/base.xml.in.h:159
-msgid "Creative Desktop Wireless 7000"
-msgstr ""
+msgid "Apple Laptop"
+msgstr "Apple laptop"
 
 #: ../rules/base.xml.in.h:160
-msgid "Crimean Tatar (Turkish Alt-Q)"
+msgid "Apple Aluminium Keyboard (ANSI)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:161
-msgid "Crimean Tatar (Turkish F)"
+msgid "Apple Aluminium Keyboard (ISO)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:162
-msgid "Crimean Tatar (Turkish Q)"
+msgid "Apple Aluminium Keyboard (JIS)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:163
-msgid "Croatian"
-msgstr ""
+msgid "SILVERCREST Multimedia Wireless Keyboard"
+msgstr "SILVERCREST Multimedia Wireless Keyboard"
 
 #: ../rules/base.xml.in.h:164
-msgid "Croatian (US keyboard with Croatian digraphs)"
-msgstr ""
+msgid "Laptop/notebook eMachines m68xx"
+msgstr "Laptop/notebook eMachines m68xx"
 
 #: ../rules/base.xml.in.h:165
-msgid "Croatian (US keyboard with Croatian letters)"
+msgid "BenQ X-Touch"
 msgstr ""
 
 #: ../rules/base.xml.in.h:166
-msgid "Croatian (use Croatian digraphs)"
-msgstr ""
+msgid "BenQ X-Touch 730"
+msgstr "BenQ X-Touch 730"
 
 #: ../rules/base.xml.in.h:167
-msgid "Croatian (use guillemets for quotes)"
-msgstr ""
+msgid "BenQ X-Touch 800"
+msgstr "BenQ X-Touch 800"
 
 #: ../rules/base.xml.in.h:168
-msgid "Ctrl key position"
-msgstr "Pozícia klávesu Ctrl"
+msgid "Happy Hacking Keyboard"
+msgstr ""
 
 #: ../rules/base.xml.in.h:169
-msgid "Ctrl+Shift"
+msgid "Classmate PC"
 msgstr ""
 
 #: ../rules/base.xml.in.h:170
-msgid "Czech"
-msgstr "České"
+msgid "OLPC"
+msgstr ""
 
 #: ../rules/base.xml.in.h:171
-msgid "Czech (UCW layout, accented letters only)"
+msgid "Sun Type 5/6"
 msgstr ""
 
 #: ../rules/base.xml.in.h:172
-msgid "Czech (US Dvorak with CZ UCW support)"
+msgid "Targa Visionary 811"
 msgstr ""
 
 #: ../rules/base.xml.in.h:173
-msgid "Czech (qwerty)"
-msgstr "České (qwerty)"
+msgid "Unitek KB-1925"
+msgstr ""
 
 #: ../rules/base.xml.in.h:174
-msgid "Czech (qwerty, extended Backslash)"
+msgid "FL90"
 msgstr ""
 
 #: ../rules/base.xml.in.h:175
-msgid "Czech (with &lt;\\|&gt; key)"
+msgid "Creative Desktop Wireless 7000"
 msgstr ""
 
 #: ../rules/base.xml.in.h:176
-msgid "DTK2000"
-msgstr "DTK2000"
-
-#: ../rules/base.xml.in.h:177
-msgid "Danish"
-msgstr "Dánske"
-
-#: ../rules/base.xml.in.h:178
-msgid "Danish (Dvorak)"
+msgid "Htc Dream phone"
 msgstr ""
 
-#: ../rules/base.xml.in.h:179
-msgid "Danish (Macintosh)"
+#. Keyboard indicator for English layouts
+#: ../rules/base.xml.in.h:178 ../rules/base.extras.xml.in.h:29
+msgid "en"
 msgstr ""
 
-#: ../rules/base.xml.in.h:180
-msgid "Danish (Macintosh, eliminate dead keys)"
+#: ../rules/base.xml.in.h:179 ../rules/base.extras.xml.in.h:30
+msgid "English (US)"
 msgstr ""
 
+#. Keyboard indicator for Cherokee layouts
 #: ../rules/base.xml.in.h:181
-msgid "Danish (eliminate dead keys)"
+msgid "chr"
 msgstr ""
 
 #: ../rules/base.xml.in.h:182
-msgid "Default numeric keypad keys"
+msgid "Cherokee"
 msgstr ""
 
 #: ../rules/base.xml.in.h:183
-msgid "Dell"
-msgstr "Dell"
+msgid "English (US, with euro on 5)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:184
-msgid "Dell 101-key PC"
-msgstr "DELL PC 101 kláves"
+msgid "English (US, international with dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:185
-msgid "Dell Laptop/notebook Inspiron 6xxx/8xxx"
-msgstr "Dell Laptop/notebook Inspiron 6xxx/8xxx"
+msgid "English (US, alternative international)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:186
-msgid "Dell Laptop/notebook Precision M series"
-msgstr "Dell Laptop/notebook Precision série M"
+msgid "English (Colemak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:187
-msgid "Dell Latitude series laptop"
-msgstr "Laptop série Dell Latitude"
+msgid "English (Dvorak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:188
-msgid "Dell Precision M65"
+msgid "English (Dvorak international with dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:189
-msgid "Dell SK-8125"
+msgid "English (Dvorak alternative international no dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:190
-msgid "Dell SK-8135"
+msgid "English (left handed Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:191
-msgid "Dell USB Multimedia Keyboard"
+msgid "English (right handed Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:192
-msgid "Dexxa Wireless Desktop Keyboard"
-msgstr "Dexxa Wireless Desktop Keyboard"
+msgid "English (classic Dvorak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:193
-msgid "Dhivehi"
+msgid "English (programmer Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:194
-msgid "Diamond 9801 / 9802 series"
-msgstr "Diamond séria 9801 / 9802"
-
-#: ../rules/base.xml.in.h:195
-msgid "Dutch"
-msgstr "Holandské"
+#. Keyboard indicator for Russian layouts
+#: ../rules/base.xml.in.h:195 ../rules/base.extras.xml.in.h:46
+msgid "ru"
+msgstr ""
 
 #: ../rules/base.xml.in.h:196
-msgid "Dutch (Macintosh)"
+msgid "Russian (US, phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:197
-msgid "Dutch (Sun dead keys)"
+msgid "English (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:198
-msgid "Dutch (standard)"
+msgid "English (international AltGr dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:199
-msgid "Dzongkha"
+msgid "English (layout toggle on multiply/divide key)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:200
-msgid "Enable extra typographic characters"
-msgstr ""
-
-#: ../rules/base.xml.in.h:201
-msgid "English (Cameroon Dvorak)"
+msgid "Serbo-Croatian (US)"
 msgstr ""
 
+#. Keyboard indicator for Catalan layouts
 #: ../rules/base.xml.in.h:202
-msgid "English (Cameroon qwerty)"
+msgid "ca"
 msgstr ""
 
 #: ../rules/base.xml.in.h:203
-msgid "English (Cameroon)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:204
-msgid "English (Canada)"
+msgid "Catalan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:205
-msgid "English (Colemak)"
+#. Keyboard indicator for Persian layouts
+#: ../rules/base.xml.in.h:205 ../rules/base.extras.xml.in.h:13
+msgid "fa"
 msgstr ""
 
 #: ../rules/base.xml.in.h:206
-msgid "English (Dvorak alternative international no dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:207
-msgid "English (Dvorak international with dead keys)"
+msgid "Afghani"
 msgstr ""
 
+#. Keyboard indicator for Pashto layouts
 #: ../rules/base.xml.in.h:208
-msgid "English (Dvorak)"
+msgid "ps"
 msgstr ""
 
 #: ../rules/base.xml.in.h:209
-msgid "English (Ghana)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:210
-msgid "English (Ghana, GILLBT)"
-msgstr ""
+msgid "Pashto"
+msgstr "paštčina"
 
+#. Keyboard indicator for Uzbek layouts
 #: ../rules/base.xml.in.h:211
-msgid "English (Ghana, multilingual)"
+msgid "uz"
 msgstr ""
 
 #: ../rules/base.xml.in.h:212
-msgid "English (India, with RupeeSign)"
+msgid "Uzbek (Afghanistan)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:213
-msgid "English (Macintosh)"
+msgid "Pashto (Afghanistan, OLPC)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:214
-msgid "English (Mali, US Macintosh)"
+msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:215
-msgid "English (Mali, US international)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:216
-msgid "English (Nigeria)"
+msgid "Uzbek (Afghanistan, OLPC)"
 msgstr ""
 
+#. Keyboard indicator for Arabic layouts
 #: ../rules/base.xml.in.h:217
-msgid "English (South Africa)"
+msgid "ar"
 msgstr ""
 
 #: ../rules/base.xml.in.h:218
-msgid "English (UK)"
-msgstr ""
+msgid "Arabic"
+msgstr "Arabsky"
 
 #: ../rules/base.xml.in.h:219
-msgid "English (UK, Colemak)"
+msgid "Arabic (azerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:220
-msgid "English (UK, Dvorak with UK punctuation)"
+msgid "Arabic (azerty/digits)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:221
-msgid "English (UK, Dvorak)"
+msgid "Arabic (digits)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:222
-msgid "English (UK, Macintosh international)"
+msgid "Arabic (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:223
-msgid "English (UK, Macintosh)"
+msgid "Arabic (qwerty/digits)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:224
-msgid "English (UK, extended WinKeys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:225
-msgid "English (UK, international with dead keys)"
+msgid "Arabic (Buckwalter)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:226 ../rules/base.extras.xml.in.h:8
-msgid "English (US)"
+#. Keyboard indicator for Albanian layouts
+#: ../rules/base.xml.in.h:226
+msgid "sq"
 msgstr ""
 
 #: ../rules/base.xml.in.h:227
-msgid "English (US, alternative international)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:228
-msgid "English (US, international with dead keys)"
+msgid "Albanian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:229
-msgid "English (US, with euro on 5)"
+#. Keyboard indicator for Armenian layouts
+#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:49
+msgid "hy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:230
-msgid "English (classic Dvorak)"
+#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:50
+msgid "Armenian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:231
-msgid "English (international AltGr dead keys)"
+msgid "Armenian (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:232
-msgid "English (layout toggle on multiply/divide key)"
+msgid "Armenian (alternative phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:233
-msgid "English (left handed Dvorak)"
+msgid "Armenian (eastern)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:234
-msgid "English (programmer Dvorak)"
+msgid "Armenian (western)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:235
-msgid "English (right handed Dvorak)"
+msgid "Armenian (alternative eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:236
-msgid "Ennyah DKB-1008"
-msgstr "Ennyah DKB-1008"
-
-#: ../rules/base.xml.in.h:237
-msgid "Enter on keypad"
+#. Keyboard indicator for German layouts
+#: ../rules/base.xml.in.h:237 ../rules/base.extras.xml.in.h:9
+msgid "de"
 msgstr ""
 
 #: ../rules/base.xml.in.h:238
-msgid "Esperanto"
-msgstr "esperanto"
+msgid "German (Austria)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:239
-msgid "Esperanto (Portugal, Nativo)"
+msgid "German (Austria, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:240
-msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgid "German (Austria, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:241
-msgid "Estonian"
-msgstr ""
-
-#: ../rules/base.xml.in.h:242
-msgid "Estonian (Dvorak)"
+msgid "German (Austria, Macintosh)"
 msgstr ""
 
+#. Keyboard indicator for Azerbaijani layouts
 #: ../rules/base.xml.in.h:243
-msgid "Estonian (US keyboard with Estonian letters)"
+msgid "az"
 msgstr ""
 
 #: ../rules/base.xml.in.h:244
-msgid "Estonian (eliminate dead keys)"
+msgid "Azerbaijani"
 msgstr ""
 
 #: ../rules/base.xml.in.h:245
-msgid "Euro on 2"
-msgstr ""
-
-#: ../rules/base.xml.in.h:246
-msgid "Euro on 4"
+msgid "Azerbaijani (Cyrillic)"
 msgstr ""
 
+#. Keyboard indicator for Belarusian layouts
 #: ../rules/base.xml.in.h:247
-msgid "Euro on 5"
+msgid "by"
 msgstr ""
 
 #: ../rules/base.xml.in.h:248
-msgid "Euro on E"
+msgid "Belarusian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:249
-msgid "Everex STEPnote"
-msgstr "Everex STEPnote"
+msgid "Belarusian (legacy)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:250
-msgid "Ewe"
-msgstr "Ewe"
-
-#: ../rules/base.xml.in.h:251
-msgid "FL90"
+msgid "Belarusian (Latin)"
 msgstr ""
 
+#. Keyboard indicator for Belgian layouts
 #: ../rules/base.xml.in.h:252
-msgid "Faroese"
+msgid "be"
 msgstr ""
 
 #: ../rules/base.xml.in.h:253
-msgid "Faroese (eliminate dead keys)"
-msgstr ""
+msgid "Belgian"
+msgstr "Belgická"
 
 #: ../rules/base.xml.in.h:254
-msgid "Filipino"
+msgid "Belgian (alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:255
-msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgid "Belgian (alternative, latin-9 only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:256
-msgid "Filipino (Capewell-Dvorak Latin)"
+msgid "Belgian (alternative, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:257
-msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgid "Belgian (ISO alternate)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:258
-msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgid "Belgian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:259
-msgid "Filipino (Colemak Baybayin)"
+msgid "Belgian (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:260
-msgid "Filipino (Colemak Latin)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:261
-msgid "Filipino (Dvorak Baybayin)"
+msgid "Belgian (Wang model 724 azerty)"
 msgstr ""
 
+#. Keyboard indicator for Bengali layouts
 #: ../rules/base.xml.in.h:262
-msgid "Filipino (Dvorak Latin)"
+msgid "bn"
 msgstr ""
 
 #: ../rules/base.xml.in.h:263
-msgid "Filipino (QWERTY Baybayin)"
-msgstr ""
+msgid "Bengali"
+msgstr "Bengálska"
 
 #: ../rules/base.xml.in.h:264
-msgid "Finnish"
-msgstr "Fínske"
-
-#: ../rules/base.xml.in.h:265
-msgid "Finnish (Macintosh)"
+msgid "Bengali (Probhat)"
 msgstr ""
 
+#. Keyboard indicator for Indian layouts
 #: ../rules/base.xml.in.h:266
-msgid "Finnish (classic)"
+msgid "in"
 msgstr ""
 
 #: ../rules/base.xml.in.h:267
-msgid "Finnish (classic, eliminate dead keys)"
+msgid "Indian"
+msgstr ""
+
+#: ../rules/base.xml.in.h:268
+msgid "Bengali (India)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:269
+msgid "Bengali (India, Probhat)"
 msgstr ""
 
-#. This assumes the KP_ abstract symbols are actually useful for some apps
-#. The description needs to be rewritten
 #: ../rules/base.xml.in.h:270
-msgid "Four-level key with abstract separators"
+msgid "Bengali (India, Baishakhi)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:271
-msgid "Four-level key with comma"
+msgid "Bengali (India, Bornona)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:272
-msgid "Four-level key with dot"
+msgid "Bengali (India, Uni Gitanjali)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:273
-msgid "Four-level key with dot, latin-9 restriction"
-msgstr ""
-
-#: ../rules/base.xml.in.h:274
-msgid "Four-level key with momayyez"
+msgid "Bengali (India, Baishakhi Inscript)"
 msgstr ""
 
+#. Keyboard indicator for Gujarati layouts
 #: ../rules/base.xml.in.h:275
-msgid "French"
-msgstr "Francúzske"
-
-#: ../rules/base.xml.in.h:276
-msgid "French (Bepo, ergonomic, Dvorak way)"
+msgid "gu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:277
-msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
-msgstr ""
+#: ../rules/base.xml.in.h:276
+msgid "Gujarati"
+msgstr "Gudžarátska"
 
+#. Keyboard indicator for Punjabi layouts
 #: ../rules/base.xml.in.h:278
-msgid "French (Breton)"
+msgid "pa"
 msgstr ""
 
 #: ../rules/base.xml.in.h:279
-msgid "French (Cameroon azerty)"
+msgid "Punjabi (Gurmukhi)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:280
-msgid "French (Cameroon)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:281 ../rules/base.extras.xml.in.h:11
-msgid "French (Canada)"
+msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr ""
 
+#. Keyboard indicator for Kannada layouts
 #: ../rules/base.xml.in.h:282
-msgid "French (Canada, Dvorak)"
+msgid "kn"
 msgstr ""
 
 #: ../rules/base.xml.in.h:283
-msgid "French (Canada, legacy)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:284
-msgid "French (Democratic Republic of the Congo)"
-msgstr ""
+msgid "Kannada"
+msgstr "Kannadské"
 
+#. Keyboard indicator for Malayalam layouts
 #: ../rules/base.xml.in.h:285
-msgid "French (Dvorak)"
+msgid "ml"
 msgstr ""
 
 #: ../rules/base.xml.in.h:286
-msgid "French (Guinea)"
-msgstr ""
+msgid "Malayalam"
+msgstr "Malajalámske"
 
 #: ../rules/base.xml.in.h:287
-msgid "French (Macintosh)"
-msgstr "Francúzske (Macintosh)"
-
-#: ../rules/base.xml.in.h:288
-msgid "French (Mali, alternative)"
+msgid "Malayalam (Lalitha)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:289
-msgid "French (Morocco)"
+#: ../rules/base.xml.in.h:288
+msgid "Malayalam (enhanced Inscript with Rupee Sign)"
 msgstr ""
 
+#. Keyboard indicator for Oriya layouts
 #: ../rules/base.xml.in.h:290
-msgid "French (Sun dead keys)"
+msgid "or"
 msgstr ""
 
 #: ../rules/base.xml.in.h:291
-msgid "French (Switzerland)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:292
-msgid "French (Switzerland, Macintosh)"
-msgstr ""
+msgid "Oriya"
+msgstr "uríjčina"
 
+#. Keyboard indicator for Tamil layouts
 #: ../rules/base.xml.in.h:293
-msgid "French (Switzerland, Sun dead keys)"
+msgid "ta"
 msgstr ""
 
 #: ../rules/base.xml.in.h:294
-msgid "French (Switzerland, eliminate dead keys)"
+msgid "Tamil (Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:295
-msgid "French (alternative)"
+msgid "Tamil (keyboard with numerals)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:296
-msgid "French (alternative, Sun dead keys)"
+msgid "Tamil (TAB typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:297
-msgid "French (alternative, eliminate dead keys)"
+msgid "Tamil (TSCII typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:298
-msgid "French (alternative, latin-9 only)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:299
-msgid "French (eliminate dead keys)"
-msgstr ""
+msgid "Tamil"
+msgstr "Tamilské"
 
+#. Keyboard indicator for Telugu layouts
 #: ../rules/base.xml.in.h:300
-msgid "French (legacy, alternative)"
+msgid "te"
 msgstr ""
 
 #: ../rules/base.xml.in.h:301
-msgid "French (legacy, alternative, Sun dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:302
-msgid "French (legacy, alternative, eliminate dead keys)"
-msgstr ""
+msgid "Telugu"
+msgstr "Telugské"
 
+#. Keyboard indicator for Urdu layouts
 #: ../rules/base.xml.in.h:303
-msgid "Fujitsu-Siemens Computers AMILO laptop"
+msgid "ur"
 msgstr ""
 
 #: ../rules/base.xml.in.h:304
-msgid "Fula"
-msgstr "fulbčina"
+msgid "Urdu (phonetic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:305
-msgid "Ga"
-msgstr "Ga"
+msgid "Urdu (alternative phonetic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:306
-msgid "Generic 101-key PC"
-msgstr "všeobecná PC 101 kláves"
-
-#: ../rules/base.xml.in.h:307
-msgid "Generic 102-key (Intl) PC"
-msgstr "všeobecná PC 102 kláves (medz.)"
+msgid "Urdu (WinKeys)"
+msgstr ""
 
+#. Keyboard indicator for Hindi layouts
 #: ../rules/base.xml.in.h:308
-msgid "Generic 104-key PC"
-msgstr "všeobecná PC 104 kláves"
+msgid "hi"
+msgstr ""
 
 #: ../rules/base.xml.in.h:309
-msgid "Generic 105-key (Intl) PC"
-msgstr "všeobecná 105-kláv. (medzinár.) PC"
+msgid "Hindi (Bolnagri)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:310
-msgid "Genius Comfy KB-12e"
-msgstr "Genius Comfy KB-12e"
+msgid "Hindi (Wx)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:311
-msgid "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-msgstr "Genius Comfy KB-16M / Genius MM Keyboard KWD-910"
-
-#: ../rules/base.xml.in.h:312
-msgid "Genius Comfy KB-21e-Scroll"
-msgstr "Genius Comfy KB-21e-Scroll"
+msgid "English (India, with RupeeSign)"
+msgstr ""
 
+#. Keyboard indicator for Bosnian layouts
 #: ../rules/base.xml.in.h:313
-msgid "Genius KB-19e NB"
-msgstr "Genius KB-19e NB"
+msgid "bs"
+msgstr ""
 
 #: ../rules/base.xml.in.h:314
-msgid "Genius KKB-2050HS"
-msgstr ""
+msgid "Bosnian"
+msgstr "Bosnianske"
 
 #: ../rules/base.xml.in.h:315
-msgid "Georgian"
+msgid "Bosnian (use guillemets for quotes)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:316
-msgid "Georgian (France, AZERTY Tskapo)"
+msgid "Bosnian (use Bosnian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:317
-msgid "Georgian (Italy)"
+msgid "Bosnian (US keyboard with Bosnian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:318
-msgid "Georgian (MESS)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:319
-msgid "Georgian (ergonomic)"
+msgid "Bosnian (US keyboard with Bosnian letters)"
 msgstr ""
 
+#. Keyboard indicator for Portuguese layouts
 #: ../rules/base.xml.in.h:320
-msgid "German"
-msgstr "Nemecké"
+msgid "pt"
+msgstr ""
 
 #: ../rules/base.xml.in.h:321
-msgid "German (Austria)"
+msgid "Portuguese (Brazil)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:322
-msgid "German (Austria, Macintosh)"
+msgid "Portuguese (Brazil, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:323
-msgid "German (Austria, Sun dead keys)"
+msgid "Portuguese (Brazil, Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:324
-msgid "German (Austria, eliminate dead keys)"
+msgid "Portuguese (Brazil, nativo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:325
-msgid "German (Dvorak)"
+msgid "Portuguese (Brazil, nativo for USA keyboards)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:326
-msgid "German (Macintosh)"
-msgstr "Nemecké (Macintosh)"
-
-#: ../rules/base.xml.in.h:327
-msgid "German (Macintosh, eliminate dead keys)"
+msgid "Portuguese (Brazil, nativo for Esperanto)"
 msgstr ""
 
+#. Keyboard indicator for Bulgarian layouts
 #: ../rules/base.xml.in.h:328
-msgid "German (Neo 2)"
+msgid "bg"
 msgstr ""
 
 #: ../rules/base.xml.in.h:329
-msgid "German (Sun dead keys)"
-msgstr ""
+msgid "Bulgarian"
+msgstr "Bulharské"
 
 #: ../rules/base.xml.in.h:330
-msgid "German (Switzerland)"
+msgid "Bulgarian (traditional phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:331
-msgid "German (Switzerland, Macintosh)"
+msgid "Bulgarian (new phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:332
-msgid "German (Switzerland, Sun dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:333
-msgid "German (Switzerland, eliminate dead keys)"
+msgid "Arabic (Morocco)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:334
-msgid "German (Switzerland, legacy)"
+#. Keyboard indicator for French layouts
+#: ../rules/base.xml.in.h:334 ../rules/base.extras.xml.in.h:3
+msgid "fr"
 msgstr ""
 
 #: ../rules/base.xml.in.h:335
-msgid "German (dead acute)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:336
-msgid "German (dead grave acute)"
+msgid "French (Morocco)"
 msgstr ""
 
+#. Keyboard indicator for Berber layouts
 #: ../rules/base.xml.in.h:337
-msgid "German (eliminate dead keys)"
+msgid "ber"
 msgstr ""
 
 #: ../rules/base.xml.in.h:338
-msgid "German (qwerty)"
+msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:339
-msgid "Greek"
+msgid "Berber (Morocco, Tifinagh alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:340
-msgid "Greek (eliminate dead keys)"
+msgid "Berber (Morocco, Tifinagh alternative phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:341
-msgid "Greek (extended)"
+msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:342
-msgid "Greek (polytonic)"
+msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:343
-msgid "Greek (simple)"
+msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:344
-msgid "Gujarati"
-msgstr "Gudžarátska"
-
-# je firma
+#. Keyboard indicator for Cameroon layouts
 #: ../rules/base.xml.in.h:345
-msgid "Gyration"
-msgstr "Gyration"
+msgid "cm"
+msgstr ""
 
 #: ../rules/base.xml.in.h:346
-msgid "HTC Dream"
+msgid "English (Cameroon)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:347
-msgid "Happy Hacking Keyboard"
+msgid "French (Cameroon)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:348
-msgid "Happy Hacking Keyboard for Mac"
+msgid "Cameroon Multilingual (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:349
-msgid "Hausa"
-msgstr "hauské"
-
-#: ../rules/base.xml.in.h:350
-msgid "Hebrew"
+msgid "Cameroon Multilingual (azerty)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:351
-msgid "Hebrew (Biblical, Tiro)"
+#: ../rules/base.xml.in.h:350
+msgid "Cameroon Multilingual (Dvorak)"
 msgstr ""
 
+#. Keyboard indicator for Burmese layouts
 #: ../rules/base.xml.in.h:352
-msgid "Hebrew (lyx)"
+msgid "my"
 msgstr ""
 
 #: ../rules/base.xml.in.h:353
-msgid "Hebrew (phonetic)"
-msgstr ""
+msgid "Burmese"
+msgstr "Burmézsky"
 
-#: ../rules/base.xml.in.h:354
-msgid "Hewlett-Packard Internet Keyboard"
-msgstr "Hewlett-Packard Internet Keyboard"
+#: ../rules/base.xml.in.h:354 ../rules/base.extras.xml.in.h:4
+msgid "French (Canada)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:355
-msgid "Hewlett-Packard Mini 110 Notebook"
+msgid "French (Canada, Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:356
-msgid "Hewlett-Packard Omnibook 500 FA"
-msgstr "Hewlett-Packard Omnibook 500 FA"
+msgid "French (Canada, legacy)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:357
-msgid "Hewlett-Packard Omnibook 5xx"
-msgstr "Hewlett-Packard Omnibook 5xx"
+msgid "Canadian Multilingual"
+msgstr ""
 
 #: ../rules/base.xml.in.h:358
-msgid "Hewlett-Packard Omnibook 6000/6100"
-msgstr "Hewlett-Packard Omnibook 6000/6100"
+msgid "Canadian Multilingual (first part)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:359
-msgid "Hewlett-Packard Omnibook XE3 GC"
-msgstr "Hewlett-Packard Omnibook XE3 GC"
-
-#: ../rules/base.xml.in.h:360
-msgid "Hewlett-Packard Omnibook XE3 GF"
-msgstr "Hewlett-Packard Omnibook XE3 GF"
+msgid "Canadian Multilingual (second part)"
+msgstr ""
 
+#. Keyboard indicator for Inuktikut layouts
 #: ../rules/base.xml.in.h:361
-msgid "Hewlett-Packard Omnibook XT1000"
-msgstr "Hewlett-Packard Omnibook XT1000"
+msgid "ike"
+msgstr ""
 
 #: ../rules/base.xml.in.h:362
-msgid "Hewlett-Packard Pavilion ZT11xx"
-msgstr "Hewlett-Packard Pavilion ZT11xx"
+msgid "Inuktitut"
+msgstr "inuktitut"
 
 #: ../rules/base.xml.in.h:363
-msgid "Hewlett-Packard Pavilion dv5"
+msgid "English (Canada)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:364
-msgid "Hewlett-Packard SK-250x Multimedia Keyboard"
-msgstr ""
-
-#: ../rules/base.xml.in.h:365
-msgid "Hewlett-Packard nx9020"
+msgid "French (Democratic Republic of the Congo)"
 msgstr ""
 
+#. Keyboard indicator for Taiwanese layouts
 #: ../rules/base.xml.in.h:366
-msgid "Hexadecimal"
+msgid "zh"
 msgstr ""
 
 #: ../rules/base.xml.in.h:367
-msgid "Hindi (Bolnagri)"
+msgid "Chinese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:368
-msgid "Hindi (Wx)"
+msgid "Tibetan"
 msgstr ""
 
 #: ../rules/base.xml.in.h:369
-msgid "Honeywell Euroboard"
-msgstr "Honeywell Euroboard"
+msgid "Tibetan (with ASCII numerals)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:370
-msgid "Htc Dream phone"
+msgid "Uyghur"
 msgstr ""
 
-#: ../rules/base.xml.in.h:371
-msgid "Hungarian"
-msgstr "Maďarské"
-
+#. Keyboard indicator for Croatian layouts
 #: ../rules/base.xml.in.h:372
-msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgid "hr"
 msgstr ""
 
 #: ../rules/base.xml.in.h:373
-msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgid "Croatian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:374
-msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgid "Croatian (use guillemets for quotes)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:375
-msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgid "Croatian (use Croatian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:376
-msgid "Hungarian (101/qwertz/comma/dead keys)"
+msgid "Croatian (US keyboard with Croatian digraphs)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:377
-msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:378
-msgid "Hungarian (101/qwertz/dot/dead keys)"
+msgid "Croatian (US keyboard with Croatian letters)"
 msgstr ""
 
+#. Keyboard indicator for Chech layouts
 #: ../rules/base.xml.in.h:379
-msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgid "cs"
 msgstr ""
 
 #: ../rules/base.xml.in.h:380
-msgid "Hungarian (102/qwerty/comma/dead keys)"
-msgstr ""
+msgid "Czech"
+msgstr "České"
 
 #: ../rules/base.xml.in.h:381
-msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
+msgid "Czech (with &lt;\\|&gt; key)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:382
-msgid "Hungarian (102/qwerty/dot/dead keys)"
-msgstr ""
+msgid "Czech (qwerty)"
+msgstr "České (qwerty)"
 
 #: ../rules/base.xml.in.h:383
-msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
+msgid "Czech (qwerty, extended Backslash)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:384
-msgid "Hungarian (102/qwertz/comma/dead keys)"
+msgid "Czech (UCW layout, accented letters only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:385
-msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:386
-msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgid "Czech (US Dvorak with CZ UCW support)"
 msgstr ""
 
+#. Keyboard indicator for Danish layouts
 #: ../rules/base.xml.in.h:387
-msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgid "da"
 msgstr ""
 
 #: ../rules/base.xml.in.h:388
-msgid "Hungarian (eliminate dead keys)"
-msgstr ""
+msgid "Danish"
+msgstr "Dánske"
 
 #: ../rules/base.xml.in.h:389
-msgid "Hungarian (qwerty)"
+msgid "Danish (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:390
-msgid "Hungarian (standard)"
+msgid "Danish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:391
-msgid "Hyper is mapped to Win-keys"
+msgid "Danish (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:392
-msgid "IBM Rapid Access"
-msgstr "IBM Rapid Access"
-
-#: ../rules/base.xml.in.h:393
-msgid "IBM Rapid Access II"
-msgstr "IBM Rapid Access II"
+msgid "Danish (Dvorak)"
+msgstr ""
 
+#. Keyboard indicator for Dutch layouts
 #: ../rules/base.xml.in.h:394
-msgid "IBM Space Saver"
+msgid "nl"
 msgstr ""
 
 #: ../rules/base.xml.in.h:395
-msgid "IBM ThinkPad 560Z/600/600E/A22E"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgid "Dutch"
+msgstr "Holandské"
 
 #: ../rules/base.xml.in.h:396
-msgid "IBM ThinkPad R60/T60/R61/T61"
+msgid "Dutch (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:397
-msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
+msgid "Dutch (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:398
-msgid "Icelandic"
-msgstr ""
-
-#: ../rules/base.xml.in.h:399
-msgid "Icelandic (Dvorak)"
+msgid "Dutch (standard)"
 msgstr ""
 
+#. Keyboard indicator for Dzongkha layouts
 #: ../rules/base.xml.in.h:400
-msgid "Icelandic (Macintosh)"
+msgid "dz"
 msgstr ""
 
 #: ../rules/base.xml.in.h:401
-msgid "Icelandic (Sun dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:402
-msgid "Icelandic (eliminate dead keys)"
+msgid "Dzongkha"
 msgstr ""
 
+#. Keyboard indicator for Estonian layouts
 #: ../rules/base.xml.in.h:403
-msgid "Igbo"
-msgstr "igbo"
+msgid "et"
+msgstr ""
 
 #: ../rules/base.xml.in.h:404
-msgid "Indian"
+msgid "Estonian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:405
-msgid "Inuktitut"
-msgstr "inuktitut"
+msgid "Estonian (eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:406
-msgid "Iraqi"
+msgid "Estonian (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:407
-msgid "Irish"
-msgstr "Írske"
+msgid "Estonian (US keyboard with Estonian letters)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:408
-msgid "Irish (UnicodeExpert)"
+#: ../rules/base.xml.in.h:408 ../rules/base.extras.xml.in.h:14
+msgid "Persian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:409
-msgid "Italian"
-msgstr "Talianske"
-
-#: ../rules/base.xml.in.h:410
-msgid "Italian (Macintosh)"
+msgid "Persian (with Persian Keypad)"
 msgstr ""
 
+#. Keyboard indicator for Kurdish layouts
 #: ../rules/base.xml.in.h:411
-msgid "Italian (US keyboard with Italian letters)"
+msgid "ku"
 msgstr ""
 
 #: ../rules/base.xml.in.h:412
-msgid "Italian (eliminate dead keys)"
+msgid "Kurdish (Iran, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:413
-msgid "Japanese"
-msgstr "Japonské"
+msgid "Kurdish (Iran, F)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:414
-msgid "Japanese (Kana 86)"
+msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:415
-msgid "Japanese (Kana)"
+msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:416
-msgid "Japanese (Macintosh)"
+msgid "Iraqi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:417
-msgid "Japanese (OADG 109A)"
+msgid "Kurdish (Iraq, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:418
-msgid "Japanese (PC-98xx Series)"
+msgid "Kurdish (Iraq, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:419
-msgid "Japanese keyboard options"
-msgstr "Japonské možnosti klávesnice"
+msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:420
-msgid "Kalmyk"
+msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:421
-msgid "Kana Lock key is locking"
-msgstr "Kláves Kana Lock zamyká"
-
+#. Keyboard indicator for Faroese layouts
 #: ../rules/base.xml.in.h:422
-msgid "Kannada"
-msgstr "Kannadské"
+msgid "fo"
+msgstr ""
 
 #: ../rules/base.xml.in.h:423
-msgid "Kashubian"
-msgstr "kašubčina"
-
-#: ../rules/base.xml.in.h:424
-msgid "Kazakh"
+msgid "Faroese"
 msgstr ""
 
-#: ../rules/base.xml.in.h:425
-msgid "Kazakh (with Russian)"
+#: ../rules/base.xml.in.h:424
+msgid "Faroese (eliminate dead keys)"
 msgstr ""
 
+#. Keyboard indicator for Finnish layouts
 #: ../rules/base.xml.in.h:426
-msgid "Key sequence to kill the X server"
+msgid "fi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:427
-msgid "Key to choose 3rd level"
-msgstr ""
+msgid "Finnish"
+msgstr "Fínske"
 
 #: ../rules/base.xml.in.h:428
-msgid "Key to choose 5th level"
+msgid "Finnish (classic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:429
-msgid "Key(s) to change layout"
+msgid "Finnish (classic, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:430
-msgid "Keytronic FlexPro"
-msgstr "Keytronic FlexPro"
+msgid "Northern Saami (Finland)"
+msgstr "Severný Saami (Fínsko)"
 
 #: ../rules/base.xml.in.h:431
-msgid "Khmer (Cambodia)"
+msgid "Finnish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:432
-msgid "Kikuyu"
-msgstr ""
+msgid "French"
+msgstr "Francúzske"
 
 #: ../rules/base.xml.in.h:433
-msgid "Kinesis"
+msgid "French (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:434
-msgid "Komi"
+msgid "French (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:435
-msgid "Korean"
+msgid "French (alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:436
-msgid "Korean (101/104 key compatible)"
+msgid "French (alternative, latin-9 only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:437
-msgid "Kurdish (Iran, Arabic-Latin)"
+msgid "French (alternative, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:438
-msgid "Kurdish (Iran, F)"
+msgid "French (alternative, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:439
-msgid "Kurdish (Iran, Latin Alt-Q)"
+msgid "French (legacy, alternative)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:440
-msgid "Kurdish (Iran, Latin Q)"
+msgid "French (legacy, alternative, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:441
-msgid "Kurdish (Iraq, Arabic-Latin)"
+msgid "French (legacy, alternative, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:442
-msgid "Kurdish (Iraq, F)"
+msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:443
-msgid "Kurdish (Iraq, Latin Alt-Q)"
+msgid "French (Bepo, ergonomic, Dvorak way, latin-9 only)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:444
-msgid "Kurdish (Iraq, Latin Q)"
+msgid "French (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:445
-msgid "Kurdish (Syria, F)"
-msgstr ""
+msgid "French (Macintosh)"
+msgstr "Francúzske (Macintosh)"
 
 #: ../rules/base.xml.in.h:446
-msgid "Kurdish (Syria, Latin Alt-Q)"
+msgid "French (Breton)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:447
-msgid "Kurdish (Syria, Latin Q)"
+msgid "Occitan"
 msgstr ""
 
 #: ../rules/base.xml.in.h:448
-msgid "Kurdish (Turkey, F)"
+msgid "Georgian (France, AZERTY Tskapo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:449
-msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgid "English (Ghana)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:450
-msgid "Kurdish (Turkey, Latin Q)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:451
-msgid "Kyrgyz"
+msgid "English (Ghana, multilingual)"
 msgstr ""
 
+#. Keyboard indicator for Akan layouts
 #: ../rules/base.xml.in.h:452
-msgid "Kyrgyz (phonetic)"
+msgid "ak"
 msgstr ""
 
 #: ../rules/base.xml.in.h:453
-msgid "Lao"
-msgstr "Lao"
-
-#: ../rules/base.xml.in.h:454
-msgid "Lao (STEA proposed standard layout)"
-msgstr ""
+msgid "Akan"
+msgstr "Akan"
 
+#. Keyboard indicator for Ewe layouts
 #: ../rules/base.xml.in.h:455
-msgid "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"
-msgstr "Laptop/notebook Compaq (napr. Armada) Laptop Keyboard"
+msgid "ee"
+msgstr ""
 
 #: ../rules/base.xml.in.h:456
-msgid "Laptop/notebook Compaq (eg. Presario) Internet Keyboard"
-msgstr "Laptop/notebook Compaq (napr. Presario) Internet Keyboard"
-
-#: ../rules/base.xml.in.h:457
-msgid "Laptop/notebook eMachines m68xx"
-msgstr "Laptop/notebook eMachines m68xx"
+msgid "Ewe"
+msgstr "Ewe"
 
-#: ../rules/base.xml.in.h:458 ../rules/base.extras.xml.in.h:13
-msgid "Latvian"
+#. Keyboard indicator for Fula layouts
+#: ../rules/base.xml.in.h:458
+msgid "ff"
 msgstr ""
 
 #: ../rules/base.xml.in.h:459
-msgid "Latvian (F variant)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:460
-msgid "Latvian (adapted)"
-msgstr ""
+msgid "Fula"
+msgstr "fulbčina"
 
+#. Keyboard indicator for Ga layouts
 #: ../rules/base.xml.in.h:461
-msgid "Latvian (apostrophe variant)"
+msgid "gaa"
 msgstr ""
 
 #: ../rules/base.xml.in.h:462
-msgid "Latvian (ergonomic, ŪGJRMV)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:463
-msgid "Latvian (modern)"
-msgstr ""
+msgid "Ga"
+msgstr "Ga"
 
+#. Keyboard indicator for Hausa layouts
 #: ../rules/base.xml.in.h:464
-msgid "Latvian (tilde variant)"
+msgid "ha"
 msgstr ""
 
 #: ../rules/base.xml.in.h:465
-msgid "Left Alt"
-msgstr ""
-
-#: ../rules/base.xml.in.h:466
-msgid "Left Alt (while pressed)"
-msgstr ""
+msgid "Hausa"
+msgstr "hauské"
 
+#. Keyboard indicator for Avatime layouts
 #: ../rules/base.xml.in.h:467
-msgid "Left Alt is swapped with Left Win"
+msgid "avn"
 msgstr ""
 
 #: ../rules/base.xml.in.h:468
-msgid "Left Ctrl"
+msgid "Avatime"
 msgstr ""
 
 #: ../rules/base.xml.in.h:469
-msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgid "English (Ghana, GILLBT)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:470
-msgid "Left Ctrl+Left Shift"
-msgstr ""
-
-#: ../rules/base.xml.in.h:471
-msgid "Left Shift"
+msgid "French (Guinea)"
 msgstr ""
 
+#. Keyboard indicator for Georgian layouts
 #: ../rules/base.xml.in.h:472
-msgid "Left Win"
+msgid "ka"
 msgstr ""
 
 #: ../rules/base.xml.in.h:473
-msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgid "Georgian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:474
-msgid "Left Win (while pressed)"
+msgid "Georgian (ergonomic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:475
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
+msgid "Georgian (MESS)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:476
-msgid ""
-"Left Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
+msgid "Russian (Georgia)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:477
-msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
+msgid "Ossetian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:478
-msgid "Legacy"
-msgstr ""
+#: ../rules/base.xml.in.h:478 ../rules/base.extras.xml.in.h:10
+msgid "German"
+msgstr "Nemecké"
 
 #: ../rules/base.xml.in.h:479
-msgid "Legacy Wang 724"
+msgid "German (dead acute)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:480
+msgid "German (dead grave acute)"
 msgstr ""
 
-#. Actually, with KP_SEPARATOR, as the old keypad(comma)
 #: ../rules/base.xml.in.h:481
-msgid "Legacy key with comma"
+msgid "German (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:482
-msgid "Legacy key with dot"
+msgid "Romanian (Germany)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:483 ../rules/base.extras.xml.in.h:22
-msgid "Lithuanian"
+#: ../rules/base.xml.in.h:483
+msgid "Romanian (Germany, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:484
-msgid "Lithuanian (IBM LST 1205-92)"
+msgid "German (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:485
-msgid "Lithuanian (LEKP)"
+msgid "German (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:486
-msgid "Lithuanian (LEKPa)"
+msgid "German (Neo 2)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:487
-msgid "Lithuanian (US keyboard with Lithuanian letters)"
-msgstr ""
+msgid "German (Macintosh)"
+msgstr "Nemecké (Macintosh)"
 
 #: ../rules/base.xml.in.h:488
-msgid "Lithuanian (standard)"
+msgid "German (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:489
-msgid "Logitech Access Keyboard"
-msgstr "Logitech Access Keyboard"
+msgid "Lower Sorbian"
+msgstr ""
 
 #: ../rules/base.xml.in.h:490
-msgid "Logitech Cordless Desktop"
-msgstr "Logitech Cordless Desktop"
-
-#: ../rules/base.xml.in.h:491
-msgid "Logitech Cordless Desktop (alternate option)"
+msgid "Lower Sorbian (qwertz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:492
-msgid "Logitech Cordless Desktop EX110"
+#: ../rules/base.xml.in.h:491
+msgid "Russian (Germany, phonetic)"
 msgstr ""
 
+#. Keyboard indicator for Greek layouts
 #: ../rules/base.xml.in.h:493
-msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop LX-300"
+msgid "gr"
+msgstr ""
 
 #: ../rules/base.xml.in.h:494
-msgid "Logitech Cordless Desktop Navigator"
-msgstr "Logitech Cordless Desktop Navigator"
+msgid "Greek"
+msgstr ""
 
 #: ../rules/base.xml.in.h:495
-msgid "Logitech Cordless Desktop Optical"
-msgstr "Logitech Cordless Desktop Optical"
+msgid "Greek (simple)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:496
-msgid "Logitech Cordless Desktop Pro (alternate option 2)"
+msgid "Greek (extended)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:497
-msgid "Logitech Cordless Desktop iTouch"
-msgstr "Logitech Cordless Desktop iTouch"
+msgid "Greek (eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:498
-msgid "Logitech Cordless Freedom/Desktop Navigator"
-msgstr "Logitech Cordless Freedom/Desktop Navigator"
-
-#: ../rules/base.xml.in.h:499
-msgid "Logitech G15 extra keys via G15daemon"
-msgstr "Logitech G15 extra klávesy pomocou G15daemon"
+msgid "Greek (polytonic)"
+msgstr ""
 
+#. Keyboard indicator for Hungarian layouts
 #: ../rules/base.xml.in.h:500
-msgid "Logitech Generic Keyboard"
+msgid "hu"
 msgstr ""
 
 #: ../rules/base.xml.in.h:501
-msgid "Logitech Internet 350 Keyboard"
-msgstr ""
+msgid "Hungarian"
+msgstr "Maďarské"
 
 #: ../rules/base.xml.in.h:502
-msgid "Logitech Internet Keyboard"
-msgstr "Logitech Internet Keyboard"
+msgid "Hungarian (standard)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:503
-msgid "Logitech Internet Navigator Keyboard"
-msgstr "Logitech Internet Navigator Keyboard"
+msgid "Hungarian (eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:504
-msgid "Logitech Media Elite Keyboard"
+msgid "Hungarian (qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:505
-msgid "Logitech Ultra-X Cordless Media Desktop Keyboard"
+msgid "Hungarian (101/qwertz/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:506
-msgid "Logitech Ultra-X Keyboard"
-msgstr "Logitech Ultra-X Keyboard"
+msgid "Hungarian (101/qwertz/comma/eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:507
-msgid "Logitech diNovo Edge Keyboard"
+msgid "Hungarian (101/qwertz/dot/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:508
-msgid "Logitech diNovo Keyboard"
-msgstr "Logitech diNovo Keyboard"
+msgid "Hungarian (101/qwertz/dot/eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:509
-msgid "Logitech iTouch"
-msgstr "Logitech iTouch"
+msgid "Hungarian (101/qwerty/comma/dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:510
-msgid "Logitech iTouch Cordless Keyboard (model Y-RB6)"
-msgstr "Logitech iTouch Cordless Keyboard (model Y-RB6)"
+msgid "Hungarian (101/qwerty/comma/eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:511
-msgid "Logitech iTouch Internet Navigator Keyboard SE"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE"
+msgid "Hungarian (101/qwerty/dot/dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:512
-msgid "Logitech iTouch Internet Navigator Keyboard SE (USB)"
-msgstr "Logitech iTouch Internet Navigator Keyboard SE (USB)"
+msgid "Hungarian (101/qwerty/dot/eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:513
-msgid "Lower Sorbian"
+msgid "Hungarian (102/qwertz/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:514
-msgid "Lower Sorbian (qwertz)"
+msgid "Hungarian (102/qwertz/comma/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:515
-msgid "MacBook/MacBook Pro"
-msgstr "MacBook/MacBook Pro"
+msgid "Hungarian (102/qwertz/dot/dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:516
-msgid "MacBook/MacBook Pro (Intl)"
-msgstr "MacBook/MacBook Pro (medzin)"
+msgid "Hungarian (102/qwertz/dot/eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:517
-msgid "Macedonian"
+msgid "Hungarian (102/qwerty/comma/dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:518
-msgid "Macedonian (eliminate dead keys)"
+msgid "Hungarian (102/qwerty/comma/eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:519
-msgid "Macintosh"
-msgstr "Macintosh"
-
-#: ../rules/base.xml.in.h:520
-msgid "Macintosh Old"
-msgstr "Macintosh staré"
+msgid "Hungarian (102/qwerty/dot/dead keys)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:521
-msgid "Make Caps Lock an additional Backspace"
+#: ../rules/base.xml.in.h:520
+msgid "Hungarian (102/qwerty/dot/eliminate dead keys)"
 msgstr ""
 
+#. Keyboard indicator for Icelandic layouts
 #: ../rules/base.xml.in.h:522
-msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
+msgid "is"
 msgstr ""
 
 #: ../rules/base.xml.in.h:523
-msgid "Make Caps Lock an additional Ctrl"
+msgid "Icelandic"
 msgstr ""
 
 #: ../rules/base.xml.in.h:524
-msgid "Make Caps Lock an additional ESC"
+msgid "Icelandic (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:525
-msgid "Make Caps Lock an additional Hyper"
+msgid "Icelandic (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:526
-msgid "Make Caps Lock an additional Num Lock"
+msgid "Icelandic (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:527
-msgid "Make Caps Lock an additional Super"
+msgid "Icelandic (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:528
-msgid "Malayalam"
-msgstr "Malajalámske"
-
+#. Keyboard indicator for Hebrew layouts
 #: ../rules/base.xml.in.h:529
-msgid "Malayalam (Lalitha)"
+msgid "he"
 msgstr ""
 
 #: ../rules/base.xml.in.h:530
-msgid "Malayalam (enhanced Inscript with Rupee Sign)"
+msgid "Hebrew"
 msgstr ""
 
 #: ../rules/base.xml.in.h:531
-msgid "Maltese"
+msgid "Hebrew (lyx)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:532
-msgid "Maltese (with US layout)"
+msgid "Hebrew (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:533
-msgid "Maori"
-msgstr "maorčina"
-
-#: ../rules/base.xml.in.h:534
-msgid "Mari"
+msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
+#. Keyboard indicator for Italian layouts
 #: ../rules/base.xml.in.h:535
-msgid "Memorex MX1998"
-msgstr "Memorex MX1998"
+msgid "it"
+msgstr ""
 
 #: ../rules/base.xml.in.h:536
-msgid "Memorex MX2500 EZ-Access Keyboard"
-msgstr "Memorex MX2500 EZ-Access Keyboard"
+msgid "Italian"
+msgstr "Talianske"
 
 #: ../rules/base.xml.in.h:537
-msgid "Memorex MX2750"
-msgstr "Memorex MX2750"
+msgid "Italian (eliminate dead keys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:538
-msgid "Menu"
+msgid "Italian (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:539
-msgid "Meta is mapped to Left Win"
+msgid "Italian (US keyboard with Italian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:540
-msgid "Meta is mapped to Win keys"
-msgstr ""
-
-#: ../rules/base.xml.in.h:541
-msgid "Meta on Left Ctrl"
+msgid "Georgian (Italy)"
 msgstr ""
 
+#. Keyboard indicator for Japanese layouts
 #: ../rules/base.xml.in.h:542
-msgid "Microsoft Comfort Curve Keyboard 2000"
+msgid "ja"
 msgstr ""
 
 #: ../rules/base.xml.in.h:543
-msgid "Microsoft Internet Keyboard"
-msgstr "Microsoft Internet Keyboard"
+msgid "Japanese"
+msgstr "Japonské"
 
 #: ../rules/base.xml.in.h:544
-msgid "Microsoft Internet Keyboard Pro, Swedish"
-msgstr "Microsoft Internet Keyboard Pro, Švédska"
+msgid "Japanese (Kana)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:545
-msgid "Microsoft Natural"
-msgstr "Microsoft Natural"
+msgid "Japanese (Kana 86)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:546
-msgid "Microsoft Natural Keyboard Elite"
+msgid "Japanese (OADG 109A)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:547
-msgid "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro"
-
-#: ../rules/base.xml.in.h:548
-msgid "Microsoft Natural Keyboard Pro OEM"
-msgstr "Microsoft Natural Keyboard Pro OEM"
+msgid "Japanese (Macintosh)"
+msgstr ""
 
+#. Keyboard indicator for Kikuyu layouts
 #: ../rules/base.xml.in.h:549
-msgid "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
-msgstr "Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro"
+msgid "ki"
+msgstr ""
 
 #: ../rules/base.xml.in.h:550
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 4000"
+msgid "Kyrgyz"
 msgstr ""
 
 #: ../rules/base.xml.in.h:551
-msgid "Microsoft Natural Wireless Ergonomic Keyboard 7000"
+msgid "Kyrgyz (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:552
-msgid "Microsoft Office Keyboard"
-msgstr "Microsoft Office Keyboard"
-
+#. Keyboard indicator for Khmer layouts
 #: ../rules/base.xml.in.h:553
-msgid "Microsoft Wireless Multimedia Keyboard 1.0A"
-msgstr "Microsoft Wireless Multimedia Keyboard 1.0A"
+msgid "km"
+msgstr ""
 
 #: ../rules/base.xml.in.h:554
-msgid "Miscellaneous compatibility options"
-msgstr "Dodatočné voľby pre kompatibilitu"
-
-#: ../rules/base.xml.in.h:555
-msgid "Mongolian"
+msgid "Khmer (Cambodia)"
 msgstr ""
 
+#. Keyboard indicator for Kazakh layouts
 #: ../rules/base.xml.in.h:556
-msgid "Montenegrin"
+msgid "kk"
 msgstr ""
 
 #: ../rules/base.xml.in.h:557
-msgid "Montenegrin (Cyrillic with guillemets)"
+msgid "Kazakh"
 msgstr ""
 
 #: ../rules/base.xml.in.h:558
-msgid "Montenegrin (Cyrillic)"
+msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:559
-msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:560
-msgid "Montenegrin (Latin Unicode qwerty)"
+msgid "Kazakh (with Russian)"
 msgstr ""
 
+#. Keyboard indicator for Lao layouts
 #: ../rules/base.xml.in.h:561
-msgid "Montenegrin (Latin Unicode)"
+msgid "lo"
 msgstr ""
 
 #: ../rules/base.xml.in.h:562
-msgid "Montenegrin (Latin qwerty)"
-msgstr ""
+msgid "Lao"
+msgstr "Lao"
 
 #: ../rules/base.xml.in.h:563
-msgid "Montenegrin (Latin with guillemets)"
+msgid "Lao (STEA proposed standard layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:564
-msgid "NICOLA-F style Backspace"
-msgstr "Backspace v štýle NICOLA-F"
-
+#. Keyboard indicator for Spanish layouts
 #: ../rules/base.xml.in.h:565
-msgid "Nepali"
+msgid "es"
 msgstr ""
 
 #: ../rules/base.xml.in.h:566
-msgid "Non-breakable space character at fourth level"
+msgid "Spanish (Latin American)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:567
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level"
+msgid "Spanish (Latin American, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:568
-msgid ""
-"Non-breakable space character at fourth level, thin non-breakable space "
-"character at sixth level (via Ctrl+Shift)"
+msgid "Spanish (Latin American, include dead tilde)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:569
-msgid "Non-breakable space character at second level"
-msgstr ""
-
-#: ../rules/base.xml.in.h:570
-msgid "Non-breakable space character at third level"
+msgid "Spanish (Latin American, Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:571
-msgid "Non-breakable space character at third level, nothing at fourth level"
+#. Keyboard indicator for Lithuanian layouts
+#: ../rules/base.xml.in.h:571 ../rules/base.extras.xml.in.h:16
+msgid "lt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:572
-msgid ""
-"Non-breakable space character at third level, thin non-breakable space "
-"character at fourth level"
+#: ../rules/base.xml.in.h:572 ../rules/base.extras.xml.in.h:17
+msgid "Lithuanian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:573
-msgid "Northern Saami (Finland)"
-msgstr "Severný Saami (Fínsko)"
+msgid "Lithuanian (standard)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:574
-msgid "Northern Saami (Norway)"
+msgid "Lithuanian (US keyboard with Lithuanian letters)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:575
-msgid "Northern Saami (Norway, eliminate dead keys)"
+msgid "Lithuanian (IBM LST 1205-92)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:576
-msgid "Northern Saami (Sweden)"
-msgstr "Severný Saami (Švédsko)"
+msgid "Lithuanian (LEKP)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:577
-msgid "Northgate OmniKey 101"
-msgstr "Northgate OmniKey 101"
-
-#: ../rules/base.xml.in.h:578
-msgid "Norwegian"
-msgstr "Nórske"
+msgid "Lithuanian (LEKPa)"
+msgstr ""
 
-#: ../rules/base.xml.in.h:579
-msgid "Norwegian (Dvorak)"
+#. Keyboard indicator for Latvian layouts
+#: ../rules/base.xml.in.h:579 ../rules/base.extras.xml.in.h:19
+msgid "lv"
 msgstr ""
 
-#: ../rules/base.xml.in.h:580
-msgid "Norwegian (Macintosh)"
+#: ../rules/base.xml.in.h:580 ../rules/base.extras.xml.in.h:20
+msgid "Latvian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:581
-msgid "Norwegian (Macintosh, eliminate dead keys)"
+msgid "Latvian (apostrophe variant)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:582
-msgid "Norwegian (eliminate dead keys)"
+msgid "Latvian (tilde variant)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:583
-msgid "Num Lock"
+msgid "Latvian (F variant)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:584
-msgid "Numeric keypad delete key behaviour"
+msgid "Latvian (modern)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:585
-msgid "Numeric keypad keys work as with Macintosh"
+msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:586
-msgid "Numeric keypad layout selection"
-msgstr "Výber rozloženia numerickej klávesnice"
-
-#: ../rules/base.xml.in.h:587
-msgid "OLPC"
+msgid "Latvian (adapted)"
 msgstr ""
 
+#. Keyboard indicator for Maori layouts
 #: ../rules/base.xml.in.h:588
-msgid "Occitan"
+msgid "mi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:589
-msgid "Ogham"
-msgstr "Oghamské"
+msgid "Maori"
+msgstr "maorčina"
 
-#: ../rules/base.xml.in.h:590
-msgid "Ogham (IS434)"
+#. Keyboard indicator for Serbian layouts
+#: ../rules/base.xml.in.h:591 ../rules/base.extras.xml.in.h:43
+msgid "sr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:591
-msgid "Oriya"
-msgstr "uríjčina"
-
 #: ../rules/base.xml.in.h:592
-msgid "Ortek MCK-800 MM/Internet keyboard"
-msgstr "Ortek MCK-800 MM/internetová klávesnica"
+msgid "Montenegrin"
+msgstr ""
 
 #: ../rules/base.xml.in.h:593
-msgid "Ossetian (Georgia)"
+msgid "Montenegrin (Cyrillic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:594
-msgid "Ossetian (WinKeys)"
+msgid "Montenegrin (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:595
-msgid "Ossetian (legacy)"
+msgid "Montenegrin (Latin Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:596
-msgid "PC-98xx Series"
-msgstr "Séria PC-98xx"
+msgid "Montenegrin (Latin qwerty)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:597
-msgid "Pannonian Rusyn (homophonic)"
+msgid "Montenegrin (Latin Unicode qwerty)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:598
-msgid "Pashto"
-msgstr "paštčina"
-
-#: ../rules/base.xml.in.h:599
-msgid "Pashto (Afghanistan, OLPC)"
+msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:600
-msgid "Pause"
+#: ../rules/base.xml.in.h:599
+msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:601 ../rules/base.extras.xml.in.h:24
-msgid "Persian"
+#. Keyboard indicator for Macedonian layouts
+#: ../rules/base.xml.in.h:601
+msgid "mk"
 msgstr ""
 
 #: ../rules/base.xml.in.h:602
-msgid "Persian (Afghanistan, Dari OLPC)"
+msgid "Macedonian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:603
-msgid "Persian (with Persian Keypad)"
+msgid "Macedonian (eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:604 ../rules/base.extras.xml.in.h:25
-msgid "Polish"
-msgstr "Poľské"
-
+#. Keyboard indicator for Maltese layouts
 #: ../rules/base.xml.in.h:605
-msgid "Polish (Dvorak)"
+msgid "mt"
 msgstr ""
 
 #: ../rules/base.xml.in.h:606
-msgid "Polish (Dvorak, Polish quotes on key 1)"
+msgid "Maltese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:607
-msgid "Polish (Dvorak, Polish quotes on quotemark key)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:608
-msgid "Polish (programmer Dvorak)"
+msgid "Maltese (with US layout)"
 msgstr ""
 
+#. Keyboard indicator for Mongolian layouts
 #: ../rules/base.xml.in.h:609
-msgid "Polish (qwertz)"
-msgstr "Poľské (qwertz)"
+msgid "mn"
+msgstr ""
 
 #: ../rules/base.xml.in.h:610
-msgid "Portuguese"
-msgstr "Portugalské"
-
-#: ../rules/base.xml.in.h:611
-msgid "Portuguese (Brazil)"
+msgid "Mongolian"
 msgstr ""
 
+#. Keyboard indicator for Norwegian layouts
 #: ../rules/base.xml.in.h:612
-msgid "Portuguese (Brazil, Dvorak)"
+msgid "no"
 msgstr ""
 
 #: ../rules/base.xml.in.h:613
-msgid "Portuguese (Brazil, eliminate dead keys)"
-msgstr ""
+msgid "Norwegian"
+msgstr "Nórske"
 
 #: ../rules/base.xml.in.h:614
-msgid "Portuguese (Brazil, nativo for Esperanto)"
+msgid "Norwegian (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:615
-msgid "Portuguese (Brazil, nativo for USA keyboards)"
+msgid "Norwegian (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:616
-msgid "Portuguese (Brazil, nativo)"
+msgid "Northern Saami (Norway)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:617
-msgid "Portuguese (Macintosh)"
+msgid "Northern Saami (Norway, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:618
-msgid "Portuguese (Macintosh, Sun dead keys)"
+msgid "Norwegian (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:619
-msgid "Portuguese (Macintosh, eliminate dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:620
-msgid "Portuguese (Nativo for USA keyboards)"
+msgid "Norwegian (Macintosh, eliminate dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:621
-msgid "Portuguese (Nativo)"
+#. Keyboard indicator for Polish layouts
+#: ../rules/base.xml.in.h:621 ../rules/base.extras.xml.in.h:35
+msgid "pl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:622
-msgid "Portuguese (Sun dead keys)"
-msgstr ""
+#: ../rules/base.xml.in.h:622 ../rules/base.extras.xml.in.h:36
+msgid "Polish"
+msgstr "Poľské"
 
 #: ../rules/base.xml.in.h:623
-msgid "Portuguese (eliminate dead keys)"
-msgstr ""
+msgid "Polish (qwertz)"
+msgstr "Poľské (qwertz)"
 
 #: ../rules/base.xml.in.h:624
-msgid "Propeller Voyager (KTEZ-1000)"
-msgstr "Propeller Voyager (KTEZ-1000)"
+msgid "Polish (Dvorak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:625
-msgid "PrtSc"
+msgid "Polish (Dvorak, Polish quotes on quotemark key)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:626
-msgid "Punjabi (Gurmukhi Jhelum)"
+msgid "Polish (Dvorak, Polish quotes on key 1)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:627
-msgid "Punjabi (Gurmukhi)"
-msgstr ""
+msgid "Kashubian"
+msgstr "kašubčina"
 
 #: ../rules/base.xml.in.h:628
-msgid "QTronix Scorpius 98N+"
-msgstr "QTronix Scorpius 98N+"
+msgid "Russian (Poland, phonetic Dvorak)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:629
-msgid "Right Alt"
+msgid "Polish (programmer Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:630
-msgid "Right Alt (while pressed)"
-msgstr ""
+msgid "Portuguese"
+msgstr "Portugalské"
 
 #: ../rules/base.xml.in.h:631
-msgid ""
-"Right Alt chooses 5th level and activates level5-Lock when pressed together "
-"with another 5th-level-chooser, one press releases the lock"
+msgid "Portuguese (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:632
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
+msgid "Portuguese (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:633
-msgid ""
-"Right Alt chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
+msgid "Portuguese (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:634
-msgid "Right Alt key never chooses 3rd level"
+msgid "Portuguese (Macintosh, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:635
-msgid "Right Alt, Shift+Right Alt key is Multi_Key"
+msgid "Portuguese (Macintosh, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:636
-msgid "Right Ctrl"
+msgid "Portuguese (Nativo)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:637
-msgid "Right Ctrl (while pressed)"
+msgid "Portuguese (Nativo for USA keyboards)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:638
-msgid "Right Ctrl as Right Alt"
-msgstr ""
-
-#: ../rules/base.xml.in.h:639
-msgid "Right Ctrl is mapped to Menu"
+msgid "Esperanto (Portugal, Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:640
-msgid "Right Ctrl+Right Shift"
+#. Keyboard indicator for Romanian layouts
+#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:38
+msgid "ro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:641
-msgid "Right Shift"
+#: ../rules/base.xml.in.h:641 ../rules/base.extras.xml.in.h:39
+msgid "Romanian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:642
-msgid "Right Win"
+msgid "Romanian (cedilla)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:643
-msgid "Right Win (while pressed)"
+msgid "Romanian (standard)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:644
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser"
+msgid "Romanian (standard cedilla)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:645
-msgid ""
-"Right Win chooses 5th level, locks when pressed together with another 5th-"
-"level-chooser, one press releases the lock"
+msgid "Romanian (WinKeys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:27
-msgid "Romanian"
-msgstr ""
+#: ../rules/base.xml.in.h:646 ../rules/base.extras.xml.in.h:47
+msgid "Russian"
+msgstr "Ruské"
 
 #: ../rules/base.xml.in.h:647
-msgid "Romanian (Germany)"
+msgid "Russian (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:648
-msgid "Romanian (Germany, eliminate dead keys)"
+msgid "Russian (phonetic WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:649
-msgid "Romanian (WinKeys)"
+msgid "Russian (typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:650
-msgid "Romanian (cedilla)"
+msgid "Russian (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:651
-msgid "Romanian (standard cedilla)"
+msgid "Russian (typewriter, legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:652
-msgid "Romanian (standard)"
-msgstr ""
+msgid "Tatar"
+msgstr "tatárčina"
 
 #: ../rules/base.xml.in.h:653
-msgid "Rupee on 4"
+msgid "Ossetian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:654 ../rules/base.extras.xml.in.h:29
-msgid "Russian"
-msgstr "Ruské"
+#: ../rules/base.xml.in.h:654
+msgid "Ossetian (WinKeys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:655
-msgid "Russian (DOS)"
-msgstr ""
+msgid "Chuvash"
+msgstr "Čuvašské"
 
 #: ../rules/base.xml.in.h:656
-msgid "Russian (Georgia)"
+msgid "Chuvash (Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:657
-msgid "Russian (Germany, phonetic)"
-msgstr ""
+msgid "Udmurt"
+msgstr "udmurtčina"
 
 #: ../rules/base.xml.in.h:658
-msgid "Russian (Kazakhstan, with Kazakh)"
+msgid "Komi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:659
-msgid "Russian (Poland, phonetic Dvorak)"
+msgid "Yakut"
 msgstr ""
 
 #: ../rules/base.xml.in.h:660
-msgid "Russian (Sweden, phonetic)"
+msgid "Kalmyk"
 msgstr ""
 
 #: ../rules/base.xml.in.h:661
-msgid "Russian (Sweden, phonetic, eliminate dead keys)"
+msgid "Russian (DOS)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:662
-msgid "Russian (US, phonetic)"
+msgid "Serbian (Russia)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:663
-msgid "Russian (Ukraine, standard RSTU)"
+msgid "Bashkirian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:664
-msgid "Russian (legacy)"
+msgid "Mari"
 msgstr ""
 
 #: ../rules/base.xml.in.h:665
-msgid "Russian (phonetic WinKeys)"
+msgid "Serbian (Cyrillic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:666
-msgid "Russian (phonetic)"
+msgid "Serbian (Cyrillic, Z and ZHE swapped)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:667
-msgid "Russian (typewriter)"
+msgid "Serbian (Latin)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:668
-msgid "Russian (typewriter, legacy)"
+msgid "Serbian (Latin Unicode)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:669
-msgid "SILVERCREST Multimedia Wireless Keyboard"
-msgstr "SILVERCREST Multimedia Wireless Keyboard"
+msgid "Serbian (Latin qwerty)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:670
-msgid "SK-1300"
-msgstr "SK-1300"
+msgid "Serbian (Latin Unicode qwerty)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:671
-msgid "SK-2500"
-msgstr "SK-2500"
+msgid "Serbian (Cyrillic with guillemets)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:672
-msgid "SK-6200"
-msgstr "SK-6200"
+msgid "Serbian (Latin with guillemets)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:673
-msgid "SK-7100"
-msgstr "SK-7100"
-
-#: ../rules/base.xml.in.h:674
-msgid "SVEN Ergonomic 2500"
-msgstr "SVEN Ergonomic 2500"
+msgid "Pannonian Rusyn (homophonic)"
+msgstr ""
 
+#. Keyboard indicator for Slovenian layouts
 #: ../rules/base.xml.in.h:675
-msgid "SVEN Slim 303"
+msgid "sl"
 msgstr ""
 
 #: ../rules/base.xml.in.h:676
-msgid "Saisiyat (Taiwan)"
+msgid "Slovenian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:677
-msgid "Samsung SDM 4500P"
-msgstr "Samsung SDM 4500P"
+msgid "Slovenian (use guillemets for quotes)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:678
-msgid "Samsung SDM 4510P"
-msgstr "Samsung SDM 4510P"
-
-#: ../rules/base.xml.in.h:679
-msgid "Sanwa Supply SKB-KG3"
+msgid "Slovenian (US keyboard with Slovenian letters)"
 msgstr ""
 
+#. Keyboard indicator for Slovak layouts
 #: ../rules/base.xml.in.h:680
-msgid "Scroll Lock"
+msgid "sk"
 msgstr ""
 
 #: ../rules/base.xml.in.h:681
-msgid "Semi-colon on third level"
-msgstr ""
+msgid "Slovak"
+msgstr "Slovenské"
 
-#: ../rules/base.xml.in.h:682 ../rules/base.extras.xml.in.h:32
-msgid "Serbian"
+#: ../rules/base.xml.in.h:682
+msgid "Slovak (extended Backslash)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:683
-msgid "Serbian (Latin Unicode qwerty)"
-msgstr ""
+msgid "Slovak (qwerty)"
+msgstr "Slovenské (qwerty)"
 
 #: ../rules/base.xml.in.h:684
-msgid "Serbian (Latin Unicode)"
+msgid "Slovak (qwerty, extended Backslash)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:685
-msgid "Serbian (Latin qwerty)"
-msgstr ""
+msgid "Spanish"
+msgstr "Španielske"
 
 #: ../rules/base.xml.in.h:686
-msgid "Serbian (Latin with guillemets)"
+msgid "Spanish (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:687
-msgid "Serbian (Latin)"
+msgid "Spanish (include dead tilde)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:688
-msgid "Serbian (Russia)"
+msgid "Spanish (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:689
-msgid "Serbian (Z and ZHE swapped)"
+msgid "Spanish (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:690
-msgid "Serbian (with guillemets)"
+msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:691
-msgid "Serbo-Croatian (US)"
+msgid "Catalan (Spain, with middle-dot L)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:692
-msgid "Shift cancels Caps Lock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:693
-msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
+msgid "Spanish (Macintosh)"
 msgstr ""
 
+#. Keyboard indicator for Swedish layouts
 #: ../rules/base.xml.in.h:694
-msgid "Shift with numeric keypad keys works as in MS Windows"
+msgid "sv"
 msgstr ""
 
 #: ../rules/base.xml.in.h:695
-msgid "Shift+Caps Lock"
-msgstr ""
+msgid "Swedish"
+msgstr "Švédske"
 
 #: ../rules/base.xml.in.h:696
-msgid "Sindhi"
+msgid "Swedish (eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:697
-msgid "Sinhala"
+msgid "Swedish (Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:698
-msgid "Slovak"
-msgstr "Slovenské"
+msgid "Russian (Sweden, phonetic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:699
-msgid "Slovak (extended Backslash)"
+msgid "Russian (Sweden, phonetic, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:700
-msgid "Slovak (qwerty)"
-msgstr "Slovenské (qwerty)"
+msgid "Northern Saami (Sweden)"
+msgstr "Severný Saami (Švédsko)"
 
 #: ../rules/base.xml.in.h:701
-msgid "Slovak (qwerty, extended Backslash)"
+msgid "Swedish (Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:702
-msgid "Slovenian"
+msgid "Swedish (Svdvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:703
-msgid "Slovenian (US keyboard with Slovenian letters)"
+msgid "Swedish Sign Language"
 msgstr ""
 
 #: ../rules/base.xml.in.h:704
-msgid "Slovenian (use guillemets for quotes)"
+msgid "German (Switzerland)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:705
-msgid "Spanish"
-msgstr "Španielske"
+msgid "German (Switzerland, legacy)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:706
-msgid "Spanish (Dvorak)"
+msgid "German (Switzerland, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:707
-msgid "Spanish (Latin American)"
+msgid "German (Switzerland, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:708
-msgid "Spanish (Latin American, Sun dead keys)"
+msgid "French (Switzerland)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:709
-msgid "Spanish (Latin American, eliminate dead keys)"
+msgid "French (Switzerland, eliminate dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:710
-msgid "Spanish (Latin American, include dead tilde)"
+msgid "French (Switzerland, Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:711
-msgid "Spanish (Macintosh)"
+msgid "French (Switzerland, Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:712
-msgid "Spanish (Sun dead keys)"
+msgid "German (Switzerland, Macintosh)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:713
-msgid "Spanish (eliminate dead keys)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:714
-msgid "Spanish (include dead tilde)"
+msgid "Arabic (Syria)"
 msgstr ""
 
+#. Keyboard indicator for Syriac layouts
 #: ../rules/base.xml.in.h:715
-msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
+msgid "syc"
 msgstr ""
 
 #: ../rules/base.xml.in.h:716
-msgid "Sun Type 5/6"
-msgstr ""
+msgid "Syriac"
+msgstr "Syrské"
 
 #: ../rules/base.xml.in.h:717
-msgid "Super Power Multimedia Keyboard"
-msgstr "Super Power Multimedia Keyboard"
+msgid "Syriac (phonetic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:718
-msgid "Swahili (Kenya)"
+msgid "Kurdish (Syria, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:719
-msgid "Swahili (Tanzania)"
+msgid "Kurdish (Syria, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:720
-msgid "Swap Ctrl and Caps Lock"
-msgstr ""
-
-#: ../rules/base.xml.in.h:721
-msgid "Swap ESC and Caps Lock"
+msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr ""
 
+#. Keyboard indicator for Tajik layouts
 #: ../rules/base.xml.in.h:722
-msgid "Swedish"
-msgstr "Švédske"
+msgid "tg"
+msgstr ""
 
 #: ../rules/base.xml.in.h:723
-msgid "Swedish (Dvorak)"
+msgid "Tajik"
 msgstr ""
 
 #: ../rules/base.xml.in.h:724
-msgid "Swedish (Macintosh)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:725
-msgid "Swedish (Svdvorak)"
+msgid "Tajik (legacy)"
 msgstr ""
 
+#. Keyboard indicator for Sinhala layouts
 #: ../rules/base.xml.in.h:726
-msgid "Swedish (eliminate dead keys)"
+msgid "si"
 msgstr ""
 
 #: ../rules/base.xml.in.h:727
-msgid "Swedish Sign Language"
+msgid "Sinhala (phonetic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:728
-msgid "Symplon PaceBook (tablet PC)"
-msgstr "Symplon PaceBook (tablet PC)"
+msgid "Tamil (Sri Lanka, Unicode)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:729
-msgid "Syriac"
-msgstr "Syrské"
-
-#: ../rules/base.xml.in.h:730
-msgid "Syriac (phonetic)"
+msgid "Tamil (Sri Lanka, TAB Typewriter)"
 msgstr ""
 
+#. Keyboard indicator for Thai layouts
 #: ../rules/base.xml.in.h:731
-msgid "Taiwanese"
+msgid "th"
 msgstr ""
 
 #: ../rules/base.xml.in.h:732
-msgid "Taiwanese (indigenous)"
+msgid "Thai"
 msgstr ""
 
 #: ../rules/base.xml.in.h:733
-msgid "Tajik"
+msgid "Thai (TIS-820.2538)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:734
-msgid "Tajik (legacy)"
+msgid "Thai (Pattachote)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:735
-msgid "Tamil"
-msgstr "Tamilské"
-
+#. Keyboard indicator for Turkish layouts
 #: ../rules/base.xml.in.h:736
-msgid "Tamil (Sri Lanka, TAB Typewriter)"
+msgid "tr"
 msgstr ""
 
 #: ../rules/base.xml.in.h:737
-msgid "Tamil (Sri Lanka, Unicode)"
-msgstr ""
+msgid "Turkish"
+msgstr "Turecké"
 
 #: ../rules/base.xml.in.h:738
-msgid "Tamil (TAB typewriter)"
-msgstr ""
+msgid "Turkish (F)"
+msgstr "Turecké (F)"
 
 #: ../rules/base.xml.in.h:739
-msgid "Tamil (TSCII typewriter)"
+msgid "Turkish (Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:740
-msgid "Tamil (Unicode)"
+msgid "Turkish (Sun dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:741
-msgid "Tamil (keyboard with numerals)"
+msgid "Kurdish (Turkey, Latin Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:742
-msgid "Targa Visionary 811"
+msgid "Kurdish (Turkey, F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:743
-msgid "Tatar"
-msgstr "tatárčina"
+msgid "Kurdish (Turkey, Latin Alt-Q)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:744
-msgid "Telugu"
-msgstr "Telugské"
-
-#: ../rules/base.xml.in.h:745
-msgid "Thai"
+msgid "Turkish (international with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:746
-msgid "Thai (Pattachote)"
+#. Keyboard indicator for Crimean Tatar layouts
+#: ../rules/base.xml.in.h:746 ../rules/base.extras.xml.in.h:40
+msgid "crh"
 msgstr ""
 
 #: ../rules/base.xml.in.h:747
-msgid "Thai (TIS-820.2538)"
+msgid "Crimean Tatar (Turkish Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:748
-msgid "Tibetan"
+msgid "Crimean Tatar (Turkish F)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:749
-msgid "Tibetan (with ASCII numerals)"
+msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:750
-msgid "To the corresponding key in a Dvorak keyboard."
+msgid "Taiwanese"
 msgstr ""
 
 #: ../rules/base.xml.in.h:751
-msgid "To the corresponding key in a Qwerty keyboard."
-msgstr ""
-
-#: ../rules/base.xml.in.h:752
-msgid "Toggle PointerKeys with Shift + NumLock."
+msgid "Taiwanese (indigenous)"
 msgstr ""
 
+#. Keyboard indicator for Saisiyat layouts
 #: ../rules/base.xml.in.h:753
-msgid "Toshiba Satellite S3000"
-msgstr "Toshiba Satellite S3000"
+msgid "xsy"
+msgstr ""
 
 #: ../rules/base.xml.in.h:754
-msgid "Trust Direct Access Keyboard"
-msgstr "Trust Direct Access Keyboard"
-
-#: ../rules/base.xml.in.h:755
-msgid "Trust Slimline"
+msgid "Saisiyat (Taiwan)"
 msgstr ""
 
+#. Keyboard indicator for Ukranian layouts
 #: ../rules/base.xml.in.h:756
-msgid "Trust Wireless Keyboard Classic"
-msgstr "Trust Wireless Keyboard Classic"
+msgid "uk"
+msgstr ""
 
 #: ../rules/base.xml.in.h:757
-msgid "Tswana"
+msgid "Ukrainian"
 msgstr ""
 
 #: ../rules/base.xml.in.h:758
-msgid "Turkish"
-msgstr "Turecké"
+msgid "Ukrainian (phonetic)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:759
-msgid "Turkish (Alt-Q)"
+msgid "Ukrainian (typewriter)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:760
-msgid "Turkish (F)"
-msgstr "Turecké (F)"
+msgid "Ukrainian (WinKeys)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:761
-msgid "Turkish (Sun dead keys)"
+msgid "Ukrainian (legacy)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:762
-msgid "Turkish (international with dead keys)"
+msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:763
-msgid "Turkmen"
+msgid "Russian (Ukraine, standard RSTU)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:764
-msgid "Turkmen (Alt-Q)"
+msgid "Ukrainian (homophonic)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:765
-msgid "TypeMatrix EZ-Reach 2020"
+msgid "English (UK)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:766
-msgid "TypeMatrix EZ-Reach 2030 PS2"
+msgid "English (UK, extended WinKeys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:767
-msgid "TypeMatrix EZ-Reach 2030 USB"
+msgid "English (UK, international with dead keys)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:768
-msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
+msgid "English (UK, Dvorak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:769
-msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
+msgid "English (UK, Dvorak with UK punctuation)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:770
-msgid "Udmurt"
-msgstr "udmurtčina"
+msgid "English (UK, Macintosh)"
+msgstr ""
 
 #: ../rules/base.xml.in.h:771
-msgid "Ukrainian"
+msgid "English (UK, Macintosh international)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:772
-msgid "Ukrainian (WinKeys)"
+msgid "English (UK, Colemak)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:773
-msgid "Ukrainian (homophonic)"
+msgid "Uzbek"
 msgstr ""
 
 #: ../rules/base.xml.in.h:774
-msgid "Ukrainian (legacy)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:775
-msgid "Ukrainian (phonetic)"
+msgid "Uzbek (Latin)"
 msgstr ""
 
+#. Keyboard indicator for Vietnamese layouts
 #: ../rules/base.xml.in.h:776
-msgid "Ukrainian (standard RSTU)"
+msgid "vi"
 msgstr ""
 
 #: ../rules/base.xml.in.h:777
-msgid "Ukrainian (typewriter)"
-msgstr ""
-
-#: ../rules/base.xml.in.h:778
-msgid "Unicode additions (arrows and math operators)"
+msgid "Vietnamese"
 msgstr ""
 
+#. Keyboard indicator for Korean layouts
 #: ../rules/base.xml.in.h:779
-msgid ""
-"Unicode additions (arrows and math operators). Math operators on default "
-"level"
+msgid "ko"
 msgstr ""
 
 #: ../rules/base.xml.in.h:780
-msgid "Unitek KB-1925"
+msgid "Korean"
 msgstr ""
 
 #: ../rules/base.xml.in.h:781
-msgid "Urdu (Pakistan)"
+msgid "Korean (101/104 key compatible)"
 msgstr ""
 
 #: ../rules/base.xml.in.h:782
+msgid "Japanese (PC-98xx Series)"
+msgstr ""
+
+#. Keyboard indicator for Irish layouts
+#: ../rules/base.xml.in.h:784
+msgid "ie"
+msgstr ""
+
+#: ../rules/base.xml.in.h:785
+msgid "Irish"
+msgstr "Írske"
+
+#: ../rules/base.xml.in.h:786
+msgid "CloGaelach"
+msgstr "CloGaelach"
+
+#: ../rules/base.xml.in.h:787
+msgid "Irish (UnicodeExpert)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:788
+msgid "Ogham"
+msgstr "Oghamské"
+
+#: ../rules/base.xml.in.h:789
+msgid "Ogham (IS434)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:790
+msgid "Urdu (Pakistan)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:791
 msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:783
+#: ../rules/base.xml.in.h:792
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:784
-msgid "Urdu (WinKeys)"
+#: ../rules/base.xml.in.h:793
+msgid "Arabic (Pakistan)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:785
-msgid "Urdu (alternative phonetic)"
+#. Keyboard indicator for Sindhi layouts
+#: ../rules/base.xml.in.h:795
+msgid "sd"
 msgstr ""
 
-#: ../rules/base.xml.in.h:786
-msgid "Urdu (phonetic)"
+#: ../rules/base.xml.in.h:796
+msgid "Sindhi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:787
-msgid "Use keyboard LED to show alternative layout"
+#. Keyboard indicator for Dhivehi layouts
+#: ../rules/base.xml.in.h:798
+msgid "dv"
+msgstr ""
+
+#: ../rules/base.xml.in.h:799
+msgid "Dhivehi"
+msgstr ""
+
+#: ../rules/base.xml.in.h:800
+msgid "English (South Africa)"
+msgstr ""
+
+#. Keyboard indicator for Esperanto layouts
+#: ../rules/base.xml.in.h:802
+msgid "eo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:803
+msgid "Esperanto"
+msgstr "esperanto"
+
+#: ../rules/base.xml.in.h:804
+msgid "Esperanto (displaced semicolon and quote, obsolete)"
+msgstr ""
+
+#. Keyboard indicator for Nepali layouts
+#: ../rules/base.xml.in.h:806
+msgid "ne"
+msgstr ""
+
+#: ../rules/base.xml.in.h:807
+msgid "Nepali"
+msgstr ""
+
+#: ../rules/base.xml.in.h:808
+msgid "English (Nigeria)"
+msgstr ""
+
+#. Keyboard indicator for Igbo layouts
+#: ../rules/base.xml.in.h:810
+msgid "ig"
+msgstr ""
+
+#: ../rules/base.xml.in.h:811
+msgid "Igbo"
+msgstr "igbo"
+
+#. Keyboard indicator for Yoruba layouts
+#: ../rules/base.xml.in.h:813
+msgid "yo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:814
+msgid "Yoruba"
+msgstr "jorubčina"
+
+#. Keyboard indicator for Amharic layouts
+#: ../rules/base.xml.in.h:816
+msgid "am"
+msgstr ""
+
+#: ../rules/base.xml.in.h:817
+msgid "Amharic"
+msgstr ""
+
+#. Keyboard indicator for Wolof layouts
+#: ../rules/base.xml.in.h:819
+msgid "wo"
+msgstr ""
+
+#: ../rules/base.xml.in.h:820
+msgid "Wolof"
+msgstr ""
+
+#. Keyboard indicator for Braille layouts
+#: ../rules/base.xml.in.h:822
+msgid "brl"
+msgstr ""
+
+#: ../rules/base.xml.in.h:823
+msgid "Braille"
+msgstr "Brailleovo"
+
+#: ../rules/base.xml.in.h:824
+msgid "Braille (left hand)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:825
+msgid "Braille (right hand)"
+msgstr ""
+
+#. Keyboard indicator for Turkmen layouts
+#: ../rules/base.xml.in.h:827
+msgid "tk"
+msgstr ""
+
+#: ../rules/base.xml.in.h:828
+msgid "Turkmen"
+msgstr ""
+
+#: ../rules/base.xml.in.h:829
+msgid "Turkmen (Alt-Q)"
+msgstr ""
+
+#. Keyboard indicator for Bambara layouts
+#: ../rules/base.xml.in.h:831
+msgid "bm"
+msgstr ""
+
+#: ../rules/base.xml.in.h:832
+msgid "Bambara"
+msgstr ""
+
+#: ../rules/base.xml.in.h:833
+msgid "French (Mali, alternative)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:834
+msgid "English (Mali, US Macintosh)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:835
+msgid "English (Mali, US international)"
+msgstr ""
+
+#. Keyboard indicator for Swahili layouts
+#: ../rules/base.xml.in.h:837
+msgid "sw"
+msgstr ""
+
+#: ../rules/base.xml.in.h:838
+msgid "Swahili (Tanzania)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:839
+msgid "Swahili (Kenya)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:840
+msgid "Kikuyu"
+msgstr ""
+
+#. Keyboard indicator for Tswana layouts
+#: ../rules/base.xml.in.h:842
+msgid "tn"
+msgstr ""
+
+#: ../rules/base.xml.in.h:843
+msgid "Tswana"
+msgstr ""
+
+#. Keyboard indicator for Filipino layouts
+#: ../rules/base.xml.in.h:845
+msgid "ph"
+msgstr ""
+
+#: ../rules/base.xml.in.h:846
+msgid "Filipino"
+msgstr ""
+
+#: ../rules/base.xml.in.h:847
+msgid "Filipino (QWERTY Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:848
+msgid "Filipino (Capewell-Dvorak Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:849
+msgid "Filipino (Capewell-Dvorak Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:850
+msgid "Filipino (Capewell-QWERF 2006 Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:851
+msgid "Filipino (Capewell-QWERF 2006 Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:852
+msgid "Filipino (Colemak Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:853
+msgid "Filipino (Colemak Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:854
+msgid "Filipino (Dvorak Latin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:855
+msgid "Filipino (Dvorak Baybayin)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:856
+msgid "Key(s) to change layout"
+msgstr ""
+
+#: ../rules/base.xml.in.h:857
+msgid "Right Alt (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:858
+msgid "Left Alt (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:859
+msgid "Left Win (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:860
+msgid "Right Win (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:861
+msgid "Any Win key (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:862
+msgid ""
+"Caps Lock (while pressed), Alt+Caps Lock does the original capslock action"
+msgstr ""
+
+#: ../rules/base.xml.in.h:863
+msgid "Right Ctrl (while pressed)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:864
+msgid "Right Alt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:865
+msgid "Left Alt"
+msgstr ""
+
+#: ../rules/base.xml.in.h:866
+msgid "Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:867
+msgid "Shift+Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:868
+msgid "Caps Lock (to first layout), Shift+Caps Lock (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:869
+msgid "Left Win (to first layout), Right Win/Menu (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:870
+msgid "Left Ctrl (to first layout), Right Ctrl (to last layout)"
+msgstr ""
+
+#: ../rules/base.xml.in.h:871
+msgid "Alt+Caps Lock"
+msgstr ""
+
+#: ../rules/base.xml.in.h:872
+msgid "Both Shift keys together"
+msgstr ""
+
+#: ../rules/base.xml.in.h:873
+msgid "Both Alt keys together"
+msgstr ""
+
+#: ../rules/base.xml.in.h:874
+msgid "Both Ctrl keys together"
+msgstr ""
+
+#: ../rules/base.xml.in.h:875
+msgid "Ctrl+Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:876
+msgid "Left Ctrl+Left Shift"
+msgstr ""
+
+#: ../rules/base.xml.in.h:877
+msgid "Right Ctrl+Right Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:788
-msgid "Using space key to input non-breakable space character"
-msgstr "Použiť klávesu medzera na zadanie znaku nezalomiteľná medzera"
+#: ../rules/base.xml.in.h:878
+msgid "Alt+Ctrl"
+msgstr ""
 
-#: ../rules/base.xml.in.h:789
-msgid "Usual space at any level"
+#: ../rules/base.xml.in.h:879
+msgid "Alt+Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:790
-msgid "Uyghur"
+#: ../rules/base.xml.in.h:880
+msgid "Left Alt+Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:791
-msgid "Uzbek"
+#: ../rules/base.xml.in.h:881
+msgid "Alt+Space"
 msgstr ""
 
-#: ../rules/base.xml.in.h:792
-msgid "Uzbek (Afghanistan)"
+#: ../rules/base.xml.in.h:882
+msgid "Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:793
-msgid "Uzbek (Afghanistan, OLPC)"
+#: ../rules/base.xml.in.h:883
+msgid "Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:794
-msgid "Uzbek (Latin)"
+#: ../rules/base.xml.in.h:884
+msgid "Right Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:795
-msgid "Vietnamese"
+#: ../rules/base.xml.in.h:885
+msgid "Left Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:796
-msgid "ViewSonic KU-306 Internet Keyboard"
+#: ../rules/base.xml.in.h:886
+msgid "Right Shift"
 msgstr ""
 
-#: ../rules/base.xml.in.h:797
-msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
+#: ../rules/base.xml.in.h:887
+msgid "Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:798
-msgid ""
-"Wang 724 keypad with Unicode additions (arrows and math operators). Math "
-"operators on default level"
+#: ../rules/base.xml.in.h:888
+msgid "Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:799
-msgid "Winbook Model XP5"
-msgstr "Winbook Model XP5"
+#: ../rules/base.xml.in.h:889
+msgid "Scroll Lock"
+msgstr ""
 
-#: ../rules/base.xml.in.h:800
-msgid "Wolof"
+#: ../rules/base.xml.in.h:890
+msgid "LeftCtrl+LeftWin (to first layout), RightCtrl+Menu (to second layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:801
-msgid "Yahoo! Internet Keyboard"
-msgstr "Yahoo! Internet Keyboard"
+#: ../rules/base.xml.in.h:891
+msgid "Key to choose 3rd level"
+msgstr ""
 
-#: ../rules/base.xml.in.h:802
-msgid "Yakut"
+#: ../rules/base.xml.in.h:892
+msgid "Any Win key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:803
-msgid "Yoruba"
-msgstr "jorubčina"
+#: ../rules/base.xml.in.h:893
+msgid "Any Alt key"
+msgstr ""
 
-#: ../rules/base.xml.in.h:804
-msgid "Zero-width non-joiner character at second level"
+#: ../rules/base.xml.in.h:894
+msgid "Right Alt, Shift+Right Alt key is Multi_Key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:805
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level"
+#: ../rules/base.xml.in.h:895
+msgid "Right Alt key never chooses 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:806
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, nothing at fourth level"
+#: ../rules/base.xml.in.h:896
+msgid "Enter on keypad"
 msgstr ""
 
-#: ../rules/base.xml.in.h:807
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, thin non-breakable space at fourth level"
+#: ../rules/base.xml.in.h:897
+msgid "Backslash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:808
-msgid ""
-"Zero-width non-joiner character at second level, non-breakable space "
-"character at third level, zero-width joiner at fourth level"
+#: ../rules/base.xml.in.h:898
+msgid "&lt;Less/Greater&gt;"
 msgstr ""
 
-#: ../rules/base.xml.in.h:809
+#: ../rules/base.xml.in.h:899
 msgid ""
-"Zero-width non-joiner character at second level, zero-width joiner character "
-"at third level"
+"Caps Lock chooses 3rd level, acts as onetime lock when pressed together with "
+"another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:810
+#: ../rules/base.xml.in.h:900
 msgid ""
-"Zero-width non-joiner character at second level, zero-width joiner character "
-"at third level, non-breakable space character at fourth level"
+"Backslash chooses 3rd level, acts as onetime lock when pressed together with "
+"another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:811
+#: ../rules/base.xml.in.h:901
 msgid ""
-"Zero-width non-joiner character at third level, zero-width joiner at fourth "
-"level"
+"&lt;Less/Greater&gt; chooses 3rd level, acts as onetime lock when pressed "
+"together with another 3rd-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:812
-msgid "ak"
+#: ../rules/base.xml.in.h:902
+msgid "Ctrl key position"
+msgstr "Pozícia klávesu Ctrl"
+
+#: ../rules/base.xml.in.h:903
+msgid "Caps Lock as Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:813
-msgid "am"
+#: ../rules/base.xml.in.h:904
+msgid "Left Ctrl as Meta"
 msgstr ""
 
-#: ../rules/base.xml.in.h:814
-msgid "ar"
+#: ../rules/base.xml.in.h:905
+msgid "Swap Ctrl and Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:815
-msgid "avn"
+#: ../rules/base.xml.in.h:906
+msgid "At left of 'A'"
 msgstr ""
 
-#: ../rules/base.xml.in.h:816
-msgid "az"
+#: ../rules/base.xml.in.h:907
+msgid "At bottom left"
 msgstr ""
 
-#: ../rules/base.xml.in.h:817
-msgid "be"
+#: ../rules/base.xml.in.h:908
+msgid "Right Ctrl as Right Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:818
-msgid "ber"
+#: ../rules/base.xml.in.h:909
+msgid "Menu as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:819
-msgid "bg"
+#: ../rules/base.xml.in.h:910
+msgid "Right Alt as Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:820
-msgid "bm"
+#: ../rules/base.xml.in.h:911
+msgid "Use keyboard LED to show alternative layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:821
-msgid "bn"
+#: ../rules/base.xml.in.h:912
+msgid "Num Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:822
-msgid "brl"
+#: ../rules/base.xml.in.h:913
+msgid "Numeric keypad layout selection"
+msgstr "Výber rozloženia numerickej klávesnice"
+
+#: ../rules/base.xml.in.h:914
+msgid "Legacy"
 msgstr ""
 
-#: ../rules/base.xml.in.h:823
-msgid "bs"
+#: ../rules/base.xml.in.h:915
+msgid "Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:824
-msgid "ca"
+#: ../rules/base.xml.in.h:916
+msgid ""
+"Unicode additions (arrows and math operators). Math operators on default "
+"level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:825
-msgid "chr"
+#: ../rules/base.xml.in.h:917
+msgid "Legacy Wang 724"
 msgstr ""
 
-#: ../rules/base.xml.in.h:826
-msgid "cm"
+#: ../rules/base.xml.in.h:918
+msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:827 ../rules/base.extras.xml.in.h:35
-msgid "crh"
+#: ../rules/base.xml.in.h:919
+msgid ""
+"Wang 724 keypad with Unicode additions (arrows and math operators). Math "
+"operators on default level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:828
-msgid "cs"
+#: ../rules/base.xml.in.h:920
+msgid "Hexadecimal"
 msgstr ""
 
-#: ../rules/base.xml.in.h:829
-msgid "da"
+#: ../rules/base.xml.in.h:921
+msgid "ATM/phone-style"
 msgstr ""
 
-#: ../rules/base.xml.in.h:830
-msgid "de"
+#: ../rules/base.xml.in.h:922
+msgid "Numeric keypad delete key behaviour"
 msgstr ""
 
-#: ../rules/base.xml.in.h:831
-msgid "dv"
+#: ../rules/base.xml.in.h:923
+msgid "Legacy key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:832
-msgid "dz"
+#. Actually, with KP_SEPARATOR, as the old keypad(comma)
+#: ../rules/base.xml.in.h:925
+msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:833
-msgid "ee"
+#: ../rules/base.xml.in.h:926
+msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:36
-msgid "en"
+#: ../rules/base.xml.in.h:927
+msgid "Four-level key with dot, latin-9 restriction"
 msgstr ""
 
-#: ../rules/base.xml.in.h:835
-msgid "eo"
+#: ../rules/base.xml.in.h:928
+msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:836
-msgid "es"
+#: ../rules/base.xml.in.h:929
+msgid "Four-level key with momayyez"
 msgstr ""
 
-#: ../rules/base.xml.in.h:837
-msgid "et"
+#. This assumes the KP_ abstract symbols are actually useful for some apps
+#. The description needs to be rewritten
+#: ../rules/base.xml.in.h:932
+msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:838 ../rules/base.extras.xml.in.h:37
-msgid "fa"
+#: ../rules/base.xml.in.h:933
+msgid "Semi-colon on third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:839
-msgid "ff"
+#: ../rules/base.xml.in.h:934
+msgid "Caps Lock key behavior"
 msgstr ""
 
-#: ../rules/base.xml.in.h:840
-msgid "fi"
+#: ../rules/base.xml.in.h:935
+msgid "Caps Lock uses internal capitalization. Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:841
-msgid "fo"
+#: ../rules/base.xml.in.h:936
+msgid ""
+"Caps Lock uses internal capitalization. Shift doesn't affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:38
-msgid "fr"
+#: ../rules/base.xml.in.h:937
+msgid "Caps Lock acts as Shift with locking. Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:843
-msgid "gaa"
+#: ../rules/base.xml.in.h:938
+msgid "Caps Lock acts as Shift with locking. Shift doesn't affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:844
-msgid "gr"
+#: ../rules/base.xml.in.h:939
+msgid "Caps Lock toggles normal capitalization of alphabetic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:845
-msgid "gu"
+#: ../rules/base.xml.in.h:940
+msgid "Make Caps Lock an additional Num Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:846
-msgid "ha"
+#: ../rules/base.xml.in.h:941
+msgid "Swap ESC and Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:847
-msgid "he"
+#: ../rules/base.xml.in.h:942
+msgid "Make Caps Lock an additional ESC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:848
-msgid "hi"
+#: ../rules/base.xml.in.h:943
+msgid "Make Caps Lock an additional Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:849
-msgid "hr"
+#: ../rules/base.xml.in.h:944
+msgid "Make Caps Lock an additional Super"
 msgstr ""
 
-#: ../rules/base.xml.in.h:850
-msgid "hu"
+#: ../rules/base.xml.in.h:945
+msgid "Make Caps Lock an additional Hyper"
 msgstr ""
 
-#: ../rules/base.xml.in.h:851 ../rules/base.extras.xml.in.h:39
-msgid "hy"
+#: ../rules/base.xml.in.h:946
+msgid "Caps Lock toggles Shift so all keys are affected"
 msgstr ""
 
-#: ../rules/base.xml.in.h:852
-msgid "ie"
+#: ../rules/base.xml.in.h:947
+msgid "Caps Lock is disabled"
 msgstr ""
 
-#: ../rules/base.xml.in.h:853
-msgid "ig"
+#: ../rules/base.xml.in.h:948
+msgid "Make Caps Lock an additional Control but keep the Caps_Lock keysym"
 msgstr ""
 
-#: ../rules/base.xml.in.h:854
-msgid "ike"
+#: ../rules/base.xml.in.h:949
+msgid "Alt/Win key behavior"
+msgstr "Chovanie klávesu Alt/Win"
+
+#: ../rules/base.xml.in.h:950
+msgid "Add the standard behavior to Menu key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:855
-msgid "in"
+#: ../rules/base.xml.in.h:951
+msgid "Alt and Meta are on Alt keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:856
-msgid "is"
+#: ../rules/base.xml.in.h:952
+msgid "Control is mapped to Win keys (and the usual Ctrl keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:857
-msgid "it"
+#: ../rules/base.xml.in.h:953
+msgid "Control is mapped to Alt keys, Alt is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:858
-msgid "ja"
+#: ../rules/base.xml.in.h:954
+msgid "Meta is mapped to Win keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:859
-msgid "ka"
+#: ../rules/base.xml.in.h:955
+msgid "Meta is mapped to Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:860
-msgid "ki"
+#: ../rules/base.xml.in.h:956
+msgid "Hyper is mapped to Win-keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:861
-msgid "kk"
+#: ../rules/base.xml.in.h:957
+msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:862
-msgid "km"
+#: ../rules/base.xml.in.h:958
+msgid "Left Alt is swapped with Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:863
-msgid "kn"
+#: ../rules/base.xml.in.h:959
+msgid "Compose key position"
+msgstr "Pozícia klávesu Compose"
+
+#: ../rules/base.xml.in.h:960
+msgid "Pause"
 msgstr ""
 
-#: ../rules/base.xml.in.h:864
-msgid "ko"
+#: ../rules/base.xml.in.h:961
+msgid "PrtSc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:865
-msgid "ku"
+#: ../rules/base.xml.in.h:962
+msgid "Miscellaneous compatibility options"
+msgstr "Dodatočné voľby pre kompatibilitu"
+
+#: ../rules/base.xml.in.h:963
+msgid "Default numeric keypad keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:866
-msgid "lo"
+#: ../rules/base.xml.in.h:964
+msgid "Numeric keypad keys always enter digits (as in Mac OS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:867 ../rules/base.extras.xml.in.h:41
-msgid "lt"
+#: ../rules/base.xml.in.h:965
+msgid "Shift with numeric keypad keys works as in MS Windows"
 msgstr ""
 
-#: ../rules/base.xml.in.h:868 ../rules/base.extras.xml.in.h:42
-msgid "lv"
+#: ../rules/base.xml.in.h:966
+msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:869
-msgid "mi"
+#: ../rules/base.xml.in.h:967
+msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr ""
 
-#: ../rules/base.xml.in.h:870
-msgid "mk"
+#: ../rules/base.xml.in.h:968
+msgid ""
+"Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num "
+"Lock)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:871
-msgid "ml"
+#: ../rules/base.xml.in.h:969
+msgid "Shift cancels Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:872
-msgid "mn"
+#: ../rules/base.xml.in.h:970
+msgid "Enable extra typographic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:873
-msgid "mt"
+#: ../rules/base.xml.in.h:971
+msgid "Both Shift-Keys together toggle Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:874
-msgid "my"
+#: ../rules/base.xml.in.h:972
+msgid ""
+"Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates"
 msgstr ""
 
-#: ../rules/base.xml.in.h:875
-msgid "ne"
+#: ../rules/base.xml.in.h:973
+msgid "Both Shift-Keys together toggle ShiftLock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:876
-msgid "nl"
+#: ../rules/base.xml.in.h:974
+msgid "Toggle PointerKeys with Shift + NumLock."
 msgstr ""
 
-#: ../rules/base.xml.in.h:877
-msgid "no"
+#: ../rules/base.xml.in.h:975
+msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:878
-msgid "or"
+#: ../rules/base.xml.in.h:976
+msgid "Adding currency signs to certain keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:879
-msgid "pa"
+#: ../rules/base.xml.in.h:977
+msgid "Euro on E"
 msgstr ""
 
-#: ../rules/base.xml.in.h:880
-msgid "ph"
+#: ../rules/base.xml.in.h:978
+msgid "Euro on 2"
 msgstr ""
 
-#: ../rules/base.xml.in.h:881 ../rules/base.extras.xml.in.h:43
-msgid "pl"
+#: ../rules/base.xml.in.h:979
+msgid "Euro on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:882
-msgid "ps"
+#: ../rules/base.xml.in.h:980
+msgid "Euro on 5"
 msgstr ""
 
-#: ../rules/base.xml.in.h:883
-msgid "pt"
+#: ../rules/base.xml.in.h:981
+msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:884 ../rules/base.extras.xml.in.h:44
-msgid "ro"
+#: ../rules/base.xml.in.h:982
+msgid "Key to choose 5th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:885 ../rules/base.extras.xml.in.h:45
-msgid "ru"
+#: ../rules/base.xml.in.h:983
+msgid ""
+"&lt;Less/Greater&gt; chooses 5th level, locks when pressed together with "
+"another 5th-level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:886
-msgid "sd"
+#: ../rules/base.xml.in.h:984
+msgid ""
+"Right Alt chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:887
-msgid "si"
+#: ../rules/base.xml.in.h:985
+msgid ""
+"Left Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:888
-msgid "sk"
+#: ../rules/base.xml.in.h:986
+msgid ""
+"Right Win chooses 5th level, locks when pressed together with another 5th-"
+"level-chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:889
-msgid "sl"
+#: ../rules/base.xml.in.h:987
+msgid "Using space key to input non-breakable space character"
+msgstr "Použiť klávesu medzera na zadanie znaku nezalomiteľná medzera"
+
+#: ../rules/base.xml.in.h:988
+msgid "Usual space at any level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:890
-msgid "sq"
+#: ../rules/base.xml.in.h:989
+msgid "Non-breakable space character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:891 ../rules/base.extras.xml.in.h:47
-msgid "sr"
+#: ../rules/base.xml.in.h:990
+msgid "Non-breakable space character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:892
-msgid "sv"
+#: ../rules/base.xml.in.h:991
+msgid "Non-breakable space character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:893
-msgid "sw"
+#: ../rules/base.xml.in.h:992
+msgid ""
+"Non-breakable space character at third level, thin non-breakable space "
+"character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:894
-msgid "syc"
+#: ../rules/base.xml.in.h:993
+msgid "Non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:895
-msgid "ta"
+#: ../rules/base.xml.in.h:994
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:896
-msgid "te"
+#: ../rules/base.xml.in.h:995
+msgid ""
+"Non-breakable space character at fourth level, thin non-breakable space "
+"character at sixth level (via Ctrl+Shift)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:897
-msgid "tg"
+#: ../rules/base.xml.in.h:996
+msgid "Zero-width non-joiner character at second level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:898
-msgid "th"
+#: ../rules/base.xml.in.h:997
+msgid ""
+"Zero-width non-joiner character at second level, zero-width joiner character "
+"at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:899
-msgid "tk"
+#: ../rules/base.xml.in.h:998
+msgid ""
+"Zero-width non-joiner character at second level, zero-width joiner character "
+"at third level, non-breakable space character at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:900
-msgid "tn"
+#: ../rules/base.xml.in.h:999
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:901
-msgid "tr"
+#: ../rules/base.xml.in.h:1000
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level, nothing at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:902
-msgid "uk"
+#: ../rules/base.xml.in.h:1001
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level, zero-width joiner at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:903
-msgid "ur"
+#: ../rules/base.xml.in.h:1002
+msgid ""
+"Zero-width non-joiner character at second level, non-breakable space "
+"character at third level, thin non-breakable space at fourth level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:904
-msgid "uz"
+#: ../rules/base.xml.in.h:1003
+msgid ""
+"Zero-width non-joiner character at third level, zero-width joiner at fourth "
+"level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:905
-msgid "vi"
+#: ../rules/base.xml.in.h:1004
+msgid "Japanese keyboard options"
+msgstr "Japonské možnosti klávesnice"
+
+#: ../rules/base.xml.in.h:1005
+msgid "Kana Lock key is locking"
+msgstr "Kláves Kana Lock zamyká"
+
+#: ../rules/base.xml.in.h:1006
+msgid "NICOLA-F style Backspace"
+msgstr "Backspace v štýle NICOLA-F"
+
+#: ../rules/base.xml.in.h:1007
+msgid "Make Zenkaku Hankaku an additional ESC"
 msgstr ""
 
-#: ../rules/base.xml.in.h:906
-msgid "wo"
+#: ../rules/base.xml.in.h:1008
+msgid "Adding Esperanto circumflexes (supersigno)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:907
-msgid "xsy"
+#: ../rules/base.xml.in.h:1009
+msgid "To the corresponding key in a Qwerty keyboard."
 msgstr ""
 
-#: ../rules/base.xml.in.h:908
-msgid "yo"
+#: ../rules/base.xml.in.h:1010
+msgid "To the corresponding key in a Dvorak keyboard."
 msgstr ""
 
-#: ../rules/base.xml.in.h:909
-msgid "zh"
+#: ../rules/base.xml.in.h:1011
+msgid "Key sequence to kill the X server"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:1
-msgid "APL Keyboard Symbols"
+#: ../rules/base.xml.in.h:1012
+msgid "Control + Alt + Backspace"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:3
-msgid "Armenian (OLPC phonetic)"
+#: ../rules/base.extras.xml.in.h:1
+msgid "apl"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:4
-msgid "Atsina"
+#: ../rules/base.extras.xml.in.h:2
+msgid "APL Keyboard Symbols"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:5
-msgid "Avestan"
+msgid "kut"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:6
-msgid "Couer D'alene Salish"
+msgid "Kutenai"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:7
-msgid "Crimean Tatar (Dobruja Q)"
+msgid "shs"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:9
-msgid "English (US, international AltGr Unicode combining)"
+#: ../rules/base.extras.xml.in.h:8
+msgid "Secwepemctsin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:10
-msgid "English (US, international AltGr Unicode combining, alternative)"
+#: ../rules/base.extras.xml.in.h:11
+msgid "German (US keyboard with German letters)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:12
-msgid "Kutenai"
+msgid "German (with Hungarian letters and no dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:14
-msgid "Latvian (US Colemak)"
+#: ../rules/base.extras.xml.in.h:15
+msgid "Avestan"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:15
-msgid "Latvian (US Colemak, apostrophe variant)"
+#: ../rules/base.extras.xml.in.h:18
+msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:16
+#: ../rules/base.extras.xml.in.h:21
 msgid "Latvian (US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:17
+#: ../rules/base.extras.xml.in.h:22
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:18
+#: ../rules/base.extras.xml.in.h:23
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:19
+#: ../rules/base.extras.xml.in.h:24
 msgid "Latvian (programmer US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:20
+#: ../rules/base.extras.xml.in.h:25
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:21
+#: ../rules/base.extras.xml.in.h:26
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:23
-msgid "Lithuanian (US Dvorak with Lithuanian letters)"
-msgstr ""
-
-#: ../rules/base.extras.xml.in.h:26
-msgid "Polish (international with dead keys)"
+#: ../rules/base.extras.xml.in.h:27
+msgid "Latvian (US Colemak)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:28
-msgid "Romanian (ergonomic Touchtype)"
+msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:30
-msgid "Russian (with UKR and BEL layout)"
+#: ../rules/base.extras.xml.in.h:31
+msgid "English (US, international AltGr Unicode combining)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:31
-msgid "Secwepemctsin"
+#: ../rules/base.extras.xml.in.h:32
+msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:33
-msgid "Serbian (combining accents instead of dead keys)"
+msgid "Atsina"
 msgstr ""
 
 #: ../rules/base.extras.xml.in.h:34
-msgid "apl"
+msgid "Couer D'alene Salish"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:40
-msgid "kut"
+#: ../rules/base.extras.xml.in.h:37
+msgid "Polish (international with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:46
-msgid "shs"
+#: ../rules/base.extras.xml.in.h:41
+msgid "Crimean Tatar (Dobruja Q)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:42
+msgid "Romanian (ergonomic Touchtype)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:44
+msgid "Serbian"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:45
+msgid "Serbian (combining accents instead of dead keys)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:48
+msgid "Russian (with Ukrainian-Belorussian layout)"
+msgstr ""
+
+#: ../rules/base.extras.xml.in.h:51
+msgid "Armenian (OLPC phonetic)"
 msgstr ""
diff -Nru language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/xscreensaver.po language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/xscreensaver.po
--- language-pack-sk-base-12.04+20111229/data/sk/LC_MESSAGES/xscreensaver.po	2012-01-02 17:50:46.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/data/sk/LC_MESSAGES/xscreensaver.po	2012-02-23 06:55:36.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: xscreensaver\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-10 16:19+0000\n"
-"PO-Revision-Date: 2010-11-28 15:46+0000\n"
+"POT-Creation-Date: 2012-01-31 01:10+0000\n"
+"PO-Revision-Date: 2012-01-31 02:11+0000\n"
 "Last-Translator: Marcel Telka <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-12-29 11:22+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-02-21 19:06+0000\n"
+"X-Generator: Launchpad (build 14838)\n"
 
 #: ../driver/demo-Gtk-conf.c:882
 msgid "Browse..."
@@ -39,15 +39,15 @@
 msgid "reason: %s\n"
 msgstr "dôvod :%s\n"
 
-#: ../driver/demo-Gtk-widgets.c:161 ../driver/xscreensaver-demo.glade2.h:73
+#: ../driver/demo-Gtk-widgets.c:161 ../driver/xscreensaver-demo.glade2.h:1
 msgid "XScreenSaver"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:182 ../driver/xscreensaver-demo.glade2.h:86
+#: ../driver/demo-Gtk-widgets.c:182 ../driver/xscreensaver-demo.glade2.h:2
 msgid "_File"
 msgstr "_Súbor"
 
-#: ../driver/demo-Gtk-widgets.c:202 ../driver/xscreensaver-demo.glade2.h:78
+#: ../driver/demo-Gtk-widgets.c:202 ../driver/xscreensaver-demo.glade2.h:3
 msgid "_Blank Screen Now"
 msgstr "_Vypnúť obrazovku okamžite"
 
@@ -56,7 +56,7 @@
 "Activate the XScreenSaver daemon now (locking the screen if so configured.)"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:215 ../driver/xscreensaver-demo.glade2.h:91
+#: ../driver/demo-Gtk-widgets.c:215 ../driver/xscreensaver-demo.glade2.h:4
 msgid "_Lock Screen Now"
 msgstr "_Zamknúť obrazuvku okamžite"
 
@@ -64,7 +64,7 @@
 msgid "Lock the screen now (even if \"Lock Screen\" is unchecked.)"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:228 ../driver/xscreensaver-demo.glade2.h:89
+#: ../driver/demo-Gtk-widgets.c:228 ../driver/xscreensaver-demo.glade2.h:5
 msgid "_Kill Daemon"
 msgstr "_Zabiť démona"
 
@@ -72,7 +72,7 @@
 msgid "Tell the running XScreenSaver daemon to exit."
 msgstr "Vypnúť bežiaceho démona XScreenSaver."
 
-#: ../driver/demo-Gtk-widgets.c:241 ../driver/xscreensaver-demo.glade2.h:102
+#: ../driver/demo-Gtk-widgets.c:241 ../driver/xscreensaver-demo.glade2.h:6
 msgid "_Restart Daemon"
 msgstr "_Reštartovať démona"
 
@@ -91,11 +91,11 @@
 msgstr ""
 "Vypnúť xscreensaver-demo program (nechať bežať démona XScreenSaver v pozadí)."
 
-#: ../driver/demo-Gtk-widgets.c:276 ../driver/xscreensaver-demo.glade2.h:87
+#: ../driver/demo-Gtk-widgets.c:276 ../driver/xscreensaver-demo.glade2.h:8
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ../driver/demo-Gtk-widgets.c:296 ../driver/xscreensaver-demo.glade2.h:74
+#: ../driver/demo-Gtk-widgets.c:296 ../driver/xscreensaver-demo.glade2.h:9
 msgid "_About..."
 msgstr "_O programe..."
 
@@ -103,7 +103,7 @@
 msgid "Display version information."
 msgstr "Zobraziť informácie o verzii."
 
-#: ../driver/demo-Gtk-widgets.c:309 ../driver/xscreensaver-demo.glade2.h:85
+#: ../driver/demo-Gtk-widgets.c:309 ../driver/xscreensaver-demo.glade2.h:10
 msgid "_Documentation..."
 msgstr "_Dokumentácia..."
 
@@ -115,11 +115,11 @@
 msgid "Cycle After"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:370 ../driver/xscreensaver-demo.glade2.h:64
+#: ../driver/demo-Gtk-widgets.c:370 ../driver/xscreensaver-demo.glade2.h:12
 msgid "Whether a password should be required to un-blank the screen."
 msgstr "Či má byť požadované heslo pri obnovení obrazovky."
 
-#: ../driver/demo-Gtk-widgets.c:372 ../driver/xscreensaver-demo.glade2.h:32
+#: ../driver/demo-Gtk-widgets.c:372 ../driver/xscreensaver-demo.glade2.h:17
 msgid "Lock Screen After"
 msgstr ""
 
@@ -135,7 +135,7 @@
 #: ../driver/demo-Gtk-widgets.c:407 ../driver/demo-Gtk-widgets.c:419
 #: ../driver/demo-Gtk-widgets.c:431 ../driver/demo-Gtk-widgets.c:1020
 #: ../driver/demo-Gtk-widgets.c:1032 ../driver/demo-Gtk-widgets.c:1044
-#: ../driver/xscreensaver-demo.glade2.h:110
+#: ../driver/xscreensaver-demo.glade2.h:19
 msgid "minutes"
 msgstr "minút"
 
@@ -143,7 +143,7 @@
 msgid "Preview"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:490 ../driver/xscreensaver-demo.glade2.h:9
+#: ../driver/demo-Gtk-widgets.c:490 ../driver/xscreensaver-demo.glade2.h:21
 msgid ""
 "Demo the selected screen saver in full-screen mode (click the mouse to "
 "return.)"
@@ -155,7 +155,7 @@
 msgid "Settings..."
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:500 ../driver/xscreensaver-demo.glade2.h:6
+#: ../driver/demo-Gtk-widgets.c:500 ../driver/xscreensaver-demo.glade2.h:23
 msgid "Customization and explanation of the selected screen saver."
 msgstr ""
 
@@ -191,7 +191,7 @@
 msgid "\\/"
 msgstr "/"
 
-#: ../driver/demo-Gtk-widgets.c:652 ../driver/xscreensaver-demo.glade2.h:40
+#: ../driver/demo-Gtk-widgets.c:652 ../driver/xscreensaver-demo.glade2.h:36
 msgid ""
 "Run the next screen saver in the list in full-screen mode (click the mouse "
 "to return.)"
@@ -201,14 +201,14 @@
 msgid "/\\"
 msgstr "/"
 
-#: ../driver/demo-Gtk-widgets.c:662 ../driver/xscreensaver-demo.glade2.h:41
+#: ../driver/demo-Gtk-widgets.c:662 ../driver/xscreensaver-demo.glade2.h:37
 msgid ""
 "Run the previous screen saver in the list in full-screen mode (click the "
 "mouse to return.)"
 msgstr ""
 
 #: ../driver/demo-Gtk-widgets.c:664 ../driver/demo-Gtk-widgets.c:1608
-#: ../driver/xscreensaver-demo.glade2.h:10
+#: ../driver/xscreensaver-demo.glade2.h:50
 msgid "Description"
 msgstr "Popis"
 
@@ -252,7 +252,7 @@
 msgid "Colormaps"
 msgstr "Farebné mapy"
 
-#: ../driver/demo-Gtk-widgets.c:840 ../driver/xscreensaver-demo.glade2.h:72
+#: ../driver/demo-Gtk-widgets.c:840 ../driver/xscreensaver-demo.glade2.h:91
 msgid ""
 "Whether to install a private colormap when running in 8-bit mode on the "
 "default Visual."
@@ -262,7 +262,7 @@
 msgid "Install Colormap"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:865 ../driver/xscreensaver-demo.glade2.h:71
+#: ../driver/demo-Gtk-widgets.c:865 ../driver/xscreensaver-demo.glade2.h:84
 msgid ""
 "Whether the screen should slowly fade to black when the screen saver "
 "activates."
@@ -272,7 +272,7 @@
 msgid "Fade To Black When Blanking"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:882 ../driver/xscreensaver-demo.glade2.h:70
+#: ../driver/demo-Gtk-widgets.c:882 ../driver/xscreensaver-demo.glade2.h:86
 msgid ""
 "Whether the screen should slowly fade in from black when the screen saver "
 "deactivates."
@@ -286,19 +286,19 @@
 msgid "Fade Duration"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:928 ../driver/xscreensaver-demo.glade2.h:25
+#: ../driver/demo-Gtk-widgets.c:928 ../driver/xscreensaver-demo.glade2.h:89
 msgid "How long it should take for the screen to fade in and out."
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:932 ../driver/xscreensaver-demo.glade2.h:115
+#: ../driver/demo-Gtk-widgets.c:932 ../driver/xscreensaver-demo.glade2.h:90
 msgid "seconds"
 msgstr "sekúnd"
 
-#: ../driver/demo-Gtk-widgets.c:942 ../driver/xscreensaver-demo.glade2.h:12
+#: ../driver/demo-Gtk-widgets.c:942 ../driver/xscreensaver-demo.glade2.h:83
 msgid "Display Power Management"
 msgstr "Zobraziť správu napájania"
 
-#: ../driver/demo-Gtk-widgets.c:986 ../driver/xscreensaver-demo.glade2.h:68
+#: ../driver/demo-Gtk-widgets.c:986 ../driver/xscreensaver-demo.glade2.h:73
 msgid "Whether the monitor should be powered down after a while."
 msgstr ""
 
@@ -318,19 +318,19 @@
 msgid "Standby After"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1105 ../driver/xscreensaver-demo.glade2.h:27
+#: ../driver/demo-Gtk-widgets.c:1105 ../driver/xscreensaver-demo.glade2.h:79
 msgid "How long until the monitor goes into power-saving mode."
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1119 ../driver/xscreensaver-demo.glade2.h:28
+#: ../driver/demo-Gtk-widgets.c:1119 ../driver/xscreensaver-demo.glade2.h:78
 msgid "How long until the monitor powers down."
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1123 ../driver/xscreensaver-demo.glade2.h:29
+#: ../driver/demo-Gtk-widgets.c:1123 ../driver/xscreensaver-demo.glade2.h:61
 msgid "Image Manipulation"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1167 ../driver/xscreensaver-demo.glade2.h:65
+#: ../driver/demo-Gtk-widgets.c:1167 ../driver/xscreensaver-demo.glade2.h:52
 msgid ""
 "Whether the image-manipulating modes should be allowed to operate on an "
 "image of your desktop."
@@ -350,18 +350,18 @@
 msgid "Grab Video Frames"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1201 ../driver/xscreensaver-demo.glade2.h:67
-msgid ""
-"Whether the image-manipulating modes should operate on random images loaded "
-"from disk."
+#: ../driver/demo-Gtk-widgets.c:1201 ../driver/xscreensaver-demo.glade2.h:56
+msgid "Whether the image-manipulating modes should load image files."
 msgstr ""
 
 #: ../driver/demo-Gtk-widgets.c:1203
 msgid "Choose Random Image:"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1236 ../driver/xscreensaver-demo.glade2.h:54
-msgid "The directory from which images will be randomly chosen."
+#: ../driver/demo-Gtk-widgets.c:1236 ../driver/xscreensaver-demo.glade2.h:58
+msgid ""
+"The local directory, RSS feed or Atom feed from which images will be "
+"randomly chosen."
 msgstr ""
 
 #: ../driver/demo-Gtk-widgets.c:1238
@@ -369,7 +369,7 @@
 msgstr ""
 
 #: ../driver/demo-Gtk-widgets.c:1246 ../driver/demo-Gtk-widgets.c:1600
-#: ../driver/xscreensaver-demo.glade2.h:1
+#: ../driver/xscreensaver-demo.glade2.h:115
 msgid "Advanced"
 msgstr "Rozšírené"
 
@@ -377,11 +377,11 @@
 msgid "XScreenSaver: Mode-Specific Settings"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1467 ../driver/xscreensaver-demo.glade2.h:42
+#: ../driver/demo-Gtk-widgets.c:1467 ../driver/xscreensaver-demo.glade2.h:116
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../driver/demo-Gtk-widgets.c:1496 ../driver/xscreensaver-demo.glade2.h:44
+#: ../driver/demo-Gtk-widgets.c:1496 ../driver/xscreensaver-demo.glade2.h:99
 msgid "Standard"
 msgstr "Štandardné"
 
@@ -391,55 +391,55 @@
 
 #: ../driver/demo-Gtk-widgets.c:1551 ../driver/demo-Gtk-widgets.c:1574
 #: ../driver/demo-Gtk.c:1775 ../driver/demo-Gtk.c:3351
-#: ../driver/xscreensaver-demo.glade2.h:2
+#: ../driver/xscreensaver-demo.glade2.h:102
 msgid "Any"
 msgstr "Ľubovoľný"
 
-#: ../driver/demo-Gtk-widgets.c:1552 ../driver/xscreensaver-demo.glade2.h:3
+#: ../driver/demo-Gtk-widgets.c:1552 ../driver/xscreensaver-demo.glade2.h:103
 msgid "Best"
 msgstr "Najlepší"
 
-#: ../driver/demo-Gtk-widgets.c:1553 ../driver/xscreensaver-demo.glade2.h:7
+#: ../driver/demo-Gtk-widgets.c:1553 ../driver/xscreensaver-demo.glade2.h:104
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../driver/demo-Gtk-widgets.c:1554 ../driver/xscreensaver-demo.glade2.h:8
+#: ../driver/demo-Gtk-widgets.c:1554 ../driver/xscreensaver-demo.glade2.h:105
 msgid "Default-N"
 msgstr "Predvolené-N"
 
-#: ../driver/demo-Gtk-widgets.c:1555 ../driver/xscreensaver-demo.glade2.h:17
+#: ../driver/demo-Gtk-widgets.c:1555 ../driver/xscreensaver-demo.glade2.h:106
 msgid "GL"
 msgstr "GL"
 
-#: ../driver/demo-Gtk-widgets.c:1556 ../driver/xscreensaver-demo.glade2.h:55
+#: ../driver/demo-Gtk-widgets.c:1556 ../driver/xscreensaver-demo.glade2.h:107
 msgid "TrueColor"
 msgstr "TrueColor"
 
-#: ../driver/demo-Gtk-widgets.c:1557 ../driver/xscreensaver-demo.glade2.h:39
+#: ../driver/demo-Gtk-widgets.c:1557 ../driver/xscreensaver-demo.glade2.h:108
 msgid "PseudoColor"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1558 ../driver/xscreensaver-demo.glade2.h:45
+#: ../driver/demo-Gtk-widgets.c:1558 ../driver/xscreensaver-demo.glade2.h:109
 msgid "StaticGray"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1559 ../driver/xscreensaver-demo.glade2.h:21
+#: ../driver/demo-Gtk-widgets.c:1559 ../driver/xscreensaver-demo.glade2.h:110
 msgid "GrayScale"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1560 ../driver/xscreensaver-demo.glade2.h:11
+#: ../driver/demo-Gtk-widgets.c:1560 ../driver/xscreensaver-demo.glade2.h:111
 msgid "DirectColor"
 msgstr ""
 
-#: ../driver/demo-Gtk-widgets.c:1561 ../driver/xscreensaver-demo.glade2.h:5
+#: ../driver/demo-Gtk-widgets.c:1561 ../driver/xscreensaver-demo.glade2.h:112
 msgid "Color"
 msgstr "Farba"
 
-#: ../driver/demo-Gtk-widgets.c:1562 ../driver/xscreensaver-demo.glade2.h:20
+#: ../driver/demo-Gtk-widgets.c:1562 ../driver/xscreensaver-demo.glade2.h:113
 msgid "Gray"
 msgstr "Sivá"
 
-#: ../driver/demo-Gtk-widgets.c:1563 ../driver/xscreensaver-demo.glade2.h:33
+#: ../driver/demo-Gtk-widgets.c:1563 ../driver/xscreensaver-demo.glade2.h:114
 msgid "Mono"
 msgstr "ČB"
 
@@ -760,122 +760,128 @@
 msgstr ""
 
 #: ../driver/screensaver-properties.desktop.in.h:1
+msgid "Screensaver"
+msgstr "Šetrič obrazovky"
+
+#: ../driver/screensaver-properties.desktop.in.h:2
 msgid "Change screensaver properties"
 msgstr ""
 
-#: ../driver/screensaver-properties.desktop.in.h:2
-msgid "Screensaver"
-msgstr "Šetrič obrazovky"
+#: ../driver/xscreensaver-demo.glade2.h:7
+msgid "_Quit"
+msgstr "_Koniec"
 
-#: ../driver/xscreensaver-demo.glade2.h:4
-msgid "Choose _Random Image:"
+#: ../driver/xscreensaver-demo.glade2.h:11
+msgid "_Cycle After"
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:13
-msgid "F_ade Duration"
+msgid "_Lock Screen After  "
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:14
-msgid "Fade from Black When _Unblanking"
+msgid "Lock Screen"
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:15
-msgid "Fade to Black when _Blanking"
+msgid "How long before the screen saver activates."
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:16
-msgid "Fading and Colormaps"
+msgid "How long after the screen blanks until a password will be required."
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:18
-msgid "Grab Desktop _Images"
+msgid ""
+"How long each display mode should run before choosing a new one (in Random "
+"mode.)"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:19
-msgid "Grab _Video Frames"
+#: ../driver/xscreensaver-demo.glade2.h:20
+msgid "_Blank After"
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:22
-msgid "How long after the screen blanks until a password will be required."
+msgid "_Preview"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:23
-msgid "How long before the screen saver activates."
+#: ../driver/xscreensaver-demo.glade2.h:24
+msgid "_Settings..."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:24
-msgid ""
-"How long each display mode should run before choosing a new one (in Random "
-"mode.)"
+#: ../driver/xscreensaver-demo.glade2.h:25
+msgid "_Mode:"
 msgstr ""
 
 #: ../driver/xscreensaver-demo.glade2.h:26
-msgid "How long until the monitor goes completely black."
+msgid "Never blank the screen or power down the monitor."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:30
-msgid "Install _Colormap"
+#: ../driver/xscreensaver-demo.glade2.h:27
+msgid "_Disable Screen Saver"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:31
-msgid "Lock Screen"
+#: ../driver/xscreensaver-demo.glade2.h:28
+msgid "When idle or locked, blacken the screen only."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:34
-msgid "Never blank the screen or power down the monitor."
+#: ../driver/xscreensaver-demo.glade2.h:29
+msgid "_Blank Screen Only"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:35
-msgid ""
-"No Preview\n"
-"Available"
+#: ../driver/xscreensaver-demo.glade2.h:30
+msgid "When idle or locked, run the display mode selected below."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:37
-msgid ""
-"Not\n"
-"Installed"
+#: ../driver/xscreensaver-demo.glade2.h:31
+msgid "_Only One Screen Saver"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:43
-msgid "Stand_by After"
+#: ../driver/xscreensaver-demo.glade2.h:32
+msgid ""
+"When idle or locked, choose a random display mode from among the checked "
+"items in the list below."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:46
-msgid "Sus_pend After"
+#: ../driver/xscreensaver-demo.glade2.h:33
+msgid "_Random Screen Saver"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:47
-msgid "Text Manipulation"
+#: ../driver/xscreensaver-demo.glade2.h:34
+msgid ""
+"When idle or locked, choose a random display mode from among the checked "
+"items in the list below.  Run that same mode on each monitor."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:48
-msgid "Text _file"
+#: ../driver/xscreensaver-demo.glade2.h:35
+msgid "_Same Random Savers"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:49
+#: ../driver/xscreensaver-demo.glade2.h:38
+msgid "preview"
+msgstr "náhľad"
+
+#: ../driver/xscreensaver-demo.glade2.h:39
 msgid ""
-"Text-displaying modes will display the contents of this URL (HTML or RSS)."
+"No Preview\n"
+"Available"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:50
-msgid "Text-displaying modes will display the contents of this file."
+#: ../driver/xscreensaver-demo.glade2.h:41
+msgid "no preview"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:51
+#: ../driver/xscreensaver-demo.glade2.h:42
 msgid ""
-"Text-displaying modes will display the local host name, date, and time."
-msgstr ""
-
-#: ../driver/xscreensaver-demo.glade2.h:52
-msgid "Text-displaying modes will display the output of this program."
+"Not\n"
+"Installed"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:53
-msgid "Text-displaying modes will display the text typed here."
+#: ../driver/xscreensaver-demo.glade2.h:44
+msgid "not installed"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:56
+#: ../driver/xscreensaver-demo.glade2.h:45
 msgid ""
 "Very few (or no) screen savers appear to be available.\n"
 "\n"
@@ -883,252 +889,313 @@
 "\"xscreensaver-gl-extras\" packages are not installed."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:60
-msgid "When idle or locked, blacken the screen only."
-msgstr ""
-
-#: ../driver/xscreensaver-demo.glade2.h:61
-msgid ""
-"When idle or locked, choose a random display mode from among the checked "
-"items in the list below."
+#: ../driver/xscreensaver-demo.glade2.h:49
+msgid "nothing"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:62
-msgid ""
-"When idle or locked, choose a random display mode from among the checked "
-"items in the list below.  Run that same mode on each monitor."
+#: ../driver/xscreensaver-demo.glade2.h:51
+msgid "_Display Modes"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:63
-msgid "When idle or locked, run the display mode selected below."
+#: ../driver/xscreensaver-demo.glade2.h:53
+msgid "Grab Desktop _Images"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:66
+#: ../driver/xscreensaver-demo.glade2.h:54
 msgid ""
 "Whether the image-manipulating modes should operate on images captured from "
 "the system's video input (if there is one.)"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:69
-msgid ""
-"Whether the monitor should be powered off immediately in \"Blank Screen "
-"Only\" mode, regardless of the above power-management timeouts."
+#: ../driver/xscreensaver-demo.glade2.h:55
+msgid "Grab _Video Frames"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:75
-msgid "_Advanced"
-msgstr "_Rozšírené"
+#: ../driver/xscreensaver-demo.glade2.h:57
+msgid "Choose _Random Image:"
+msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:76
-msgid "_Advanced >>"
+#: ../driver/xscreensaver-demo.glade2.h:59
+msgid "_Browse"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:77
-msgid "_Blank After"
+#: ../driver/xscreensaver-demo.glade2.h:60
+msgid "Local directory, or RSS feed URL."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:79
-msgid "_Blank Screen Only"
+#: ../driver/xscreensaver-demo.glade2.h:62
+msgid "Text-displaying modes will display the text typed here."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:80
-msgid "_Browse"
+#: ../driver/xscreensaver-demo.glade2.h:63
+msgid "_Text"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:81
-msgid "_Command Line:"
+#: ../driver/xscreensaver-demo.glade2.h:64
+msgid "Text-displaying modes will display the contents of this file."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:82
-msgid "_Cycle After"
+#: ../driver/xscreensaver-demo.glade2.h:65
+msgid "Text _file"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:83
-msgid "_Disable Screen Saver"
+#: ../driver/xscreensaver-demo.glade2.h:66
+msgid "Text-displaying modes will display the output of this program."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:84
-msgid "_Display Modes"
+#: ../driver/xscreensaver-demo.glade2.h:67
+msgid "_Program"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:88
-msgid "_Host Name and Time"
+#: ../driver/xscreensaver-demo.glade2.h:68
+msgid ""
+"Text-displaying modes will display the contents of this URL (HTML or RSS)."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:90
-msgid "_Lock Screen After  "
+#: ../driver/xscreensaver-demo.glade2.h:69
+msgid "_URL"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:92
-msgid "_Mode:"
+#: ../driver/xscreensaver-demo.glade2.h:70
+msgid ""
+"Text-displaying modes will display the local host name, date, and time."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:93
-msgid "_Off After"
+#: ../driver/xscreensaver-demo.glade2.h:71
+msgid "_Host Name and Time"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:94
-msgid "_Only One Screen Saver"
+#: ../driver/xscreensaver-demo.glade2.h:72
+msgid "Text Manipulation"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:95
+#: ../driver/xscreensaver-demo.glade2.h:74
 msgid "_Power Management Enabled"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:96
-msgid "_Preview"
+#: ../driver/xscreensaver-demo.glade2.h:75
+msgid "Stand_by After"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:97
-msgid "_Program"
+#: ../driver/xscreensaver-demo.glade2.h:76
+msgid "Sus_pend After"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:98
-msgid "_Quick Power-off in Blank Only Mode"
+#: ../driver/xscreensaver-demo.glade2.h:77
+msgid "_Off After"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:99
-msgid "_Quit"
-msgstr "_Koniec"
-
-#: ../driver/xscreensaver-demo.glade2.h:100
-msgid "_Random Screen Saver"
+#: ../driver/xscreensaver-demo.glade2.h:80
+msgid "How long until the monitor goes completely black."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:101
-msgid "_Reset to Defaults"
+#: ../driver/xscreensaver-demo.glade2.h:81
+msgid ""
+"Whether the monitor should be powered off immediately in \"Blank Screen "
+"Only\" mode, regardless of the above power-management timeouts."
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:103
-msgid "_Same Random Savers"
+#: ../driver/xscreensaver-demo.glade2.h:82
+msgid "_Quick Power-off in Blank Only Mode"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:104
-msgid "_Settings..."
+#: ../driver/xscreensaver-demo.glade2.h:85
+msgid "Fade to Black when _Blanking"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:105
-msgid "_Standard <<"
+#: ../driver/xscreensaver-demo.glade2.h:87
+msgid "Fade from Black When _Unblanking"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:106
-msgid "_Text"
+#: ../driver/xscreensaver-demo.glade2.h:88
+msgid "F_ade Duration"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:107
-msgid "_URL"
+#: ../driver/xscreensaver-demo.glade2.h:92
+msgid "Install _Colormap"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:108
-msgid "_Visual:"
+#: ../driver/xscreensaver-demo.glade2.h:93
+msgid "Fading and Colormaps"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:109
+#: ../driver/xscreensaver-demo.glade2.h:94
+msgid "_Advanced"
+msgstr "_Rozšírené"
+
+#: ../driver/xscreensaver-demo.glade2.h:95
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../driver/xscreensaver-demo.glade2.h:111
-msgid "no preview"
+#: ../driver/xscreensaver-demo.glade2.h:96
+msgid "_Advanced >>"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:112
-msgid "not installed"
+#: ../driver/xscreensaver-demo.glade2.h:97
+msgid "_Standard <<"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:113
-msgid "nothing"
+#: ../driver/xscreensaver-demo.glade2.h:98
+msgid "_Reset to Defaults"
 msgstr ""
 
-#: ../driver/xscreensaver-demo.glade2.h:114
-msgid "preview"
-msgstr "náhľad"
-
-#: ../hacks/config/abstractile.xml.h:1 ../hacks/config/ccurve.xml.h:1
-#: ../hacks/config/flame.xml.h:1 ../hacks/config/maze.xml.h:1
-msgid "0 seconds"
-msgstr "0 sekúnd"
+#: ../driver/xscreensaver-demo.glade2.h:100
+msgid "_Command Line:"
+msgstr ""
 
-#: ../hacks/config/abstractile.xml.h:2 ../hacks/config/voronoi.xml.h:3
-msgid "60 seconds"
+#: ../driver/xscreensaver-demo.glade2.h:101
+msgid "_Visual:"
 msgstr ""
 
-#: ../hacks/config/abstractile.xml.h:3
+#: ../hacks/config/abstractile.xml.h:1
 msgid "Abstractile"
 msgstr ""
 
-#: ../hacks/config/abstractile.xml.h:4
-msgid "Block tiles"
-msgstr ""
+#. 
+#. -withdraw 1200
+#. -turnspeed 50
+#. 
+#: ../hacks/config/abstractile.xml.h:2 ../hacks/config/anemone.xml.h:6
+#: ../hacks/config/apollonian.xml.h:13 ../hacks/config/atlantis.xml.h:5
+#: ../hacks/config/attraction.xml.h:24 ../hacks/config/blitspin.xml.h:2
+#: ../hacks/config/boing.xml.h:5 ../hacks/config/bouncingcow.xml.h:5
+#: ../hacks/config/boxed.xml.h:5 ../hacks/config/carousel.xml.h:5
+#: ../hacks/config/ccurve.xml.h:5 ../hacks/config/circuit.xml.h:8
+#: ../hacks/config/companioncube.xml.h:5 ../hacks/config/cube21.xml.h:8
+#: ../hacks/config/cubenetic.xml.h:17 ../hacks/config/cubestorm.xml.h:5
+#: ../hacks/config/cubicgrid.xml.h:5 ../hacks/config/dangerball.xml.h:5
+#: ../hacks/config/eruption.xml.h:10 ../hacks/config/fliptext.xml.h:5
+#: ../hacks/config/flyingtoasters.xml.h:5 ../hacks/config/fontglide.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:5 ../hacks/config/gears.xml.h:5
+#: ../hacks/config/gflux.xml.h:5 ../hacks/config/glcells.xml.h:25
+#: ../hacks/config/glknots.xml.h:5 ../hacks/config/glmatrix.xml.h:8
+#: ../hacks/config/glsnake.xml.h:11 ../hacks/config/goop.xml.h:5
+#: ../hacks/config/hilbert.xml.h:8 ../hacks/config/hyperball.xml.h:5
+#: ../hacks/config/hypercube.xml.h:5 ../hacks/config/hypnowheel.xml.h:2
+#: ../hacks/config/interference.xml.h:5 ../hacks/config/jigglypuff.xml.h:6
+#: ../hacks/config/jigsaw.xml.h:5 ../hacks/config/juggle.xml.h:5
+#: ../hacks/config/juggler3d.xml.h:5 ../hacks/config/moebiusgears.xml.h:5
+#: ../hacks/config/penetrate.xml.h:2 ../hacks/config/petri.xml.h:18
+#: ../hacks/config/phosphor.xml.h:6 ../hacks/config/photopile.xml.h:12
+#: ../hacks/config/piecewise.xml.h:8 ../hacks/config/pinion.xml.h:5
+#: ../hacks/config/polyhedra.xml.h:5 ../hacks/config/pong.xml.h:2
+#: ../hacks/config/pyro.xml.h:2 ../hacks/config/rd-bomb.xml.h:2
+#: ../hacks/config/rdbomb.xml.h:2 ../hacks/config/rocks.xml.h:8
+#: ../hacks/config/rubik.xml.h:6 ../hacks/config/rubikblocks.xml.h:8
+#: ../hacks/config/skytentacles.xml.h:15 ../hacks/config/slidescreen.xml.h:11
+#: ../hacks/config/sonar.xml.h:5 ../hacks/config/speedmine.xml.h:5
+#: ../hacks/config/superquadrics.xml.h:5 ../hacks/config/tangram.xml.h:8
+#: ../hacks/config/topblock.xml.h:5 ../hacks/config/tronbit.xml.h:5
+#: ../hacks/config/twang.xml.h:8 ../hacks/config/voronoi.xml.h:2
+#: ../hacks/config/wormhole.xml.h:5 ../hacks/config/xjack.xml.h:2
+msgid "Slow"
+msgstr "Pomaly"
 
 #. 
 #. -withdraw 1200
 #. -turnspeed 50
 #. 
-#: ../hacks/config/abstractile.xml.h:5 ../hacks/config/anemone.xml.h:7
-#: ../hacks/config/apollonian.xml.h:9 ../hacks/config/atlantis.xml.h:6
-#: ../hacks/config/attraction.xml.h:7 ../hacks/config/blitspin.xml.h:6
-#: ../hacks/config/boing.xml.h:2 ../hacks/config/bouncingcow.xml.h:4
-#: ../hacks/config/boxed.xml.h:7 ../hacks/config/carousel.xml.h:5
-#: ../hacks/config/ccurve.xml.h:7 ../hacks/config/circuit.xml.h:4
-#: ../hacks/config/cube21.xml.h:6 ../hacks/config/cubenetic.xml.h:5
-#: ../hacks/config/cubestorm.xml.h:4 ../hacks/config/cubicgrid.xml.h:7
-#: ../hacks/config/dangerball.xml.h:3 ../hacks/config/eruption.xml.h:5
-#: ../hacks/config/fliptext.xml.h:3 ../hacks/config/flyingtoasters.xml.h:5
-#: ../hacks/config/fontglide.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:6
-#: ../hacks/config/gears.xml.h:3 ../hacks/config/gflux.xml.h:7
-#: ../hacks/config/glknots.xml.h:2 ../hacks/config/glmatrix.xml.h:4
-#: ../hacks/config/glsnake.xml.h:7 ../hacks/config/goop.xml.h:4
-#: ../hacks/config/hyperball.xml.h:1 ../hacks/config/hypercube.xml.h:2
-#: ../hacks/config/hypnowheel.xml.h:6 ../hacks/config/interference.xml.h:5
-#: ../hacks/config/jigglypuff.xml.h:7 ../hacks/config/jigsaw.xml.h:2
-#: ../hacks/config/juggle.xml.h:4 ../hacks/config/juggler3d.xml.h:6
-#: ../hacks/config/moebiusgears.xml.h:2 ../hacks/config/penetrate.xml.h:3
-#: ../hacks/config/petri.xml.h:5 ../hacks/config/phosphor.xml.h:3
-#: ../hacks/config/photopile.xml.h:6 ../hacks/config/piecewise.xml.h:3
-#: ../hacks/config/pinion.xml.h:4 ../hacks/config/polyhedra.xml.h:16
-#: ../hacks/config/pong.xml.h:3 ../hacks/config/pyro.xml.h:4
-#: ../hacks/config/rd-bomb.xml.h:8 ../hacks/config/rdbomb.xml.h:8
-#: ../hacks/config/rocks.xml.h:3 ../hacks/config/rubik.xml.h:4
-#: ../hacks/config/rubikblocks.xml.h:3 ../hacks/config/skytentacles.xml.h:5
-#: ../hacks/config/slidescreen.xml.h:5 ../hacks/config/sonar.xml.h:3
-#: ../hacks/config/speedmine.xml.h:3 ../hacks/config/starwars.xml.h:7
-#: ../hacks/config/superquadrics.xml.h:3 ../hacks/config/tangram.xml.h:3
-#: ../hacks/config/topblock.xml.h:7 ../hacks/config/voronoi.xml.h:5
-#: ../hacks/config/wormhole.xml.h:1 ../hacks/config/xjack.xml.h:1
+#: ../hacks/config/abstractile.xml.h:3 ../hacks/config/anemone.xml.h:11
+#: ../hacks/config/apollonian.xml.h:14 ../hacks/config/attraction.xml.h:25
+#: ../hacks/config/boing.xml.h:6 ../hacks/config/boxed.xml.h:6
+#: ../hacks/config/cubestorm.xml.h:6 ../hacks/config/cubicgrid.xml.h:6
+#: ../hacks/config/fliptext.xml.h:6 ../hacks/config/fontglide.xml.h:6
+#: ../hacks/config/fuzzyflakes.xml.h:6 ../hacks/config/gears.xml.h:6
+#: ../hacks/config/glknots.xml.h:6 ../hacks/config/goop.xml.h:6
+#: ../hacks/config/hilbert.xml.h:11 ../hacks/config/hypnowheel.xml.h:5
+#: ../hacks/config/jigsaw.xml.h:6 ../hacks/config/juggle.xml.h:6
+#: ../hacks/config/juggler3d.xml.h:6 ../hacks/config/moebiusgears.xml.h:6
+#: ../hacks/config/polyhedra.xml.h:6 ../hacks/config/skytentacles.xml.h:18
+#: ../hacks/config/sonar.xml.h:6 ../hacks/config/xjack.xml.h:3
+msgid "Speed"
+msgstr "Rýchlosť"
+
+#. 
+#. -withdraw 1200
+#. -turnspeed 50
+#. 
+#: ../hacks/config/abstractile.xml.h:4 ../hacks/config/anemone.xml.h:16
+#: ../hacks/config/apollonian.xml.h:15 ../hacks/config/atlantis.xml.h:7
+#: ../hacks/config/attraction.xml.h:26 ../hacks/config/blitspin.xml.h:4
+#: ../hacks/config/boing.xml.h:7 ../hacks/config/bouncingcow.xml.h:7
+#: ../hacks/config/boxed.xml.h:7 ../hacks/config/carousel.xml.h:7
+#: ../hacks/config/ccurve.xml.h:7 ../hacks/config/circuit.xml.h:10
+#: ../hacks/config/companioncube.xml.h:7 ../hacks/config/cube21.xml.h:10
+#: ../hacks/config/cubenetic.xml.h:19 ../hacks/config/cubestorm.xml.h:7
+#: ../hacks/config/cubicgrid.xml.h:7 ../hacks/config/dangerball.xml.h:7
+#: ../hacks/config/eruption.xml.h:12 ../hacks/config/fliptext.xml.h:7
+#: ../hacks/config/flyingtoasters.xml.h:7 ../hacks/config/fontglide.xml.h:7
+#: ../hacks/config/fuzzyflakes.xml.h:7 ../hacks/config/gears.xml.h:7
+#: ../hacks/config/gflux.xml.h:7 ../hacks/config/glknots.xml.h:7
+#: ../hacks/config/glmatrix.xml.h:10 ../hacks/config/glsnake.xml.h:13
+#: ../hacks/config/goop.xml.h:7 ../hacks/config/hilbert.xml.h:10
+#: ../hacks/config/hyperball.xml.h:7 ../hacks/config/hypercube.xml.h:7
+#: ../hacks/config/hypnowheel.xml.h:4 ../hacks/config/interference.xml.h:7
+#: ../hacks/config/jigglypuff.xml.h:8 ../hacks/config/jigsaw.xml.h:7
+#: ../hacks/config/juggle.xml.h:7 ../hacks/config/juggler3d.xml.h:7
+#: ../hacks/config/moebiusgears.xml.h:7 ../hacks/config/penetrate.xml.h:4
+#: ../hacks/config/petri.xml.h:20 ../hacks/config/phosphor.xml.h:8
+#: ../hacks/config/photopile.xml.h:14 ../hacks/config/piecewise.xml.h:10
+#: ../hacks/config/pinion.xml.h:7 ../hacks/config/polyhedra.xml.h:7
+#: ../hacks/config/pong.xml.h:4 ../hacks/config/pyro.xml.h:4
+#: ../hacks/config/rd-bomb.xml.h:4 ../hacks/config/rdbomb.xml.h:4
+#: ../hacks/config/rocks.xml.h:10 ../hacks/config/rubik.xml.h:8
+#: ../hacks/config/rubikblocks.xml.h:10 ../hacks/config/skytentacles.xml.h:17
+#: ../hacks/config/slidescreen.xml.h:13 ../hacks/config/sonar.xml.h:7
+#: ../hacks/config/speedmine.xml.h:7 ../hacks/config/starwars.xml.h:5
+#: ../hacks/config/superquadrics.xml.h:7 ../hacks/config/tangram.xml.h:10
+#: ../hacks/config/topblock.xml.h:7 ../hacks/config/tronbit.xml.h:7
+#: ../hacks/config/voronoi.xml.h:4 ../hacks/config/wormhole.xml.h:7
+#: ../hacks/config/xjack.xml.h:4
 msgid "Fast"
 msgstr "Rýchlo"
 
-#: ../hacks/config/abstractile.xml.h:6
-msgid "Flat tiles"
-msgstr ""
+#: ../hacks/config/abstractile.xml.h:5 ../hacks/config/ccurve.xml.h:2
+#: ../hacks/config/flame.xml.h:5 ../hacks/config/maze.xml.h:5
+msgid "0 seconds"
+msgstr "0 sekúnd"
 
-#: ../hacks/config/abstractile.xml.h:7
-msgid ""
-"Generates mosaic patterns of interlocking tiles. Written by Steve Sundstrom; "
-"2004."
-msgstr ""
-
-#: ../hacks/config/abstractile.xml.h:8 ../hacks/config/boxed.xml.h:13
-#: ../hacks/config/celtic.xml.h:5 ../hacks/config/coral.xml.h:9
-#: ../hacks/config/cube21.xml.h:10 ../hacks/config/epicycle.xml.h:8
-#: ../hacks/config/flame.xml.h:9 ../hacks/config/glcells.xml.h:15
-#: ../hacks/config/helix.xml.h:6 ../hacks/config/imsmap.xml.h:10
-#: ../hacks/config/rorschach.xml.h:5 ../hacks/config/rubikblocks.xml.h:7
-#: ../hacks/config/tangram.xml.h:6 ../hacks/config/xlyap.xml.h:4
+#: ../hacks/config/abstractile.xml.h:6 ../hacks/config/boxed.xml.h:17
+#: ../hacks/config/celtic.xml.h:6 ../hacks/config/coral.xml.h:6
+#: ../hacks/config/cube21.xml.h:22 ../hacks/config/epicycle.xml.h:9
+#: ../hacks/config/flame.xml.h:6 ../hacks/config/glcells.xml.h:6
+#: ../hacks/config/helix.xml.h:6 ../hacks/config/imsmap.xml.h:6
+#: ../hacks/config/rorschach.xml.h:9 ../hacks/config/rubikblocks.xml.h:16
+#: ../hacks/config/tangram.xml.h:6 ../hacks/config/xlyap.xml.h:6
 #: ../hacks/config/xspirograph.xml.h:6
 msgid "Linger"
 msgstr ""
 
+#: ../hacks/config/abstractile.xml.h:7 ../hacks/config/voronoi.xml.h:16
+msgid "60 seconds"
+msgstr ""
+
+#: ../hacks/config/abstractile.xml.h:8
+msgid "Random tile layout"
+msgstr ""
+
 #: ../hacks/config/abstractile.xml.h:9
-msgid "Neon tiles"
+msgid "Flat tiles"
 msgstr ""
 
 #: ../hacks/config/abstractile.xml.h:10
-msgid "Outline tiles"
+msgid "Thin tiles"
 msgstr ""
 
 #: ../hacks/config/abstractile.xml.h:11
-msgid "Random tile layout"
+msgid "Outline tiles"
+msgstr ""
+
+#: ../hacks/config/abstractile.xml.h:12
+msgid "Block tiles"
+msgstr ""
+
+#: ../hacks/config/abstractile.xml.h:13
+msgid "Neon tiles"
+msgstr ""
+
+#: ../hacks/config/abstractile.xml.h:14
+msgid "Tiled tiles"
 msgstr ""
 
 #. 
@@ -1158,728 +1225,692 @@
 #. #### -3d
 #. #### -font []
 #. #### -w []
-#: ../hacks/config/abstractile.xml.h:12 ../hacks/config/anemone.xml.h:17
-#: ../hacks/config/anemotaxis.xml.h:12 ../hacks/config/ant.xml.h:15
-#: ../hacks/config/antinspect.xml.h:7 ../hacks/config/antmaze.xml.h:6
-#: ../hacks/config/antspotlight.xml.h:6 ../hacks/config/apollonian.xml.h:15
-#: ../hacks/config/apple2.xml.h:6 ../hacks/config/atlantis.xml.h:16
-#: ../hacks/config/attraction.xml.h:25 ../hacks/config/atunnel.xml.h:7
-#: ../hacks/config/barcode.xml.h:10 ../hacks/config/blaster.xml.h:11
-#: ../hacks/config/blinkbox.xml.h:10 ../hacks/config/blitspin.xml.h:9
-#: ../hacks/config/blocktube.xml.h:10 ../hacks/config/boing.xml.h:8
-#: ../hacks/config/bouboule.xml.h:10 ../hacks/config/bouncingcow.xml.h:11
-#: ../hacks/config/boxed.xml.h:21 ../hacks/config/boxfit.xml.h:15
-#: ../hacks/config/braid.xml.h:13 ../hacks/config/bsod.xml.h:27
+#: ../hacks/config/abstractile.xml.h:15 ../hacks/config/anemone.xml.h:33
+#: ../hacks/config/anemotaxis.xml.h:12 ../hacks/config/ant.xml.h:22
+#: ../hacks/config/antinspect.xml.h:5 ../hacks/config/antmaze.xml.h:5
+#: ../hacks/config/antspotlight.xml.h:5 ../hacks/config/apollonian.xml.h:16
+#: ../hacks/config/apple2.xml.h:6 ../hacks/config/atlantis.xml.h:19
+#: ../hacks/config/attraction.xml.h:32 ../hacks/config/atunnel.xml.h:8
+#: ../hacks/config/barcode.xml.h:9 ../hacks/config/blaster.xml.h:11
+#: ../hacks/config/blinkbox.xml.h:12 ../hacks/config/blitspin.xml.h:9
+#: ../hacks/config/blocktube.xml.h:11 ../hacks/config/boing.xml.h:14
+#: ../hacks/config/bouboule.xml.h:11 ../hacks/config/bouncingcow.xml.h:12
+#: ../hacks/config/boxed.xml.h:23 ../hacks/config/boxfit.xml.h:15
+#: ../hacks/config/braid.xml.h:13 ../hacks/config/bsod.xml.h:5
 #: ../hacks/config/bubble3d.xml.h:7 ../hacks/config/bubbles.xml.h:11
-#: ../hacks/config/bumps.xml.h:12 ../hacks/config/cage.xml.h:5
-#: ../hacks/config/carousel.xml.h:13 ../hacks/config/ccurve.xml.h:11
-#: ../hacks/config/celtic.xml.h:10 ../hacks/config/circuit.xml.h:13
-#: ../hacks/config/cloudlife.xml.h:12 ../hacks/config/compass.xml.h:5
-#: ../hacks/config/coral.xml.h:13 ../hacks/config/crackberg.xml.h:18
-#: ../hacks/config/critical.xml.h:7 ../hacks/config/crystal.xml.h:14
-#: ../hacks/config/cube21.xml.h:17 ../hacks/config/cubenetic.xml.h:19
-#: ../hacks/config/cubestorm.xml.h:10 ../hacks/config/cubicgrid.xml.h:11
-#: ../hacks/config/cwaves.xml.h:8 ../hacks/config/cynosure.xml.h:11
-#: ../hacks/config/dangerball.xml.h:10 ../hacks/config/decayscreen.xml.h:21
-#: ../hacks/config/deco.xml.h:12 ../hacks/config/deluxe.xml.h:12
-#: ../hacks/config/demon.xml.h:13 ../hacks/config/discrete.xml.h:9
-#: ../hacks/config/distort.xml.h:19 ../hacks/config/dnalogo.xml.h:9
-#: ../hacks/config/drift.xml.h:11 ../hacks/config/endgame.xml.h:7
-#: ../hacks/config/engine.xml.h:16 ../hacks/config/epicycle.xml.h:13
-#: ../hacks/config/eruption.xml.h:22 ../hacks/config/euler2d.xml.h:27
-#: ../hacks/config/extrusion.xml.h:12 ../hacks/config/fadeplot.xml.h:10
-#: ../hacks/config/fiberlamp.xml.h:11 ../hacks/config/fireworkx.xml.h:11
-#: ../hacks/config/flag.xml.h:9 ../hacks/config/flame.xml.h:14
-#: ../hacks/config/flipflop.xml.h:10 ../hacks/config/flipscreen3d.xml.h:7
-#: ../hacks/config/fliptext.xml.h:12 ../hacks/config/flow.xml.h:18
-#: ../hacks/config/fluidballs.xml.h:19 ../hacks/config/flurry.xml.h:9
-#: ../hacks/config/flyingtoasters.xml.h:13 ../hacks/config/fontglide.xml.h:14
-#: ../hacks/config/forest.xml.h:7 ../hacks/config/fuzzyflakes.xml.h:21
-#: ../hacks/config/galaxy.xml.h:12 ../hacks/config/gears.xml.h:9
-#: ../hacks/config/gflux.xml.h:15 ../hacks/config/glblur.xml.h:15
-#: ../hacks/config/glcells.xml.h:30 ../hacks/config/gleidescope.xml.h:12
-#: ../hacks/config/glforestfire.xml.h:13 ../hacks/config/glhanoi.xml.h:15
-#: ../hacks/config/glknots.xml.h:17 ../hacks/config/glmatrix.xml.h:16
-#: ../hacks/config/glplanet.xml.h:11 ../hacks/config/glschool.xml.h:15
-#: ../hacks/config/glslideshow.xml.h:20 ../hacks/config/glsnake.xml.h:14
-#: ../hacks/config/gltext.xml.h:17 ../hacks/config/goop.xml.h:12
-#: ../hacks/config/grav.xml.h:11 ../hacks/config/greynetic.xml.h:7
-#: ../hacks/config/halftone.xml.h:17 ../hacks/config/halo.xml.h:14
-#: ../hacks/config/helix.xml.h:8 ../hacks/config/hopalong.xml.h:20
-#: ../hacks/config/hyperball.xml.h:6 ../hacks/config/hypercube.xml.h:9
-#: ../hacks/config/hypertorus.xml.h:18 ../hacks/config/hypnowheel.xml.h:12
-#: ../hacks/config/ifs.xml.h:13 ../hacks/config/imsmap.xml.h:16
-#: ../hacks/config/interaggregate.xml.h:9
-#: ../hacks/config/interference.xml.h:17
-#: ../hacks/config/intermomentary.xml.h:9 ../hacks/config/jigglypuff.xml.h:17
-#: ../hacks/config/jigsaw.xml.h:11 ../hacks/config/juggle.xml.h:18
-#: ../hacks/config/juggler3d.xml.h:19 ../hacks/config/julia.xml.h:13
-#: ../hacks/config/kaleidescope.xml.h:12 ../hacks/config/klein.xml.h:21
+#: ../hacks/config/bumps.xml.h:11 ../hacks/config/cage.xml.h:6
+#: ../hacks/config/carousel.xml.h:18 ../hacks/config/ccurve.xml.h:11
+#: ../hacks/config/celtic.xml.h:9 ../hacks/config/circuit.xml.h:14
+#: ../hacks/config/cloudlife.xml.h:12 ../hacks/config/companioncube.xml.h:14
+#: ../hacks/config/compass.xml.h:5 ../hacks/config/coral.xml.h:14
+#: ../hacks/config/crackberg.xml.h:18 ../hacks/config/critical.xml.h:8
+#: ../hacks/config/crystal.xml.h:15 ../hacks/config/cube21.xml.h:26
+#: ../hacks/config/cubenetic.xml.h:26 ../hacks/config/cubestorm.xml.h:17
+#: ../hacks/config/cubicgrid.xml.h:12 ../hacks/config/cwaves.xml.h:9
+#: ../hacks/config/cynosure.xml.h:11 ../hacks/config/dangerball.xml.h:14
+#: ../hacks/config/decayscreen.xml.h:23 ../hacks/config/deco.xml.h:14
+#: ../hacks/config/deluxe.xml.h:16 ../hacks/config/demon.xml.h:15
+#: ../hacks/config/discrete.xml.h:11 ../hacks/config/distort.xml.h:22
+#: ../hacks/config/dnalogo.xml.h:9 ../hacks/config/drift.xml.h:11
+#: ../hacks/config/endgame.xml.h:6 ../hacks/config/engine.xml.h:19
+#: ../hacks/config/epicycle.xml.h:14 ../hacks/config/eruption.xml.h:22
+#: ../hacks/config/euler2d.xml.h:29 ../hacks/config/extrusion.xml.h:17
+#: ../hacks/config/fadeplot.xml.h:14 ../hacks/config/fiberlamp.xml.h:11
+#: ../hacks/config/fireworkx.xml.h:11 ../hacks/config/flag.xml.h:13
+#: ../hacks/config/flame.xml.h:14 ../hacks/config/flipflop.xml.h:14
+#: ../hacks/config/flipscreen3d.xml.h:6 ../hacks/config/fliptext.xml.h:15
+#: ../hacks/config/flow.xml.h:21 ../hacks/config/fluidballs.xml.h:22
+#: ../hacks/config/flurry.xml.h:2 ../hacks/config/flyingtoasters.xml.h:14
+#: ../hacks/config/fontglide.xml.h:16 ../hacks/config/forest.xml.h:8
+#: ../hacks/config/fuzzyflakes.xml.h:12 ../hacks/config/galaxy.xml.h:13
+#: ../hacks/config/gears.xml.h:14 ../hacks/config/gflux.xml.h:19
+#: ../hacks/config/glblur.xml.h:17 ../hacks/config/glcells.xml.h:32
+#: ../hacks/config/gleidescope.xml.h:14 ../hacks/config/glforestfire.xml.h:16
+#: ../hacks/config/glhanoi.xml.h:16 ../hacks/config/glknots.xml.h:24
+#: ../hacks/config/glmatrix.xml.h:20 ../hacks/config/glplanet.xml.h:13
+#: ../hacks/config/glschool.xml.h:17 ../hacks/config/glslideshow.xml.h:20
+#: ../hacks/config/glsnake.xml.h:18 ../hacks/config/gltext.xml.h:19
+#: ../hacks/config/goop.xml.h:13 ../hacks/config/grav.xml.h:12
+#: ../hacks/config/greynetic.xml.h:6 ../hacks/config/halftone.xml.h:17
+#: ../hacks/config/halo.xml.h:14 ../hacks/config/helix.xml.h:8
+#: ../hacks/config/hilbert.xml.h:20 ../hacks/config/hopalong.xml.h:23
+#: ../hacks/config/hyperball.xml.h:13 ../hacks/config/hypercube.xml.h:17
+#: ../hacks/config/hypertorus.xml.h:5 ../hacks/config/hypnowheel.xml.h:8
+#: ../hacks/config/ifs.xml.h:68 ../hacks/config/imsmap.xml.h:18
+#: ../hacks/config/interaggregate.xml.h:8
+#: ../hacks/config/interference.xml.h:21
+#: ../hacks/config/intermomentary.xml.h:8 ../hacks/config/jigglypuff.xml.h:27
+#: ../hacks/config/jigsaw.xml.h:15 ../hacks/config/juggle.xml.h:21
+#: ../hacks/config/juggler3d.xml.h:21 ../hacks/config/julia.xml.h:14
+#: ../hacks/config/kaleidescope.xml.h:13 ../hacks/config/klein.xml.h:5
 #: ../hacks/config/kumppa.xml.h:8 ../hacks/config/lament.xml.h:7
-#: ../hacks/config/laser.xml.h:11 ../hacks/config/lavalite.xml.h:26
-#: ../hacks/config/lcdscrub.xml.h:11 ../hacks/config/lightning.xml.h:7
-#: ../hacks/config/lisa.xml.h:12 ../hacks/config/lissie.xml.h:11
-#: ../hacks/config/lmorph.xml.h:15 ../hacks/config/lockward.xml.h:13
-#: ../hacks/config/loop.xml.h:10 ../hacks/config/m6502.xml.h:5
-#: ../hacks/config/maze.xml.h:15 ../hacks/config/memscroller.xml.h:9
-#: ../hacks/config/menger.xml.h:17 ../hacks/config/metaballs.xml.h:15
-#: ../hacks/config/mirrorblob.xml.h:21 ../hacks/config/mismunch.xml.h:10
-#: ../hacks/config/moebius.xml.h:6 ../hacks/config/moebiusgears.xml.h:10
-#: ../hacks/config/moire.xml.h:10 ../hacks/config/moire2.xml.h:8
-#: ../hacks/config/molecule.xml.h:25 ../hacks/config/morph3d.xml.h:11
-#: ../hacks/config/mountain.xml.h:11 ../hacks/config/munch.xml.h:14
-#: ../hacks/config/nerverot.xml.h:21 ../hacks/config/noof.xml.h:6
-#: ../hacks/config/noseguy.xml.h:3 ../hacks/config/pacman.xml.h:6
-#: ../hacks/config/pedal.xml.h:9 ../hacks/config/penetrate.xml.h:6
-#: ../hacks/config/penrose.xml.h:10 ../hacks/config/petri.xml.h:24
-#: ../hacks/config/phosphor.xml.h:9 ../hacks/config/photopile.xml.h:19
-#: ../hacks/config/piecewise.xml.h:13 ../hacks/config/pinion.xml.h:14
-#: ../hacks/config/pipes.xml.h:20 ../hacks/config/polyhedra.xml.h:111
-#: ../hacks/config/polyominoes.xml.h:12 ../hacks/config/polytopes.xml.h:19
-#: ../hacks/config/pong.xml.h:8 ../hacks/config/popsquares.xml.h:19
-#: ../hacks/config/providence.xml.h:7 ../hacks/config/pulsar.xml.h:15
-#: ../hacks/config/pyro.xml.h:13 ../hacks/config/qix.xml.h:20
-#: ../hacks/config/queens.xml.h:5 ../hacks/config/rd-bomb.xml.h:18
-#: ../hacks/config/rdbomb.xml.h:18 ../hacks/config/ripples.xml.h:16
-#: ../hacks/config/rocks.xml.h:13 ../hacks/config/rorschach.xml.h:8
-#: ../hacks/config/rotor.xml.h:11 ../hacks/config/rotzoomer.xml.h:11
-#: ../hacks/config/rubik.xml.h:11 ../hacks/config/rubikblocks.xml.h:14
-#: ../hacks/config/sballs.xml.h:13 ../hacks/config/shadebobs.xml.h:14
-#: ../hacks/config/sierpinski.xml.h:9 ../hacks/config/sierpinski3d.xml.h:8
-#: ../hacks/config/skytentacles.xml.h:13 ../hacks/config/slidescreen.xml.h:14
-#: ../hacks/config/slip.xml.h:9 ../hacks/config/sonar.xml.h:20
-#: ../hacks/config/speedmine.xml.h:11 ../hacks/config/sphere.xml.h:6
-#: ../hacks/config/spheremonics.xml.h:18 ../hacks/config/spiral.xml.h:9
-#: ../hacks/config/spotlight.xml.h:9 ../hacks/config/sproingies.xml.h:7
-#: ../hacks/config/squiral.xml.h:15 ../hacks/config/stairs.xml.h:5
-#: ../hacks/config/starfish.xml.h:13 ../hacks/config/starwars.xml.h:13
-#: ../hacks/config/stonerview.xml.h:5 ../hacks/config/strange.xml.h:9
-#: ../hacks/config/substrate.xml.h:17 ../hacks/config/superquadrics.xml.h:10
-#: ../hacks/config/surfaces.xml.h:22 ../hacks/config/swirl.xml.h:10
-#: ../hacks/config/t3d.xml.h:12 ../hacks/config/tangram.xml.h:10
-#: ../hacks/config/thornbird.xml.h:13 ../hacks/config/timetunnel.xml.h:7
-#: ../hacks/config/topblock.xml.h:19 ../hacks/config/triangle.xml.h:7
-#: ../hacks/config/truchet.xml.h:5 ../hacks/config/twang.xml.h:13
-#: ../hacks/config/vermiculate.xml.h:5 ../hacks/config/vidwhacker.xml.h:5
-#: ../hacks/config/vines.xml.h:6 ../hacks/config/voronoi.xml.h:12
-#: ../hacks/config/wander.xml.h:12 ../hacks/config/webcollage.xml.h:9
-#: ../hacks/config/whirlwindwarp.xml.h:7 ../hacks/config/whirlygig.xml.h:6
-#: ../hacks/config/worm.xml.h:8 ../hacks/config/wormhole.xml.h:8
-#: ../hacks/config/xanalogtv.xml.h:1 ../hacks/config/xflame.xml.h:7
-#: ../hacks/config/xjack.xml.h:3 ../hacks/config/xlyap.xml.h:8
-#: ../hacks/config/xmatrix.xml.h:17 ../hacks/config/xrayswarm.xml.h:5
-#: ../hacks/config/xspirograph.xml.h:8 ../hacks/config/zoom.xml.h:12
+#: ../hacks/config/laser.xml.h:12 ../hacks/config/lavalite.xml.h:16
+#: ../hacks/config/lcdscrub.xml.h:7 ../hacks/config/lightning.xml.h:8
+#: ../hacks/config/lisa.xml.h:16 ../hacks/config/lissie.xml.h:15
+#: ../hacks/config/lmorph.xml.h:17 ../hacks/config/lockward.xml.h:9
+#: ../hacks/config/loop.xml.h:12 ../hacks/config/m6502.xml.h:6
+#: ../hacks/config/maze.xml.h:16 ../hacks/config/memscroller.xml.h:9
+#: ../hacks/config/menger.xml.h:20 ../hacks/config/metaballs.xml.h:16
+#: ../hacks/config/mirrorblob.xml.h:25 ../hacks/config/mismunch.xml.h:13
+#: ../hacks/config/moebius.xml.h:7 ../hacks/config/moebiusgears.xml.h:14
+#: ../hacks/config/moire.xml.h:12 ../hacks/config/moire2.xml.h:9
+#: ../hacks/config/molecule.xml.h:15 ../hacks/config/morph3d.xml.h:11
+#: ../hacks/config/mountain.xml.h:11 ../hacks/config/munch.xml.h:16
+#: ../hacks/config/nerverot.xml.h:21 ../hacks/config/noof.xml.h:5
+#: ../hacks/config/noseguy.xml.h:2 ../hacks/config/pacman.xml.h:6
+#: ../hacks/config/pedal.xml.h:9 ../hacks/config/penetrate.xml.h:8
+#: ../hacks/config/penrose.xml.h:12 ../hacks/config/petri.xml.h:5
+#: ../hacks/config/phosphor.xml.h:9 ../hacks/config/photopile.xml.h:22
+#: ../hacks/config/piecewise.xml.h:15 ../hacks/config/pinion.xml.h:16
+#: ../hacks/config/pipes.xml.h:19 ../hacks/config/polyhedra.xml.h:168
+#: ../hacks/config/polyominoes.xml.h:12 ../hacks/config/polytopes.xml.h:29
+#: ../hacks/config/pong.xml.h:9 ../hacks/config/popsquares.xml.h:21
+#: ../hacks/config/providence.xml.h:7 ../hacks/config/pulsar.xml.h:14
+#: ../hacks/config/pyro.xml.h:14 ../hacks/config/qix.xml.h:24
+#: ../hacks/config/queens.xml.h:6 ../hacks/config/rd-bomb.xml.h:23
+#: ../hacks/config/rdbomb.xml.h:23 ../hacks/config/ripples.xml.h:18
+#: ../hacks/config/rocks.xml.h:17 ../hacks/config/rorschach.xml.h:11
+#: ../hacks/config/rotor.xml.h:13 ../hacks/config/rotzoomer.xml.h:13
+#: ../hacks/config/rubik.xml.h:11 ../hacks/config/rubikblocks.xml.h:20
+#: ../hacks/config/sballs.xml.h:16 ../hacks/config/shadebobs.xml.h:16
+#: ../hacks/config/sierpinski.xml.h:13 ../hacks/config/sierpinski3d.xml.h:10
+#: ../hacks/config/skytentacles.xml.h:25 ../hacks/config/slidescreen.xml.h:18
+#: ../hacks/config/slip.xml.h:13 ../hacks/config/sonar.xml.h:30
+#: ../hacks/config/speedmine.xml.h:17 ../hacks/config/sphere.xml.h:8
+#: ../hacks/config/spheremonics.xml.h:22 ../hacks/config/spiral.xml.h:11
+#: ../hacks/config/spotlight.xml.h:11 ../hacks/config/sproingies.xml.h:9
+#: ../hacks/config/squiral.xml.h:17 ../hacks/config/stairs.xml.h:5
+#: ../hacks/config/starfish.xml.h:17 ../hacks/config/starwars.xml.h:15
+#: ../hacks/config/stonerview.xml.h:7 ../hacks/config/strange.xml.h:11
+#: ../hacks/config/substrate.xml.h:18 ../hacks/config/superquadrics.xml.h:13
+#: ../hacks/config/surfaces.xml.h:27 ../hacks/config/swirl.xml.h:11
+#: ../hacks/config/t3d.xml.h:16 ../hacks/config/tangram.xml.h:16
+#: ../hacks/config/thornbird.xml.h:16 ../hacks/config/timetunnel.xml.h:8
+#: ../hacks/config/topblock.xml.h:24 ../hacks/config/triangle.xml.h:8
+#: ../hacks/config/tronbit.xml.h:11 ../hacks/config/truchet.xml.h:6
+#: ../hacks/config/twang.xml.h:18 ../hacks/config/vermiculate.xml.h:5
+#: ../hacks/config/vidwhacker.xml.h:6 ../hacks/config/vines.xml.h:8
+#: ../hacks/config/voronoi.xml.h:11 ../hacks/config/wander.xml.h:13
+#: ../hacks/config/webcollage.xml.h:11 ../hacks/config/whirlwindwarp.xml.h:8
+#: ../hacks/config/whirlygig.xml.h:31 ../hacks/config/worm.xml.h:11
+#: ../hacks/config/wormhole.xml.h:11 ../hacks/config/xanalogtv.xml.h:2
+#: ../hacks/config/xflame.xml.h:7 ../hacks/config/xjack.xml.h:6
+#: ../hacks/config/xlyap.xml.h:9 ../hacks/config/xmatrix.xml.h:21
+#: ../hacks/config/xrayswarm.xml.h:5 ../hacks/config/xspirograph.xml.h:9
+#: ../hacks/config/zoom.xml.h:15
 msgid "Show frame rate"
 msgstr ""
 
-#. 
-#. -withdraw 1200
-#. -turnspeed 50
-#. 
-#: ../hacks/config/abstractile.xml.h:13 ../hacks/config/anemone.xml.h:22
-#: ../hacks/config/apollonian.xml.h:16 ../hacks/config/atlantis.xml.h:18
-#: ../hacks/config/attraction.xml.h:26 ../hacks/config/blitspin.xml.h:10
-#: ../hacks/config/boing.xml.h:10 ../hacks/config/bouncingcow.xml.h:12
-#: ../hacks/config/boxed.xml.h:22 ../hacks/config/carousel.xml.h:14
-#: ../hacks/config/ccurve.xml.h:12 ../hacks/config/circuit.xml.h:14
-#: ../hacks/config/cube21.xml.h:20 ../hacks/config/cubenetic.xml.h:20
-#: ../hacks/config/cubestorm.xml.h:11 ../hacks/config/cubicgrid.xml.h:12
-#: ../hacks/config/dangerball.xml.h:11 ../hacks/config/eruption.xml.h:23
-#: ../hacks/config/fliptext.xml.h:13 ../hacks/config/flyingtoasters.xml.h:14
-#: ../hacks/config/fontglide.xml.h:15 ../hacks/config/fuzzyflakes.xml.h:22
-#: ../hacks/config/gears.xml.h:10 ../hacks/config/gflux.xml.h:16
-#: ../hacks/config/glcells.xml.h:31 ../hacks/config/glknots.xml.h:18
-#: ../hacks/config/glmatrix.xml.h:17 ../hacks/config/glsnake.xml.h:16
-#: ../hacks/config/goop.xml.h:13 ../hacks/config/hyperball.xml.h:7
-#: ../hacks/config/hypercube.xml.h:10 ../hacks/config/hypnowheel.xml.h:13
-#: ../hacks/config/interference.xml.h:18 ../hacks/config/jigglypuff.xml.h:18
-#: ../hacks/config/jigsaw.xml.h:12 ../hacks/config/juggle.xml.h:19
-#: ../hacks/config/juggler3d.xml.h:20 ../hacks/config/moebiusgears.xml.h:11
-#: ../hacks/config/penetrate.xml.h:8 ../hacks/config/petri.xml.h:25
-#: ../hacks/config/phosphor.xml.h:10 ../hacks/config/photopile.xml.h:21
-#: ../hacks/config/piecewise.xml.h:14 ../hacks/config/pinion.xml.h:15
-#: ../hacks/config/polyhedra.xml.h:112 ../hacks/config/pong.xml.h:9
-#: ../hacks/config/pyro.xml.h:14 ../hacks/config/rd-bomb.xml.h:19
-#: ../hacks/config/rdbomb.xml.h:19 ../hacks/config/rocks.xml.h:14
-#: ../hacks/config/rubik.xml.h:13 ../hacks/config/rubikblocks.xml.h:15
-#: ../hacks/config/skytentacles.xml.h:15 ../hacks/config/slidescreen.xml.h:17
-#: ../hacks/config/sonar.xml.h:25 ../hacks/config/speedmine.xml.h:14
-#: ../hacks/config/superquadrics.xml.h:11 ../hacks/config/tangram.xml.h:11
-#: ../hacks/config/topblock.xml.h:20 ../hacks/config/twang.xml.h:14
-#: ../hacks/config/voronoi.xml.h:13 ../hacks/config/wormhole.xml.h:9
-#: ../hacks/config/xjack.xml.h:4
-msgid "Slow"
-msgstr "Pomaly"
-
-#. 
-#. -withdraw 1200
-#. -turnspeed 50
-#. 
-#: ../hacks/config/abstractile.xml.h:14 ../hacks/config/anemone.xml.h:27
-#: ../hacks/config/apollonian.xml.h:17 ../hacks/config/attraction.xml.h:28
-#: ../hacks/config/boing.xml.h:12 ../hacks/config/boxed.xml.h:23
-#: ../hacks/config/cubestorm.xml.h:12 ../hacks/config/cubicgrid.xml.h:13
-#: ../hacks/config/fliptext.xml.h:14 ../hacks/config/fontglide.xml.h:16
-#: ../hacks/config/fuzzyflakes.xml.h:24 ../hacks/config/gears.xml.h:11
-#: ../hacks/config/glknots.xml.h:20 ../hacks/config/goop.xml.h:14
-#: ../hacks/config/hypnowheel.xml.h:14 ../hacks/config/jigsaw.xml.h:14
-#: ../hacks/config/juggle.xml.h:20 ../hacks/config/juggler3d.xml.h:21
-#: ../hacks/config/moebiusgears.xml.h:12 ../hacks/config/polyhedra.xml.h:146
-#: ../hacks/config/skytentacles.xml.h:17 ../hacks/config/sonar.xml.h:27
-#: ../hacks/config/xjack.xml.h:5
-msgid "Speed"
-msgstr "Rýchlosť"
-
-#: ../hacks/config/abstractile.xml.h:15
-msgid "Thin tiles"
-msgstr ""
-
 #: ../hacks/config/abstractile.xml.h:16
-msgid "Tiled tiles"
+msgid ""
+"Generates mosaic patterns of interlocking tiles. Written by Steve Sundstrom; "
+"2004."
 msgstr ""
 
 #: ../hacks/config/anemone.xml.h:1
 msgid "Anemone"
 msgstr ""
 
-#: ../hacks/config/anemone.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:1
-#: ../hacks/config/hypnowheel.xml.h:4
-msgid "Arms"
-msgstr ""
-
-#: ../hacks/config/anemone.xml.h:8 ../hacks/config/anemotaxis.xml.h:5
-#: ../hacks/config/blaster.xml.h:3 ../hacks/config/bouboule.xml.h:3
-#: ../hacks/config/boxed.xml.h:8 ../hacks/config/coral.xml.h:6
-#: ../hacks/config/crackberg.xml.h:5 ../hacks/config/cubenetic.xml.h:6
-#: ../hacks/config/cubestorm.xml.h:5 ../hacks/config/dangerball.xml.h:4
-#: ../hacks/config/eruption.xml.h:6 ../hacks/config/euler2d.xml.h:8
-#: ../hacks/config/fiberlamp.xml.h:2 ../hacks/config/flame.xml.h:4
-#: ../hacks/config/flow.xml.h:3 ../hacks/config/fluidballs.xml.h:4
-#: ../hacks/config/fuzzyflakes.xml.h:7 ../hacks/config/glcells.xml.h:6
-#: ../hacks/config/glschool.xml.h:5 ../hacks/config/goop.xml.h:5
-#: ../hacks/config/grav.xml.h:1 ../hacks/config/halftone.xml.h:5
-#: ../hacks/config/halo.xml.h:3 ../hacks/config/interaggregate.xml.h:2
-#: ../hacks/config/interference.xml.h:6 ../hacks/config/jigsaw.xml.h:3
-#: ../hacks/config/julia.xml.h:3 ../hacks/config/kaleidescope.xml.h:4
-#: ../hacks/config/lisa.xml.h:4 ../hacks/config/lmorph.xml.h:3
-#: ../hacks/config/nerverot.xml.h:9 ../hacks/config/pedal.xml.h:4
-#: ../hacks/config/petri.xml.h:7 ../hacks/config/piecewise.xml.h:4
-#: ../hacks/config/qix.xml.h:7 ../hacks/config/rocks.xml.h:4
-#: ../hacks/config/sierpinski.xml.h:1 ../hacks/config/slip.xml.h:2
-#: ../hacks/config/spiral.xml.h:3 ../hacks/config/substrate.xml.h:8
-#: ../hacks/config/swirl.xml.h:2 ../hacks/config/thornbird.xml.h:2
-#: ../hacks/config/topblock.xml.h:8 ../hacks/config/voronoi.xml.h:6
-#: ../hacks/config/whirlwindwarp.xml.h:1 ../hacks/config/wormhole.xml.h:2
+#: ../hacks/config/anemone.xml.h:17 ../hacks/config/anemotaxis.xml.h:8
+#: ../hacks/config/blaster.xml.h:7 ../hacks/config/bouboule.xml.h:5
+#: ../hacks/config/boxed.xml.h:8 ../hacks/config/coral.xml.h:11
+#: ../hacks/config/crackberg.xml.h:8 ../hacks/config/cubenetic.xml.h:5
+#: ../hacks/config/cubestorm.xml.h:8 ../hacks/config/dangerball.xml.h:8
+#: ../hacks/config/eruption.xml.h:5 ../hacks/config/euler2d.xml.h:5
+#: ../hacks/config/fiberlamp.xml.h:5 ../hacks/config/flame.xml.h:8
+#: ../hacks/config/flow.xml.h:5 ../hacks/config/fluidballs.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:8 ../hacks/config/glcells.xml.h:8
+#: ../hacks/config/glschool.xml.h:5 ../hacks/config/goop.xml.h:8
+#: ../hacks/config/grav.xml.h:5 ../hacks/config/halftone.xml.h:5
+#: ../hacks/config/halo.xml.h:5 ../hacks/config/interaggregate.xml.h:5
+#: ../hacks/config/interference.xml.h:11 ../hacks/config/jigsaw.xml.h:8
+#: ../hacks/config/julia.xml.h:5 ../hacks/config/kaleidescope.xml.h:5
+#: ../hacks/config/lisa.xml.h:5 ../hacks/config/lmorph.xml.h:5
+#: ../hacks/config/nerverot.xml.h:8 ../hacks/config/pedal.xml.h:5
+#: ../hacks/config/petri.xml.h:12 ../hacks/config/piecewise.xml.h:5
+#: ../hacks/config/qix.xml.h:5 ../hacks/config/rocks.xml.h:5
+#: ../hacks/config/sierpinski.xml.h:5 ../hacks/config/slip.xml.h:5
+#: ../hacks/config/spiral.xml.h:5 ../hacks/config/substrate.xml.h:8
+#: ../hacks/config/swirl.xml.h:5 ../hacks/config/thornbird.xml.h:5
+#: ../hacks/config/topblock.xml.h:13 ../hacks/config/voronoi.xml.h:5
+#: ../hacks/config/whirlwindwarp.xml.h:2 ../hacks/config/wormhole.xml.h:8
 msgid "Few"
 msgstr "Málo"
 
+#: ../hacks/config/anemone.xml.h:18 ../hacks/config/fuzzyflakes.xml.h:20
+#: ../hacks/config/hypnowheel.xml.h:13
+msgid "Arms"
+msgstr ""
+
+#. 
+#. On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+#. 
+#. detail 3:  invisible
+#. detail 4:  barely visible
+#. detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+#. detail 8:  ~700+ fps
+#. detail 9:  ~400 fps
+#. detail 10: ~300 fps
+#. detail 11: ~100 fps
+#. detail 12:  ~50 fps
+#. detail 13:  ~17 fps
+#. detail 14:   ~8 fps
+#. detail 15:   ~2 fps
+#. 
+#. With the default -delay, CPU load only starts causing the frame rate
+#. to drop below 30 fps detail 12 or higher.
+#. 
 #. #### -color [random]
-#: ../hacks/config/anemone.xml.h:9 ../hacks/config/anemotaxis.xml.h:9
-#: ../hacks/config/ant.xml.h:10 ../hacks/config/apollonian.xml.h:11
-#: ../hacks/config/attraction.xml.h:16 ../hacks/config/blaster.xml.h:8
-#: ../hacks/config/bouboule.xml.h:7 ../hacks/config/braid.xml.h:9
-#: ../hacks/config/coral.xml.h:11 ../hacks/config/critical.xml.h:5
-#: ../hacks/config/crystal.xml.h:9 ../hacks/config/cubenetic.xml.h:11
-#: ../hacks/config/cubestorm.xml.h:9 ../hacks/config/cynosure.xml.h:7
-#: ../hacks/config/deco.xml.h:6 ../hacks/config/deluxe.xml.h:9
-#: ../hacks/config/demon.xml.h:11 ../hacks/config/discrete.xml.h:6
-#: ../hacks/config/drift.xml.h:8 ../hacks/config/epicycle.xml.h:10
-#: ../hacks/config/eruption.xml.h:15 ../hacks/config/euler2d.xml.h:18
-#: ../hacks/config/fadeplot.xml.h:8 ../hacks/config/fiberlamp.xml.h:9
-#: ../hacks/config/flag.xml.h:6 ../hacks/config/flame.xml.h:11
-#: ../hacks/config/flow.xml.h:11 ../hacks/config/fluidballs.xml.h:14
-#: ../hacks/config/forest.xml.h:5 ../hacks/config/fuzzyflakes.xml.h:16
-#: ../hacks/config/galaxy.xml.h:8 ../hacks/config/glcells.xml.h:19
-#: ../hacks/config/goop.xml.h:10 ../hacks/config/grav.xml.h:6
-#: ../hacks/config/halftone.xml.h:12 ../hacks/config/halo.xml.h:8
-#: ../hacks/config/hopalong.xml.h:15 ../hacks/config/ifs.xml.h:8
-#: ../hacks/config/imsmap.xml.h:12 ../hacks/config/interaggregate.xml.h:7
-#: ../hacks/config/interference.xml.h:14 ../hacks/config/jigsaw.xml.h:8
-#: ../hacks/config/julia.xml.h:11 ../hacks/config/kaleidescope.xml.h:9
-#: ../hacks/config/laser.xml.h:8 ../hacks/config/lightning.xml.h:5
-#: ../hacks/config/lisa.xml.h:10 ../hacks/config/lissie.xml.h:9
-#: ../hacks/config/lmorph.xml.h:11 ../hacks/config/loop.xml.h:8
-#: ../hacks/config/metaballs.xml.h:8 ../hacks/config/mismunch.xml.h:6
-#: ../hacks/config/moire.xml.h:5 ../hacks/config/moire2.xml.h:5
-#: ../hacks/config/mountain.xml.h:6 ../hacks/config/munch.xml.h:7
-#: ../hacks/config/nerverot.xml.h:16 ../hacks/config/pedal.xml.h:6
-#: ../hacks/config/penrose.xml.h:7 ../hacks/config/petri.xml.h:12
-#: ../hacks/config/piecewise.xml.h:9 ../hacks/config/polyominoes.xml.h:7
-#: ../hacks/config/qix.xml.h:14 ../hacks/config/rd-bomb.xml.h:12
-#: ../hacks/config/rdbomb.xml.h:12 ../hacks/config/rocks.xml.h:8
-#: ../hacks/config/rotor.xml.h:7 ../hacks/config/shadebobs.xml.h:8
-#: ../hacks/config/sierpinski.xml.h:6 ../hacks/config/slip.xml.h:7
-#: ../hacks/config/sphere.xml.h:4 ../hacks/config/spiral.xml.h:7
-#: ../hacks/config/squiral.xml.h:9 ../hacks/config/starfish.xml.h:9
-#: ../hacks/config/strange.xml.h:6 ../hacks/config/swirl.xml.h:7
-#: ../hacks/config/thornbird.xml.h:6 ../hacks/config/topblock.xml.h:14
-#: ../hacks/config/triangle.xml.h:5 ../hacks/config/vines.xml.h:4
-#: ../hacks/config/voronoi.xml.h:9 ../hacks/config/whirlwindwarp.xml.h:4
-#: ../hacks/config/worm.xml.h:5
+#: ../hacks/config/anemone.xml.h:19 ../hacks/config/anemotaxis.xml.h:10
+#: ../hacks/config/ant.xml.h:21 ../hacks/config/apollonian.xml.h:12
+#: ../hacks/config/attraction.xml.h:19 ../hacks/config/blaster.xml.h:9
+#: ../hacks/config/bouboule.xml.h:7 ../hacks/config/braid.xml.h:10
+#: ../hacks/config/coral.xml.h:13 ../hacks/config/critical.xml.h:7
+#: ../hacks/config/crystal.xml.h:7 ../hacks/config/cubenetic.xml.h:7
+#: ../hacks/config/cubestorm.xml.h:10 ../hacks/config/cynosure.xml.h:7
+#: ../hacks/config/deco.xml.h:7 ../hacks/config/deluxe.xml.h:13
+#: ../hacks/config/demon.xml.h:13 ../hacks/config/discrete.xml.h:10
+#: ../hacks/config/drift.xml.h:10 ../hacks/config/epicycle.xml.h:7
+#: ../hacks/config/eruption.xml.h:7 ../hacks/config/euler2d.xml.h:7
+#: ../hacks/config/fadeplot.xml.h:13 ../hacks/config/fiberlamp.xml.h:7
+#: ../hacks/config/flag.xml.h:11 ../hacks/config/flame.xml.h:10
+#: ../hacks/config/flow.xml.h:7 ../hacks/config/fluidballs.xml.h:7
+#: ../hacks/config/forest.xml.h:7 ../hacks/config/fuzzyflakes.xml.h:10
+#: ../hacks/config/galaxy.xml.h:11 ../hacks/config/glcells.xml.h:10
+#: ../hacks/config/goop.xml.h:10 ../hacks/config/grav.xml.h:7
+#: ../hacks/config/halftone.xml.h:7 ../hacks/config/halo.xml.h:7
+#: ../hacks/config/hopalong.xml.h:11 ../hacks/config/ifs.xml.h:64
+#: ../hacks/config/imsmap.xml.h:13 ../hacks/config/interaggregate.xml.h:7
+#: ../hacks/config/interference.xml.h:13 ../hacks/config/jigsaw.xml.h:10
+#: ../hacks/config/julia.xml.h:13 ../hacks/config/kaleidescope.xml.h:7
+#: ../hacks/config/laser.xml.h:11 ../hacks/config/lightning.xml.h:7
+#: ../hacks/config/lisa.xml.h:7 ../hacks/config/lissie.xml.h:10
+#: ../hacks/config/lmorph.xml.h:7 ../hacks/config/loop.xml.h:10
+#: ../hacks/config/metaballs.xml.h:10 ../hacks/config/mismunch.xml.h:10
+#: ../hacks/config/moire.xml.h:7 ../hacks/config/moire2.xml.h:7
+#: ../hacks/config/mountain.xml.h:10 ../hacks/config/munch.xml.h:10
+#: ../hacks/config/nerverot.xml.h:10 ../hacks/config/pedal.xml.h:7
+#: ../hacks/config/penrose.xml.h:7 ../hacks/config/petri.xml.h:14
+#: ../hacks/config/piecewise.xml.h:7 ../hacks/config/polyominoes.xml.h:11
+#: ../hacks/config/qix.xml.h:7 ../hacks/config/rd-bomb.xml.h:16
+#: ../hacks/config/rdbomb.xml.h:16 ../hacks/config/rocks.xml.h:7
+#: ../hacks/config/rotor.xml.h:10 ../hacks/config/shadebobs.xml.h:10
+#: ../hacks/config/sierpinski.xml.h:7 ../hacks/config/slip.xml.h:7
+#: ../hacks/config/sphere.xml.h:7 ../hacks/config/spiral.xml.h:7
+#: ../hacks/config/squiral.xml.h:15 ../hacks/config/starfish.xml.h:16
+#: ../hacks/config/strange.xml.h:10 ../hacks/config/swirl.xml.h:7
+#: ../hacks/config/thornbird.xml.h:7 ../hacks/config/topblock.xml.h:15
+#: ../hacks/config/triangle.xml.h:7 ../hacks/config/vines.xml.h:7
+#: ../hacks/config/voronoi.xml.h:7 ../hacks/config/whirlwindwarp.xml.h:4
+#: ../hacks/config/worm.xml.h:7
 msgid "Many"
 msgstr "Veľa"
 
-#: ../hacks/config/anemone.xml.h:10 ../hacks/config/pyro.xml.h:9
-msgid "Often"
-msgstr "Často"
-
-#: ../hacks/config/anemone.xml.h:11
-msgid "Rarely"
-msgstr ""
-
-#: ../hacks/config/anemone.xml.h:28 ../hacks/config/skytentacles.xml.h:18
+#: ../hacks/config/anemone.xml.h:20 ../hacks/config/skytentacles.xml.h:3
 msgid "Tentacles"
 msgstr ""
 
-#: ../hacks/config/anemone.xml.h:29 ../hacks/config/cubestorm.xml.h:15
-#: ../hacks/config/deluxe.xml.h:13 ../hacks/config/fadeplot.xml.h:12
-#: ../hacks/config/fuzzyflakes.xml.h:25 ../hacks/config/glknots.xml.h:21
-#: ../hacks/config/lmorph.xml.h:16 ../hacks/config/skytentacles.xml.h:21
-#: ../hacks/config/starfish.xml.h:15 ../hacks/config/thornbird.xml.h:14
-msgid "Thick"
-msgstr "Hrubý"
+#: ../hacks/config/anemone.xml.h:21 ../hacks/config/cubestorm.xml.h:11
+#: ../hacks/config/deluxe.xml.h:5 ../hacks/config/fadeplot.xml.h:5
+#: ../hacks/config/fuzzyflakes.xml.h:21 ../hacks/config/glknots.xml.h:19
+#: ../hacks/config/hilbert.xml.h:15 ../hacks/config/lmorph.xml.h:11
+#: ../hacks/config/skytentacles.xml.h:8 ../hacks/config/starfish.xml.h:11
+#: ../hacks/config/thornbird.xml.h:8
+msgid "Thin"
+msgstr "Tenký"
 
-#: ../hacks/config/anemone.xml.h:30 ../hacks/config/fadeplot.xml.h:13
-#: ../hacks/config/fuzzyflakes.xml.h:26 ../hacks/config/glknots.xml.h:22
-#: ../hacks/config/moire2.xml.h:9 ../hacks/config/skytentacles.xml.h:22
-#: ../hacks/config/thornbird.xml.h:15
+#: ../hacks/config/anemone.xml.h:22 ../hacks/config/fadeplot.xml.h:6
+#: ../hacks/config/fuzzyflakes.xml.h:22 ../hacks/config/glknots.xml.h:20
+#: ../hacks/config/moire2.xml.h:8 ../hacks/config/skytentacles.xml.h:9
+#: ../hacks/config/thornbird.xml.h:9
 msgid "Thickness"
 msgstr "Hrúbka"
 
-#: ../hacks/config/anemone.xml.h:31 ../hacks/config/cubestorm.xml.h:16
-#: ../hacks/config/deluxe.xml.h:14 ../hacks/config/fadeplot.xml.h:14
-#: ../hacks/config/fuzzyflakes.xml.h:27 ../hacks/config/glknots.xml.h:23
-#: ../hacks/config/lmorph.xml.h:17 ../hacks/config/skytentacles.xml.h:23
-#: ../hacks/config/starfish.xml.h:16 ../hacks/config/thornbird.xml.h:16
-msgid "Thin"
-msgstr "Tenký"
-
-#: ../hacks/config/anemone.xml.h:32
-msgid "Turn speed"
-msgstr ""
+#: ../hacks/config/anemone.xml.h:23 ../hacks/config/cubestorm.xml.h:13
+#: ../hacks/config/deluxe.xml.h:7 ../hacks/config/fadeplot.xml.h:7
+#: ../hacks/config/fuzzyflakes.xml.h:23 ../hacks/config/glknots.xml.h:21
+#: ../hacks/config/hilbert.xml.h:17 ../hacks/config/lmorph.xml.h:13
+#: ../hacks/config/skytentacles.xml.h:10 ../hacks/config/starfish.xml.h:13
+#: ../hacks/config/thornbird.xml.h:10
+msgid "Thick"
+msgstr "Hrubý"
 
-#: ../hacks/config/anemone.xml.h:33
-msgid "Wiggling tentacles. Written by Gabriel Finch; 2002."
-msgstr ""
+#: ../hacks/config/anemone.xml.h:24 ../hacks/config/pyro.xml.h:10
+msgid "Often"
+msgstr "Často"
 
-#: ../hacks/config/anemone.xml.h:34
+#: ../hacks/config/anemone.xml.h:25
 msgid "Withdraw freqency"
 msgstr ""
 
-#: ../hacks/config/anemotaxis.xml.h:1
-msgid "Anemotaxis"
+#: ../hacks/config/anemone.xml.h:26
+msgid "Rarely"
 msgstr ""
 
-#: ../hacks/config/anemotaxis.xml.h:2
-msgid ""
-"Anemotaxis demonstrates a search algorithm designed for locating a source of "
-"odor in turbulent atmosphere. The searcher is able to sense the odor and "
-"determine local instantaneous wind direction. The goal is to find the source "
-"in the shortest mean time. http://en.wikipedia.org/wiki/Anemotaxis Written "
-"by Eugene Balkovsky; 2004."
+#: ../hacks/config/anemone.xml.h:27
+msgid "Turn speed"
 msgstr ""
 
-#: ../hacks/config/anemotaxis.xml.h:3
-msgid "Distance"
+#: ../hacks/config/anemone.xml.h:34
+msgid "Wiggling tentacles. Written by Gabriel Finch; 2002."
 msgstr ""
 
-#: ../hacks/config/anemotaxis.xml.h:4 ../hacks/config/cubicgrid.xml.h:6
-#: ../hacks/config/hypercube.xml.h:1
-msgid "Far"
-msgstr "Ďaleko"
+#: ../hacks/config/anemotaxis.xml.h:1
+msgid "Anemotaxis"
+msgstr ""
 
 #. #### -colorcount [64]
-#: ../hacks/config/anemotaxis.xml.h:6 ../hacks/config/ant.xml.h:6
-#: ../hacks/config/antinspect.xml.h:4 ../hacks/config/antmaze.xml.h:3
-#: ../hacks/config/antspotlight.xml.h:3 ../hacks/config/atlantis.xml.h:8
-#: ../hacks/config/atunnel.xml.h:3 ../hacks/config/barcode.xml.h:6
-#: ../hacks/config/blaster.xml.h:4 ../hacks/config/blinkbox.xml.h:5
-#: ../hacks/config/blocktube.xml.h:5 ../hacks/config/bouboule.xml.h:4
-#: ../hacks/config/bouncingcow.xml.h:5 ../hacks/config/boxed.xml.h:9
-#: ../hacks/config/boxfit.xml.h:8 ../hacks/config/braid.xml.h:4
-#: ../hacks/config/bubble3d.xml.h:4 ../hacks/config/bubbles.xml.h:7
-#: ../hacks/config/bumps.xml.h:7 ../hacks/config/cage.xml.h:2
-#: ../hacks/config/carousel.xml.h:6 ../hacks/config/celtic.xml.h:3
-#: ../hacks/config/circuit.xml.h:6 ../hacks/config/cloudlife.xml.h:3
-#: ../hacks/config/compass.xml.h:2 ../hacks/config/coral.xml.h:7
-#: ../hacks/config/crackberg.xml.h:8 ../hacks/config/critical.xml.h:2
-#: ../hacks/config/crystal.xml.h:5 ../hacks/config/cube21.xml.h:7
-#: ../hacks/config/cubenetic.xml.h:7 ../hacks/config/cubestorm.xml.h:6
-#: ../hacks/config/cubicgrid.xml.h:8 ../hacks/config/cwaves.xml.h:4
-#: ../hacks/config/cynosure.xml.h:3 ../hacks/config/dangerball.xml.h:5
-#: ../hacks/config/decayscreen.xml.h:5 ../hacks/config/deluxe.xml.h:5
-#: ../hacks/config/demon.xml.h:7 ../hacks/config/discrete.xml.h:2
-#: ../hacks/config/distort.xml.h:7 ../hacks/config/drift.xml.h:4
-#: ../hacks/config/endgame.xml.h:3 ../hacks/config/engine.xml.h:8
-#: ../hacks/config/epicycle.xml.h:4 ../hacks/config/eruption.xml.h:7
-#: ../hacks/config/euler2d.xml.h:9 ../hacks/config/extrusion.xml.h:3
-#: ../hacks/config/fadeplot.xml.h:4 ../hacks/config/fiberlamp.xml.h:5
-#: ../hacks/config/fireworkx.xml.h:5 ../hacks/config/flag.xml.h:2
-#: ../hacks/config/flame.xml.h:6 ../hacks/config/flipflop.xml.h:6
-#: ../hacks/config/flipscreen3d.xml.h:2 ../hacks/config/fliptext.xml.h:8
-#: ../hacks/config/flow.xml.h:5 ../hacks/config/fluidballs.xml.h:6
-#: ../hacks/config/flyingtoasters.xml.h:7 ../hacks/config/fontglide.xml.h:5
-#: ../hacks/config/forest.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:8
-#: ../hacks/config/galaxy.xml.h:3 ../hacks/config/gears.xml.h:4
-#: ../hacks/config/gflux.xml.h:9 ../hacks/config/glblur.xml.h:4
-#: ../hacks/config/glcells.xml.h:7 ../hacks/config/gleidescope.xml.h:4
-#: ../hacks/config/glforestfire.xml.h:5 ../hacks/config/glhanoi.xml.h:8
-#: ../hacks/config/glknots.xml.h:3 ../hacks/config/glmatrix.xml.h:6
-#: ../hacks/config/glplanet.xml.h:2 ../hacks/config/glschool.xml.h:8
-#: ../hacks/config/glslideshow.xml.h:11 ../hacks/config/glsnake.xml.h:8
-#: ../hacks/config/gltext.xml.h:6 ../hacks/config/goop.xml.h:6
+#: ../hacks/config/anemotaxis.xml.h:2 ../hacks/config/ant.xml.h:2
+#: ../hacks/config/antinspect.xml.h:2 ../hacks/config/antmaze.xml.h:2
+#: ../hacks/config/antspotlight.xml.h:2 ../hacks/config/atlantis.xml.h:2
+#: ../hacks/config/attraction.xml.h:11 ../hacks/config/atunnel.xml.h:2
+#: ../hacks/config/barcode.xml.h:2 ../hacks/config/blaster.xml.h:2
+#: ../hacks/config/blinkbox.xml.h:2 ../hacks/config/blocktube.xml.h:2
+#: ../hacks/config/bouboule.xml.h:2 ../hacks/config/bouncingcow.xml.h:2
+#: ../hacks/config/boxed.xml.h:2 ../hacks/config/boxfit.xml.h:2
+#: ../hacks/config/braid.xml.h:2 ../hacks/config/bubble3d.xml.h:2
+#: ../hacks/config/bubbles.xml.h:2 ../hacks/config/bumps.xml.h:3
+#: ../hacks/config/cage.xml.h:2 ../hacks/config/carousel.xml.h:2
+#: ../hacks/config/ccurve.xml.h:8 ../hacks/config/celtic.xml.h:2
+#: ../hacks/config/circuit.xml.h:2 ../hacks/config/cloudlife.xml.h:2
+#: ../hacks/config/companioncube.xml.h:2 ../hacks/config/compass.xml.h:2
+#: ../hacks/config/coral.xml.h:2 ../hacks/config/crackberg.xml.h:2
+#: ../hacks/config/critical.xml.h:2 ../hacks/config/crystal.xml.h:2
+#: ../hacks/config/cube21.xml.h:2 ../hacks/config/cubenetic.xml.h:2
+#: ../hacks/config/cubestorm.xml.h:2 ../hacks/config/cubicgrid.xml.h:2
+#: ../hacks/config/cwaves.xml.h:2 ../hacks/config/cynosure.xml.h:2
+#: ../hacks/config/dangerball.xml.h:2 ../hacks/config/decayscreen.xml.h:2
+#: ../hacks/config/deluxe.xml.h:2 ../hacks/config/demon.xml.h:2
+#: ../hacks/config/discrete.xml.h:2 ../hacks/config/distort.xml.h:2
+#: ../hacks/config/dnalogo.xml.h:2 ../hacks/config/drift.xml.h:2
+#: ../hacks/config/endgame.xml.h:2 ../hacks/config/engine.xml.h:2
+#: ../hacks/config/epicycle.xml.h:2 ../hacks/config/eruption.xml.h:2
+#: ../hacks/config/euler2d.xml.h:2 ../hacks/config/extrusion.xml.h:2
+#: ../hacks/config/fadeplot.xml.h:2 ../hacks/config/fiberlamp.xml.h:2
+#: ../hacks/config/fireworkx.xml.h:2 ../hacks/config/flag.xml.h:3
+#: ../hacks/config/flame.xml.h:2 ../hacks/config/flipflop.xml.h:2
+#: ../hacks/config/flipscreen3d.xml.h:2 ../hacks/config/fliptext.xml.h:2
+#: ../hacks/config/flow.xml.h:2 ../hacks/config/fluidballs.xml.h:2
+#: ../hacks/config/flyingtoasters.xml.h:2 ../hacks/config/fontglide.xml.h:2
+#: ../hacks/config/forest.xml.h:2 ../hacks/config/fuzzyflakes.xml.h:2
+#: ../hacks/config/galaxy.xml.h:2 ../hacks/config/gears.xml.h:2
+#: ../hacks/config/gflux.xml.h:2 ../hacks/config/glblur.xml.h:2
+#: ../hacks/config/glcells.xml.h:2 ../hacks/config/gleidescope.xml.h:2
+#: ../hacks/config/glforestfire.xml.h:2 ../hacks/config/glhanoi.xml.h:2
+#: ../hacks/config/glknots.xml.h:2 ../hacks/config/glmatrix.xml.h:2
+#: ../hacks/config/glplanet.xml.h:2 ../hacks/config/glschool.xml.h:2
+#: ../hacks/config/glslideshow.xml.h:2 ../hacks/config/glsnake.xml.h:2
+#: ../hacks/config/gltext.xml.h:2 ../hacks/config/goop.xml.h:2
 #: ../hacks/config/grav.xml.h:2 ../hacks/config/greynetic.xml.h:2
-#: ../hacks/config/halftone.xml.h:6 ../hacks/config/halo.xml.h:4
-#: ../hacks/config/helix.xml.h:3 ../hacks/config/hopalong.xml.h:9
-#: ../hacks/config/hyperball.xml.h:2 ../hacks/config/hypercube.xml.h:3
-#: ../hacks/config/hypertorus.xml.h:4 ../hacks/config/hypnowheel.xml.h:7
-#: ../hacks/config/ifs.xml.h:4 ../hacks/config/imsmap.xml.h:6
-#: ../hacks/config/interaggregate.xml.h:3 ../hacks/config/interference.xml.h:7
-#: ../hacks/config/intermomentary.xml.h:4 ../hacks/config/jigglypuff.xml.h:9
-#: ../hacks/config/jigsaw.xml.h:4 ../hacks/config/juggle.xml.h:6
-#: ../hacks/config/juggler3d.xml.h:7 ../hacks/config/julia.xml.h:4
-#: ../hacks/config/kaleidescope.xml.h:5 ../hacks/config/klein.xml.h:9
-#: ../hacks/config/kumppa.xml.h:2 ../hacks/config/lament.xml.h:3
-#: ../hacks/config/laser.xml.h:3 ../hacks/config/lavalite.xml.h:9
-#: ../hacks/config/lcdscrub.xml.h:4 ../hacks/config/lightning.xml.h:1
-#: ../hacks/config/lisa.xml.h:5 ../hacks/config/lissie.xml.h:4
-#: ../hacks/config/lmorph.xml.h:4 ../hacks/config/lockward.xml.h:3
-#: ../hacks/config/loop.xml.h:1 ../hacks/config/maze.xml.h:4
-#: ../hacks/config/memscroller.xml.h:5 ../hacks/config/menger.xml.h:3
-#: ../hacks/config/metaballs.xml.h:4 ../hacks/config/mirrorblob.xml.h:13
+#: ../hacks/config/halftone.xml.h:2 ../hacks/config/halo.xml.h:2
+#: ../hacks/config/helix.xml.h:2 ../hacks/config/hopalong.xml.h:2
+#: ../hacks/config/hyperball.xml.h:2 ../hacks/config/hypercube.xml.h:2
+#: ../hacks/config/hypertorus.xml.h:2 ../hacks/config/hypnowheel.xml.h:14
+#: ../hacks/config/ifs.xml.h:2 ../hacks/config/imsmap.xml.h:2
+#: ../hacks/config/interaggregate.xml.h:2 ../hacks/config/interference.xml.h:2
+#: ../hacks/config/intermomentary.xml.h:2 ../hacks/config/jigglypuff.xml.h:3
+#: ../hacks/config/jigsaw.xml.h:2 ../hacks/config/juggle.xml.h:2
+#: ../hacks/config/juggler3d.xml.h:2 ../hacks/config/julia.xml.h:2
+#: ../hacks/config/kaleidescope.xml.h:2 ../hacks/config/klein.xml.h:2
+#: ../hacks/config/kumppa.xml.h:2 ../hacks/config/lament.xml.h:2
+#: ../hacks/config/laser.xml.h:2 ../hacks/config/lavalite.xml.h:2
+#: ../hacks/config/lcdscrub.xml.h:2 ../hacks/config/lightning.xml.h:2
+#: ../hacks/config/lisa.xml.h:2 ../hacks/config/lissie.xml.h:2
+#: ../hacks/config/lmorph.xml.h:2 ../hacks/config/lockward.xml.h:2
+#: ../hacks/config/loop.xml.h:2 ../hacks/config/maze.xml.h:2
+#: ../hacks/config/memscroller.xml.h:2 ../hacks/config/menger.xml.h:2
+#: ../hacks/config/metaballs.xml.h:2 ../hacks/config/mirrorblob.xml.h:2
 #: ../hacks/config/mismunch.xml.h:2 ../hacks/config/moebius.xml.h:2
-#: ../hacks/config/moebiusgears.xml.h:3 ../hacks/config/moire2.xml.h:1
-#: ../hacks/config/molecule.xml.h:12 ../hacks/config/morph3d.xml.h:3
-#: ../hacks/config/mountain.xml.h:1 ../hacks/config/munch.xml.h:3
-#: ../hacks/config/nerverot.xml.h:10 ../hacks/config/noof.xml.h:2
-#: ../hacks/config/pacman.xml.h:1 ../hacks/config/penrose.xml.h:3
-#: ../hacks/config/petri.xml.h:8 ../hacks/config/phosphor.xml.h:5
-#: ../hacks/config/photopile.xml.h:7 ../hacks/config/piecewise.xml.h:5
-#: ../hacks/config/pinion.xml.h:5 ../hacks/config/pipes.xml.h:8
-#: ../hacks/config/polyhedra.xml.h:17 ../hacks/config/polyominoes.xml.h:2
-#: ../hacks/config/polytopes.xml.h:10 ../hacks/config/popsquares.xml.h:8
-#: ../hacks/config/providence.xml.h:3 ../hacks/config/pulsar.xml.h:10
-#: ../hacks/config/pyro.xml.h:5 ../hacks/config/qix.xml.h:8
-#: ../hacks/config/queens.xml.h:1 ../hacks/config/rd-bomb.xml.h:10
-#: ../hacks/config/rdbomb.xml.h:10 ../hacks/config/ripples.xml.h:8
-#: ../hacks/config/rocks.xml.h:5 ../hacks/config/rotor.xml.h:2
-#: ../hacks/config/rotzoomer.xml.h:6 ../hacks/config/rubik.xml.h:5
-#: ../hacks/config/rubikblocks.xml.h:4 ../hacks/config/sballs.xml.h:4
-#: ../hacks/config/shadebobs.xml.h:3 ../hacks/config/sierpinski.xml.h:2
-#: ../hacks/config/sierpinski3d.xml.h:2 ../hacks/config/skytentacles.xml.h:7
-#: ../hacks/config/slidescreen.xml.h:6 ../hacks/config/slip.xml.h:3
-#: ../hacks/config/sonar.xml.h:5 ../hacks/config/speedmine.xml.h:4
-#: ../hacks/config/sphere.xml.h:1 ../hacks/config/spheremonics.xml.h:5
-#: ../hacks/config/spiral.xml.h:4 ../hacks/config/spotlight.xml.h:5
-#: ../hacks/config/sproingies.xml.h:2 ../hacks/config/squiral.xml.h:4
+#: ../hacks/config/moebiusgears.xml.h:2 ../hacks/config/moire2.xml.h:2
+#: ../hacks/config/molecule.xml.h:2 ../hacks/config/morph3d.xml.h:2
+#: ../hacks/config/mountain.xml.h:2 ../hacks/config/munch.xml.h:2
+#: ../hacks/config/nerverot.xml.h:2 ../hacks/config/noof.xml.h:2
+#: ../hacks/config/pacman.xml.h:2 ../hacks/config/penrose.xml.h:2
+#: ../hacks/config/petri.xml.h:2 ../hacks/config/phosphor.xml.h:2
+#: ../hacks/config/photopile.xml.h:15 ../hacks/config/piecewise.xml.h:2
+#: ../hacks/config/pinion.xml.h:2 ../hacks/config/pipes.xml.h:2
+#: ../hacks/config/polyhedra.xml.h:2 ../hacks/config/polyominoes.xml.h:3
+#: ../hacks/config/polytopes.xml.h:23 ../hacks/config/popsquares.xml.h:2
+#: ../hacks/config/providence.xml.h:2 ../hacks/config/pulsar.xml.h:2
+#: ../hacks/config/pyro.xml.h:11 ../hacks/config/qix.xml.h:2
+#: ../hacks/config/queens.xml.h:2 ../hacks/config/ripples.xml.h:2
+#: ../hacks/config/rocks.xml.h:2 ../hacks/config/rotor.xml.h:2
+#: ../hacks/config/rotzoomer.xml.h:2 ../hacks/config/rubik.xml.h:2
+#: ../hacks/config/rubikblocks.xml.h:2 ../hacks/config/sballs.xml.h:2
+#: ../hacks/config/shadebobs.xml.h:2 ../hacks/config/sierpinski.xml.h:2
+#: ../hacks/config/sierpinski3d.xml.h:2 ../hacks/config/skytentacles.xml.h:11
+#: ../hacks/config/slidescreen.xml.h:2 ../hacks/config/slip.xml.h:2
+#: ../hacks/config/sonar.xml.h:2 ../hacks/config/speedmine.xml.h:2
+#: ../hacks/config/sphere.xml.h:2 ../hacks/config/spheremonics.xml.h:2
+#: ../hacks/config/spiral.xml.h:2 ../hacks/config/spotlight.xml.h:2
+#: ../hacks/config/sproingies.xml.h:2 ../hacks/config/squiral.xml.h:2
 #: ../hacks/config/stairs.xml.h:2 ../hacks/config/starfish.xml.h:5
-#: ../hacks/config/stonerview.xml.h:2 ../hacks/config/strange.xml.h:3
-#: ../hacks/config/substrate.xml.h:9 ../hacks/config/superquadrics.xml.h:4
-#: ../hacks/config/surfaces.xml.h:7 ../hacks/config/swirl.xml.h:4
-#: ../hacks/config/t3d.xml.h:6 ../hacks/config/tangram.xml.h:4
-#: ../hacks/config/thornbird.xml.h:3 ../hacks/config/topblock.xml.h:10
-#: ../hacks/config/triangle.xml.h:1 ../hacks/config/truchet.xml.h:1
-#: ../hacks/config/twang.xml.h:6 ../hacks/config/vines.xml.h:1
-#: ../hacks/config/voronoi.xml.h:7 ../hacks/config/wander.xml.h:6
-#: ../hacks/config/worm.xml.h:2 ../hacks/config/wormhole.xml.h:4
-#: ../hacks/config/xflame.xml.h:4 ../hacks/config/xlyap.xml.h:2
-#: ../hacks/config/xmatrix.xml.h:5 ../hacks/config/xrayswarm.xml.h:2
-#: ../hacks/config/xspirograph.xml.h:3 ../hacks/config/zoom.xml.h:8
+#: ../hacks/config/stonerview.xml.h:2 ../hacks/config/strange.xml.h:2
+#: ../hacks/config/substrate.xml.h:2 ../hacks/config/superquadrics.xml.h:2
+#: ../hacks/config/surfaces.xml.h:2 ../hacks/config/swirl.xml.h:2
+#: ../hacks/config/t3d.xml.h:2 ../hacks/config/tangram.xml.h:2
+#: ../hacks/config/thornbird.xml.h:2 ../hacks/config/topblock.xml.h:2
+#: ../hacks/config/triangle.xml.h:2 ../hacks/config/tronbit.xml.h:2
+#: ../hacks/config/truchet.xml.h:2 ../hacks/config/twang.xml.h:2
+#: ../hacks/config/vines.xml.h:2 ../hacks/config/wander.xml.h:2
+#: ../hacks/config/whirlygig.xml.h:4 ../hacks/config/worm.xml.h:2
+#: ../hacks/config/wormhole.xml.h:2 ../hacks/config/xflame.xml.h:2
+#: ../hacks/config/xlyap.xml.h:2 ../hacks/config/xmatrix.xml.h:15
+#: ../hacks/config/xrayswarm.xml.h:2 ../hacks/config/xspirograph.xml.h:2
+#: ../hacks/config/zoom.xml.h:2
+msgid "Low"
+msgstr "Nízky"
+
+#. #### -colorcount [64]
+#: ../hacks/config/anemotaxis.xml.h:3 ../hacks/config/ant.xml.h:3
+#: ../hacks/config/antinspect.xml.h:3 ../hacks/config/antmaze.xml.h:3
+#: ../hacks/config/antspotlight.xml.h:3 ../hacks/config/atlantis.xml.h:3
+#: ../hacks/config/atunnel.xml.h:3 ../hacks/config/barcode.xml.h:3
+#: ../hacks/config/blaster.xml.h:3 ../hacks/config/blinkbox.xml.h:3
+#: ../hacks/config/blocktube.xml.h:3 ../hacks/config/bouboule.xml.h:3
+#: ../hacks/config/bouncingcow.xml.h:3 ../hacks/config/boxed.xml.h:3
+#: ../hacks/config/boxfit.xml.h:3 ../hacks/config/braid.xml.h:3
+#: ../hacks/config/bubble3d.xml.h:3 ../hacks/config/bubbles.xml.h:3
+#: ../hacks/config/bumps.xml.h:5 ../hacks/config/cage.xml.h:3
+#: ../hacks/config/carousel.xml.h:3 ../hacks/config/celtic.xml.h:3
+#: ../hacks/config/circuit.xml.h:3 ../hacks/config/cloudlife.xml.h:3
+#: ../hacks/config/companioncube.xml.h:3 ../hacks/config/compass.xml.h:3
+#: ../hacks/config/coral.xml.h:3 ../hacks/config/crackberg.xml.h:3
+#: ../hacks/config/critical.xml.h:3 ../hacks/config/crystal.xml.h:3
+#: ../hacks/config/cube21.xml.h:3 ../hacks/config/cubenetic.xml.h:3
+#: ../hacks/config/cubestorm.xml.h:3 ../hacks/config/cubicgrid.xml.h:3
+#: ../hacks/config/cwaves.xml.h:3 ../hacks/config/cynosure.xml.h:3
+#: ../hacks/config/dangerball.xml.h:3 ../hacks/config/decayscreen.xml.h:3
+#: ../hacks/config/deluxe.xml.h:3 ../hacks/config/demon.xml.h:3
+#: ../hacks/config/discrete.xml.h:3 ../hacks/config/distort.xml.h:3
+#: ../hacks/config/drift.xml.h:3 ../hacks/config/endgame.xml.h:3
+#: ../hacks/config/engine.xml.h:3 ../hacks/config/epicycle.xml.h:3
+#: ../hacks/config/eruption.xml.h:3 ../hacks/config/euler2d.xml.h:3
+#: ../hacks/config/extrusion.xml.h:3 ../hacks/config/fadeplot.xml.h:3
+#: ../hacks/config/fiberlamp.xml.h:3 ../hacks/config/fireworkx.xml.h:3
+#: ../hacks/config/flag.xml.h:4 ../hacks/config/flame.xml.h:3
+#: ../hacks/config/flipflop.xml.h:3 ../hacks/config/flipscreen3d.xml.h:3
+#: ../hacks/config/fliptext.xml.h:3 ../hacks/config/flow.xml.h:3
+#: ../hacks/config/fluidballs.xml.h:3 ../hacks/config/flyingtoasters.xml.h:3
+#: ../hacks/config/fontglide.xml.h:3 ../hacks/config/forest.xml.h:3
+#: ../hacks/config/fuzzyflakes.xml.h:3 ../hacks/config/galaxy.xml.h:3
+#: ../hacks/config/gears.xml.h:3 ../hacks/config/gflux.xml.h:3
+#: ../hacks/config/glblur.xml.h:3 ../hacks/config/glcells.xml.h:3
+#: ../hacks/config/gleidescope.xml.h:3 ../hacks/config/glforestfire.xml.h:3
+#: ../hacks/config/glhanoi.xml.h:3 ../hacks/config/glknots.xml.h:3
+#: ../hacks/config/glmatrix.xml.h:3 ../hacks/config/glplanet.xml.h:3
+#: ../hacks/config/glschool.xml.h:3 ../hacks/config/glslideshow.xml.h:3
+#: ../hacks/config/glsnake.xml.h:3 ../hacks/config/gltext.xml.h:3
+#: ../hacks/config/goop.xml.h:3 ../hacks/config/grav.xml.h:3
+#: ../hacks/config/greynetic.xml.h:3 ../hacks/config/halftone.xml.h:3
+#: ../hacks/config/halo.xml.h:3 ../hacks/config/helix.xml.h:3
+#: ../hacks/config/hilbert.xml.h:9 ../hacks/config/hopalong.xml.h:3
+#: ../hacks/config/hyperball.xml.h:3 ../hacks/config/hypercube.xml.h:3
+#: ../hacks/config/hypertorus.xml.h:3 ../hacks/config/hypnowheel.xml.h:3
+#: ../hacks/config/ifs.xml.h:3 ../hacks/config/imsmap.xml.h:3
+#: ../hacks/config/interaggregate.xml.h:3 ../hacks/config/interference.xml.h:3
+#: ../hacks/config/intermomentary.xml.h:3 ../hacks/config/jigglypuff.xml.h:4
+#: ../hacks/config/jigsaw.xml.h:3 ../hacks/config/juggle.xml.h:3
+#: ../hacks/config/juggler3d.xml.h:3 ../hacks/config/julia.xml.h:3
+#: ../hacks/config/kaleidescope.xml.h:3 ../hacks/config/klein.xml.h:3
+#: ../hacks/config/kumppa.xml.h:3 ../hacks/config/lament.xml.h:3
+#: ../hacks/config/laser.xml.h:3 ../hacks/config/lavalite.xml.h:3
+#: ../hacks/config/lcdscrub.xml.h:3 ../hacks/config/lightning.xml.h:3
+#: ../hacks/config/lisa.xml.h:3 ../hacks/config/lissie.xml.h:3
+#: ../hacks/config/lmorph.xml.h:3 ../hacks/config/lockward.xml.h:3
+#: ../hacks/config/loop.xml.h:3 ../hacks/config/maze.xml.h:3
+#: ../hacks/config/memscroller.xml.h:3 ../hacks/config/menger.xml.h:3
+#: ../hacks/config/metaballs.xml.h:3 ../hacks/config/mirrorblob.xml.h:3
+#: ../hacks/config/mismunch.xml.h:3 ../hacks/config/moebius.xml.h:3
+#: ../hacks/config/moebiusgears.xml.h:3 ../hacks/config/moire2.xml.h:3
+#: ../hacks/config/molecule.xml.h:3 ../hacks/config/morph3d.xml.h:3
+#: ../hacks/config/mountain.xml.h:3 ../hacks/config/munch.xml.h:3
+#: ../hacks/config/nerverot.xml.h:3 ../hacks/config/noof.xml.h:3
+#: ../hacks/config/pacman.xml.h:3 ../hacks/config/penrose.xml.h:3
+#: ../hacks/config/petri.xml.h:3 ../hacks/config/phosphor.xml.h:3
+#: ../hacks/config/photopile.xml.h:16 ../hacks/config/piecewise.xml.h:3
+#: ../hacks/config/pinion.xml.h:3 ../hacks/config/pipes.xml.h:3
+#: ../hacks/config/polyhedra.xml.h:3 ../hacks/config/polyominoes.xml.h:4
+#: ../hacks/config/polytopes.xml.h:24 ../hacks/config/popsquares.xml.h:3
+#: ../hacks/config/providence.xml.h:3 ../hacks/config/pulsar.xml.h:3
+#: ../hacks/config/pyro.xml.h:3 ../hacks/config/qix.xml.h:3
+#: ../hacks/config/queens.xml.h:3 ../hacks/config/rd-bomb.xml.h:3
+#: ../hacks/config/rdbomb.xml.h:3 ../hacks/config/ripples.xml.h:3
+#: ../hacks/config/rocks.xml.h:3 ../hacks/config/rotor.xml.h:3
+#: ../hacks/config/rotzoomer.xml.h:3 ../hacks/config/rubik.xml.h:3
+#: ../hacks/config/rubikblocks.xml.h:3 ../hacks/config/sballs.xml.h:3
+#: ../hacks/config/shadebobs.xml.h:3 ../hacks/config/sierpinski.xml.h:3
+#: ../hacks/config/sierpinski3d.xml.h:3 ../hacks/config/skytentacles.xml.h:16
+#: ../hacks/config/slidescreen.xml.h:3 ../hacks/config/slip.xml.h:3
+#: ../hacks/config/sonar.xml.h:3 ../hacks/config/speedmine.xml.h:3
+#: ../hacks/config/sphere.xml.h:3 ../hacks/config/spheremonics.xml.h:3
+#: ../hacks/config/spiral.xml.h:3 ../hacks/config/spotlight.xml.h:3
+#: ../hacks/config/sproingies.xml.h:3 ../hacks/config/squiral.xml.h:3
+#: ../hacks/config/stairs.xml.h:3 ../hacks/config/starfish.xml.h:6
+#: ../hacks/config/stonerview.xml.h:3 ../hacks/config/strange.xml.h:3
+#: ../hacks/config/substrate.xml.h:3 ../hacks/config/superquadrics.xml.h:3
+#: ../hacks/config/surfaces.xml.h:3 ../hacks/config/swirl.xml.h:3
+#: ../hacks/config/t3d.xml.h:3 ../hacks/config/tangram.xml.h:3
+#: ../hacks/config/thornbird.xml.h:3 ../hacks/config/topblock.xml.h:3
+#: ../hacks/config/triangle.xml.h:3 ../hacks/config/tronbit.xml.h:3
+#: ../hacks/config/truchet.xml.h:3 ../hacks/config/twang.xml.h:3
+#: ../hacks/config/vines.xml.h:3 ../hacks/config/voronoi.xml.h:3
+#: ../hacks/config/wander.xml.h:3 ../hacks/config/worm.xml.h:3
+#: ../hacks/config/wormhole.xml.h:3 ../hacks/config/xflame.xml.h:3
+#: ../hacks/config/xlyap.xml.h:3 ../hacks/config/xmatrix.xml.h:16
+#: ../hacks/config/xrayswarm.xml.h:3 ../hacks/config/xspirograph.xml.h:3
+#: ../hacks/config/zoom.xml.h:3
 msgid "Frame rate"
 msgstr ""
 
 #. #### -colorcount [64]
-#: ../hacks/config/anemotaxis.xml.h:7 ../hacks/config/ant.xml.h:7
-#: ../hacks/config/antinspect.xml.h:5 ../hacks/config/antmaze.xml.h:4
-#: ../hacks/config/antspotlight.xml.h:4 ../hacks/config/atlantis.xml.h:10
-#: ../hacks/config/attraction.xml.h:9 ../hacks/config/atunnel.xml.h:4
-#: ../hacks/config/barcode.xml.h:7 ../hacks/config/blaster.xml.h:5
-#: ../hacks/config/blinkbox.xml.h:6 ../hacks/config/blocktube.xml.h:6
-#: ../hacks/config/bouboule.xml.h:5 ../hacks/config/bouncingcow.xml.h:7
-#: ../hacks/config/boxed.xml.h:11 ../hacks/config/boxfit.xml.h:11
-#: ../hacks/config/braid.xml.h:5 ../hacks/config/bubble3d.xml.h:5
-#: ../hacks/config/bubbles.xml.h:8 ../hacks/config/bumps.xml.h:9
-#: ../hacks/config/cage.xml.h:3 ../hacks/config/carousel.xml.h:7
-#: ../hacks/config/ccurve.xml.h:9 ../hacks/config/celtic.xml.h:4
-#: ../hacks/config/circuit.xml.h:7 ../hacks/config/cloudlife.xml.h:6
-#: ../hacks/config/compass.xml.h:3 ../hacks/config/coral.xml.h:8
-#: ../hacks/config/crackberg.xml.h:9 ../hacks/config/critical.xml.h:3
-#: ../hacks/config/crystal.xml.h:6 ../hacks/config/cube21.xml.h:8
-#: ../hacks/config/cubenetic.xml.h:8 ../hacks/config/cubestorm.xml.h:7
-#: ../hacks/config/cubicgrid.xml.h:9 ../hacks/config/cwaves.xml.h:5
-#: ../hacks/config/cynosure.xml.h:4 ../hacks/config/dangerball.xml.h:6
-#: ../hacks/config/decayscreen.xml.h:7 ../hacks/config/deluxe.xml.h:6
-#: ../hacks/config/demon.xml.h:8 ../hacks/config/discrete.xml.h:3
-#: ../hacks/config/distort.xml.h:9 ../hacks/config/dnalogo.xml.h:7
-#: ../hacks/config/drift.xml.h:5 ../hacks/config/endgame.xml.h:4
-#: ../hacks/config/engine.xml.h:9 ../hacks/config/epicycle.xml.h:6
-#: ../hacks/config/eruption.xml.h:10 ../hacks/config/euler2d.xml.h:10
-#: ../hacks/config/extrusion.xml.h:7 ../hacks/config/fadeplot.xml.h:5
-#: ../hacks/config/fiberlamp.xml.h:6 ../hacks/config/fireworkx.xml.h:7
-#: ../hacks/config/flag.xml.h:3 ../hacks/config/flame.xml.h:7
-#: ../hacks/config/flipflop.xml.h:7 ../hacks/config/flipscreen3d.xml.h:4
-#: ../hacks/config/fliptext.xml.h:9 ../hacks/config/flow.xml.h:6
-#: ../hacks/config/fluidballs.xml.h:9 ../hacks/config/flyingtoasters.xml.h:8
-#: ../hacks/config/fontglide.xml.h:6 ../hacks/config/forest.xml.h:3
-#: ../hacks/config/fuzzyflakes.xml.h:11 ../hacks/config/galaxy.xml.h:5
-#: ../hacks/config/gears.xml.h:7 ../hacks/config/gflux.xml.h:11
-#: ../hacks/config/glblur.xml.h:6 ../hacks/config/glcells.xml.h:10
-#: ../hacks/config/gleidescope.xml.h:6 ../hacks/config/glforestfire.xml.h:7
-#: ../hacks/config/glhanoi.xml.h:10 ../hacks/config/glknots.xml.h:6
-#: ../hacks/config/glmatrix.xml.h:12 ../hacks/config/glplanet.xml.h:4
-#: ../hacks/config/glschool.xml.h:11 ../hacks/config/glslideshow.xml.h:13
-#: ../hacks/config/glsnake.xml.h:10 ../hacks/config/gltext.xml.h:8
-#: ../hacks/config/goop.xml.h:8 ../hacks/config/grav.xml.h:4
-#: ../hacks/config/greynetic.xml.h:5 ../hacks/config/halftone.xml.h:9
-#: ../hacks/config/halo.xml.h:6 ../hacks/config/helix.xml.h:5
-#: ../hacks/config/hopalong.xml.h:10 ../hacks/config/hyperball.xml.h:3
-#: ../hacks/config/hypercube.xml.h:4 ../hacks/config/hypertorus.xml.h:5
-#: ../hacks/config/hypnowheel.xml.h:8 ../hacks/config/ifs.xml.h:5
-#: ../hacks/config/imsmap.xml.h:7 ../hacks/config/interaggregate.xml.h:4
-#: ../hacks/config/interference.xml.h:8 ../hacks/config/intermomentary.xml.h:5
-#: ../hacks/config/jigglypuff.xml.h:10 ../hacks/config/jigsaw.xml.h:5
-#: ../hacks/config/juggle.xml.h:7 ../hacks/config/juggler3d.xml.h:8
-#: ../hacks/config/julia.xml.h:5 ../hacks/config/kaleidescope.xml.h:6
-#: ../hacks/config/klein.xml.h:10 ../hacks/config/kumppa.xml.h:3
-#: ../hacks/config/lament.xml.h:4 ../hacks/config/laser.xml.h:4
-#: ../hacks/config/lavalite.xml.h:11 ../hacks/config/lcdscrub.xml.h:5
-#: ../hacks/config/lightning.xml.h:2 ../hacks/config/lisa.xml.h:6
-#: ../hacks/config/lissie.xml.h:5 ../hacks/config/lmorph.xml.h:5
-#: ../hacks/config/lockward.xml.h:4 ../hacks/config/loop.xml.h:4
-#: ../hacks/config/maze.xml.h:7 ../hacks/config/memscroller.xml.h:6
-#: ../hacks/config/menger.xml.h:4 ../hacks/config/metaballs.xml.h:5
-#: ../hacks/config/mirrorblob.xml.h:14 ../hacks/config/mismunch.xml.h:3
-#: ../hacks/config/moebius.xml.h:3 ../hacks/config/moebiusgears.xml.h:4
-#: ../hacks/config/moire2.xml.h:3 ../hacks/config/molecule.xml.h:13
-#: ../hacks/config/morph3d.xml.h:4 ../hacks/config/mountain.xml.h:3
-#: ../hacks/config/munch.xml.h:4 ../hacks/config/nerverot.xml.h:12
-#: ../hacks/config/noof.xml.h:3 ../hacks/config/pacman.xml.h:2
-#: ../hacks/config/penrose.xml.h:4 ../hacks/config/petri.xml.h:9
-#: ../hacks/config/phosphor.xml.h:6 ../hacks/config/photopile.xml.h:8
-#: ../hacks/config/piecewise.xml.h:6 ../hacks/config/pinion.xml.h:7
-#: ../hacks/config/pipes.xml.h:10 ../hacks/config/polyhedra.xml.h:71
-#: ../hacks/config/polyominoes.xml.h:3 ../hacks/config/polytopes.xml.h:11
-#: ../hacks/config/popsquares.xml.h:9 ../hacks/config/providence.xml.h:4
-#: ../hacks/config/pulsar.xml.h:11 ../hacks/config/pyro.xml.h:6
-#: ../hacks/config/qix.xml.h:10 ../hacks/config/queens.xml.h:2
-#: ../hacks/config/ripples.xml.h:10 ../hacks/config/rocks.xml.h:6
-#: ../hacks/config/rotor.xml.h:3 ../hacks/config/rotzoomer.xml.h:7
-#: ../hacks/config/rubik.xml.h:7 ../hacks/config/rubikblocks.xml.h:5
-#: ../hacks/config/sballs.xml.h:5 ../hacks/config/shadebobs.xml.h:4
-#: ../hacks/config/sierpinski.xml.h:3 ../hacks/config/sierpinski3d.xml.h:3
-#: ../hacks/config/skytentacles.xml.h:8 ../hacks/config/slidescreen.xml.h:8
-#: ../hacks/config/slip.xml.h:4 ../hacks/config/sonar.xml.h:6
-#: ../hacks/config/speedmine.xml.h:6 ../hacks/config/sphere.xml.h:2
-#: ../hacks/config/spheremonics.xml.h:6 ../hacks/config/spiral.xml.h:5
-#: ../hacks/config/spotlight.xml.h:6 ../hacks/config/sproingies.xml.h:3
-#: ../hacks/config/squiral.xml.h:6 ../hacks/config/stairs.xml.h:3
-#: ../hacks/config/starfish.xml.h:6 ../hacks/config/starwars.xml.h:11
-#: ../hacks/config/stonerview.xml.h:3 ../hacks/config/strange.xml.h:4
-#: ../hacks/config/substrate.xml.h:10 ../hacks/config/superquadrics.xml.h:5
-#: ../hacks/config/surfaces.xml.h:9 ../hacks/config/swirl.xml.h:5
-#: ../hacks/config/t3d.xml.h:7 ../hacks/config/tangram.xml.h:5
-#: ../hacks/config/thornbird.xml.h:4 ../hacks/config/topblock.xml.h:11
-#: ../hacks/config/triangle.xml.h:3 ../hacks/config/truchet.xml.h:2
-#: ../hacks/config/twang.xml.h:8 ../hacks/config/vines.xml.h:2
-#: ../hacks/config/wander.xml.h:7 ../hacks/config/whirlygig.xml.h:2
-#: ../hacks/config/worm.xml.h:3 ../hacks/config/wormhole.xml.h:5
-#: ../hacks/config/xflame.xml.h:5 ../hacks/config/xlyap.xml.h:3
-#: ../hacks/config/xmatrix.xml.h:9 ../hacks/config/xrayswarm.xml.h:3
-#: ../hacks/config/xspirograph.xml.h:4 ../hacks/config/zoom.xml.h:9
+#: ../hacks/config/anemotaxis.xml.h:4 ../hacks/config/ant.xml.h:4
+#: ../hacks/config/antinspect.xml.h:4 ../hacks/config/antmaze.xml.h:4
+#: ../hacks/config/antspotlight.xml.h:4 ../hacks/config/atlantis.xml.h:4
+#: ../hacks/config/attraction.xml.h:13 ../hacks/config/atunnel.xml.h:4
+#: ../hacks/config/barcode.xml.h:4 ../hacks/config/blaster.xml.h:4
+#: ../hacks/config/blinkbox.xml.h:4 ../hacks/config/blocktube.xml.h:4
+#: ../hacks/config/bouboule.xml.h:4 ../hacks/config/bouncingcow.xml.h:4
+#: ../hacks/config/boxed.xml.h:4 ../hacks/config/boxfit.xml.h:4
+#: ../hacks/config/braid.xml.h:4 ../hacks/config/bubble3d.xml.h:4
+#: ../hacks/config/bubbles.xml.h:4 ../hacks/config/bumps.xml.h:7
+#: ../hacks/config/cage.xml.h:4 ../hacks/config/carousel.xml.h:4
+#: ../hacks/config/ccurve.xml.h:10 ../hacks/config/celtic.xml.h:4
+#: ../hacks/config/circuit.xml.h:4 ../hacks/config/cloudlife.xml.h:4
+#: ../hacks/config/companioncube.xml.h:4 ../hacks/config/compass.xml.h:4
+#: ../hacks/config/coral.xml.h:4 ../hacks/config/crackberg.xml.h:4
+#: ../hacks/config/critical.xml.h:4 ../hacks/config/crystal.xml.h:4
+#: ../hacks/config/cube21.xml.h:4 ../hacks/config/cubenetic.xml.h:4
+#: ../hacks/config/cubestorm.xml.h:4 ../hacks/config/cubicgrid.xml.h:4
+#: ../hacks/config/cwaves.xml.h:4 ../hacks/config/cynosure.xml.h:4
+#: ../hacks/config/dangerball.xml.h:4 ../hacks/config/decayscreen.xml.h:4
+#: ../hacks/config/deluxe.xml.h:4 ../hacks/config/demon.xml.h:4
+#: ../hacks/config/discrete.xml.h:4 ../hacks/config/distort.xml.h:4
+#: ../hacks/config/dnalogo.xml.h:4 ../hacks/config/drift.xml.h:4
+#: ../hacks/config/endgame.xml.h:4 ../hacks/config/engine.xml.h:4
+#: ../hacks/config/epicycle.xml.h:4 ../hacks/config/eruption.xml.h:4
+#: ../hacks/config/euler2d.xml.h:4 ../hacks/config/extrusion.xml.h:4
+#: ../hacks/config/fadeplot.xml.h:4 ../hacks/config/fiberlamp.xml.h:4
+#: ../hacks/config/fireworkx.xml.h:4 ../hacks/config/flag.xml.h:5
+#: ../hacks/config/flame.xml.h:4 ../hacks/config/flipflop.xml.h:4
+#: ../hacks/config/flipscreen3d.xml.h:4 ../hacks/config/fliptext.xml.h:4
+#: ../hacks/config/flow.xml.h:4 ../hacks/config/fluidballs.xml.h:4
+#: ../hacks/config/flyingtoasters.xml.h:4 ../hacks/config/fontglide.xml.h:4
+#: ../hacks/config/forest.xml.h:4 ../hacks/config/fuzzyflakes.xml.h:4
+#: ../hacks/config/galaxy.xml.h:4 ../hacks/config/gears.xml.h:4
+#: ../hacks/config/gflux.xml.h:4 ../hacks/config/glblur.xml.h:4
+#: ../hacks/config/glcells.xml.h:4 ../hacks/config/gleidescope.xml.h:4
+#: ../hacks/config/glforestfire.xml.h:4 ../hacks/config/glhanoi.xml.h:4
+#: ../hacks/config/glknots.xml.h:4 ../hacks/config/glmatrix.xml.h:4
+#: ../hacks/config/glplanet.xml.h:4 ../hacks/config/glschool.xml.h:4
+#: ../hacks/config/glslideshow.xml.h:4 ../hacks/config/glsnake.xml.h:4
+#: ../hacks/config/gltext.xml.h:4 ../hacks/config/goop.xml.h:4
+#: ../hacks/config/grav.xml.h:4 ../hacks/config/greynetic.xml.h:4
+#: ../hacks/config/halftone.xml.h:4 ../hacks/config/halo.xml.h:4
+#: ../hacks/config/helix.xml.h:4 ../hacks/config/hopalong.xml.h:4
+#: ../hacks/config/hyperball.xml.h:4 ../hacks/config/hypercube.xml.h:4
+#: ../hacks/config/hypertorus.xml.h:4 ../hacks/config/hypnowheel.xml.h:16
+#: ../hacks/config/ifs.xml.h:4 ../hacks/config/imsmap.xml.h:4
+#: ../hacks/config/interaggregate.xml.h:4 ../hacks/config/interference.xml.h:4
+#: ../hacks/config/intermomentary.xml.h:4 ../hacks/config/jigglypuff.xml.h:5
+#: ../hacks/config/jigsaw.xml.h:4 ../hacks/config/juggle.xml.h:4
+#: ../hacks/config/juggler3d.xml.h:4 ../hacks/config/julia.xml.h:4
+#: ../hacks/config/kaleidescope.xml.h:4 ../hacks/config/klein.xml.h:4
+#: ../hacks/config/kumppa.xml.h:4 ../hacks/config/lament.xml.h:4
+#: ../hacks/config/laser.xml.h:4 ../hacks/config/lavalite.xml.h:4
+#: ../hacks/config/lcdscrub.xml.h:4 ../hacks/config/lightning.xml.h:4
+#: ../hacks/config/lisa.xml.h:4 ../hacks/config/lissie.xml.h:4
+#: ../hacks/config/lmorph.xml.h:4 ../hacks/config/lockward.xml.h:4
+#: ../hacks/config/loop.xml.h:4 ../hacks/config/maze.xml.h:4
+#: ../hacks/config/memscroller.xml.h:4 ../hacks/config/menger.xml.h:4
+#: ../hacks/config/metaballs.xml.h:4 ../hacks/config/mirrorblob.xml.h:4
+#: ../hacks/config/mismunch.xml.h:4 ../hacks/config/moebius.xml.h:4
+#: ../hacks/config/moebiusgears.xml.h:4 ../hacks/config/moire2.xml.h:4
+#: ../hacks/config/molecule.xml.h:4 ../hacks/config/morph3d.xml.h:4
+#: ../hacks/config/mountain.xml.h:4 ../hacks/config/munch.xml.h:4
+#: ../hacks/config/nerverot.xml.h:4 ../hacks/config/noof.xml.h:4
+#: ../hacks/config/pacman.xml.h:4 ../hacks/config/penrose.xml.h:4
+#: ../hacks/config/petri.xml.h:4 ../hacks/config/phosphor.xml.h:4
+#: ../hacks/config/photopile.xml.h:17 ../hacks/config/piecewise.xml.h:4
+#: ../hacks/config/pinion.xml.h:4 ../hacks/config/pipes.xml.h:4
+#: ../hacks/config/polyhedra.xml.h:4 ../hacks/config/polyominoes.xml.h:5
+#: ../hacks/config/polytopes.xml.h:25 ../hacks/config/popsquares.xml.h:4
+#: ../hacks/config/providence.xml.h:4 ../hacks/config/pulsar.xml.h:4
+#: ../hacks/config/pyro.xml.h:13 ../hacks/config/qix.xml.h:4
+#: ../hacks/config/queens.xml.h:4 ../hacks/config/ripples.xml.h:4
+#: ../hacks/config/rocks.xml.h:4 ../hacks/config/rotor.xml.h:4
+#: ../hacks/config/rotzoomer.xml.h:4 ../hacks/config/rubik.xml.h:4
+#: ../hacks/config/rubikblocks.xml.h:4 ../hacks/config/sballs.xml.h:4
+#: ../hacks/config/shadebobs.xml.h:4 ../hacks/config/sierpinski.xml.h:4
+#: ../hacks/config/sierpinski3d.xml.h:4 ../hacks/config/skytentacles.xml.h:13
+#: ../hacks/config/slidescreen.xml.h:4 ../hacks/config/slip.xml.h:4
+#: ../hacks/config/sonar.xml.h:4 ../hacks/config/speedmine.xml.h:4
+#: ../hacks/config/sphere.xml.h:4 ../hacks/config/spheremonics.xml.h:4
+#: ../hacks/config/spiral.xml.h:4 ../hacks/config/spotlight.xml.h:4
+#: ../hacks/config/sproingies.xml.h:4 ../hacks/config/squiral.xml.h:4
+#: ../hacks/config/stairs.xml.h:4 ../hacks/config/starfish.xml.h:7
+#: ../hacks/config/starwars.xml.h:3 ../hacks/config/stonerview.xml.h:4
+#: ../hacks/config/strange.xml.h:4 ../hacks/config/substrate.xml.h:4
+#: ../hacks/config/superquadrics.xml.h:4 ../hacks/config/surfaces.xml.h:4
+#: ../hacks/config/swirl.xml.h:4 ../hacks/config/t3d.xml.h:4
+#: ../hacks/config/tangram.xml.h:4 ../hacks/config/thornbird.xml.h:4
+#: ../hacks/config/topblock.xml.h:4 ../hacks/config/triangle.xml.h:4
+#: ../hacks/config/tronbit.xml.h:4 ../hacks/config/truchet.xml.h:4
+#: ../hacks/config/twang.xml.h:4 ../hacks/config/vines.xml.h:4
+#: ../hacks/config/wander.xml.h:4 ../hacks/config/whirlygig.xml.h:6
+#: ../hacks/config/worm.xml.h:4 ../hacks/config/wormhole.xml.h:4
+#: ../hacks/config/xflame.xml.h:4 ../hacks/config/xlyap.xml.h:4
+#: ../hacks/config/xmatrix.xml.h:17 ../hacks/config/xrayswarm.xml.h:4
+#: ../hacks/config/xspirograph.xml.h:4 ../hacks/config/zoom.xml.h:4
 msgid "High"
 msgstr "Vysoký"
 
-#. #### -colorcount [64]
-#: ../hacks/config/anemotaxis.xml.h:8 ../hacks/config/ant.xml.h:9
-#: ../hacks/config/antinspect.xml.h:6 ../hacks/config/antmaze.xml.h:5
-#: ../hacks/config/antspotlight.xml.h:5 ../hacks/config/atlantis.xml.h:11
-#: ../hacks/config/attraction.xml.h:15 ../hacks/config/atunnel.xml.h:6
-#: ../hacks/config/barcode.xml.h:8 ../hacks/config/blaster.xml.h:7
-#: ../hacks/config/blinkbox.xml.h:8 ../hacks/config/blocktube.xml.h:8
-#: ../hacks/config/bouboule.xml.h:6 ../hacks/config/bouncingcow.xml.h:8
-#: ../hacks/config/boxed.xml.h:15 ../hacks/config/boxfit.xml.h:12
-#: ../hacks/config/braid.xml.h:8 ../hacks/config/bubble3d.xml.h:6
-#: ../hacks/config/bubbles.xml.h:10 ../hacks/config/bumps.xml.h:11
-#: ../hacks/config/cage.xml.h:4 ../hacks/config/carousel.xml.h:9
-#: ../hacks/config/ccurve.xml.h:10 ../hacks/config/celtic.xml.h:7
-#: ../hacks/config/circuit.xml.h:9 ../hacks/config/cloudlife.xml.h:9
-#: ../hacks/config/compass.xml.h:4 ../hacks/config/coral.xml.h:10
-#: ../hacks/config/crackberg.xml.h:15 ../hacks/config/critical.xml.h:4
-#: ../hacks/config/crystal.xml.h:8 ../hacks/config/cube21.xml.h:12
-#: ../hacks/config/cubenetic.xml.h:10 ../hacks/config/cubestorm.xml.h:8
-#: ../hacks/config/cubicgrid.xml.h:10 ../hacks/config/cwaves.xml.h:6
-#: ../hacks/config/cynosure.xml.h:6 ../hacks/config/dangerball.xml.h:7
-#: ../hacks/config/decayscreen.xml.h:8 ../hacks/config/deluxe.xml.h:8
-#: ../hacks/config/demon.xml.h:10 ../hacks/config/discrete.xml.h:5
-#: ../hacks/config/distort.xml.h:15 ../hacks/config/dnalogo.xml.h:8
-#: ../hacks/config/drift.xml.h:7 ../hacks/config/endgame.xml.h:5
-#: ../hacks/config/engine.xml.h:12 ../hacks/config/epicycle.xml.h:9
-#: ../hacks/config/eruption.xml.h:14 ../hacks/config/euler2d.xml.h:17
-#: ../hacks/config/extrusion.xml.h:9 ../hacks/config/fadeplot.xml.h:7
-#: ../hacks/config/fiberlamp.xml.h:8 ../hacks/config/fireworkx.xml.h:9
-#: ../hacks/config/flag.xml.h:5 ../hacks/config/flame.xml.h:10
-#: ../hacks/config/flipflop.xml.h:9 ../hacks/config/flipscreen3d.xml.h:5
-#: ../hacks/config/fliptext.xml.h:10 ../hacks/config/flow.xml.h:10
-#: ../hacks/config/fluidballs.xml.h:13 ../hacks/config/flyingtoasters.xml.h:9
-#: ../hacks/config/fontglide.xml.h:9 ../hacks/config/forest.xml.h:4
-#: ../hacks/config/fuzzyflakes.xml.h:14 ../hacks/config/galaxy.xml.h:7
-#: ../hacks/config/gears.xml.h:8 ../hacks/config/gflux.xml.h:12
-#: ../hacks/config/glblur.xml.h:7 ../hacks/config/glcells.xml.h:17
-#: ../hacks/config/gleidescope.xml.h:9 ../hacks/config/glforestfire.xml.h:9
-#: ../hacks/config/glhanoi.xml.h:12 ../hacks/config/glknots.xml.h:7
-#: ../hacks/config/glmatrix.xml.h:13 ../hacks/config/glplanet.xml.h:8
-#: ../hacks/config/glschool.xml.h:13 ../hacks/config/glslideshow.xml.h:16
-#: ../hacks/config/glsnake.xml.h:12 ../hacks/config/gltext.xml.h:9
-#: ../hacks/config/goop.xml.h:9 ../hacks/config/grav.xml.h:5
-#: ../hacks/config/greynetic.xml.h:6 ../hacks/config/halftone.xml.h:11
-#: ../hacks/config/halo.xml.h:7 ../hacks/config/helix.xml.h:7
-#: ../hacks/config/hopalong.xml.h:14 ../hacks/config/hyperball.xml.h:5
-#: ../hacks/config/hypercube.xml.h:6 ../hacks/config/hypertorus.xml.h:7
-#: ../hacks/config/hypnowheel.xml.h:11 ../hacks/config/ifs.xml.h:7
-#: ../hacks/config/imsmap.xml.h:11 ../hacks/config/interaggregate.xml.h:6
-#: ../hacks/config/interference.xml.h:12
-#: ../hacks/config/intermomentary.xml.h:7 ../hacks/config/jigglypuff.xml.h:13
-#: ../hacks/config/jigsaw.xml.h:7 ../hacks/config/juggle.xml.h:12
-#: ../hacks/config/juggler3d.xml.h:13 ../hacks/config/julia.xml.h:10
-#: ../hacks/config/kaleidescope.xml.h:8 ../hacks/config/klein.xml.h:13
-#: ../hacks/config/kumppa.xml.h:5 ../hacks/config/lament.xml.h:6
-#: ../hacks/config/laser.xml.h:7 ../hacks/config/lavalite.xml.h:14
-#: ../hacks/config/lcdscrub.xml.h:10 ../hacks/config/lightning.xml.h:4
-#: ../hacks/config/lisa.xml.h:9 ../hacks/config/lissie.xml.h:8
-#: ../hacks/config/lmorph.xml.h:10 ../hacks/config/lockward.xml.h:6
-#: ../hacks/config/loop.xml.h:7 ../hacks/config/maze.xml.h:11
-#: ../hacks/config/memscroller.xml.h:7 ../hacks/config/menger.xml.h:6
-#: ../hacks/config/metaballs.xml.h:7 ../hacks/config/mirrorblob.xml.h:15
-#: ../hacks/config/mismunch.xml.h:5 ../hacks/config/moebius.xml.h:4
-#: ../hacks/config/moebiusgears.xml.h:5 ../hacks/config/moire2.xml.h:4
-#: ../hacks/config/molecule.xml.h:15 ../hacks/config/morph3d.xml.h:6
-#: ../hacks/config/mountain.xml.h:5 ../hacks/config/munch.xml.h:6
-#: ../hacks/config/nerverot.xml.h:15 ../hacks/config/noof.xml.h:4
-#: ../hacks/config/pacman.xml.h:3 ../hacks/config/penrose.xml.h:6
-#: ../hacks/config/petri.xml.h:11 ../hacks/config/phosphor.xml.h:7
-#: ../hacks/config/photopile.xml.h:13 ../hacks/config/piecewise.xml.h:8
-#: ../hacks/config/pinion.xml.h:9 ../hacks/config/pipes.xml.h:13
-#: ../hacks/config/polyhedra.xml.h:77 ../hacks/config/polyominoes.xml.h:6
-#: ../hacks/config/polytopes.xml.h:12 ../hacks/config/popsquares.xml.h:16
-#: ../hacks/config/providence.xml.h:5 ../hacks/config/pulsar.xml.h:12
-#: ../hacks/config/pyro.xml.h:8 ../hacks/config/qix.xml.h:13
-#: ../hacks/config/queens.xml.h:3 ../hacks/config/ripples.xml.h:11
-#: ../hacks/config/rocks.xml.h:7 ../hacks/config/rotor.xml.h:6
-#: ../hacks/config/rotzoomer.xml.h:8 ../hacks/config/rubik.xml.h:8
-#: ../hacks/config/rubikblocks.xml.h:9 ../hacks/config/sballs.xml.h:7
-#: ../hacks/config/shadebobs.xml.h:6 ../hacks/config/sierpinski.xml.h:5
-#: ../hacks/config/sierpinski3d.xml.h:5 ../hacks/config/skytentacles.xml.h:11
-#: ../hacks/config/slidescreen.xml.h:11 ../hacks/config/slip.xml.h:6
-#: ../hacks/config/sonar.xml.h:9 ../hacks/config/speedmine.xml.h:7
-#: ../hacks/config/sphere.xml.h:3 ../hacks/config/spheremonics.xml.h:8
-#: ../hacks/config/spiral.xml.h:6 ../hacks/config/spotlight.xml.h:8
-#: ../hacks/config/sproingies.xml.h:5 ../hacks/config/squiral.xml.h:8
-#: ../hacks/config/stairs.xml.h:4 ../hacks/config/starfish.xml.h:8
-#: ../hacks/config/stonerview.xml.h:4 ../hacks/config/strange.xml.h:5
-#: ../hacks/config/substrate.xml.h:14 ../hacks/config/superquadrics.xml.h:7
-#: ../hacks/config/surfaces.xml.h:14 ../hacks/config/swirl.xml.h:6
-#: ../hacks/config/t3d.xml.h:8 ../hacks/config/tangram.xml.h:8
-#: ../hacks/config/thornbird.xml.h:5 ../hacks/config/topblock.xml.h:13
-#: ../hacks/config/triangle.xml.h:4 ../hacks/config/truchet.xml.h:3
-#: ../hacks/config/twang.xml.h:11 ../hacks/config/vines.xml.h:3
-#: ../hacks/config/wander.xml.h:10 ../hacks/config/whirlygig.xml.h:5
-#: ../hacks/config/worm.xml.h:4 ../hacks/config/wormhole.xml.h:7
-#: ../hacks/config/xflame.xml.h:6 ../hacks/config/xlyap.xml.h:6
-#: ../hacks/config/xmatrix.xml.h:12 ../hacks/config/xrayswarm.xml.h:4
-#: ../hacks/config/xspirograph.xml.h:7 ../hacks/config/zoom.xml.h:11
-msgid "Low"
-msgstr "Nízky"
-
-#: ../hacks/config/anemotaxis.xml.h:10 ../hacks/config/hypercube.xml.h:7
+#: ../hacks/config/anemotaxis.xml.h:5 ../hacks/config/hypercube.xml.h:10
 msgid "Near"
 msgstr "Blízko"
 
+#: ../hacks/config/anemotaxis.xml.h:6
+msgid "Distance"
+msgstr ""
+
+#: ../hacks/config/anemotaxis.xml.h:7 ../hacks/config/cubicgrid.xml.h:10
+#: ../hacks/config/hypercube.xml.h:12
+msgid "Far"
+msgstr "Ďaleko"
+
+#: ../hacks/config/anemotaxis.xml.h:9
+msgid "Sources"
+msgstr ""
+
 #: ../hacks/config/anemotaxis.xml.h:11
 msgid "Searchers"
 msgstr ""
 
 #: ../hacks/config/anemotaxis.xml.h:13
-msgid "Sources"
+msgid ""
+"Anemotaxis demonstrates a search algorithm designed for locating a source of "
+"odor in turbulent atmosphere. The searcher is able to sense the odor and "
+"determine local instantaneous wind direction. The goal is to find the source "
+"in the shortest mean time. http://en.wikipedia.org/wiki/Anemotaxis Written "
+"by Eugene Balkovsky; 2004."
 msgstr ""
 
 #: ../hacks/config/ant.xml.h:1
 msgid "Ant"
 msgstr "Mravec"
 
-#: ../hacks/config/ant.xml.h:2
-msgid "Ant size"
-msgstr ""
+#. #### -slow
+#: ../hacks/config/ant.xml.h:5 ../hacks/config/attraction.xml.h:21
+#: ../hacks/config/blinkbox.xml.h:5 ../hacks/config/cloudlife.xml.h:9
+#: ../hacks/config/cube21.xml.h:5 ../hacks/config/cubenetic.xml.h:20
+#: ../hacks/config/demon.xml.h:8 ../hacks/config/discrete.xml.h:5
+#: ../hacks/config/distort.xml.h:9 ../hacks/config/fadeplot.xml.h:8
+#: ../hacks/config/flag.xml.h:6 ../hacks/config/flow.xml.h:8
+#: ../hacks/config/fluidballs.xml.h:8 ../hacks/config/fuzzyflakes.xml.h:25
+#: ../hacks/config/glcells.xml.h:11 ../hacks/config/gleidescope.xml.h:5
+#: ../hacks/config/halftone.xml.h:8 ../hacks/config/hopalong.xml.h:5
+#: ../hacks/config/interference.xml.h:8 ../hacks/config/julia.xml.h:8
+#: ../hacks/config/lisa.xml.h:10 ../hacks/config/lissie.xml.h:5
+#: ../hacks/config/loop.xml.h:5 ../hacks/config/metaballs.xml.h:12
+#: ../hacks/config/moire.xml.h:8 ../hacks/config/penrose.xml.h:8
+#: ../hacks/config/photopile.xml.h:2 ../hacks/config/piecewise.xml.h:11
+#: ../hacks/config/rd-bomb.xml.h:11 ../hacks/config/rdbomb.xml.h:11
+#: ../hacks/config/rorschach.xml.h:2 ../hacks/config/rubikblocks.xml.h:5
+#: ../hacks/config/sierpinski.xml.h:8 ../hacks/config/slidescreen.xml.h:14
+#: ../hacks/config/slip.xml.h:8 ../hacks/config/spotlight.xml.h:8
+#: ../hacks/config/topblock.xml.h:8 ../hacks/config/twang.xml.h:14
+msgid "Small"
+msgstr "Malé"
 
-#: ../hacks/config/ant.xml.h:3
-msgid "Ants count"
-msgstr ""
+#: ../hacks/config/ant.xml.h:6 ../hacks/config/demon.xml.h:9
+#: ../hacks/config/discrete.xml.h:6 ../hacks/config/flag.xml.h:7
+#: ../hacks/config/flow.xml.h:9 ../hacks/config/lissie.xml.h:6
+#: ../hacks/config/loop.xml.h:6 ../hacks/config/sierpinski.xml.h:9
+#: ../hacks/config/slip.xml.h:9
+msgid "Timeout"
+msgstr "Časový interval"
 
-#: ../hacks/config/ant.xml.h:4
-msgid "Draw eyes"
+#. #### -slow
+#: ../hacks/config/ant.xml.h:7 ../hacks/config/attraction.xml.h:23
+#: ../hacks/config/blinkbox.xml.h:7 ../hacks/config/cloudlife.xml.h:11
+#: ../hacks/config/cube21.xml.h:7 ../hacks/config/cubenetic.xml.h:22
+#: ../hacks/config/demon.xml.h:10 ../hacks/config/discrete.xml.h:7
+#: ../hacks/config/distort.xml.h:13 ../hacks/config/fadeplot.xml.h:10
+#: ../hacks/config/flag.xml.h:8 ../hacks/config/flow.xml.h:10
+#: ../hacks/config/fluidballs.xml.h:10 ../hacks/config/fuzzyflakes.xml.h:27
+#: ../hacks/config/glcells.xml.h:27 ../hacks/config/gleidescope.xml.h:7
+#: ../hacks/config/halftone.xml.h:12 ../hacks/config/hopalong.xml.h:7
+#: ../hacks/config/interference.xml.h:10 ../hacks/config/julia.xml.h:10
+#: ../hacks/config/lisa.xml.h:12 ../hacks/config/lissie.xml.h:7
+#: ../hacks/config/loop.xml.h:7 ../hacks/config/moire.xml.h:10
+#: ../hacks/config/penrose.xml.h:10 ../hacks/config/photopile.xml.h:4
+#: ../hacks/config/piecewise.xml.h:13 ../hacks/config/rd-bomb.xml.h:13
+#: ../hacks/config/rdbomb.xml.h:13 ../hacks/config/rorschach.xml.h:4
+#: ../hacks/config/rubikblocks.xml.h:7 ../hacks/config/sierpinski.xml.h:10
+#: ../hacks/config/slidescreen.xml.h:16 ../hacks/config/slip.xml.h:10
+#: ../hacks/config/spotlight.xml.h:10 ../hacks/config/topblock.xml.h:10
+#: ../hacks/config/twang.xml.h:16
+msgid "Large"
+msgstr "Veľké"
+
+#: ../hacks/config/ant.xml.h:8
+msgid "Sharp turns"
 msgstr ""
 
-#: ../hacks/config/ant.xml.h:5
-msgid "Four sided cells"
+#: ../hacks/config/ant.xml.h:9
+msgid "Truchet lines"
 msgstr ""
 
-#. #### -slow
-#: ../hacks/config/ant.xml.h:8 ../hacks/config/attraction.xml.h:12
-#: ../hacks/config/blinkbox.xml.h:7 ../hacks/config/cloudlife.xml.h:8
-#: ../hacks/config/cube21.xml.h:9 ../hacks/config/cubenetic.xml.h:9
-#: ../hacks/config/demon.xml.h:9 ../hacks/config/discrete.xml.h:4
-#: ../hacks/config/distort.xml.h:11 ../hacks/config/fadeplot.xml.h:6
-#: ../hacks/config/flag.xml.h:4 ../hacks/config/flow.xml.h:7
-#: ../hacks/config/fluidballs.xml.h:12 ../hacks/config/fuzzyflakes.xml.h:12
-#: ../hacks/config/glcells.xml.h:14 ../hacks/config/gleidescope.xml.h:8
-#: ../hacks/config/halftone.xml.h:10 ../hacks/config/hopalong.xml.h:13
-#: ../hacks/config/interference.xml.h:11 ../hacks/config/julia.xml.h:8
-#: ../hacks/config/lisa.xml.h:7 ../hacks/config/lissie.xml.h:6
-#: ../hacks/config/loop.xml.h:5 ../hacks/config/moire.xml.h:4
-#: ../hacks/config/penrose.xml.h:5 ../hacks/config/photopile.xml.h:10
-#: ../hacks/config/piecewise.xml.h:7 ../hacks/config/rd-bomb.xml.h:11
-#: ../hacks/config/rdbomb.xml.h:11 ../hacks/config/rorschach.xml.h:4
-#: ../hacks/config/rubikblocks.xml.h:6 ../hacks/config/sierpinski.xml.h:4
-#: ../hacks/config/slidescreen.xml.h:9 ../hacks/config/slip.xml.h:5
-#: ../hacks/config/spotlight.xml.h:7 ../hacks/config/topblock.xml.h:12
-#: ../hacks/config/twang.xml.h:10
-msgid "Large"
-msgstr "Veľké"
+#: ../hacks/config/ant.xml.h:10
+msgid "Draw eyes"
+msgstr ""
 
 #: ../hacks/config/ant.xml.h:11
-msgid "Nine sided cells"
+msgid "Ants count"
 msgstr ""
 
-#. #### -color [random]
-#: ../hacks/config/ant.xml.h:12 ../hacks/config/apollonian.xml.h:12
-#: ../hacks/config/attraction.xml.h:17 ../hacks/config/bouboule.xml.h:8
-#: ../hacks/config/braid.xml.h:10 ../hacks/config/critical.xml.h:6
-#: ../hacks/config/crystal.xml.h:11 ../hacks/config/cynosure.xml.h:8
-#: ../hacks/config/deco.xml.h:11 ../hacks/config/deluxe.xml.h:10
-#: ../hacks/config/demon.xml.h:12 ../hacks/config/discrete.xml.h:8
-#: ../hacks/config/drift.xml.h:9 ../hacks/config/epicycle.xml.h:11
-#: ../hacks/config/eruption.xml.h:17 ../hacks/config/euler2d.xml.h:19
-#: ../hacks/config/fadeplot.xml.h:9 ../hacks/config/flag.xml.h:7
-#: ../hacks/config/flame.xml.h:12 ../hacks/config/flow.xml.h:12
-#: ../hacks/config/forest.xml.h:6 ../hacks/config/galaxy.xml.h:9
-#: ../hacks/config/grav.xml.h:7 ../hacks/config/halo.xml.h:10
-#: ../hacks/config/hopalong.xml.h:17 ../hacks/config/ifs.xml.h:9
-#: ../hacks/config/imsmap.xml.h:13 ../hacks/config/interference.xml.h:15
-#: ../hacks/config/julia.xml.h:12 ../hacks/config/laser.xml.h:9
-#: ../hacks/config/lightning.xml.h:6 ../hacks/config/lisa.xml.h:11
-#: ../hacks/config/lissie.xml.h:10 ../hacks/config/loop.xml.h:9
-#: ../hacks/config/metaballs.xml.h:13 ../hacks/config/moire.xml.h:7
-#: ../hacks/config/moire2.xml.h:7 ../hacks/config/mountain.xml.h:8
-#: ../hacks/config/penrose.xml.h:8 ../hacks/config/polyominoes.xml.h:8
-#: ../hacks/config/popsquares.xml.h:17 ../hacks/config/rd-bomb.xml.h:13
-#: ../hacks/config/rdbomb.xml.h:13 ../hacks/config/rocks.xml.h:9
-#: ../hacks/config/rotor.xml.h:8 ../hacks/config/shadebobs.xml.h:10
-#: ../hacks/config/sierpinski.xml.h:7 ../hacks/config/slip.xml.h:8
-#: ../hacks/config/sphere.xml.h:5 ../hacks/config/spiral.xml.h:8
-#: ../hacks/config/squiral.xml.h:10 ../hacks/config/starfish.xml.h:10
-#: ../hacks/config/strange.xml.h:7 ../hacks/config/swirl.xml.h:8
-#: ../hacks/config/triangle.xml.h:6 ../hacks/config/vines.xml.h:5
-#: ../hacks/config/worm.xml.h:6
-msgid "Number of colors"
+#: ../hacks/config/ant.xml.h:12
+msgid "Ant size"
 msgstr ""
 
 #: ../hacks/config/ant.xml.h:13
@@ -1887,37 +1918,81 @@
 msgstr ""
 
 #: ../hacks/config/ant.xml.h:14
-msgid "Sharp turns"
+msgid "Three sided cells"
+msgstr ""
+
+#: ../hacks/config/ant.xml.h:15
+msgid "Four sided cells"
 msgstr ""
 
 #: ../hacks/config/ant.xml.h:16
 msgid "Six sided cells"
 msgstr ""
 
-#. #### -slow
-#: ../hacks/config/ant.xml.h:17 ../hacks/config/attraction.xml.h:27
-#: ../hacks/config/blinkbox.xml.h:12 ../hacks/config/cloudlife.xml.h:13
-#: ../hacks/config/cube21.xml.h:21 ../hacks/config/cubenetic.xml.h:21
-#: ../hacks/config/demon.xml.h:14 ../hacks/config/discrete.xml.h:10
-#: ../hacks/config/distort.xml.h:21 ../hacks/config/fadeplot.xml.h:11
-#: ../hacks/config/flag.xml.h:10 ../hacks/config/flow.xml.h:19
-#: ../hacks/config/fluidballs.xml.h:20 ../hacks/config/fuzzyflakes.xml.h:23
-#: ../hacks/config/glcells.xml.h:32 ../hacks/config/gleidescope.xml.h:14
-#: ../hacks/config/halftone.xml.h:18 ../hacks/config/hopalong.xml.h:22
-#: ../hacks/config/interference.xml.h:19 ../hacks/config/julia.xml.h:14
-#: ../hacks/config/lisa.xml.h:14 ../hacks/config/lissie.xml.h:13
-#: ../hacks/config/loop.xml.h:12 ../hacks/config/metaballs.xml.h:16
-#: ../hacks/config/moire.xml.h:11 ../hacks/config/penrose.xml.h:11
-#: ../hacks/config/photopile.xml.h:22 ../hacks/config/piecewise.xml.h:15
-#: ../hacks/config/rd-bomb.xml.h:20 ../hacks/config/rdbomb.xml.h:20
-#: ../hacks/config/rorschach.xml.h:9 ../hacks/config/rubikblocks.xml.h:16
-#: ../hacks/config/sierpinski.xml.h:11 ../hacks/config/slidescreen.xml.h:18
-#: ../hacks/config/slip.xml.h:11 ../hacks/config/spotlight.xml.h:10
-#: ../hacks/config/topblock.xml.h:21 ../hacks/config/twang.xml.h:15
-msgid "Small"
-msgstr "Malé"
+#: ../hacks/config/ant.xml.h:17
+msgid "Nine sided cells"
+msgstr ""
+
+#: ../hacks/config/ant.xml.h:18
+msgid "Twelve sided cells"
+msgstr ""
 
 #: ../hacks/config/ant.xml.h:19
+msgid "Three"
+msgstr ""
+
+#. 
+#. On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+#. 
+#. detail 3:  invisible
+#. detail 4:  barely visible
+#. detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+#. detail 8:  ~700+ fps
+#. detail 9:  ~400 fps
+#. detail 10: ~300 fps
+#. detail 11: ~100 fps
+#. detail 12:  ~50 fps
+#. detail 13:  ~17 fps
+#. detail 14:   ~8 fps
+#. detail 15:   ~2 fps
+#. 
+#. With the default -delay, CPU load only starts causing the frame rate
+#. to drop below 30 fps detail 12 or higher.
+#. 
+#. #### -color [random]
+#: ../hacks/config/ant.xml.h:20 ../hacks/config/apollonian.xml.h:11
+#: ../hacks/config/attraction.xml.h:18 ../hacks/config/bouboule.xml.h:9
+#: ../hacks/config/braid.xml.h:9 ../hacks/config/critical.xml.h:6
+#: ../hacks/config/crystal.xml.h:6 ../hacks/config/cynosure.xml.h:6
+#: ../hacks/config/deco.xml.h:6 ../hacks/config/deluxe.xml.h:12
+#: ../hacks/config/demon.xml.h:12 ../hacks/config/discrete.xml.h:9
+#: ../hacks/config/drift.xml.h:9 ../hacks/config/epicycle.xml.h:6
+#: ../hacks/config/eruption.xml.h:6 ../hacks/config/euler2d.xml.h:28
+#: ../hacks/config/fadeplot.xml.h:12 ../hacks/config/flag.xml.h:10
+#: ../hacks/config/flame.xml.h:13 ../hacks/config/flow.xml.h:12
+#: ../hacks/config/forest.xml.h:6 ../hacks/config/galaxy.xml.h:10
+#: ../hacks/config/grav.xml.h:9 ../hacks/config/halo.xml.h:9
+#: ../hacks/config/hopalong.xml.h:10 ../hacks/config/ifs.xml.h:45
+#: ../hacks/config/imsmap.xml.h:12 ../hacks/config/interference.xml.h:16
+#: ../hacks/config/julia.xml.h:12 ../hacks/config/laser.xml.h:10
+#: ../hacks/config/lightning.xml.h:6 ../hacks/config/lisa.xml.h:9
+#: ../hacks/config/lissie.xml.h:9 ../hacks/config/loop.xml.h:9
+#: ../hacks/config/metaballs.xml.h:9 ../hacks/config/moire.xml.h:6
+#: ../hacks/config/moire2.xml.h:6 ../hacks/config/mountain.xml.h:9
+#: ../hacks/config/penrose.xml.h:6 ../hacks/config/polyominoes.xml.h:10
+#: ../hacks/config/popsquares.xml.h:7 ../hacks/config/rd-bomb.xml.h:15
+#: ../hacks/config/rdbomb.xml.h:15 ../hacks/config/rocks.xml.h:15
+#: ../hacks/config/rotor.xml.h:9 ../hacks/config/shadebobs.xml.h:8
+#: ../hacks/config/sierpinski.xml.h:12 ../hacks/config/slip.xml.h:12
+#: ../hacks/config/sphere.xml.h:6 ../hacks/config/spiral.xml.h:10
+#: ../hacks/config/squiral.xml.h:14 ../hacks/config/starfish.xml.h:15
+#: ../hacks/config/strange.xml.h:9 ../hacks/config/swirl.xml.h:9
+#: ../hacks/config/triangle.xml.h:6 ../hacks/config/vines.xml.h:6
+#: ../hacks/config/worm.xml.h:6
+msgid "Number of colors"
+msgstr ""
+
+#: ../hacks/config/ant.xml.h:24
 #, no-c-format
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
@@ -1928,39 +2003,15 @@
 "http://en.wikipedia.org/wiki/Turing_machine Written by David Bagley; 1997."
 msgstr ""
 
-#: ../hacks/config/ant.xml.h:20
-msgid "Three"
-msgstr ""
-
-#: ../hacks/config/ant.xml.h:21
-msgid "Three sided cells"
-msgstr ""
-
-#: ../hacks/config/ant.xml.h:22 ../hacks/config/demon.xml.h:16
-#: ../hacks/config/discrete.xml.h:11 ../hacks/config/flag.xml.h:13
-#: ../hacks/config/flow.xml.h:21 ../hacks/config/lissie.xml.h:15
-#: ../hacks/config/loop.xml.h:13 ../hacks/config/sierpinski.xml.h:13
-#: ../hacks/config/slip.xml.h:13
-msgid "Timeout"
-msgstr "Časový interval"
-
-#: ../hacks/config/ant.xml.h:23
-msgid "Truchet lines"
-msgstr ""
-
-#: ../hacks/config/ant.xml.h:24
-msgid "Twelve sided cells"
-msgstr ""
-
 #: ../hacks/config/antinspect.xml.h:1
 msgid "AntInspect"
 msgstr ""
 
-#: ../hacks/config/antinspect.xml.h:2
+#: ../hacks/config/antinspect.xml.h:6
 msgid "Draw shadows"
 msgstr ""
 
-#: ../hacks/config/antinspect.xml.h:3
+#: ../hacks/config/antinspect.xml.h:7
 msgid ""
 "Draws a trio of ants moving their spheres around a circle. Written by Blair "
 "Tennessy; 2004."
@@ -1970,7 +2021,7 @@
 msgid "AntMaze"
 msgstr ""
 
-#: ../hacks/config/antmaze.xml.h:2
+#: ../hacks/config/antmaze.xml.h:6
 msgid ""
 "Draws a few views of a few ants walking around in a simple maze. Written by "
 "Blair Tennessy; 2005."
@@ -1980,7 +2031,7 @@
 msgid "AntSpotlight"
 msgstr ""
 
-#: ../hacks/config/antspotlight.xml.h:2
+#: ../hacks/config/antspotlight.xml.h:6
 msgid ""
 "Draws an ant (with a headlight) who walks on top of an image of your desktop "
 "or other image. Written by Blair Tennessy; 2003."
@@ -1990,21 +2041,61 @@
 msgid "Apollonian"
 msgstr "Apolónsky"
 
-#. don't know what -count does
+#: ../hacks/config/apollonian.xml.h:2 ../hacks/config/tangram.xml.h:13
+msgid "Draw labels"
+msgstr ""
+
 #: ../hacks/config/apollonian.xml.h:3
-msgid "Deep"
-msgstr "Hlboký"
+msgid "Include alternate geometries"
+msgstr ""
 
 #. don't know what -count does
-#: ../hacks/config/apollonian.xml.h:5 ../hacks/config/flipflop.xml.h:1
+#: ../hacks/config/apollonian.xml.h:5
+msgid "Shallow"
+msgstr "Plytký"
+
+#. don't know what -count does
+#: ../hacks/config/apollonian.xml.h:7 ../hacks/config/flipflop.xml.h:11
 msgid "Depth"
 msgstr "Hĺbka"
 
-#: ../hacks/config/apollonian.xml.h:6 ../hacks/config/tangram.xml.h:2
-msgid "Draw labels"
-msgstr ""
+#. don't know what -count does
+#: ../hacks/config/apollonian.xml.h:9
+msgid "Deep"
+msgstr "Hlboký"
+
+#. #### -color [random]
+#: ../hacks/config/apollonian.xml.h:10 ../hacks/config/attraction.xml.h:17
+#: ../hacks/config/bouboule.xml.h:8 ../hacks/config/braid.xml.h:8
+#: ../hacks/config/critical.xml.h:5 ../hacks/config/crystal.xml.h:5
+#: ../hacks/config/cynosure.xml.h:5 ../hacks/config/deco.xml.h:5
+#: ../hacks/config/deluxe.xml.h:11 ../hacks/config/demon.xml.h:11
+#: ../hacks/config/discrete.xml.h:8 ../hacks/config/drift.xml.h:8
+#: ../hacks/config/epicycle.xml.h:5 ../hacks/config/euler2d.xml.h:27
+#: ../hacks/config/fadeplot.xml.h:11 ../hacks/config/flag.xml.h:9
+#: ../hacks/config/flame.xml.h:12 ../hacks/config/flow.xml.h:11
+#: ../hacks/config/forest.xml.h:5 ../hacks/config/galaxy.xml.h:9
+#: ../hacks/config/grav.xml.h:8 ../hacks/config/halo.xml.h:8
+#: ../hacks/config/hopalong.xml.h:9 ../hacks/config/imsmap.xml.h:11
+#: ../hacks/config/interference.xml.h:15 ../hacks/config/julia.xml.h:11
+#: ../hacks/config/laser.xml.h:9 ../hacks/config/lightning.xml.h:5
+#: ../hacks/config/lisa.xml.h:8 ../hacks/config/lissie.xml.h:8
+#: ../hacks/config/loop.xml.h:8 ../hacks/config/metaballs.xml.h:8
+#: ../hacks/config/moire.xml.h:5 ../hacks/config/moire2.xml.h:5
+#: ../hacks/config/mountain.xml.h:8 ../hacks/config/nerverot.xml.h:11
+#: ../hacks/config/penrose.xml.h:5 ../hacks/config/polyominoes.xml.h:9
+#: ../hacks/config/rd-bomb.xml.h:14 ../hacks/config/rdbomb.xml.h:14
+#: ../hacks/config/rocks.xml.h:14 ../hacks/config/rotor.xml.h:8
+#: ../hacks/config/shadebobs.xml.h:6 ../hacks/config/sierpinski.xml.h:11
+#: ../hacks/config/slip.xml.h:11 ../hacks/config/sphere.xml.h:5
+#: ../hacks/config/spiral.xml.h:9 ../hacks/config/squiral.xml.h:13
+#: ../hacks/config/starfish.xml.h:14 ../hacks/config/strange.xml.h:8
+#: ../hacks/config/swirl.xml.h:8 ../hacks/config/triangle.xml.h:5
+#: ../hacks/config/vines.xml.h:5 ../hacks/config/worm.xml.h:5
+msgid "Two"
+msgstr "Dve"
 
-#: ../hacks/config/apollonian.xml.h:8
+#: ../hacks/config/apollonian.xml.h:18
 #, no-c-format
 msgid ""
 "Draws an Apollonian gasket: a fractal packing of circles with smaller "
@@ -2014,46 +2105,6 @@
 "and David Bagley; 2002."
 msgstr ""
 
-#: ../hacks/config/apollonian.xml.h:10
-msgid "Include alternate geometries"
-msgstr ""
-
-#. don't know what -count does
-#: ../hacks/config/apollonian.xml.h:14
-msgid "Shallow"
-msgstr "Plytký"
-
-#. #### -color [random]
-#: ../hacks/config/apollonian.xml.h:18 ../hacks/config/attraction.xml.h:32
-#: ../hacks/config/bouboule.xml.h:12 ../hacks/config/braid.xml.h:14
-#: ../hacks/config/critical.xml.h:9 ../hacks/config/crystal.xml.h:15
-#: ../hacks/config/cynosure.xml.h:12 ../hacks/config/deco.xml.h:15
-#: ../hacks/config/deluxe.xml.h:17 ../hacks/config/demon.xml.h:17
-#: ../hacks/config/discrete.xml.h:12 ../hacks/config/drift.xml.h:12
-#: ../hacks/config/epicycle.xml.h:15 ../hacks/config/euler2d.xml.h:31
-#: ../hacks/config/fadeplot.xml.h:15 ../hacks/config/flag.xml.h:14
-#: ../hacks/config/flame.xml.h:15 ../hacks/config/flow.xml.h:22
-#: ../hacks/config/forest.xml.h:9 ../hacks/config/galaxy.xml.h:14
-#: ../hacks/config/grav.xml.h:13 ../hacks/config/halo.xml.h:15
-#: ../hacks/config/hopalong.xml.h:24 ../hacks/config/imsmap.xml.h:19
-#: ../hacks/config/interference.xml.h:20 ../hacks/config/julia.xml.h:15
-#: ../hacks/config/laser.xml.h:13 ../hacks/config/lightning.xml.h:9
-#: ../hacks/config/lisa.xml.h:17 ../hacks/config/lissie.xml.h:16
-#: ../hacks/config/loop.xml.h:14 ../hacks/config/metaballs.xml.h:17
-#: ../hacks/config/moire.xml.h:12 ../hacks/config/moire2.xml.h:10
-#: ../hacks/config/mountain.xml.h:12 ../hacks/config/nerverot.xml.h:23
-#: ../hacks/config/penrose.xml.h:13 ../hacks/config/polyominoes.xml.h:13
-#: ../hacks/config/rd-bomb.xml.h:21 ../hacks/config/rdbomb.xml.h:21
-#: ../hacks/config/rocks.xml.h:17 ../hacks/config/rotor.xml.h:14
-#: ../hacks/config/shadebobs.xml.h:17 ../hacks/config/sierpinski.xml.h:14
-#: ../hacks/config/slip.xml.h:14 ../hacks/config/sphere.xml.h:9
-#: ../hacks/config/spiral.xml.h:12 ../hacks/config/squiral.xml.h:18
-#: ../hacks/config/starfish.xml.h:18 ../hacks/config/strange.xml.h:12
-#: ../hacks/config/swirl.xml.h:12 ../hacks/config/triangle.xml.h:9
-#: ../hacks/config/vines.xml.h:8 ../hacks/config/worm.xml.h:11
-msgid "Two"
-msgstr "Dve"
-
 #: ../hacks/config/apple2.xml.h:1
 msgid "Apple2"
 msgstr ""
@@ -2063,11 +2114,11 @@
 msgstr ""
 
 #: ../hacks/config/apple2.xml.h:3
-msgid "Display images"
+msgid "Display scrolling text"
 msgstr ""
 
 #: ../hacks/config/apple2.xml.h:4
-msgid "Display scrolling text"
+msgid "Display images"
 msgstr ""
 
 #: ../hacks/config/apple2.xml.h:5
@@ -2082,236 +2133,240 @@
 "program and runs it. In \"Text Mode\", it displays the output of a program, "
 "or the contents of a file or URL. In \"Slideshow Mode\", it chooses random "
 "images and displays them within the limitations of the Apple ][ display "
-"hardware. (Six available colors in hi-res mode!) On X11 systems, This "
-"program is also a fully-functional VT100 emulator. "
+"hardware. (Six available colors in hi-res mode!) This program is also a "
+"fully-functional VT100 emulator! Run it as an application instead of as a "
+"screen saver and you can use it as a terminal. "
 "http://en.wikipedia.org/wiki/Apple_II_series Written by Trevor Blackwell; "
 "2003."
 msgstr ""
 
-#: ../hacks/config/atlantis.xml.h:1 ../hacks/config/deluxe.xml.h:2
-#: ../hacks/config/demon.xml.h:2 ../hacks/config/gears.xml.h:2
-#: ../hacks/config/glhanoi.xml.h:4 ../hacks/config/lisa.xml.h:2
-#: ../hacks/config/lissie.xml.h:2 ../hacks/config/skytentacles.xml.h:2
-msgid "20"
-msgstr ""
-
-#: ../hacks/config/atlantis.xml.h:2
-msgid ""
-"A 3D animation of a number of sharks, dolphins, and whales. Written by Mark "
-"Kilgard; 1998."
-msgstr ""
-
-#: ../hacks/config/atlantis.xml.h:3
-msgid "Agressive"
-msgstr "Dôrazný"
-
-#: ../hacks/config/atlantis.xml.h:4
+#: ../hacks/config/atlantis.xml.h:1
 msgid "Atlantis"
 msgstr "Atlantída"
 
-#: ../hacks/config/atlantis.xml.h:5
-msgid "Clear water"
+#: ../hacks/config/atlantis.xml.h:6
+msgid "Whale speed"
 msgstr ""
 
-#: ../hacks/config/atlantis.xml.h:7
-msgid "Flat background"
+#: ../hacks/config/atlantis.xml.h:8
+msgid "Shy"
 msgstr ""
 
 #: ../hacks/config/atlantis.xml.h:9
-msgid "Gradient background"
+msgid "Shark proximity"
 msgstr ""
 
-#: ../hacks/config/atlantis.xml.h:12 ../hacks/config/boxed.xml.h:16
-#: ../hacks/config/flyingtoasters.xml.h:10 ../hacks/config/glschool.xml.h:14
-#: ../hacks/config/glslideshow.xml.h:17 ../hacks/config/jigglypuff.xml.h:14
-#: ../hacks/config/juggle.xml.h:13 ../hacks/config/juggler3d.xml.h:14
-#: ../hacks/config/mirrorblob.xml.h:17 ../hacks/config/pipes.xml.h:14
-#: ../hacks/config/webcollage.xml.h:7
+#: ../hacks/config/atlantis.xml.h:10
+msgid "Agressive"
+msgstr "Dôrazný"
+
+#: ../hacks/config/atlantis.xml.h:11 ../hacks/config/boxed.xml.h:20
+#: ../hacks/config/flyingtoasters.xml.h:8 ../hacks/config/glschool.xml.h:8
+#: ../hacks/config/glslideshow.xml.h:16 ../hacks/config/jigglypuff.xml.h:10
+#: ../hacks/config/juggle.xml.h:11 ../hacks/config/juggler3d.xml.h:11
+#: ../hacks/config/mirrorblob.xml.h:11 ../hacks/config/pipes.xml.h:11
+#: ../hacks/config/webcollage.xml.h:2
 msgid "None"
 msgstr "Žiadne"
 
-#: ../hacks/config/atlantis.xml.h:13
+#: ../hacks/config/atlantis.xml.h:12
 msgid "Number of sharks"
 msgstr ""
 
+#: ../hacks/config/atlantis.xml.h:13 ../hacks/config/companioncube.xml.h:10
+#: ../hacks/config/deluxe.xml.h:10 ../hacks/config/demon.xml.h:7
+#: ../hacks/config/gears.xml.h:10 ../hacks/config/glhanoi.xml.h:11
+#: ../hacks/config/lisa.xml.h:15 ../hacks/config/lissie.xml.h:13
+#: ../hacks/config/skytentacles.xml.h:4
+msgid "20"
+msgstr ""
+
 #: ../hacks/config/atlantis.xml.h:14
-msgid "Shark proximity"
+msgid "Shimmering water"
 msgstr ""
 
 #: ../hacks/config/atlantis.xml.h:15
-msgid "Shimmering water"
+msgid "Clear water"
 msgstr ""
 
-#: ../hacks/config/atlantis.xml.h:17
-msgid "Shy"
+#: ../hacks/config/atlantis.xml.h:16
+msgid "Flat background"
 msgstr ""
 
-#: ../hacks/config/atlantis.xml.h:19
-msgid "Whale speed"
+#: ../hacks/config/atlantis.xml.h:17
+msgid "Gradient background"
 msgstr ""
 
 #. #### -mipmap
-#: ../hacks/config/atlantis.xml.h:20 ../hacks/config/atunnel.xml.h:9
-#: ../hacks/config/blinkbox.xml.h:13 ../hacks/config/blocktube.xml.h:12
-#: ../hacks/config/boing.xml.h:15 ../hacks/config/bouncingcow.xml.h:13
-#: ../hacks/config/boxed.xml.h:25 ../hacks/config/cage.xml.h:7
-#: ../hacks/config/crackberg.xml.h:24 ../hacks/config/cube21.xml.h:28
-#: ../hacks/config/cubenetic.xml.h:27 ../hacks/config/cubestorm.xml.h:18
-#: ../hacks/config/dangerball.xml.h:15 ../hacks/config/dnalogo.xml.h:10
-#: ../hacks/config/extrusion.xml.h:18 ../hacks/config/flipflop.xml.h:15
-#: ../hacks/config/flyingtoasters.xml.h:16 ../hacks/config/gears.xml.h:15
-#: ../hacks/config/glcells.xml.h:34 ../hacks/config/glforestfire.xml.h:17
-#: ../hacks/config/glhanoi.xml.h:18 ../hacks/config/glknots.xml.h:25
-#: ../hacks/config/glmatrix.xml.h:21 ../hacks/config/glplanet.xml.h:14
-#: ../hacks/config/glschool.xml.h:18 ../hacks/config/glsnake.xml.h:18
-#: ../hacks/config/gltext.xml.h:20 ../hacks/config/jigglypuff.xml.h:28
-#: ../hacks/config/lament.xml.h:9 ../hacks/config/lavalite.xml.h:30
-#: ../hacks/config/menger.xml.h:21 ../hacks/config/mirrorblob.xml.h:27
-#: ../hacks/config/moebiusgears.xml.h:15 ../hacks/config/molecule.xml.h:27
-#: ../hacks/config/pinion.xml.h:17 ../hacks/config/polyhedra.xml.h:169
-#: ../hacks/config/providence.xml.h:8 ../hacks/config/queens.xml.h:7
-#: ../hacks/config/rubikblocks.xml.h:21 ../hacks/config/sballs.xml.h:17
-#: ../hacks/config/sierpinski3d.xml.h:11 ../hacks/config/speedmine.xml.h:18
-#: ../hacks/config/spheremonics.xml.h:23 ../hacks/config/sproingies.xml.h:11
-#: ../hacks/config/stonerview.xml.h:8 ../hacks/config/superquadrics.xml.h:14
-#: ../hacks/config/tangram.xml.h:14 ../hacks/config/topblock.xml.h:25
+#: ../hacks/config/atlantis.xml.h:18 ../hacks/config/atunnel.xml.h:7
+#: ../hacks/config/blinkbox.xml.h:11 ../hacks/config/blocktube.xml.h:10
+#: ../hacks/config/boing.xml.h:13 ../hacks/config/bouncingcow.xml.h:11
+#: ../hacks/config/boxed.xml.h:24 ../hacks/config/cage.xml.h:5
+#: ../hacks/config/companioncube.xml.h:13 ../hacks/config/crackberg.xml.h:17
+#: ../hacks/config/cube21.xml.h:25 ../hacks/config/cubenetic.xml.h:25
+#: ../hacks/config/cubestorm.xml.h:16 ../hacks/config/dangerball.xml.h:13
+#: ../hacks/config/dnalogo.xml.h:8 ../hacks/config/extrusion.xml.h:16
+#: ../hacks/config/flipflop.xml.h:13 ../hacks/config/flyingtoasters.xml.h:13
+#: ../hacks/config/gears.xml.h:13 ../hacks/config/glcells.xml.h:33
+#: ../hacks/config/glforestfire.xml.h:15 ../hacks/config/glhanoi.xml.h:15
+#: ../hacks/config/glknots.xml.h:23 ../hacks/config/glmatrix.xml.h:19
+#: ../hacks/config/glplanet.xml.h:12 ../hacks/config/glschool.xml.h:13
+#: ../hacks/config/glsnake.xml.h:17 ../hacks/config/gltext.xml.h:18
+#: ../hacks/config/hilbert.xml.h:21 ../hacks/config/jigglypuff.xml.h:26
+#: ../hacks/config/lament.xml.h:6 ../hacks/config/lavalite.xml.h:15
+#: ../hacks/config/menger.xml.h:19 ../hacks/config/mirrorblob.xml.h:26
+#: ../hacks/config/moebiusgears.xml.h:13 ../hacks/config/molecule.xml.h:11
+#: ../hacks/config/pinion.xml.h:15 ../hacks/config/polyhedra.xml.h:166
+#: ../hacks/config/providence.xml.h:6 ../hacks/config/queens.xml.h:5
+#: ../hacks/config/rubikblocks.xml.h:19 ../hacks/config/sballs.xml.h:15
+#: ../hacks/config/sierpinski3d.xml.h:9 ../hacks/config/speedmine.xml.h:16
+#: ../hacks/config/spheremonics.xml.h:21 ../hacks/config/sproingies.xml.h:8
+#: ../hacks/config/stonerview.xml.h:5 ../hacks/config/superquadrics.xml.h:12
+#: ../hacks/config/tangram.xml.h:14 ../hacks/config/topblock.xml.h:23
+#: ../hacks/config/tronbit.xml.h:10
 msgid "Wireframe"
 msgstr ""
 
+#: ../hacks/config/atlantis.xml.h:20
+msgid ""
+"A 3D animation of a number of sharks, dolphins, and whales. Written by Mark "
+"Kilgard; 1998."
+msgstr ""
+
 #: ../hacks/config/attraction.xml.h:1
 msgid "Attraction"
 msgstr "Atrakcia"
 
-#: ../hacks/config/attraction.xml.h:2
-msgid "Ball count"
-msgstr ""
-
-#: ../hacks/config/attraction.xml.h:3
-msgid "Ball mass"
-msgstr ""
-
-#: ../hacks/config/attraction.xml.h:4 ../hacks/config/juggle.xml.h:1
-#: ../hacks/config/juggler3d.xml.h:1
+#: ../hacks/config/attraction.xml.h:2 ../hacks/config/juggle.xml.h:13
+#: ../hacks/config/juggler3d.xml.h:13
 msgid "Balls"
 msgstr "Lopty"
 
+#: ../hacks/config/attraction.xml.h:3 ../hacks/config/deluxe.xml.h:6
+#: ../hacks/config/lmorph.xml.h:12 ../hacks/config/pedal.xml.h:6
+#: ../hacks/config/starfish.xml.h:12 ../hacks/config/surfaces.xml.h:23
+#: ../hacks/config/whirlygig.xml.h:3
+msgid "Lines"
+msgstr "Čiary"
+
+#: ../hacks/config/attraction.xml.h:4
+msgid "Tails"
+msgstr "Chvosty"
+
 #: ../hacks/config/attraction.xml.h:5
-msgid "Bounce off walls"
-msgstr ""
+msgid "Polygons"
+msgstr "Mnohouholníky"
 
 #: ../hacks/config/attraction.xml.h:6
-msgid "Environmental viscosity"
+msgid "Splines"
 msgstr ""
 
-#: ../hacks/config/attraction.xml.h:8
+#: ../hacks/config/attraction.xml.h:7
 msgid "Filled splines"
 msgstr ""
 
-#: ../hacks/config/attraction.xml.h:10
+#: ../hacks/config/attraction.xml.h:8
+msgid "Bounce off walls"
+msgstr ""
+
+#: ../hacks/config/attraction.xml.h:9
 msgid "Ignore screen edges"
 msgstr ""
 
-#: ../hacks/config/attraction.xml.h:11
-msgid "Inward"
-msgstr "Vnútri"
+#: ../hacks/config/attraction.xml.h:10
+msgid "Ball count"
+msgstr ""
 
-#: ../hacks/config/attraction.xml.h:13 ../hacks/config/deluxe.xml.h:7
-#: ../hacks/config/lmorph.xml.h:9 ../hacks/config/pedal.xml.h:5
-#: ../hacks/config/starfish.xml.h:7 ../hacks/config/surfaces.xml.h:12
-#: ../hacks/config/whirlygig.xml.h:4
-msgid "Lines"
-msgstr "Čiary"
+#: ../hacks/config/attraction.xml.h:12
+msgid "Environmental viscosity"
+msgstr ""
 
 #. 
 #. <number id="eulerpower" type="slider" arg="-eulerpower %"
 #. _label="Power" _low-label="Low" _high-label="High"
 #. low="0.5" high="3.0" default="1.0"/>
 #. 
-#: ../hacks/config/attraction.xml.h:14 ../hacks/config/blocktube.xml.h:7
-#: ../hacks/config/braid.xml.h:7 ../hacks/config/celtic.xml.h:6
-#: ../hacks/config/cube21.xml.h:11 ../hacks/config/cynosure.xml.h:5
-#: ../hacks/config/drift.xml.h:6 ../hacks/config/eruption.xml.h:13
-#: ../hacks/config/euler2d.xml.h:16 ../hacks/config/fiberlamp.xml.h:7
-#: ../hacks/config/flow.xml.h:9 ../hacks/config/fontglide.xml.h:8
-#: ../hacks/config/galaxy.xml.h:6 ../hacks/config/glcells.xml.h:16
-#: ../hacks/config/juggle.xml.h:11 ../hacks/config/juggler3d.xml.h:12
-#: ../hacks/config/laser.xml.h:6 ../hacks/config/menger.xml.h:5
-#: ../hacks/config/metaballs.xml.h:6 ../hacks/config/mismunch.xml.h:4
-#: ../hacks/config/munch.xml.h:5 ../hacks/config/nerverot.xml.h:14
-#: ../hacks/config/petri.xml.h:10 ../hacks/config/photopile.xml.h:12
-#: ../hacks/config/pipes.xml.h:11 ../hacks/config/polyominoes.xml.h:5
-#: ../hacks/config/rotor.xml.h:5 ../hacks/config/rubikblocks.xml.h:8
-#: ../hacks/config/shadebobs.xml.h:5 ../hacks/config/sierpinski3d.xml.h:4
-#: ../hacks/config/skytentacles.xml.h:10 ../hacks/config/slidescreen.xml.h:10
-#: ../hacks/config/sonar.xml.h:8 ../hacks/config/spheremonics.xml.h:7
-#: ../hacks/config/substrate.xml.h:12 ../hacks/config/superquadrics.xml.h:6
-#: ../hacks/config/surfaces.xml.h:13 ../hacks/config/tangram.xml.h:7
-#: ../hacks/config/vermiculate.xml.h:3 ../hacks/config/wander.xml.h:9
-#: ../hacks/config/whirlwindwarp.xml.h:3 ../hacks/config/xlyap.xml.h:5
-msgid "Long"
-msgstr "Dlhý"
+#: ../hacks/config/attraction.xml.h:14 ../hacks/config/blocktube.xml.h:5
+#: ../hacks/config/braid.xml.h:5 ../hacks/config/celtic.xml.h:5
+#: ../hacks/config/cube21.xml.h:21 ../hacks/config/cynosure.xml.h:8
+#: ../hacks/config/drift.xml.h:5 ../hacks/config/eruption.xml.h:19
+#: ../hacks/config/euler2d.xml.h:13 ../hacks/config/fiberlamp.xml.h:8
+#: ../hacks/config/flow.xml.h:13 ../hacks/config/galaxy.xml.h:6
+#: ../hacks/config/glcells.xml.h:5 ../hacks/config/juggle.xml.h:8
+#: ../hacks/config/juggler3d.xml.h:8 ../hacks/config/laser.xml.h:6
+#: ../hacks/config/menger.xml.h:5 ../hacks/config/metaballs.xml.h:5
+#: ../hacks/config/mismunch.xml.h:5 ../hacks/config/munch.xml.h:5
+#: ../hacks/config/nerverot.xml.h:5 ../hacks/config/petri.xml.h:24
+#: ../hacks/config/photopile.xml.h:18 ../hacks/config/pipes.xml.h:8
+#: ../hacks/config/polyominoes.xml.h:6 ../hacks/config/rotor.xml.h:5
+#: ../hacks/config/rubikblocks.xml.h:15 ../hacks/config/shadebobs.xml.h:13
+#: ../hacks/config/sierpinski3d.xml.h:5 ../hacks/config/skytentacles.xml.h:5
+#: ../hacks/config/slidescreen.xml.h:5 ../hacks/config/sonar.xml.h:20
+#: ../hacks/config/spheremonics.xml.h:5 ../hacks/config/substrate.xml.h:5
+#: ../hacks/config/superquadrics.xml.h:9 ../hacks/config/surfaces.xml.h:5
+#: ../hacks/config/vermiculate.xml.h:2 ../hacks/config/wander.xml.h:6
+#: ../hacks/config/whirlwindwarp.xml.h:5
+msgid "Short"
+msgstr "Krátky"
 
-#: ../hacks/config/attraction.xml.h:18
-msgid "Orbital mode"
+#: ../hacks/config/attraction.xml.h:15 ../hacks/config/euler2d.xml.h:14
+#: ../hacks/config/juggle.xml.h:12 ../hacks/config/juggler3d.xml.h:12
+#: ../hacks/config/sonar.xml.h:21
+msgid "Trail length"
 msgstr ""
 
-#: ../hacks/config/attraction.xml.h:19
-msgid "Outward"
-msgstr "Von"
+#. 
+#. <number id="eulerpower" type="slider" arg="-eulerpower %"
+#. _label="Power" _low-label="Low" _high-label="High"
+#. low="0.5" high="3.0" default="1.0"/>
+#. 
+#: ../hacks/config/attraction.xml.h:16 ../hacks/config/blocktube.xml.h:7
+#: ../hacks/config/braid.xml.h:7 ../hacks/config/celtic.xml.h:7
+#: ../hacks/config/cube21.xml.h:23 ../hacks/config/cynosure.xml.h:10
+#: ../hacks/config/drift.xml.h:7 ../hacks/config/eruption.xml.h:21
+#: ../hacks/config/euler2d.xml.h:20 ../hacks/config/fiberlamp.xml.h:10
+#: ../hacks/config/flow.xml.h:15 ../hacks/config/fontglide.xml.h:13
+#: ../hacks/config/galaxy.xml.h:8 ../hacks/config/glcells.xml.h:7
+#: ../hacks/config/juggle.xml.h:10 ../hacks/config/juggler3d.xml.h:10
+#: ../hacks/config/laser.xml.h:8 ../hacks/config/menger.xml.h:7
+#: ../hacks/config/metaballs.xml.h:7 ../hacks/config/mismunch.xml.h:7
+#: ../hacks/config/munch.xml.h:7 ../hacks/config/nerverot.xml.h:7
+#: ../hacks/config/petri.xml.h:26 ../hacks/config/photopile.xml.h:20
+#: ../hacks/config/pipes.xml.h:10 ../hacks/config/polyominoes.xml.h:8
+#: ../hacks/config/rotor.xml.h:7 ../hacks/config/rubikblocks.xml.h:17
+#: ../hacks/config/shadebobs.xml.h:15 ../hacks/config/sierpinski3d.xml.h:7
+#: ../hacks/config/skytentacles.xml.h:7 ../hacks/config/slidescreen.xml.h:7
+#: ../hacks/config/sonar.xml.h:22 ../hacks/config/spheremonics.xml.h:7
+#: ../hacks/config/substrate.xml.h:7 ../hacks/config/superquadrics.xml.h:11
+#: ../hacks/config/surfaces.xml.h:7 ../hacks/config/tangram.xml.h:7
+#: ../hacks/config/vermiculate.xml.h:4 ../hacks/config/wander.xml.h:8
+#: ../hacks/config/whirlwindwarp.xml.h:7 ../hacks/config/xlyap.xml.h:7
+msgid "Long"
+msgstr "Dlhý"
 
 #: ../hacks/config/attraction.xml.h:20
-msgid "Polygons"
-msgstr "Mnohouholníky"
-
-#: ../hacks/config/attraction.xml.h:21 ../hacks/config/fuzzyflakes.xml.h:18
-msgid "Radius"
-msgstr "Polomer"
+msgid "Ball mass"
+msgstr ""
 
 #: ../hacks/config/attraction.xml.h:22
 msgid "Repulsion threshold"
 msgstr ""
 
-#. 
-#. <number id="eulerpower" type="slider" arg="-eulerpower %"
-#. _label="Power" _low-label="Low" _high-label="High"
-#. low="0.5" high="3.0" default="1.0"/>
-#. 
-#: ../hacks/config/attraction.xml.h:23 ../hacks/config/blocktube.xml.h:9
-#: ../hacks/config/braid.xml.h:12 ../hacks/config/celtic.xml.h:9
-#: ../hacks/config/cube21.xml.h:16 ../hacks/config/cynosure.xml.h:10
-#: ../hacks/config/drift.xml.h:10 ../hacks/config/eruption.xml.h:21
-#: ../hacks/config/euler2d.xml.h:26 ../hacks/config/fiberlamp.xml.h:10
-#: ../hacks/config/flow.xml.h:17 ../hacks/config/galaxy.xml.h:11
-#: ../hacks/config/glcells.xml.h:29 ../hacks/config/juggle.xml.h:17
-#: ../hacks/config/juggler3d.xml.h:18 ../hacks/config/laser.xml.h:10
-#: ../hacks/config/menger.xml.h:16 ../hacks/config/metaballs.xml.h:14
-#: ../hacks/config/mismunch.xml.h:9 ../hacks/config/munch.xml.h:13
-#: ../hacks/config/nerverot.xml.h:20 ../hacks/config/petri.xml.h:23
-#: ../hacks/config/photopile.xml.h:17 ../hacks/config/pipes.xml.h:19
-#: ../hacks/config/polyominoes.xml.h:11 ../hacks/config/rotor.xml.h:10
-#: ../hacks/config/rubikblocks.xml.h:13 ../hacks/config/shadebobs.xml.h:13
-#: ../hacks/config/sierpinski3d.xml.h:7 ../hacks/config/skytentacles.xml.h:12
-#: ../hacks/config/slidescreen.xml.h:13 ../hacks/config/sonar.xml.h:19
-#: ../hacks/config/spheremonics.xml.h:17 ../hacks/config/substrate.xml.h:16
-#: ../hacks/config/superquadrics.xml.h:9 ../hacks/config/surfaces.xml.h:21
-#: ../hacks/config/vermiculate.xml.h:4 ../hacks/config/wander.xml.h:11
-#: ../hacks/config/whirlwindwarp.xml.h:6
-msgid "Short"
-msgstr "Krátky"
+#: ../hacks/config/attraction.xml.h:27
+msgid "Orbital mode"
+msgstr ""
+
+#: ../hacks/config/attraction.xml.h:28 ../hacks/config/fuzzyflakes.xml.h:26
+msgid "Radius"
+msgstr "Polomer"
 
 #: ../hacks/config/attraction.xml.h:29
-msgid "Splines"
-msgstr ""
+msgid "Outward"
+msgstr "Von"
 
 #: ../hacks/config/attraction.xml.h:30
-msgid "Tails"
-msgstr "Chvosty"
-
-#: ../hacks/config/attraction.xml.h:31 ../hacks/config/euler2d.xml.h:30
-#: ../hacks/config/juggle.xml.h:22 ../hacks/config/juggler3d.xml.h:22
-#: ../hacks/config/sonar.xml.h:31
-msgid "Trail length"
-msgstr ""
+msgid "Inward"
+msgstr "Vnútri"
 
 #: ../hacks/config/attraction.xml.h:33
 msgid ""
@@ -2326,40 +2381,44 @@
 msgid "Atunnel"
 msgstr ""
 
-#: ../hacks/config/atunnel.xml.h:2
-msgid ""
-"Draws an animation of a textured tunnel in GL. Written by Eric Lassauge and "
-"Roman Podobedov; 2003."
+#: ../hacks/config/atunnel.xml.h:5 ../hacks/config/blocktube.xml.h:9
+#: ../hacks/config/cubenetic.xml.h:24 ../hacks/config/glmatrix.xml.h:18
+#: ../hacks/config/lament.xml.h:5 ../hacks/config/sballs.xml.h:14
+msgid "Textured"
 msgstr ""
 
-#: ../hacks/config/atunnel.xml.h:5 ../hacks/config/boing.xml.h:4
-#: ../hacks/config/crackberg.xml.h:14 ../hacks/config/glplanet.xml.h:7
+#: ../hacks/config/atunnel.xml.h:6 ../hacks/config/boing.xml.h:11
+#: ../hacks/config/crackberg.xml.h:12 ../hacks/config/glplanet.xml.h:11
 msgid "Lighting"
 msgstr ""
 
-#: ../hacks/config/atunnel.xml.h:8 ../hacks/config/blocktube.xml.h:11
-#: ../hacks/config/cubenetic.xml.h:25 ../hacks/config/glmatrix.xml.h:19
-#: ../hacks/config/lament.xml.h:8 ../hacks/config/sballs.xml.h:16
-msgid "Textured"
+#: ../hacks/config/atunnel.xml.h:9
+msgid ""
+"Draws an animation of a textured tunnel in GL. Written by Eric Lassauge and "
+"Roman Podobedov; 2003."
 msgstr ""
 
 #: ../hacks/config/barcode.xml.h:1
 msgid "Barcode"
 msgstr ""
 
-#: ../hacks/config/barcode.xml.h:2
-msgid "Barcode clock (24 hour)"
+#: ../hacks/config/barcode.xml.h:5
+msgid "Scrolling barcodes"
+msgstr ""
+
+#: ../hacks/config/barcode.xml.h:6
+msgid "Barcode grid"
 msgstr ""
 
-#: ../hacks/config/barcode.xml.h:3
+#: ../hacks/config/barcode.xml.h:7
 msgid "Barcode clock (AM/PM)"
 msgstr ""
 
-#: ../hacks/config/barcode.xml.h:4
-msgid "Barcode grid"
+#: ../hacks/config/barcode.xml.h:8
+msgid "Barcode clock (24 hour)"
 msgstr ""
 
-#: ../hacks/config/barcode.xml.h:5
+#: ../hacks/config/barcode.xml.h:10
 msgid ""
 "Draws a random sequence of colorful barcodes scrolling across your screen. "
 "CONSUME! The barcodes follow the UPC-A, UPC-E, EAN-8 or EAN-13 standards. "
@@ -2368,46 +2427,38 @@
 "Bornstein; 2003."
 msgstr ""
 
-#: ../hacks/config/barcode.xml.h:9
-msgid "Scrolling barcodes"
-msgstr ""
-
 #: ../hacks/config/blaster.xml.h:1
 msgid "Blaster"
 msgstr ""
 
-#: ../hacks/config/blaster.xml.h:2
-msgid ""
-"Draws a simulation of flying space-combat robots (cleverly disguised as "
-"colored circles) doing battle in front of a moving star field. Written by "
-"Jonathan Lin; 1999."
-msgstr ""
+#: ../hacks/config/blaster.xml.h:5
+msgid "Robots"
+msgstr "Roboty"
 
-#: ../hacks/config/blaster.xml.h:6 ../hacks/config/penetrate.xml.h:4
+#: ../hacks/config/blaster.xml.h:6 ../hacks/config/penetrate.xml.h:5
 msgid "Lasers"
 msgstr "Lasery"
 
-#: ../hacks/config/blaster.xml.h:9
-msgid "Robots"
-msgstr "Roboty"
-
-#: ../hacks/config/blaster.xml.h:12 ../hacks/config/glplanet.xml.h:12
+#: ../hacks/config/blaster.xml.h:8 ../hacks/config/glplanet.xml.h:10
 msgid "Stars"
 msgstr "Hviezdy"
 
+#: ../hacks/config/blaster.xml.h:12
+msgid ""
+"Draws a simulation of flying space-combat robots (cleverly disguised as "
+"colored circles) doing battle in front of a moving star field. Written by "
+"Jonathan Lin; 1999."
+msgstr ""
+
 #: ../hacks/config/blinkbox.xml.h:1
 msgid "BlinkBox"
 msgstr ""
 
-#: ../hacks/config/blinkbox.xml.h:2
+#: ../hacks/config/blinkbox.xml.h:6
 msgid "Box size"
 msgstr ""
 
-#: ../hacks/config/blinkbox.xml.h:3
-msgid "Dissolve"
-msgstr ""
-
-#: ../hacks/config/blinkbox.xml.h:4 ../hacks/config/phosphor.xml.h:2
+#: ../hacks/config/blinkbox.xml.h:8 ../hacks/config/phosphor.xml.h:7
 msgid "Fade"
 msgstr ""
 
@@ -2415,36 +2466,36 @@
 msgid "Motion blur"
 msgstr ""
 
-#: ../hacks/config/blinkbox.xml.h:11
+#: ../hacks/config/blinkbox.xml.h:10
+msgid "Dissolve"
+msgstr ""
+
+#: ../hacks/config/blinkbox.xml.h:13
 msgid ""
 "Shows a ball contained inside of a bounding box. Colored blocks blink in "
 "when the ball hits the sides. Written by Jeremy English; 2003."
 msgstr ""
 
-#: ../hacks/config/blitspin.xml.h:1 ../hacks/config/bumps.xml.h:1
-#: ../hacks/config/decayscreen.xml.h:1 ../hacks/config/distort.xml.h:1
-#: ../hacks/config/ripples.xml.h:1 ../hacks/config/rotzoomer.xml.h:1
-#: ../hacks/config/slidescreen.xml.h:1 ../hacks/config/spotlight.xml.h:1
-#: ../hacks/config/twang.xml.h:1 ../hacks/config/zoom.xml.h:5
-msgid "10 minutes"
+#: ../hacks/config/blitspin.xml.h:1
+msgid "BlitSpin"
 msgstr ""
 
-#: ../hacks/config/blitspin.xml.h:2 ../hacks/config/bumps.xml.h:2
-#: ../hacks/config/decayscreen.xml.h:2 ../hacks/config/distort.xml.h:2
-#: ../hacks/config/flame.xml.h:2 ../hacks/config/gleidescope.xml.h:1
-#: ../hacks/config/glslideshow.xml.h:2 ../hacks/config/maze.xml.h:2
-#: ../hacks/config/ripples.xml.h:2 ../hacks/config/rotzoomer.xml.h:2
-#: ../hacks/config/slidescreen.xml.h:2 ../hacks/config/spotlight.xml.h:2
-#: ../hacks/config/twang.xml.h:2 ../hacks/config/zoom.xml.h:6
-msgid "10 seconds"
+#: ../hacks/config/blitspin.xml.h:3
+msgid "Fuzzy rotation speed"
 msgstr ""
 
-#: ../hacks/config/blitspin.xml.h:3
+#: ../hacks/config/blitspin.xml.h:5
 msgid "90 degree rotation speed"
 msgstr ""
 
-#: ../hacks/config/blitspin.xml.h:4
-msgid "BlitSpin"
+#: ../hacks/config/blitspin.xml.h:6 ../hacks/config/bumps.xml.h:8
+#: ../hacks/config/decayscreen.xml.h:5 ../hacks/config/distort.xml.h:5
+#: ../hacks/config/flame.xml.h:7 ../hacks/config/gleidescope.xml.h:8
+#: ../hacks/config/glslideshow.xml.h:5 ../hacks/config/maze.xml.h:7
+#: ../hacks/config/ripples.xml.h:5 ../hacks/config/rotzoomer.xml.h:5
+#: ../hacks/config/slidescreen.xml.h:8 ../hacks/config/spotlight.xml.h:5
+#: ../hacks/config/twang.xml.h:5 ../hacks/config/zoom.xml.h:5
+msgid "10 seconds"
 msgstr ""
 
 #. 
@@ -2452,35 +2503,39 @@
 #. _label="Power" _low-label="Low" _high-label="High"
 #. low="0.5" high="3.0" default="1.0"/>
 #. 
-#: ../hacks/config/blitspin.xml.h:5 ../hacks/config/braid.xml.h:3
-#: ../hacks/config/bsod.xml.h:10 ../hacks/config/bumps.xml.h:5
-#: ../hacks/config/cynosure.xml.h:2 ../hacks/config/decayscreen.xml.h:4
-#: ../hacks/config/deco.xml.h:4 ../hacks/config/distort.xml.h:6
-#: ../hacks/config/drift.xml.h:3 ../hacks/config/eruption.xml.h:2
-#: ../hacks/config/euler2d.xml.h:6 ../hacks/config/galaxy.xml.h:2
-#: ../hacks/config/glsnake.xml.h:6 ../hacks/config/hopalong.xml.h:2
-#: ../hacks/config/laser.xml.h:2 ../hacks/config/menger.xml.h:2
-#: ../hacks/config/metaballs.xml.h:3 ../hacks/config/mismunch.xml.h:1
-#: ../hacks/config/moire.xml.h:3 ../hacks/config/molecule.xml.h:11
-#: ../hacks/config/munch.xml.h:2 ../hacks/config/nerverot.xml.h:8
-#: ../hacks/config/pedal.xml.h:3 ../hacks/config/polyhedra.xml.h:15
-#: ../hacks/config/polyominoes.xml.h:1 ../hacks/config/ripples.xml.h:6
-#: ../hacks/config/rotzoomer.xml.h:5 ../hacks/config/shadebobs.xml.h:2
-#: ../hacks/config/sierpinski3d.xml.h:1 ../hacks/config/slidescreen.xml.h:4
-#: ../hacks/config/spheremonics.xml.h:4 ../hacks/config/spotlight.xml.h:4
-#: ../hacks/config/starfish.xml.h:4 ../hacks/config/substrate.xml.h:7
-#: ../hacks/config/superquadrics.xml.h:2 ../hacks/config/surfaces.xml.h:5
-#: ../hacks/config/twang.xml.h:5 ../hacks/config/vermiculate.xml.h:2
-#: ../hacks/config/vidwhacker.xml.h:3 ../hacks/config/wander.xml.h:5
-#: ../hacks/config/zoom.xml.h:7
+#: ../hacks/config/blitspin.xml.h:7 ../hacks/config/braid.xml.h:6
+#: ../hacks/config/bsod.xml.h:3 ../hacks/config/bumps.xml.h:9
+#: ../hacks/config/cynosure.xml.h:9 ../hacks/config/decayscreen.xml.h:6
+#: ../hacks/config/deco.xml.h:3 ../hacks/config/distort.xml.h:6
+#: ../hacks/config/drift.xml.h:6 ../hacks/config/eruption.xml.h:20
+#: ../hacks/config/euler2d.xml.h:26 ../hacks/config/galaxy.xml.h:7
+#: ../hacks/config/glsnake.xml.h:6 ../hacks/config/hopalong.xml.h:6
+#: ../hacks/config/laser.xml.h:7 ../hacks/config/menger.xml.h:6
+#: ../hacks/config/metaballs.xml.h:6 ../hacks/config/mismunch.xml.h:6
+#: ../hacks/config/moire.xml.h:3 ../hacks/config/molecule.xml.h:6
+#: ../hacks/config/munch.xml.h:6 ../hacks/config/nerverot.xml.h:6
+#: ../hacks/config/pedal.xml.h:3 ../hacks/config/polyhedra.xml.h:9
+#: ../hacks/config/polyominoes.xml.h:7 ../hacks/config/ripples.xml.h:6
+#: ../hacks/config/rotzoomer.xml.h:6 ../hacks/config/shadebobs.xml.h:14
+#: ../hacks/config/sierpinski3d.xml.h:6 ../hacks/config/slidescreen.xml.h:9
+#: ../hacks/config/spheremonics.xml.h:6 ../hacks/config/spotlight.xml.h:6
+#: ../hacks/config/starfish.xml.h:9 ../hacks/config/substrate.xml.h:6
+#: ../hacks/config/superquadrics.xml.h:10 ../hacks/config/surfaces.xml.h:6
+#: ../hacks/config/twang.xml.h:6 ../hacks/config/vermiculate.xml.h:3
+#: ../hacks/config/vidwhacker.xml.h:3 ../hacks/config/wander.xml.h:7
+#: ../hacks/config/zoom.xml.h:6
 msgid "Duration"
 msgstr "Trvanie"
 
-#: ../hacks/config/blitspin.xml.h:7
-msgid "Fuzzy rotation speed"
+#: ../hacks/config/blitspin.xml.h:8 ../hacks/config/bumps.xml.h:10
+#: ../hacks/config/decayscreen.xml.h:7 ../hacks/config/distort.xml.h:7
+#: ../hacks/config/ripples.xml.h:7 ../hacks/config/rotzoomer.xml.h:7
+#: ../hacks/config/slidescreen.xml.h:10 ../hacks/config/spotlight.xml.h:7
+#: ../hacks/config/twang.xml.h:7 ../hacks/config/zoom.xml.h:7
+msgid "10 minutes"
 msgstr ""
 
-#: ../hacks/config/blitspin.xml.h:8
+#: ../hacks/config/blitspin.xml.h:10
 msgid ""
 "Repeatedly rotates a bitmap by 90 degrees by using logical operations: the "
 "bitmap is divided into quadrants, and the quadrants are shifted clockwise. "
@@ -2494,15 +2549,15 @@
 msgid "BlockTube"
 msgstr ""
 
-#: ../hacks/config/blocktube.xml.h:2
-msgid "Color change time"
+#: ../hacks/config/blocktube.xml.h:6
+msgid "Color hold time"
 msgstr ""
 
-#: ../hacks/config/blocktube.xml.h:3
-msgid "Color hold time"
+#: ../hacks/config/blocktube.xml.h:8
+msgid "Color change time"
 msgstr ""
 
-#: ../hacks/config/blocktube.xml.h:4
+#: ../hacks/config/blocktube.xml.h:12
 msgid ""
 "Draws a swirling, falling tunnel of reflective slabs. They fade from hue to "
 "hue. Written by Lars R. Damerow; 2003."
@@ -2512,36 +2567,41 @@
 msgid "Boing"
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:3 ../hacks/config/boxed.xml.h:12
-#: ../hacks/config/glcells.xml.h:12 ../hacks/config/pinion.xml.h:8
-#: ../hacks/config/sonar.xml.h:7
+#: ../hacks/config/boing.xml.h:2 ../hacks/config/boxed.xml.h:11
+#: ../hacks/config/pinion.xml.h:9 ../hacks/config/sonar.xml.h:17
+msgid "Tiny"
+msgstr ""
+
+#: ../hacks/config/boing.xml.h:3 ../hacks/config/lisa.xml.h:11
+#: ../hacks/config/lissie.xml.h:14 ../hacks/config/loop.xml.h:11
+#: ../hacks/config/rotor.xml.h:12 ../hacks/config/rubik.xml.h:9
+#: ../hacks/config/wander.xml.h:11 ../hacks/config/worm.xml.h:9
+msgid "Size"
+msgstr "Veľkosť"
+
+#: ../hacks/config/boing.xml.h:4 ../hacks/config/boxed.xml.h:13
+#: ../hacks/config/glcells.xml.h:13 ../hacks/config/pinion.xml.h:11
+#: ../hacks/config/sonar.xml.h:19
 msgid "Huge"
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:5
+#: ../hacks/config/boing.xml.h:8
 msgid "Meridians"
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:6
+#: ../hacks/config/boing.xml.h:9
 msgid "Parallels"
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:7
-msgid "Scanlines"
+#: ../hacks/config/boing.xml.h:10
+msgid "Smoothing"
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:9 ../hacks/config/lisa.xml.h:13
-#: ../hacks/config/lissie.xml.h:12 ../hacks/config/loop.xml.h:11
-#: ../hacks/config/rotor.xml.h:12 ../hacks/config/rubik.xml.h:12
-#: ../hacks/config/wander.xml.h:13 ../hacks/config/worm.xml.h:9
-msgid "Size"
-msgstr "Veľkosť"
-
-#: ../hacks/config/boing.xml.h:11
-msgid "Smoothing"
+#: ../hacks/config/boing.xml.h:12
+msgid "Scanlines"
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:13
+#: ../hacks/config/boing.xml.h:15
 msgid ""
 "This bouncing ball is a clone of the first graphics demo for the Amiga 1000, "
 "which was written by Dale Luck and RJ Mical during a break at the 1984 "
@@ -2552,146 +2612,149 @@
 "2005."
 msgstr ""
 
-#: ../hacks/config/boing.xml.h:14 ../hacks/config/boxed.xml.h:24
-#: ../hacks/config/pinion.xml.h:16 ../hacks/config/sonar.xml.h:30
-msgid "Tiny"
-msgstr ""
-
 #: ../hacks/config/bouboule.xml.h:1
 msgid "Bouboule"
 msgstr ""
 
-#: ../hacks/config/bouboule.xml.h:2 ../hacks/config/rocks.xml.h:2
-msgid "Do Red/Blue 3D separation"
+#: ../hacks/config/bouboule.xml.h:6
+msgid "Number of spots"
 msgstr ""
 
-#: ../hacks/config/bouboule.xml.h:9
-msgid "Number of spots"
+#: ../hacks/config/bouboule.xml.h:10 ../hacks/config/rocks.xml.h:13
+msgid "Do Red/Blue 3D separation"
 msgstr ""
 
-#: ../hacks/config/bouboule.xml.h:11
+#: ../hacks/config/bouboule.xml.h:12
 msgid ""
 "This draws what looks like a spinning, deforming balloon with varying-sized "
 "spots painted on its invisible surface. Written by Jeremie Petit; 1997."
 msgstr ""
 
 #: ../hacks/config/bouncingcow.xml.h:1
-msgid ""
-"A Cow. A Trampoline. Together, they fight crime. Written by Jamie Zawinski; "
-"2003."
+msgid "BouncingCow"
 msgstr ""
 
-#: ../hacks/config/bouncingcow.xml.h:2
+#: ../hacks/config/bouncingcow.xml.h:6
 msgid "Bounce speed"
 msgstr ""
 
-#: ../hacks/config/bouncingcow.xml.h:3
-msgid "BouncingCow"
-msgstr ""
-
-#: ../hacks/config/bouncingcow.xml.h:6
-msgid "Herd"
+#: ../hacks/config/bouncingcow.xml.h:8
+msgid "Moo"
 msgstr ""
 
 #: ../hacks/config/bouncingcow.xml.h:9
-msgid "Moo"
+msgid "Number of cows"
 msgstr ""
 
 #: ../hacks/config/bouncingcow.xml.h:10
-msgid "Number of cows"
+msgid "Herd"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:1 ../hacks/config/fluidballs.xml.h:2
-msgid "Ball size"
+#: ../hacks/config/bouncingcow.xml.h:13
+msgid ""
+"A Cow. A Trampoline. Together, they fight crime. Written by Jamie Zawinski; "
+"2003."
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:2
+#: ../hacks/config/boxed.xml.h:1
 msgid "Boxed"
 msgstr "V krabici"
 
-#: ../hacks/config/boxed.xml.h:3
-msgid ""
-"Draws a box full of 3D bouncing balls that explode. Written by Sander van "
-"Grieken; 2002."
-msgstr ""
-
-#: ../hacks/config/boxed.xml.h:4
-msgid "Explosion decay"
+#: ../hacks/config/boxed.xml.h:9 ../hacks/config/fluidballs.xml.h:6
+msgid "Number of balls"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:5
-msgid "Explosion force"
+#: ../hacks/config/boxed.xml.h:10 ../hacks/config/circuit.xml.h:7
+#: ../hacks/config/glschool.xml.h:7 ../hacks/config/julia.xml.h:7
+#: ../hacks/config/mountain.xml.h:7 ../hacks/config/pipes.xml.h:13
+#: ../hacks/config/sproingies.xml.h:6 ../hacks/config/substrate.xml.h:10
+#: ../hacks/config/wormhole.xml.h:10
+msgid "Lots"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:6
-msgid "Explosion momentum"
+#: ../hacks/config/boxed.xml.h:12 ../hacks/config/fluidballs.xml.h:9
+msgid "Ball size"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:10 ../hacks/config/xmatrix.xml.h:6
-msgid "Full"
-msgstr ""
+#: ../hacks/config/boxed.xml.h:14 ../hacks/config/hopalong.xml.h:14
+msgid "Popcorn"
+msgstr "Pukance"
 
-#: ../hacks/config/boxed.xml.h:14 ../hacks/config/circuit.xml.h:8
-#: ../hacks/config/glschool.xml.h:12 ../hacks/config/julia.xml.h:9
-#: ../hacks/config/mountain.xml.h:4 ../hacks/config/pipes.xml.h:12
-#: ../hacks/config/sproingies.xml.h:4 ../hacks/config/substrate.xml.h:13
-#: ../hacks/config/wormhole.xml.h:6
-msgid "Lots"
+#: ../hacks/config/boxed.xml.h:15
+msgid "Explosion force"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:17
+#: ../hacks/config/boxed.xml.h:16
 msgid "Nuke"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:18 ../hacks/config/fluidballs.xml.h:16
-msgid "Number of balls"
+#: ../hacks/config/boxed.xml.h:18
+msgid "Explosion decay"
 msgstr ""
 
 #: ../hacks/config/boxed.xml.h:19
 msgid "Pop!"
 msgstr ""
 
-#: ../hacks/config/boxed.xml.h:20 ../hacks/config/hopalong.xml.h:18
-msgid "Popcorn"
-msgstr "Pukance"
+#: ../hacks/config/boxed.xml.h:21
+msgid "Explosion momentum"
+msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:1 ../hacks/config/popsquares.xml.h:1
-msgid "Border"
+#: ../hacks/config/boxed.xml.h:22 ../hacks/config/xmatrix.xml.h:20
+msgid "Full"
+msgstr ""
+
+#: ../hacks/config/boxed.xml.h:25
+msgid ""
+"Draws a box full of 3D bouncing balls that explode. Written by Sander van "
+"Grieken; 2002."
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:2
+#: ../hacks/config/boxfit.xml.h:1
 msgid "BoxFit"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:3 ../hacks/config/cubenetic.xml.h:1
+#: ../hacks/config/boxfit.xml.h:5 ../hacks/config/cubenetic.xml.h:6
 msgid "Boxes"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:4
-msgid "Boxes only"
+#: ../hacks/config/boxfit.xml.h:6
+msgid "Grow by"
+msgstr ""
+
+#: ../hacks/config/boxfit.xml.h:7
+msgid "Spacing"
+msgstr ""
+
+#: ../hacks/config/boxfit.xml.h:8 ../hacks/config/popsquares.xml.h:6
+msgid "Border"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:5
+#: ../hacks/config/boxfit.xml.h:9
 msgid "Boxes or circles"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:6
+#: ../hacks/config/boxfit.xml.h:10
+msgid "Boxes only"
+msgstr ""
+
+#: ../hacks/config/boxfit.xml.h:11
 msgid "Circles only"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:7
+#: ../hacks/config/boxfit.xml.h:12
 msgid "Color gradient"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:9
+#: ../hacks/config/boxfit.xml.h:13
 msgid "Grab images"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:10
-msgid "Grow by"
+#: ../hacks/config/boxfit.xml.h:14
+msgid "Peek at underlying images"
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:13
+#: ../hacks/config/boxfit.xml.h:16
 msgid ""
 "Packs the screen with growing squares or circles, colored according to a "
 "horizontal or vertical gradient, or according to the colors of the desktop "
@@ -2700,207 +2763,199 @@
 "Jamie Zawinski; 2005."
 msgstr ""
 
-#: ../hacks/config/boxfit.xml.h:14
-msgid "Peek at underlying images"
-msgstr ""
-
-#: ../hacks/config/boxfit.xml.h:16
-msgid "Spacing"
-msgstr ""
-
 #: ../hacks/config/braid.xml.h:1
 msgid "Braid"
 msgstr ""
 
-#: ../hacks/config/braid.xml.h:2
-msgid ""
-"Draws random color-cycling inter-braided concentric circles. Written by John "
-"Neil; 1997."
+#: ../hacks/config/braid.xml.h:11
+msgid "Number of rings"
 msgstr ""
 
-#: ../hacks/config/braid.xml.h:6 ../hacks/config/epicycle.xml.h:7
-#: ../hacks/config/nerverot.xml.h:13
+#: ../hacks/config/braid.xml.h:12 ../hacks/config/epicycle.xml.h:11
+#: ../hacks/config/hilbert.xml.h:16 ../hacks/config/nerverot.xml.h:20
 msgid "Line thickness"
 msgstr ""
 
-#: ../hacks/config/braid.xml.h:11
-msgid "Number of rings"
+#: ../hacks/config/braid.xml.h:14
+msgid ""
+"Draws random color-cycling inter-braided concentric circles. Written by John "
+"Neil; 1997."
 msgstr ""
 
-#: ../hacks/config/bsod.xml.h:1 ../hacks/config/m6502.xml.h:1
-#: ../hacks/config/molecule.xml.h:1 ../hacks/config/vidwhacker.xml.h:1
-msgid "2 minutes"
-msgstr "2 minúty"
-
-#: ../hacks/config/bsod.xml.h:2 ../hacks/config/carousel.xml.h:2
-#: ../hacks/config/m6502.xml.h:2 ../hacks/config/molecule.xml.h:2
-msgid "5 seconds"
-msgstr "5 sekúnd"
-
-#: ../hacks/config/bsod.xml.h:3
-msgid "ATM"
-msgstr ""
+#: ../hacks/config/bsod.xml.h:1
+msgid "BSOD"
+msgstr "BSOD"
 
-#: ../hacks/config/bsod.xml.h:4
-msgid "AmigaDOS"
-msgstr "AmigaDOS"
+#: ../hacks/config/bsod.xml.h:2 ../hacks/config/carousel.xml.h:8
+#: ../hacks/config/m6502.xml.h:2 ../hacks/config/molecule.xml.h:5
+msgid "5 seconds"
+msgstr "5 sekúnd"
 
-#: ../hacks/config/bsod.xml.h:5
-msgid "Apple ]["
-msgstr ""
+#: ../hacks/config/bsod.xml.h:4 ../hacks/config/m6502.xml.h:4
+#: ../hacks/config/molecule.xml.h:7 ../hacks/config/vidwhacker.xml.h:4
+msgid "2 minutes"
+msgstr "2 minúty"
 
 #: ../hacks/config/bsod.xml.h:6
-msgid "Atari"
-msgstr "Atari"
+msgid "Windows 3.1"
+msgstr ""
 
 #: ../hacks/config/bsod.xml.h:7
-msgid "BSD"
-msgstr "BSD"
+msgid "Windows NT"
+msgstr "Windows NT"
 
 #: ../hacks/config/bsod.xml.h:8
-msgid "BSOD"
-msgstr "BSOD"
+msgid "Windows 2000  "
+msgstr ""
 
 #: ../hacks/config/bsod.xml.h:9
-msgid ""
-"BSOD stands for \"Blue Screen of Death\". The finest in personal computer "
-"emulation, BSOD simulates popular screen savers from a number of less robust "
-"operating systems. Written by Jamie Zawinski; 1998."
+msgid "MS-DOS"
 msgstr ""
 
+#: ../hacks/config/bsod.xml.h:10
+msgid "AmigaDOS"
+msgstr "AmigaDOS"
+
 #: ../hacks/config/bsod.xml.h:11
 msgid "GLaDOS"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:12
-msgid "HPUX"
+msgid "Apple ]["
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:13
-msgid "HVX/GCOS6"
+msgid "NVidia"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:14
-msgid "Linux (fsck)"
+msgid "OS/2"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:15
-msgid "Linux (hppa)"
+msgid "Sad Mac"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:16
-msgid "Linux (sparc)"
+msgid "Mac bomb"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:17
-msgid "MS-DOS"
-msgstr ""
+msgid "MacsBug"
+msgstr "MacsBug"
 
 #: ../hacks/config/bsod.xml.h:18
-msgid "Mac bomb"
-msgstr ""
+msgid "Atari"
+msgstr "Atari"
 
 #: ../hacks/config/bsod.xml.h:19
 msgid "MacOS X"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:20
-msgid "MacsBug"
-msgstr "MacsBug"
+msgid "OS/390"
+msgstr ""
 
 #: ../hacks/config/bsod.xml.h:21
-msgid "NCD X Terminal  "
+msgid "VMS"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:22
-msgid "NVidia"
+msgid "HVX/GCOS6"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:23
-msgid "OS/2"
+msgid "NCD X Terminal  "
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:24
-msgid "OS/390"
+msgid "ATM"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:25
-msgid "SCO"
-msgstr "SCO"
+msgid "BSD"
+msgstr "BSD"
 
 #: ../hacks/config/bsod.xml.h:26
-msgid "Sad Mac"
+msgid "Linux (fsck)"
+msgstr ""
+
+#: ../hacks/config/bsod.xml.h:27
+msgid "Linux (sparc)"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:28
-msgid "Solaris"
-msgstr "Solaris"
+msgid "Linux (hppa)"
+msgstr ""
 
 #: ../hacks/config/bsod.xml.h:29
-msgid "Tru64"
-msgstr ""
+msgid "Solaris"
+msgstr "Solaris"
 
 #: ../hacks/config/bsod.xml.h:30
-msgid "VMS"
-msgstr ""
+msgid "SCO"
+msgstr "SCO"
 
 #: ../hacks/config/bsod.xml.h:31
-msgid "Windows 2000  "
+msgid "HPUX"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:32
-msgid "Windows 3.1"
+msgid "Tru64"
 msgstr ""
 
 #: ../hacks/config/bsod.xml.h:33
-msgid "Windows NT"
-msgstr "Windows NT"
-
-#: ../hacks/config/bubble3d.xml.h:1
-msgid "Bubble color"
+msgid ""
+"BSOD stands for \"Blue Screen of Death\". The finest in personal computer "
+"emulation, BSOD simulates popular screen savers from a number of less robust "
+"operating systems. Written by Jamie Zawinski; 1998."
 msgstr ""
 
-#: ../hacks/config/bubble3d.xml.h:2
+#: ../hacks/config/bubble3d.xml.h:1
 msgid "Bubble3D"
 msgstr "Trojrozmerné bubliny"
 
-#: ../hacks/config/bubble3d.xml.h:3
+#: ../hacks/config/bubble3d.xml.h:5
+msgid "Transparent bubbles"
+msgstr ""
+
+#: ../hacks/config/bubble3d.xml.h:6
+msgid "Bubble color"
+msgstr ""
+
+#: ../hacks/config/bubble3d.xml.h:8
 msgid ""
 "Draws a stream of rising, undulating 3D bubbles, rising toward the top of "
 "the screen, with transparency and specular reflections. Written by Richard "
 "Jones; 1998."
 msgstr ""
 
-#: ../hacks/config/bubble3d.xml.h:8
-msgid "Transparent bubbles"
-msgstr ""
-
 #: ../hacks/config/bubbles.xml.h:1
 msgid "Bubbles"
 msgstr "Bubliny"
 
-#: ../hacks/config/bubbles.xml.h:2
-msgid "Bubbles fall"
+#: ../hacks/config/bubbles.xml.h:5
+msgid "Draw circles instead of bubble images"
 msgstr ""
 
-#: ../hacks/config/bubbles.xml.h:3
-msgid "Bubbles float"
+#: ../hacks/config/bubbles.xml.h:6
+msgid "Don't hide bubbles when they pop"
 msgstr ""
 
-#: ../hacks/config/bubbles.xml.h:4
-msgid "Bubbles rise"
+#: ../hacks/config/bubbles.xml.h:7
+msgid "Leave trails"
 msgstr ""
 
-#: ../hacks/config/bubbles.xml.h:5
-msgid "Don't hide bubbles when they pop"
+#: ../hacks/config/bubbles.xml.h:8
+msgid "Bubbles rise"
 msgstr ""
 
-#: ../hacks/config/bubbles.xml.h:6
-msgid "Draw circles instead of bubble images"
+#: ../hacks/config/bubbles.xml.h:9
+msgid "Bubbles float"
 msgstr ""
 
-#: ../hacks/config/bubbles.xml.h:9
-msgid "Leave trails"
+#: ../hacks/config/bubbles.xml.h:10
+msgid "Bubbles fall"
 msgstr ""
 
 #: ../hacks/config/bubbles.xml.h:12
@@ -2912,21 +2967,21 @@
 "Macnicol; 1996."
 msgstr ""
 
-#: ../hacks/config/bumps.xml.h:3
+#: ../hacks/config/bumps.xml.h:1 ../hacks/config/mirrorblob.xml.h:15
+msgid "Bumps"
+msgstr ""
+
+#: ../hacks/config/bumps.xml.h:12
 msgid ""
 "A spotlight roams across an embossed version of your desktop or other "
 "picture. Written by Shane Smit; 1999."
 msgstr ""
 
-#: ../hacks/config/bumps.xml.h:4 ../hacks/config/mirrorblob.xml.h:7
-msgid "Bumps"
-msgstr ""
-
 #: ../hacks/config/cage.xml.h:1
 msgid "Cage"
 msgstr "Klietka"
 
-#: ../hacks/config/cage.xml.h:6
+#: ../hacks/config/cage.xml.h:7
 msgid ""
 "This draws Escher's \"Impossible Cage\", a 3d analog of a moebius strip, and "
 "rotates it in three dimensions. "
@@ -2934,87 +2989,87 @@
 "Vianna; 1998."
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:1 ../hacks/config/coral.xml.h:1
-#: ../hacks/config/deco.xml.h:1 ../hacks/config/helix.xml.h:1
-#: ../hacks/config/moire.xml.h:1 ../hacks/config/pedal.xml.h:1
-#: ../hacks/config/rorschach.xml.h:1 ../hacks/config/xspirograph.xml.h:1
-msgid "1 minute"
-msgstr "1 minúta"
-
-#: ../hacks/config/carousel.xml.h:3 ../hacks/config/ccurve.xml.h:3
-#: ../hacks/config/photopile.xml.h:3
-msgid "Animation speed"
-msgstr ""
-
-#: ../hacks/config/carousel.xml.h:4
+#: ../hacks/config/carousel.xml.h:1
 msgid "Carousel"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:8
-msgid ""
-"Loads several random images, and displays them flying in a circular "
-"formation. The formation changes speed and direction randomly, and images "
-"periodically drop out to be replaced by new ones. Written by Jamie Zawinski; "
-"2005."
+#: ../hacks/config/carousel.xml.h:6 ../hacks/config/ccurve.xml.h:6
+#: ../hacks/config/photopile.xml.h:13 ../hacks/config/tronbit.xml.h:6
+msgid "Animation speed"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:10
-msgid "No tilting"
+#: ../hacks/config/carousel.xml.h:9 ../hacks/config/glslideshow.xml.h:6
+#: ../hacks/config/mirrorblob.xml.h:9 ../hacks/config/photopile.xml.h:19
+msgid "Time until loading a new image"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:11 ../hacks/config/photopile.xml.h:15
-msgid "Number of images"
-msgstr ""
+#: ../hacks/config/carousel.xml.h:10 ../hacks/config/coral.xml.h:7
+#: ../hacks/config/deco.xml.h:4 ../hacks/config/helix.xml.h:7
+#: ../hacks/config/moire.xml.h:4 ../hacks/config/pedal.xml.h:4
+#: ../hacks/config/rorschach.xml.h:10 ../hacks/config/xspirograph.xml.h:7
+msgid "1 minute"
+msgstr "1 minúta"
 
-#: ../hacks/config/carousel.xml.h:12 ../hacks/config/glslideshow.xml.h:19
-#: ../hacks/config/photopile.xml.h:18
-msgid "Show file names"
+#: ../hacks/config/carousel.xml.h:11 ../hacks/config/photopile.xml.h:8
+msgid "Number of images"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:15
+#: ../hacks/config/carousel.xml.h:12
 msgid "Tilt in/out and left/right"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:16
+#: ../hacks/config/carousel.xml.h:13
 msgid "Tilt in/out only"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:17
+#: ../hacks/config/carousel.xml.h:14
 msgid "Tilt left/right only"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:18 ../hacks/config/glslideshow.xml.h:21
-#: ../hacks/config/mirrorblob.xml.h:24 ../hacks/config/photopile.xml.h:23
-msgid "Time until loading a new image"
+#: ../hacks/config/carousel.xml.h:15
+msgid "No tilting"
 msgstr ""
 
-#: ../hacks/config/carousel.xml.h:19
+#: ../hacks/config/carousel.xml.h:16
 msgid "Zoom in/out"
 msgstr ""
 
-#: ../hacks/config/ccurve.xml.h:2 ../hacks/config/epicycle.xml.h:2
-#: ../hacks/config/glslideshow.xml.h:5 ../hacks/config/glsnake.xml.h:2
-#: ../hacks/config/polyhedra.xml.h:2 ../hacks/config/starfish.xml.h:2
-msgid "30 seconds"
+#: ../hacks/config/carousel.xml.h:17 ../hacks/config/glslideshow.xml.h:19
+#: ../hacks/config/photopile.xml.h:21
+msgid "Show file names"
+msgstr ""
+
+#: ../hacks/config/carousel.xml.h:19
+msgid ""
+"Loads several random images, and displays them flying in a circular "
+"formation. The formation changes speed and direction randomly, and images "
+"periodically drop out to be replaced by new ones. Written by Jamie Zawinski; "
+"2005."
 msgstr ""
 
-#: ../hacks/config/ccurve.xml.h:4
+#: ../hacks/config/ccurve.xml.h:1
 msgid "CCurve"
 msgstr ""
 
-#: ../hacks/config/ccurve.xml.h:5
+#: ../hacks/config/ccurve.xml.h:3
 msgid "Change image every"
 msgstr ""
 
-#: ../hacks/config/ccurve.xml.h:6 ../hacks/config/coral.xml.h:5
-#: ../hacks/config/imsmap.xml.h:5 ../hacks/config/kumppa.xml.h:1
-#: ../hacks/config/qix.xml.h:6 ../hacks/config/squiral.xml.h:2
-#: ../hacks/config/superquadrics.xml.h:1 ../hacks/config/wander.xml.h:2
-#: ../hacks/config/xmatrix.xml.h:2
+#: ../hacks/config/ccurve.xml.h:4 ../hacks/config/epicycle.xml.h:10
+#: ../hacks/config/glslideshow.xml.h:15 ../hacks/config/glsnake.xml.h:7
+#: ../hacks/config/polyhedra.xml.h:10 ../hacks/config/starfish.xml.h:10
+msgid "30 seconds"
+msgstr ""
+
+#: ../hacks/config/ccurve.xml.h:9 ../hacks/config/coral.xml.h:9
+#: ../hacks/config/imsmap.xml.h:9 ../hacks/config/kumppa.xml.h:5
+#: ../hacks/config/qix.xml.h:9 ../hacks/config/squiral.xml.h:11
+#: ../hacks/config/superquadrics.xml.h:8 ../hacks/config/wander.xml.h:5
+#: ../hacks/config/xmatrix.xml.h:19
 msgid "Density"
 msgstr "Hustota"
 
-#: ../hacks/config/ccurve.xml.h:8
+#: ../hacks/config/ccurve.xml.h:12
 msgid ""
 "Generates self-similar linear fractals, including the classic \"C Curve\". "
 "http://en.wikipedia.org/wiki/Levy_C_curve Written by Rick Campbell; 1999."
@@ -3024,68 +3079,85 @@
 msgid "Celtic"
 msgstr ""
 
-#: ../hacks/config/celtic.xml.h:2
+#: ../hacks/config/celtic.xml.h:8
 msgid "Draw graph"
 msgstr ""
 
-#: ../hacks/config/celtic.xml.h:8
+#: ../hacks/config/celtic.xml.h:10
 msgid ""
 "Repeatedly draws random Celtic cross-stitch patterns. "
 "http://en.wikipedia.org/wiki/Celtic_knot Written by Max Froumentin; 2005."
 msgstr ""
 
 #: ../hacks/config/circuit.xml.h:1
-msgid ""
-"Animates a number of 3D electronic components. Written by Ben Buxton; 2001."
-msgstr ""
-
-#: ../hacks/config/circuit.xml.h:2
 msgid "Circuit"
 msgstr "Obvod"
 
-#: ../hacks/config/circuit.xml.h:3 ../hacks/config/gflux.xml.h:5
-msgid "Directional lighting"
-msgstr ""
-
-#: ../hacks/config/circuit.xml.h:5
-msgid "Flat coloring"
-msgstr ""
-
-#: ../hacks/config/circuit.xml.h:10 ../hacks/config/mismunch.xml.h:8
-#: ../hacks/config/mountain.xml.h:9 ../hacks/config/munch.xml.h:12
-#: ../hacks/config/pipes.xml.h:16 ../hacks/config/shadebobs.xml.h:11
-#: ../hacks/config/sproingies.xml.h:6
+#: ../hacks/config/circuit.xml.h:5 ../hacks/config/mismunch.xml.h:8
+#: ../hacks/config/mountain.xml.h:5 ../hacks/config/munch.xml.h:8
+#: ../hacks/config/pipes.xml.h:5 ../hacks/config/shadebobs.xml.h:11
+#: ../hacks/config/sproingies.xml.h:5
 msgid "One"
 msgstr ""
 
-#: ../hacks/config/circuit.xml.h:11
+#: ../hacks/config/circuit.xml.h:6
 msgid "Parts"
 msgstr "Súčiastky"
 
-#: ../hacks/config/circuit.xml.h:12 ../hacks/config/jigglypuff.xml.h:16
-#: ../hacks/config/pinion.xml.h:12
+#: ../hacks/config/circuit.xml.h:9 ../hacks/config/jigglypuff.xml.h:7
+#: ../hacks/config/pinion.xml.h:6
 msgid "Rotation speed"
 msgstr ""
 
-#: ../hacks/config/circuit.xml.h:15 ../hacks/config/cube21.xml.h:22
-#: ../hacks/config/cubestorm.xml.h:13 ../hacks/config/dangerball.xml.h:13
-#: ../hacks/config/engine.xml.h:17 ../hacks/config/flipflop.xml.h:11
-#: ../hacks/config/gears.xml.h:12 ../hacks/config/moebiusgears.xml.h:13
-#: ../hacks/config/polyhedra.xml.h:147 ../hacks/config/rubikblocks.xml.h:17
-#: ../hacks/config/surfaces.xml.h:23
+#: ../hacks/config/circuit.xml.h:11 ../hacks/config/companioncube.xml.h:11
+#: ../hacks/config/cube21.xml.h:19 ../hacks/config/cubestorm.xml.h:15
+#: ../hacks/config/dangerball.xml.h:12 ../hacks/config/engine.xml.h:18
+#: ../hacks/config/flipflop.xml.h:6 ../hacks/config/gears.xml.h:12
+#: ../hacks/config/hilbert.xml.h:19 ../hacks/config/moebiusgears.xml.h:11
+#: ../hacks/config/polyhedra.xml.h:164 ../hacks/config/rubikblocks.xml.h:13
+#: ../hacks/config/surfaces.xml.h:26 ../hacks/config/tronbit.xml.h:8
 msgid "Spin"
 msgstr "Krútiť"
 
-#: ../hacks/config/cloudlife.xml.h:1 ../hacks/config/demon.xml.h:5
-#: ../hacks/config/petri.xml.h:1 ../hacks/config/slidescreen.xml.h:3
-msgid "Cell size"
+#: ../hacks/config/circuit.xml.h:12
+msgid "Flat coloring"
+msgstr ""
+
+#: ../hacks/config/circuit.xml.h:13 ../hacks/config/gflux.xml.h:16
+msgid "Directional lighting"
+msgstr ""
+
+#: ../hacks/config/circuit.xml.h:15
+msgid ""
+"Animates a number of 3D electronic components. Written by Ben Buxton; 2001."
 msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:2
+#: ../hacks/config/cloudlife.xml.h:1
 msgid "CloudLife"
 msgstr ""
 
 #: ../hacks/config/cloudlife.xml.h:5
+msgid "Young"
+msgstr ""
+
+#: ../hacks/config/cloudlife.xml.h:6
+msgid "Max age"
+msgstr ""
+
+#: ../hacks/config/cloudlife.xml.h:7
+msgid "Old"
+msgstr ""
+
+#: ../hacks/config/cloudlife.xml.h:8
+msgid "Initial density"
+msgstr ""
+
+#: ../hacks/config/cloudlife.xml.h:10 ../hacks/config/demon.xml.h:14
+#: ../hacks/config/petri.xml.h:6 ../hacks/config/slidescreen.xml.h:15
+msgid "Cell size"
+msgstr ""
+
+#: ../hacks/config/cloudlife.xml.h:14
 #, no-c-format
 msgid ""
 "Generates cloud-like formations based on a variant of Conway's Life. The "
@@ -3096,20 +3168,53 @@
 "2003."
 msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:7
-msgid "Initial density"
+#: ../hacks/config/companioncube.xml.h:1
+msgid "CompanionCube"
 msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:10
-msgid "Max age"
+#: ../hacks/config/companioncube.xml.h:6 ../hacks/config/distort.xml.h:17
+msgid "Bounce"
 msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:11
-msgid "Old"
+#: ../hacks/config/companioncube.xml.h:8 ../hacks/config/deluxe.xml.h:8
+#: ../hacks/config/gflux.xml.h:11 ../hacks/config/glcells.xml.h:28
+#: ../hacks/config/glhanoi.xml.h:9 ../hacks/config/glsnake.xml.h:5
+#: ../hacks/config/hypnowheel.xml.h:9 ../hacks/config/lavalite.xml.h:8
+#: ../hacks/config/lisa.xml.h:13 ../hacks/config/lissie.xml.h:11
+#: ../hacks/config/skytentacles.xml.h:2
+msgid "1"
+msgstr "1"
+
+#: ../hacks/config/companioncube.xml.h:9
+msgid "Number of cubes"
 msgstr ""
 
-#: ../hacks/config/cloudlife.xml.h:14
-msgid "Young"
+#. #### -no-optimize
+#: ../hacks/config/companioncube.xml.h:12 ../hacks/config/cube21.xml.h:20
+#: ../hacks/config/cubenetic.xml.h:8 ../hacks/config/cubestorm.xml.h:14
+#: ../hacks/config/dangerball.xml.h:11 ../hacks/config/engine.xml.h:17
+#: ../hacks/config/gears.xml.h:11 ../hacks/config/glblur.xml.h:8
+#: ../hacks/config/glforestfire.xml.h:11 ../hacks/config/glknots.xml.h:22
+#: ../hacks/config/glplanet.xml.h:7 ../hacks/config/gltext.xml.h:9
+#: ../hacks/config/hilbert.xml.h:18 ../hacks/config/hypnowheel.xml.h:6
+#: ../hacks/config/lavalite.xml.h:14 ../hacks/config/menger.xml.h:10
+#: ../hacks/config/moebiusgears.xml.h:10 ../hacks/config/molecule.xml.h:16
+#: ../hacks/config/polyhedra.xml.h:165 ../hacks/config/rubikblocks.xml.h:14
+#: ../hacks/config/spheremonics.xml.h:9 ../hacks/config/surfaces.xml.h:25
+#: ../hacks/config/tronbit.xml.h:9 ../hacks/config/wander.xml.h:1
+msgid "Wander"
+msgstr ""
+
+#: ../hacks/config/companioncube.xml.h:16
+#, no-c-format
+msgid ""
+"The symptoms most commonly produced by Enrichment Center testing are "
+"superstition, perceiving inanimate objects as alive, and hallucinations. The "
+"Enrichment Center reminds you that the weighted companion cube will never "
+"threaten to stab you and, in fact, cannot speak. In the event that the "
+"Weighted Companion Cube does speak, the Enrichment Center urges you to "
+"disregard its advice. http://en.wikipedia.org/wiki/Portal_%28video_game%29 "
+"Written by Jamie Zawinski; 2011."
 msgstr ""
 
 #: ../hacks/config/compass.xml.h:1
@@ -3122,72 +3227,65 @@
 "\"lost and nauseous\" feeling. Written by Jamie Zawinski; 1999."
 msgstr ""
 
-#: ../hacks/config/coral.xml.h:2 ../hacks/config/deco.xml.h:2
-#: ../hacks/config/epicycle.xml.h:1 ../hacks/config/glslideshow.xml.h:1
-#: ../hacks/config/helix.xml.h:2 ../hacks/config/moire.xml.h:2
-#: ../hacks/config/pedal.xml.h:2 ../hacks/config/polyhedra.xml.h:1
-#: ../hacks/config/rorschach.xml.h:2 ../hacks/config/starfish.xml.h:1
-#: ../hacks/config/xspirograph.xml.h:2
+#: ../hacks/config/coral.xml.h:1
+msgid "Coral"
+msgstr "Koral"
+
+#: ../hacks/config/coral.xml.h:5 ../hacks/config/deco.xml.h:2
+#: ../hacks/config/epicycle.xml.h:8 ../hacks/config/glslideshow.xml.h:13
+#: ../hacks/config/helix.xml.h:5 ../hacks/config/moire.xml.h:2
+#: ../hacks/config/pedal.xml.h:2 ../hacks/config/polyhedra.xml.h:8
+#: ../hacks/config/rorschach.xml.h:8 ../hacks/config/starfish.xml.h:8
+#: ../hacks/config/xspirograph.xml.h:5
 msgid "1 second"
 msgstr "1 sekunda"
 
-#: ../hacks/config/coral.xml.h:3
-msgid "Coral"
-msgstr "Koral"
+#: ../hacks/config/coral.xml.h:8 ../hacks/config/fireworkx.xml.h:7
+#: ../hacks/config/gflux.xml.h:8 ../hacks/config/glblur.xml.h:5
+#: ../hacks/config/glmatrix.xml.h:5 ../hacks/config/imsmap.xml.h:8
+#: ../hacks/config/lavalite.xml.h:5 ../hacks/config/pyro.xml.h:5
+#: ../hacks/config/qix.xml.h:8 ../hacks/config/squiral.xml.h:10
+#: ../hacks/config/xmatrix.xml.h:18
+msgid "Sparse"
+msgstr "Riedky"
 
-#: ../hacks/config/coral.xml.h:4 ../hacks/config/fireworkx.xml.h:2
-#: ../hacks/config/gflux.xml.h:4 ../hacks/config/glblur.xml.h:2
-#: ../hacks/config/glmatrix.xml.h:2 ../hacks/config/imsmap.xml.h:4
-#: ../hacks/config/lavalite.xml.h:6 ../hacks/config/pyro.xml.h:1
-#: ../hacks/config/qix.xml.h:5 ../hacks/config/squiral.xml.h:1
+#: ../hacks/config/coral.xml.h:10 ../hacks/config/fireworkx.xml.h:5
+#: ../hacks/config/gflux.xml.h:10 ../hacks/config/glblur.xml.h:7
+#: ../hacks/config/glmatrix.xml.h:7 ../hacks/config/imsmap.xml.h:10
+#: ../hacks/config/lavalite.xml.h:7 ../hacks/config/pyro.xml.h:7
+#: ../hacks/config/qix.xml.h:10 ../hacks/config/squiral.xml.h:12
 msgid "Dense"
 msgstr "Husté"
 
-#: ../hacks/config/coral.xml.h:12 ../hacks/config/glcells.xml.h:28
-#: ../hacks/config/squiral.xml.h:13
+#: ../hacks/config/coral.xml.h:12 ../hacks/config/glcells.xml.h:29
+#: ../hacks/config/squiral.xml.h:6
 msgid "Seeds"
 msgstr ""
 
-#: ../hacks/config/coral.xml.h:14
+#: ../hacks/config/coral.xml.h:15
 msgid ""
 "Simulates coral growth, albeit somewhat slowly. Written by Frederick Roeber; "
 "1997."
 msgstr ""
 
-#: ../hacks/config/coral.xml.h:15 ../hacks/config/fireworkx.xml.h:12
-#: ../hacks/config/gflux.xml.h:17 ../hacks/config/glblur.xml.h:16
-#: ../hacks/config/glmatrix.xml.h:18 ../hacks/config/imsmap.xml.h:17
-#: ../hacks/config/lavalite.xml.h:28 ../hacks/config/pyro.xml.h:15
-#: ../hacks/config/qix.xml.h:22 ../hacks/config/squiral.xml.h:16
-#: ../hacks/config/xmatrix.xml.h:20
-msgid "Sparse"
-msgstr "Riedky"
-
 #: ../hacks/config/crackberg.xml.h:1
-msgid "Confused"
-msgstr ""
-
-#: ../hacks/config/crackberg.xml.h:2
 msgid "Crackberg"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:3
-msgid "Eagle nest"
-msgstr ""
-
-#: ../hacks/config/crackberg.xml.h:4
-msgid "Earthy coloration"
+#: ../hacks/config/crackberg.xml.h:5
+msgid "Mouse hole"
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:6
-msgid "Flat shading"
+msgid "Visibility"
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:7
-msgid ""
-"Flies through height maps, optionally animating the creation and destruction "
-"of generated tiles; tiles `grow' into place. Written by Matus Telgarsky; "
-"2005."
+msgid "Eagle nest"
+msgstr ""
+
+#: ../hacks/config/crackberg.xml.h:9
+msgid "Subdivisions"
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:10
@@ -3195,50 +3293,57 @@
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:11
-msgid "Icy coloration"
+msgid "Flat shading"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:12
-msgid "Immediate"
+#: ../hacks/config/crackberg.xml.h:13 ../hacks/config/flurry.xml.h:6
+msgid "Water"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:13 ../hacks/config/glslideshow.xml.h:14
-msgid "Letterbox"
+#: ../hacks/config/crackberg.xml.h:14
+msgid "Confused"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:16
-msgid "Mouse hole"
+#: ../hacks/config/crackberg.xml.h:15
+msgid "Immediate"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:17 ../hacks/config/imsmap.xml.h:14
-msgid "Random coloration"
+#: ../hacks/config/crackberg.xml.h:16 ../hacks/config/glslideshow.xml.h:18
+msgid "Letterbox"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:19
-msgid "Subdivisions"
+#: ../hacks/config/crackberg.xml.h:19 ../hacks/config/imsmap.xml.h:14
+msgid "Random coloration"
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:20
-msgid "Swampy coloration"
+msgid "Earthy coloration"
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:21
-msgid "Visibility"
+msgid "Icy coloration"
 msgstr ""
 
 #: ../hacks/config/crackberg.xml.h:22
+msgid "Swampy coloration"
+msgstr ""
+
+#: ../hacks/config/crackberg.xml.h:23
 msgid "Vomitous coloration"
 msgstr ""
 
-#: ../hacks/config/crackberg.xml.h:23 ../hacks/config/flurry.xml.h:11
-msgid "Water"
+#: ../hacks/config/crackberg.xml.h:24
+msgid ""
+"Flies through height maps, optionally animating the creation and destruction "
+"of generated tiles; tiles `grow' into place. Written by Matus Telgarsky; "
+"2005."
 msgstr ""
 
 #: ../hacks/config/critical.xml.h:1
 msgid "Critical"
 msgstr ""
 
-#: ../hacks/config/critical.xml.h:8
+#: ../hacks/config/critical.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws a system of self-organizing lines. It starts out as "
@@ -3247,229 +3352,214 @@
 msgstr ""
 
 #: ../hacks/config/crystal.xml.h:1
-msgid "Center on screen"
-msgstr ""
-
-#: ../hacks/config/crystal.xml.h:2
 msgid "Crystal"
 msgstr "Kryštál"
 
-#: ../hacks/config/crystal.xml.h:3
-msgid "Draw cell"
+#. #### -shift (color cycling)
+#: ../hacks/config/crystal.xml.h:9
+msgid "Number of crystals"
 msgstr ""
 
-#: ../hacks/config/crystal.xml.h:4 ../hacks/config/spheremonics.xml.h:3
-msgid "Draw grid"
+#: ../hacks/config/crystal.xml.h:10
+msgid "Horizontal symmetries"
 msgstr ""
 
-#: ../hacks/config/crystal.xml.h:7
-msgid "Horizontal symmetries"
+#: ../hacks/config/crystal.xml.h:11
+msgid "Vertical symmetries"
 msgstr ""
 
-#: ../hacks/config/crystal.xml.h:10
-msgid ""
-"Moving polygons, similar to a kaleidoscope. See also the \"Kaleidescope\" "
-"and \"GLeidescope\" screen savers. http://en.wikipedia.org/wiki/Kaleidoscope "
-"Written by Jouk Jansen; 1998."
+#: ../hacks/config/crystal.xml.h:12 ../hacks/config/spheremonics.xml.h:19
+msgid "Draw grid"
 msgstr ""
 
-#. #### -shift (color cycling)
 #: ../hacks/config/crystal.xml.h:13
-msgid "Number of crystals"
+msgid "Draw cell"
 msgstr ""
 
-#: ../hacks/config/crystal.xml.h:16
-msgid "Vertical symmetries"
+#: ../hacks/config/crystal.xml.h:14
+msgid "Center on screen"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:2
-#, no-c-format
+#: ../hacks/config/crystal.xml.h:16
 msgid ""
-"Animates a Rubik-like puzzle known as Cube 21 or Square-1. The rotations are "
-"chosen randomly. See also the \"Rubik\", \"RubikBlocks\" and \"GLSnake\" "
-"screen savers. http://en.wikipedia.org/wiki/Square_One_%28puzzle%29 Written "
-"by Vasek Potocek; 2005."
+"Moving polygons, similar to a kaleidoscope. See also the \"Kaleidescope\" "
+"and \"GLeidescope\" screen savers. http://en.wikipedia.org/wiki/Kaleidoscope "
+"Written by Jouk Jansen; 1998."
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:3
-msgid "Classic edition"
+#: ../hacks/config/cube21.xml.h:1
+msgid "Cube21"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:4 ../hacks/config/rubikblocks.xml.h:2
+#: ../hacks/config/cube21.xml.h:6 ../hacks/config/rubikblocks.xml.h:6
 msgid "Cube size"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:5
-msgid "Cube21"
+#: ../hacks/config/cube21.xml.h:9 ../hacks/config/rocks.xml.h:11
+#: ../hacks/config/rubik.xml.h:7 ../hacks/config/rubikblocks.xml.h:9
+#: ../hacks/config/topblock.xml.h:16
+msgid "Rotation"
+msgstr "Rotácia"
+
+#: ../hacks/config/cube21.xml.h:11 ../hacks/config/rubikblocks.xml.h:11
+msgid "Start as cube"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:13 ../hacks/config/rubikblocks.xml.h:10
-msgid "Outlines"
+#: ../hacks/config/cube21.xml.h:12 ../hacks/config/rubikblocks.xml.h:12
+msgid "Start as random shape"
+msgstr ""
+
+#: ../hacks/config/cube21.xml.h:13
+msgid "White"
 msgstr ""
 
 #: ../hacks/config/cube21.xml.h:14
 msgid "Random color"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:15 ../hacks/config/rocks.xml.h:11
-#: ../hacks/config/rubik.xml.h:9 ../hacks/config/rubikblocks.xml.h:11
-#: ../hacks/config/topblock.xml.h:18
-msgid "Rotation"
-msgstr "Rotácia"
-
-#: ../hacks/config/cube21.xml.h:18
+#: ../hacks/config/cube21.xml.h:15
 msgid "Silver edition"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:19
-msgid "Six random colors"
-msgstr ""
-
-#: ../hacks/config/cube21.xml.h:23 ../hacks/config/rubikblocks.xml.h:18
-msgid "Start as cube"
+#: ../hacks/config/cube21.xml.h:16
+msgid "Two random colors"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:24 ../hacks/config/rubikblocks.xml.h:19
-msgid "Start as random shape"
+#: ../hacks/config/cube21.xml.h:17
+msgid "Classic edition"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:25
-msgid "Two random colors"
+#: ../hacks/config/cube21.xml.h:18
+msgid "Six random colors"
 msgstr ""
 
-#. #### -no-optimize
-#: ../hacks/config/cube21.xml.h:26 ../hacks/config/cubenetic.xml.h:26
-#: ../hacks/config/cubestorm.xml.h:17 ../hacks/config/dangerball.xml.h:14
-#: ../hacks/config/engine.xml.h:20 ../hacks/config/gears.xml.h:14
-#: ../hacks/config/glblur.xml.h:18 ../hacks/config/glforestfire.xml.h:16
-#: ../hacks/config/glknots.xml.h:24 ../hacks/config/glplanet.xml.h:13
-#: ../hacks/config/gltext.xml.h:19 ../hacks/config/hypnowheel.xml.h:17
-#: ../hacks/config/lavalite.xml.h:29 ../hacks/config/menger.xml.h:20
-#: ../hacks/config/moebiusgears.xml.h:14 ../hacks/config/molecule.xml.h:26
-#: ../hacks/config/polyhedra.xml.h:168 ../hacks/config/rubikblocks.xml.h:20
-#: ../hacks/config/spheremonics.xml.h:22 ../hacks/config/surfaces.xml.h:27
-#: ../hacks/config/wander.xml.h:14
-msgid "Wander"
+#: ../hacks/config/cube21.xml.h:24 ../hacks/config/rubikblocks.xml.h:18
+msgid "Outlines"
 msgstr ""
 
-#: ../hacks/config/cube21.xml.h:27
-msgid "White"
+#: ../hacks/config/cube21.xml.h:28
+#, no-c-format
+msgid ""
+"Animates a Rubik-like puzzle known as Cube 21 or Square-1. The rotations are "
+"chosen randomly. See also the \"Rubik\", \"RubikBlocks\" and \"GLSnake\" "
+"screen savers. http://en.wikipedia.org/wiki/Square_One_%28puzzle%29 Written "
+"by Vasek Potocek; 2005."
 msgstr ""
 
-#: ../hacks/config/cubenetic.xml.h:2
+#: ../hacks/config/cubenetic.xml.h:1
 msgid "Cubenetic"
 msgstr ""
 
-#: ../hacks/config/cubenetic.xml.h:3 ../hacks/config/glblur.xml.h:3
-#: ../hacks/config/glknots.xml.h:1 ../hacks/config/gltext.xml.h:5
-#: ../hacks/config/menger.xml.h:1 ../hacks/config/molecule.xml.h:4
-#: ../hacks/config/spheremonics.xml.h:1
+#: ../hacks/config/cubenetic.xml.h:9 ../hacks/config/glblur.xml.h:9
+#: ../hacks/config/glknots.xml.h:8 ../hacks/config/gltext.xml.h:10
+#: ../hacks/config/menger.xml.h:11 ../hacks/config/molecule.xml.h:17
+#: ../hacks/config/spheremonics.xml.h:10
 msgid "Don't rotate"
 msgstr ""
 
-#: ../hacks/config/cubenetic.xml.h:4
-msgid ""
-"Draws a pulsating set of overlapping boxes with ever-chaning blobby patterns "
-"undulating across their surfaces. It's sort of a cubist Lavalite. Written by "
-"Jamie Zawinski; 2002."
-msgstr ""
+#: ../hacks/config/cubenetic.xml.h:10 ../hacks/config/glblur.xml.h:10
+#: ../hacks/config/glknots.xml.h:9 ../hacks/config/gltext.xml.h:11
+#: ../hacks/config/lavalite.xml.h:23 ../hacks/config/menger.xml.h:12
+#: ../hacks/config/molecule.xml.h:18 ../hacks/config/spheremonics.xml.h:11
+msgid "Rotate around X axis"
+msgstr "Rotovať okolo osi X"
 
-#: ../hacks/config/cubenetic.xml.h:12 ../hacks/config/glblur.xml.h:8
-#: ../hacks/config/glknots.xml.h:9 ../hacks/config/gltext.xml.h:10
-#: ../hacks/config/lavalite.xml.h:19 ../hacks/config/menger.xml.h:9
-#: ../hacks/config/molecule.xml.h:18 ../hacks/config/spheremonics.xml.h:10
+#: ../hacks/config/cubenetic.xml.h:11 ../hacks/config/glblur.xml.h:11
+#: ../hacks/config/glknots.xml.h:10 ../hacks/config/gltext.xml.h:12
+#: ../hacks/config/lavalite.xml.h:24 ../hacks/config/menger.xml.h:13
+#: ../hacks/config/molecule.xml.h:19 ../hacks/config/spheremonics.xml.h:12
+msgid "Rotate around Y axis"
+msgstr "Rotovať okolo osi Y"
+
+#: ../hacks/config/cubenetic.xml.h:12 ../hacks/config/glblur.xml.h:12
+#: ../hacks/config/glknots.xml.h:11 ../hacks/config/gltext.xml.h:13
+#: ../hacks/config/lavalite.xml.h:25 ../hacks/config/menger.xml.h:14
+#: ../hacks/config/molecule.xml.h:20 ../hacks/config/spheremonics.xml.h:13
+msgid "Rotate around Z axis"
+msgstr "Rotovať okolo osi Z"
+
+#: ../hacks/config/cubenetic.xml.h:13 ../hacks/config/glblur.xml.h:13
+#: ../hacks/config/glknots.xml.h:12 ../hacks/config/gltext.xml.h:14
+#: ../hacks/config/lavalite.xml.h:26 ../hacks/config/menger.xml.h:15
+#: ../hacks/config/molecule.xml.h:21 ../hacks/config/spheremonics.xml.h:14
 msgid "Rotate around X and Y axes"
 msgstr "Rotovať okolo osí X a Z"
 
-#: ../hacks/config/cubenetic.xml.h:13 ../hacks/config/glblur.xml.h:9
-#: ../hacks/config/glknots.xml.h:10 ../hacks/config/gltext.xml.h:11
-#: ../hacks/config/lavalite.xml.h:20 ../hacks/config/menger.xml.h:10
-#: ../hacks/config/molecule.xml.h:19 ../hacks/config/spheremonics.xml.h:11
+#: ../hacks/config/cubenetic.xml.h:14 ../hacks/config/glblur.xml.h:14
+#: ../hacks/config/glknots.xml.h:13 ../hacks/config/gltext.xml.h:15
+#: ../hacks/config/lavalite.xml.h:27 ../hacks/config/menger.xml.h:16
+#: ../hacks/config/molecule.xml.h:22 ../hacks/config/spheremonics.xml.h:15
 msgid "Rotate around X and Z axes"
 msgstr "Rotovať okolo osí X a Z"
 
-#: ../hacks/config/cubenetic.xml.h:14 ../hacks/config/glblur.xml.h:10
-#: ../hacks/config/glknots.xml.h:11 ../hacks/config/gltext.xml.h:12
-#: ../hacks/config/lavalite.xml.h:21 ../hacks/config/menger.xml.h:11
-#: ../hacks/config/molecule.xml.h:20 ../hacks/config/spheremonics.xml.h:12
-msgid "Rotate around X axis"
-msgstr "Rotovať okolo osi X"
-
-#: ../hacks/config/cubenetic.xml.h:15 ../hacks/config/glblur.xml.h:11
-#: ../hacks/config/glknots.xml.h:12 ../hacks/config/gltext.xml.h:13
-#: ../hacks/config/lavalite.xml.h:22 ../hacks/config/menger.xml.h:12
-#: ../hacks/config/molecule.xml.h:21 ../hacks/config/spheremonics.xml.h:13
+#: ../hacks/config/cubenetic.xml.h:15 ../hacks/config/glblur.xml.h:15
+#: ../hacks/config/glknots.xml.h:14 ../hacks/config/gltext.xml.h:16
+#: ../hacks/config/lavalite.xml.h:28 ../hacks/config/menger.xml.h:17
+#: ../hacks/config/molecule.xml.h:23 ../hacks/config/spheremonics.xml.h:16
 msgid "Rotate around Y and Z axes"
 msgstr "Rotovať okolo osí Y a Z"
 
-#: ../hacks/config/cubenetic.xml.h:16 ../hacks/config/glblur.xml.h:12
-#: ../hacks/config/glknots.xml.h:13 ../hacks/config/gltext.xml.h:14
-#: ../hacks/config/lavalite.xml.h:23 ../hacks/config/menger.xml.h:13
-#: ../hacks/config/molecule.xml.h:22 ../hacks/config/spheremonics.xml.h:14
-msgid "Rotate around Y axis"
-msgstr "Rotovať okolo osi Y"
-
-#: ../hacks/config/cubenetic.xml.h:17 ../hacks/config/glblur.xml.h:13
-#: ../hacks/config/glknots.xml.h:14 ../hacks/config/gltext.xml.h:15
-#: ../hacks/config/lavalite.xml.h:24 ../hacks/config/menger.xml.h:14
-#: ../hacks/config/molecule.xml.h:23 ../hacks/config/spheremonics.xml.h:15
-msgid "Rotate around Z axis"
-msgstr "Rotovať okolo osi Z"
-
-#: ../hacks/config/cubenetic.xml.h:18 ../hacks/config/glblur.xml.h:14
-#: ../hacks/config/glknots.xml.h:15 ../hacks/config/gltext.xml.h:16
-#: ../hacks/config/lavalite.xml.h:25 ../hacks/config/menger.xml.h:15
-#: ../hacks/config/molecule.xml.h:24 ../hacks/config/spheremonics.xml.h:16
+#: ../hacks/config/cubenetic.xml.h:16 ../hacks/config/glblur.xml.h:16
+#: ../hacks/config/glknots.xml.h:15 ../hacks/config/gltext.xml.h:17
+#: ../hacks/config/lavalite.xml.h:29 ../hacks/config/menger.xml.h:18
+#: ../hacks/config/molecule.xml.h:24 ../hacks/config/spheremonics.xml.h:17
 msgid "Rotate around all three axes"
 msgstr "Rotovať okolo všetkých troch osí"
 
-#: ../hacks/config/cubenetic.xml.h:22
-msgid "Surface pattern complexity"
+#: ../hacks/config/cubenetic.xml.h:18
+msgid "Surface pattern speed"
 msgstr ""
 
-#: ../hacks/config/cubenetic.xml.h:23
+#: ../hacks/config/cubenetic.xml.h:21
 msgid "Surface pattern overlap"
 msgstr ""
 
-#: ../hacks/config/cubenetic.xml.h:24
-msgid "Surface pattern speed"
+#: ../hacks/config/cubenetic.xml.h:23
+msgid "Surface pattern complexity"
+msgstr ""
+
+#: ../hacks/config/cubenetic.xml.h:27
+msgid ""
+"Draws a pulsating set of overlapping boxes with ever-chaning blobby patterns "
+"undulating across their surfaces. It's sort of a cubist Lavalite. Written by "
+"Jamie Zawinski; 2002."
 msgstr ""
 
 #: ../hacks/config/cubestorm.xml.h:1
 msgid "CubeStorm"
 msgstr ""
 
-#: ../hacks/config/cubestorm.xml.h:2
+#: ../hacks/config/cubestorm.xml.h:9
 msgid "Cubes"
 msgstr ""
 
-#: ../hacks/config/cubestorm.xml.h:3
+#: ../hacks/config/cubestorm.xml.h:12
+msgid "Struts"
+msgstr ""
+
+#: ../hacks/config/cubestorm.xml.h:18
 msgid ""
 "Draws a series of rotating 3D boxes that intersect each other and eventually "
 "fill space. Written by Jamie Zawinski; 2003."
 msgstr ""
 
-#: ../hacks/config/cubestorm.xml.h:14
-msgid "Struts"
-msgstr ""
-
 #: ../hacks/config/cubicgrid.xml.h:1
-msgid "Big dots"
+msgid "CubicGrid"
 msgstr ""
 
-#: ../hacks/config/cubicgrid.xml.h:2
+#: ../hacks/config/cubicgrid.xml.h:8
 msgid "Close"
 msgstr ""
 
-#: ../hacks/config/cubicgrid.xml.h:3
-msgid "CubicGrid"
+#: ../hacks/config/cubicgrid.xml.h:9
+msgid "Dot spacing"
 msgstr ""
 
-#: ../hacks/config/cubicgrid.xml.h:4
-msgid "Dot spacing"
+#: ../hacks/config/cubicgrid.xml.h:11
+msgid "Big dots"
 msgstr ""
 
-#: ../hacks/config/cubicgrid.xml.h:5
+#: ../hacks/config/cubicgrid.xml.h:13
 msgid ""
 "Draws the view of an observer located inside a rotating 3D lattice of "
 "colored points. Written by Vasek Potocek; 2007."
@@ -3479,22 +3569,22 @@
 msgid "CWaves"
 msgstr ""
 
-#: ../hacks/config/cwaves.xml.h:2
-msgid "Color transitions"
-msgstr ""
-
-#: ../hacks/config/cwaves.xml.h:3 ../hacks/config/flame.xml.h:3
-#: ../hacks/config/jigglypuff.xml.h:4
+#: ../hacks/config/cwaves.xml.h:5 ../hacks/config/flame.xml.h:11
+#: ../hacks/config/jigglypuff.xml.h:13
 msgid "Complexity"
 msgstr "Zložitosť"
 
-#: ../hacks/config/cwaves.xml.h:7
+#: ../hacks/config/cwaves.xml.h:6
 msgid "Rough"
 msgstr ""
 
-#: ../hacks/config/cwaves.xml.h:9 ../hacks/config/glknots.xml.h:19
-#: ../hacks/config/jigsaw.xml.h:13 ../hacks/config/lavalite.xml.h:27
-#: ../hacks/config/skytentacles.xml.h:16
+#: ../hacks/config/cwaves.xml.h:7
+msgid "Color transitions"
+msgstr ""
+
+#: ../hacks/config/cwaves.xml.h:8 ../hacks/config/glknots.xml.h:18
+#: ../hacks/config/jigsaw.xml.h:13 ../hacks/config/lavalite.xml.h:13
+#: ../hacks/config/skytentacles.xml.h:24
 msgid "Smooth"
 msgstr ""
 
@@ -3508,7 +3598,7 @@
 msgid "Cynosure"
 msgstr ""
 
-#: ../hacks/config/cynosure.xml.h:9
+#: ../hacks/config/cynosure.xml.h:12
 msgid ""
 "Random dropshadowed rectangles pop onto the screen in lockstep. Written by "
 "Ozymandias G. Desiderata, Jamie Zawinski, and Stephen Linhart; 1998."
@@ -3518,86 +3608,86 @@
 msgid "DangerBall"
 msgstr ""
 
-#: ../hacks/config/dangerball.xml.h:2
-msgid ""
-"Draws a ball that periodically extrudes many random spikes. Ouch! Written by "
-"Jamie Zawinski; 2001."
+#: ../hacks/config/dangerball.xml.h:6
+msgid "Spike growth"
 msgstr ""
 
-#: ../hacks/config/dangerball.xml.h:8
+#: ../hacks/config/dangerball.xml.h:9
 msgid "Number of spikes"
 msgstr ""
 
-#: ../hacks/config/dangerball.xml.h:9
+#: ../hacks/config/dangerball.xml.h:10
 msgid "Ouch"
 msgstr ""
 
-#: ../hacks/config/dangerball.xml.h:12
-msgid "Spike growth"
+#: ../hacks/config/dangerball.xml.h:15
+msgid ""
+"Draws a ball that periodically extrudes many random spikes. Ouch! Written by "
+"Jamie Zawinski; 2001."
 msgstr ""
 
-#: ../hacks/config/decayscreen.xml.h:3
+#: ../hacks/config/decayscreen.xml.h:1
 msgid "DecayScreen"
 msgstr "Kazenie obrazu"
 
-#: ../hacks/config/decayscreen.xml.h:6
-msgid "Fuzzy melt"
+#: ../hacks/config/decayscreen.xml.h:8
+msgid "Random melt style"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:9
-msgid "Melt away from center"
+msgid "Shuffle melt"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:10
-msgid "Melt down"
+msgid "Melt up"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:11
-msgid "Melt down, left"
+msgid "Melt down"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:12
-msgid "Melt down, right"
+msgid "Melt left"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:13
-msgid "Melt left"
+msgid "Melt right"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:14
-msgid "Melt right"
+msgid "Melt up, left"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:15
-msgid "Melt towards center"
+msgid "Melt up, right"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:16
-msgid "Melt up"
+msgid "Melt down, left"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:17
-msgid "Melt up, left"
+msgid "Melt down, right"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:18
-msgid "Melt up, right"
+msgid "Melt towards center"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:19
-msgid "Melty melt"
+msgid "Melt away from center"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:20
-msgid "Random melt style"
+msgid "Melty melt"
 msgstr ""
 
-#: ../hacks/config/decayscreen.xml.h:22
-msgid "Shuffle melt"
+#: ../hacks/config/decayscreen.xml.h:21
+msgid "Stretchy melt"
 msgstr ""
 
-#: ../hacks/config/decayscreen.xml.h:23
-msgid "Stretchy melt"
+#: ../hacks/config/decayscreen.xml.h:22
+msgid "Fuzzy melt"
 msgstr ""
 
 #: ../hacks/config/decayscreen.xml.h:24
@@ -3609,35 +3699,35 @@
 "Wald, Vivek Khera, Jamie Zawinski, and Vince Levey; 1993."
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:3
+#: ../hacks/config/deco.xml.h:1
 msgid "Deco"
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:5
-msgid "Golden ratio"
+#: ../hacks/config/deco.xml.h:8
+msgid "Minimum width"
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:7
-msgid "Maximum depth"
+#: ../hacks/config/deco.xml.h:9
+msgid "Minimum height"
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:8
-msgid "Minimum height"
+#: ../hacks/config/deco.xml.h:10
+msgid "Maximum depth"
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:9
-msgid "Minimum width"
+#: ../hacks/config/deco.xml.h:11
+msgid "Smooth colors"
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:10
-msgid "Mondrian"
+#: ../hacks/config/deco.xml.h:12
+msgid "Golden ratio"
 msgstr ""
 
 #: ../hacks/config/deco.xml.h:13
-msgid "Smooth colors"
+msgid "Mondrian"
 msgstr ""
 
-#: ../hacks/config/deco.xml.h:14
+#: ../hacks/config/deco.xml.h:15
 msgid ""
 "Subdivides and colors rectangles randomly. It looks kind of like Brady-Bunch-"
 "era rec-room wall paneling. "
@@ -3645,232 +3735,220 @@
 "by Jamie Zawinski and Michael Bayne; 1997."
 msgstr ""
 
-#: ../hacks/config/deluxe.xml.h:1 ../hacks/config/gflux.xml.h:1
-#: ../hacks/config/glcells.xml.h:1 ../hacks/config/glhanoi.xml.h:2
-#: ../hacks/config/glsnake.xml.h:1 ../hacks/config/hypnowheel.xml.h:1
-#: ../hacks/config/lavalite.xml.h:1 ../hacks/config/lisa.xml.h:1
-#: ../hacks/config/lissie.xml.h:1 ../hacks/config/skytentacles.xml.h:1
-msgid "1"
-msgstr "1"
-
-#: ../hacks/config/deluxe.xml.h:3
+#: ../hacks/config/deluxe.xml.h:1
 msgid "Deluxe"
 msgstr ""
 
-#: ../hacks/config/deluxe.xml.h:4
-msgid ""
-"Draws a pulsing sequence of transparent stars, circles, and lines. Written "
-"by Jamie Zawinski; 1999."
-msgstr ""
-
-#: ../hacks/config/deluxe.xml.h:11
+#: ../hacks/config/deluxe.xml.h:9
 msgid "Shapes"
 msgstr ""
 
 #. #### -speed [15]
-#: ../hacks/config/deluxe.xml.h:16 ../hacks/config/mirrorblob.xml.h:26
+#: ../hacks/config/deluxe.xml.h:15 ../hacks/config/mirrorblob.xml.h:18
 msgid "Transparency"
 msgstr ""
 
-#: ../hacks/config/demon.xml.h:1 ../hacks/config/gears.xml.h:1
-#: ../hacks/config/glhanoi.xml.h:1 ../hacks/config/interference.xml.h:1
-#: ../hacks/config/voronoi.xml.h:1
-msgid "0"
-msgstr ""
-
-#: ../hacks/config/demon.xml.h:4
-#, no-c-format
+#: ../hacks/config/deluxe.xml.h:17
 msgid ""
-"A cellular automaton that starts with a random field, and organizes it into "
-"stripes and spirals. http://en.wikipedia.org/wiki/Maxwell%27s_demon Written "
-"by David Bagley; 1999."
+"Draws a pulsing sequence of transparent stars, circles, and lines. Written "
+"by Jamie Zawinski; 1999."
 msgstr ""
 
-#: ../hacks/config/demon.xml.h:6
+#: ../hacks/config/demon.xml.h:1
 msgid "Demon"
 msgstr ""
 
-#: ../hacks/config/demon.xml.h:15
+#: ../hacks/config/demon.xml.h:5 ../hacks/config/gears.xml.h:8
+#: ../hacks/config/glhanoi.xml.h:5 ../hacks/config/interference.xml.h:18
+#: ../hacks/config/voronoi.xml.h:8
+msgid "0"
+msgstr ""
+
+#: ../hacks/config/demon.xml.h:6
 msgid "States"
 msgstr "Stavy"
 
-#: ../hacks/config/discrete.xml.h:1
-msgid "Discrete"
-msgstr ""
-
-#: ../hacks/config/discrete.xml.h:7
+#: ../hacks/config/demon.xml.h:17
+#, no-c-format
 msgid ""
-"More \"discrete map\" systems, including new variants of Hopalong and Julia, "
-"and a few others. See also the \"Hopalong\" and \"Julia\" screen savers. "
-"Written by Tim Auckland; 1998."
-msgstr ""
-
-#: ../hacks/config/distort.xml.h:3
-msgid "Black hole"
-msgstr ""
-
-#: ../hacks/config/distort.xml.h:4
-msgid "Bounce"
+"A cellular automaton that starts with a random field, and organizes it into "
+"stripes and spirals. http://en.wikipedia.org/wiki/Maxwell%27s_demon Written "
+"by David Bagley; 1999."
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:5
-msgid "Distort"
+#: ../hacks/config/discrete.xml.h:1
+msgid "Discrete"
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:8
+#: ../hacks/config/discrete.xml.h:12
 msgid ""
-"Grabs an image of the screen, and then lets a transparent lens wander around "
-"the screen, magnifying whatever is underneath. Written by Jonas Munsin; 1998."
+"More \"discrete map\" systems, including new variants of Hopalong and Julia, "
+"and a few others. See also the \"Hopalong\" and \"Julia\" screen savers. "
+"Written by Tim Auckland; 1998."
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:12
-msgid "Lens count"
+#: ../hacks/config/distort.xml.h:1
+msgid "Distort"
 msgstr ""
 
 #. #### -slow
-#: ../hacks/config/distort.xml.h:14
+#: ../hacks/config/distort.xml.h:11
 msgid "Lens size"
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:16
-msgid "Magnify"
-msgstr "Zväčšovať"
+#: ../hacks/config/distort.xml.h:14
+msgid "Lens count"
+msgstr ""
 
-#: ../hacks/config/distort.xml.h:17
+#: ../hacks/config/distort.xml.h:15
 msgid "Normal"
 msgstr ""
 
+#: ../hacks/config/distort.xml.h:16
+msgid "Swamp thing"
+msgstr ""
+
 #: ../hacks/config/distort.xml.h:18
 msgid "Reflect"
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:22
-msgid "Swamp thing"
+#: ../hacks/config/distort.xml.h:19
+msgid "Magnify"
+msgstr "Zväčšovať"
+
+#: ../hacks/config/distort.xml.h:20
+msgid "Black hole"
 msgstr ""
 
-#: ../hacks/config/distort.xml.h:23
+#: ../hacks/config/distort.xml.h:21
 msgid "Vortex"
 msgstr "Vír"
 
-#: ../hacks/config/dnalogo.xml.h:1
-msgid "DNA Logo"
+#: ../hacks/config/distort.xml.h:23
+msgid ""
+"Grabs an image of the screen, and then lets a transparent lens wander around "
+"the screen, magnifying whatever is underneath. Written by Jonas Munsin; 1998."
 msgstr ""
 
-#: ../hacks/config/dnalogo.xml.h:2
-msgid ""
-"DNA Lounge Restaurant -- Bar -- Nightclub -- Cafe -- Est. 1985. 375 Eleventh "
-"Street San Francisco, CA 94103 http://www.dnalounge.com/ "
-"http://www.dnapizza.com/ Written by Jamie Zawinski; 2001."
+#: ../hacks/config/dnalogo.xml.h:1
+msgid "DNA Logo"
 msgstr ""
 
 #: ../hacks/config/dnalogo.xml.h:3
-msgid "DNA Lounge and DNA Pizza logos"
+msgid "Frame Rate"
 msgstr ""
 
-#: ../hacks/config/dnalogo.xml.h:4
+#: ../hacks/config/dnalogo.xml.h:5
 msgid "DNA Lounge logo"
 msgstr ""
 
-#: ../hacks/config/dnalogo.xml.h:5
+#: ../hacks/config/dnalogo.xml.h:6
 msgid "DNA Pizza logo"
 msgstr ""
 
-#: ../hacks/config/dnalogo.xml.h:6
-msgid "Frame Rate"
+#: ../hacks/config/dnalogo.xml.h:7
+msgid "DNA Lounge and DNA Pizza logos"
+msgstr ""
+
+#: ../hacks/config/dnalogo.xml.h:10
+msgid ""
+"DNA Lounge Restaurant -- Bar -- Nightclub -- Cafe -- Est. 1985. 375 Eleventh "
+"Street San Francisco, CA 94103 http://www.dnalounge.com/ "
+"http://www.dnapizza.com/ Written by Jamie Zawinski; 2001."
 msgstr ""
 
 #: ../hacks/config/drift.xml.h:1
 msgid "Drift"
 msgstr ""
 
-#: ../hacks/config/drift.xml.h:2
+#: ../hacks/config/drift.xml.h:12
 msgid ""
 "Drifting recursive fractal cosmic flames. Written by Scott Draves; 1997."
 msgstr ""
 
 #: ../hacks/config/endgame.xml.h:1
-msgid ""
-"Black slips out of three mating nets, but the fourth one holds him tight! A "
-"brilliant composition! See also the \"Queens\" screen saver. "
-"http://en.wikipedia.org/wiki/Chess_endgame Written by Blair Tennessy; 2002."
-msgstr ""
-
-#: ../hacks/config/endgame.xml.h:2
 msgid "Endgame"
 msgstr ""
 
-#: ../hacks/config/endgame.xml.h:6
+#: ../hacks/config/endgame.xml.h:5
 msgid "Low resolution chess pieces"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:1
-msgid "Audi Quattro (5 cylinders)"
+#: ../hacks/config/endgame.xml.h:7
+msgid ""
+"Black slips out of three mating nets, but the fourth one holds him tight! A "
+"brilliant composition! See also the \"Queens\" screen saver. "
+"http://en.wikipedia.org/wiki/Chess_endgame Written by Blair Tennessy; 2002."
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:2
-msgid "BMW M3 (4 cylinders)"
-msgstr ""
+#: ../hacks/config/engine.xml.h:1
+msgid "Engine"
+msgstr "Motor"
 
-#: ../hacks/config/engine.xml.h:3
-msgid "BMW M5 (6 cylinders)"
+#: ../hacks/config/engine.xml.h:5
+msgid "Random engine"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:4
-msgid "Corvette Z06 (8 cylinders, V)"
+#: ../hacks/config/engine.xml.h:6
+msgid "Honda Insight (3 cylinders)"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:5
-msgid "Dodge Viper (10 cylinders, V)"
+#: ../hacks/config/engine.xml.h:7
+msgid "BMW M3 (4 cylinders)"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:6
-msgid ""
-"Draws a simple model of an engine that floats around the screen. "
-"http://en.wikipedia.org/wiki/Internal_combustion_engine#Operation Written by "
-"Ben Buxton and Ed Beroset; 2001."
+#: ../hacks/config/engine.xml.h:8
+msgid "VW Beetle (4 cylinders, flat)"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:7
-msgid "Engine"
-msgstr "Motor"
+#: ../hacks/config/engine.xml.h:9
+msgid "Audi Quattro (5 cylinders)"
+msgstr ""
 
 #: ../hacks/config/engine.xml.h:10
-msgid "Honda Insight (3 cylinders)"
+msgid "BMW M5 (6 cylinders)"
 msgstr ""
 
 #: ../hacks/config/engine.xml.h:11
-msgid "Jaguar XKE (12 cylinders, V)"
+msgid "Subaru XT (6 cylinders, V)"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:13
+#: ../hacks/config/engine.xml.h:12
 msgid "Porsche 911 (6 cylinders, flat)"
 msgstr ""
 
+#: ../hacks/config/engine.xml.h:13
+msgid "Corvette Z06 (8 cylinders, V)"
+msgstr ""
+
 #: ../hacks/config/engine.xml.h:14
-msgid "Random engine"
+msgid "Dodge Viper (10 cylinders, V)"
 msgstr ""
 
 #: ../hacks/config/engine.xml.h:15
-msgid "Show engine name"
+msgid "Jaguar XKE (12 cylinders, V)"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:18
-msgid "Subaru XT (6 cylinders, V)"
+#: ../hacks/config/engine.xml.h:16
+msgid "Show engine name"
 msgstr ""
 
-#: ../hacks/config/engine.xml.h:19
-msgid "VW Beetle (4 cylinders, flat)"
+#: ../hacks/config/engine.xml.h:20
+msgid ""
+"Draws a simple model of an engine that floats around the screen. "
+"http://en.wikipedia.org/wiki/Internal_combustion_engine#Operation Written by "
+"Ben Buxton and Ed Beroset; 2001."
 msgstr ""
 
-#: ../hacks/config/epicycle.xml.h:3
+#: ../hacks/config/epicycle.xml.h:1
 msgid "Epicycle"
 msgstr "Epicyklus"
 
-#: ../hacks/config/epicycle.xml.h:5
+#: ../hacks/config/epicycle.xml.h:12
 msgid "Harmonics"
 msgstr ""
 
-#: ../hacks/config/epicycle.xml.h:14
+#: ../hacks/config/epicycle.xml.h:15
 msgid ""
 "This draws the path traced out by a point on the edge of a circle. That "
 "circle rotates around a point on the rim of another circle, and so on, "
@@ -3880,61 +3958,61 @@
 msgstr ""
 
 #: ../hacks/config/eruption.xml.h:1
-msgid "Cooling factor"
-msgstr ""
-
-#: ../hacks/config/eruption.xml.h:3
 msgid "Eruption"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:4
-msgid ""
-"Exploding fireworks. See also the \"Fireworkx\", \"XFlame\" and \"Pyro\" "
-"screen savers. Written by W.P. van Paassen; 2003."
+#: ../hacks/config/eruption.xml.h:8
+msgid "Little"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:8 ../hacks/config/fluidballs.xml.h:8
-#: ../hacks/config/qix.xml.h:9 ../hacks/config/speedmine.xml.h:5
-msgid "Gravity"
-msgstr "Gravitácia"
-
 #: ../hacks/config/eruption.xml.h:9
-msgid "Heat"
+msgid "Number of particles"
 msgstr ""
 
 #: ../hacks/config/eruption.xml.h:11
-msgid "Inferno"
+msgid "Cooling factor"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:12
-msgid "Little"
+#: ../hacks/config/eruption.xml.h:13
+msgid "Pleasant"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:16
-msgid "Negative"
+#: ../hacks/config/eruption.xml.h:14
+msgid "Heat"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:18
-msgid "Number of particles"
+#: ../hacks/config/eruption.xml.h:15
+msgid "Inferno"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:19
-msgid "Pleasant"
+#: ../hacks/config/eruption.xml.h:16
+msgid "Negative"
 msgstr ""
 
-#: ../hacks/config/eruption.xml.h:20
+#: ../hacks/config/eruption.xml.h:17 ../hacks/config/fluidballs.xml.h:12
+#: ../hacks/config/qix.xml.h:23 ../hacks/config/speedmine.xml.h:9
+msgid "Gravity"
+msgstr "Gravitácia"
+
+#: ../hacks/config/eruption.xml.h:18
 msgid "Positive"
 msgstr ""
 
-#: ../hacks/config/euler2d.xml.h:7
+#: ../hacks/config/eruption.xml.h:23
+msgid ""
+"Exploding fireworks. See also the \"Fireworkx\", \"XFlame\" and \"Pyro\" "
+"screen savers. Written by W.P. van Paassen; 2003."
+msgstr ""
+
+#: ../hacks/config/euler2d.xml.h:1
 msgid "Euler2D"
 msgstr ""
 
-#: ../hacks/config/euler2d.xml.h:20 ../hacks/config/whirlwindwarp.xml.h:5
+#: ../hacks/config/euler2d.xml.h:6 ../hacks/config/whirlwindwarp.xml.h:3
 msgid "Particles"
 msgstr ""
 
-#: ../hacks/config/euler2d.xml.h:29
+#: ../hacks/config/euler2d.xml.h:31
 #, no-c-format
 msgid ""
 "Simulates two dimensional incompressible inviscid fluid flow. "
@@ -3944,124 +4022,124 @@
 msgstr ""
 
 #: ../hacks/config/extrusion.xml.h:1
-msgid ""
-"Draws various rotating extruded shapes that twist around, lengthen, and turn "
-"inside out. Written by Linas Vepstas, David Konerding, and Jamie Zawinski; "
-"1999."
+msgid "Extrusion"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:2
-msgid "Extrusion"
+#: ../hacks/config/extrusion.xml.h:5 ../hacks/config/morph3d.xml.h:5
+#: ../hacks/config/polytopes.xml.h:5
+msgid "Random object"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:4
+#: ../hacks/config/extrusion.xml.h:6
 msgid "Helix 2"
 msgstr "Špirála 2"
 
-#: ../hacks/config/extrusion.xml.h:5
+#: ../hacks/config/extrusion.xml.h:7
 msgid "Helix 3"
 msgstr "Špirála 3"
 
-#: ../hacks/config/extrusion.xml.h:6
+#: ../hacks/config/extrusion.xml.h:8
 msgid "Helix 4"
 msgstr "Špirála 4"
 
-#: ../hacks/config/extrusion.xml.h:8
+#: ../hacks/config/extrusion.xml.h:9
 msgid "Join offset"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:10 ../hacks/config/morph3d.xml.h:10
-#: ../hacks/config/polytopes.xml.h:18
-msgid "Random object"
-msgstr ""
-
-#: ../hacks/config/extrusion.xml.h:11
+#: ../hacks/config/extrusion.xml.h:10
 msgid "Screw"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:13
+#: ../hacks/config/extrusion.xml.h:11
 msgid "Taper"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:14
+#: ../hacks/config/extrusion.xml.h:12
 msgid "Twistoid"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:15
+#: ../hacks/config/extrusion.xml.h:13
 msgid "Use flat coloring"
 msgstr ""
 
-#: ../hacks/config/extrusion.xml.h:16
+#: ../hacks/config/extrusion.xml.h:14
 msgid "Use lighting"
 msgstr ""
 
-#: ../hacks/config/fadeplot.xml.h:1 ../hacks/config/lcdscrub.xml.h:1
-#: ../hacks/config/spiral.xml.h:2
-msgid "Cycles"
-msgstr ""
-
-#: ../hacks/config/fadeplot.xml.h:2
+#: ../hacks/config/extrusion.xml.h:18
 msgid ""
-"Draws what looks like a waving ribbon following a sinusoidal path. Written "
-"by Bas van Gaalen and Charles Vidal; 1997."
+"Draws various rotating extruded shapes that twist around, lengthen, and turn "
+"inside out. Written by Linas Vepstas, David Konerding, and Jamie Zawinski; "
+"1999."
 msgstr ""
 
-#: ../hacks/config/fadeplot.xml.h:3
+#: ../hacks/config/fadeplot.xml.h:1
 msgid "FadePlot"
 msgstr ""
 
-#: ../hacks/config/fiberlamp.xml.h:1
+#: ../hacks/config/fadeplot.xml.h:9 ../hacks/config/lcdscrub.xml.h:6
+#: ../hacks/config/spiral.xml.h:8
+msgid "Cycles"
+msgstr ""
+
+#: ../hacks/config/fadeplot.xml.h:15
 msgid ""
-"Draws a groovy rotating fiber optic lamp. Written by Tim Auckland; 2005."
+"Draws what looks like a waving ribbon following a sinusoidal path. Written "
+"by Bas van Gaalen and Charles Vidal; 1997."
 msgstr ""
 
-#: ../hacks/config/fiberlamp.xml.h:3
+#: ../hacks/config/fiberlamp.xml.h:1
 msgid "Fiberlamp"
 msgstr ""
 
-#: ../hacks/config/fiberlamp.xml.h:4
+#: ../hacks/config/fiberlamp.xml.h:6
 msgid "Fibers"
 msgstr ""
 
-#: ../hacks/config/fiberlamp.xml.h:12
+#: ../hacks/config/fiberlamp.xml.h:9
 msgid "Time between knocks"
 msgstr ""
 
-#: ../hacks/config/fireworkx.xml.h:1 ../hacks/config/lavalite.xml.h:3
-msgid "Activity"
-msgstr ""
-
-#: ../hacks/config/fireworkx.xml.h:3
+#: ../hacks/config/fiberlamp.xml.h:12
 msgid ""
-"Exploding fireworks. See also the \"Eruption\", \"XFlame\" and \"Pyro\" "
-"screen savers. Written by Rony B Chandran; 2004."
+"Draws a groovy rotating fiber optic lamp. Written by Tim Auckland; 2005."
 msgstr ""
 
-#: ../hacks/config/fireworkx.xml.h:4
+#: ../hacks/config/fireworkx.xml.h:1
 msgid "Fireworkx"
 msgstr ""
 
-#: ../hacks/config/fireworkx.xml.h:6
-msgid "Glowing smoke"
+#: ../hacks/config/fireworkx.xml.h:6 ../hacks/config/lavalite.xml.h:6
+msgid "Activity"
 msgstr ""
 
 #: ../hacks/config/fireworkx.xml.h:8
 msgid "Light flash"
 msgstr ""
 
+#: ../hacks/config/fireworkx.xml.h:9
+msgid "Glowing smoke"
+msgstr ""
+
 #: ../hacks/config/fireworkx.xml.h:10
 msgid "Shells upward"
 msgstr ""
 
+#: ../hacks/config/fireworkx.xml.h:12
+msgid ""
+"Exploding fireworks. See also the \"Eruption\", \"XFlame\" and \"Pyro\" "
+"screen savers. Written by Rony B Chandran; 2004."
+msgstr ""
+
 #: ../hacks/config/flag.xml.h:1
 msgid "Flag"
 msgstr "Zástava"
 
-#: ../hacks/config/flag.xml.h:11
+#: ../hacks/config/flag.xml.h:2
 msgid "Text for flag"
 msgstr ""
 
-#: ../hacks/config/flag.xml.h:12
+#: ../hacks/config/flag.xml.h:14
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. This draws a waving colored flag, that undulates its way "
@@ -4070,149 +4148,149 @@
 "picture of \"Bob\". Written by Charles Vidal and Jamie Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/flame.xml.h:5
+#: ../hacks/config/flame.xml.h:1
 msgid "Flame"
 msgstr "Plamene"
 
-#: ../hacks/config/flame.xml.h:8
-msgid "Iterative fractals. Written by Scott Draves; 1993."
-msgstr ""
-
-#: ../hacks/config/flame.xml.h:13
+#: ../hacks/config/flame.xml.h:9
 msgid "Number of fractals"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:2
-msgid "Draw Sticks"
+#: ../hacks/config/flame.xml.h:15
+msgid "Iterative fractals. Written by Scott Draves; 1993."
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:3
-msgid "Draw Tiles"
+#: ../hacks/config/flipflop.xml.h:1
+msgid "FlipFlop"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:4
-msgid ""
-"Draws a grid of 3D colored tiles that change positions with each other. "
-"Written by Kevin Ogden and Sergio Gutierrez; 2003."
+#: ../hacks/config/flipflop.xml.h:5
+msgid "Stopped"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:5
-msgid "FlipFlop"
+#: ../hacks/config/flipflop.xml.h:7
+msgid "Whirlwind"
 msgstr ""
 
 #: ../hacks/config/flipflop.xml.h:8
-msgid "Load image"
+msgid "Draw Tiles"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:12
-msgid "Stopped"
+#: ../hacks/config/flipflop.xml.h:9
+msgid "Draw Sticks"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:13
-msgid "Whirlwind"
+#: ../hacks/config/flipflop.xml.h:10
+msgid "Width"
 msgstr ""
 
-#: ../hacks/config/flipflop.xml.h:14
-msgid "Width"
+#: ../hacks/config/flipflop.xml.h:12
+msgid "Load image"
+msgstr ""
+
+#: ../hacks/config/flipflop.xml.h:15
+msgid ""
+"Draws a grid of 3D colored tiles that change positions with each other. "
+"Written by Kevin Ogden and Sergio Gutierrez; 2003."
 msgstr ""
 
 #: ../hacks/config/flipscreen3d.xml.h:1
 msgid "FlipScreen3D"
 msgstr ""
 
-#: ../hacks/config/flipscreen3d.xml.h:3
+#: ../hacks/config/flipscreen3d.xml.h:5 ../hacks/config/gleidescope.xml.h:12
+#: ../hacks/config/glplanet.xml.h:8 ../hacks/config/ifs.xml.h:67
+#: ../hacks/config/tangram.xml.h:15 ../hacks/config/topblock.xml.h:17
+msgid "Rotate"
+msgstr "Otáčať"
+
+#: ../hacks/config/flipscreen3d.xml.h:7
 msgid ""
 "Grabs an image of the desktop, turns it into a GL texture map, and spins it "
 "around and deforms it in various ways. Written by Ben Buxton and Jamie "
 "Zawinski; 2001."
 msgstr ""
 
-#: ../hacks/config/flipscreen3d.xml.h:6 ../hacks/config/gleidescope.xml.h:11
-#: ../hacks/config/glplanet.xml.h:10 ../hacks/config/ifs.xml.h:11
-#: ../hacks/config/tangram.xml.h:9 ../hacks/config/topblock.xml.h:17
-msgid "Rotate"
-msgstr "Otáčať"
-
-#: ../hacks/config/fliptext.xml.h:1 ../hacks/config/starwars.xml.h:4
-msgid "Centered text"
+#: ../hacks/config/fliptext.xml.h:1
+msgid "FlipText"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:2
-msgid ""
-"Draws successive pages of text. The lines flip in and out in a soothing 3D "
-"pattern. Written by Jamie Zawinski; 2005."
+#: ../hacks/config/fliptext.xml.h:8
+msgid "Random text alignment"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:4
-msgid "FlipText"
+#: ../hacks/config/fliptext.xml.h:9 ../hacks/config/starwars.xml.h:7
+msgid "Flush left text"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:5 ../hacks/config/starwars.xml.h:8
-msgid "Flush left text"
+#: ../hacks/config/fliptext.xml.h:10 ../hacks/config/starwars.xml.h:8
+msgid "Centered text"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:6 ../hacks/config/starwars.xml.h:9
+#: ../hacks/config/fliptext.xml.h:11 ../hacks/config/starwars.xml.h:9
 msgid "Flush right text"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:7 ../hacks/config/starwars.xml.h:10
+#: ../hacks/config/fliptext.xml.h:12 ../hacks/config/starwars.xml.h:17
 msgid "Font point size"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:11
-msgid "Random text alignment"
-msgstr ""
-
-#: ../hacks/config/fliptext.xml.h:15
+#: ../hacks/config/fliptext.xml.h:13
 msgid "Text columns"
 msgstr ""
 
-#: ../hacks/config/fliptext.xml.h:16 ../hacks/config/starwars.xml.h:15
+#: ../hacks/config/fliptext.xml.h:14 ../hacks/config/starwars.xml.h:16
 msgid "Text lines"
 msgstr ""
 
-#: ../hacks/config/flow.xml.h:1 ../hacks/config/galaxy.xml.h:1
-#: ../hacks/config/glforestfire.xml.h:1 ../hacks/config/julia.xml.h:2
-#: ../hacks/config/laser.xml.h:1 ../hacks/config/lisa.xml.h:3
-#: ../hacks/config/lissie.xml.h:3 ../hacks/config/piecewise.xml.h:2
-#: ../hacks/config/qix.xml.h:4 ../hacks/config/rocks.xml.h:1
-#: ../hacks/config/rotor.xml.h:1 ../hacks/config/rubik.xml.h:1
-#: ../hacks/config/shadebobs.xml.h:1 ../hacks/config/slip.xml.h:1
-#: ../hacks/config/spiral.xml.h:1 ../hacks/config/swirl.xml.h:1
-#: ../hacks/config/worm.xml.h:1
-msgid "Count"
-msgstr "Počet"
-
-#: ../hacks/config/flow.xml.h:2 ../hacks/config/glschool.xml.h:3
-#: ../hacks/config/molecule.xml.h:7 ../hacks/config/spheremonics.xml.h:2
-msgid "Draw bounding box"
+#: ../hacks/config/fliptext.xml.h:16
+msgid ""
+"Draws successive pages of text. The lines flip in and out in a soothing 3D "
+"pattern. Written by Jamie Zawinski; 2005."
 msgstr ""
 
-#: ../hacks/config/flow.xml.h:4
+#: ../hacks/config/flow.xml.h:1
 msgid "Flow"
 msgstr "Tok"
 
-#: ../hacks/config/flow.xml.h:8
+#: ../hacks/config/flow.xml.h:6 ../hacks/config/galaxy.xml.h:5
+#: ../hacks/config/glforestfire.xml.h:6 ../hacks/config/julia.xml.h:6
+#: ../hacks/config/laser.xml.h:5 ../hacks/config/lisa.xml.h:14
+#: ../hacks/config/lissie.xml.h:12 ../hacks/config/piecewise.xml.h:6
+#: ../hacks/config/qix.xml.h:18 ../hacks/config/rocks.xml.h:6
+#: ../hacks/config/rotor.xml.h:11 ../hacks/config/rubik.xml.h:5
+#: ../hacks/config/shadebobs.xml.h:12 ../hacks/config/slip.xml.h:6
+#: ../hacks/config/spiral.xml.h:6 ../hacks/config/swirl.xml.h:6
+#: ../hacks/config/worm.xml.h:8
+msgid "Count"
+msgstr "Počet"
+
+#: ../hacks/config/flow.xml.h:14
 msgid "Length of trails"
 msgstr ""
 
-#: ../hacks/config/flow.xml.h:13
-msgid "Periodic attractors"
+#: ../hacks/config/flow.xml.h:16
+msgid "Rotating around attractor"
 msgstr ""
 
-#: ../hacks/config/flow.xml.h:14
+#: ../hacks/config/flow.xml.h:17
 msgid "Ride in the flow"
 msgstr ""
 
-#: ../hacks/config/flow.xml.h:15
-msgid "Rotating around attractor"
+#: ../hacks/config/flow.xml.h:18 ../hacks/config/glschool.xml.h:16
+#: ../hacks/config/molecule.xml.h:10 ../hacks/config/spheremonics.xml.h:20
+msgid "Draw bounding box"
 msgstr ""
 
-#: ../hacks/config/flow.xml.h:16
-msgid "Search for new attractors"
+#: ../hacks/config/flow.xml.h:19
+msgid "Periodic attractors"
 msgstr ""
 
 #: ../hacks/config/flow.xml.h:20
+msgid "Search for new attractors"
+msgstr ""
+
+#: ../hacks/config/flow.xml.h:22
 msgid ""
 "Strange attractors formed of flows in a 3D differential equation phase "
 "space. Features the popular attractors described by Lorentz, Roessler, "
@@ -4222,92 +4300,92 @@
 msgstr ""
 
 #: ../hacks/config/fluidballs.xml.h:1
+msgid "FluidBalls"
+msgstr ""
+
+#: ../hacks/config/fluidballs.xml.h:11
 msgid "      Freefall"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:3
-msgid "Clay"
+#: ../hacks/config/fluidballs.xml.h:13
+msgid "Jupiter"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:5
-msgid "FluidBalls"
+#: ../hacks/config/fluidballs.xml.h:14
+msgid "Still"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:7 ../hacks/config/twang.xml.h:7
-msgid "Friction"
+#: ../hacks/config/fluidballs.xml.h:15
+msgid "Wind"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:10
+#: ../hacks/config/fluidballs.xml.h:16
 msgid "Hurricane"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:11
-msgid "Jupiter"
+#: ../hacks/config/fluidballs.xml.h:17
+msgid "Clay"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:15
-msgid ""
-"Models the physics of bouncing balls, or of particles in a gas or fluid, "
-"depending on the settings. If \"Shake Box\" is selected, then every now and "
-"then, the box will be rotated, changing which direction is down (in order to "
-"keep the settled balls in motion.) Written by Peter Birtles and Jamie "
-"Zawinski; 2002."
+#: ../hacks/config/fluidballs.xml.h:18 ../hacks/config/twang.xml.h:11
+msgid "Friction"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:17
+#: ../hacks/config/fluidballs.xml.h:19
 msgid "Rubber"
 msgstr ""
 
-#: ../hacks/config/fluidballs.xml.h:18
-msgid "Shake box"
+#: ../hacks/config/fluidballs.xml.h:20
+msgid "Various ball sizes"
 msgstr ""
 
 #: ../hacks/config/fluidballs.xml.h:21
-msgid "Still"
-msgstr ""
-
-#: ../hacks/config/fluidballs.xml.h:22
-msgid "Various ball sizes"
+msgid "Shake box"
 msgstr ""
 
 #: ../hacks/config/fluidballs.xml.h:23
-msgid "Wind"
+msgid ""
+"Models the physics of bouncing balls, or of particles in a gas or fluid, "
+"depending on the settings. If \"Shake Box\" is selected, then every now and "
+"then, the box will be rotated, changing which direction is down (in order to "
+"keep the settled balls in motion.) Written by Peter Birtles and Jamie "
+"Zawinski; 2002."
 msgstr ""
 
 #: ../hacks/config/flurry.xml.h:1
-msgid "Binary"
-msgstr ""
-
-#: ../hacks/config/flurry.xml.h:2
-msgid "Classic"
+msgid "Flurry"
 msgstr ""
 
 #: ../hacks/config/flurry.xml.h:3
-msgid "Fire"
+msgid "Classic"
 msgstr ""
 
 #: ../hacks/config/flurry.xml.h:4
-msgid "Flurry"
+msgid "RGB"
 msgstr ""
 
 #: ../hacks/config/flurry.xml.h:5
-msgid "Insane"
+msgid "Fire"
+msgstr ""
+
+#: ../hacks/config/flurry.xml.h:7
+msgid "Binary"
 msgstr ""
 
-#: ../hacks/config/flurry.xml.h:6
+#: ../hacks/config/flurry.xml.h:8
 msgid "Psychedelic"
 msgstr ""
 
-#: ../hacks/config/flurry.xml.h:7
-msgid "RGB"
+#: ../hacks/config/flurry.xml.h:9
+msgid "Insane"
 msgstr ""
 
-#: ../hacks/config/flurry.xml.h:8 ../hacks/config/klein.xml.h:19
-#: ../hacks/config/sballs.xml.h:11 ../hacks/config/starfish.xml.h:12
+#: ../hacks/config/flurry.xml.h:10 ../hacks/config/klein.xml.h:6
+#: ../hacks/config/sballs.xml.h:5 ../hacks/config/starfish.xml.h:2
 msgid "Random"
 msgstr "Náhodne"
 
-#: ../hacks/config/flurry.xml.h:10
+#: ../hacks/config/flurry.xml.h:11
 msgid ""
 "This X11 port of the OSX screensaver of the same name draws a colourful "
 "star(fish)like flurry of particles. Original Mac version: "
@@ -4315,164 +4393,164 @@
 "Sargeant; 2002."
 msgstr ""
 
-#: ../hacks/config/flyingtoasters.xml.h:2
-#, no-c-format
-msgid ""
-"A fleet of 3d space-age jet-powered flying toasters (and toast!) Inspired by "
-"the ancient Berkeley Systems After Dark flying toasters. "
-"http://en.wikipedia.org/wiki/After_Dark_%28software%29#Flying_Toasters "
-"Written by Jamie Zawinski and Devon Dossett; 2003."
+#: ../hacks/config/flyingtoasters.xml.h:1
+msgid "FlyingToasters"
 msgstr ""
 
-#: ../hacks/config/flyingtoasters.xml.h:3
+#: ../hacks/config/flyingtoasters.xml.h:6
 msgid "Air speed"
 msgstr ""
 
-#: ../hacks/config/flyingtoasters.xml.h:4 ../hacks/config/jigglypuff.xml.h:1
-msgid "Chrome"
+#: ../hacks/config/flyingtoasters.xml.h:9
+msgid "Number of toasters"
 msgstr ""
 
-#: ../hacks/config/flyingtoasters.xml.h:6
-msgid "FlyingToasters"
+#: ../hacks/config/flyingtoasters.xml.h:10
+msgid "Swarm"
 msgstr ""
 
 #: ../hacks/config/flyingtoasters.xml.h:11
 msgid "Number of slices"
 msgstr ""
 
-#: ../hacks/config/flyingtoasters.xml.h:12
-msgid "Number of toasters"
-msgstr ""
-
-#: ../hacks/config/flyingtoasters.xml.h:15
-msgid "Swarm"
+#: ../hacks/config/flyingtoasters.xml.h:12 ../hacks/config/jigglypuff.xml.h:23
+msgid "Chrome"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:1 ../hacks/config/tangram.xml.h:1
-#: ../hacks/config/xlyap.xml.h:1
-msgid "Brief"
+#: ../hacks/config/flyingtoasters.xml.h:16
+#, no-c-format
+msgid ""
+"A fleet of 3d space-age jet-powered flying toasters (and toast!) Inspired by "
+"the ancient Berkeley Systems After Dark flying toasters. "
+"http://en.wikipedia.org/wiki/After_Dark_%28software%29#Flying_Toasters "
+"Written by Jamie Zawinski and Devon Dossett; 2003."
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:3
-msgid "Font border thickness"
+#: ../hacks/config/fontglide.xml.h:1
+msgid "FontGlide"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:4
-msgid "FontGlide"
+#: ../hacks/config/fontglide.xml.h:8
+msgid "Pages of text"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:7
+#: ../hacks/config/fontglide.xml.h:9
 msgid "Horizontally scrolling text"
 msgstr ""
 
 #: ../hacks/config/fontglide.xml.h:10
-msgid "Page linger"
+msgid "Random display style"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:11
-msgid "Pages of text"
+#: ../hacks/config/fontglide.xml.h:11 ../hacks/config/tangram.xml.h:5
+#: ../hacks/config/xlyap.xml.h:5
+msgid "Brief"
 msgstr ""
 
 #: ../hacks/config/fontglide.xml.h:12
-msgid ""
-"Puts text on the screen using large characters that glide in from the edges, "
-"assemble, then disperse. Alternately, it can simply scroll whole sentences "
-"from right to left. Written by Jamie Zawinski; 2003."
+msgid "Page linger"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:13
-msgid "Random display style"
+#: ../hacks/config/fontglide.xml.h:14
+msgid "Font border thickness"
 msgstr ""
 
-#: ../hacks/config/fontglide.xml.h:17
+#: ../hacks/config/fontglide.xml.h:15
 msgid "Vapor trails"
 msgstr ""
 
-#: ../hacks/config/forest.xml.h:1 ../hacks/config/glforestfire.xml.h:4
+#: ../hacks/config/fontglide.xml.h:17
+msgid ""
+"Puts text on the screen using large characters that glide in from the edges, "
+"assemble, then disperse. Alternately, it can simply scroll whole sentences "
+"from right to left. Written by Jamie Zawinski; 2003."
+msgstr ""
+
+#: ../hacks/config/forest.xml.h:1 ../hacks/config/glforestfire.xml.h:10
 msgid "Forest"
 msgstr "Les"
 
-#: ../hacks/config/forest.xml.h:8
+#: ../hacks/config/forest.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Fractal trees. Written by Peter Baumung; 1997."
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:2
-msgid "Blue"
+#: ../hacks/config/fuzzyflakes.xml.h:1
+msgid "FuzzyFlakes"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:3
-msgid "Border thickness"
+#: ../hacks/config/fuzzyflakes.xml.h:9 ../hacks/config/hypnowheel.xml.h:10
+#: ../hacks/config/xspirograph.xml.h:8
+msgid "Layers"
+msgstr "Vrstvy"
+
+#: ../hacks/config/fuzzyflakes.xml.h:11
+msgid "Random colors"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:4
-msgid "Cyan"
+#: ../hacks/config/fuzzyflakes.xml.h:13
+msgid "Red"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:5
-msgid ""
-"Falling colored snowflake/flower shapes. "
-"http://en.wikipedia.org/wiki/Snowflake Written by Barry Dmytro; 2004."
+#: ../hacks/config/fuzzyflakes.xml.h:14
+msgid "Pink"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:9
-msgid "FuzzyFlakes"
+#: ../hacks/config/fuzzyflakes.xml.h:15
+msgid "Yellow"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:10
+#: ../hacks/config/fuzzyflakes.xml.h:16
 msgid "Green"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:13 ../hacks/config/hypnowheel.xml.h:10
-#: ../hacks/config/xspirograph.xml.h:5
-msgid "Layers"
-msgstr "Vrstvy"
-
-#: ../hacks/config/fuzzyflakes.xml.h:15
-msgid "Magenta"
+#: ../hacks/config/fuzzyflakes.xml.h:17
+msgid "Cyan"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:17
-msgid "Pink"
+#: ../hacks/config/fuzzyflakes.xml.h:18
+msgid "Blue"
 msgstr ""
 
 #: ../hacks/config/fuzzyflakes.xml.h:19
-msgid "Random colors"
+msgid "Magenta"
 msgstr ""
 
-#: ../hacks/config/fuzzyflakes.xml.h:20
-msgid "Red"
+#: ../hacks/config/fuzzyflakes.xml.h:24
+msgid "Border thickness"
 msgstr ""
 
 #: ../hacks/config/fuzzyflakes.xml.h:28
-msgid "Yellow"
+msgid ""
+"Falling colored snowflake/flower shapes. "
+"http://en.wikipedia.org/wiki/Snowflake Written by Barry Dmytro; 2004."
 msgstr ""
 
-#: ../hacks/config/galaxy.xml.h:4
+#: ../hacks/config/galaxy.xml.h:1
 msgid "Galaxy"
 msgstr "Galaxia"
 
-#: ../hacks/config/galaxy.xml.h:10
+#: ../hacks/config/galaxy.xml.h:12
 msgid "Rotate viewpoint"
 msgstr ""
 
-#: ../hacks/config/galaxy.xml.h:13
+#: ../hacks/config/galaxy.xml.h:14
 msgid ""
 "This draws spinning galaxies, which then collide and scatter their stars to "
 "the, uh, four winds or something. Written by Uli Siegmund, Harald Backert, "
 "and Hubert Feyrer; 1997."
 msgstr ""
 
-#: ../hacks/config/gears.xml.h:5
-msgid "Gear count"
-msgstr ""
-
-#: ../hacks/config/gears.xml.h:6
+#: ../hacks/config/gears.xml.h:1
 msgid "Gears"
 msgstr "Ozubené kolesá"
 
-#: ../hacks/config/gears.xml.h:13
+#: ../hacks/config/gears.xml.h:9
+msgid "Gear count"
+msgstr ""
+
+#: ../hacks/config/gears.xml.h:15
 msgid ""
 "This draws sets of turning, interlocking gears, rotating in three "
 "dimensions. See also the \"Pinion\" and \"MoebiusGears\" screen savers. "
@@ -4481,58 +4559,58 @@
 "2007."
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:2 ../hacks/config/glhanoi.xml.h:3
-#: ../hacks/config/lavalite.xml.h:2
-msgid "10"
+#: ../hacks/config/gflux.xml.h:1
+msgid "GFlux"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:3
-msgid "Checkerboard"
+#: ../hacks/config/gflux.xml.h:6 ../hacks/config/interference.xml.h:6
+msgid "Wave speed"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:6
-msgid ""
-"Draws a rippling waves on a rotating wireframe grid. Written by Josiah "
-"Pease; 2000."
+#: ../hacks/config/gflux.xml.h:9
+msgid "Mesh density"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:8
-msgid "Flat lighting"
-msgstr ""
+#: ../hacks/config/gflux.xml.h:12 ../hacks/config/glmatrix.xml.h:16
+msgid "Waves"
+msgstr "Vlny"
 
-#: ../hacks/config/gflux.xml.h:10
-msgid "GFlux"
+#: ../hacks/config/gflux.xml.h:13 ../hacks/config/glhanoi.xml.h:13
+#: ../hacks/config/hilbert.xml.h:14 ../hacks/config/lavalite.xml.h:10
+msgid "10"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:13
-msgid "Mesh density"
+#: ../hacks/config/gflux.xml.h:14
+msgid "Wire mesh"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:14
-msgid "Picture"
+#: ../hacks/config/gflux.xml.h:15
+msgid "Flat lighting"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:18 ../hacks/config/interference.xml.h:22
-msgid "Wave speed"
+#: ../hacks/config/gflux.xml.h:17
+msgid "Checkerboard"
 msgstr ""
 
-#: ../hacks/config/gflux.xml.h:19 ../hacks/config/glmatrix.xml.h:20
-msgid "Waves"
-msgstr "Vlny"
+#: ../hacks/config/gflux.xml.h:18
+msgid "Picture"
+msgstr ""
 
 #: ../hacks/config/gflux.xml.h:20
-msgid "Wire mesh"
+msgid ""
+"Draws a rippling waves on a rotating wireframe grid. Written by Josiah "
+"Pease; 2000."
 msgstr ""
 
 #: ../hacks/config/glblur.xml.h:1
-msgid "Blur smoothness"
+msgid "GLBlur"
 msgstr ""
 
-#: ../hacks/config/glblur.xml.h:5
-msgid "GLBlur"
+#: ../hacks/config/glblur.xml.h:6
+msgid "Blur smoothness"
 msgstr ""
 
-#: ../hacks/config/glblur.xml.h:17
+#: ../hacks/config/glblur.xml.h:18
 msgid ""
 "This draws a box and a few line segments, and generates a radial blur "
 "outward from it. This creates flowing field effects. This is done by "
@@ -4543,260 +4621,253 @@
 "Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:2
-msgid "15"
+#: ../hacks/config/glcells.xml.h:1
+msgid "GLCells"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:3
-msgid "Cell division"
+#: ../hacks/config/glcells.xml.h:9
+msgid "Max cells"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:4
+#: ../hacks/config/glcells.xml.h:12
 msgid "Cell radius"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:5
-msgid ""
-"Cells growing, dividing and dying on your screen. Written by Matthias "
-"Toussaint; 2007."
+#: ../hacks/config/glcells.xml.h:14
+msgid "Lowest sphere detail"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:8
-msgid "GLCells"
+#: ../hacks/config/glcells.xml.h:15
+msgid "Medium sphere detail"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:9
-msgid "Gorge"
+#: ../hacks/config/glcells.xml.h:16
+msgid "Normal sphere detail"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:11
-msgid "Highest sphere detail"
+#: ../hacks/config/glcells.xml.h:17
+msgid "More sphere detail"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:13
-msgid "Keep dead cells"
+#: ../hacks/config/glcells.xml.h:18
+msgid "Highest sphere detail"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:18
-msgid "Lowest sphere detail"
+#: ../hacks/config/glcells.xml.h:19
+msgid "Starve"
 msgstr ""
 
 #: ../hacks/config/glcells.xml.h:20
-msgid "Max cells"
+msgid "Min food"
 msgstr ""
 
 #: ../hacks/config/glcells.xml.h:21
-msgid "Max food"
+msgid "Gorge"
 msgstr ""
 
 #: ../hacks/config/glcells.xml.h:22
-msgid "Medium sphere detail"
+msgid "Max food"
 msgstr ""
 
 #: ../hacks/config/glcells.xml.h:23
-msgid "Min distance"
+msgid "Quick"
 msgstr ""
 
 #: ../hacks/config/glcells.xml.h:24
-msgid "Min food"
-msgstr ""
-
-#: ../hacks/config/glcells.xml.h:25
-msgid "More sphere detail"
+msgid "Cell division"
 msgstr ""
 
 #: ../hacks/config/glcells.xml.h:26
-msgid "Normal sphere detail"
-msgstr ""
-
-#: ../hacks/config/glcells.xml.h:27
-msgid "Quick"
+msgid "Min distance"
 msgstr ""
 
-#: ../hacks/config/glcells.xml.h:33
-msgid "Starve"
+#: ../hacks/config/glcells.xml.h:30
+msgid "15"
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:2 ../hacks/config/glslideshow.xml.h:6
-msgid "5 minutes"
+#: ../hacks/config/glcells.xml.h:31
+msgid "Keep dead cells"
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:3
+#: ../hacks/config/glcells.xml.h:34
 msgid ""
-"A kaleidoscope that operates on your desktop image, or on image files loaded "
-"from disk. http://en.wikipedia.org/wiki/Kaleidoscope Written by Andrew Dean; "
-"2003."
+"Cells growing, dividing and dying on your screen. Written by Matthias "
+"Toussaint; 2007."
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:5
+#: ../hacks/config/gleidescope.xml.h:1
 msgid "Gleidescope"
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:7
+#: ../hacks/config/gleidescope.xml.h:6
+msgid "Size of tube"
+msgstr ""
+
+#: ../hacks/config/gleidescope.xml.h:9
 msgid "Image duration"
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:10
-msgid "Move"
+#: ../hacks/config/gleidescope.xml.h:10 ../hacks/config/glslideshow.xml.h:7
+msgid "5 minutes"
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:13
-msgid "Size of tube"
+#: ../hacks/config/gleidescope.xml.h:11
+msgid "Move"
 msgstr ""
 
-#: ../hacks/config/gleidescope.xml.h:15 ../hacks/config/hypercube.xml.h:18
-#: ../hacks/config/mirrorblob.xml.h:28 ../hacks/config/zoom.xml.h:15
+#: ../hacks/config/gleidescope.xml.h:13 ../hacks/config/hypercube.xml.h:11
+#: ../hacks/config/mirrorblob.xml.h:6 ../hacks/config/zoom.xml.h:1
 msgid "Zoom"
 msgstr ""
 
-#: ../hacks/config/glforestfire.xml.h:2
-msgid "Desert"
-msgstr "Púšť"
-
-#: ../hacks/config/glforestfire.xml.h:3 ../hacks/config/glmatrix.xml.h:5
-#: ../hacks/config/glschool.xml.h:7
-msgid "Fog"
-msgstr "Hmla"
-
-#: ../hacks/config/glforestfire.xml.h:6
+#: ../hacks/config/gleidescope.xml.h:15
+msgid ""
+"A kaleidoscope that operates on your desktop image, or on image files loaded "
+"from disk. http://en.wikipedia.org/wiki/Kaleidoscope Written by Andrew Dean; "
+"2003."
+msgstr ""
+
+#: ../hacks/config/glforestfire.xml.h:1
 msgid "GLForestFire"
 msgstr ""
 
-#: ../hacks/config/glforestfire.xml.h:8
+#: ../hacks/config/glforestfire.xml.h:5
+msgid "Rain"
+msgstr "Dážď"
+
+#: ../hacks/config/glforestfire.xml.h:7
 msgid "Huge fire"
 msgstr ""
 
-#: ../hacks/config/glforestfire.xml.h:10
+#: ../hacks/config/glforestfire.xml.h:8
+msgid "Desert"
+msgstr "Púšť"
+
+#: ../hacks/config/glforestfire.xml.h:9
 msgid "Number of trees"
 msgstr "Počet stromov"
 
-#: ../hacks/config/glforestfire.xml.h:11
-msgid "Rain"
-msgstr "Dážď"
-
 #: ../hacks/config/glforestfire.xml.h:12
-msgid "Shadows"
+msgid "Textures"
 msgstr ""
 
-#: ../hacks/config/glforestfire.xml.h:14
-msgid "Textures"
+#: ../hacks/config/glforestfire.xml.h:13
+msgid "Shadows"
 msgstr ""
 
-#: ../hacks/config/glforestfire.xml.h:15
+#: ../hacks/config/glforestfire.xml.h:14 ../hacks/config/glmatrix.xml.h:15
+#: ../hacks/config/glschool.xml.h:14
+msgid "Fog"
+msgstr "Hmla"
+
+#: ../hacks/config/glforestfire.xml.h:17
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws an animation of sprinkling fire-like 3D triangles in a "
 "landscape filled with trees. Written by Eric Lassauge; 2002."
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:5
-msgid "31"
+#: ../hacks/config/glhanoi.xml.h:1
+msgid "GLHanoi"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:6 ../hacks/config/pulsar.xml.h:5
-msgid "Enable fog"
+#: ../hacks/config/glhanoi.xml.h:6
+msgid "Number of disks"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:7 ../hacks/config/pulsar.xml.h:6
-msgid "Enable lighting"
+#: ../hacks/config/glhanoi.xml.h:7
+msgid "31"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:9
-msgid "GLHanoi"
+#: ../hacks/config/glhanoi.xml.h:8
+msgid "Number of poles"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:11
+#: ../hacks/config/glhanoi.xml.h:10
+msgid "Speed (of smallest disks)"
+msgstr ""
+
+#: ../hacks/config/glhanoi.xml.h:12
 msgid "Length of disk trails"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:13
-msgid "Number of disks"
+#: ../hacks/config/glhanoi.xml.h:14 ../hacks/config/pulsar.xml.h:7
+msgid "Enable fog"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:14
-msgid "Number of poles"
+#: ../hacks/config/glhanoi.xml.h:17 ../hacks/config/pulsar.xml.h:6
+msgid "Enable lighting"
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:16
+#: ../hacks/config/glhanoi.xml.h:18
 msgid ""
 "Solves the Towers of Hanoi puzzle. Move N disks from one pole to another, "
 "one disk at a time, with no disk ever resting on a disk smaller than itself. "
 "http://en.wikipedia.org/wiki/Tower_of_Hanoi Written by Dave Atkinson; 2005."
 msgstr ""
 
-#: ../hacks/config/glhanoi.xml.h:17
-msgid "Speed (of smallest disks)"
-msgstr ""
-
-#: ../hacks/config/glknots.xml.h:4
+#: ../hacks/config/glknots.xml.h:1
 msgid "GLKnots"
 msgstr ""
 
-#: ../hacks/config/glknots.xml.h:5
-msgid ""
-"Generates some twisting 3d knot patterns. Spins 'em around. "
-"http://en.wikipedia.org/wiki/Knot_theory Written by Jamie Zawinski; 2003."
-msgstr ""
-
-#: ../hacks/config/glknots.xml.h:8 ../hacks/config/jigsaw.xml.h:10
-#: ../hacks/config/lavalite.xml.h:17 ../hacks/config/mirrorblob.xml.h:20
-#: ../hacks/config/spheremonics.xml.h:9
-msgid "Resolution"
-msgstr ""
-
 #: ../hacks/config/glknots.xml.h:16
 msgid "Segmented"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:1 ../hacks/config/xmatrix.xml.h:1
-msgid "Binary encoding"
+#: ../hacks/config/glknots.xml.h:17 ../hacks/config/jigsaw.xml.h:12
+#: ../hacks/config/lavalite.xml.h:11 ../hacks/config/mirrorblob.xml.h:14
+#: ../hacks/config/spheremonics.xml.h:8
+msgid "Resolution"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:3
+#: ../hacks/config/glknots.xml.h:25
 msgid ""
-"Draws 3D dropping characters similar to what is seen in the title sequence "
-"of \"The Matrix\". See also \"xmatrix\" for a 2D rendering of the similar "
-"effect that appeared on the computer monitors actually *in* the movie. "
-"Written by Jamie Zawinski; 2003."
+"Generates some twisting 3d knot patterns. Spins 'em around. "
+"http://en.wikipedia.org/wiki/Knot_theory Written by Jamie Zawinski; 2003."
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:7
+#: ../hacks/config/glmatrix.xml.h:1
 msgid "GLMatrix"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:8 ../hacks/config/xmatrix.xml.h:7
-msgid "Genetic encoding"
+#: ../hacks/config/glmatrix.xml.h:6
+msgid "Glyph density"
 msgstr ""
 
 #: ../hacks/config/glmatrix.xml.h:9
-msgid "Glyph density"
+msgid "Glyph speed"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:10
-msgid "Glyph speed"
+#: ../hacks/config/glmatrix.xml.h:11 ../hacks/config/xmatrix.xml.h:4
+msgid "Matrix encoding"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:11 ../hacks/config/xmatrix.xml.h:8
+#: ../hacks/config/glmatrix.xml.h:12 ../hacks/config/xmatrix.xml.h:5
+msgid "Binary encoding"
+msgstr ""
+
+#: ../hacks/config/glmatrix.xml.h:13 ../hacks/config/xmatrix.xml.h:6
 msgid "Hexadecimal encoding"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:14 ../hacks/config/xmatrix.xml.h:13
-msgid "Matrix encoding"
+#: ../hacks/config/glmatrix.xml.h:14 ../hacks/config/xmatrix.xml.h:7
+msgid "Genetic encoding"
 msgstr ""
 
-#: ../hacks/config/glmatrix.xml.h:15
+#: ../hacks/config/glmatrix.xml.h:17
 msgid "Panning"
 msgstr ""
 
-#: ../hacks/config/glplanet.xml.h:1
+#: ../hacks/config/glmatrix.xml.h:21
 msgid ""
-"Draws a planet bouncing around in space. The built-in image is a map of the "
-"earth (extracted from `xearth'), but you can wrap any texture around the "
-"sphere, e.g., the planetary textures that come with `ssystem'. Written by "
-"David Konerding; 1998."
+"Draws the 3D \"digital rain\" effect, as seen in the title sequence of \"The "
+"Matrix\". See also \"xmatrix\" for a 2D rendering of the similar effect that "
+"appeared on the computer monitors actually *in* the movie. "
+"http://en.wikipedia.org/wiki/Matrix_digital_rain Written by Jamie Zawinski; "
+"2003."
 msgstr ""
 
-#: ../hacks/config/glplanet.xml.h:3
+#: ../hacks/config/glplanet.xml.h:1
 msgid "GLPlanet"
 msgstr ""
 
@@ -4805,20 +4876,20 @@
 msgid "Image file"
 msgstr ""
 
-#: ../hacks/config/glplanet.xml.h:9 ../hacks/config/moebiusgears.xml.h:9
+#: ../hacks/config/glplanet.xml.h:9 ../hacks/config/moebiusgears.xml.h:12
 msgid "Roll"
 msgstr ""
 
-#: ../hacks/config/glschool.xml.h:1
-msgid "Avoidance"
-msgstr ""
-
-#: ../hacks/config/glschool.xml.h:2
-msgid "Centering"
+#: ../hacks/config/glplanet.xml.h:14
+msgid ""
+"Draws a planet bouncing around in space. The built-in image is a map of the "
+"earth (extracted from `xearth'), but you can wrap any texture around the "
+"sphere, e.g., the planetary textures that come with `ssystem'. Written by "
+"David Konerding; 1998."
 msgstr ""
 
-#: ../hacks/config/glschool.xml.h:4
-msgid "Draw goal"
+#: ../hacks/config/glschool.xml.h:1
+msgid "GLSchool"
 msgstr ""
 
 #: ../hacks/config/glschool.xml.h:6
@@ -4826,153 +4897,169 @@
 msgstr ""
 
 #: ../hacks/config/glschool.xml.h:9
-msgid "GLSchool"
+msgid "Avoidance"
 msgstr ""
 
 #: ../hacks/config/glschool.xml.h:10
+msgid "Velocity matching"
+msgstr ""
+
+#: ../hacks/config/glschool.xml.h:11
+msgid "Centering"
+msgstr ""
+
+#: ../hacks/config/glschool.xml.h:12
 msgid "Goal following"
 msgstr ""
 
-#: ../hacks/config/glschool.xml.h:16
+#: ../hacks/config/glschool.xml.h:15
+msgid "Draw goal"
+msgstr ""
+
+#: ../hacks/config/glschool.xml.h:18
 msgid ""
 "Uses Craig Reynolds' Boids algorithm to simulate a school of fish. "
 "http://en.wikipedia.org/wiki/Boids Written by David C. Lambert; 2006."
 msgstr ""
 
-#: ../hacks/config/glschool.xml.h:17
-msgid "Velocity matching"
+#: ../hacks/config/glslideshow.xml.h:1
+msgid "GLSlideshow"
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:4 ../hacks/config/rd-bomb.xml.h:4
-#: ../hacks/config/rdbomb.xml.h:4 ../hacks/config/substrate.xml.h:4
-#, no-c-format
-msgid "100%"
-msgstr "100 %"
-
-#: ../hacks/config/glslideshow.xml.h:8
+#: ../hacks/config/glslideshow.xml.h:9
 #, no-c-format
 msgid "50%"
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:9
+#: ../hacks/config/glslideshow.xml.h:10
 msgid "Always show at least this much of the image"
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:10
-msgid "Crossfade duration"
+#: ../hacks/config/glslideshow.xml.h:12 ../hacks/config/rd-bomb.xml.h:10
+#: ../hacks/config/rdbomb.xml.h:10 ../hacks/config/substrate.xml.h:15
+#, no-c-format
+msgid "100%"
+msgstr "100 %"
+
+#: ../hacks/config/glslideshow.xml.h:14
+msgid "Pan/zoom duration"
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:12
-msgid "GLSlideshow"
+#: ../hacks/config/glslideshow.xml.h:17
+msgid "Crossfade duration"
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:15
+#: ../hacks/config/glslideshow.xml.h:21
 msgid ""
 "Loads a random sequence of images and smoothly scans and zooms around in "
 "each, fading from pan to pan. Written by Jamie Zawinski and Mike Oliphant; "
 "2003."
 msgstr ""
 
-#: ../hacks/config/glslideshow.xml.h:18
-msgid "Pan/zoom duration"
-msgstr ""
-
-#: ../hacks/config/glsnake.xml.h:3
-msgid "Angular velocity"
+#: ../hacks/config/glsnake.xml.h:1
+msgid "GLSnake"
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:5
-#, no-c-format
-msgid ""
-"Draws a simulation of the Rubik's Snake puzzle. See also the \"Rubik\" and "
-"\"Cube21\" screen savers. http://en.wikipedia.org/wiki/Rubik%27s_Snake "
-"Written by Jamie Wilkinson, Andrew Bennetts, and Peter Aylett; 2002."
+#: ../hacks/config/glsnake.xml.h:8
+msgid "Tight"
 msgstr ""
 
 #: ../hacks/config/glsnake.xml.h:9
-msgid "GLSnake"
+msgid "Packing"
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:11
+#: ../hacks/config/glsnake.xml.h:10
 msgid "Loose"
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:13
-msgid "Packing"
+#: ../hacks/config/glsnake.xml.h:12
+msgid "Angular velocity"
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:15
-msgid "Show titles"
+#: ../hacks/config/glsnake.xml.h:14
+msgid "Y angular velocity"
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:17
-msgid "Tight"
+#: ../hacks/config/glsnake.xml.h:15
+msgid "Z angular velocity"
 msgstr ""
 
-#: ../hacks/config/glsnake.xml.h:19
-msgid "Y angular velocity"
+#: ../hacks/config/glsnake.xml.h:16
+msgid "Show titles"
 msgstr ""
 
 #: ../hacks/config/glsnake.xml.h:20
-msgid "Z angular velocity"
+#, no-c-format
+msgid ""
+"Draws a simulation of the Rubik's Snake puzzle. See also the \"Rubik\" and "
+"\"Cube21\" screen savers. http://en.wikipedia.org/wiki/Rubik%27s_Snake "
+"Written by Jamie Wilkinson, Andrew Bennetts, and Peter Aylett; 2002."
 msgstr ""
 
 #: ../hacks/config/gltext.xml.h:1
-msgid "Always face front"
+msgid "GLText"
+msgstr "GLText"
+
+#: ../hacks/config/gltext.xml.h:5
+msgid "Display system information"
 msgstr ""
 
-#: ../hacks/config/gltext.xml.h:2
+#: ../hacks/config/gltext.xml.h:6
 msgid "Display date and time"
 msgstr ""
 
-#: ../hacks/config/gltext.xml.h:3
-msgid "Display system information"
+#: ../hacks/config/gltext.xml.h:7
+msgid "Always face front"
+msgstr ""
+
+#: ../hacks/config/gltext.xml.h:8
+msgid "Spin all the way around"
 msgstr ""
 
-#: ../hacks/config/gltext.xml.h:4
+#: ../hacks/config/gltext.xml.h:20
 msgid ""
 "Displays a few lines of text spinning around in a solid 3D font. The text "
 "can use strftime() escape codes to display the current date and time. "
 "Written by Jamie Zawinski; 2001."
 msgstr ""
 
-#: ../hacks/config/gltext.xml.h:7
-msgid "GLText"
-msgstr "GLText"
-
-#: ../hacks/config/gltext.xml.h:18
-msgid "Spin all the way around"
-msgstr ""
-
 #: ../hacks/config/goop.xml.h:1
-msgid "Additive colors (transmitted light)"
+msgid "Goop"
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:2
+#: ../hacks/config/goop.xml.h:9
 msgid "Blobs"
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:3
+#: ../hacks/config/goop.xml.h:11
 msgid "Elasticity"
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:7
-msgid "Goop"
+#: ../hacks/config/goop.xml.h:12
+msgid "Speed limit"
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:11
-msgid "Opaque blobs"
+#: ../hacks/config/goop.xml.h:14
+msgid "Transparent blobs"
 msgstr ""
 
 #: ../hacks/config/goop.xml.h:15
-msgid "Speed limit"
+msgid "Opaque blobs"
 msgstr ""
 
 #: ../hacks/config/goop.xml.h:16
-msgid "Subtractive colors (reflected light)"
+msgid "XOR blobs"
 msgstr ""
 
 #: ../hacks/config/goop.xml.h:17
+msgid "Additive colors (transmitted light)"
+msgstr ""
+
+#: ../hacks/config/goop.xml.h:18
+msgid "Subtractive colors (reflected light)"
+msgstr ""
+
+#: ../hacks/config/goop.xml.h:19
 msgid ""
 "This draws set of animating, transparent, amoeba-like blobs. The blobs "
 "change shape as they wander around the screen, and they are translucent, so "
@@ -4983,63 +5070,79 @@
 "Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/goop.xml.h:18
-msgid "Transparent blobs"
-msgstr ""
-
-#: ../hacks/config/goop.xml.h:19
-msgid "XOR blobs"
-msgstr ""
-
-#: ../hacks/config/grav.xml.h:3
+#: ../hacks/config/grav.xml.h:1
 msgid "Grav"
 msgstr "Grav"
 
-#: ../hacks/config/grav.xml.h:8
+#: ../hacks/config/grav.xml.h:6
 msgid "Number of objects"
 msgstr ""
 
-#: ../hacks/config/grav.xml.h:9
-msgid "Object trails"
-msgstr ""
-
 #: ../hacks/config/grav.xml.h:10
 msgid "Orbital decay"
 msgstr ""
 
-#: ../hacks/config/grav.xml.h:12
+#: ../hacks/config/grav.xml.h:11
+msgid "Object trails"
+msgstr ""
+
+#: ../hacks/config/grav.xml.h:13
 msgid ""
 "This draws a simple orbital simulation. With trails enabled, it looks kind "
 "of like a cloud-chamber photograph. Written by Greg Bowering; 1997."
 msgstr ""
 
 #: ../hacks/config/greynetic.xml.h:1
+msgid "Greynetic"
+msgstr ""
+
+#: ../hacks/config/greynetic.xml.h:5
+msgid "Grey"
+msgstr ""
+
+#: ../hacks/config/greynetic.xml.h:7
 msgid ""
 "Draws random colored, stippled and transparent rectangles. Written by Jamie "
 "Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/greynetic.xml.h:3
-msgid "Grey"
+#: ../hacks/config/halftone.xml.h:1
+msgid "Halftone"
 msgstr ""
 
-#: ../hacks/config/greynetic.xml.h:4
-msgid "Greynetic"
+#: ../hacks/config/halftone.xml.h:6
+msgid "Gravity points"
+msgstr ""
+
+#: ../hacks/config/halftone.xml.h:9
+msgid "Dot size"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:1 ../hacks/config/metaballs.xml.h:1
+#: ../hacks/config/halftone.xml.h:10 ../hacks/config/metaballs.xml.h:14
 msgid "Big"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:2
+#: ../hacks/config/halftone.xml.h:11
 msgid "Dot fill factor"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:3
-msgid "Dot size"
+#: ../hacks/config/halftone.xml.h:13
+msgid "Minimum speed"
+msgstr ""
+
+#: ../hacks/config/halftone.xml.h:14
+msgid "Maximum speed"
+msgstr ""
+
+#: ../hacks/config/halftone.xml.h:15
+msgid "Minimum mass"
+msgstr ""
+
+#: ../hacks/config/halftone.xml.h:16
+msgid "Maximum mass"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:4
+#: ../hacks/config/halftone.xml.h:18
 msgid ""
 "Draws the gravity force in each point on the screen seen through a halftone "
 "dot pattern. The gravity force is calculated from a set of moving mass "
@@ -5047,170 +5150,213 @@
 "http://en.wikipedia.org/wiki/Halftone Written by Peter Jaric; 2002."
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:7
-msgid "Gravity points"
+#: ../hacks/config/halo.xml.h:1
+msgid "Halo"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:6
+msgid "Number of circles"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:10
+msgid "Random mode"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:11
+msgid "Seuss mode"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:12
+msgid "Ramp mode"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:13
+msgid "Animate circles"
+msgstr ""
+
+#: ../hacks/config/halo.xml.h:15
+msgid ""
+"Draws trippy psychedelic circular patterns that hurt to look at. "
+"http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 1993."
+msgstr ""
+
+#: ../hacks/config/helix.xml.h:1
+msgid "Helix"
+msgstr "Špirála"
+
+#: ../hacks/config/helix.xml.h:9
+msgid "Spirally string-art-ish patterns. Written by Jamie Zawinski; 1992."
+msgstr ""
+
+#: ../hacks/config/hilbert.xml.h:1
+msgid "Hilbert"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:8
-msgid "Halftone"
+#: ../hacks/config/hilbert.xml.h:2
+msgid "2D or 3D"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:13
-msgid "Maximum mass"
+#: ../hacks/config/hilbert.xml.h:3
+msgid "2D"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:14
-msgid "Maximum speed"
+#: ../hacks/config/hilbert.xml.h:4
+msgid "3D"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:15
-msgid "Minimum mass"
+#: ../hacks/config/hilbert.xml.h:5
+msgid "Open or closed paths"
 msgstr ""
 
-#: ../hacks/config/halftone.xml.h:16
-msgid "Minimum speed"
+#: ../hacks/config/hilbert.xml.h:6
+msgid "Closed"
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:1
-msgid "Animate circles"
+#: ../hacks/config/hilbert.xml.h:7
+msgid "Open"
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:2
-msgid ""
-"Draws trippy psychedelic circular patterns that hurt to look at. "
-"http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 1993."
+#. 
+#. On a 2.93 gHz iMac i7, I get these rates with -delay 0:
+#. 
+#. detail 3:  invisible
+#. detail 4:  barely visible
+#. detail 5:  1000+ fps, looks like noise at -delay 0, ok at -delay 20000
+#. detail 8:  ~700+ fps
+#. detail 9:  ~400 fps
+#. detail 10: ~300 fps
+#. detail 11: ~100 fps
+#. detail 12:  ~50 fps
+#. detail 13:  ~17 fps
+#. detail 14:   ~8 fps
+#. detail 15:   ~2 fps
+#. 
+#. With the default -delay, CPU load only starts causing the frame rate
+#. to drop below 30 fps detail 12 or higher.
+#. 
+#: ../hacks/config/hilbert.xml.h:12 ../hacks/config/hypnowheel.xml.h:12
+#: ../hacks/config/ifs.xml.h:23
+msgid "2"
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:5
-msgid "Halo"
+#: ../hacks/config/hilbert.xml.h:13
+msgid "Recursion levels"
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:9
-msgid "Number of circles"
+#: ../hacks/config/hilbert.xml.h:22
+msgid ""
+"This draws the recursive Hilbert space-filling curve, in both 2D and 3D "
+"variants. It incrementally animates the growth and recursion to the maximum "
+"depth, then unwinds it back. The Hilbert path is a single contiguous line "
+"that can fill a volume without crossing itself. As a data structure, Hilbert "
+"paths are useful because ordering along the curve preserves locality: points "
+"that close together along the curve are also close together in space. The "
+"converse is often, but not always, true. The coloration reflects this. "
+"http://en.wikipedia.org/wiki/Hilbert_curve Written by Jamie Zawinski; 2011."
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:11
-msgid "Ramp mode"
+#: ../hacks/config/hopalong.xml.h:1
+msgid "Hopalong"
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:12
-msgid "Random mode"
+#: ../hacks/config/hopalong.xml.h:8 ../hacks/config/interference.xml.h:17
+#: ../hacks/config/qix.xml.h:11 ../hacks/config/wander.xml.h:12
+msgid "Color contrast"
 msgstr ""
 
-#: ../hacks/config/halo.xml.h:13
-msgid "Seuss mode"
+#: ../hacks/config/hopalong.xml.h:12
+msgid "Sine"
 msgstr ""
 
-#: ../hacks/config/helix.xml.h:4
-msgid "Helix"
-msgstr "Špirála"
+#: ../hacks/config/hopalong.xml.h:13
+msgid "Martin"
+msgstr "Martin"
 
-#: ../hacks/config/helix.xml.h:9
-msgid "Spirally string-art-ish patterns. Written by Jamie Zawinski; 1992."
+#: ../hacks/config/hopalong.xml.h:15
+msgid "Jong"
 msgstr ""
 
-#: ../hacks/config/hopalong.xml.h:1 ../hacks/config/interference.xml.h:3
-#: ../hacks/config/qix.xml.h:3 ../hacks/config/wander.xml.h:1
-msgid "Color contrast"
-msgstr ""
+#: ../hacks/config/hopalong.xml.h:16
+msgid "RR"
+msgstr "RR"
 
-#: ../hacks/config/hopalong.xml.h:3
+#: ../hacks/config/hopalong.xml.h:17
 msgid "EJK1"
 msgstr "EJK1"
 
-#: ../hacks/config/hopalong.xml.h:4
+#: ../hacks/config/hopalong.xml.h:18
 msgid "EJK2"
 msgstr "EJK2"
 
-#: ../hacks/config/hopalong.xml.h:5
+#: ../hacks/config/hopalong.xml.h:19
 msgid "EJK3"
 msgstr "EJK3"
 
-#: ../hacks/config/hopalong.xml.h:6
+#: ../hacks/config/hopalong.xml.h:20
 msgid "EJK4"
 msgstr "EJK4"
 
-#: ../hacks/config/hopalong.xml.h:7
+#: ../hacks/config/hopalong.xml.h:21
 msgid "EJK5"
 msgstr "EJK5"
 
-#: ../hacks/config/hopalong.xml.h:8
+#: ../hacks/config/hopalong.xml.h:22
 msgid "EJK6"
 msgstr "EJK6"
 
-#: ../hacks/config/hopalong.xml.h:11
-msgid "Hopalong"
-msgstr ""
-
-#: ../hacks/config/hopalong.xml.h:12
-msgid "Jong"
-msgstr ""
-
-#: ../hacks/config/hopalong.xml.h:16
-msgid "Martin"
-msgstr "Martin"
-
-#: ../hacks/config/hopalong.xml.h:19
-msgid "RR"
-msgstr "RR"
-
-#: ../hacks/config/hopalong.xml.h:21
-msgid "Sine"
-msgstr ""
-
-#: ../hacks/config/hopalong.xml.h:23
+#: ../hacks/config/hopalong.xml.h:24
 msgid ""
 "This draws lacy fractal patterns based on iteration in the imaginary plane, "
 "from a 1986 Scientific American article. See also the \"Discrete\" screen "
 "saver. Written by Patrick Naughton; 1992."
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:4
+#: ../hacks/config/hyperball.xml.h:1
 msgid "HyperBall"
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:8
-msgid ""
-"This screen saver was removed from the XScreenSaver distribution as of "
-"version 5.10. It has been replaced by the more general \"Polytopes\" screen "
-"saver, which can display this object as well as others. The Polytopes \"120-"
-"cell\" object corresponds to this one. Hyperball is to hypercube as "
-"dodecahedron is to cube: this displays a 2D projection of the sequence of 3D "
-"objects which are the projections of the 4D analog to the dodecahedron. "
-"Technically, it is a \"120 cell polytope\". "
-"http://en.wikipedia.org/wiki/Hypercube "
-"http://en.wikipedia.org/wiki/Regular_polytope Written by Joe Keane; 2000."
-msgstr ""
-
-#: ../hacks/config/hyperball.xml.h:9 ../hacks/config/hypercube.xml.h:12
+#: ../hacks/config/hyperball.xml.h:6 ../hacks/config/hypercube.xml.h:6
 msgid "XW rotation"
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:10 ../hacks/config/hypercube.xml.h:13
+#: ../hacks/config/hyperball.xml.h:8 ../hacks/config/hypercube.xml.h:8
 msgid "XY rotation"
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:11 ../hacks/config/hypercube.xml.h:14
+#: ../hacks/config/hyperball.xml.h:9 ../hacks/config/hypercube.xml.h:9
 msgid "XZ rotation"
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:12 ../hacks/config/hypercube.xml.h:15
+#: ../hacks/config/hyperball.xml.h:10 ../hacks/config/hypercube.xml.h:13
 msgid "YW rotation"
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:13 ../hacks/config/hypercube.xml.h:16
+#: ../hacks/config/hyperball.xml.h:11 ../hacks/config/hypercube.xml.h:14
 msgid "YZ rotation"
 msgstr ""
 
-#: ../hacks/config/hyperball.xml.h:14 ../hacks/config/hypercube.xml.h:17
+#: ../hacks/config/hyperball.xml.h:12 ../hacks/config/hypercube.xml.h:15
 msgid "ZW rotation"
 msgstr ""
 
-#: ../hacks/config/hypercube.xml.h:5
+#: ../hacks/config/hyperball.xml.h:14
+msgid ""
+"This screen saver was removed from the XScreenSaver distribution as of "
+"version 5.10. It has been replaced by the more general \"Polytopes\" screen "
+"saver, which can display this object as well as others. The Polytopes \"120-"
+"cell\" object corresponds to this one. Hyperball is to hypercube as "
+"dodecahedron is to cube: this displays a 2D projection of the sequence of 3D "
+"objects which are the projections of the 4D analog to the dodecahedron. "
+"Technically, it is a \"120 cell polytope\". "
+"http://en.wikipedia.org/wiki/Hypercube "
+"http://en.wikipedia.org/wiki/Regular_polytope Written by Joe Keane; 2000."
+msgstr ""
+
+#: ../hacks/config/hypercube.xml.h:1
 msgid "HyperCube"
 msgstr ""
 
-#: ../hacks/config/hypercube.xml.h:11
+#: ../hacks/config/hypercube.xml.h:18
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.10. It has been replaced by the more general \"Polytopes\" screen "
@@ -5226,180 +5372,180 @@
 "Mueller, and Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:1 ../hacks/config/klein.xml.h:2
-#: ../hacks/config/polytopes.xml.h:1
-msgid "-4.0"
-msgstr ""
-
-#: ../hacks/config/hypertorus.xml.h:2 ../hacks/config/klein.xml.h:6
-#: ../hacks/config/polytopes.xml.h:5
-msgid "4.0"
+#: ../hacks/config/hypertorus.xml.h:1
+msgid "Hypertorus"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:3
-msgid "Color wheel"
+#: ../hacks/config/hypertorus.xml.h:6 ../hacks/config/klein.xml.h:13
+#: ../hacks/config/polytopes.xml.h:2
+msgid "Wireframe mesh"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:6
-msgid "Hypertorus"
+#: ../hacks/config/hypertorus.xml.h:7 ../hacks/config/klein.xml.h:14
+#: ../hacks/config/mirrorblob.xml.h:27 ../hacks/config/polytopes.xml.h:3
+msgid "Solid surface"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:8 ../hacks/config/klein.xml.h:14
-#: ../hacks/config/polytopes.xml.h:13
-msgid "Orthographic 3D"
+#: ../hacks/config/hypertorus.xml.h:8 ../hacks/config/klein.xml.h:15
+#: ../hacks/config/polytopes.xml.h:4
+msgid "Transparent surface"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:9 ../hacks/config/klein.xml.h:15
-#: ../hacks/config/polytopes.xml.h:14
-msgid "Orthographic 4D"
+#: ../hacks/config/hypertorus.xml.h:9 ../hacks/config/klein.xml.h:16
+msgid "Solid object"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:10 ../hacks/config/klein.xml.h:16
-#: ../hacks/config/polytopes.xml.h:15
-msgid "Perspective 3D"
+#: ../hacks/config/hypertorus.xml.h:10 ../hacks/config/klein.xml.h:17
+msgid "See-through bands"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:11 ../hacks/config/klein.xml.h:17
-#: ../hacks/config/polytopes.xml.h:16
-msgid "Perspective 4D"
+#: ../hacks/config/hypertorus.xml.h:11
+msgid "See-through spirals (1 spiral)"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:12 ../hacks/config/klein.xml.h:20
-msgid "See-through bands"
+#: ../hacks/config/hypertorus.xml.h:12
+msgid "See-through spirals (2 spirals)"
 msgstr ""
 
 #: ../hacks/config/hypertorus.xml.h:13
-msgid "See-through spirals (1 spiral)"
+msgid "See-through spirals (4 spirals)"
 msgstr ""
 
 #: ../hacks/config/hypertorus.xml.h:14
-msgid "See-through spirals (16 spirals)"
+msgid "See-through spirals (8 spirals)"
 msgstr ""
 
 #: ../hacks/config/hypertorus.xml.h:15
-msgid "See-through spirals (2 spirals)"
+msgid "See-through spirals (16 spirals)"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:16
-msgid "See-through spirals (4 spirals)"
+#: ../hacks/config/hypertorus.xml.h:16 ../hacks/config/klein.xml.h:18
+msgid "Two-sided"
 msgstr ""
 
 #: ../hacks/config/hypertorus.xml.h:17
-msgid "See-through spirals (8 spirals)"
+msgid "Color wheel"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:19 ../hacks/config/klein.xml.h:23
-msgid "Solid object"
+#: ../hacks/config/hypertorus.xml.h:18 ../hacks/config/klein.xml.h:21
+#: ../hacks/config/polytopes.xml.h:14
+msgid "Perspective 3D"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:20 ../hacks/config/klein.xml.h:24
-#: ../hacks/config/mirrorblob.xml.h:23 ../hacks/config/polytopes.xml.h:21
-msgid "Solid surface"
+#: ../hacks/config/hypertorus.xml.h:19 ../hacks/config/klein.xml.h:22
+#: ../hacks/config/polytopes.xml.h:15
+msgid "Orthographic 3D"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:21
-msgid ""
-"This shows a rotating Clifford Torus: a torus lying on the \"surface\" of a "
-"4D hypersphere. Inspired by Thomas Banchoff's book \"Beyond the Third "
-"Dimension: Geometry, Computer Graphics, and Higher Dimensions\", Scientific "
-"American Library, 1990. http://en.wikipedia.org/wiki/N-sphere "
-"http://en.wikipedia.org/wiki/Clifford_torus "
-"http://en.wikipedia.org/wiki/Regular_polytope Written by Carsten Steger; "
-"2003."
+#: ../hacks/config/hypertorus.xml.h:20 ../hacks/config/klein.xml.h:23
+#: ../hacks/config/polytopes.xml.h:16
+msgid "Perspective 4D"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:22 ../hacks/config/klein.xml.h:26
-#: ../hacks/config/polytopes.xml.h:23
-msgid "Transparent surface"
+#: ../hacks/config/hypertorus.xml.h:21 ../hacks/config/klein.xml.h:24
+#: ../hacks/config/polytopes.xml.h:17
+msgid "Orthographic 4D"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:23 ../hacks/config/klein.xml.h:28
-msgid "Two-sided"
+#: ../hacks/config/hypertorus.xml.h:22 ../hacks/config/klein.xml.h:25
+#: ../hacks/config/polytopes.xml.h:18
+msgid "-4.0"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:24 ../hacks/config/klein.xml.h:29
-#: ../hacks/config/polytopes.xml.h:24
+#: ../hacks/config/hypertorus.xml.h:23 ../hacks/config/klein.xml.h:26
+#: ../hacks/config/polytopes.xml.h:19
 msgid "WX rotation speed"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:25 ../hacks/config/klein.xml.h:30
-#: ../hacks/config/polytopes.xml.h:25
+#: ../hacks/config/hypertorus.xml.h:24 ../hacks/config/klein.xml.h:27
+#: ../hacks/config/polytopes.xml.h:20
+msgid "4.0"
+msgstr ""
+
+#: ../hacks/config/hypertorus.xml.h:25 ../hacks/config/klein.xml.h:28
+#: ../hacks/config/polytopes.xml.h:21
 msgid "WY rotation speed"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:26 ../hacks/config/klein.xml.h:31
-#: ../hacks/config/polytopes.xml.h:26
+#: ../hacks/config/hypertorus.xml.h:26 ../hacks/config/klein.xml.h:29
+#: ../hacks/config/polytopes.xml.h:22
 msgid "WZ rotation speed"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:27 ../hacks/config/klein.xml.h:36
+#: ../hacks/config/hypertorus.xml.h:27 ../hacks/config/klein.xml.h:33
+#: ../hacks/config/polytopes.xml.h:26
+msgid "XY rotation speed"
+msgstr ""
+
+#: ../hacks/config/hypertorus.xml.h:28 ../hacks/config/klein.xml.h:34
 #: ../hacks/config/polytopes.xml.h:27
-msgid "Wireframe mesh"
+msgid "XZ rotation speed"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:28 ../hacks/config/klein.xml.h:37
+#: ../hacks/config/hypertorus.xml.h:29 ../hacks/config/klein.xml.h:35
 #: ../hacks/config/polytopes.xml.h:28
-msgid "XY rotation speed"
+msgid "YZ rotation speed"
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:29 ../hacks/config/klein.xml.h:38
-#: ../hacks/config/polytopes.xml.h:29
-msgid "XZ rotation speed"
+#: ../hacks/config/hypertorus.xml.h:30
+msgid ""
+"This shows a rotating Clifford Torus: a torus lying on the \"surface\" of a "
+"4D hypersphere. Inspired by Thomas Banchoff's book \"Beyond the Third "
+"Dimension: Geometry, Computer Graphics, and Higher Dimensions\", Scientific "
+"American Library, 1990. http://en.wikipedia.org/wiki/N-sphere "
+"http://en.wikipedia.org/wiki/Clifford_torus "
+"http://en.wikipedia.org/wiki/Regular_polytope Written by Carsten Steger; "
+"2003."
 msgstr ""
 
-#: ../hacks/config/hypertorus.xml.h:30 ../hacks/config/klein.xml.h:39
-#: ../hacks/config/polytopes.xml.h:30
-msgid "YZ rotation speed"
+#: ../hacks/config/hypnowheel.xml.h:1
+msgid "Hypnowheel"
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:2 ../hacks/config/ifs.xml.h:1
-msgid "2"
+#: ../hacks/config/hypnowheel.xml.h:7
+msgid "Symmetric twisting"
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:3 ../hacks/config/intermomentary.xml.h:2
+#: ../hacks/config/hypnowheel.xml.h:11 ../hacks/config/intermomentary.xml.h:5
 msgid "50"
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:5
+#: ../hacks/config/hypnowheel.xml.h:15
+msgid "Twistiness"
+msgstr ""
+
+#: ../hacks/config/hypnowheel.xml.h:17
 msgid ""
 "Draws a series of overlapping, translucent spiral patterns. The tightness of "
 "their spirals fluctuates in and out. "
 "http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 2008."
 msgstr ""
 
-#: ../hacks/config/hypnowheel.xml.h:9
-msgid "Hypnowheel"
-msgstr ""
-
-#: ../hacks/config/hypnowheel.xml.h:15
-msgid "Symmetric twisting"
-msgstr ""
+#: ../hacks/config/ifs.xml.h:1
+msgid "IFS"
+msgstr "IFS"
 
-#: ../hacks/config/hypnowheel.xml.h:16
-msgid "Twistiness"
+#: ../hacks/config/ifs.xml.h:24
+msgid "Number of functions"
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:2
+#: ../hacks/config/ifs.xml.h:25
 msgid "6"
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:3
+#: ../hacks/config/ifs.xml.h:26
 msgid "Detail"
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:6
-msgid "IFS"
-msgstr "IFS"
-
-#: ../hacks/config/ifs.xml.h:10
-msgid "Number of functions"
+#: ../hacks/config/ifs.xml.h:65
+msgid "Translate"
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:12
+#: ../hacks/config/ifs.xml.h:66
 msgid "Scale"
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:14
+#: ../hacks/config/ifs.xml.h:69
 msgid ""
 "This one draws spinning, colliding iterated-function-system images. Note "
 "that the \"Detail\" parameter is exponential. Number of points drawn is "
@@ -5407,35 +5553,31 @@
 "Written by Chris Le Sueur and Robby Griffin; 1997."
 msgstr ""
 
-#: ../hacks/config/ifs.xml.h:15
-msgid "Translate"
-msgstr ""
-
 #: ../hacks/config/imsmap.xml.h:1
-msgid "1 Minute"
-msgstr "1 minúta"
+msgid "IMSMap"
+msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:2
+#: ../hacks/config/imsmap.xml.h:5
 msgid "1 Second"
 msgstr "1 sekunda"
 
-#: ../hacks/config/imsmap.xml.h:3
-msgid "Brightness gradients"
-msgstr ""
+#: ../hacks/config/imsmap.xml.h:7
+msgid "1 Minute"
+msgstr "1 minúta"
 
-#: ../hacks/config/imsmap.xml.h:8
+#: ../hacks/config/imsmap.xml.h:15
 msgid "Hue gradients"
 msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:9
-msgid "IMSMap"
+#: ../hacks/config/imsmap.xml.h:16
+msgid "Saturation gradients"
 msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:15
-msgid "Saturation gradients"
+#: ../hacks/config/imsmap.xml.h:17
+msgid "Brightness gradients"
 msgstr ""
 
-#: ../hacks/config/imsmap.xml.h:18
+#: ../hacks/config/imsmap.xml.h:19
 msgid ""
 "This generates random cloud-like patterns. The idea is to take four points "
 "on the edge of the image, and assign each a random \"elevation\". Then find "
@@ -5445,6 +5587,15 @@
 msgstr ""
 
 #: ../hacks/config/interaggregate.xml.h:1
+msgid "Interaggregate"
+msgstr ""
+
+#: ../hacks/config/interaggregate.xml.h:6
+#: ../hacks/config/intermomentary.xml.h:6
+msgid "Number of discs"
+msgstr ""
+
+#: ../hacks/config/interaggregate.xml.h:9
 msgid ""
 "A surface is filled with a hundred medium to small sized circles. Each "
 "circle has a different size and direction, but moves at the same slow rate. "
@@ -5454,50 +5605,45 @@
 "Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/interaggregate.xml.h:5
-msgid "Interaggregate"
+#: ../hacks/config/interference.xml.h:1
+msgid "Interference"
 msgstr ""
 
-#: ../hacks/config/interaggregate.xml.h:8
-#: ../hacks/config/intermomentary.xml.h:8
-msgid "Number of discs"
+#: ../hacks/config/interference.xml.h:9
+msgid "Wave size"
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:2
-msgid "360"
+#: ../hacks/config/interference.xml.h:12
+msgid "Number of waves"
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:4
-msgid ""
-"Color field based on computing decaying sinusoidal waves. Written by Hannu "
-"Mallat; 1998."
+#: ../hacks/config/interference.xml.h:14 ../hacks/config/t3d.xml.h:11
+msgid "Magnification"
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:9
+#: ../hacks/config/interference.xml.h:19
 msgid "Hue"
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:10
-msgid "Interference"
-msgstr ""
-
-#: ../hacks/config/interference.xml.h:13 ../hacks/config/t3d.xml.h:9
-msgid "Magnification"
+#: ../hacks/config/interference.xml.h:20
+msgid "360"
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:16
-msgid "Number of waves"
+#: ../hacks/config/interference.xml.h:22
+msgid ""
+"Color field based on computing decaying sinusoidal waves. Written by Hannu "
+"Mallat; 1998."
 msgstr ""
 
-#: ../hacks/config/interference.xml.h:21
-msgid "Wave size"
+#: ../hacks/config/intermomentary.xml.h:1
+msgid "Intermomentary"
 msgstr ""
 
-#: ../hacks/config/intermomentary.xml.h:1
+#: ../hacks/config/intermomentary.xml.h:7
 msgid "400"
 msgstr ""
 
-#: ../hacks/config/intermomentary.xml.h:3
+#: ../hacks/config/intermomentary.xml.h:9
 msgid ""
 "A surface is filled with a hundred medium to small sized circles. Each "
 "circle has a different size and direction, but moves at the same slow rate. "
@@ -5510,68 +5656,72 @@
 "Hodgin, and Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/intermomentary.xml.h:6
-msgid "Intermomentary"
+#: ../hacks/config/jigglypuff.xml.h:1
+msgid "JigglyPuff"
 msgstr ""
 
 #: ../hacks/config/jigglypuff.xml.h:2
-msgid "Clown barf"
+msgid "Randomize almost everything"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:3
-msgid "Collapse"
+#: ../hacks/config/jigglypuff.xml.h:9
+msgid "Inertial damping"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:5
-msgid "Cycle"
+#: ../hacks/config/jigglypuff.xml.h:11
+msgid "Vertex-vertex force"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:6
-msgid "Expand"
+#: ../hacks/config/jigglypuff.xml.h:12
+msgid "Strong"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:8
-msgid "Flower box"
+#: ../hacks/config/jigglypuff.xml.h:14
+msgid "Sphere strength"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:11
-msgid "Inertial damping"
+#: ../hacks/config/jigglypuff.xml.h:15
+msgid "Expand"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:12
-msgid "JigglyPuff"
+#: ../hacks/config/jigglypuff.xml.h:16
+msgid "Vertex-vertex behavior"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:15
-msgid "Randomize almost everything"
+#: ../hacks/config/jigglypuff.xml.h:17
+msgid "Collapse"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:19 ../hacks/config/sphere.xml.h:7
-msgid "Sphere"
-msgstr "Guľa"
+#: ../hacks/config/jigglypuff.xml.h:18
+msgid "Spookiness"
+msgstr ""
+
+#: ../hacks/config/jigglypuff.xml.h:19
+msgid "Spoooooky"
+msgstr ""
 
 #: ../hacks/config/jigglypuff.xml.h:20
-msgid "Sphere strength"
+msgid "Cycle"
 msgstr ""
 
 #: ../hacks/config/jigglypuff.xml.h:21
-msgid "Spookiness"
+msgid "Flower box"
 msgstr ""
 
 #: ../hacks/config/jigglypuff.xml.h:22
-msgid "Spoooooky"
+msgid "Clown barf"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:23
-msgid "Strong"
-msgstr ""
+#: ../hacks/config/jigglypuff.xml.h:24 ../hacks/config/sphere.xml.h:1
+msgid "Sphere"
+msgstr "Guľa"
 
-#: ../hacks/config/jigglypuff.xml.h:24 ../hacks/config/morph3d.xml.h:12
-#: ../hacks/config/polyhedra.xml.h:150 ../hacks/config/sballs.xml.h:15
+#: ../hacks/config/jigglypuff.xml.h:25 ../hacks/config/morph3d.xml.h:6
+#: ../hacks/config/polyhedra.xml.h:22 ../hacks/config/sballs.xml.h:6
 msgid "Tetrahedron"
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:25
+#: ../hacks/config/jigglypuff.xml.h:28
 msgid ""
 "This does bad things with quasi-spherical objects. You have a tetrahedron "
 "with tesselated faces. The vertices on these faces have forces on them: one "
@@ -5582,19 +5732,7 @@
 "that jiggles in a kind of disturbing manner. Written by Keith Macleod; 2003."
 msgstr ""
 
-#: ../hacks/config/jigglypuff.xml.h:26
-msgid "Vertex-vertex behavior"
-msgstr ""
-
-#: ../hacks/config/jigglypuff.xml.h:27
-msgid "Vertex-vertex force"
-msgstr ""
-
 #: ../hacks/config/jigsaw.xml.h:1
-msgid "Chunky"
-msgstr ""
-
-#: ../hacks/config/jigsaw.xml.h:6
 msgid "Jigsaw"
 msgstr "Skladačka"
 
@@ -5602,72 +5740,84 @@
 msgid "Puzzle pieces"
 msgstr ""
 
-#: ../hacks/config/jigsaw.xml.h:15
+#: ../hacks/config/jigsaw.xml.h:11
+msgid "Chunky"
+msgstr ""
+
+#: ../hacks/config/jigsaw.xml.h:14 ../hacks/config/sonar.xml.h:29
+msgid "Tilt"
+msgstr ""
+
+#: ../hacks/config/jigsaw.xml.h:16
 msgid ""
 "This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, "
 "and then solves the puzzle. http://en.wikipedia.org/wiki/Jigsaw_puzzle "
 "http://en.wikipedia.org/wiki/Tessellation Written by Jamie Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/jigsaw.xml.h:16 ../hacks/config/sonar.xml.h:29
-msgid "Tilt"
-msgstr ""
+#: ../hacks/config/juggle.xml.h:1
+msgid "Juggle"
+msgstr "Žonglovanie"
 
-#. <boolean id="torches" _label="Flaming torches" arg-unset="-no-torches"/>
-#: ../hacks/config/juggle.xml.h:2 ../hacks/config/juggler3d.xml.h:3
-msgid "Bowling balls"
+#: ../hacks/config/juggle.xml.h:9 ../hacks/config/juggler3d.xml.h:9
+msgid "Performance length"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:3 ../hacks/config/juggler3d.xml.h:4
+#: ../hacks/config/juggle.xml.h:14 ../hacks/config/juggler3d.xml.h:14
 msgid "Clubs"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:5
-msgid "Flaming torches"
+#: ../hacks/config/juggle.xml.h:15 ../hacks/config/juggler3d.xml.h:15
+msgid "Rings"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:8
-msgid "Juggle"
-msgstr "Žonglovanie"
-
-#: ../hacks/config/juggle.xml.h:9 ../hacks/config/juggler3d.xml.h:9
-msgid "Juggle this pattern"
+#: ../hacks/config/juggle.xml.h:16 ../hacks/config/juggler3d.xml.h:16
+msgid "Knives"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:10 ../hacks/config/juggler3d.xml.h:11
-msgid "Knives"
+#: ../hacks/config/juggle.xml.h:17
+msgid "Flaming torches"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:14 ../hacks/config/juggler3d.xml.h:15
-msgid "Performance length"
+#. <boolean id="torches" _label="Flaming torches" arg-unset="-no-torches"/>
+#: ../hacks/config/juggle.xml.h:18 ../hacks/config/juggler3d.xml.h:18
+msgid "Bowling balls"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:15 ../hacks/config/juggler3d.xml.h:16
+#: ../hacks/config/juggle.xml.h:19 ../hacks/config/juggler3d.xml.h:19
 msgid "Print Cambridge juggling pattern descriptions"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:16 ../hacks/config/juggler3d.xml.h:17
-msgid "Rings"
+#: ../hacks/config/juggle.xml.h:20 ../hacks/config/juggler3d.xml.h:20
+msgid "Juggle this pattern"
 msgstr ""
 
-#: ../hacks/config/juggle.xml.h:21
+#: ../hacks/config/juggle.xml.h:22
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.09. It has been replaced by the \"Juggler3D\" screen saver. "
 "http://en.wikipedia.org/wiki/Siteswap Written by Tim Auckland; 2002."
 msgstr ""
 
-#: ../hacks/config/juggler3d.xml.h:5
+#: ../hacks/config/juggler3d.xml.h:1
+msgid "Juggler3D"
+msgstr ""
+
+#: ../hacks/config/juggler3d.xml.h:22
 msgid ""
 "Draws a 3D juggling stick-man. http://en.wikipedia.org/wiki/Siteswap Written "
 "by Tim Auckland and Jamie Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/juggler3d.xml.h:10
-msgid "Juggler3D"
-msgstr ""
-
 #: ../hacks/config/julia.xml.h:1
+msgid "Julia"
+msgstr "Júlia"
+
+#: ../hacks/config/julia.xml.h:9 ../hacks/config/rorschach.xml.h:3
+msgid "Iterations"
+msgstr "Iterácie"
+
+#: ../hacks/config/julia.xml.h:15
 msgid ""
 "Animates the Julia set (a close relative of the Mandelbrot set). The small "
 "moving dot indicates the control point from which the rest of the image was "
@@ -5675,114 +5825,106 @@
 "http://en.wikipedia.org/wiki/Julia_set Written by Sean McCullough; 1997."
 msgstr ""
 
-#: ../hacks/config/julia.xml.h:6 ../hacks/config/rorschach.xml.h:3
-msgid "Iterations"
-msgstr "Iterácie"
-
-#: ../hacks/config/julia.xml.h:7
-msgid "Julia"
-msgstr "Júlia"
-
 #: ../hacks/config/kaleidescope.xml.h:1
-msgid "3"
-msgstr ""
-
-#: ../hacks/config/kaleidescope.xml.h:2
-msgid "32"
-msgstr ""
-
-#: ../hacks/config/kaleidescope.xml.h:3
-msgid ""
-"A simple kaleidoscope. See also \"GLeidescope\". "
-"http://en.wikipedia.org/wiki/Kaleidoscope Written by Ron Tapia; 1997."
-msgstr ""
-
-#: ../hacks/config/kaleidescope.xml.h:7
 msgid "Kaleidescope"
 msgstr "Kaleidoskop"
 
-#: ../hacks/config/kaleidescope.xml.h:10 ../hacks/config/qix.xml.h:19
+#: ../hacks/config/kaleidescope.xml.h:6 ../hacks/config/qix.xml.h:6
 msgid "Segments"
 msgstr "Segmenty"
 
-#: ../hacks/config/kaleidescope.xml.h:13
-msgid "Symmetry"
+#: ../hacks/config/kaleidescope.xml.h:8
+msgid "3"
 msgstr ""
 
-#: ../hacks/config/kaleidescope.xml.h:14
-msgid "Trails"
+#: ../hacks/config/kaleidescope.xml.h:9
+msgid "Symmetry"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:1
-msgid "-180.0"
+#: ../hacks/config/kaleidescope.xml.h:10
+msgid "32"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:3
-msgid "1.0"
+#: ../hacks/config/kaleidescope.xml.h:11
+msgid "Trails"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:4
-msgid "100.0"
+#: ../hacks/config/kaleidescope.xml.h:14
+msgid ""
+"A simple kaleidoscope. See also \"GLeidescope\". "
+"http://en.wikipedia.org/wiki/Kaleidoscope Written by Ron Tapia; 1997."
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:5
-msgid "180.0"
+#: ../hacks/config/klein.xml.h:1
+msgid "Klein"
 msgstr ""
 
 #: ../hacks/config/klein.xml.h:7
-msgid "4d depth colors"
+msgid "Figure 8"
 msgstr ""
 
 #: ../hacks/config/klein.xml.h:8
-msgid "Figure 8"
+msgid "Lawson"
+msgstr ""
+
+#: ../hacks/config/klein.xml.h:9
+msgid "Walk"
+msgstr ""
+
+#: ../hacks/config/klein.xml.h:10
+msgid "Turn"
 msgstr ""
 
 #: ../hacks/config/klein.xml.h:11
-msgid "Klein"
+msgid "Walk and turn"
 msgstr ""
 
 #: ../hacks/config/klein.xml.h:12
-msgid "Lawson"
+msgid "Show orientation marks"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:18
+#: ../hacks/config/klein.xml.h:19
 msgid "Rainbow colors"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:22
-msgid "Show orientation marks"
+#: ../hacks/config/klein.xml.h:20
+msgid "4d depth colors"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:25
-msgid ""
-"This shows a 4D Klein bottle. You can walk on the Klein bottle or rotate it "
-"in 4D or walk on it while it rotates in 4D. Inspired by Thomas Banchoff's "
-"book \"Beyond the Third Dimension: Geometry, Computer Graphics, and Higher "
-"Dimensions\", Scientific American Library, 1990. "
-"http://en.wikipedia.org/wiki/Klein_bottle Written by Carsten Steger; 2008."
+#: ../hacks/config/klein.xml.h:30
+msgid "-180.0"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:27
-msgid "Turn"
+#: ../hacks/config/klein.xml.h:31
+msgid "Walking direction"
 msgstr ""
 
 #: ../hacks/config/klein.xml.h:32
-msgid "Walk"
+msgid "180.0"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:33
-msgid "Walk and turn"
+#: ../hacks/config/klein.xml.h:36
+msgid "1.0"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:34
-msgid "Walking direction"
+#: ../hacks/config/klein.xml.h:37
+msgid "Walking speed"
 msgstr ""
 
-#: ../hacks/config/klein.xml.h:35
-msgid "Walking speed"
+#: ../hacks/config/klein.xml.h:38
+msgid "100.0"
+msgstr ""
+
+#: ../hacks/config/klein.xml.h:39
+msgid ""
+"This shows a 4D Klein bottle. You can walk on the Klein bottle or rotate it "
+"in 4D or walk on it while it rotates in 4D. Inspired by Thomas Banchoff's "
+"book \"Beyond the Third Dimension: Geometry, Computer Graphics, and Higher "
+"Dimensions\", Scientific American Library, 1990. "
+"http://en.wikipedia.org/wiki/Klein_bottle Written by Carsten Steger; 2008."
 msgstr ""
 
-#: ../hacks/config/kumppa.xml.h:4
+#: ../hacks/config/kumppa.xml.h:1
 msgid "Kumppa"
 msgstr ""
 
@@ -5796,7 +5938,11 @@
 "screen. Written by Teemu Suutari; 1998."
 msgstr ""
 
-#: ../hacks/config/lament.xml.h:2
+#: ../hacks/config/lament.xml.h:1
+msgid "Lament"
+msgstr ""
+
+#: ../hacks/config/lament.xml.h:9
 #, no-c-format
 msgid ""
 "Animates a simulation of Lemarchand's Box, the Lament Configuration, "
@@ -5805,34 +5951,54 @@
 "1998."
 msgstr ""
 
-#: ../hacks/config/lament.xml.h:5
-msgid "Lament"
-msgstr ""
-
-#: ../hacks/config/laser.xml.h:5
+#: ../hacks/config/laser.xml.h:1
 msgid "Laser"
 msgstr "Laser"
 
-#: ../hacks/config/laser.xml.h:12
+#: ../hacks/config/laser.xml.h:13
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Moving radiating lines, that look vaguely like scanning laser "
 "beams. (Frankie say relax.) Written by Pascal Pensa; 1997."
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:4
+#: ../hacks/config/lavalite.xml.h:1
+msgid "Lavalite"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:9
+msgid "Max blobs"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:12
+msgid "Impatient"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:17
 msgid "Classic Lavalite"
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:5
+#: ../hacks/config/lavalite.xml.h:18
+msgid "Giant Lavalite"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:19
 msgid "Cone Lavalite"
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:7
+#: ../hacks/config/lavalite.xml.h:20
+msgid "Rocket Lavalite"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:21
+msgid "Random Lamp Style"
+msgstr ""
+
+#: ../hacks/config/lavalite.xml.h:22
 msgid "Don't Rotate"
 msgstr "Nerotovať"
 
-#: ../hacks/config/lavalite.xml.h:8
+#: ../hacks/config/lavalite.xml.h:30
 msgid ""
 "Draws a 3D Simulation a Lava Lite(r). Odd-shaped blobs of a mysterious "
 "substance are heated, slowly rise to the top of the bottle, and then drop "
@@ -5845,63 +6011,47 @@
 "http://en.wikipedia.org/wiki/Metaballs Written by Jamie Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:10
-msgid "Giant Lavalite"
-msgstr ""
-
-#: ../hacks/config/lavalite.xml.h:12
-msgid "Impatient"
-msgstr ""
-
-#: ../hacks/config/lavalite.xml.h:13
-msgid "Lavalite"
-msgstr ""
-
-#: ../hacks/config/lavalite.xml.h:15
-msgid "Max blobs"
+#: ../hacks/config/lcdscrub.xml.h:1
+msgid "LCDscrub"
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:16
-msgid "Random Lamp Style"
+#: ../hacks/config/lcdscrub.xml.h:5
+msgid "Line spread"
 msgstr ""
 
-#: ../hacks/config/lavalite.xml.h:18
-msgid "Rocket Lavalite"
+#: ../hacks/config/lcdscrub.xml.h:8
+msgid "Horizontal white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:2
-msgid "Diagonal black"
+#: ../hacks/config/lcdscrub.xml.h:9
+msgid "Vertical white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:3
+#: ../hacks/config/lcdscrub.xml.h:10
 msgid "Diagonal white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:6
-msgid "Horizontal black"
+#: ../hacks/config/lcdscrub.xml.h:11
+msgid "Solid white"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:7
-msgid "Horizontal white"
+#: ../hacks/config/lcdscrub.xml.h:12
+msgid "Horizontal black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:8
-msgid "LCDscrub"
+#: ../hacks/config/lcdscrub.xml.h:13
+msgid "Vertical black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:9
-msgid "Line spread"
+#: ../hacks/config/lcdscrub.xml.h:14
+msgid "Diagonal black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:12
+#: ../hacks/config/lcdscrub.xml.h:15
 msgid "Solid black"
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:13
-msgid "Solid white"
-msgstr ""
-
-#: ../hacks/config/lcdscrub.xml.h:14
+#: ../hacks/config/lcdscrub.xml.h:16
 msgid ""
 "This screen saver is not meant to look pretty, but rather, to repair burn-in "
 "on LCD monitors. Believe it or not, screen burn is not a thing of the past. "
@@ -5913,45 +6063,37 @@
 "program by Daniel Sandler. Written by Jamie Zawinski; 2008."
 msgstr ""
 
-#: ../hacks/config/lcdscrub.xml.h:15
-msgid "Vertical black"
-msgstr ""
-
-#: ../hacks/config/lcdscrub.xml.h:16
-msgid "Vertical white"
-msgstr ""
-
-#: ../hacks/config/lightning.xml.h:3
+#: ../hacks/config/lightning.xml.h:1
 msgid "Lightning"
 msgstr ""
 
-#: ../hacks/config/lightning.xml.h:8
+#: ../hacks/config/lightning.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Crackling fractal lightning bolts. Written by Keith Romberg; "
 "1997."
 msgstr ""
 
-#: ../hacks/config/lisa.xml.h:8
+#: ../hacks/config/lisa.xml.h:1
 msgid "Lisa"
 msgstr ""
 
-#: ../hacks/config/lisa.xml.h:15
+#: ../hacks/config/lisa.xml.h:6
 msgid "Steps"
 msgstr "Kroky"
 
-#: ../hacks/config/lisa.xml.h:16
+#: ../hacks/config/lisa.xml.h:17
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Lissajous loops. http://en.wikipedia.org/wiki/Lissajous_curve "
 "Written by Caleb Cullen; 1997."
 msgstr ""
 
-#: ../hacks/config/lissie.xml.h:7
+#: ../hacks/config/lissie.xml.h:1
 msgid "Lissie"
 msgstr ""
 
-#: ../hacks/config/lissie.xml.h:14
+#: ../hacks/config/lissie.xml.h:16
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Lissajous loops. This one draws the progress of circular "
@@ -5960,37 +6102,37 @@
 msgstr ""
 
 #: ../hacks/config/lmorph.xml.h:1
-msgid "Closed figures"
-msgstr ""
-
-#: ../hacks/config/lmorph.xml.h:2
-msgid "Control points"
-msgstr ""
-
-#: ../hacks/config/lmorph.xml.h:6
-msgid "Interpolation steps"
+msgid "LMorph"
 msgstr ""
 
-#: ../hacks/config/lmorph.xml.h:7
-msgid "LMorph"
+#: ../hacks/config/lmorph.xml.h:6
+msgid "Control points"
 msgstr ""
 
 #: ../hacks/config/lmorph.xml.h:8
 msgid "Less"
 msgstr "Menej"
 
-#: ../hacks/config/lmorph.xml.h:12
+#: ../hacks/config/lmorph.xml.h:9
+msgid "Interpolation steps"
+msgstr ""
+
+#: ../hacks/config/lmorph.xml.h:10
 msgid "More"
 msgstr "Viac"
 
-#: ../hacks/config/lmorph.xml.h:13
+#: ../hacks/config/lmorph.xml.h:14
 msgid "Open and closed figures"
 msgstr ""
 
-#: ../hacks/config/lmorph.xml.h:14
+#: ../hacks/config/lmorph.xml.h:15
 msgid "Open figures"
 msgstr ""
 
+#: ../hacks/config/lmorph.xml.h:16
+msgid "Closed figures"
+msgstr ""
+
 #: ../hacks/config/lmorph.xml.h:18
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
@@ -5999,65 +6141,69 @@
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:1
-msgid ""
-"A translucent spinning, blinking thing. Sort of a cross between the wards in "
-"an old combination lock and those old backlit information displays that "
-"animated and changed color via polarized light. Written by Leo L. Schwab; "
-"2007."
+msgid "Lockward"
 msgstr ""
 
-#: ../hacks/config/lockward.xml.h:2
-msgid "Blinking effects"
+#: ../hacks/config/lockward.xml.h:5
+msgid "Miniumum rotator idle time"
 msgstr ""
 
-#: ../hacks/config/lockward.xml.h:5
-msgid "Lockward"
+#: ../hacks/config/lockward.xml.h:6
+msgid "Minimum blink idle time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:7
-msgid "Maximum blink dwell time"
+msgid "Minimum blink dwell time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:8
-msgid "Maximum blink idle time"
-msgstr ""
-
-#: ../hacks/config/lockward.xml.h:9
-msgid "Maximum rotator idle time"
+msgid "Blinking effects"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:10
-msgid "Minimum blink dwell time"
+msgid "Maximum rotator idle time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:11
-msgid "Minimum blink idle time"
+msgid "Maximum blink idle time"
 msgstr ""
 
 #: ../hacks/config/lockward.xml.h:12
-msgid "Miniumum rotator idle time"
+msgid "Maximum blink dwell time"
+msgstr ""
+
+#: ../hacks/config/lockward.xml.h:13
+msgid ""
+"A translucent spinning, blinking thing. Sort of a cross between the wards in "
+"an old combination lock and those old backlit information displays that "
+"animated and changed color via polarized light. Written by Leo L. Schwab; "
+"2007."
+msgstr ""
+
+#: ../hacks/config/loop.xml.h:1
+msgid "Loop"
 msgstr ""
 
-#: ../hacks/config/loop.xml.h:3
+#: ../hacks/config/loop.xml.h:14
 #, no-c-format
 msgid ""
 "Generates loop-shaped colonies that spawn, age, and eventually die. "
 "http://en.wikipedia.org/wiki/Langton%27s_loops Written by David Bagley; 1999."
 msgstr ""
 
-#: ../hacks/config/loop.xml.h:6
-msgid "Loop"
+#: ../hacks/config/m6502.xml.h:1
+msgid "m6502"
 msgstr ""
 
 #: ../hacks/config/m6502.xml.h:3
-msgid "Assembly file"
+msgid "Display time for each program"
 msgstr ""
 
-#: ../hacks/config/m6502.xml.h:4
-msgid "Display time for each program"
+#: ../hacks/config/m6502.xml.h:5
+msgid "Assembly file"
 msgstr ""
 
-#: ../hacks/config/m6502.xml.h:6
+#: ../hacks/config/m6502.xml.h:7
 msgid ""
 "This emulates a 6502 microprocessor. The family of 6502 chips were used "
 "throughout the 70's and 80's in machines such as the Atari 2600, Commodore "
@@ -6068,47 +6214,47 @@
 "2007."
 msgstr ""
 
-#: ../hacks/config/m6502.xml.h:7
-msgid "m6502"
-msgstr ""
-
-#: ../hacks/config/maze.xml.h:3
-msgid "Depth-first backtracking maze generator"
-msgstr ""
-
-#: ../hacks/config/maze.xml.h:5
-msgid "Grid size"
-msgstr ""
+#: ../hacks/config/maze.xml.h:1
+msgid "Maze"
+msgstr "Bludisko"
 
 #: ../hacks/config/maze.xml.h:6
-msgid "Head toward exit"
+msgid "Linger before solving"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:8
-msgid "Ignorant of exit direction"
+msgid "Linger after solving"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:9
-msgid "Linger after solving"
+msgid "Grid size"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:10
-msgid "Linger before solving"
+msgid "Random maze generator"
+msgstr ""
+
+#: ../hacks/config/maze.xml.h:11
+msgid "Depth-first backtracking maze generator"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:12
-msgid "Maze"
-msgstr "Bludisko"
+msgid "Wall-building maze generator (Prim)"
+msgstr ""
 
 #: ../hacks/config/maze.xml.h:13
-msgid "Random maze generator"
+msgid "Set-joining maze generator (Kruskal)"
 msgstr ""
 
 #: ../hacks/config/maze.xml.h:14
-msgid "Set-joining maze generator (Kruskal)"
+msgid "Head toward exit"
+msgstr ""
+
+#: ../hacks/config/maze.xml.h:15
+msgid "Ignorant of exit direction"
 msgstr ""
 
-#: ../hacks/config/maze.xml.h:16
+#: ../hacks/config/maze.xml.h:17
 msgid ""
 "This generates random mazes (with three different maze-generation "
 "algorithms), and then solves them. Backtracking and look-ahead paths are "
@@ -6118,28 +6264,24 @@
 "Weinberg; 1985."
 msgstr ""
 
-#: ../hacks/config/maze.xml.h:17
-msgid "Wall-building maze generator (Prim)"
-msgstr ""
-
 #: ../hacks/config/memscroller.xml.h:1
-msgid "Draw green"
+msgid "MemScroller"
 msgstr ""
 
-#: ../hacks/config/memscroller.xml.h:2
-msgid "Draw in RGB"
+#: ../hacks/config/memscroller.xml.h:5
+msgid "Dump memory"
 msgstr ""
 
-#: ../hacks/config/memscroller.xml.h:3
+#: ../hacks/config/memscroller.xml.h:6
 msgid "Draw random numbers"
 msgstr ""
 
-#: ../hacks/config/memscroller.xml.h:4
-msgid "Dump memory"
+#: ../hacks/config/memscroller.xml.h:7
+msgid "Draw in RGB"
 msgstr ""
 
 #: ../hacks/config/memscroller.xml.h:8
-msgid "MemScroller"
+msgid "Draw green"
 msgstr ""
 
 #: ../hacks/config/memscroller.xml.h:10
@@ -6148,15 +6290,15 @@
 "three windows at three different rates. Written by Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/menger.xml.h:7 ../hacks/config/sierpinski3d.xml.h:6
-msgid "Max depth"
+#: ../hacks/config/menger.xml.h:1
+msgid "Menger"
 msgstr ""
 
-#: ../hacks/config/menger.xml.h:8
-msgid "Menger"
+#: ../hacks/config/menger.xml.h:8 ../hacks/config/sierpinski3d.xml.h:8
+msgid "Max depth"
 msgstr ""
 
-#: ../hacks/config/menger.xml.h:18
+#: ../hacks/config/menger.xml.h:21
 msgid ""
 "This draws the three-dimensional variant of the recursive Menger Gasket, a "
 "cube-based fractal object analagous to the Sierpinski Tetrahedron. "
@@ -6165,108 +6307,113 @@
 "2001."
 msgstr ""
 
-#: ../hacks/config/metaballs.xml.h:2
-msgid ""
-"Draws two dimensional metaballs: overlapping and merging balls with fuzzy "
-"edges. http://en.wikipedia.org/wiki/Metaballs Written by W.P. van Paassen; "
-"2003."
+#: ../hacks/config/metaballs.xml.h:1
+msgid "MetaBalls"
 msgstr ""
 
-#: ../hacks/config/metaballs.xml.h:9
-msgid "MetaBall Movement"
+#: ../hacks/config/metaballs.xml.h:11
+msgid "Metaball count"
 msgstr ""
 
-#: ../hacks/config/metaballs.xml.h:10
+#: ../hacks/config/metaballs.xml.h:13
 msgid "MetaBall Radius"
 msgstr ""
 
-#: ../hacks/config/metaballs.xml.h:11
-msgid "MetaBalls"
+#: ../hacks/config/metaballs.xml.h:15
+msgid "MetaBall Movement"
 msgstr ""
 
-#: ../hacks/config/metaballs.xml.h:12
-msgid "Metaball count"
+#: ../hacks/config/metaballs.xml.h:17
+msgid ""
+"Draws two dimensional metaballs: overlapping and merging balls with fuzzy "
+"edges. http://en.wikipedia.org/wiki/Metaballs Written by W.P. van Paassen; "
+"2003."
 msgstr ""
 
 #: ../hacks/config/mirrorblob.xml.h:1
+msgid "MirrorBlob"
+msgstr ""
+
+#: ../hacks/config/mirrorblob.xml.h:5
 msgid "0.1x"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:2
+#: ../hacks/config/mirrorblob.xml.h:7
 msgid "3.0x"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:3 ../hacks/config/timetunnel.xml.h:2
-msgid "30 sec"
+#: ../hacks/config/mirrorblob.xml.h:8
+msgid "5 sec"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:4
+#: ../hacks/config/mirrorblob.xml.h:10
 msgid "5 min"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:5
-msgid "5 sec"
-msgstr ""
-
-#: ../hacks/config/mirrorblob.xml.h:6
-msgid "50 bumps"
+#: ../hacks/config/mirrorblob.xml.h:12
+msgid "Transition duration"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:8
-msgid "Clear"
+#: ../hacks/config/mirrorblob.xml.h:13 ../hacks/config/timetunnel.xml.h:4
+msgid "30 sec"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:9
-msgid ""
-"Draws a wobbly blob that distorts the image behind it. Written by Jon "
-"Dowdall; 2003."
+#: ../hacks/config/mirrorblob.xml.h:16
+msgid "50 bumps"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:10
-msgid "Enable colouring"
+#: ../hacks/config/mirrorblob.xml.h:17
+msgid "Clear"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:11
-msgid "Enable reflected image"
+#: ../hacks/config/mirrorblob.xml.h:19 ../hacks/config/webcollage.xml.h:10
+msgid "Opaque"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:12
+#: ../hacks/config/mirrorblob.xml.h:20
 msgid "Enable walls"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:16
-msgid "MirrorBlob"
+#: ../hacks/config/mirrorblob.xml.h:21
+msgid "Enable colouring"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:18
-msgid "Offset texture coordinates"
+#: ../hacks/config/mirrorblob.xml.h:22
+msgid "Enable reflected image"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:19 ../hacks/config/webcollage.xml.h:8
-msgid "Opaque"
+#: ../hacks/config/mirrorblob.xml.h:23
+msgid "Show image on background"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:22
-msgid "Show image on background"
+#: ../hacks/config/mirrorblob.xml.h:24
+msgid "Offset texture coordinates"
 msgstr ""
 
-#: ../hacks/config/mirrorblob.xml.h:25
-msgid "Transition duration"
+#: ../hacks/config/mirrorblob.xml.h:28
+msgid ""
+"Draws a wobbly blob that distorts the image behind it. Written by Jon "
+"Dowdall; 2003."
 msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:7
+#: ../hacks/config/mismunch.xml.h:1
 msgid "Mismunch"
 msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:11 ../hacks/config/munch.xml.h:15
+#: ../hacks/config/mismunch.xml.h:9 ../hacks/config/munch.xml.h:9
 msgid "Simultaneous squares"
 msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:12 ../hacks/config/munch.xml.h:16
+#: ../hacks/config/mismunch.xml.h:11 ../hacks/config/munch.xml.h:14
+#: ../hacks/config/qix.xml.h:22
+msgid "XOR"
+msgstr "XOR"
+
+#: ../hacks/config/mismunch.xml.h:12 ../hacks/config/munch.xml.h:15
 msgid "Solid"
 msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:13
+#: ../hacks/config/mismunch.xml.h:14
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. It was merged with the \"Munch\" screen saver. Munching "
@@ -6276,21 +6423,16 @@
 "http://en.wikipedia.org/wiki/Munching_square Written by Steven Hazel; 2004."
 msgstr ""
 
-#: ../hacks/config/mismunch.xml.h:14 ../hacks/config/munch.xml.h:17
-#: ../hacks/config/qix.xml.h:25
-msgid "XOR"
-msgstr "XOR"
-
 #: ../hacks/config/moebius.xml.h:1
-msgid "Draw ants"
+msgid "Moebius"
 msgstr ""
 
 #: ../hacks/config/moebius.xml.h:5
-msgid "Moebius"
+msgid "Solid floor"
 msgstr ""
 
-#: ../hacks/config/moebius.xml.h:7
-msgid "Solid floor"
+#: ../hacks/config/moebius.xml.h:6
+msgid "Draw ants"
 msgstr ""
 
 #: ../hacks/config/moebius.xml.h:8
@@ -6303,30 +6445,30 @@
 msgstr ""
 
 #: ../hacks/config/moebiusgears.xml.h:1
-msgid ""
-"Draws a closed, interlinked chain of rotating gears. The layout of the gears "
-"follows the path of a moebius strip. See also the \"Pinion\" and \"Gears\" "
-"screen savers. http://en.wikipedia.org/wiki/Involute_gear "
-"http://en.wikipedia.org/wiki/Moebius_strip Written by Jamie Zawinski; 2007."
-msgstr ""
-
-#: ../hacks/config/moebiusgears.xml.h:6
 msgid "MoebiusGears"
 msgstr ""
 
-#: ../hacks/config/moebiusgears.xml.h:7
+#: ../hacks/config/moebiusgears.xml.h:8
 msgid "Number of gears"
 msgstr ""
 
-#: ../hacks/config/moebiusgears.xml.h:8
+#: ../hacks/config/moebiusgears.xml.h:9
 msgid "Number of teeth"
 msgstr ""
 
-#: ../hacks/config/moire.xml.h:6
+#: ../hacks/config/moebiusgears.xml.h:15
+msgid ""
+"Draws a closed, interlinked chain of rotating gears. The layout of the gears "
+"follows the path of a moebius strip. See also the \"Pinion\" and \"Gears\" "
+"screen savers. http://en.wikipedia.org/wiki/Involute_gear "
+"http://en.wikipedia.org/wiki/Moebius_strip Written by Jamie Zawinski; 2007."
+msgstr ""
+
+#: ../hacks/config/moire.xml.h:1
 msgid "Moire"
 msgstr ""
 
-#: ../hacks/config/moire.xml.h:8 ../hacks/config/rorschach.xml.h:6
+#: ../hacks/config/moire.xml.h:9 ../hacks/config/rorschach.xml.h:5
 msgid "Offset"
 msgstr "Posunutie"
 
@@ -6337,7 +6479,11 @@
 "Michael Bayne; 1997."
 msgstr ""
 
-#: ../hacks/config/moire2.xml.h:2
+#: ../hacks/config/moire2.xml.h:1
+msgid "Moire2"
+msgstr ""
+
+#: ../hacks/config/moire2.xml.h:10
 msgid ""
 "Generates fields of concentric circles or ovals, and combines the planes "
 "with various operations. The planes are moving independently of one another, "
@@ -6345,27 +6491,35 @@
 "http://en.wikipedia.org/wiki/Moire_pattern Written by Jamie Zawinski; 1998."
 msgstr ""
 
-#: ../hacks/config/moire2.xml.h:6
-msgid "Moire2"
+#: ../hacks/config/molecule.xml.h:1
+msgid "Molecule"
+msgstr "Molekula"
+
+#: ../hacks/config/molecule.xml.h:8
+msgid "Label atoms"
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:3
+#: ../hacks/config/molecule.xml.h:9
 msgid "Describe molecule"
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:5
-msgid "Draw atomic bonds"
+#: ../hacks/config/molecule.xml.h:12
+msgid "Draw atomic nuclei"
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:6
-msgid "Draw atomic nuclei"
+#: ../hacks/config/molecule.xml.h:13
+msgid "Draw atomic bonds"
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:8
+#: ../hacks/config/molecule.xml.h:14
 msgid "Draw electron shells"
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:10
+#: ../hacks/config/molecule.xml.h:25
+msgid "PDB file or directory"
+msgstr ""
+
+#: ../hacks/config/molecule.xml.h:27
 #, no-c-format
 msgid ""
 "Draws several different representations of molecules. Some common molecules "
@@ -6374,63 +6528,67 @@
 "Jamie Zawinski; 2001."
 msgstr ""
 
-#: ../hacks/config/molecule.xml.h:14
-msgid "Label atoms"
-msgstr ""
-
-#: ../hacks/config/molecule.xml.h:16
-msgid "Molecule"
-msgstr "Molekula"
-
-#: ../hacks/config/molecule.xml.h:17
-msgid "PDB file or directory"
+#: ../hacks/config/morph3d.xml.h:1
+msgid "Morph3D"
 msgstr ""
 
-#: ../hacks/config/morph3d.xml.h:1 ../hacks/config/polyhedra.xml.h:3
-#: ../hacks/config/sballs.xml.h:1
+#: ../hacks/config/morph3d.xml.h:7 ../hacks/config/polyhedra.xml.h:30
+#: ../hacks/config/sballs.xml.h:7
 msgid "Cube"
 msgstr "Kocka"
 
-#: ../hacks/config/morph3d.xml.h:2 ../hacks/config/polyhedra.xml.h:14
-#: ../hacks/config/sballs.xml.h:2
-msgid "Dodecahedron"
-msgstr ""
-
-#: ../hacks/config/morph3d.xml.h:5 ../hacks/config/polyhedra.xml.h:72
-#: ../hacks/config/sballs.xml.h:6
-msgid "Icosahedron"
+#: ../hacks/config/morph3d.xml.h:8 ../hacks/config/polyhedra.xml.h:29
+#: ../hacks/config/sballs.xml.h:8
+msgid "Octahedron"
 msgstr ""
 
-#: ../hacks/config/morph3d.xml.h:7
-msgid "Morph3D"
+#: ../hacks/config/morph3d.xml.h:9 ../hacks/config/polyhedra.xml.h:62
+#: ../hacks/config/sballs.xml.h:9
+msgid "Dodecahedron"
 msgstr ""
 
-#: ../hacks/config/morph3d.xml.h:8 ../hacks/config/polyhedra.xml.h:86
-#: ../hacks/config/sballs.xml.h:8
-msgid "Octahedron"
+#: ../hacks/config/morph3d.xml.h:10 ../hacks/config/polyhedra.xml.h:61
+#: ../hacks/config/sballs.xml.h:10
+msgid "Icosahedron"
 msgstr ""
 
-#: ../hacks/config/morph3d.xml.h:9
+#: ../hacks/config/morph3d.xml.h:12
 msgid ""
 "Platonic solids that turn inside out and get spikey. "
 "http://en.wikipedia.org/wiki/Platonic_solid Written by Marcelo Vianna; 1997."
 msgstr ""
 
-#: ../hacks/config/mountain.xml.h:2
+#: ../hacks/config/mountain.xml.h:1
+msgid "Mountain"
+msgstr "Pohorie"
+
+#: ../hacks/config/mountain.xml.h:6
+msgid "Peaks"
+msgstr ""
+
+#: ../hacks/config/mountain.xml.h:12
 msgid ""
 "Generates random 3D plots that look vaguely mountainous. Written by Pascal "
 "Pensa; 1997."
 msgstr ""
 
-#: ../hacks/config/mountain.xml.h:7
-msgid "Mountain"
-msgstr "Pohorie"
+#: ../hacks/config/munch.xml.h:1
+msgid "Munch"
+msgstr ""
 
-#: ../hacks/config/mountain.xml.h:10
-msgid "Peaks"
+#: ../hacks/config/munch.xml.h:11
+msgid "Munch or mismunch"
 msgstr ""
 
-#: ../hacks/config/munch.xml.h:1
+#: ../hacks/config/munch.xml.h:12
+msgid "Munch only"
+msgstr ""
+
+#: ../hacks/config/munch.xml.h:13
+msgid "Mismunch only"
+msgstr ""
+
+#: ../hacks/config/munch.xml.h:17
 msgid ""
 "DATAI 2 ADDB 1,2 ROTC 2,-22 XOR 1,2 JRST .-4 As reported by HAKMEM (MIT AI "
 "Memo 239, 1972), Jackson Wright wrote the above PDP-1 code in 1962. That "
@@ -6441,90 +6599,74 @@
 "Showalter, Jamie Zawinski and Steven Hazel; 1997."
 msgstr ""
 
-#: ../hacks/config/munch.xml.h:8
-msgid "Mismunch only"
-msgstr ""
-
-#: ../hacks/config/munch.xml.h:9
-msgid "Munch"
+#: ../hacks/config/nerverot.xml.h:1
+msgid "NerveRot"
 msgstr ""
 
-#: ../hacks/config/munch.xml.h:10
-msgid "Munch only"
+#: ../hacks/config/nerverot.xml.h:9
+msgid "Blot count"
 msgstr ""
 
-#: ../hacks/config/munch.xml.h:11
-msgid "Munch or mismunch"
-msgstr ""
+#: ../hacks/config/nerverot.xml.h:12 ../hacks/config/topblock.xml.h:14
+msgid "Colors"
+msgstr "Farby"
 
-#: ../hacks/config/nerverot.xml.h:1
-msgid "Blot count"
+#: ../hacks/config/nerverot.xml.h:13 ../hacks/config/pyro.xml.h:8
+msgid "Seldom"
+msgstr "Zriedka"
+
+#: ../hacks/config/nerverot.xml.h:14
+msgid "Changes"
+msgstr "Zmeny"
+
+#: ../hacks/config/nerverot.xml.h:15
+msgid "Frequent"
 msgstr ""
 
-#: ../hacks/config/nerverot.xml.h:2
+#: ../hacks/config/nerverot.xml.h:16
 msgid "Calm"
 msgstr ""
 
-#: ../hacks/config/nerverot.xml.h:3
-msgid "Changes"
-msgstr "Zmeny"
+#: ../hacks/config/nerverot.xml.h:17
+msgid "Nervousness"
+msgstr ""
 
-#: ../hacks/config/nerverot.xml.h:4 ../hacks/config/topblock.xml.h:4
-msgid "Colors"
-msgstr "Farby"
+#: ../hacks/config/nerverot.xml.h:18
+msgid "Spastic"
+msgstr ""
 
-#: ../hacks/config/nerverot.xml.h:5
+#: ../hacks/config/nerverot.xml.h:19
 msgid "Crunchiness"
 msgstr ""
 
 #. #### -max-radius [25]
-#: ../hacks/config/nerverot.xml.h:7
+#: ../hacks/config/nerverot.xml.h:23
 msgid ""
 "Draws different shapes composed of nervously vibrating squiggles, as if seen "
 "through a camera operated by a monkey on crack. Written by Dan Bornstein; "
 "2000."
 msgstr ""
 
-#: ../hacks/config/nerverot.xml.h:11
-msgid "Frequent"
-msgstr ""
-
-#: ../hacks/config/nerverot.xml.h:17
-msgid "NerveRot"
-msgstr ""
-
-#: ../hacks/config/nerverot.xml.h:18
-msgid "Nervousness"
-msgstr ""
-
-#: ../hacks/config/nerverot.xml.h:19 ../hacks/config/pyro.xml.h:12
-msgid "Seldom"
-msgstr "Zriedka"
-
-#: ../hacks/config/nerverot.xml.h:22
-msgid "Spastic"
+#: ../hacks/config/noof.xml.h:1
+msgid "Noof"
 msgstr ""
 
-#: ../hacks/config/noof.xml.h:1
+#: ../hacks/config/noof.xml.h:6
 msgid ""
 "Draws some rotatey patterns, using OpenGL. Written by Bill Torzewski; 2004."
 msgstr ""
 
-#: ../hacks/config/noof.xml.h:5
-msgid "Noof"
+#: ../hacks/config/noseguy.xml.h:1
+msgid "NoseGuy"
 msgstr ""
 
-#: ../hacks/config/noseguy.xml.h:1
+#: ../hacks/config/noseguy.xml.h:3
 msgid ""
 "A little man with a big nose wanders around your screen saying things. "
 "Written by Dan Heller and Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/noseguy.xml.h:2
-msgid "NoseGuy"
-msgstr ""
-
-#: ../hacks/config/pacman.xml.h:4
+#: ../hacks/config/pacman.xml.h:1
 msgid "Pacman"
 msgstr ""
 
@@ -6538,7 +6680,7 @@
 "http://en.wikipedia.org/wiki/Pac-Man Written by Edwin de Jong; 2004."
 msgstr ""
 
-#: ../hacks/config/pedal.xml.h:7
+#: ../hacks/config/pedal.xml.h:1
 msgid "Pedal"
 msgstr ""
 
@@ -6550,32 +6692,40 @@
 msgstr ""
 
 #: ../hacks/config/penetrate.xml.h:1
-msgid "Always play well"
+msgid "Penetrate"
 msgstr ""
 
-#: ../hacks/config/penetrate.xml.h:2
+#: ../hacks/config/penetrate.xml.h:3
 msgid "Explosions"
 msgstr "Výbuchy"
 
-#: ../hacks/config/penetrate.xml.h:5
-msgid "Penetrate"
+#: ../hacks/config/penetrate.xml.h:6
+msgid "Start badly, but learn"
 msgstr ""
 
 #: ../hacks/config/penetrate.xml.h:7
+msgid "Always play well"
+msgstr ""
+
+#: ../hacks/config/penetrate.xml.h:9
 msgid ""
 "Simulates (something like) the classic arcade game Missile Command. "
 "http://en.wikipedia.org/wiki/Missile_Command Written by Adam Miller; 1999."
 msgstr ""
 
-#: ../hacks/config/penetrate.xml.h:9
-msgid "Start badly, but learn"
+#: ../hacks/config/penrose.xml.h:1
+msgid "Penrose"
 msgstr ""
 
-#: ../hacks/config/penrose.xml.h:1
+#: ../hacks/config/penrose.xml.h:9 ../hacks/config/twang.xml.h:15
+msgid "Tile size"
+msgstr ""
+
+#: ../hacks/config/penrose.xml.h:11
 msgid "Draw ammann lines"
 msgstr ""
 
-#: ../hacks/config/penrose.xml.h:2
+#: ../hacks/config/penrose.xml.h:13
 msgid ""
 "Draws quasiperiodic tilings; think of the implications on modern formica "
 "technology. In April 1997, Sir Roger Penrose, a British math professor who "
@@ -6591,76 +6741,68 @@
 "http://en.wikipedia.org/wiki/Penrose_tiling Written by Timo Korvola; 1997."
 msgstr ""
 
-#: ../hacks/config/penrose.xml.h:9
-msgid "Penrose"
+#: ../hacks/config/petri.xml.h:1
+msgid "Petri"
 msgstr ""
 
-#: ../hacks/config/penrose.xml.h:12 ../hacks/config/twang.xml.h:17
-msgid "Tile size"
+#: ../hacks/config/petri.xml.h:7
+msgid "Mold varieties"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:2
-msgid "Colony shape"
+#: ../hacks/config/petri.xml.h:8
+msgid "Square"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:3
-msgid "Death comes"
+#: ../hacks/config/petri.xml.h:9
+msgid "Colony shape"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:4
+#: ../hacks/config/petri.xml.h:10
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../hacks/config/petri.xml.h:6
+#: ../hacks/config/petri.xml.h:11
 msgid "Fertility"
 msgstr ""
 
 #: ../hacks/config/petri.xml.h:13
-msgid "Maximum lifespan"
-msgstr ""
-
-#: ../hacks/config/petri.xml.h:14
-msgid "Maximum rate of death"
+msgid "Offspring"
 msgstr ""
 
 #: ../hacks/config/petri.xml.h:15
-msgid "Maximum rate of growth"
-msgstr ""
+msgid "Slowly"
+msgstr "Pomaly"
 
 #: ../hacks/config/petri.xml.h:16
-msgid "Minimum lifespan"
+msgid "Death comes"
 msgstr ""
 
 #: ../hacks/config/petri.xml.h:17
-msgid "Minimum rate of death"
-msgstr ""
+msgid "Quickly"
+msgstr "Rýchlo"
 
-#: ../hacks/config/petri.xml.h:18
+#: ../hacks/config/petri.xml.h:19
 msgid "Minimum rate of growth"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:19
-msgid "Mold varieties"
+#: ../hacks/config/petri.xml.h:21
+msgid "Maximum rate of growth"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:20
-msgid "Offspring"
+#: ../hacks/config/petri.xml.h:22
+msgid "Minimum rate of death"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:21
-msgid "Petri"
+#: ../hacks/config/petri.xml.h:23
+msgid "Maximum rate of death"
 msgstr ""
 
-#: ../hacks/config/petri.xml.h:22
-msgid "Quickly"
-msgstr "Rýchlo"
-
-#: ../hacks/config/petri.xml.h:26
-msgid "Slowly"
-msgstr "Pomaly"
+#: ../hacks/config/petri.xml.h:25
+msgid "Minimum lifespan"
+msgstr ""
 
 #: ../hacks/config/petri.xml.h:27
-msgid "Square"
+msgid "Maximum lifespan"
 msgstr ""
 
 #. #### -mem-throttle [22M]
@@ -6672,73 +6814,74 @@
 msgstr ""
 
 #: ../hacks/config/phosphor.xml.h:1
+msgid "Phosphor"
+msgstr ""
+
+#: ../hacks/config/phosphor.xml.h:5
+msgid "Font scale"
+msgstr ""
+
+#: ../hacks/config/phosphor.xml.h:10
 msgid ""
 "Draws a simulation of an old terminal, with large pixels and long-sustain "
-"phosphor. On X11 systems, This program is also a fully-functional VT100 "
-"emulator! Written by Jamie Zawinski; 1999."
+"phosphor. This program is also a fully-functional VT100 emulator! Run it as "
+"an application instead of as a screen saver and you can use it as a "
+"terminal. Written by Jamie Zawinski; 1999."
 msgstr ""
 
-#: ../hacks/config/phosphor.xml.h:4
-msgid "Font scale"
+#: ../hacks/config/photopile.xml.h:1
+msgid "Photopile"
 msgstr ""
 
-#: ../hacks/config/phosphor.xml.h:8
-msgid "Phosphor"
+#: ../hacks/config/photopile.xml.h:3
+msgid "Image size"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:1 ../hacks/config/t3d.xml.h:1
+#: ../hacks/config/photopile.xml.h:5 ../hacks/config/t3d.xml.h:5
 msgid "0 deg"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:2 ../hacks/config/t3d.xml.h:3
-msgid "90 deg"
+#: ../hacks/config/photopile.xml.h:6
+msgid "Maximum angle from vertical"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:4
-msgid "Clip images"
+#: ../hacks/config/photopile.xml.h:7 ../hacks/config/t3d.xml.h:7
+msgid "90 deg"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:5
-msgid "Draw drop shadows"
+#: ../hacks/config/photopile.xml.h:9
+msgid "Simulate instant film"
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:9
-msgid "Image size"
+#: ../hacks/config/photopile.xml.h:10
+msgid "Clip images"
 msgstr ""
 
 #: ../hacks/config/photopile.xml.h:11
+msgid "Draw drop shadows"
+msgstr ""
+
+#: ../hacks/config/photopile.xml.h:23
 msgid ""
 "Loads several random images, and displays them as if lying in a random pile. "
 "The pile is periodically reshuffled, with new images coming in and old ones "
 "being thrown out. Written by Jens Kilian; 2008."
 msgstr ""
 
-#: ../hacks/config/photopile.xml.h:14
-msgid "Maximum angle from vertical"
-msgstr ""
-
-#: ../hacks/config/photopile.xml.h:16
-msgid "Photopile"
-msgstr ""
-
-#: ../hacks/config/photopile.xml.h:20
-msgid "Simulate instant film"
-msgstr ""
-
 #: ../hacks/config/piecewise.xml.h:1
-msgid "Color shift"
+msgid "Piecewise"
 msgstr ""
 
-#: ../hacks/config/piecewise.xml.h:10
-msgid "Maximum radius"
+#: ../hacks/config/piecewise.xml.h:9
+msgid "Color shift"
 msgstr ""
 
-#: ../hacks/config/piecewise.xml.h:11
+#: ../hacks/config/piecewise.xml.h:12
 msgid "Minimum radius"
 msgstr ""
 
-#: ../hacks/config/piecewise.xml.h:12
-msgid "Piecewise"
+#: ../hacks/config/piecewise.xml.h:14
+msgid "Maximum radius"
 msgstr ""
 
 #: ../hacks/config/piecewise.xml.h:16
@@ -6748,716 +6891,709 @@
 msgstr ""
 
 #: ../hacks/config/pinion.xml.h:1
-msgid "100"
-msgstr ""
-
-#: ../hacks/config/pinion.xml.h:2
-msgid "2000"
+msgid "Pinion"
 msgstr ""
 
-#: ../hacks/config/pinion.xml.h:3
-msgid ""
-"Draws an interconnected set of gears moving across the screen. See also the "
-"\"Gears\" and \"MoebiusGears\" screen savers. "
-"http://en.wikipedia.org/wiki/Involute_gear Written by Jamie Zawinski; 2004."
+#: ../hacks/config/pinion.xml.h:8
+msgid "Scrolling speed"
 msgstr ""
 
-#: ../hacks/config/pinion.xml.h:6
+#: ../hacks/config/pinion.xml.h:10
 msgid "Gear size"
 msgstr ""
 
-#: ../hacks/config/pinion.xml.h:10
-msgid "Max RPM"
+#: ../hacks/config/pinion.xml.h:12
+msgid "100"
 msgstr ""
 
-#: ../hacks/config/pinion.xml.h:11
-msgid "Pinion"
+#: ../hacks/config/pinion.xml.h:13
+msgid "Max RPM"
 msgstr ""
 
-#: ../hacks/config/pinion.xml.h:13
-msgid "Scrolling speed"
+#: ../hacks/config/pinion.xml.h:14
+msgid "2000"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:1
+#: ../hacks/config/pinion.xml.h:17
 msgid ""
-"A growing plumbing system, with bolts and valves. Written by Marcelo Vianna; "
-"1997."
+"Draws an interconnected set of gears moving across the screen. See also the "
+"\"Gears\" and \"MoebiusGears\" screen savers. "
+"http://en.wikipedia.org/wiki/Involute_gear Written by Jamie Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:2
-msgid "A hundred"
+#: ../hacks/config/pipes.xml.h:1
+msgid "Pipes"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:3
-msgid "Allow tight turns"
+#: ../hacks/config/pipes.xml.h:6
+msgid "Number of pipes"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:4
-msgid "Ball joints"
+#: ../hacks/config/pipes.xml.h:7
+msgid "A hundred"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:5
-msgid "Bolted fittings"
+#: ../hacks/config/pipes.xml.h:9
+msgid "Pipe length"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:6
-msgid "Curved pipes"
+#: ../hacks/config/pipes.xml.h:12
+msgid "Gadgetry"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:7
+#: ../hacks/config/pipes.xml.h:14
 msgid "Fisheye lens"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:9
-msgid "Gadgetry"
+#: ../hacks/config/pipes.xml.h:15
+msgid "Allow tight turns"
 msgstr ""
 
-#: ../hacks/config/pipes.xml.h:15
-msgid "Number of pipes"
+#: ../hacks/config/pipes.xml.h:16
+msgid "Curved pipes"
 msgstr ""
 
 #: ../hacks/config/pipes.xml.h:17
-msgid "Pipe length"
+msgid "Ball joints"
 msgstr ""
 
 #: ../hacks/config/pipes.xml.h:18
-msgid "Pipes"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:4
-msgid "Cubitruncated cuboctahedron"
+msgid "Bolted fittings"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:5
-msgid "Cuboctahedron"
+#: ../hacks/config/pipes.xml.h:20
+msgid ""
+"A growing plumbing system, with bolts and valves. Written by Marcelo Vianna; "
+"1997."
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:6
-msgid "Cubohemioctahedron"
+#: ../hacks/config/polyhedra.xml.h:1
+msgid "Polyhedra"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:7
-msgid "Deltoidal hexecontahedron"
+#: ../hacks/config/polyhedra.xml.h:11
+msgid "Display random polyhedron"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:8
-msgid "Deltoidal icositetrahedron"
+#: ../hacks/config/polyhedra.xml.h:12
+msgid "Pentagonal prism"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:9
-msgid "Disdyakisdodecahedron"
+#: ../hacks/config/polyhedra.xml.h:13
+msgid "Pentagonal dipyramid"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:10
-msgid "Disdyakistriacontahedron"
+#: ../hacks/config/polyhedra.xml.h:14
+msgid "Pentagonal antiprism"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:11
-msgid "Display random polyhedron"
+#: ../hacks/config/polyhedra.xml.h:15
+msgid "Pentagonal deltohedron"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:12
-msgid ""
-"Displays different 3D solids and some information about each. A new solid is "
-"chosen every few seconds. There are 75 uniform polyhedra, plus 5 infinite "
-"sets of prisms and antiprisms; including their duals brings the total to "
-"160. http://en.wikipedia.org/wiki/Uniform_polyhedra Written by Dr. Zvi "
-"Har'El and Jamie Zawinski; 2004."
+#: ../hacks/config/polyhedra.xml.h:16
+msgid "Pentagrammic prism"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:13
-msgid "Ditrigonal dodecadodecahedron"
+#: ../hacks/config/polyhedra.xml.h:17
+msgid "Pentagrammic dipyramid"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:18
-msgid "Great cubicuboctahedron"
+msgid "Pentagrammic antiprism"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:19
-msgid "Great deltoidal hexecontahedron"
+msgid "Pentagrammic deltohedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:20
-msgid "Great deltoidal icositetrahedron"
+msgid "Pentagrammic crossed antiprism"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:21
-msgid "Great dirhombicosidodecacron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:22
-msgid "Great dirhombicosidodecahedron"
+msgid "Pentagrammic concave deltohedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:23
-msgid "Great disdyakisdodecahedron"
+msgid "Truncated tetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:24
-msgid "Great disdyakistriacontahedron"
+msgid "Triakistetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:25
-msgid "Great ditrigonal dodecacronic hexecontahedron"
+msgid "Octahemioctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:26
-msgid "Great ditrigonal dodecicosidodecahedron"
+msgid "Octahemioctacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:27
-msgid "Great ditrigonal icosidodecahedron"
+msgid "Tetrahemihexahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:28
-msgid "Great dodecacronic hexecontahedron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:29
-msgid "Great dodecadodecahedron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:30
-msgid "Great dodecahedron"
+msgid "Tetrahemihexacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:31
-msgid "Great dodecahemicosacron"
+msgid "Cuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:32
-msgid "Great dodecahemicosahedron"
+msgid "Rhombic dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:33
-msgid "Great dodecahemidodecacron"
+msgid "Truncated octahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:34
-msgid "Great dodecahemidodecahedron"
+msgid "Tetrakishexahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:35
-msgid "Great dodecicosacron"
+msgid "Truncated cube"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:36
-msgid "Great dodecicosahedron"
+msgid "Triakisoctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:37
-msgid "Great dodecicosidodecahedron"
+msgid "Rhombicuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:38
-msgid "Great hexacronic icositetrahedron"
+msgid "Deltoidal icositetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:39
-msgid "Great hexagonal hexecontahedron"
+msgid "Truncated cuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:40
-msgid "Great icosacronic hexecontahedron"
+msgid "Disdyakisdodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:41
-msgid "Great icosahedron"
+msgid "Snub cube"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:42
-msgid "Great icosicosidodecahedron"
+msgid "Pentagonal icositetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:43
-msgid "Great icosidodecahedron"
+msgid "Small cubicuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:44
-msgid "Great icosihemidodecacron"
+msgid "Small hexacronic icositetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:45
-msgid "Great icosihemidodecahedron"
+msgid "Great cubicuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:46
-msgid "Great inverted pentagonal hexecontahedron"
+msgid "Great hexacronic icositetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:47
-msgid "Great inverted snub icosidodecahedron"
+msgid "Cubohemioctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:48
-msgid "Great pentagonal hexecontahedron"
+msgid "Hexahemioctacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:49
-msgid "Great pentagrammic hexecontahedron"
+msgid "Cubitruncated cuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:50
-msgid "Great pentakisdodekahedron"
+msgid "Tetradyakishexahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:51
-msgid "Great retrosnub icosidodecahedron"
+msgid "Great rhombicuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:52
-msgid "Great rhombic triacontahedron"
+msgid "Great deltoidal icositetrahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:53
-msgid "Great rhombicosidodecahedron"
+msgid "Small rhombihexahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:54
-msgid "Great rhombicuboctahedron"
+msgid "Small rhombihexacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:55
-msgid "Great rhombidodecacron"
+msgid "Stellated truncated hexahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:56
-msgid "Great rhombidodecahedron"
+msgid "Great triakisoctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:57
-msgid "Great rhombihexacron"
+msgid "Great truncated cuboctahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:58
-msgid "Great rhombihexahedron"
+msgid "Great disdyakisdodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:59
-msgid "Great snub dodecicosidodecahedron"
+msgid "Great rhombihexahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:60
-msgid "Great snub icosidodecahedron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:61
-msgid "Great stellapentakisdodecahedron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:62
-msgid "Great stellated dodecahedron"
+msgid "Great rhombihexacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:63
-msgid "Great stellated truncated dodecahedron"
+msgid "Icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:64
-msgid "Great triakisicosahedron"
+msgid "Rhombic triacontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:65
-msgid "Great triakisoctahedron"
+msgid "Truncated icosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:66
-msgid "Great triambic icosahedron"
+msgid "Pentakisdodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:67
-msgid "Great truncated cuboctahedron"
+msgid "Truncated dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:68
-msgid "Great truncated icosahedron"
+msgid "Triakisicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:69
-msgid "Great truncated icosidodecahedron"
+msgid "Rhombicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:70
-msgid "Hexahemioctacron"
+msgid "Deltoidal hexecontahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:71
+msgid "Truncated icosidodecahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:72
+msgid "Disdyakistriacontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:73
-msgid "Icosidodecadodecahedron"
+msgid "Snub dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:74
-msgid "Icosidodecahedron"
+msgid "Pentagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:75
-msgid "Icositruncated dodecadodecahedron"
+msgid "Small ditrigonal icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:76
-msgid "Inverted snub dodecadodecahedron"
+msgid "Small triambic icosahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:77
+msgid "Small icosicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:78
-msgid "Medial deltoidal hexecontahedron"
+msgid "Small icosacronic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:79
-msgid "Medial disdyakistriacontahedron"
+msgid "Small snub icosicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:80
-msgid "Medial hexagonal hexecontahedron"
+msgid "Small hexagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:81
-msgid "Medial icosacronic hexecontahedron"
+msgid "Small dodecicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:82
-msgid "Medial inverted pentagonal hexecontahedron"
+msgid "Small dodecacronic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:83
-msgid "Medial pentagonal hexecontahedron"
+msgid "Small stellated dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:84
-msgid "Medial rhombic triacontahedron"
+msgid "Great dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:85
-msgid "Medial triambic icosahedron"
+msgid "Great dodecadodecahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:86
+msgid "Medial rhombic triacontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:87
-msgid "Octahemioctacron"
+msgid "Truncated great dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:88
-msgid "Octahemioctahedron"
+msgid "Small stellapentakisdodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:89
-msgid "Pentagonal antiprism"
+msgid "Rhombidodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:90
-msgid "Pentagonal deltohedron"
+msgid "Medial deltoidal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:91
-msgid "Pentagonal dipyramid"
+msgid "Small rhombidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:92
-msgid "Pentagonal hexecontahedron"
+msgid "Small rhombidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:93
-msgid "Pentagonal icositetrahedron"
+msgid "Snub dodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:94
-msgid "Pentagonal prism"
+msgid "Medial pentagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:95
-msgid "Pentagrammic antiprism"
+msgid "Ditrigonal dodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:96
-msgid "Pentagrammic concave deltohedron"
+msgid "Medial triambic icosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:97
-msgid "Pentagrammic crossed antiprism"
+msgid "Great ditrigonal dodecicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:98
-msgid "Pentagrammic deltohedron"
+msgid "Great ditrigonal dodecacronic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:99
-msgid "Pentagrammic dipyramid"
+msgid "Small ditrigonal dodecicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:100
-msgid "Pentagrammic prism"
+msgid "Small ditrigonal dodecacronic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:101
-msgid "Pentakisdodecahedron"
+msgid "Icosidodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:102
-msgid "Polyhedra"
+msgid "Medial icosacronic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:103
-msgid "Rhombic dodecahedron"
+msgid "Icositruncated dodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:104
-msgid "Rhombic triacontahedron"
+msgid "Tridyakisicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:105
-msgid "Rhombicosacron"
+msgid "Snub icosidodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:106
-msgid "Rhombicosahedron"
+msgid "Medial hexagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:107
-msgid "Rhombicosidodecahedron"
+msgid "Great ditrigonal icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:108
-msgid "Rhombicuboctahedron"
+msgid "Great triambic icosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:109
-msgid "Rhombidodecadodecahedron"
+msgid "Great icosicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:110
-msgid "Show description"
+msgid "Great icosacronic hexecontahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:111
+msgid "Small icosihemidodecahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:112
+msgid "Small icosihemidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:113
-msgid "Small cubicuboctahedron"
+msgid "Small dodecicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:114
-msgid "Small ditrigonal dodecacronic hexecontahedron"
+msgid "Small dodecicosacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:115
-msgid "Small ditrigonal dodecicosidodecahedron"
+msgid "Small dodecahemidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:116
-msgid "Small ditrigonal icosidodecahedron"
+msgid "Small dodecahemidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:117
-msgid "Small dodecacronic hexecontahedron"
+msgid "Great stellated dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:118
-msgid "Small dodecahemicosacron"
+msgid "Great icosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:119
-msgid "Small dodecahemicosahedron"
+msgid "Great icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:120
-msgid "Small dodecahemidodecacron"
+msgid "Great rhombic triacontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:121
-msgid "Small dodecahemidodecahedron"
+msgid "Great truncated icosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:122
-msgid "Small dodecicosacron"
+msgid "Great stellapentakisdodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:123
-msgid "Small dodecicosahedron"
+msgid "Rhombicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:124
-msgid "Small dodecicosidodecahedron"
+msgid "Rhombicosacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:125
-msgid "Small hexacronic icositetrahedron"
+msgid "Great snub icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:126
-msgid "Small hexagonal hexecontahedron"
+msgid "Great pentagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:127
-msgid "Small hexagrammic hexecontahedron"
+msgid "Small stellated truncated dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:128
-msgid "Small icosacronic hexecontahedron"
+msgid "Great pentakisdodekahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:129
-msgid "Small icosicosidodecahedron"
+msgid "Truncated dodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:130
-msgid "Small icosihemidodecacron"
+msgid "Medial disdyakistriacontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:131
-msgid "Small icosihemidodecahedron"
+msgid "Inverted snub dodecadodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:132
-msgid "Small retrosnub icosicosidodecahedron"
+msgid "Medial inverted pentagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:133
-msgid "Small rhombidodecacron"
+msgid "Great dodecicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:134
-msgid "Small rhombidodecahedron"
+msgid "Great dodecacronic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:135
-msgid "Small rhombihexacron"
+msgid "Small dodecahemicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:136
-msgid "Small rhombihexahedron"
+msgid "Small dodecahemicosacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:137
-msgid "Small snub icosicosidodecahedron"
+msgid "Great dodecicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:138
-msgid "Small stellapentakisdodecahedron"
+msgid "Great dodecicosacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:139
-msgid "Small stellated dodecahedron"
+msgid "Great snub dodecicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:140
-msgid "Small stellated truncated dodecahedron"
+msgid "Great hexagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:141
-msgid "Small triambic icosahedron"
+msgid "Great dodecahemicosahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:142
-msgid "Snub cube"
+msgid "Great dodecahemicosacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:143
-msgid "Snub dodecadodecahedron"
+msgid "Great stellated truncated dodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:144
-msgid "Snub dodecahedron"
+msgid "Great triakisicosahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:145
+msgid "Great rhombicosidodecahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:146
+msgid "Great deltoidal hexecontahedron"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:145
-msgid "Snub icosidodecadodecahedron"
+#: ../hacks/config/polyhedra.xml.h:147
+msgid "Great truncated icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:148
-msgid "Stellated truncated hexahedron"
+msgid "Great disdyakistriacontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:149
-msgid "Tetradyakishexahedron"
+msgid "Great inverted snub icosidodecahedron"
+msgstr ""
+
+#: ../hacks/config/polyhedra.xml.h:150
+msgid "Great inverted pentagonal hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:151
-msgid "Tetrahemihexacron"
+msgid "Great dodecahemidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:152
-msgid "Tetrahemihexahedron"
+msgid "Great dodecahemidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:153
-msgid "Tetrakishexahedron"
+msgid "Great icosihemidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:154
-msgid "Triakisicosahedron"
+msgid "Great icosihemidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:155
-msgid "Triakisoctahedron"
+msgid "Small retrosnub icosicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:156
-msgid "Triakistetrahedron"
+msgid "Small hexagrammic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:157
-msgid "Tridyakisicosahedron"
+msgid "Great rhombidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:158
-msgid "Truncated cube"
+msgid "Great rhombidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:159
-msgid "Truncated cuboctahedron"
+msgid "Great retrosnub icosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:160
-msgid "Truncated dodecadodecahedron"
+msgid "Great pentagrammic hexecontahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:161
-msgid "Truncated dodecahedron"
+msgid "Great dirhombicosidodecahedron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:162
-msgid "Truncated great dodecahedron"
+msgid "Great dirhombicosidodecacron"
 msgstr ""
 
 #: ../hacks/config/polyhedra.xml.h:163
-msgid "Truncated icosahedron"
-msgstr ""
-
-#: ../hacks/config/polyhedra.xml.h:164
-msgid "Truncated icosidodecahedron"
+msgid "Utah teapotahedron"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:165
-msgid "Truncated octahedron"
+#: ../hacks/config/polyhedra.xml.h:167
+msgid "Show description"
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:166
-msgid "Truncated tetrahedron"
+#: ../hacks/config/polyhedra.xml.h:169
+msgid ""
+"Displays different 3D solids and some information about each. A new solid is "
+"chosen every few seconds. There are 75 uniform polyhedra, plus 5 infinite "
+"sets of prisms and antiprisms; including their duals brings the total to "
+"160. http://en.wikipedia.org/wiki/Uniform_polyhedra "
+"http://en.wikipedia.org/wiki/Stellation Written by Dr. Zvi Har'El and Jamie "
+"Zawinski; 2004."
 msgstr ""
 
-#: ../hacks/config/polyhedra.xml.h:167
-msgid "Utah teapotahedron"
+#: ../hacks/config/polyominoes.xml.h:1
+msgid "Polyominoes"
 msgstr ""
 
-#: ../hacks/config/polyominoes.xml.h:4
+#: ../hacks/config/polyominoes.xml.h:2
 msgid "Identical pieces"
 msgstr ""
 
-#: ../hacks/config/polyominoes.xml.h:9
-msgid "Polyominoes"
-msgstr ""
-
-#: ../hacks/config/polyominoes.xml.h:10
+#: ../hacks/config/polyominoes.xml.h:13
 msgid ""
 "Repeatedly attempts to completely fill a rectangle with irregularly-shaped "
 "puzzle pieces. http://en.wikipedia.org/wiki/Polyomino Written by Stephen "
 "Montgomery-Smith; 2002."
 msgstr ""
 
-#: ../hacks/config/polytopes.xml.h:2
-msgid "120-cell"
-msgstr ""
-
-#: ../hacks/config/polytopes.xml.h:3
-msgid "16-cell (hyper-octahedron)"
-msgstr ""
-
-#: ../hacks/config/polytopes.xml.h:4
-msgid "24-cell"
+#: ../hacks/config/polytopes.xml.h:1
+msgid "Polytopes"
 msgstr ""
 
 #: ../hacks/config/polytopes.xml.h:6
@@ -7465,26 +7601,34 @@
 msgstr ""
 
 #: ../hacks/config/polytopes.xml.h:7
-msgid "600-cell"
+msgid "8-cell (hypercube / tesseract)"
 msgstr ""
 
 #: ../hacks/config/polytopes.xml.h:8
-msgid "8-cell (hypercube / tesseract)"
+msgid "16-cell (hyper-octahedron)"
 msgstr ""
 
 #: ../hacks/config/polytopes.xml.h:9
-msgid "Colors By 4D Depth"
+msgid "24-cell"
 msgstr ""
 
-#: ../hacks/config/polytopes.xml.h:17
-msgid "Polytopes"
+#: ../hacks/config/polytopes.xml.h:10
+msgid "120-cell"
 msgstr ""
 
-#: ../hacks/config/polytopes.xml.h:20
+#: ../hacks/config/polytopes.xml.h:11
+msgid "600-cell"
+msgstr ""
+
+#: ../hacks/config/polytopes.xml.h:12
 msgid "Single color"
 msgstr ""
 
-#: ../hacks/config/polytopes.xml.h:22
+#: ../hacks/config/polytopes.xml.h:13
+msgid "Colors By 4D Depth"
+msgstr ""
+
+#: ../hacks/config/polytopes.xml.h:30
 msgid ""
 "This shows one of the six regular 4D polytopes rotating in 4D. Inspired by "
 "H.S.M Coxeter's book \"Regular Polytopes\", 3rd Edition, Dover Publications, "
@@ -7496,27 +7640,27 @@
 msgstr ""
 
 #: ../hacks/config/pong.xml.h:1
-msgid "Clock mode"
-msgstr ""
-
-#: ../hacks/config/pong.xml.h:2
-msgid "Crisp"
+msgid "Pong"
 msgstr ""
 
-#: ../hacks/config/pong.xml.h:4
+#: ../hacks/config/pong.xml.h:3
 msgid "Game speed"
 msgstr ""
 
 #: ../hacks/config/pong.xml.h:5
-msgid "Noise"
+msgid "Crisp"
 msgstr ""
 
 #: ../hacks/config/pong.xml.h:6
-msgid "Noisy"
+msgid "Noise"
 msgstr ""
 
 #: ../hacks/config/pong.xml.h:7
-msgid "Pong"
+msgid "Noisy"
+msgstr ""
+
+#: ../hacks/config/pong.xml.h:8
+msgid "Clock mode"
 msgstr ""
 
 #: ../hacks/config/pong.xml.h:10
@@ -7527,32 +7671,24 @@
 "English and Trevor Blackwell; 2003."
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:2
-msgid "Dark blue"
-msgstr ""
-
-#: ../hacks/config/popsquares.xml.h:3
-msgid "Dark cyan"
-msgstr ""
-
-#: ../hacks/config/popsquares.xml.h:4
-msgid "Dark green"
+#: ../hacks/config/popsquares.xml.h:1
+msgid "PopSquares"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:5
-msgid "Dark magenta"
+msgid "Subdivision"
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:6
-msgid "Dark red"
+#: ../hacks/config/popsquares.xml.h:8
+msgid "Light red"
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:7
-msgid "Dark yellow"
+#: ../hacks/config/popsquares.xml.h:9
+msgid "Light yellow"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:10
-msgid "Light blue"
+msgid "Light green"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:11
@@ -7560,7 +7696,7 @@
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:12
-msgid "Light green"
+msgid "Light blue"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:13
@@ -7568,159 +7704,167 @@
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:14
-msgid "Light red"
+msgid "Dark red"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:15
-msgid "Light yellow"
+msgid "Dark yellow"
+msgstr ""
+
+#: ../hacks/config/popsquares.xml.h:16
+msgid "Dark green"
+msgstr ""
+
+#: ../hacks/config/popsquares.xml.h:17
+msgid "Dark cyan"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:18
-msgid "PopSquares"
+msgid "Dark blue"
+msgstr ""
+
+#: ../hacks/config/popsquares.xml.h:19
+msgid "Dark magenta"
 msgstr ""
 
 #: ../hacks/config/popsquares.xml.h:20
-msgid "Subdivision"
+msgid "Twitch"
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:21
+#: ../hacks/config/popsquares.xml.h:22
 msgid ""
 "This draws a pop-art-ish looking grid of pulsing colors. Written by Levi "
 "Burton; 2003."
 msgstr ""
 
-#: ../hacks/config/popsquares.xml.h:22
-msgid "Twitch"
+#: ../hacks/config/providence.xml.h:1
+msgid "Providence"
 msgstr ""
 
-#: ../hacks/config/providence.xml.h:1
+#: ../hacks/config/providence.xml.h:5
+msgid "Draw eye"
+msgstr ""
+
+#: ../hacks/config/providence.xml.h:8
 msgid ""
 "\"A pyramid unfinished. In the zenith an eye in a triangle, surrounded by a "
 "glory, proper.\" http://en.wikipedia.org/wiki/Eye_of_Providence Written by "
 "Blair Tennessy; 2004."
 msgstr ""
 
-#: ../hacks/config/providence.xml.h:2
-msgid "Draw eye"
+#: ../hacks/config/pulsar.xml.h:1
+msgid "Pulsar"
 msgstr ""
 
-#: ../hacks/config/providence.xml.h:6
-msgid "Providence"
+#: ../hacks/config/pulsar.xml.h:5
+msgid "Quad count"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:1
-msgid "Anti-alias lines"
+#: ../hacks/config/pulsar.xml.h:8
+msgid "Enable texturing"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:2
-msgid ""
-"Draws some intersecting planes, making use of alpha blending, fog, textures, "
-"and mipmaps. Written by David Konerding; 1999."
+#: ../hacks/config/pulsar.xml.h:9
+msgid "Enable texture mipmaps"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:3
+#: ../hacks/config/pulsar.xml.h:10
 msgid "Enable blending"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:4
-msgid "Enable depth buffer"
+#: ../hacks/config/pulsar.xml.h:11
+msgid "Anti-alias lines"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:7
+#: ../hacks/config/pulsar.xml.h:12
 msgid "Enable texture filtering"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:8
-msgid "Enable texture mipmaps"
-msgstr ""
-
-#: ../hacks/config/pulsar.xml.h:9
-msgid "Enable texturing"
-msgstr ""
-
 #: ../hacks/config/pulsar.xml.h:13
-msgid "Pulsar"
+msgid "Enable depth buffer"
 msgstr ""
 
-#: ../hacks/config/pulsar.xml.h:14
-msgid "Quad count"
+#: ../hacks/config/pulsar.xml.h:15
+msgid ""
+"Draws some intersecting planes, making use of alpha blending, fog, textures, "
+"and mipmaps. Written by David Konerding; 1999."
 msgstr ""
 
-#: ../hacks/config/pyro.xml.h:2
-msgid ""
-"Exploding fireworks. See also the \"Fireworkx\", \"Eruption\", and "
-"\"XFlame\" screen savers. Written by Jamie Zawinski; 1992."
+#: ../hacks/config/pyro.xml.h:1
+msgid "Pyro"
 msgstr ""
 
-#: ../hacks/config/pyro.xml.h:3
-msgid "Explosive yield"
+#: ../hacks/config/pyro.xml.h:6
+msgid "Particle density"
 msgstr ""
 
-#: ../hacks/config/pyro.xml.h:7
+#: ../hacks/config/pyro.xml.h:9
 msgid "Launch frequency"
 msgstr ""
 
-#: ../hacks/config/pyro.xml.h:10
-msgid "Particle density"
+#: ../hacks/config/pyro.xml.h:12
+msgid "Explosive yield"
 msgstr ""
 
-#: ../hacks/config/pyro.xml.h:11
-msgid "Pyro"
+#: ../hacks/config/pyro.xml.h:15
+msgid ""
+"Exploding fireworks. See also the \"Fireworkx\", \"Eruption\", and "
+"\"XFlame\" screen savers. Written by Jamie Zawinski; 1992."
 msgstr ""
 
 #: ../hacks/config/qix.xml.h:1
-msgid "Additive colors"
+msgid "Qix"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:2
-msgid ""
-"Bounces a series of line segments around the screen, and uses variations on "
-"this basic motion pattern to produce all sorts of different presentations: "
-"line segments, filled polygons, and overlapping translucent areas. "
-"http://en.wikipedia.org/wiki/Qix Written by Jamie Zawinski; 1992."
+#: ../hacks/config/qix.xml.h:12
+msgid "Line segments"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:11
-msgid "Line segments"
+#: ../hacks/config/qix.xml.h:13
+msgid "Solid objects"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:12
+#: ../hacks/config/qix.xml.h:14
 msgid "Linear motion"
 msgstr ""
 
 #: ../hacks/config/qix.xml.h:15
-msgid "Max size"
+msgid "Random motion"
 msgstr ""
 
 #: ../hacks/config/qix.xml.h:16
-msgid "Poly corners"
+msgid "Additive colors"
 msgstr ""
 
 #: ../hacks/config/qix.xml.h:17
-msgid "Qix"
+msgid "Subtractive colors"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:18
-msgid "Random motion"
+#: ../hacks/config/qix.xml.h:19
+msgid "Max size"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:21
-msgid "Solid objects"
+#: ../hacks/config/qix.xml.h:20
+msgid "Poly corners"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:23
-msgid "Subtractive colors"
+#: ../hacks/config/qix.xml.h:21 ../hacks/config/webcollage.xml.h:8
+msgid "Transparent"
 msgstr ""
 
-#: ../hacks/config/qix.xml.h:24 ../hacks/config/webcollage.xml.h:17
-msgid "Transparent"
+#: ../hacks/config/qix.xml.h:25
+msgid ""
+"Bounces a series of line segments around the screen, and uses variations on "
+"this basic motion pattern to produce all sorts of different presentations: "
+"line segments, filled polygons, and overlapping translucent areas. "
+"http://en.wikipedia.org/wiki/Qix Written by Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/queens.xml.h:4
+#: ../hacks/config/queens.xml.h:1
 msgid "Queens"
 msgstr ""
 
-#: ../hacks/config/queens.xml.h:6
+#: ../hacks/config/queens.xml.h:7
 msgid ""
 "Solves the N-Queens problem (where N is between 5 and 10 queens). The "
 "problem is: how may one place N queens on an NxN chessboard such that no "
@@ -7729,99 +7873,99 @@
 "2002."
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:2 ../hacks/config/rdbomb.xml.h:2
-#, no-c-format
-msgid "1%"
-msgstr "1 %"
+#: ../hacks/config/rd-bomb.xml.h:1 ../hacks/config/rdbomb.xml.h:1
+msgid "RDbomb"
+msgstr ""
 
 #: ../hacks/config/rd-bomb.xml.h:5 ../hacks/config/rdbomb.xml.h:5
-msgid "Diffusion"
+#: ../hacks/config/voronoi.xml.h:12
+msgid "Wander speed"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:6 ../hacks/config/rdbomb.xml.h:6
-msgid ""
-"Draws a grid of growing square-like shapes that, once they overtake each "
-"other, react in unpredictable ways. \"RD\" stands for reaction-diffusion. "
-"Written by Scott Draves; 1997."
+#: ../hacks/config/rd-bomb.xml.h:7 ../hacks/config/rdbomb.xml.h:7
+#, no-c-format
+msgid "1%"
+msgstr "1 %"
+
+#: ../hacks/config/rd-bomb.xml.h:8 ../hacks/config/rdbomb.xml.h:8
+msgid "Fill screen"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:7 ../hacks/config/rdbomb.xml.h:7
+#: ../hacks/config/rd-bomb.xml.h:12 ../hacks/config/rdbomb.xml.h:12
 msgid "Epoch"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:9 ../hacks/config/rdbomb.xml.h:9
-msgid "Fill screen"
+#: ../hacks/config/rd-bomb.xml.h:17 ../hacks/config/rdbomb.xml.h:17
+msgid "X tile size"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:14 ../hacks/config/rdbomb.xml.h:14
-msgid "RDbomb"
+#: ../hacks/config/rd-bomb.xml.h:18 ../hacks/config/rdbomb.xml.h:18
+msgid "Y tile size"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:15 ../hacks/config/rdbomb.xml.h:15
+#: ../hacks/config/rd-bomb.xml.h:19 ../hacks/config/rdbomb.xml.h:19
 msgid "Reaction"
 msgstr ""
 
-#. #### default is wrong
-#: ../hacks/config/rd-bomb.xml.h:17 ../hacks/config/rdbomb.xml.h:17
-msgid "Seed radius"
+#: ../hacks/config/rd-bomb.xml.h:20 ../hacks/config/rdbomb.xml.h:20
+msgid "Diffusion"
 msgstr ""
 
+#. #### default is wrong
 #: ../hacks/config/rd-bomb.xml.h:22 ../hacks/config/rdbomb.xml.h:22
-#: ../hacks/config/voronoi.xml.h:15
-msgid "Wander speed"
+msgid "Seed radius"
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:23 ../hacks/config/rdbomb.xml.h:23
-msgid "X tile size"
+#: ../hacks/config/rd-bomb.xml.h:24 ../hacks/config/rdbomb.xml.h:24
+msgid ""
+"Draws a grid of growing square-like shapes that, once they overtake each "
+"other, react in unpredictable ways. \"RD\" stands for reaction-diffusion. "
+"Written by Scott Draves; 1997."
 msgstr ""
 
-#: ../hacks/config/rd-bomb.xml.h:24 ../hacks/config/rdbomb.xml.h:24
-msgid "Y tile size"
+#: ../hacks/config/ripples.xml.h:1
+msgid "Ripples"
 msgstr ""
 
-#: ../hacks/config/ripples.xml.h:3
-msgid "Big drops"
+#: ../hacks/config/ripples.xml.h:8
+msgid "Drizzle"
 msgstr ""
 
-#: ../hacks/config/ripples.xml.h:4
+#: ../hacks/config/ripples.xml.h:9
 msgid "Drippiness"
 msgstr ""
 
-#: ../hacks/config/ripples.xml.h:5
-msgid "Drizzle"
-msgstr ""
-
-#: ../hacks/config/ripples.xml.h:7
-msgid "Fluidity"
-msgstr ""
+#: ../hacks/config/ripples.xml.h:10
+msgid "Storm"
+msgstr "Búrka"
 
-#: ../hacks/config/ripples.xml.h:9
-msgid "Grayscale"
+#: ../hacks/config/ripples.xml.h:11
+msgid "Small drops"
 msgstr ""
 
 #: ../hacks/config/ripples.xml.h:12
-msgid "Magic lighting effect"
+msgid "Fluidity"
 msgstr ""
 
 #: ../hacks/config/ripples.xml.h:13
-msgid "Moving splashes"
+msgid "Big drops"
 msgstr ""
 
 #: ../hacks/config/ripples.xml.h:14
-msgid "Psychedelic colors"
+msgid "Moving splashes"
 msgstr ""
 
 #: ../hacks/config/ripples.xml.h:15
-msgid "Ripples"
+msgid "Psychedelic colors"
 msgstr ""
 
-#: ../hacks/config/ripples.xml.h:17
-msgid "Small drops"
+#: ../hacks/config/ripples.xml.h:16
+msgid "Grayscale"
 msgstr ""
 
-#: ../hacks/config/ripples.xml.h:18
-msgid "Storm"
-msgstr "Búrka"
+#: ../hacks/config/ripples.xml.h:17
+msgid "Magic lighting effect"
+msgstr ""
 
 #: ../hacks/config/ripples.xml.h:19
 msgid ""
@@ -7829,29 +7973,37 @@
 "the desktop or an image. Written by Tom Hammersley; 1999."
 msgstr ""
 
-#: ../hacks/config/rocks.xml.h:10
+#: ../hacks/config/rocks.xml.h:1
 msgid "Rocks"
 msgstr "Skaly"
 
-#: ../hacks/config/rocks.xml.h:15
+#: ../hacks/config/rocks.xml.h:9
+msgid "Velocity"
+msgstr ""
+
+#: ../hacks/config/rocks.xml.h:12
 msgid "Steering"
 msgstr ""
 
-#: ../hacks/config/rocks.xml.h:16
+#: ../hacks/config/rocks.xml.h:18
 msgid ""
 "This draws an animation of flight through an asteroid field, with changes in "
 "rotation and direction. Written by Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/rocks.xml.h:18
-msgid "Velocity"
+#: ../hacks/config/rorschach.xml.h:1
+msgid "Rorschach"
+msgstr ""
+
+#: ../hacks/config/rorschach.xml.h:6
+msgid "With X symmetry"
 msgstr ""
 
 #: ../hacks/config/rorschach.xml.h:7
-msgid "Rorschach"
+msgid "With Y symmetry"
 msgstr ""
 
-#: ../hacks/config/rorschach.xml.h:10
+#: ../hacks/config/rorschach.xml.h:12
 msgid ""
 "This generates random inkblot patterns via a reflected random walk. Any deep-"
 "seated neurotic tendencies which this program reveals are your own problem. "
@@ -7859,61 +8011,61 @@
 "http://en.wikipedia.org/wiki/Random_walk Written by Jamie Zawinski; 1992."
 msgstr ""
 
-#: ../hacks/config/rorschach.xml.h:11
-msgid "With X symmetry"
-msgstr ""
-
-#: ../hacks/config/rorschach.xml.h:12
-msgid "With Y symmetry"
-msgstr ""
+#: ../hacks/config/rotor.xml.h:1
+msgid "Rotor"
+msgstr "Rotor"
 
-#: ../hacks/config/rotor.xml.h:4 ../hacks/config/skytentacles.xml.h:9
-#: ../hacks/config/wander.xml.h:8
+#: ../hacks/config/rotor.xml.h:6 ../hacks/config/skytentacles.xml.h:6
+#: ../hacks/config/wander.xml.h:9
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../hacks/config/rotor.xml.h:9
-msgid "Rotor"
-msgstr "Rotor"
-
-#: ../hacks/config/rotor.xml.h:13
+#: ../hacks/config/rotor.xml.h:14
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws a line segment moving along a complex spiraling curve. "
 "Written by Tom Lawrence; 1997."
 msgstr ""
 
-#: ../hacks/config/rotzoomer.xml.h:3
-msgid "Animate"
+#: ../hacks/config/rotzoomer.xml.h:1
+msgid "RotZoomer"
 msgstr ""
 
-#: ../hacks/config/rotzoomer.xml.h:4
-msgid ""
-"Creates a collage of rotated and scaled portions of the screen. Written by "
-"Claudio Matsuoka; 2001."
+#: ../hacks/config/rotzoomer.xml.h:8
+msgid "Rectangle count"
 msgstr ""
 
 #: ../hacks/config/rotzoomer.xml.h:9
-msgid "Rectangle count"
+msgid "Stationary rectangles"
 msgstr ""
 
 #: ../hacks/config/rotzoomer.xml.h:10
-msgid "RotZoomer"
+msgid "Wandering rectangles"
 msgstr ""
 
-#: ../hacks/config/rotzoomer.xml.h:12
-msgid "Stationary rectangles"
+#: ../hacks/config/rotzoomer.xml.h:11
+msgid "Sweeping arcs"
 msgstr ""
 
-#: ../hacks/config/rotzoomer.xml.h:13
-msgid "Sweeping arcs"
+#: ../hacks/config/rotzoomer.xml.h:12
+msgid "Animate"
 msgstr ""
 
 #: ../hacks/config/rotzoomer.xml.h:14
-msgid "Wandering rectangles"
+msgid ""
+"Creates a collage of rotated and scaled portions of the screen. Written by "
+"Claudio Matsuoka; 2001."
+msgstr ""
+
+#: ../hacks/config/rubik.xml.h:1
+msgid "Rubik"
+msgstr "Rubik"
+
+#: ../hacks/config/rubik.xml.h:10
+msgid "Hide shuffling"
 msgstr ""
 
-#: ../hacks/config/rubik.xml.h:3
+#: ../hacks/config/rubik.xml.h:13
 #, no-c-format
 msgid ""
 "Draws a Rubik's Cube that rotates in three dimensions and repeatedly "
@@ -7922,15 +8074,11 @@
 "Vianna; 1997."
 msgstr ""
 
-#: ../hacks/config/rubik.xml.h:6
-msgid "Hide shuffling"
+#: ../hacks/config/rubikblocks.xml.h:1
+msgid "RubikBlocks"
 msgstr ""
 
-#: ../hacks/config/rubik.xml.h:10
-msgid "Rubik"
-msgstr "Rubik"
-
-#: ../hacks/config/rubikblocks.xml.h:1
+#: ../hacks/config/rubikblocks.xml.h:21
 msgid ""
 "Animates the Rubik's Mirror Blocks puzzle. See also the \"Rubik\", "
 "\"Cube21\", and \"GLSnake\" screen savers. "
@@ -7938,52 +8086,48 @@
 "by Vasek Potocek; 2009."
 msgstr ""
 
-#: ../hacks/config/rubikblocks.xml.h:12
-msgid "RubikBlocks"
-msgstr ""
-
-#: ../hacks/config/sballs.xml.h:3
-msgid ""
-"Draws an animation of textured balls spinning like crazy. Written by Eric "
-"Lassauge; 2002."
+#: ../hacks/config/sballs.xml.h:1
+msgid "SBalls"
 msgstr ""
 
-#: ../hacks/config/sballs.xml.h:9
+#: ../hacks/config/sballs.xml.h:11
 msgid "Plane"
 msgstr ""
 
-#: ../hacks/config/sballs.xml.h:10
+#: ../hacks/config/sballs.xml.h:12
 msgid "Pyramid"
 msgstr "Pyramída"
 
-#: ../hacks/config/sballs.xml.h:12
-msgid "SBalls"
-msgstr ""
-
-#: ../hacks/config/sballs.xml.h:14
+#: ../hacks/config/sballs.xml.h:13
 msgid "Star"
 msgstr "Hviezda"
 
-#: ../hacks/config/shadebobs.xml.h:12
+#: ../hacks/config/sballs.xml.h:17
+msgid ""
+"Draws an animation of textured balls spinning like crazy. Written by Eric "
+"Lassauge; 2002."
+msgstr ""
+
+#: ../hacks/config/shadebobs.xml.h:1
 msgid "ShadeBobs"
 msgstr ""
 
-#: ../hacks/config/shadebobs.xml.h:15
+#: ../hacks/config/shadebobs.xml.h:17
 msgid ""
 "This draws smoothly-shaded oscillating oval patterns that look something "
 "like vapor trails or neon tubes. Written by Shane Smit; 1999."
 msgstr ""
 
-#: ../hacks/config/sierpinski.xml.h:8 ../hacks/config/surfaces.xml.h:17
-#: ../hacks/config/thornbird.xml.h:7 ../hacks/config/voronoi.xml.h:11
-msgid "Points"
-msgstr "Body"
-
-#: ../hacks/config/sierpinski.xml.h:10
+#: ../hacks/config/sierpinski.xml.h:1
 msgid "Sierpinski"
 msgstr ""
 
-#: ../hacks/config/sierpinski.xml.h:12
+#: ../hacks/config/sierpinski.xml.h:6 ../hacks/config/surfaces.xml.h:22
+#: ../hacks/config/thornbird.xml.h:6 ../hacks/config/voronoi.xml.h:6
+msgid "Points"
+msgstr "Body"
+
+#: ../hacks/config/sierpinski.xml.h:14
 msgid ""
 "This draws the two-dimensional variant of the recursive Sierpinski triangle "
 "fractal. See also the \"Sierpinski3D\" screen saver. "
@@ -7991,11 +8135,11 @@
 "Daignault; 1997."
 msgstr ""
 
-#: ../hacks/config/sierpinski3d.xml.h:9
+#: ../hacks/config/sierpinski3d.xml.h:1
 msgid "Sierpinski3D"
 msgstr ""
 
-#: ../hacks/config/sierpinski3d.xml.h:10
+#: ../hacks/config/sierpinski3d.xml.h:11
 msgid ""
 "This draws the Sierpinski tetrahedron fractal, the three-dimensional variant "
 "of the recursive Sierpinski triangle. "
@@ -8003,58 +8147,58 @@
 "Written by Jamie Zawinski and Tim Robinson; 1999."
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:3
-msgid "Cartoony"
-msgstr ""
-
-#: ../hacks/config/skytentacles.xml.h:4
-msgid "Draw skin"
+#: ../hacks/config/skytentacles.xml.h:1
+msgid "SkyTentacles"
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:6
+#: ../hacks/config/skytentacles.xml.h:12
 msgid "Flexibility"
 msgstr ""
 
 #: ../hacks/config/skytentacles.xml.h:14
-msgid "SkyTentacles"
+msgid "Wiggliness"
 msgstr ""
 
 #: ../hacks/config/skytentacles.xml.h:19
-msgid "Tentacles can intersect"
+msgid "X resolution"
 msgstr ""
 
 #: ../hacks/config/skytentacles.xml.h:20
-msgid ""
-"There is a tentacled abomination in the sky. From above you it devours. "
-"Written by Jamie Zawinski; 2008."
+msgid "Y resolution"
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:24
-msgid "Wiggliness"
+#: ../hacks/config/skytentacles.xml.h:21
+msgid "Draw skin"
 msgstr ""
 
-#: ../hacks/config/skytentacles.xml.h:25
-msgid "X resolution"
+#: ../hacks/config/skytentacles.xml.h:22
+msgid "Cartoony"
+msgstr ""
+
+#: ../hacks/config/skytentacles.xml.h:23
+msgid "Tentacles can intersect"
 msgstr ""
 
 #: ../hacks/config/skytentacles.xml.h:26
-msgid "Y resolution"
+msgid ""
+"There is a tentacled abomination in the sky. From above you it devours. "
+"Written by Jamie Zawinski; 2008."
 msgstr ""
 
-#: ../hacks/config/slidescreen.xml.h:7
-msgid "Gutter size"
+#: ../hacks/config/slidescreen.xml.h:1
+msgid "SlideScreen"
 msgstr ""
 
-#: ../hacks/config/slidescreen.xml.h:12
+#: ../hacks/config/slidescreen.xml.h:6
 msgid "Pause"
 msgstr ""
 
-#: ../hacks/config/slidescreen.xml.h:15
+#: ../hacks/config/slidescreen.xml.h:12
 msgid "Slide speed"
 msgstr ""
 
-#: ../hacks/config/slidescreen.xml.h:16
-msgid "SlideScreen"
+#: ../hacks/config/slidescreen.xml.h:17
+msgid "Gutter size"
 msgstr ""
 
 #: ../hacks/config/slidescreen.xml.h:19
@@ -8065,11 +8209,11 @@
 "http://en.wikipedia.org/wiki/Fifteen_puzzle Written by Jamie Zawinski; 1994."
 msgstr ""
 
-#: ../hacks/config/slip.xml.h:10
+#: ../hacks/config/slip.xml.h:1
 msgid "Slip"
 msgstr ""
 
-#: ../hacks/config/slip.xml.h:12
+#: ../hacks/config/slip.xml.h:14
 msgid ""
 "This throws some random bits on the screen, then sucks them through a jet "
 "engine and spews them out the other side. To avoid turning the image "
@@ -8079,59 +8223,47 @@
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:1
-msgid "A count"
+msgid "Sonar"
 msgstr ""
 
-#: ../hacks/config/sonar.xml.h:2
-msgid "B count"
+#: ../hacks/config/sonar.xml.h:8
+msgid "Ping subnet/24 (254 hosts)"
 msgstr ""
 
-#: ../hacks/config/sonar.xml.h:4
-msgid "Font size"
+#: ../hacks/config/sonar.xml.h:9
+msgid "Ping subnet/25 (126 hosts)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:10
-msgid "Ping known SSH hosts"
+msgid "Ping subnet/26 (62 hosts)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:11
-msgid "Ping subnet/24 (254 hosts)"
+msgid "Ping subnet/27 (31 hosts)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:12
-msgid "Ping subnet/25 (126 hosts)"
+msgid "Ping subnet/28 (14 hosts)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:13
-msgid "Ping subnet/26 (62 hosts)"
+msgid "Ping subnet/29 (6 hosts)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:14
-msgid "Ping subnet/27 (31 hosts)"
+msgid "Ping subnet/30 (2 hosts)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:15
-msgid "Ping subnet/28 (14 hosts)"
+msgid "Ping known SSH hosts"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:16
-msgid "Ping subnet/29 (6 hosts)"
-msgstr ""
-
-#: ../hacks/config/sonar.xml.h:17
-msgid "Ping subnet/30 (2 hosts)"
+msgid "Simulation (don't ping)"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:18
-msgid "Resolve host names"
-msgstr ""
-
-#: ../hacks/config/sonar.xml.h:21
-msgid "Show ping times"
-msgstr ""
-
-#: ../hacks/config/sonar.xml.h:22
-msgid "Simulation (don't ping)"
+msgid "Font size"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:23
@@ -8139,14 +8271,26 @@
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:24
+msgid "A count"
+msgstr ""
+
+#: ../hacks/config/sonar.xml.h:25
 msgid "Simulation team B name"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:26
-msgid "Sonar"
+msgid "B count"
+msgstr ""
+
+#: ../hacks/config/sonar.xml.h:27
+msgid "Resolve host names"
 msgstr ""
 
 #: ../hacks/config/sonar.xml.h:28
+msgid "Show ping times"
+msgstr ""
+
+#: ../hacks/config/sonar.xml.h:31
 msgid ""
 "This draws a sonar screen that pings (get it?) the hosts on your local "
 "network, and plots their distance (response time) from you. The three rings "
@@ -8158,64 +8302,64 @@
 msgstr ""
 
 #: ../hacks/config/speedmine.xml.h:1
-msgid "Allow wall collisions"
+msgid "SpeedMine"
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:2
-msgid "Display crosshair"
+#: ../hacks/config/speedmine.xml.h:6
+msgid "Max velocity"
 msgstr ""
 
 #: ../hacks/config/speedmine.xml.h:8
-msgid "Max velocity"
+msgid "Thrust"
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:9
-msgid "Present bonuses"
+#: ../hacks/config/speedmine.xml.h:10
+msgid "Tunnel"
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:10
+#: ../hacks/config/speedmine.xml.h:11 ../hacks/config/worm.xml.h:1
+msgid "Worm"
+msgstr "Červ"
+
+#: ../hacks/config/speedmine.xml.h:12
 msgid "Rocky walls"
 msgstr ""
 
-#. #### -psychedelic
 #: ../hacks/config/speedmine.xml.h:13
-msgid ""
-"Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written "
-"by Conrad Parker; 2001."
+msgid "Allow wall collisions"
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:15
-msgid "SpeedMine"
+#: ../hacks/config/speedmine.xml.h:14
+msgid "Present bonuses"
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:16
-msgid "Thrust"
+#: ../hacks/config/speedmine.xml.h:15
+msgid "Display crosshair"
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:17
-msgid "Tunnel"
+#. #### -psychedelic
+#: ../hacks/config/speedmine.xml.h:19
+msgid ""
+"Simulates speeding down a rocky mineshaft, or a funky dancing worm. Written "
+"by Conrad Parker; 2001."
 msgstr ""
 
-#: ../hacks/config/speedmine.xml.h:19 ../hacks/config/worm.xml.h:12
-msgid "Worm"
-msgstr "Červ"
-
-#: ../hacks/config/sphere.xml.h:8
+#: ../hacks/config/sphere.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws shaded spheres in multiple colors. Written by Tom Duff "
 "and Jamie Zawinski; 1982, 1997."
 msgstr ""
 
-#: ../hacks/config/spheremonics.xml.h:19
-msgid "Smoothed lines"
+#: ../hacks/config/spheremonics.xml.h:1
+msgid "Spheremonics"
 msgstr ""
 
-#: ../hacks/config/spheremonics.xml.h:20
-msgid "Spheremonics"
+#: ../hacks/config/spheremonics.xml.h:18
+msgid "Smoothed lines"
 msgstr ""
 
-#: ../hacks/config/spheremonics.xml.h:21
+#: ../hacks/config/spheremonics.xml.h:23
 msgid ""
 "These closed objects are commonly called spherical harmonics, although they "
 "are only remotely related to the mathematical definition found in the "
@@ -8225,100 +8369,100 @@
 "al_harmonics Written by Paul Bourke and Jamie Zawinski; 2002."
 msgstr ""
 
-#: ../hacks/config/spiral.xml.h:10
+#: ../hacks/config/spiral.xml.h:1
 msgid "Spiral"
 msgstr ""
 
-#: ../hacks/config/spiral.xml.h:11
+#: ../hacks/config/spiral.xml.h:12
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Moving circular moire patterns. Written by Peter "
 "Schmitzberger; 1997."
 msgstr ""
 
-#: ../hacks/config/spotlight.xml.h:3
-msgid ""
-"Draws a spotlight scanning across a black screen, illuminating the "
-"underlying desktop (or a picture) when it passes. Written by Rick Schultz "
-"and Jamie Zawinski; 1999."
+#: ../hacks/config/spotlight.xml.h:1
+msgid "Spotlight"
 msgstr ""
 
-#: ../hacks/config/spotlight.xml.h:11
-msgid "Spotlight"
+#: ../hacks/config/spotlight.xml.h:9
+msgid "Spotlight size"
 msgstr ""
 
 #: ../hacks/config/spotlight.xml.h:12
-msgid "Spotlight size"
+msgid ""
+"Draws a spotlight scanning across a black screen, illuminating the "
+"underlying desktop (or a picture) when it passes. Written by Rick Schultz "
+"and Jamie Zawinski; 1999."
 msgstr ""
 
 #: ../hacks/config/sproingies.xml.h:1
+msgid "Sproingies"
+msgstr ""
+
+#: ../hacks/config/sproingies.xml.h:7
 msgid "Fall off edge"
 msgstr ""
 
-#: ../hacks/config/sproingies.xml.h:9
+#: ../hacks/config/sproingies.xml.h:11
 #, no-c-format
 msgid ""
 "Slinky-like creatures walk down an infinite staircase and occasionally "
 "explode! http://en.wikipedia.org/wiki/Slinky "
-"http://en.wikipedia.org/wiki/Q%2Abert "
-"http://en.wikipedia.org/wiki/Marble_Madness Written by Ed Mackey; 1997."
-msgstr ""
-
-#: ../hacks/config/sproingies.xml.h:10
-msgid "Sproingies"
-msgstr ""
-
-#: ../hacks/config/squiral.xml.h:3
-msgid ""
-"Draws a set of interacting, square-spiral-producing automata. The spirals "
-"grow outward until they hit something, then they go around it. Written by "
-"Jeff Epler; 1999."
+"http://en.wikipedia.org/wiki/Q%2Abert "
+"http://en.wikipedia.org/wiki/Marble_Madness Written by Ed Mackey; 1997."
 msgstr ""
 
-#: ../hacks/config/squiral.xml.h:5
-msgid "Handedness"
+#: ../hacks/config/squiral.xml.h:1
+msgid "Squiral"
 msgstr ""
 
+#: ../hacks/config/squiral.xml.h:5 ../hacks/config/twang.xml.h:9
+msgid "Randomness"
+msgstr "Náhodne"
+
 #: ../hacks/config/squiral.xml.h:7
 msgid "Left"
 msgstr "Vľavo"
 
-#: ../hacks/config/squiral.xml.h:11 ../hacks/config/twang.xml.h:12
-msgid "Randomness"
-msgstr "Náhodne"
+#: ../hacks/config/squiral.xml.h:8
+msgid "Handedness"
+msgstr ""
 
-#: ../hacks/config/squiral.xml.h:12
+#: ../hacks/config/squiral.xml.h:9
 msgid "Right"
 msgstr "Vpravo"
 
-#: ../hacks/config/squiral.xml.h:17
-msgid "Squiral"
+#: ../hacks/config/squiral.xml.h:18
+msgid ""
+"Draws a set of interacting, square-spiral-producing automata. The spirals "
+"grow outward until they hit something, then they go around it. Written by "
+"Jeff Epler; 1999."
 msgstr ""
 
 #: ../hacks/config/stairs.xml.h:1
+msgid "Stairs"
+msgstr "Schody"
+
+#: ../hacks/config/stairs.xml.h:6
 msgid ""
 "Escher's infinite staircase. "
 "http://en.wikipedia.org/wiki/Maurits_Cornelis_Escher Written by Marcelo "
 "Vianna; 1998."
 msgstr ""
 
-#: ../hacks/config/stairs.xml.h:6
-msgid "Stairs"
-msgstr "Schody"
+#: ../hacks/config/starfish.xml.h:1
+msgid "Starfish"
+msgstr ""
 
 #: ../hacks/config/starfish.xml.h:3
 msgid "Color gradients"
 msgstr ""
 
-#: ../hacks/config/starfish.xml.h:11
+#: ../hacks/config/starfish.xml.h:4
 msgid "Pulsating blob"
 msgstr ""
 
-#: ../hacks/config/starfish.xml.h:14
-msgid "Starfish"
-msgstr ""
-
-#: ../hacks/config/starfish.xml.h:17
+#: ../hacks/config/starfish.xml.h:18
 msgid ""
 "This generates a sequence of undulating, throbbing, star-like patterns which "
 "pulsate, rotate, and turn inside out. Another display mode uses these shapes "
@@ -8327,86 +8471,86 @@
 msgstr ""
 
 #: ../hacks/config/starwars.xml.h:1
+msgid "StarWars"
+msgstr "Hviezdne vojny"
+
+#: ../hacks/config/starwars.xml.h:2
 msgid "  Frame rate      Low"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:2
-msgid " Stars speed     Slow"
+#: ../hacks/config/starwars.xml.h:4
+msgid "Scroll speed     Slow"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:3
-msgid "Anti-aliased lines"
+#: ../hacks/config/starwars.xml.h:6
+msgid " Stars speed     Slow"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:5
-msgid ""
-"Draws a stream of text slowly scrolling into the distance at an angle, over "
-"a star field, like at the beginning of the movie of the same name. "
-"http://en.wikipedia.org/wiki/Star_Wars_opening_crawl Written by Jamie "
-"Zawinski and Claudio Matauoka; 2001."
+#: ../hacks/config/starwars.xml.h:10
+msgid "Wrap long lines"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:6
-msgid "Fade out"
+#: ../hacks/config/starwars.xml.h:11
+msgid "Texture-mapped font"
 msgstr ""
 
 #: ../hacks/config/starwars.xml.h:12
-msgid "Scroll speed     Slow"
+msgid "Anti-aliased lines"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:14
-msgid "StarWars"
-msgstr "Hviezdne vojny"
-
-#: ../hacks/config/starwars.xml.h:16
-msgid "Texture-mapped font"
+#: ../hacks/config/starwars.xml.h:13
+msgid "Thick lines"
 msgstr ""
 
-#: ../hacks/config/starwars.xml.h:17
-msgid "Thick lines"
+#: ../hacks/config/starwars.xml.h:14
+msgid "Fade out"
 msgstr ""
 
 #: ../hacks/config/starwars.xml.h:18
-msgid "Wrap long lines"
+msgid "or, Text columns"
 msgstr ""
 
 #: ../hacks/config/starwars.xml.h:19
-msgid "or, Text columns"
+msgid ""
+"Draws a stream of text slowly scrolling into the distance at an angle, over "
+"a star field, like at the beginning of the movie of the same name. "
+"http://en.wikipedia.org/wiki/Star_Wars_opening_crawl Written by Jamie "
+"Zawinski and Claudio Matauoka; 2001."
 msgstr ""
 
 #: ../hacks/config/stonerview.xml.h:1
-msgid ""
-"Chains of colorful squares dance around each other in complex spiral "
-"patterns. Inspired by David Tristram's `electropaint' screen saver, "
-"originally written for SGI computers in the late 1980s or early 1990s. "
-"Written by Andrew Plotkin; 2001."
+msgid "StonerView"
 msgstr ""
 
 #: ../hacks/config/stonerview.xml.h:6
-msgid "StonerView"
+msgid "Translucent"
 msgstr ""
 
-#: ../hacks/config/stonerview.xml.h:7
-msgid "Translucent"
+#: ../hacks/config/stonerview.xml.h:8
+msgid ""
+"Chains of colorful squares dance around each other in complex spiral "
+"patterns. Inspired by David Tristram's `electropaint' screen saver, "
+"originally written for SGI computers in the late 1980s or early 1990s. "
+"Written by Andrew Plotkin; 2001."
 msgstr ""
 
 #: ../hacks/config/strange.xml.h:1
-msgid "100k"
+msgid "Strange"
 msgstr ""
 
-#: ../hacks/config/strange.xml.h:2
+#: ../hacks/config/strange.xml.h:5
 msgid "1k"
 msgstr ""
 
-#: ../hacks/config/strange.xml.h:8
+#: ../hacks/config/strange.xml.h:6
 msgid "Number of points"
 msgstr ""
 
-#: ../hacks/config/strange.xml.h:10
-msgid "Strange"
+#: ../hacks/config/strange.xml.h:7
+msgid "100k"
 msgstr ""
 
-#: ../hacks/config/strange.xml.h:11
+#: ../hacks/config/strange.xml.h:12
 msgid ""
 "This draws iterations to strange attractors: it's a colorful, unpredictably-"
 "animating swarm of dots that swoops and twists around. "
@@ -8414,111 +8558,115 @@
 "Massimino Pascal; 1997."
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:2
-#, no-c-format
-msgid "0%"
+#: ../hacks/config/substrate.xml.h:1
+msgid "Substrate"
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:5
-msgid "Circle percentage"
+#: ../hacks/config/substrate.xml.h:9
+msgid "Sand grains"
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:6
-msgid ""
-"Crystalline lines grow on a computational substrate. A simple perpendicular "
-"growth rule creates intricate city-like structures. Written by J. Tarbell "
-"and Mike Kershaw; 2004."
+#: ../hacks/config/substrate.xml.h:12
+#, no-c-format
+msgid "0%"
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:11
-msgid "Initial cracks"
+#: ../hacks/config/substrate.xml.h:13
+msgid "Circle percentage"
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:15
-msgid "Sand grains"
+#: ../hacks/config/substrate.xml.h:16
+msgid "Initial cracks"
 msgstr ""
 
-#: ../hacks/config/substrate.xml.h:18
-msgid "Substrate"
+#: ../hacks/config/substrate.xml.h:17
+msgid "Wireframe only"
 msgstr ""
 
 #: ../hacks/config/substrate.xml.h:19
-msgid "Wireframe only"
+msgid ""
+"Crystalline lines grow on a computational substrate. A simple perpendicular "
+"growth rule creates intricate city-like structures. Written by J. Tarbell "
+"and Mike Kershaw; 2004."
 msgstr ""
 
-#: ../hacks/config/superquadrics.xml.h:8
-msgid "Morphing 3D shapes. Written by Ed Mackey; 1987, 1997."
+#: ../hacks/config/superquadrics.xml.h:1
+msgid "Superquadrics"
 msgstr ""
 
-#: ../hacks/config/superquadrics.xml.h:12
+#: ../hacks/config/superquadrics.xml.h:6
 msgid "Spin speed"
 msgstr ""
 
-#: ../hacks/config/superquadrics.xml.h:13
-msgid "Superquadrics"
+#: ../hacks/config/superquadrics.xml.h:14
+msgid "Morphing 3D shapes. Written by Ed Mackey; 1987, 1997."
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:1
-msgid "Bohemian Dome"
-msgstr ""
-
-#: ../hacks/config/surfaces.xml.h:2
-msgid "Catalan's Surface"
+msgid "Surfaces"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:3
-msgid "Corkscrew Surface"
+#: ../hacks/config/surfaces.xml.h:8
+msgid "Random Surface"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:4
+#: ../hacks/config/surfaces.xml.h:9
 msgid "Dini's Surface"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:6
+#: ../hacks/config/surfaces.xml.h:10
 msgid "Enneper's Surface"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:8
-msgid "Henneberg's Surface"
+#: ../hacks/config/surfaces.xml.h:11
+msgid "Kuen Surface"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:10
-msgid "Kuen Surface"
+#: ../hacks/config/surfaces.xml.h:12
+msgid "Moebius Strip"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:11
-msgid "Line Loops"
+#: ../hacks/config/surfaces.xml.h:13
+msgid "Seashell"
+msgstr ""
+
+#: ../hacks/config/surfaces.xml.h:14
+msgid "Swallowtail"
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:15
-msgid "Moebius Strip"
+msgid "Bohemian Dome"
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:16
+msgid "Whitney Umbrella"
+msgstr ""
+
+#: ../hacks/config/surfaces.xml.h:17
 msgid "Pluecker's Conoid"
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:18
-msgid "Random Display Mode"
+msgid "Henneberg's Surface"
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:19
-msgid "Random Surface"
+msgid "Catalan's Surface"
 msgstr ""
 
 #: ../hacks/config/surfaces.xml.h:20
-msgid "Seashell"
+msgid "Corkscrew Surface"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:24
-msgid "Surfaces"
+#: ../hacks/config/surfaces.xml.h:21
+msgid "Random Display Mode"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:25
-msgid "Swallowtail"
+#: ../hacks/config/surfaces.xml.h:24
+msgid "Line Loops"
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:26
+#: ../hacks/config/surfaces.xml.h:28
 msgid ""
 "This draws a visualization of several interesting parametric surfaces. "
 "http://mathworld.wolfram.com/DinisSurface.html "
@@ -8537,101 +8685,95 @@
 "Mirtchovski and Carsten Steger; 2003."
 msgstr ""
 
-#: ../hacks/config/surfaces.xml.h:28
-msgid "Whitney Umbrella"
+#: ../hacks/config/swirl.xml.h:1
+msgid "Swirl"
 msgstr ""
 
-#: ../hacks/config/swirl.xml.h:3
+#: ../hacks/config/swirl.xml.h:12
 msgid "Flowing, swirly patterns. Written by M. Dobie and R. Taylor; 1997."
 msgstr ""
 
-#: ../hacks/config/swirl.xml.h:11
-msgid "Swirl"
+#: ../hacks/config/t3d.xml.h:1
+msgid "T3D"
 msgstr ""
 
-#: ../hacks/config/t3d.xml.h:2
-msgid "5 minute tick marks"
+#: ../hacks/config/t3d.xml.h:6
+msgid "Turn side-to-side"
 msgstr ""
 
-#: ../hacks/config/t3d.xml.h:4
-msgid "Bigger"
-msgstr "Väčšie"
+#: ../hacks/config/t3d.xml.h:8
+msgid "Wobbliness"
+msgstr ""
 
-#: ../hacks/config/t3d.xml.h:5
+#: ../hacks/config/t3d.xml.h:9
 msgid "Cycle seconds"
 msgstr ""
 
 #: ../hacks/config/t3d.xml.h:10
-msgid "Minute tick marks"
-msgstr ""
-
-#: ../hacks/config/t3d.xml.h:13
 msgid "Smaller"
 msgstr "Menšie"
 
-#: ../hacks/config/t3d.xml.h:14
-msgid "T3D"
-msgstr ""
+#: ../hacks/config/t3d.xml.h:12
+msgid "Bigger"
+msgstr "Väčšie"
 
-#: ../hacks/config/t3d.xml.h:15
-msgid ""
-"This screen saver was removed from the XScreenSaver distribution as of "
-"version 5.08. Draws a working analog clock composed of floating, throbbing "
-"bubbles. Written by Bernd Paysan; 1999."
+#: ../hacks/config/t3d.xml.h:13
+msgid "Minute tick marks"
 msgstr ""
 
-#: ../hacks/config/t3d.xml.h:16
-msgid "Turn side-to-side"
+#: ../hacks/config/t3d.xml.h:14
+msgid "5 minute tick marks"
 msgstr ""
 
 #: ../hacks/config/t3d.xml.h:17
-msgid "Wobbliness"
-msgstr ""
-
-#: ../hacks/config/tangram.xml.h:12
 msgid ""
-"Solves tangram puzzles. http://en.wikipedia.org/wiki/Tangram Written by "
-"Jeremy English; 2005."
+"This screen saver was removed from the XScreenSaver distribution as of "
+"version 5.08. Draws a working analog clock composed of floating, throbbing "
+"bubbles. Written by Bernd Paysan; 1999."
 msgstr ""
 
-#: ../hacks/config/tangram.xml.h:13
+#: ../hacks/config/tangram.xml.h:1
 msgid "Tangram"
 msgstr ""
 
-#: ../hacks/config/tangram.xml.h:15
+#: ../hacks/config/tangram.xml.h:9
 msgid "X rotation"
 msgstr ""
 
-#: ../hacks/config/tangram.xml.h:16
+#: ../hacks/config/tangram.xml.h:11
 msgid "Y rotation"
 msgstr ""
 
-#: ../hacks/config/tangram.xml.h:17
+#: ../hacks/config/tangram.xml.h:12
 msgid "Z rotation"
 msgstr ""
 
+#: ../hacks/config/tangram.xml.h:17
+msgid ""
+"Solves tangram puzzles. http://en.wikipedia.org/wiki/Tangram Written by "
+"Jeremy English; 2005."
+msgstr ""
+
 #: ../hacks/config/thornbird.xml.h:1
+msgid "Thornbird"
+msgstr ""
+
+#: ../hacks/config/thornbird.xml.h:17
 msgid ""
 "Displays a view of the \"Bird in a Thornbush\" fractal. Written by Tim "
 "Auckland; 2002."
 msgstr ""
 
-#: ../hacks/config/thornbird.xml.h:17
-msgid "Thornbird"
+#: ../hacks/config/timetunnel.xml.h:1
+msgid "TimeTunnel"
 msgstr ""
 
-#: ../hacks/config/timetunnel.xml.h:1
+#: ../hacks/config/timetunnel.xml.h:2
 msgid "0 sec"
 msgstr ""
 
 #: ../hacks/config/timetunnel.xml.h:3
-msgid "Draw logo"
-msgstr ""
-
-#: ../hacks/config/timetunnel.xml.h:4
-msgid ""
-"Draws an animation similar to the opening and closing effects on the Dr. Who "
-"TV show. Written by Sean P. Brennan; 2005."
+msgid "Start sequence time"
 msgstr ""
 
 #: ../hacks/config/timetunnel.xml.h:5
@@ -8639,126 +8781,147 @@
 msgstr ""
 
 #: ../hacks/config/timetunnel.xml.h:6
-msgid "Run backward"
+msgid "Draw logo"
 msgstr ""
 
-#: ../hacks/config/timetunnel.xml.h:8
-msgid "Start sequence time"
+#: ../hacks/config/timetunnel.xml.h:7
+msgid "Run backward"
 msgstr ""
 
 #: ../hacks/config/timetunnel.xml.h:9
-msgid "TimeTunnel"
+msgid ""
+"Draws an animation similar to the opening and closing effects on the Dr. Who "
+"TV show. Written by Sean P. Brennan; 2005."
 msgstr ""
 
 #: ../hacks/config/topblock.xml.h:1
-msgid "Blob mode"
+msgid "TopBlock"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:2
-msgid "Carpet"
+#: ../hacks/config/topblock.xml.h:6
+msgid "Drop speed"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:3
+#: ../hacks/config/topblock.xml.h:9
 msgid "Carpet size"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:5
-msgid ""
-"Creates a 3D world with dropping blocks that build up and up. Written by "
-"rednuht; 2006."
+#: ../hacks/config/topblock.xml.h:11
+msgid "Spawn likelyhood"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:6
-msgid "Drop speed"
+#: ../hacks/config/topblock.xml.h:12
+msgid "Polygon count"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:9
+#: ../hacks/config/topblock.xml.h:18
 msgid "Follow"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:15
-msgid "Nipples"
+#: ../hacks/config/topblock.xml.h:19
+msgid "Blob mode"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:16
-msgid "Polygon count"
+#: ../hacks/config/topblock.xml.h:20
+msgid "Tunnel mode"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:22
-msgid "Spawn likelyhood"
+#: ../hacks/config/topblock.xml.h:21
+msgid "Carpet"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:23
-msgid "TopBlock"
+#: ../hacks/config/topblock.xml.h:22
+msgid "Nipples"
 msgstr ""
 
-#: ../hacks/config/topblock.xml.h:24
-msgid "Tunnel mode"
+#: ../hacks/config/topblock.xml.h:25
+msgid ""
+"Creates a 3D world with dropping blocks that build up and up. Written by "
+"rednuht; 2006."
 msgstr ""
 
-#: ../hacks/config/triangle.xml.h:2
+#: ../hacks/config/triangle.xml.h:1
+msgid "Triangle"
+msgstr "Trojuholník"
+
+#: ../hacks/config/triangle.xml.h:9
 msgid ""
 "Generates random mountain ranges using iterative subdivision of triangles. "
 "Written by Tobias Gloth; 1997."
 msgstr ""
 
-#: ../hacks/config/triangle.xml.h:8
-msgid "Triangle"
-msgstr "Trojuholník"
+#: ../hacks/config/tronbit.xml.h:1
+msgid "TronBit"
+msgstr ""
 
-#: ../hacks/config/truchet.xml.h:6
+#: ../hacks/config/tronbit.xml.h:12
 msgid ""
-"This draws line- and arc-based truchet patterns that tile the screen. "
-"http://en.wikipedia.org/wiki/Tessellation Written by Adrian Likins; 1998."
+"Draws an animation of the character \"Bit\" from the film, \"Tron\". The "
+"\"yes\" state is a tetrahedron; the \"no\" state is the second stellation of "
+"an icosahedron; and the idle state oscillates between a small triambic "
+"icosahedron and the compound of an icosahedron and a dodecahedron. "
+"http://en.wikipedia.org/wiki/List_of_Tron_characters#Bit "
+"http://en.wikipedia.org/wiki/Uniform_polyhedra "
+"http://en.wikipedia.org/wiki/Stellation Written by Jamie Zawinski; 2011."
 msgstr ""
 
-#: ../hacks/config/truchet.xml.h:7
+#: ../hacks/config/truchet.xml.h:1
 msgid "Truchet"
 msgstr ""
 
-#: ../hacks/config/twang.xml.h:3
-msgid "Border width"
+#: ../hacks/config/truchet.xml.h:7
+msgid ""
+"This draws line- and arc-based truchet patterns that tile the screen. "
+"http://en.wikipedia.org/wiki/Tessellation Written by Adrian Likins; 1998."
 msgstr ""
 
-#: ../hacks/config/twang.xml.h:4
-msgid ""
-"Divides the screen into a grid, and plucks them. Written by Dan Bornstein; "
-"2002."
+#: ../hacks/config/twang.xml.h:1
+msgid "Twang"
 msgstr ""
 
-#: ../hacks/config/twang.xml.h:9
+#: ../hacks/config/twang.xml.h:10
 msgid "Jumpy"
 msgstr ""
 
-#: ../hacks/config/twang.xml.h:16
+#: ../hacks/config/twang.xml.h:12
 msgid "Springiness"
 msgstr ""
 
-#: ../hacks/config/twang.xml.h:18
+#: ../hacks/config/twang.xml.h:13
 msgid "Transference"
 msgstr ""
 
+#: ../hacks/config/twang.xml.h:17
+msgid "Border width"
+msgstr ""
+
 #: ../hacks/config/twang.xml.h:19
-msgid "Twang"
+msgid ""
+"Divides the screen into a grid, and plucks them. Written by Dan Bornstein; "
+"2002."
 msgstr ""
 
 #: ../hacks/config/vermiculate.xml.h:1
-msgid "Draws squiggly worm-like paths. Written by Tyler Pierce; 2001."
+msgid "Vermiculate"
 msgstr ""
 
 #: ../hacks/config/vermiculate.xml.h:6
-msgid "Vermiculate"
+msgid "Draws squiggly worm-like paths. Written by Tyler Pierce; 2001."
+msgstr ""
+
+#: ../hacks/config/vidwhacker.xml.h:1
+msgid "VidWhacker"
 msgstr ""
 
 #: ../hacks/config/vidwhacker.xml.h:2
 msgid "2 seconds"
 msgstr "2 sekundy"
 
-#: ../hacks/config/vidwhacker.xml.h:4
+#: ../hacks/config/vidwhacker.xml.h:5
 msgid "Image directory"
 msgstr ""
 
-#: ../hacks/config/vidwhacker.xml.h:6
+#: ../hacks/config/vidwhacker.xml.h:7
 msgid ""
 "This is a shell script that grabs a frame of video from the system's video "
 "input, and then uses some PBM filters (chosen at random) to manipulate and "
@@ -8768,96 +8931,96 @@
 "feed broadcast television into it. Written by Jamie Zawinski; 1998."
 msgstr ""
 
-#: ../hacks/config/vidwhacker.xml.h:7
-msgid "VidWhacker"
-msgstr ""
+#: ../hacks/config/vines.xml.h:1
+msgid "Vines"
+msgstr "Viniče"
 
-#: ../hacks/config/vines.xml.h:7
+#: ../hacks/config/vines.xml.h:9
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Generates a continuous sequence of small, curvy geometric "
 "patterns. Written by Tracy Camp and David Hansen; 1997."
 msgstr ""
 
-#: ../hacks/config/vines.xml.h:9
-msgid "Vines"
-msgstr "Viniče"
-
-#: ../hacks/config/voronoi.xml.h:2
-msgid "50 pixels"
+#: ../hacks/config/voronoi.xml.h:1
+msgid "Voronoi"
 msgstr ""
 
-#: ../hacks/config/voronoi.xml.h:4
-msgid ""
-"Draws a randomly-colored Voronoi tessellation, and periodically zooms in and "
-"adds new points. The existing points also wander around. There are a set of "
-"control points on the plane, each at the center of a colored cell. Every "
-"pixel within that cell is closer to that cell's control point than to any "
-"other control point. That is what determines the cell's shapes. "
-"http://en.wikipedia.org/wiki/Voronoi_diagram Written by Jamie Zawinski; 2007."
+#: ../hacks/config/voronoi.xml.h:9
+msgid "Point size"
 msgstr ""
 
-#: ../hacks/config/voronoi.xml.h:8
-msgid "Insertion speed"
+#: ../hacks/config/voronoi.xml.h:10
+msgid "50 pixels"
 msgstr ""
 
-#: ../hacks/config/voronoi.xml.h:10
-msgid "Point size"
+#: ../hacks/config/voronoi.xml.h:13
+msgid "Insertion speed"
 msgstr ""
 
 #: ../hacks/config/voronoi.xml.h:14
-msgid "Voronoi"
+msgid "Zoom speed"
 msgstr ""
 
-#: ../hacks/config/voronoi.xml.h:16
+#: ../hacks/config/voronoi.xml.h:15
 msgid "Zoom frequency"
 msgstr ""
 
 #: ../hacks/config/voronoi.xml.h:17
-msgid "Zoom speed"
+msgid ""
+"Draws a randomly-colored Voronoi tessellation, and periodically zooms in and "
+"adds new points. The existing points also wander around. There are a set of "
+"control points on the plane, each at the center of a colored cell. Every "
+"pixel within that cell is closer to that cell's control point than to any "
+"other control point. That is what determines the cell's shapes. "
+"http://en.wikipedia.org/wiki/Voronoi_diagram Written by Jamie Zawinski; 2007."
 msgstr ""
 
-#: ../hacks/config/wander.xml.h:3
+#: ../hacks/config/wander.xml.h:10
 msgid "Draw spots"
 msgstr ""
 
-#: ../hacks/config/wander.xml.h:4
+#: ../hacks/config/wander.xml.h:14
 msgid ""
 "Draws a colorful random-walk, in various forms. "
 "http://en.wikipedia.org/wiki/Random_walk Written by Rick Campbell; 1999."
 msgstr ""
 
 #: ../hacks/config/webcollage.xml.h:1
-msgid "2 min"
-msgstr ""
-
-#: ../hacks/config/webcollage.xml.h:2
-msgid "2 secs"
+msgid "WebCollage"
 msgstr ""
 
 #: ../hacks/config/webcollage.xml.h:3
-msgid "30 secs"
+msgid "Delay between images"
 msgstr ""
 
 #: ../hacks/config/webcollage.xml.h:4
-msgid "Delay between images"
+msgid "30 secs"
 msgstr ""
 
 #: ../hacks/config/webcollage.xml.h:5
-msgid "Image opacity"
+msgid "2 secs"
 msgstr ""
 
 #: ../hacks/config/webcollage.xml.h:6
 msgid "Network timeout"
 msgstr ""
 
+#: ../hacks/config/webcollage.xml.h:7
+msgid "2 min"
+msgstr ""
+
+#: ../hacks/config/webcollage.xml.h:9
+msgid "Image opacity"
+msgstr ""
+
 #. 
 #. <string id="filter"  _label="Per-image filter program" arg="-filter %"/>
 #. <string id="filter2" _label="Overall filter program" arg="-filter2 %"/>
 #. <file id="dictionary" _label="Dictionary file" arg="-dictionary %"/>
 #. <file id="dir" _label="Image directory" arg="-directory %"/>
 #. 
-#: ../hacks/config/webcollage.xml.h:16
+#: ../hacks/config/webcollage.xml.h:18
 msgid ""
 "This makes collages out of random images pulled off of the World Wide Web. "
 "It finds these images by doing random web searches, and then extracting "
@@ -8868,110 +9031,107 @@
 "Written by Jamie Zawinski; 1999."
 msgstr ""
 
-#: ../hacks/config/webcollage.xml.h:18
-msgid "WebCollage"
+#: ../hacks/config/whirlwindwarp.xml.h:1
+msgid "WhirlWindWarp"
+msgstr ""
+
+#: ../hacks/config/whirlwindwarp.xml.h:6
+msgid "Trail size"
 msgstr ""
 
-#: ../hacks/config/whirlwindwarp.xml.h:2
+#: ../hacks/config/whirlwindwarp.xml.h:9
 msgid ""
 "Floating stars are acted upon by a mixture of simple 2D forcefields. The "
 "strength of each forcefield changes continuously, and it is also switched on "
 "and off at random. Written by Paul 'Joey' Clark; 2001."
 msgstr ""
 
-#: ../hacks/config/whirlwindwarp.xml.h:8
-msgid "Trail size"
-msgstr ""
-
-#: ../hacks/config/whirlwindwarp.xml.h:9
-msgid "WhirlWindWarp"
+#: ../hacks/config/whirlygig.xml.h:1
+msgid "Whirlygig"
 msgstr ""
 
-#: ../hacks/config/whirlygig.xml.h:1
-msgid "Explain modes"
+#: ../hacks/config/whirlygig.xml.h:2
+msgid "Whirlies"
 msgstr ""
 
-#: ../hacks/config/whirlygig.xml.h:3
-msgid "Leave a trail"
+#: ../hacks/config/whirlygig.xml.h:5
+msgid "X speed"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:7
-msgid ""
-"This screen saver was removed from the XScreenSaver distribution as of "
-"version 5.08. Draws zooming chains of sinusoidal spots. Written by Ashton "
-"Trey Belew; 2001."
+msgid "Y speed"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:8
-msgid "Whirlies"
+msgid "X amplitude"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:9
-msgid "Whirlygig"
+msgid "Y amplitude"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:10
-msgid "Wrap the screen"
+msgid "X random"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:11
-msgid "X amplitude"
+msgid "X spin"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:12
-msgid "X circle"
+msgid "X funky"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:13
-msgid "X fun"
+msgid "X circle"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:14
-msgid "X funky"
+msgid "X linear"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:15
-msgid "X innie"
+msgid "X test"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:16
-msgid "X linear"
+msgid "X fun"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:17
-msgid "X lissajous"
+msgid "X innie"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:18
-msgid "X random"
+msgid "X lissajous"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:19
-msgid "X speed"
+msgid "Y random"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:20
-msgid "X spin"
+msgid "Y spin"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:21
-msgid "X test"
+msgid "Y funky"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:22
-msgid "Y amplitude"
+msgid "Y circle"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:23
-msgid "Y circle"
+msgid "Y linear"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:24
-msgid "Y fun"
+msgid "Y test"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:25
-msgid "Y funky"
+msgid "Y fun"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:26
@@ -8979,54 +9139,53 @@
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:27
-msgid "Y linear"
+msgid "Y lissajous"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:28
-msgid "Y lissajous"
+msgid "Leave a trail"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:29
-msgid "Y random"
+msgid "Explain modes"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:30
-msgid "Y speed"
-msgstr ""
-
-#: ../hacks/config/whirlygig.xml.h:31
-msgid "Y spin"
+msgid "Wrap the screen"
 msgstr ""
 
 #: ../hacks/config/whirlygig.xml.h:32
-msgid "Y test"
+msgid ""
+"This screen saver was removed from the XScreenSaver distribution as of "
+"version 5.08. Draws zooming chains of sinusoidal spots. Written by Ashton "
+"Trey Belew; 2001."
 msgstr ""
 
-#: ../hacks/config/worm.xml.h:10
+#: ../hacks/config/worm.xml.h:12
 msgid ""
 "This screen saver was removed from the XScreenSaver distribution as of "
 "version 5.08. Draws multicolored worms that crawl around the screen. Written "
 "by Brad Taylor, Dave Lemke, Boris Putanec, and Henrik Theiling; 1991."
 msgstr ""
 
-#: ../hacks/config/wormhole.xml.h:3
-msgid ""
-"Flying through a colored wormhole in space. Written by Jon Rafkind; 2004."
+#: ../hacks/config/wormhole.xml.h:1
+msgid "Wormhole"
 msgstr ""
 
-#: ../hacks/config/wormhole.xml.h:10
+#: ../hacks/config/wormhole.xml.h:6
 msgid "Star speed"
 msgstr ""
 
-#: ../hacks/config/wormhole.xml.h:11
+#: ../hacks/config/wormhole.xml.h:9
 msgid "Stars created"
 msgstr ""
 
 #: ../hacks/config/wormhole.xml.h:12
-msgid "Wormhole"
+msgid ""
+"Flying through a colored wormhole in space. Written by Jon Rafkind; 2004."
 msgstr ""
 
-#: ../hacks/config/xanalogtv.xml.h:2
+#: ../hacks/config/xanalogtv.xml.h:1
 msgid "XAnalogTV"
 msgstr ""
 
@@ -9040,135 +9199,136 @@
 msgstr ""
 
 #: ../hacks/config/xflame.xml.h:1
-msgid ""
-"Draws a simulation of pulsing fire. It can also take an arbitrary image and "
-"set it on fire too. Written by Carsten Haitzler and many others; 1999."
+msgid "XFlame"
 msgstr ""
 
 #. #### -vartrend [20]
-#: ../hacks/config/xflame.xml.h:3
+#: ../hacks/config/xflame.xml.h:6
 msgid "Enable blooming"
 msgstr ""
 
 #: ../hacks/config/xflame.xml.h:8
-msgid "XFlame"
+msgid ""
+"Draws a simulation of pulsing fire. It can also take an arbitrary image and "
+"set it on fire too. Written by Carsten Haitzler and many others; 1999."
+msgstr ""
+
+#: ../hacks/config/xjack.xml.h:1
+msgid "XJack"
 msgstr ""
 
-#: ../hacks/config/xjack.xml.h:6
+#: ../hacks/config/xjack.xml.h:7
 msgid ""
 "This behaves schizophrenically and makes a lot of typos. Written by Jamie "
 "Zawinski; 1997."
 msgstr ""
 
-#: ../hacks/config/xjack.xml.h:7
-msgid "XJack"
+#: ../hacks/config/xlyap.xml.h:1
+msgid "XLyap"
 msgstr ""
 
-#: ../hacks/config/xlyap.xml.h:9
+#: ../hacks/config/xlyap.xml.h:10
 msgid ""
 "This generates pretty fractal pictures via the Lyapunov exponent. "
 "http://en.wikipedia.org/wiki/Lyapunov_exponent Written by Ron Record; 1997."
 msgstr ""
 
-#: ../hacks/config/xlyap.xml.h:10
-msgid "XLyap"
+#: ../hacks/config/xmatrix.xml.h:1
+msgid "XMatrix"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:3
-msgid ""
-"Draws dropping characters similar to what is seen on the computer monitors "
-"in \"The Matrix\". See also \"GLMatrix\" for a 3D rendering of the similar "
-"effect that appeared in the movie's title sequence. Written by Jamie "
-"Zawinski; 1999."
+#: ../hacks/config/xmatrix.xml.h:2
+msgid "Small font"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:4
-msgid "Expansion algorithm"
+#: ../hacks/config/xmatrix.xml.h:3
+msgid "Large font"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:10
-msgid "Knock knock"
+#: ../hacks/config/xmatrix.xml.h:8
+msgid "Piped ASCII text"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:11
-msgid "Large font"
+#: ../hacks/config/xmatrix.xml.h:9
+msgid "Synergistic algorithm"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:14
-msgid "Phone number"
+#: ../hacks/config/xmatrix.xml.h:10
+msgid "Slider algorithm"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:15
-msgid "Piped ASCII text"
+#: ../hacks/config/xmatrix.xml.h:11
+msgid "Expansion algorithm"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:16
+#: ../hacks/config/xmatrix.xml.h:12
 msgid "Run trace program"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:18
-msgid "Slider algorithm"
-msgstr ""
-
-#: ../hacks/config/xmatrix.xml.h:19
-msgid "Small font"
+#: ../hacks/config/xmatrix.xml.h:13
+msgid "Knock knock"
 msgstr ""
 
-#: ../hacks/config/xmatrix.xml.h:21
-msgid "Synergistic algorithm"
+#: ../hacks/config/xmatrix.xml.h:14
+msgid "Phone number"
 msgstr ""
 
 #: ../hacks/config/xmatrix.xml.h:22
-msgid "XMatrix"
+msgid ""
+"Draws the \"digital rain\" effect, as seen on the computer monitors in \"The "
+"Matrix\". See also \"GLMatrix\" for a 3D rendering of the similar effect "
+"that appeared in the movie's title sequence. "
+"http://en.wikipedia.org/wiki/Matrix_digital_rain Written by Jamie Zawinski; "
+"1999."
 msgstr ""
 
 #: ../hacks/config/xrayswarm.xml.h:1
+msgid "XRaySwarm"
+msgstr ""
+
+#: ../hacks/config/xrayswarm.xml.h:6
 msgid ""
 "Draws a few swarms of critters flying around the screen, with faded color "
 "trails behind them. Written by Chris Leger; 2000."
 msgstr ""
 
-#: ../hacks/config/xrayswarm.xml.h:6
-msgid "XRaySwarm"
+#: ../hacks/config/xspirograph.xml.h:1
+msgid "XSpirograph"
 msgstr ""
 
-#: ../hacks/config/xspirograph.xml.h:9
+#: ../hacks/config/xspirograph.xml.h:10
 msgid ""
 "Simulates that pen-in-nested-plastic-gears toy from your childhood. "
 "http://en.wikipedia.org/wiki/Spirograph Written by Rohit Singh; 2000."
 msgstr ""
 
-#: ../hacks/config/xspirograph.xml.h:10
-msgid "XSpirograph"
+#: ../hacks/config/zoom.xml.h:8
+msgid "X magnification"
 msgstr ""
 
-#: ../hacks/config/zoom.xml.h:1
-msgid "    Y lens offset"
+#: ../hacks/config/zoom.xml.h:9
+msgid " X border width"
 msgstr ""
 
-#: ../hacks/config/zoom.xml.h:2
+#: ../hacks/config/zoom.xml.h:10
 msgid "   X lens offset"
 msgstr ""
 
-#: ../hacks/config/zoom.xml.h:3
-msgid " X border width"
+#: ../hacks/config/zoom.xml.h:11
+msgid "Y magnification"
 msgstr ""
 
-#: ../hacks/config/zoom.xml.h:4
+#: ../hacks/config/zoom.xml.h:12
 msgid " Y border width"
 msgstr ""
 
-#: ../hacks/config/zoom.xml.h:10
-msgid "Lenses"
-msgstr "Šošovky"
-
 #: ../hacks/config/zoom.xml.h:13
-msgid "X magnification"
+msgid "    Y lens offset"
 msgstr ""
 
 #: ../hacks/config/zoom.xml.h:14
-msgid "Y magnification"
-msgstr ""
+msgid "Lenses"
+msgstr "Šošovky"
 
 #: ../hacks/config/zoom.xml.h:16
 msgid ""
diff -Nru language-pack-sk-base-12.04+20111229/debian/changelog language-pack-sk-base-12.04+20120221/debian/changelog
--- language-pack-sk-base-12.04+20111229/debian/changelog	2012-01-02 17:50:35.000000000 +0000
+++ language-pack-sk-base-12.04+20120221/debian/changelog	2012-02-23 06:55:25.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-sk-base (1:12.04+20111229) precise; urgency=low
+language-pack-sk-base (1:12.04+20120221) precise; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Mon, 02 Jan 2012 17:50:35 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Thu, 23 Feb 2012 06:55:25 +0000