diff --git a/po/ChangeLog b/po/ChangeLog
index a48eb1d46..a745625f5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-25  Zbigniew Chyla  <cyba@gnome.pl>
+
+	* pl.po: Updated Polish translation by
+	GNOME PL Team <translators@gnome.pl>.
+
 2001-10-24  Stanislav Visnovsky  <visnovsky@nenya.ms.mff.cuni.cz>
 
 	* sk.po: More screensaver description translated.
diff --git a/po/pl.po b/po/pl.po
index 1332bef81..8e40329c4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,186 +9,185 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: control-center\n"
-"POT-Creation-Date: 2001-10-11 14:12-0600\n"
-"PO-Revision-Date: 2001-08-08 17:33+0200\n"
+"POT-Creation-Date: 2001-10-25 18:40+0200\n"
+"PO-Revision-Date: 2001-10-25 20:58+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: archiver/archive.c:614
-#, fuzzy
+#: archiver/archive.c:1
 msgid "Default location"
 msgstr "Domyślna lokalizacja"
 
-#: archiver/config-archiver.c:307 archiver/location.c:460
+#: archiver/config-archiver.c:1 archiver/location.c:1
 msgid "Default Location"
 msgstr "Domyślna lokalizacja"
 
-#: archiver/config-archiver.c:81
+#: archiver/config-archiver.c:1
 msgid "Store XML data in the archive"
 msgstr "Zachowuje w archiwum dane w XML-u"
 
-#: archiver/config-archiver.c:83
+#: archiver/config-archiver.c:1
 msgid "Roll back the configuration to a given point"
 msgstr "Wycofuje zmiany w konfiguracji do podanego punktu"
 
-#: archiver/config-archiver.c:85
+#: archiver/config-archiver.c:1
 msgid "Change the location profile to the given one"
 msgstr "Zmienia lokalizację profilu na podaną"
 
-#: archiver/config-archiver.c:87
+#: archiver/config-archiver.c:1
 msgid "Push configuration data out to client machines (UNIMPLEMENTED)"
 msgstr "Wysyła dane konfiguracyjne do maszyny klienckiej (NIEZAIPLEMENTOWANE)"
 
-#: archiver/config-archiver.c:89
+#: archiver/config-archiver.c:1
 msgid "Rename a location to a new name"
 msgstr "Zmienia nazwę lokalizacji na nową"
 
-#: archiver/config-archiver.c:91
+#: archiver/config-archiver.c:1
 msgid "Add a new location to the archive"
 msgstr "Dodaje do archiwum nową lokalizację"
 
-#: archiver/config-archiver.c:93
+#: archiver/config-archiver.c:1
 msgid "Remove a location from the archive"
 msgstr "Usuwa lokalizację z archiwum"
 
-#: archiver/config-archiver.c:95
+#: archiver/config-archiver.c:1
 msgid "Add a given backend to the given location"
 msgstr "Dodaje podany program przetwarzający do podanej lokalizacji"
 
-#: archiver/config-archiver.c:97
+#: archiver/config-archiver.c:1
 msgid "Remove the given backend from the given location"
 msgstr "Usuwa podany program przetwarzający z podanej lokalizacji"
 
-#: archiver/config-archiver.c:99
+#: archiver/config-archiver.c:1
 msgid "Perform garbage collection on the given location"
 msgstr "Przeprowadza odśmiecanie podanej lokalizacji"
 
-#: archiver/config-archiver.c:105
+#: archiver/config-archiver.c:1
 msgid "Use the global repository"
 msgstr "Korzysta z globalnego repozytorium"
 
-#: archiver/config-archiver.c:107
+#: archiver/config-archiver.c:1
 msgid "Identifier of location profile on which to operate"
 msgstr "Identyfikator profilu lokalizacji, którego dotyczy operacja"
 
-#: archiver/config-archiver.c:108
+#: archiver/config-archiver.c:1
 msgid "LOCATION"
 msgstr "LOCATION"
 
-#: archiver/config-archiver.c:110
+#: archiver/config-archiver.c:1
 msgid "Backend being used for this operation"
 msgstr "Program przetwarzający używany przy operacji"
 
-#: archiver/config-archiver.c:110
+#: archiver/config-archiver.c:1
 msgid "BACKEND_ID"
 msgstr "BACKEND_ID"
 
-#: archiver/config-archiver.c:116
+#: archiver/config-archiver.c:1
 msgid "Store only the differences with the parent location's config"
 msgstr ""
 "Zachowuje tylko różnice w stosunku do konfiguracji nadrzędnej lokalizacji"
 
-#: archiver/config-archiver.c:118
+#: archiver/config-archiver.c:1
 msgid "Store only those settings set in the previous config"
 msgstr "Zachowuje tylko ustawienia ustawione w poprzedniej konfiguracji"
 
-#: archiver/config-archiver.c:124
+#: archiver/config-archiver.c:1
 msgid "Date to which to roll back"
 msgstr "Data, do której należy przywrócić stan konfiguracji"
 
-#: archiver/config-archiver.c:124
+#: archiver/config-archiver.c:1
 msgid "DATE"
 msgstr "DATA"
 
-#: archiver/config-archiver.c:126
+#: archiver/config-archiver.c:1
 msgid "Roll back all configuration items"
 msgstr "Wycofuje wszystkie elementy konfiguracji"
 
-#: archiver/config-archiver.c:128
+#: archiver/config-archiver.c:1
 msgid "Roll back to the revision REVISION_ID"
 msgstr "Wycofuje do wersji NR_WERSJI"
 
-#: archiver/config-archiver.c:128
+#: archiver/config-archiver.c:1
 msgid "REVISION_ID"
 msgstr "NR_WERSJI"
 
-#: archiver/config-archiver.c:130
+#: archiver/config-archiver.c:1
 msgid "Roll back to the last known revision"
 msgstr "Wycofuje do ostatniej znanej wersji"
 
-#: archiver/config-archiver.c:132
+#: archiver/config-archiver.c:1
 msgid "Roll back by STEPS revisions"
 msgstr "Wycofuje o KROKI wersji"
 
-#: archiver/config-archiver.c:132
+#: archiver/config-archiver.c:1
 msgid "STEPS"
 msgstr "KROKI"
 
-#: archiver/config-archiver.c:134
+#: archiver/config-archiver.c:1
 msgid "Don't run the backend, just dump the output"
 msgstr "Nie uruchamia programu przetwarzającego, wypisuje tylko informacje"
 
-#: archiver/config-archiver.c:140
+#: archiver/config-archiver.c:1
 msgid "Parent location for the new location"
 msgstr "Nadrzędna lokalizacja nowej lokalizacji"
 
-#: archiver/config-archiver.c:140
+#: archiver/config-archiver.c:1
 msgid "PARENT"
 msgstr "NADRZĘDNA"
 
-#: archiver/config-archiver.c:142
+#: archiver/config-archiver.c:1
 msgid "New name to assign to the location"
 msgstr "Nowa nazwa przypisana lokalizacji"
 
-#: archiver/config-archiver.c:142
+#: archiver/config-archiver.c:1
 msgid "NEW_NAME"
 msgstr "NOWA_NAZWA"
 
-#: archiver/config-archiver.c:148
+#: archiver/config-archiver.c:1
 msgid "Add/remove this backend to/from the master backend list"
 msgstr "Dodaje/usuwa podany program przetwarzający z globalnej listy"
 
-#: archiver/config-archiver.c:150
+#: archiver/config-archiver.c:1
 msgid "Full containment"
 msgstr "Pełne zawieranie"
 
-#: archiver/config-archiver.c:152
+#: archiver/config-archiver.c:1
 msgid "Partial containment"
 msgstr "Częściowe zawieranie"
 
-#: archiver/config-archiver.c:368
+#: archiver/config-archiver.c:1
 msgid "Global archiver options"
 msgstr "Globalne opcje archiwizatora"
 
-#: archiver/config-archiver.c:370
+#: archiver/config-archiver.c:1
 msgid "Archiver commands"
 msgstr "Polecenia archiwizatora"
 
-#: archiver/config-archiver.c:372
+#: archiver/config-archiver.c:1
 msgid "Options for storing data"
 msgstr "Opcje dotyczące przechowywania danych"
 
-#: archiver/config-archiver.c:374
+#: archiver/config-archiver.c:1
 msgid "Options for rolling back"
 msgstr "Opcje dotyczące wycofywania"
 
-#: archiver/config-archiver.c:376
+#: archiver/config-archiver.c:1
 msgid "Options for adding or renaming locations"
 msgstr "Opcje dotyczące dodawania lub zmiany nazwy lokalizacji"
 
-#: archiver/config-archiver.c:379
+#: archiver/config-archiver.c:1
 msgid "Options for adding and removing backends"
 msgstr "Opcje dotyczące dodawania lub zmiany nazwy programu przetwarzającego"
 
-#: capplets/background/applier.c:379
+#: capplets/background/applier.c:1
 #, c-format
 msgid "Could not load pixbuf \"%s\"; disabling wallpaper."
 msgstr "Nie można wczytać obrazu z pliku \"%s\", zrezygnowano z tapety."
 
-#: capplets/background/applier.c:518
+#: capplets/background/applier.c:1
 msgid "Disabled"
 msgstr "Nieaktywny"
 
@@ -196,7 +195,7 @@ msgstr "Nieaktywny"
 msgid "Background"
 msgstr "Tło"
 
-#: capplets/background/background.desktop.in.in.h:2
+#: capplets/background/background.desktop.in.in.h:1
 msgid "Configuration of the desktop's background"
 msgstr "Konfiguracja tła biurka"
 
@@ -204,80 +203,79 @@ msgstr "Konfiguracja t
 msgid "Background colors"
 msgstr "Kolory tła"
 
-#: capplets/background/background-properties.glade.h:2
+#: capplets/background/background-properties.glade.h:1
 msgid "Background picture"
 msgstr "Obraz w tle"
 
-#: capplets/background/background-properties.glade.h:3
+#: capplets/background/background-properties.glade.h:1
 msgid "Centered"
 msgstr "Wyśrodkowany"
 
-#: capplets/background/background-properties.glade.h:4
+#: capplets/background/background-properties.glade.h:1
 msgid "Horizontal gradient"
 msgstr "Poziomy gradient"
 
-#: capplets/background/background-properties.glade.h:5
+#: capplets/background/background-properties.glade.h:1
 msgid "Image:"
 msgstr "Obraz:"
 
-#: capplets/background/background-properties.glade.h:6
+#: capplets/background/background-properties.glade.h:1
 msgid "Opacity (percent):"
-msgstr "Przeźroczystość (procenty):"
+msgstr "Przezroczystość (procenty):"
 
-#: capplets/background/background-properties.glade.h:7
+#: capplets/background/background-properties.glade.h:1
 msgid "Pick a color"
 msgstr "Wybór koloru"
 
-#: capplets/background/background-properties.glade.h:8
+#: capplets/background/background-properties.glade.h:1
 msgid "Scaled (keep aspect ratio)"
 msgstr "Przeskalowany (z zachowaniem proporcji)"
 
-#: capplets/background/background-properties.glade.h:9
+#: capplets/background/background-properties.glade.h:1
 msgid "Solid color"
 msgstr "Jednolity kolor"
 
-#: capplets/background/background-properties.glade.h:10
+#: capplets/background/background-properties.glade.h:1
 msgid "Stretched"
 msgstr "Rozciągnięty"
 
-#: capplets/background/background-properties.glade.h:11
+#: capplets/background/background-properties.glade.h:1
 msgid "Style:"
 msgstr "Styl:"
 
-#: capplets/background/background-properties.glade.h:12
+#: capplets/background/background-properties.glade.h:1
 msgid "Tiled"
 msgstr "Kafelka"
 
-#: capplets/background/background-properties.glade.h:13
+#: capplets/background/background-properties.glade.h:1
 msgid "Use a picture for the background"
 msgstr ""
 
-#: capplets/background/background-properties.glade.h:14
+#: capplets/background/background-properties.glade.h:1
 msgid "Vertical gradient"
 msgstr "Pionowy gradient"
 
-#: capplets/background/background-properties-capplet.c:47
-#, fuzzy
+#: capplets/background/background-properties-capplet.c:1
 msgid "Set background image."
-msgstr "Obraz w tle"
+msgstr "Ustawia obraz w tle."
 
-#: capplets/background/background-properties-capplet.c:47
+#: capplets/background/background-properties-capplet.c:1
 msgid "IMAGE-FILE"
-msgstr ""
+msgstr "PLIK-Z-OBRAZEM"
 
-#: capplets/common/capplet-util.c:506
+#: capplets/common/capplet-util.c:1
 msgid "Just apply settings and quit"
 msgstr "Zastosowuje ustawienia i kończy"
 
-#: capplets/common/capplet-util.c:508
+#: capplets/common/capplet-util.c:1
 msgid "Initialize the session"
 msgstr "Inicjuje sesję"
 
-#: capplets/common/capplet-util.c:510
+#: capplets/common/capplet-util.c:1
 msgid "Retrieve and store legacy settings"
 msgstr "Pobiera i zapisuje tradycyjne ustawienia"
 
-#: capplets/common/capplet-util.c:519
+#: capplets/common/capplet-util.c:1
 msgid "Capplet options"
 msgstr "Opcje capletu"
 
@@ -285,103 +283,103 @@ msgstr "Opcje capletu"
 msgid "Choose the applications used by default"
 msgstr "Ustawienia domyślnych aplikacji do pełnienia różnych funkcji"
 
-#: capplets/default-applications/default-applications.desktop.in.in.h:2
+#: capplets/default-applications/default-applications.desktop.in.in.h:1
 msgid "Default Applications"
 msgstr "Domyślne aplikacje"
 
-#: capplets/default-applications/interface.c:108
+#: capplets/default-applications/interface.c:1
 msgid "Gnome Default Editor"
 msgstr "Domyślny edytor GNOME"
 
-#: capplets/default-applications/interface.c:125
+#: capplets/default-applications/interface.c:1
 msgid "Select an Editor"
 msgstr "Wybór edytora z listy"
 
-#: capplets/default-applications/interface.c:134
+#: capplets/default-applications/interface.c:1
 msgid "With this option, you can select a predefined Editor as your default"
 msgstr ""
 "Za pomocą tej opcji można wybrać domyślny edytor jako jeden z listy "
 "predefiniowanych."
 
-#: capplets/default-applications/interface.c:154
+#: capplets/default-applications/interface.c:1
 msgid "Custom Editor"
 msgstr "Dowolny edytor"
 
-#: capplets/default-applications/interface.c:163
+#: capplets/default-applications/interface.c:1
 msgid "With this option you can create your own default editor"
 msgstr "Opcja ta pozwala na podanie własnego edytora."
 
-#: capplets/default-applications/interface.c:174
-#: capplets/default-applications/interface.c:305
-#: capplets/default-applications/interface.c:436
+#: capplets/default-applications/interface.c:1
+#: capplets/default-applications/interface.c:1
+#: capplets/default-applications/interface.c:1
 msgid "Start in Terminal"
 msgstr "Uruchamianie w terminalu"
 
-#: capplets/default-applications/interface.c:182
+#: capplets/default-applications/interface.c:1
 msgid "Does this editor need to start in an xterm?"
 msgstr ""
 "Określa czy edytor powinien zostać uruchomiony w nowo otwartym terminalu "
 "(takim, jak xterm)."
 
-#: capplets/default-applications/interface.c:184
+#: capplets/default-applications/interface.c:1
 msgid "Accepts Line Number"
 msgstr "Edytor dopuszcza podanie numeru wiersza"
 
-#: capplets/default-applications/interface.c:192
+#: capplets/default-applications/interface.c:1
 msgid "Does this editor accept line numbers from the command line?"
 msgstr ""
 "Określa, czy edytor akceptuje podawanie numeru wiersza w pliku w wierszu "
 "poleceń."
 
-#: capplets/default-applications/interface.c:203
-#: capplets/default-applications/interface.c:334
-#: capplets/default-applications/interface.c:465
-#: capplets/default-applications/interface.c:576
+#: capplets/default-applications/interface.c:1
+#: capplets/default-applications/interface.c:1
+#: capplets/default-applications/interface.c:1
+#: capplets/default-applications/interface.c:1
 msgid "Command:"
 msgstr "Polecenie:"
 
-#: capplets/default-applications/interface.c:221
+#: capplets/default-applications/interface.c:1
 msgid "Please enter the command line used to start this editor"
 msgstr "Wiersz polecenia uruchamiającego edytor"
 
-#: capplets/default-applications/interface.c:232
+#: capplets/default-applications/interface.c:1
 msgid "Text Editor"
 msgstr "Edytor tekstu"
 
-#: capplets/default-applications/interface.c:239
+#: capplets/default-applications/interface.c:1
 msgid "Gnome Default Web Browser"
 msgstr "Domyślna przeglądarka WWW w GNOME"
 
-#: capplets/default-applications/interface.c:256
+#: capplets/default-applications/interface.c:1
 msgid "Select a Web Browser"
 msgstr "Wybór przeglądarki WWW z listy"
 
-#: capplets/default-applications/interface.c:265
+#: capplets/default-applications/interface.c:1
 msgid ""
 "With this option, you can select a predefined Web Browser as your default"
 msgstr ""
 "Za pomocą tej opcji można wybrać domyślną przeglądarkę WWW jako jedną z "
 "listy predefiniowanych."
 
-#: capplets/default-applications/interface.c:285
+#: capplets/default-applications/interface.c:1
 msgid "Custom Web Browser"
 msgstr "Dowolna przeglądarka WWW"
 
-#: capplets/default-applications/interface.c:294
+#: capplets/default-applications/interface.c:1
 msgid "With this option you can create your own default web browser"
 msgstr "Opcja ta pozwala na podanie własnej przeglądarki."
 
-#: capplets/default-applications/interface.c:313
+#: capplets/default-applications/interface.c:1
 msgid "Does this web browser need to display in an xterm?"
 msgstr ""
 "Określa czy przeglądarka powininna zostać uruchomiona w nowo otwartym "
 "terminalu (takim, jak xterm)."
 
-#: capplets/default-applications/interface.c:315
+#: capplets/default-applications/interface.c:1
 msgid "Understands Netscape Remote Control"
 msgstr "Obsługa protokołu zdalnego sterowania przeglądarek Netscape"
 
-#: capplets/default-applications/interface.c:323
+#: capplets/default-applications/interface.c:1
 msgid ""
 "Does this web browser support the netscape remote control protocol?  If in "
 "doubt, and this web browser isn't Netscape or Mozilla, it probably doesn't."
@@ -390,86 +388,85 @@ msgstr ""
 "stosowany w przeglądarkach Netscape. Jeśli nie masz pewności, a przeglądarką "
 "nie jest Netscape lub Mozilla, prawdopodobnie nie jest on obsługiwany."
 
-#: capplets/default-applications/interface.c:352
+#: capplets/default-applications/interface.c:1
 msgid "Please enter the command line used to start this web browser"
 msgstr "Wiersz polecenia uruchamiającego przeglądarkę WWW"
 
-#: capplets/default-applications/interface.c:363
+#: capplets/default-applications/interface.c:1
 msgid "Web Browser"
 msgstr "Przeglądarka WWW"
 
-#: capplets/default-applications/interface.c:370
+#: capplets/default-applications/interface.c:1
 msgid "Default Help Viewer"
 msgstr "Domyślna przeglądarka pomocy"
 
-#: capplets/default-applications/interface.c:387
+#: capplets/default-applications/interface.c:1
 msgid "Select a Viewer"
 msgstr "Wybór przeglądarki pomocy z listy"
 
-#: capplets/default-applications/interface.c:396
+#: capplets/default-applications/interface.c:1
 msgid "With this option you can select a predefined help viewer."
 msgstr ""
 "Za pomocą tej opcji można wybrać domyślną przeglądarkę pomocy jako jedną z "
 "listy predefiniowanych."
 
-#: capplets/default-applications/interface.c:416
+#: capplets/default-applications/interface.c:1
 msgid "Custom Help Viewer"
 msgstr "Dowolna przeglądarka pomocy"
 
-#: capplets/default-applications/interface.c:425
+#: capplets/default-applications/interface.c:1
 msgid "With this option you can create your own help viewer"
 msgstr "Opcja ta pozwala na podanie własnej przeglądarki pomocy."
 
-#: capplets/default-applications/interface.c:444
+#: capplets/default-applications/interface.c:1
 msgid "Does this help viewer need an xterm for display?"
 msgstr "Określa, czy przeglądarka wymaga otwarcia okna terminala."
 
-#: capplets/default-applications/interface.c:446
+#: capplets/default-applications/interface.c:1
 msgid "Accepts URLs"
 msgstr "Obsługa URL-i"
 
-#: capplets/default-applications/interface.c:454
+#: capplets/default-applications/interface.c:1
 msgid "Does this help viewer allow URLs for help?"
 msgstr ""
 "Określa, czy przeglądarka dopuszcza podanie lokalizacji pliku pomocy w "
 "postaci URL-a."
 
-#: capplets/default-applications/interface.c:483
+#: capplets/default-applications/interface.c:1
 msgid "Please enter the command line used to start this help viewer"
 msgstr "Wiersz polecenia uruchamiającego przeglądarkę pomocy"
 
-#: capplets/default-applications/interface.c:494
+#: capplets/default-applications/interface.c:1
 msgid "Help Viewer"
 msgstr "Przeglądarka pomocy"
 
-#: capplets/default-applications/interface.c:501
-#, fuzzy
+#: capplets/default-applications/interface.c:1
 msgid "Default Terminal"
-msgstr "Wybór terminala z listy"
+msgstr "Domyślny terminal"
 
-#: capplets/default-applications/interface.c:518
+#: capplets/default-applications/interface.c:1
 msgid "Select a Terminal"
 msgstr "Wybór terminala z listy"
 
-#: capplets/default-applications/interface.c:527
+#: capplets/default-applications/interface.c:1
 msgid "With this option you can select a predefined terminal."
 msgstr ""
 "Za pomocą tej opcji można wybrać domyślny terminal jako jeden z listy "
 "predefiniowanych."
 
-#: capplets/default-applications/interface.c:547
+#: capplets/default-applications/interface.c:1
 msgid "Custom Terminal"
 msgstr "Dowolny terminal"
 
-#: capplets/default-applications/interface.c:556
+#: capplets/default-applications/interface.c:1
 msgid "With this option you can create your own terminal"
 msgstr "Opcja ta pozwala na podanie własnego terminala."
 
-#: capplets/default-applications/interface.c:586
+#: capplets/default-applications/interface.c:1
 msgid "Exec Flag:"
 msgstr "Opcja wykonania:"
 
-#: capplets/default-applications/interface.c:604
+#: capplets/default-applications/interface.c:1
 msgid ""
 "Please enter the flag used by this terminal to specify the command to run on "
 "startup.  For example, in 'xterm' this would be '-e'."
@@ -478,21 +475,21 @@ msgstr ""
 "na podanie nazwy programu uruchamianego w terminalu. W przypadku terminala "
 "xterm jest to np. \"-e\"."
 
-#: capplets/default-applications/interface.c:614
+#: capplets/default-applications/interface.c:1
 msgid "Please enter the command line used to start this terminal"
 msgstr "Wiersz polecenia uruchamiającego terminal"
 
-#: capplets/default-applications/interface.c:625
+#: capplets/default-applications/interface.c:1
 msgid "Terminal"
 msgstr "Terminal"
 
-#: capplets/default-applications/support.c:100
-#: capplets/default-applications/support.c:138
+#: capplets/default-applications/support.c:1
+#: capplets/default-applications/support.c:1
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Nie można odnaleźć pliku z piksmapą: %s"
 
-#: capplets/default-applications/support.c:116
+#: capplets/default-applications/support.c:1
 #, c-format
 msgid "Couldn't create pixmap from file: %s"
 msgstr "Nie można stworzyć piksmapy z pliku: %s"
@@ -501,16 +498,16 @@ msgstr "Nie mo
 msgid "Options for the startup hint dialog"
 msgstr "Opcje dotyczące porad wyświetlanych przy rozpoczęciu pracy z GNOME"
 
-#: capplets/desktop-links/gnome-hint-properties.desktop.in.h:2
+#: capplets/desktop-links/gnome-hint-properties.desktop.in.h:1
 msgid "Startup Hint"
 msgstr "Porada dnia"
 
-#: capplets/keyboard/keyboard-properties.glade.h:9
+#: capplets/keyboard/keyboard-properties.glade.h:1
 #: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard"
 msgstr "Klawiatura"
 
-#: capplets/keyboard/keyboard.desktop.in.in.h:2
+#: capplets/keyboard/keyboard.desktop.in.in.h:1
 msgid "Keyboard Properties"
 msgstr "Ustawienia klawiatury"
 
@@ -518,69 +515,91 @@ msgstr "Ustawienia klawiatury"
 msgid "Bell"
 msgstr "Dzwonek"
 
-#: capplets/keyboard/keyboard-properties.glade.h:2
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Click volume"
 msgstr "Głośność kliknięcia"
 
-#: capplets/keyboard/keyboard-properties.glade.h:3
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Delay before repeat:"
 msgstr "Opóźnienie przed powtarzaniem:"
 
-#: capplets/keyboard/keyboard-properties.glade.h:4
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Duration (ms)"
 msgstr "Czas trwania (ms)"
 
-#: capplets/keyboard/keyboard-properties.glade.h:5
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Enable Keyboard Click"
 msgstr "Kliknięcia klawiatury"
 
-#: capplets/keyboard/keyboard-properties.glade.h:6
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Enable Keyboard Repeat"
 msgstr "Automatyczne powtarzanie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:7
+#: capplets/keyboard/keyboard-properties.glade.h:1
 #: capplets/mouse/mouse-properties.glade.h:1
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/bsod.xml.h:1
+#: capplets/screensaver/screensavers/compass.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Fast"
 msgstr "Szybkie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:8
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Key repeat rate:"
 msgstr "Tempo powtarzania:"
 
-#: capplets/keyboard/keyboard-properties.glade.h:10
+#: capplets/keyboard/keyboard-properties.glade.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Long"
 msgstr "Długie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:11
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Medium"
 msgstr "Średnie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:12
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Pitch (Hz)"
 msgstr "Wysokość (Hz)"
 
-#: capplets/keyboard/keyboard-properties.glade.h:13
+#: capplets/keyboard/keyboard-properties.glade.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Short"
 msgstr "Krótkie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:14
-#: capplets/mouse/mouse-properties.glade.h:10
+#: capplets/keyboard/keyboard-properties.glade.h:1
+#: capplets/mouse/mouse-properties.glade.h:1
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/bsod.xml.h:1
+#: capplets/screensaver/screensavers/compass.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Slow"
 msgstr "Wolne"
 
-#: capplets/keyboard/keyboard-properties.glade.h:15
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Test"
 msgstr "Test"
 
-#: capplets/keyboard/keyboard-properties.glade.h:16
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Very fast"
 msgstr "Bardzo szybkie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:17
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Very long"
 msgstr "Bardzo długie"
 
-#: capplets/keyboard/keyboard-properties.glade.h:18
+#: capplets/keyboard/keyboard-properties.glade.h:1
 msgid "Volume"
 msgstr "Głośność"
 
@@ -588,94 +607,96 @@ msgstr "G
 msgid "Mouse"
 msgstr "Mysz"
 
-#: capplets/mouse/mouse.desktop.in.in.h:2
+#: capplets/mouse/mouse.desktop.in.in.h:1
 msgid "Mouse Properties"
 msgstr "Ustawienia myszy"
 
-#: capplets/mouse/mouse-properties.glade.h:2
+#: capplets/mouse/mouse-properties.glade.h:1
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "High"
 msgstr "Wysoka"
 
-#: capplets/mouse/mouse-properties.glade.h:3
+#: capplets/mouse/mouse-properties.glade.h:1
 msgid "Left handed"
 msgstr "Dla leworęcznych"
 
-#: capplets/mouse/mouse-properties.glade.h:4
+#: capplets/mouse/mouse-properties.glade.h:1
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Low"
 msgstr "Niska"
 
-#: capplets/mouse/mouse-properties.glade.h:5
+#: capplets/mouse/mouse-properties.glade.h:1
 msgid "Mouse Configuration"
 msgstr "Konfiguracja myszy"
 
-#: capplets/mouse/mouse-properties.glade.h:6
+#: capplets/mouse/mouse-properties.glade.h:1
 msgid "Mouse speed:"
 msgstr "Tempo ruchu myszy:"
 
-#: capplets/mouse/mouse-properties.glade.h:7
+#: capplets/mouse/mouse-properties.glade.h:1
 msgid "My mouse is:"
 msgstr "Ustawienie myszy:"
 
-#: capplets/mouse/mouse-properties.glade.h:8
+#: capplets/mouse/mouse-properties.glade.h:1
 msgid "Right handed"
 msgstr "Dla praworęcznych"
 
-#: capplets/mouse/mouse-properties.glade.h:9
+#: capplets/mouse/mouse-properties.glade.h:1
 msgid "Sensitivity:"
 msgstr "Czułość:"
 
-#: capplets/screensaver/preferences.c:786
+#: capplets/screensaver/preferences.c:1
 msgid "Custom screensaver. No description available"
 msgstr "Dowolny wygaszacz ekranu. Brak opisu."
 
-#: capplets/screensaver/prefs-widget.c:202
-msgid "Use"
-msgstr "Używany"
-
-#: capplets/screensaver/prefs-widget.c:202
-#: capplets/screensaver/screensaver.desktop.in.in.h:2
+#: capplets/screensaver/prefs-widget.c:1
+#: capplets/screensaver/screensaver.desktop.in.in.h:1
 msgid "Screensaver"
 msgstr "Wygaszacz ekranu"
 
-#: capplets/screensaver/prefs-widget.c:924
+#: capplets/screensaver/prefs-widget.c:1
 #, c-format
 msgid "About %s\n"
-msgstr ""
+msgstr "Informacje o %s\n"
 
 #: capplets/screensaver/screensaver.desktop.in.in.h:1
 msgid "Configure the settings of the screensaver"
 msgstr "Konfiguruje ustawienia wygaszacza ekranu"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:185
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:197
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:204
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Description"
 msgstr "Opis"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:207
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "label1"
 msgstr "etykieta1"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:216
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Demo"
 msgstr "Demonstracja"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:274
-#, fuzzy, c-format
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
+#, c-format
 msgid "%s properties"
-msgstr "Ustawienia myszy"
+msgstr "Ustawienia wygaszacza %s"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:1366
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "There are no configurable settings for this screensaver."
 msgstr "Z tym wygaszaczem ekranu nie są związane żadne ustawienia."
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:1375
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid ""
 "Cannot find the data to configure this screensaver. Please edit the command "
 "line below."
@@ -683,16 +704,16 @@ msgstr ""
 "Nie można odnaleźć danych potrzebnych do skonfigurowania wygaszacza. "
 "Zmodyfikuj znajdujący się poniżej wiersz poleceń."
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:1380
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Please enter a command line below."
 msgstr "Wprowadź poniżej wiersz polecenia."
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:1395
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Visual:"
 msgstr "Tryb wyświetlania:"
 
-#: capplets/screensaver/screensaver-prefs-dialog.c:1424
-#: capplets/screensaver/screensaver-prefs-dialog.c:1715
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
+#: capplets/screensaver/screensaver-prefs-dialog.c:1
 msgid "Any"
 msgstr "Dowolny"
 
@@ -700,128 +721,145 @@ msgstr "Dowolny"
 msgid " Configure..."
 msgstr " Skonfiguruj..."
 
-#: capplets/screensaver/screensaver-properties.glade.h:2
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "About \"<Screensaver name>\""
 msgstr "Informacje o wygaszaczu \"<Screensaver name>\""
 
-#: capplets/screensaver/screensaver-properties.glade.h:3
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Black screen only"
 msgstr "Tylko czarny ekran"
 
-#: capplets/screensaver/screensaver-properties.glade.h:4
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Configure Power Management"
 msgstr "Konfiguracja zarządzania poborem energii"
 
-#: capplets/screensaver/screensaver-properties.glade.h:5
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Disable screensaver"
 msgstr "Bez wygaszacza ekranu"
 
-#: capplets/screensaver/screensaver-properties.glade.h:6
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid ""
 "Draws quasiperiodic tilings; think of the implications on modern formica "
 "technology. Written by Time Korlove. In April 1997, Sir Roger Penrose, a "
 "British math professor who has worked with Stephen Hawking on such topics as "
-"relatvity, black holes, and whether time has a beginning, files a copyright-"
-"infringement lawsuit against Kimberly-Clark Corporation, wchih Penrose said "
-"copied a pattern he created ( apattern demonstrating that \"a nonrepeating "
-"pattern could exist in nature\") for its Kleenex quilted toilet paper. "
+"relatvity, black holes, and whether time has a beginning, files a "
+"copyright-infringement lawsuit against Kimberly-Clark Corporation, wchih "
+"Penrose said copied a pattern he created ( apattern demonstrating that \"a "
+"nonrepeating pattern could exist in nature\") for its Kleenex quilted toilet "
+"paper. "
 msgstr ""
 
-#: capplets/screensaver/screensaver-properties.glade.h:7
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Enable _power management"
 msgstr "Z_arządzanie poborem energii"
 
-#: capplets/screensaver/screensaver-properties.glade.h:8
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Go to standby mode after"
 msgstr "Przejście w tryb oczekiwania po"
 
-#: capplets/screensaver/screensaver-properties.glade.h:9
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Go to suspend mode after"
 msgstr "Przejście w tryb uśpienia po"
 
-#: capplets/screensaver/screensaver-properties.glade.h:10
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "One screensaver all the time"
 msgstr "Przez cały czas jeden wygaszacz"
 
-#: capplets/screensaver/screensaver-properties.glade.h:11
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Preview"
 msgstr "Podgląd"
 
-#: capplets/screensaver/screensaver-properties.glade.h:12
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "R_equire password to unlock screen"
 msgstr "_Wymaganie hasła przed odblokowaniem ekranu"
 
-#: capplets/screensaver/screensaver-properties.glade.h:13
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Random (all screensavers)"
 msgstr "Losowy (spośród wszystkich)"
 
-#: capplets/screensaver/screensaver-properties.glade.h:14
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Random (checked screensavers)"
 msgstr "Losowy (spośród zaznaczonych)"
 
-#: capplets/screensaver/screensaver-properties.glade.h:15
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "S_tart screensaver after "
 msgstr "_Uruchamianie wygaszacza po "
 
-#: capplets/screensaver/screensaver-properties.glade.h:16
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "S_witch screensavers after "
 msgstr "_Zmiana wygaszacza po "
 
-#: capplets/screensaver/screensaver-properties.glade.h:17
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Settings for \"<Screensaver name>\""
 msgstr "Ustawienia wygaszacza \"<Screensaver name>\""
 
-#: capplets/screensaver/screensaver-properties.glade.h:18
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "Shut down monitor after"
 msgstr "Wyłączanie monitora po"
 
-#: capplets/screensaver/screensaver-properties.glade.h:19
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid ""
 "There are no configurable settings for this\n"
 "screensaver. "
 msgstr "Z tym wygaszaczem ekranu nie są związane żadne ustawienia."
 
-#: capplets/screensaver/screensaver-properties.glade.h:21
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "_About this screensaver..."
 msgstr "_Informacje o tym wygaszaczu ekranu..."
 
-#: capplets/screensaver/screensaver-properties.glade.h:22
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: capplets/screensaver/screensaver-properties.glade.h:23
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "_Mode:"
 msgstr "_Tryb:"
 
-#: capplets/screensaver/screensaver-properties.glade.h:24
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: capplets/screensaver/screensaver-properties.glade.h:25
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "_Settings"
 msgstr "_Ustawienia"
 
-#: capplets/screensaver/screensaver-properties.glade.h:26
+#: capplets/screensaver/screensaver-properties.glade.h:1
 msgid "minutes"
 msgstr "min."
 
 #: capplets/screensaver/screensavers/3d_clock.xml.h:1
 msgid "3d clock"
-msgstr ""
+msgstr "Zegar 3d"
 
-#: capplets/screensaver/screensavers/3d_clock.xml.h:2
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
+msgid "Large"
+msgstr "Duże"
+
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: capplets/screensaver/screensavers/3d_clock.xml.h:3
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
+msgid "Small"
+msgstr "Małe"
+
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
 msgid "Twist speed:"
 msgstr ""
 
-#: capplets/screensaver/screensavers/3d_clock.xml.h:4
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
 msgid "Twist:"
 msgstr ""
 
-#: capplets/screensaver/screensavers/3d_clock.xml.h:5
+#: capplets/screensaver/screensavers/3d_clock.xml.h:1
 msgid "Wobble:"
 msgstr ""
 
@@ -833,98 +871,107 @@ msgid ""
 "influenced.  Written by David Bagley."
 msgstr ""
 
-#: capplets/screensaver/screensavers/ant.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Ant"
-msgstr "Dowolny"
+msgstr "Mrówka"
 
-#: capplets/screensaver/screensavers/ant.xml.h:3
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Four Sided cells"
-msgstr ""
+msgstr "Komórki czterokątne"
 
-#: capplets/screensaver/screensavers/ant.xml.h:4
-#: capplets/screensaver/screensavers/attraction.xml.h:4
-#: capplets/screensaver/screensavers/bsod.xml.h:3
-#: capplets/screensaver/screensavers/compass.xml.h:3
-#: capplets/screensaver/screensavers/flag.xml.h:3
-#: capplets/screensaver/screensavers/qix.xml.h:3
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/bsod.xml.h:1
+#: capplets/screensaver/screensavers/compass.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Full Color"
-msgstr ""
+msgstr "Pełnia kolorów"
 
-#: capplets/screensaver/screensavers/ant.xml.h:5
-#: capplets/screensaver/screensavers/attraction.xml.h:12
-#: capplets/screensaver/screensavers/bsod.xml.h:4
-#: capplets/screensaver/screensavers/compass.xml.h:4
-#: capplets/screensaver/screensavers/flag.xml.h:4
-#: capplets/screensaver/screensavers/qix.xml.h:6
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+msgid "Many"
+msgstr "Wiele"
+
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/bsod.xml.h:1
+#: capplets/screensaver/screensavers/compass.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Monochrome"
 msgstr "Monochromatyczny"
 
-#: capplets/screensaver/screensavers/ant.xml.h:6
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Nine Sided cells"
-msgstr ""
+msgstr "Komórki dziewięciokątne"
 
-#: capplets/screensaver/screensavers/ant.xml.h:7
-#: capplets/screensaver/screensavers/flag.xml.h:5
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Number of colours"
 msgstr "Liczba kolorów"
 
-#: capplets/screensaver/screensavers/ant.xml.h:8
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Random"
 msgstr "Losowa"
 
-#: capplets/screensaver/screensavers/ant.xml.h:9
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Random size upto"
-msgstr ""
+msgstr "Losowy rozmiar do"
 
-#: capplets/screensaver/screensavers/ant.xml.h:10
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Randomize"
-msgstr ""
+msgstr "Losowanie"
 
-#: capplets/screensaver/screensavers/ant.xml.h:11
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Sharp turns"
 msgstr ""
 
-#: capplets/screensaver/screensavers/ant.xml.h:12
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Six Sided cells"
-msgstr ""
+msgstr "Komórki sześciokątne"
 
-#: capplets/screensaver/screensavers/ant.xml.h:13
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Specific"
-msgstr ""
+msgstr "Określona"
 
-#: capplets/screensaver/screensavers/ant.xml.h:14
-#: capplets/screensaver/screensavers/flag.xml.h:7
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Specific size of"
-msgstr ""
+msgstr "Określony rozmiar"
 
-#: capplets/screensaver/screensavers/ant.xml.h:15
-#: capplets/screensaver/screensavers/attraction.xml.h:15
-#: capplets/screensaver/screensavers/bsod.xml.h:5
-#: capplets/screensaver/screensavers/compass.xml.h:5
-#: capplets/screensaver/screensavers/flag.xml.h:8
-#: capplets/screensaver/screensavers/qix.xml.h:12
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/bsod.xml.h:1
+#: capplets/screensaver/screensavers/compass.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Speed"
-msgstr "Szybkość"
+msgstr "Tempo"
 
-#: capplets/screensaver/screensavers/ant.xml.h:16
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Three Sided cells"
-msgstr ""
+msgstr "Komórki trójkątne"
 
-#: capplets/screensaver/screensavers/ant.xml.h:17
-#: capplets/screensaver/screensavers/flag.xml.h:11
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Timeout"
 msgstr "Opóźnienie"
 
-#: capplets/screensaver/screensavers/ant.xml.h:18
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Truchet lines"
 msgstr ""
 
-#: capplets/screensaver/screensavers/ant.xml.h:19
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "Twelve Sided cells"
-msgstr ""
+msgstr "Komórki dwunastokątne"
 
-#: capplets/screensaver/screensavers/ant.xml.h:20
+#: capplets/screensaver/screensavers/ant.xml.h:1
+#: capplets/screensaver/screensavers/flag.xml.h:1
+msgid "Two"
+msgstr "Dwa"
+
+#: capplets/screensaver/screensavers/ant.xml.h:1
 msgid "number of Ants"
 msgstr "liczba mrówek"
 
@@ -932,7 +979,7 @@ msgstr "liczba mr
 msgid "Atlantis"
 msgstr ""
 
-#: capplets/screensaver/screensavers/atlantis.xml.h:2
+#: capplets/screensaver/screensavers/atlantis.xml.h:1
 msgid ""
 "This is xfishtank writ large: a GL animation of a number of sharks, "
 "dolphins, and whales.  The swimming motions are great.  Originally written "
@@ -940,23 +987,22 @@ msgid ""
 msgstr ""
 
 #: capplets/screensaver/screensavers/attraction.xml.h:1
-#, fuzzy
 msgid "Attraction (balls)"
-msgstr "Czas trwania (ms)"
+msgstr ""
 
-#: capplets/screensaver/screensavers/attraction.xml.h:2
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid "Balls"
 msgstr "Piłki"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:3
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid "Color Contrast"
-msgstr "Kontrast kolorów"
+msgstr "Wartość kontrastu kolorów"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:5
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid "Length of Trail"
-msgstr "Długiść smugi"
+msgstr "Długości smug"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:6
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid ""
 "Like qix, this uses a simple motion model to generate many different display "
 "modes.  The control points attract each other up to a certain distance, and "
@@ -973,35 +1019,35 @@ msgid ""
 "Written by Jamie Zawinski, based on Lisp code by John Pezaris."
 msgstr ""
 
-#: capplets/screensaver/screensavers/attraction.xml.h:11
-#: capplets/screensaver/screensavers/qix.xml.h:5
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Lines"
 msgstr "Linie"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:13
-#: capplets/screensaver/screensavers/braid.xml.h:4
-#: capplets/screensaver/screensavers/fadeplot.xml.h:5
-#: capplets/screensaver/screensavers/sierpinski.xml.h:2
-#: capplets/screensaver/screensavers/spiral.xml.h:3
-#: capplets/screensaver/screensavers/triangle.xml.h:3
-#: capplets/screensaver/screensavers/vines.xml.h:2
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/braid.xml.h:1
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+#: capplets/screensaver/screensavers/triangle.xml.h:1
+#: capplets/screensaver/screensavers/vines.xml.h:1
 msgid "Number of Colors"
 msgstr "Liczba kolorów"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:14
-#: capplets/screensaver/screensavers/qix.xml.h:9
+#: capplets/screensaver/screensavers/attraction.xml.h:1
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Polygons"
 msgstr "Wielokąty"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:16
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid "Splines"
 msgstr "Krzywe"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:17
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid "Tails"
 msgstr "Warkocze"
 
-#: capplets/screensaver/screensavers/attraction.xml.h:18
+#: capplets/screensaver/screensavers/attraction.xml.h:1
 msgid "Threshold of repulsion"
 msgstr ""
 
@@ -1009,7 +1055,7 @@ msgstr ""
 msgid "Blaster"
 msgstr ""
 
-#: capplets/screensaver/screensavers/blaster.xml.h:2
+#: capplets/screensaver/screensavers/blaster.xml.h:1
 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 "
@@ -1020,35 +1066,35 @@ msgstr ""
 msgid "BlitSpin"
 msgstr ""
 
-#: capplets/screensaver/screensavers/blitspin.xml.h:2
-#: capplets/screensaver/screensavers/bouboule.xml.h:2
-#: capplets/screensaver/screensavers/braid.xml.h:2
-#: capplets/screensaver/screensavers/bubbles.xml.h:3
-#: capplets/screensaver/screensavers/crystal.xml.h:4
-#: capplets/screensaver/screensavers/cynosure.xml.h:3
-#: capplets/screensaver/screensavers/decayscreen.xml.h:2
-#: capplets/screensaver/screensavers/discrete.xml.h:2
+#: capplets/screensaver/screensavers/blitspin.xml.h:1
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/braid.xml.h:1
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/decayscreen.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
 #: capplets/screensaver/screensavers/drift.xml.h:1
 #: capplets/screensaver/screensavers/epicycle.xml.h:1
 #: capplets/screensaver/screensavers/fadeplot.xml.h:1
-#: capplets/screensaver/screensavers/flame.xml.h:2
-#: capplets/screensaver/screensavers/forest.xml.h:2
+#: capplets/screensaver/screensavers/flame.xml.h:1
+#: capplets/screensaver/screensavers/forest.xml.h:1
 #: capplets/screensaver/screensavers/goop.xml.h:1
 #: capplets/screensaver/screensavers/grav.xml.h:1
 #: capplets/screensaver/screensavers/greynetic.xml.h:1
-#: capplets/screensaver/screensavers/halo.xml.h:3
+#: capplets/screensaver/screensavers/halo.xml.h:1
 #: capplets/screensaver/screensavers/helix.xml.h:1
 #: capplets/screensaver/screensavers/hopalong.xml.h:1
 #: capplets/screensaver/screensavers/hypercube.xml.h:1
 #: capplets/screensaver/screensavers/ifs.xml.h:1
 #: capplets/screensaver/screensavers/julia.xml.h:1
-#: capplets/screensaver/screensavers/kaleidescope.xml.h:2
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
 #: capplets/screensaver/screensavers/laser.xml.h:1
 #: capplets/screensaver/screensavers/lightning.xml.h:1
 #: capplets/screensaver/screensavers/lisa.xml.h:1
 #: capplets/screensaver/screensavers/lmorph.xml.h:1
 #: capplets/screensaver/screensavers/moire.xml.h:1
-#: capplets/screensaver/screensavers/munch.xml.h:9
+#: capplets/screensaver/screensavers/munch.xml.h:1
 #: capplets/screensaver/screensavers/pedal.xml.h:1
 #: capplets/screensaver/screensavers/sierpinski.xml.h:1
 #: capplets/screensaver/screensavers/spiral.xml.h:1
@@ -1058,15 +1104,77 @@ msgstr ""
 msgid "Display screensaver in monochrome."
 msgstr "Wyświetlanie wygaszacza ekranu bez kolorów."
 
-#: capplets/screensaver/screensavers/blitspin.xml.h:3
+#: capplets/screensaver/screensavers/blitspin.xml.h:1
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
+#: capplets/screensaver/screensavers/coral.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/decayscreen.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/drift.xml.h:1
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/flame.xml.h:1
+#: capplets/screensaver/screensavers/forest.xml.h:1
+#: capplets/screensaver/screensavers/goop.xml.h:1
+#: capplets/screensaver/screensavers/greynetic.xml.h:1
+#: capplets/screensaver/screensavers/halo.xml.h:1
+#: capplets/screensaver/screensavers/helix.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
+#: capplets/screensaver/screensavers/munch.xml.h:1
+#: capplets/screensaver/screensavers/pyro.xml.h:1
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+msgid "Faster"
+msgstr "Szybciej"
+
+#: capplets/screensaver/screensavers/blitspin.xml.h:1
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
+#: capplets/screensaver/screensavers/coral.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/decayscreen.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/drift.xml.h:1
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/flame.xml.h:1
+#: capplets/screensaver/screensavers/forest.xml.h:1
+#: capplets/screensaver/screensavers/goop.xml.h:1
+#: capplets/screensaver/screensavers/greynetic.xml.h:1
+#: capplets/screensaver/screensavers/halo.xml.h:1
+#: capplets/screensaver/screensavers/helix.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
+#: capplets/screensaver/screensavers/munch.xml.h:1
+#: capplets/screensaver/screensavers/pyro.xml.h:1
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+msgid "Slower"
+msgstr "Wolniej"
+
+#: capplets/screensaver/screensavers/blitspin.xml.h:1
 msgid "Speed of rotation."
-msgstr ""
+msgstr "Szybkość obrotu."
 
-#: capplets/screensaver/screensavers/blitspin.xml.h:4
+#: capplets/screensaver/screensavers/blitspin.xml.h:1
 msgid "Speed of the 90 degree rotation."
-msgstr ""
+msgstr "Szybkość obrotu o 90 stopni."
 
-#: capplets/screensaver/screensavers/blitspin.xml.h:5
+#: capplets/screensaver/screensavers/blitspin.xml.h:1
 msgid ""
 "The ``blitspin'' hack repeatedly rotates a bitmap by 90 degrees by using "
 "logical operations: the bitmap is divided into quadrants, and the quadrants "
@@ -1084,69 +1192,108 @@ msgstr ""
 msgid "Bouboule"
 msgstr ""
 
-#: capplets/screensaver/screensavers/bouboule.xml.h:3
-#: capplets/screensaver/screensavers/crystal.xml.h:7
-#: capplets/screensaver/screensavers/cynosure.xml.h:4
-#: capplets/screensaver/screensavers/discrete.xml.h:4
-#: capplets/screensaver/screensavers/drift.xml.h:5
-#: capplets/screensaver/screensavers/forest.xml.h:4
-#: capplets/screensaver/screensavers/grav.xml.h:3
-#: capplets/screensaver/screensavers/halo.xml.h:5
-#: capplets/screensaver/screensavers/hopalong.xml.h:3
-#: capplets/screensaver/screensavers/ifs.xml.h:3
-#: capplets/screensaver/screensavers/julia.xml.h:3
-#: capplets/screensaver/screensavers/lightning.xml.h:3
-#: capplets/screensaver/screensavers/lisa.xml.h:3
-#: capplets/screensaver/screensavers/moire.xml.h:4
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/braid.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/drift.xml.h:1
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/forest.xml.h:1
+#: capplets/screensaver/screensavers/grav.xml.h:1
+#: capplets/screensaver/screensavers/halo.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/ifs.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/lightning.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+#: capplets/screensaver/screensavers/triangle.xml.h:1
+#: capplets/screensaver/screensavers/vines.xml.h:1
+msgid "Colors:"
+msgstr "Kolory:"
+
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/drift.xml.h:1
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/forest.xml.h:1
+#: capplets/screensaver/screensavers/goop.xml.h:1
+#: capplets/screensaver/screensavers/grav.xml.h:1
+#: capplets/screensaver/screensavers/halo.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/pyro.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+msgid "Count:"
+msgstr ""
+
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/drift.xml.h:1
+#: capplets/screensaver/screensavers/forest.xml.h:1
+#: capplets/screensaver/screensavers/grav.xml.h:1
+#: capplets/screensaver/screensavers/halo.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/ifs.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/lightning.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
 msgid "Number of Colors."
 msgstr "Liczba kolorów."
 
-#: capplets/screensaver/screensavers/bouboule.xml.h:4
-#: capplets/screensaver/screensavers/goop.xml.h:4
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/goop.xml.h:1
 msgid "Number of bubbles to use."
 msgstr "Liczba bąbelków."
 
-#: capplets/screensaver/screensavers/bouboule.xml.h:5
-#: capplets/screensaver/screensavers/bubbles.xml.h:6
-#: capplets/screensaver/screensavers/coral.xml.h:5
-#: capplets/screensaver/screensavers/crystal.xml.h:9
-#: capplets/screensaver/screensavers/cynosure.xml.h:6
-#: capplets/screensaver/screensavers/decayscreen.xml.h:3
-#: capplets/screensaver/screensavers/discrete.xml.h:6
-#: capplets/screensaver/screensavers/drift.xml.h:7
-#: capplets/screensaver/screensavers/epicycle.xml.h:3
-#: capplets/screensaver/screensavers/flame.xml.h:6
-#: capplets/screensaver/screensavers/goop.xml.h:5
-#: capplets/screensaver/screensavers/greynetic.xml.h:3
-#: capplets/screensaver/screensavers/halo.xml.h:7
-#: capplets/screensaver/screensavers/hopalong.xml.h:5
-#: capplets/screensaver/screensavers/hypercube.xml.h:4
-#: capplets/screensaver/screensavers/jigsaw.xml.h:2
-#: capplets/screensaver/screensavers/julia.xml.h:5
-#: capplets/screensaver/screensavers/kaleidescope.xml.h:6
-#: capplets/screensaver/screensavers/lisa.xml.h:6
-#: capplets/screensaver/screensavers/lmorph.xml.h:6
-#: capplets/screensaver/screensavers/moire.xml.h:5
-#: capplets/screensaver/screensavers/munch.xml.h:12
-#: capplets/screensaver/screensavers/spiral.xml.h:5
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
+#: capplets/screensaver/screensavers/coral.xml.h:1
+#: capplets/screensaver/screensavers/crystal.xml.h:1
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/decayscreen.xml.h:1
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/drift.xml.h:1
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
+#: capplets/screensaver/screensavers/flame.xml.h:1
+#: capplets/screensaver/screensavers/goop.xml.h:1
+#: capplets/screensaver/screensavers/greynetic.xml.h:1
+#: capplets/screensaver/screensavers/halo.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
+#: capplets/screensaver/screensavers/jigsaw.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
+#: capplets/screensaver/screensavers/munch.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
 msgid "Speed of Motion."
 msgstr "Szybkość ruchu."
 
-#: capplets/screensaver/screensavers/bouboule.xml.h:6
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
 msgid ""
 "This draws what looks like a spinning, deforming baloon with varying-sized "
 "spots painted on its invisible surface.  Written by Jeremie Petit."
 msgstr ""
 
-#: capplets/screensaver/screensavers/bouboule.xml.h:7
+#: capplets/screensaver/screensavers/bouboule.xml.h:1
 msgid "Use red/blue 3d seperation."
-msgstr ""
+msgstr "Separacja czerwonego i niebieskiego."
 
 #: capplets/screensaver/screensavers/braid.xml.h:1
 msgid "Braid"
 msgstr ""
 
-#: capplets/screensaver/screensavers/braid.xml.h:3
+#: capplets/screensaver/screensavers/braid.xml.h:1
 msgid ""
 "Draws random color-cycling inter-braided concentric circles.  Written by "
 "John Neil."
@@ -1156,7 +1303,7 @@ msgstr ""
 msgid "BSOD"
 msgstr ""
 
-#: capplets/screensaver/screensavers/bsod.xml.h:2
+#: capplets/screensaver/screensavers/bsod.xml.h:1
 msgid ""
 "BSOD stands for ``Blue Screen of Death.''  The finest in personal computer "
 "emulation, this hack simulates popular screen savers from a number of less "
@@ -1165,9 +1312,9 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/bubble3d.xml.h:1
 msgid "Bubble3D"
-msgstr ""
+msgstr "Bąble3D"
 
-#: capplets/screensaver/screensavers/bubble3d.xml.h:2
+#: capplets/screensaver/screensavers/bubble3d.xml.h:1
 msgid ""
 "Draws a stream of rising, undulating 3D bubbles, rising toward the top of "
 "the screen, with nice specular reflections.  Written by Richard Jones."
@@ -1175,25 +1322,26 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/bubbles.xml.h:1
 msgid "Bubbles"
-msgstr ""
+msgstr "Bąble"
 
-#: capplets/screensaver/screensavers/bubbles.xml.h:2
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
 msgid "Bubbles exist in three dimensions."
-msgstr ""
+msgstr "Bąble trójwymiarowe."
 
-#: capplets/screensaver/screensavers/bubbles.xml.h:4
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
 msgid "Don't hide bubbles when they pop."
 msgstr ""
 
-#: capplets/screensaver/screensavers/bubbles.xml.h:5
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
 msgid "Draw circles instead of pixmap bubbles."
-msgstr ""
+msgstr "Rysowanie okręgów zamiast piksmap z bąblami."
 
-#: capplets/screensaver/screensavers/bubbles.xml.h:7
+#: capplets/screensaver/screensavers/bubbles.xml.h:1
 msgid ""
-"This simulates the kind of bubble formation that happens when water boils:"
-"small bubbles appear, and as they get closer to each other, they combine to "
-"form larger bubbles, which eventually pop.  Written by James Macnicol."
+"This simulates the kind of bubble formation that happens when water "
+"boils:small bubbles appear, and as they get closer to each other, they "
+"combine to form larger bubbles, which eventually pop.  Written by James "
+"Macnicol."
 msgstr ""
 
 #: capplets/screensaver/screensavers/bumps.xml.h:1
@@ -1203,16 +1351,15 @@ msgid ""
 "section of your desktop, based on color intensity.  Written by Shane Smit."
 msgstr ""
 
-#: capplets/screensaver/screensavers/bumps.xml.h:2
+#: capplets/screensaver/screensavers/bumps.xml.h:1
 msgid "Bumps"
 msgstr ""
 
 #: capplets/screensaver/screensavers/cage.xml.h:1
-#, fuzzy
 msgid "Cage"
-msgstr "Obraz:"
+msgstr ""
 
-#: capplets/screensaver/screensavers/cage.xml.h:2
+#: capplets/screensaver/screensavers/cage.xml.h:1
 msgid ""
 "This draws Escher's ``Impossible Cage,'' a 3d analog of a moebius strip, and "
 "rotates it in three dimensions.  Written by Marcelo Vianna."
@@ -1220,9 +1367,9 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/ccurve.xml.h:1
 msgid "C Curve"
-msgstr ""
+msgstr "Krzywa C"
 
-#: capplets/screensaver/screensavers/ccurve.xml.h:2
+#: capplets/screensaver/screensavers/ccurve.xml.h:1
 msgid ""
 "Generates self-similar linear fractals, including the classic ``C Curve.''  "
 "Written by Rick Campbell."
@@ -1230,19 +1377,19 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/compass.xml.h:1
 msgid "Compass"
-msgstr ""
+msgstr "Kompas"
 
-#: capplets/screensaver/screensavers/compass.xml.h:2
+#: capplets/screensaver/screensavers/compass.xml.h:1
 msgid "Don't use double bufferinge"
 msgstr "Bez podwójnego buforowania"
 
-#: capplets/screensaver/screensavers/compass.xml.h:6
+#: capplets/screensaver/screensavers/compass.xml.h:1
 msgid ""
 "This draws a compass, with all elements spinning about randomly, for that "
 "``lost and nauseous'' feeling.  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/compass.xml.h:7
+#: capplets/screensaver/screensavers/compass.xml.h:1
 msgid "Use double buffering"
 msgstr "Podwójne buforowanie"
 
@@ -1250,25 +1397,37 @@ msgstr "Podw
 msgid "Coral"
 msgstr ""
 
-#: capplets/screensaver/screensavers/coral.xml.h:2
+#: capplets/screensaver/screensavers/coral.xml.h:1
+msgid "Denser"
+msgstr "Gęściej"
+
+#: capplets/screensaver/screensavers/coral.xml.h:1
 msgid "Density"
 msgstr "Gęstość"
 
-#: capplets/screensaver/screensavers/coral.xml.h:3
+#: capplets/screensaver/screensavers/coral.xml.h:1
 msgid "Number of seeds"
 msgstr ""
 
-#: capplets/screensaver/screensavers/coral.xml.h:4
+#: capplets/screensaver/screensavers/coral.xml.h:1
+msgid "Seeds"
+msgstr ""
+
+#: capplets/screensaver/screensavers/coral.xml.h:1
 msgid ""
 "Simulates coral growth, albeit somewhat slowly.  This image doesn't really "
 "do it justice.  Written by Frederick Roeber."
 msgstr ""
 
+#: capplets/screensaver/screensavers/coral.xml.h:1
+msgid "Thinner"
+msgstr "Rzadziej"
+
 #: capplets/screensaver/screensavers/cosmos.xml.h:1
 msgid "Cosmos"
 msgstr ""
 
-#: capplets/screensaver/screensavers/cosmos.xml.h:2
+#: capplets/screensaver/screensavers/cosmos.xml.h:1
 msgid ""
 "Draws fireworks and zooming, fading flares.  By Tom Campbell.  You can find "
 "it at <http://www.mindspring.com/~campbell/cosmos/>."
@@ -1278,7 +1437,7 @@ msgstr ""
 msgid "Critical"
 msgstr ""
 
-#: capplets/screensaver/screensavers/critical.xml.h:2
+#: capplets/screensaver/screensavers/critical.xml.h:1
 msgid ""
 "Draws a system of self-organizing lines.  It starts out as random squiggles, "
 "but after a few iterations, order begins to appear.  Written by Martin Pool."
@@ -1288,25 +1447,25 @@ msgstr ""
 msgid "Cell"
 msgstr "Komórka"
 
-#: capplets/screensaver/screensavers/crystal.xml.h:2
+#: capplets/screensaver/screensavers/crystal.xml.h:1
 msgid "Center image."
 msgstr "Wyśrodkowanie obrazu."
 
-#: capplets/screensaver/screensavers/crystal.xml.h:3
+#: capplets/screensaver/screensavers/crystal.xml.h:1
 msgid "Crystal"
-msgstr ""
+msgstr "Kryształ"
 
-#: capplets/screensaver/screensavers/crystal.xml.h:5
+#: capplets/screensaver/screensavers/crystal.xml.h:1
 msgid "Have at maximum size"
-msgstr ""
+msgstr "Maksymalny rozmiar"
 
-#: capplets/screensaver/screensavers/crystal.xml.h:6
+#: capplets/screensaver/screensavers/crystal.xml.h:1
 msgid ""
 "Moving polygons, similar to a kaleidescope (more like a kaleidescope than "
 "the hack called `kaleid,' actually.) This one by Jouk Jansen."
 msgstr ""
 
-#: capplets/screensaver/screensavers/crystal.xml.h:8
+#: capplets/screensaver/screensavers/crystal.xml.h:1
 msgid "Number of polygons to use."
 msgstr "Liczba wielokątów."
 
@@ -1318,12 +1477,32 @@ msgid ""
 "inclusion here."
 msgstr ""
 
-#: capplets/screensaver/screensavers/cynosure.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
 msgid "Cynosure"
-msgstr "Zamknij"
+msgstr ""
 
-#: capplets/screensaver/screensavers/cynosure.xml.h:5
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/flame.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
+#: capplets/screensaver/screensavers/pedal.xml.h:1
+#: capplets/screensaver/screensavers/pyro.xml.h:1
+msgid "Less"
+msgstr "Mniej"
+
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/flame.xml.h:1
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
+#: capplets/screensaver/screensavers/pedal.xml.h:1
+#: capplets/screensaver/screensavers/pyro.xml.h:1
+msgid "More"
+msgstr "Więcej"
+
+#: capplets/screensaver/screensavers/cynosure.xml.h:1
 msgid "Number of iterations."
 msgstr "Liczba iteracji."
 
@@ -1331,7 +1510,7 @@ msgstr "Liczba iteracji."
 msgid "DangerBall"
 msgstr ""
 
-#: capplets/screensaver/screensavers/dangerball.xml.h:2
+#: capplets/screensaver/screensavers/dangerball.xml.h:1
 msgid ""
 "Draws a ball that periodically extrudes many random spikes.  Ouch! Written "
 "by Jamie Zawinski."
@@ -1341,7 +1520,7 @@ msgstr ""
 msgid "DecayScreen"
 msgstr ""
 
-#: capplets/screensaver/screensavers/decayscreen.xml.h:4
+#: capplets/screensaver/screensavers/decayscreen.xml.h:1
 msgid ""
 "This grabs an image of whatever is on your screen, and makes it melt.  "
 "You've no doubt seen this effect before, but no screensaver would really be "
@@ -1360,12 +1539,11 @@ msgstr ""
 msgid "Cycle through colors."
 msgstr ""
 
-#: capplets/screensaver/screensavers/deco.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/deco.xml.h:1
 msgid "Deco"
-msgstr "Demonstracja"
+msgstr ""
 
-#: capplets/screensaver/screensavers/deco.xml.h:3
+#: capplets/screensaver/screensavers/deco.xml.h:1
 msgid ""
 "This one subdivides and colors rectangles randomly.  It looks kind of like "
 "Brady-Bunch-era rec-room wall paneling.  (Raven says: ``this screensaver is "
@@ -1373,15 +1551,24 @@ msgid ""
 "code by Michael Bayne."
 msgstr ""
 
-#: capplets/screensaver/screensavers/deco.xml.h:4
+#: capplets/screensaver/screensavers/deco.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+msgid "Time between redraws:"
+msgstr "Czas pomiędzy kolejnymi odrysowaniami:"
+
+#: capplets/screensaver/screensavers/deco.xml.h:1
 msgid "Use color when drawing."
 msgstr ""
 
+#: capplets/screensaver/screensavers/deco.xml.h:1
+msgid "seconds"
+msgstr ""
+
 #: capplets/screensaver/screensavers/deluxe.xml.h:1
 msgid "Deluxe"
 msgstr ""
 
-#: capplets/screensaver/screensavers/deluxe.xml.h:2
+#: capplets/screensaver/screensavers/deluxe.xml.h:1
 msgid ""
 "This draws a pulsing sequence of stars, circles, and lines.  It would look "
 "better if it was faster, but as far as I can tell, there is no way to make "
@@ -1395,26 +1582,24 @@ msgid ""
 "stripes and spirals.  Written by David Bagley."
 msgstr ""
 
-#: capplets/screensaver/screensavers/demon.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/demon.xml.h:1
 msgid "Demon"
-msgstr "Demonstracja"
+msgstr ""
 
 #: capplets/screensaver/screensavers/discrete.xml.h:1
-#, fuzzy
 msgid "Discrete"
-msgstr "Rozdzielone linie"
+msgstr ""
 
-#: capplets/screensaver/screensavers/discrete.xml.h:3
+#: capplets/screensaver/screensavers/discrete.xml.h:1
 msgid ""
 "More ``discrete map'' systems, including new variants of Hopalong and Julia, "
 "and a few others.  Written by Tim Auckland."
 msgstr ""
 
-#: capplets/screensaver/screensavers/discrete.xml.h:5
-#: capplets/screensaver/screensavers/julia.xml.h:4
-#: capplets/screensaver/screensavers/lisa.xml.h:4
-#: capplets/screensaver/screensavers/spiral.xml.h:4
+#: capplets/screensaver/screensavers/discrete.xml.h:1
+#: capplets/screensaver/screensavers/julia.xml.h:1
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
 msgid "Number to use."
 msgstr ""
 
@@ -1422,33 +1607,33 @@ msgstr ""
 msgid "Distort"
 msgstr ""
 
-#: capplets/screensaver/screensavers/distort.xml.h:2
+#: capplets/screensaver/screensavers/distort.xml.h:1
 msgid ""
 "This hack grabs an image of the screen, and then lets a transparent lens "
 "wander around the screen, magnifying whatever is underneath.  Written by "
 "Jonas Munsin."
 msgstr ""
 
-#: capplets/screensaver/screensavers/drift.xml.h:2
+#: capplets/screensaver/screensavers/drift.xml.h:1
 msgid "Drift"
 msgstr ""
 
-#: capplets/screensaver/screensavers/drift.xml.h:3
+#: capplets/screensaver/screensavers/drift.xml.h:1
 msgid "Fractals should grow."
-msgstr ""
+msgstr "Rozrastanie się fraktali."
 
-#: capplets/screensaver/screensavers/drift.xml.h:4
+#: capplets/screensaver/screensavers/drift.xml.h:1
 msgid ""
 "How could one possibly describe this except as ``drifting recursive fractal "
 "cosmic flames?''  Another fine hack from the Scott Draves collection of fine "
 "hacks."
 msgstr ""
 
-#: capplets/screensaver/screensavers/drift.xml.h:6
+#: capplets/screensaver/screensavers/drift.xml.h:1
 msgid "Number of pixels to use."
 msgstr "Liczba pikseli."
 
-#: capplets/screensaver/screensavers/drift.xml.h:8
+#: capplets/screensaver/screensavers/drift.xml.h:1
 msgid "Use lissajous figures to get points."
 msgstr ""
 
@@ -1456,7 +1641,7 @@ msgstr ""
 msgid "ElectricSheep"
 msgstr ""
 
-#: capplets/screensaver/screensavers/electricsheep.xml.h:2
+#: capplets/screensaver/screensavers/electricsheep.xml.h:1
 msgid ""
 "ElectricSheep is an xscreensaver module that displays mpeg video of an "
 "animated fractal flame.  In the background, it contributes render cycles to "
@@ -1470,11 +1655,17 @@ msgid ""
 "that web site for configuration information."
 msgstr ""
 
-#: capplets/screensaver/screensavers/epicycle.xml.h:2
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
 msgid "Epicycle"
 msgstr ""
 
-#: capplets/screensaver/screensavers/epicycle.xml.h:4
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
+#: capplets/screensaver/screensavers/spiral.xml.h:1
+#: capplets/screensaver/screensavers/starfish.xml.h:1
+msgid "Seconds"
+msgstr ""
+
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
 msgid ""
 "This program 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, "
@@ -1482,8 +1673,8 @@ msgid ""
 "planetary motion.  Written by James Youngman."
 msgstr ""
 
-#: capplets/screensaver/screensavers/epicycle.xml.h:5
-#: capplets/screensaver/screensavers/flame.xml.h:7
+#: capplets/screensaver/screensavers/epicycle.xml.h:1
+#: capplets/screensaver/screensavers/flame.xml.h:1
 msgid "Time finished product is shown."
 msgstr ""
 
@@ -1494,50 +1685,50 @@ msgid ""
 "GL Extrusion library by Linas Vepstas."
 msgstr ""
 
-#: capplets/screensaver/screensavers/extrusion.xml.h:2
+#: capplets/screensaver/screensavers/extrusion.xml.h:1
 msgid "Extrusion"
 msgstr ""
 
-#: capplets/screensaver/screensavers/fadeplot.xml.h:2
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
 msgid ""
 "Draws what looks like a waving ribbon following a sinusoidal path.  Written "
 "by Bas van Gaalen and Charles Vidal."
 msgstr ""
 
-#: capplets/screensaver/screensavers/fadeplot.xml.h:3
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
 msgid "FadePlot"
 msgstr ""
 
-#: capplets/screensaver/screensavers/fadeplot.xml.h:4
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
 msgid "Number"
 msgstr "Liczba"
 
-#: capplets/screensaver/screensavers/fadeplot.xml.h:6
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
 msgid "Number of cycles"
 msgstr ""
 
-#: capplets/screensaver/screensavers/fadeplot.xml.h:7
-#: capplets/screensaver/screensavers/sierpinski.xml.h:4
+#: capplets/screensaver/screensavers/fadeplot.xml.h:1
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
 msgid "Speed of Motion"
-msgstr ""
+msgstr "Tempo ruchu"
 
 #: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Bitmap for flag"
 msgstr "Bitmapa na fladze"
 
-#: capplets/screensaver/screensavers/flag.xml.h:2
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Flag"
-msgstr ""
+msgstr "Flaga"
 
-#: capplets/screensaver/screensavers/flag.xml.h:6
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Random size up to"
 msgstr "Losowy rozmiar aż do"
 
-#: capplets/screensaver/screensavers/flag.xml.h:9
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid "Text for flag"
 msgstr "Napis na fladze"
 
-#: capplets/screensaver/screensavers/flag.xml.h:10
+#: capplets/screensaver/screensavers/flag.xml.h:1
 msgid ""
 "This draws a waving colored flag, that undulates its way around the screen.  "
 "The trick is the flag can contain arbitrary text and images.  By default, it "
@@ -1549,17 +1740,21 @@ msgstr ""
 #: capplets/screensaver/screensavers/flame.xml.h:1
 msgid "Another iterative fractal generator.  Written by Scott Draves."
 msgstr ""
+"Kolejny interaktywny generator fraktali. Napisany przez Scotta Dravesa."
 
-#: capplets/screensaver/screensavers/flame.xml.h:3
-#, fuzzy
+#: capplets/screensaver/screensavers/flame.xml.h:1
 msgid "Flame"
-msgstr "Nazwa:"
+msgstr ""
 
-#: capplets/screensaver/screensavers/flame.xml.h:4
+#: capplets/screensaver/screensavers/flame.xml.h:1
+msgid "Iterations:"
+msgstr "Iteracje:"
+
+#: capplets/screensaver/screensavers/flame.xml.h:1
 msgid "Number of fractals to generate."
 msgstr "Liczba generowanych fraktali."
 
-#: capplets/screensaver/screensavers/flame.xml.h:5
+#: capplets/screensaver/screensavers/flame.xml.h:1
 msgid "Pixels per fractal."
 msgstr "Liczba pikseli przypadających na fraktal."
 
@@ -1569,25 +1764,23 @@ msgid ""
 "strange rotational shapes.  Written by Jeff Butterworth."
 msgstr ""
 
-#: capplets/screensaver/screensavers/flow.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/flow.xml.h:1
 msgid "Flow"
-msgstr "Wolne"
+msgstr ""
 
 #: capplets/screensaver/screensavers/forest.xml.h:1
 msgid "Delay between redraws."
 msgstr "Opóźnienie pomiędzy kolejnymi odrysowaniami."
 
-#: capplets/screensaver/screensavers/forest.xml.h:3
-#, fuzzy
+#: capplets/screensaver/screensavers/forest.xml.h:1
 msgid "Forest"
-msgstr "Test"
+msgstr "Las"
 
-#: capplets/screensaver/screensavers/forest.xml.h:5
+#: capplets/screensaver/screensavers/forest.xml.h:1
 msgid "Number of trees to use."
 msgstr "Liczba drzew."
 
-#: capplets/screensaver/screensavers/forest.xml.h:6
+#: capplets/screensaver/screensavers/forest.xml.h:1
 msgid ""
 "This draws fractal trees.  Written by Peter Baumung.  Everybody loves "
 "fractals, right?"
@@ -1595,9 +1788,9 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/galaxy.xml.h:1
 msgid "Galaxy"
-msgstr ""
+msgstr "Galaktyka"
 
-#: capplets/screensaver/screensavers/galaxy.xml.h:2
+#: capplets/screensaver/screensavers/galaxy.xml.h:1
 msgid ""
 "This draws spinning galaxies, which then collide and scatter their stars to "
 "the, uh, four winds or something.  Originally an Amiga program by Uli "
@@ -1608,7 +1801,7 @@ msgstr ""
 msgid "Gears"
 msgstr ""
 
-#: capplets/screensaver/screensavers/gears.xml.h:2
+#: capplets/screensaver/screensavers/gears.xml.h:1
 msgid ""
 "This draws sets of turning, interlocking gears, rotating in three "
 "dimensions.  Another GL hack, by Danny Sung, Brian Paul, Ed Mackey, and "
@@ -1621,7 +1814,7 @@ msgid ""
 "Josiah Pease."
 msgstr ""
 
-#: capplets/screensaver/screensavers/gflux.xml.h:2
+#: capplets/screensaver/screensavers/gflux.xml.h:1
 msgid "GFlux"
 msgstr ""
 
@@ -1633,9 +1826,9 @@ msgid ""
 "with `ssystem'."
 msgstr ""
 
-#: capplets/screensaver/screensavers/glplanet.xml.h:2
+#: capplets/screensaver/screensavers/glplanet.xml.h:1
 msgid "GLPlanet"
-msgstr ""
+msgstr "PlanetaGL"
 
 #: capplets/screensaver/screensavers/gltext.xml.h:1
 msgid ""
@@ -1643,30 +1836,29 @@ msgid ""
 "Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/gltext.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/gltext.xml.h:1
 msgid "GLText"
-msgstr "Test"
+msgstr "GLTekst"
 
 #: capplets/screensaver/screensavers/goban.xml.h:1
 msgid "Goban"
 msgstr ""
 
-#: capplets/screensaver/screensavers/goban.xml.h:2
+#: capplets/screensaver/screensavers/goban.xml.h:1
 msgid ""
 "Replays historical games of go (aka wei-chi and baduk) on the screen.  By "
 "Scott Draves.  You can find it at <http://www.draves.org/goban/>."
 msgstr ""
 
-#: capplets/screensaver/screensavers/goop.xml.h:2
+#: capplets/screensaver/screensavers/goop.xml.h:1
 msgid "Goop"
 msgstr ""
 
-#: capplets/screensaver/screensavers/goop.xml.h:3
+#: capplets/screensaver/screensavers/goop.xml.h:1
 msgid "Have transparent bubbles."
-msgstr "Przeźroczyste bąbelki."
+msgstr "Przezroczyste bąbelki."
 
-#: capplets/screensaver/screensavers/goop.xml.h:6
+#: capplets/screensaver/screensavers/goop.xml.h:1
 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 "
@@ -1677,37 +1869,37 @@ msgid ""
 "between them.  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/goop.xml.h:7
+#: capplets/screensaver/screensavers/goop.xml.h:1
 msgid "Use additive color model."
 msgstr "Addytywny model kolorów."
 
-#: capplets/screensaver/screensavers/grav.xml.h:2
+#: capplets/screensaver/screensavers/grav.xml.h:1
 msgid "Grav"
 msgstr ""
 
-#: capplets/screensaver/screensavers/grav.xml.h:4
+#: capplets/screensaver/screensavers/grav.xml.h:1
 msgid "Number of planets to use."
 msgstr "Liczba planet."
 
-#: capplets/screensaver/screensavers/grav.xml.h:5
+#: capplets/screensaver/screensavers/grav.xml.h:1
 msgid "Objects should leave trails behind them."
-msgstr ""
+msgstr "Pozostawianie smug po obiektach."
 
-#: capplets/screensaver/screensavers/grav.xml.h:6
+#: capplets/screensaver/screensavers/grav.xml.h:1
 msgid "Orbit should decay."
 msgstr ""
 
-#: capplets/screensaver/screensavers/grav.xml.h:7
+#: capplets/screensaver/screensavers/grav.xml.h:1
 msgid ""
 "This program draws a simple orbital simulation.  If you turn on trails, it "
 "looks kind of like a cloud-chamber photograph.  Written by Greg Bowering."
 msgstr ""
 
-#: capplets/screensaver/screensavers/greynetic.xml.h:2
+#: capplets/screensaver/screensavers/greynetic.xml.h:1
 msgid "Greynetic"
 msgstr ""
 
-#: capplets/screensaver/screensavers/greynetic.xml.h:4
+#: capplets/screensaver/screensavers/greynetic.xml.h:1
 msgid ""
 "This draws random colored and stippled rectangles.  Written by Jamie "
 "Zawinski."
@@ -1715,54 +1907,54 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/halo.xml.h:1
 msgid "Animate circles."
-msgstr ""
+msgstr "Animowanie okręgów."
 
-#: capplets/screensaver/screensavers/halo.xml.h:2
+#: capplets/screensaver/screensavers/halo.xml.h:1
 msgid "Cycle through colormap."
 msgstr ""
 
-#: capplets/screensaver/screensavers/halo.xml.h:4
+#: capplets/screensaver/screensavers/halo.xml.h:1
 msgid "Halo"
 msgstr ""
 
-#: capplets/screensaver/screensavers/halo.xml.h:6
+#: capplets/screensaver/screensavers/halo.xml.h:1
 msgid "Number of circles to use."
 msgstr "Liczba okręgów."
 
-#: capplets/screensaver/screensavers/halo.xml.h:8
+#: capplets/screensaver/screensavers/halo.xml.h:1
 msgid ""
 "This draws trippy psychedelic circular patterns that hurt to look at.  It "
 "can also animate the control-points, but that takes a lot of CPU and "
 "bandwidth.  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/halo.xml.h:9
+#: capplets/screensaver/screensavers/halo.xml.h:1
 msgid "Use a gradient of colors between circles."
-msgstr ""
+msgstr "Gradient kolorów pomiędzy okręgami."
 
-#: capplets/screensaver/screensavers/helix.xml.h:2
+#: capplets/screensaver/screensavers/helix.xml.h:1
 msgid "Helix"
-msgstr ""
+msgstr "Helix"
 
-#: capplets/screensaver/screensavers/helix.xml.h:3
+#: capplets/screensaver/screensavers/helix.xml.h:1
 msgid ""
 "This repeatedly generates spirally string-art-ish patterns.  Written by "
 "Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/helix.xml.h:4
+#: capplets/screensaver/screensavers/helix.xml.h:1
 msgid "Time between redraws."
 msgstr "Czas pomiędzy kolejnymi odrysowaniami."
 
-#: capplets/screensaver/screensavers/hopalong.xml.h:2
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
 msgid "Hopalong"
 msgstr ""
 
-#: capplets/screensaver/screensavers/hopalong.xml.h:4
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
 msgid "Number of pixels before a color change."
 msgstr "Liczba pikseli przed zmianą koloru."
 
-#: capplets/screensaver/screensavers/hopalong.xml.h:6
+#: capplets/screensaver/screensavers/hopalong.xml.h:1
 msgid ""
 "This draws lacy fractal patterns, based on iteration in the imaginary plane, "
 "from a 1986 Scientific American article.  Mostly written by Patrick Naughton."
@@ -1770,24 +1962,32 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/hyperball.xml.h:1
 msgid "Hyperball"
-msgstr ""
+msgstr "Hiperkula"
 
-#: capplets/screensaver/screensavers/hyperball.xml.h:2
+#: capplets/screensaver/screensavers/hyperball.xml.h:1
 msgid ""
 "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.  Written by Joe Keane."
 msgstr ""
 
-#: capplets/screensaver/screensavers/hypercube.xml.h:2
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
+msgid "Closer"
+msgstr "Bliżej"
+
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
 msgid "Distance from center of cube"
 msgstr "Odległość od środka sześcianu"
 
-#: capplets/screensaver/screensavers/hypercube.xml.h:3
-msgid "Hypercube"
-msgstr ""
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
+msgid "Farther"
+msgstr "Dalej"
 
-#: capplets/screensaver/screensavers/hypercube.xml.h:5
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
+msgid "Hypercube"
+msgstr "Hiperkostka"
+
+#: capplets/screensaver/screensavers/hypercube.xml.h:1
 msgid ""
 "This displays 2D projections of the sequence of 3D objects which are the "
 "projections of the 4D analog to the cube: as a square is composed of four "
@@ -1799,11 +1999,11 @@ msgid ""
 "Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/ifs.xml.h:2
+#: capplets/screensaver/screensavers/ifs.xml.h:1
 msgid "IFS"
-msgstr ""
+msgstr "IFS"
 
-#: capplets/screensaver/screensavers/ifs.xml.h:4
+#: capplets/screensaver/screensavers/ifs.xml.h:1
 msgid ""
 "This one draws spinning, colliding iterated-function-system images.  Written "
 "by Massimino Pascal."
@@ -1813,14 +2013,14 @@ msgstr ""
 msgid "IMSmap"
 msgstr ""
 
-#: capplets/screensaver/screensavers/imsmap.xml.h:2
+#: capplets/screensaver/screensavers/imsmap.xml.h:1
 msgid ""
 "This generates random cloud-like patterns.  It looks quite different in "
 "monochrome and color.  The basic idea is to take four points on the edge of "
 "the image, and assign each a random ``elevation''.  Then find the point "
 "between them, and give it a value which is the average of the other four, "
-"plus some small random offset.  Then coloration is done based on "
-"elevation.  \n"
+"plus some small random offset.  Then coloration is done based on elevation.  "
+"\n"
 "\n"
 "The color selection is done by binding the elevation to either hue, "
 "saturation, or brightness, and assigning random values to the others.  The "
@@ -1836,7 +2036,7 @@ msgid ""
 "move.  Written by Hannu Mallat."
 msgstr ""
 
-#: capplets/screensaver/screensavers/interference.xml.h:2
+#: capplets/screensaver/screensavers/interference.xml.h:1
 msgid "Interference"
 msgstr ""
 
@@ -1844,7 +2044,7 @@ msgstr ""
 msgid "Jigsaw"
 msgstr ""
 
-#: capplets/screensaver/screensavers/jigsaw.xml.h:3
+#: capplets/screensaver/screensavers/jigsaw.xml.h:1
 msgid ""
 "This grabs a screen image, carves it up into a jigsaw puzzle, shuffles it, "
 "and then solves the puzzle.  This works especially well when you feed it an "
@@ -1854,11 +2054,11 @@ msgid ""
 "puzzle is solved.  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/julia.xml.h:2
+#: capplets/screensaver/screensavers/julia.xml.h:1
 msgid "Julia"
-msgstr ""
+msgstr "Julia"
 
-#: capplets/screensaver/screensavers/julia.xml.h:6
+#: capplets/screensaver/screensavers/julia.xml.h:1
 msgid ""
 "This one draws spinning, animating (are you detecting a pattern here yet?)  "
 "explorations of the Julia set.  You've probably seen static images of this "
@@ -1876,23 +2076,27 @@ msgid ""
 "variations in the rotational speed might help, too."
 msgstr ""
 
-#: capplets/screensaver/screensavers/kaleidescope.xml.h:3
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
 msgid "Kaleidescope"
 msgstr ""
 
-#: capplets/screensaver/screensavers/kaleidescope.xml.h:4
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
 msgid "Number of segments."
 msgstr "Liczba odcinków."
 
-#: capplets/screensaver/screensavers/kaleidescope.xml.h:5
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
 msgid "Number of trails."
 msgstr "Liczba smug."
 
+#: capplets/screensaver/screensavers/kaleidescope.xml.h:1
+msgid "Segments"
+msgstr ""
+
 #: capplets/screensaver/screensavers/kumppa.xml.h:1
 msgid "Kumppa"
 msgstr ""
 
-#: capplets/screensaver/screensavers/kumppa.xml.h:2
+#: capplets/screensaver/screensavers/kumppa.xml.h:1
 msgid ""
 "Spiraling, spinning, and very, very fast splashes of color rush toward the "
 "screen.  Written by Teemu Suutari."
@@ -1905,49 +2109,71 @@ msgid ""
 "Warning: occasionally opens doors.  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/lament.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/lament.xml.h:1
 msgid "Lament"
-msgstr "Długość"
+msgstr ""
 
-#: capplets/screensaver/screensavers/laser.xml.h:2
+#: capplets/screensaver/screensavers/laser.xml.h:1
 msgid "Duration of laser burst."
 msgstr ""
 
-#: capplets/screensaver/screensavers/laser.xml.h:3
+#: capplets/screensaver/screensavers/laser.xml.h:1
 msgid "Laser"
+msgstr "Laser"
+
+#: capplets/screensaver/screensavers/laser.xml.h:1
+#: capplets/screensaver/screensavers/pedal.xml.h:1
+msgid "Longer"
 msgstr ""
 
-#: capplets/screensaver/screensavers/laser.xml.h:4
+#: capplets/screensaver/screensavers/laser.xml.h:1
 msgid ""
 "Moving radiating lines, that look vaguely like scanning laser beams.  "
 "Written by Pascal Pensa.  (Frankie say: relax.)"
 msgstr ""
 
-#: capplets/screensaver/screensavers/laser.xml.h:5
+#: capplets/screensaver/screensavers/laser.xml.h:1
+msgid "Segments:"
+msgstr ""
+
+#: capplets/screensaver/screensavers/laser.xml.h:1
+#: capplets/screensaver/screensavers/pedal.xml.h:1
+msgid "Shorter"
+msgstr ""
+
+#: capplets/screensaver/screensavers/laser.xml.h:1
 msgid "Size of burst."
 msgstr ""
 
-#: capplets/screensaver/screensavers/lightning.xml.h:2
+#: capplets/screensaver/screensavers/lightning.xml.h:1
 msgid "Lightning"
 msgstr ""
 
-#: capplets/screensaver/screensavers/lightning.xml.h:4
+#: capplets/screensaver/screensavers/lightning.xml.h:1
 msgid ""
 "This one draws crackling fractal lightning bolts.  It's simple, direct, and "
 "to the point.  If only it had sound...  Written by Keith Romberg."
 msgstr ""
 
-#: capplets/screensaver/screensavers/lisa.xml.h:2
-#, fuzzy
-msgid "Lisa"
-msgstr "Linie"
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
+msgid "Larger"
+msgstr ""
 
-#: capplets/screensaver/screensavers/lisa.xml.h:5
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+msgid "Lisa"
+msgstr "Lisa"
+
+#: capplets/screensaver/screensavers/lisa.xml.h:1
 msgid "Size of object."
 msgstr "Rozmiar obiektu."
 
-#: capplets/screensaver/screensavers/lisa.xml.h:7
+#: capplets/screensaver/screensavers/lisa.xml.h:1
+#: capplets/screensaver/screensavers/moire.xml.h:1
+msgid "Smaller"
+msgstr ""
+
+#: capplets/screensaver/screensavers/lisa.xml.h:1
 msgid ""
 "This draws Lisajous loops, by Caleb Cullen.  Remember that device they had "
 "the Phantom Zone prisoners in during their trial in Superman?  I think that "
@@ -1960,27 +2186,31 @@ msgid ""
 "along a path.  Written by Alexander Jolk."
 msgstr ""
 
-#: capplets/screensaver/screensavers/lissie.xml.h:2
+#: capplets/screensaver/screensavers/lissie.xml.h:1
 msgid "Lissie"
 msgstr ""
 
-#: capplets/screensaver/screensavers/lmorph.xml.h:2
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
 msgid "LMorph"
 msgstr ""
 
-#: capplets/screensaver/screensavers/lmorph.xml.h:3
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
 msgid "Number of interpolation steps."
 msgstr "Liczba kroków interpolacji."
 
-#: capplets/screensaver/screensavers/lmorph.xml.h:4
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
 msgid "Number of points."
 msgstr "Liczba punktów."
 
-#: capplets/screensaver/screensavers/lmorph.xml.h:5
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
 msgid "Open figures."
 msgstr ""
 
-#: capplets/screensaver/screensavers/lmorph.xml.h:7
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
+msgid "Points:"
+msgstr "Punkty:"
+
+#: capplets/screensaver/screensavers/lmorph.xml.h:1
 msgid ""
 "This generates random spline-ish line drawings and morphs between them.  "
 "Written by Sverre H.  Huseby and Glenn T.  Lines."
@@ -1990,7 +2220,7 @@ msgstr ""
 msgid "Loop"
 msgstr ""
 
-#: capplets/screensaver/screensavers/loop.xml.h:2
+#: capplets/screensaver/screensavers/loop.xml.h:1
 msgid ""
 "This one produces loop-shaped colonies that spawn, age, and eventually die.  "
 "Written by David Bagley."
@@ -2001,23 +2231,31 @@ msgid "Delay between drawing the maze and starting the solution."
 msgstr ""
 "Opóźnienie pomiędzy narysowaniem labiryntu i rozpoczęciem rozwiązywania."
 
-#: capplets/screensaver/screensavers/maze.xml.h:2
+#: capplets/screensaver/screensavers/maze.xml.h:1
 msgid "Delay between each step in the maze."
 msgstr "Opóźnienie przed każdym krokiem w labiryncie."
 
-#: capplets/screensaver/screensavers/maze.xml.h:3
+#: capplets/screensaver/screensavers/maze.xml.h:1
 msgid "Delay between finishing the maze and starting a new one."
 msgstr "Opóźnienie po ukończeniu labiryntu a przed rozpoczęciem nowego."
 
-#: capplets/screensaver/screensavers/maze.xml.h:4
+#: capplets/screensaver/screensavers/maze.xml.h:1
+msgid "Less Delay"
+msgstr ""
+
+#: capplets/screensaver/screensavers/maze.xml.h:1
 msgid "Maze"
 msgstr ""
 
-#: capplets/screensaver/screensavers/maze.xml.h:5
+#: capplets/screensaver/screensavers/maze.xml.h:1
+msgid "More Delay"
+msgstr ""
+
+#: capplets/screensaver/screensavers/maze.xml.h:1
 msgid "Put a bridge over the logo?"
 msgstr ""
 
-#: capplets/screensaver/screensavers/maze.xml.h:6
+#: capplets/screensaver/screensavers/maze.xml.h:1
 msgid ""
 "This is the ancient X maze demo, modified to work with xscreensaver.  It "
 "generates a random maze, then solves it with visual feedback.  Originally by "
@@ -2030,10 +2268,9 @@ msgid ""
 "Strip II,'' a GL image of ants walking along the surface of a moebius strip."
 msgstr ""
 
-#: capplets/screensaver/screensavers/moebius.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/moebius.xml.h:1
 msgid "Moebius"
-msgstr "Mysz"
+msgstr "Moebius"
 
 #: capplets/screensaver/screensavers/moire2.xml.h:1
 msgid ""
@@ -2044,20 +2281,19 @@ msgid ""
 "Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/moire2.xml.h:2
+#: capplets/screensaver/screensavers/moire2.xml.h:1
 msgid "Moire2"
 msgstr ""
 
-#: capplets/screensaver/screensavers/moire.xml.h:2
+#: capplets/screensaver/screensavers/moire.xml.h:1
 msgid "Maximum radius increment"
 msgstr "Maksymalny przyrost promienia"
 
-#: capplets/screensaver/screensavers/moire.xml.h:3
-#, fuzzy
+#: capplets/screensaver/screensavers/moire.xml.h:1
 msgid "Moire"
-msgstr "Mysz"
+msgstr ""
 
-#: capplets/screensaver/screensavers/moire.xml.h:6
+#: capplets/screensaver/screensavers/moire.xml.h:1
 msgid ""
 "This one draws cool circular interference patterns.  Most of the circles you "
 "see aren't explicitly rendered, but show up as a result of interactions "
@@ -2075,18 +2311,17 @@ msgid ""
 "Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/molecule.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/molecule.xml.h:1
 msgid "Molecule"
-msgstr "Mysz"
+msgstr ""
 
 #: capplets/screensaver/screensavers/morph3d.xml.h:1
 msgid ""
-"Another 3d shape-changing GL hack, by Marcelo Vianna.  It has the same shiny-"
-"plastic feel as Superquadrics, as many computer-generated objects do..."
+"Another 3d shape-changing GL hack, by Marcelo Vianna.  It has the same "
+"shiny-plastic feel as Superquadrics, as many computer-generated objects do..."
 msgstr ""
 
-#: capplets/screensaver/screensavers/morph3d.xml.h:2
+#: capplets/screensaver/screensavers/morph3d.xml.h:1
 msgid "Morph3D"
 msgstr ""
 
@@ -2096,10 +2331,9 @@ msgid ""
 "Pensa."
 msgstr ""
 
-#: capplets/screensaver/screensavers/mountain.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/mountain.xml.h:1
 msgid "Mountain"
-msgstr "Główne"
+msgstr ""
 
 #: capplets/screensaver/screensavers/munch.xml.h:1
 msgid ""
@@ -2116,15 +2350,15 @@ msgid ""
 "This version is by Tim Showalter."
 msgstr ""
 
-#: capplets/screensaver/screensavers/munch.xml.h:10
+#: capplets/screensaver/screensavers/munch.xml.h:1
 msgid "Draw square at weird starting points."
 msgstr ""
 
-#: capplets/screensaver/screensavers/munch.xml.h:11
+#: capplets/screensaver/screensavers/munch.xml.h:1
 msgid "Munch"
 msgstr ""
 
-#: capplets/screensaver/screensavers/munch.xml.h:13
+#: capplets/screensaver/screensavers/munch.xml.h:1
 msgid "Use XOR drawing function."
 msgstr "Rysowanie przy użyciu operacji XOR."
 
@@ -2134,7 +2368,7 @@ msgid ""
 "through a camera operated by a monkey on crack.  By Dan Bornstein."
 msgstr ""
 
-#: capplets/screensaver/screensavers/nerverot.xml.h:2
+#: capplets/screensaver/screensavers/nerverot.xml.h:1
 msgid "NerveRot"
 msgstr ""
 
@@ -2146,31 +2380,31 @@ msgid ""
 "Colorized by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/noseguy.xml.h:2
+#: capplets/screensaver/screensavers/noseguy.xml.h:1
 msgid "Noseguy"
 msgstr ""
 
-#: capplets/screensaver/screensavers/pedal.xml.h:2
+#: capplets/screensaver/screensavers/pedal.xml.h:1
 msgid "Maximum number of lines."
 msgstr "Maksymalna liczba linii."
 
-#: capplets/screensaver/screensavers/pedal.xml.h:3
+#: capplets/screensaver/screensavers/pedal.xml.h:1
 msgid "Pedal"
 msgstr ""
 
-#: capplets/screensaver/screensavers/pedal.xml.h:4
+#: capplets/screensaver/screensavers/pedal.xml.h:1
 msgid ""
 "This is sort of a combination spirograph/string-art.  It generates a large, "
 "complex polygon, and lets the X server do the bulk of the work by giving it "
-"an even/odd winding rule.  Written by Dale Moore, based on some ancient PDP-"
-"11 code."
+"an even/odd winding rule.  Written by Dale Moore, based on some ancient "
+"PDP-11 code."
 msgstr ""
 
-#: capplets/screensaver/screensavers/pedal.xml.h:5
+#: capplets/screensaver/screensavers/pedal.xml.h:1
 msgid "Time to fade away."
 msgstr ""
 
-#: capplets/screensaver/screensavers/pedal.xml.h:6
+#: capplets/screensaver/screensavers/pedal.xml.h:1
 msgid "Time to show each picture."
 msgstr "Czas wyświetlania każdego z obrazów."
 
@@ -2178,7 +2412,7 @@ msgstr "Czas wy
 msgid "Penetrate"
 msgstr ""
 
-#: capplets/screensaver/screensavers/penetrate.xml.h:2
+#: capplets/screensaver/screensavers/penetrate.xml.h:1
 msgid ""
 "This hack simulates the classic arcade game Missile Command.  Written by "
 "Adam Miller."
@@ -2197,13 +2431,13 @@ msgid ""
 "nature'') for its Kleenex quilted toilet paper.  Penrose said he doesn't "
 "like litigation but, ``When it comes to the population of Great Britain "
 "being invited by a multinational to wipe their bottoms on what appears to be "
-"the work of a Knight of the Realm, then a last stand must be taken.'' \t\t\t"
-"\t\t\t\t\t    \n"
+"the work of a Knight of the Realm, then a last stand must be taken.'' "
+"\t\t\t\t\t\t\t\t    \n"
 "\n"
 "As reported by News of the Weird #491, 4-jul-1997."
 msgstr ""
 
-#: capplets/screensaver/screensavers/penrose.xml.h:6
+#: capplets/screensaver/screensavers/penrose.xml.h:1
 msgid "Penrose"
 msgstr ""
 
@@ -2211,7 +2445,7 @@ msgstr ""
 msgid "Petri"
 msgstr ""
 
-#: capplets/screensaver/screensavers/petri.xml.h:2
+#: capplets/screensaver/screensavers/petri.xml.h:1
 msgid ""
 "This simulates colonies of mold growing in a petri dish.  Growing colored "
 "circles overlap and leave spiral interference in their wake.  Written by Dan "
@@ -2225,7 +2459,7 @@ msgid ""
 "Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/phosphor.xml.h:2
+#: capplets/screensaver/screensavers/phosphor.xml.h:1
 msgid "Phosphor"
 msgstr ""
 
@@ -2235,10 +2469,9 @@ msgid ""
 "probably seen this GL hack.  This version is by Marcelo Vianna."
 msgstr ""
 
-#: capplets/screensaver/screensavers/pipes.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/pipes.xml.h:1
 msgid "Pipes"
-msgstr "Linie"
+msgstr ""
 
 #: capplets/screensaver/screensavers/pulsar.xml.h:1
 msgid ""
@@ -2247,7 +2480,7 @@ msgid ""
 "fast your graphics card is...  Requires OpenGL.  Written by David Konerding."
 msgstr ""
 
-#: capplets/screensaver/screensavers/pulsar.xml.h:2
+#: capplets/screensaver/screensavers/pulsar.xml.h:1
 msgid "Pulsar"
 msgstr ""
 
@@ -2255,19 +2488,19 @@ msgstr ""
 msgid "Frequency of missile launch"
 msgstr "Częstość wystrzeliwania pocisków"
 
-#: capplets/screensaver/screensavers/pyro.xml.h:2
+#: capplets/screensaver/screensavers/pyro.xml.h:1
 msgid "Number of particles"
 msgstr "Liczba cząstek"
 
-#: capplets/screensaver/screensavers/pyro.xml.h:3
+#: capplets/screensaver/screensavers/pyro.xml.h:1
 msgid "Particles on screen"
 msgstr "Cząstki na ekranie"
 
-#: capplets/screensaver/screensavers/pyro.xml.h:4
+#: capplets/screensaver/screensavers/pyro.xml.h:1
 msgid "Pyro"
 msgstr ""
 
-#: capplets/screensaver/screensavers/pyro.xml.h:5
+#: capplets/screensaver/screensavers/pyro.xml.h:1
 msgid ""
 "Pyro draws exploding fireworks.  Blah blah blah.  Written by Jamie Zawinski."
 msgstr ""
@@ -2276,35 +2509,39 @@ msgstr ""
 msgid "Color contrast"
 msgstr "Kontrast kolorów"
 
-#: capplets/screensaver/screensavers/qix.xml.h:2
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Discrete Lines"
 msgstr "Rozdzielone linie"
 
-#: capplets/screensaver/screensavers/qix.xml.h:4
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Length"
 msgstr "Długość"
 
-#: capplets/screensaver/screensavers/qix.xml.h:7
+#: capplets/screensaver/screensavers/qix.xml.h:1
+msgid "Narrow"
+msgstr ""
+
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Number of points:"
 msgstr "Liczba punktów:"
 
-#: capplets/screensaver/screensavers/qix.xml.h:8
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Number of trails:"
 msgstr "Liczba smug:"
 
-#: capplets/screensaver/screensavers/qix.xml.h:10
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Qix (solid)"
 msgstr ""
 
-#: capplets/screensaver/screensavers/qix.xml.h:11
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Solid Trails"
 msgstr "Jednolite smugi"
 
-#: capplets/screensaver/screensavers/qix.xml.h:13
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Spread between lines"
 msgstr "Odstępy pomiędzy liniami"
 
-#: capplets/screensaver/screensavers/qix.xml.h:14
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid ""
 "This is the swiss army chainsaw of qix programs.  It bounces a series of "
 "line segments around the screen, and uses variations on this basic motion "
@@ -2312,19 +2549,23 @@ msgid ""
 "filled polygons, overlapping translucent areas...  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/qix.xml.h:15
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Trails attract each other"
 msgstr "Przyciąganie się smug"
 
-#: capplets/screensaver/screensavers/qix.xml.h:16
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Transparent Trails"
-msgstr "Przeźroczyste smugi"
+msgstr "Przezroczyste smugi"
 
-#: capplets/screensaver/screensavers/qix.xml.h:17
+#: capplets/screensaver/screensavers/qix.xml.h:1
+msgid "Wide"
+msgstr ""
+
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "Width"
 msgstr "Szerokość"
 
-#: capplets/screensaver/screensavers/qix.xml.h:18
+#: capplets/screensaver/screensavers/qix.xml.h:1
 msgid "XOR Trails"
 msgstr "Nakładanie smug operacją XOR"
 
@@ -2335,7 +2576,7 @@ msgid ""
 "unpredictable ways.  ``RD'' stands for reaction-diffusion."
 msgstr ""
 
-#: capplets/screensaver/screensavers/rd-bomb.xml.h:2
+#: capplets/screensaver/screensavers/rd-bomb.xml.h:1
 msgid "RD-Bomb"
 msgstr ""
 
@@ -2343,10 +2584,10 @@ msgstr ""
 msgid "Ripples (oily)"
 msgstr ""
 
-#: capplets/screensaver/screensavers/ripples.xml.h:2
+#: capplets/screensaver/screensavers/ripples.xml.h:1
 msgid ""
-"This draws rippling interference patterns like splashing water.  With the -"
-"water option, it manipulates your desktop image to look like something is "
+"This draws rippling interference patterns like splashing water.  With the "
+"-water option, it manipulates your desktop image to look like something is "
 "dripping into it.  Written by Tom Hammersley."
 msgstr ""
 
@@ -2354,7 +2595,7 @@ msgstr ""
 msgid "Rocks"
 msgstr ""
 
-#: capplets/screensaver/screensavers/rocks.xml.h:2
+#: capplets/screensaver/screensavers/rocks.xml.h:1
 msgid ""
 "This draws an animation of flight through an asteroid field, with changes in "
 "rotation and direction.  It can also display 3D separations for red/blue "
@@ -2365,23 +2606,23 @@ msgstr ""
 msgid "Delay before next redraw"
 msgstr "Opóźnienie pomiędzy kolejnymi odrysowaniami"
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:2
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Number of Iterations"
 msgstr "Liczba iteracji"
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:3
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Offset"
 msgstr "Przesunięcie"
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:4
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Rorschach"
 msgstr ""
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:5
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "Speed to clear the screen"
 msgstr "Szybkośc czyszczenia ekranu"
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:6
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid ""
 "This generates random inkblot patterns.  The algorithm is deceptively simple "
 "for how well it works; it merely walks a dot around the screen randomly, and "
@@ -2390,11 +2631,11 @@ msgid ""
 "Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:7
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "With X-axis Symmetry"
 msgstr "Symetria względem osi X"
 
-#: capplets/screensaver/screensavers/rorschach.xml.h:8
+#: capplets/screensaver/screensavers/rorschach.xml.h:1
 msgid "With Y-axis Symmetry"
 msgstr "Symetria względem osi Y"
 
@@ -2405,7 +2646,7 @@ msgid ""
 "curvier lines, but still frames of it don't look like much."
 msgstr ""
 
-#: capplets/screensaver/screensavers/rotor.xml.h:2
+#: capplets/screensaver/screensavers/rotor.xml.h:1
 msgid "Rotor"
 msgstr ""
 
@@ -2415,7 +2656,7 @@ msgid ""
 "Claudio Matsuoka."
 msgstr ""
 
-#: capplets/screensaver/screensavers/rotzoomer.xml.h:2
+#: capplets/screensaver/screensavers/rotzoomer.xml.h:1
 msgid "RotZoomer"
 msgstr ""
 
@@ -2425,15 +2666,15 @@ msgid ""
 "shuffles and solves itself.  Another fine GL hack by Marcelo Vianna."
 msgstr ""
 
-#: capplets/screensaver/screensavers/rubik.xml.h:2
+#: capplets/screensaver/screensavers/rubik.xml.h:1
 msgid "Rubik"
-msgstr ""
+msgstr "Rubik"
 
 #: capplets/screensaver/screensavers/shadebobs.xml.h:1
 msgid "ShadeBobs"
 msgstr ""
 
-#: capplets/screensaver/screensavers/shadebobs.xml.h:2
+#: capplets/screensaver/screensavers/shadebobs.xml.h:1
 msgid ""
 "This draws smoothly-shaded oscilating oval patterns, that look something "
 "like vapor trails or neon tubes.  Written by Shane Smit."
@@ -2441,19 +2682,19 @@ msgstr ""
 
 #: capplets/screensaver/screensavers/sierpinski3d.xml.h:1
 msgid "Sierpinski3D"
-msgstr ""
+msgstr "Sierpiński3D"
 
-#: capplets/screensaver/screensavers/sierpinski3d.xml.h:2
+#: capplets/screensaver/screensavers/sierpinski3d.xml.h:1
 msgid ""
 "This draws the three-dimensional variant of the recursive Sierpinski "
 "triangle fractal, using GL.  Written by Tim Robinson and Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/sierpinski.xml.h:3
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
 msgid "Sierpinski"
 msgstr ""
 
-#: capplets/screensaver/screensavers/sierpinski.xml.h:5
+#: capplets/screensaver/screensavers/sierpinski.xml.h:1
 msgid ""
 "This draws the two-dimensional variant of the recursive Sierpinski triangle "
 "fractal.  Written by Desmond Daignault."
@@ -2463,7 +2704,7 @@ msgstr ""
 msgid "SlideScreen"
 msgstr ""
 
-#: capplets/screensaver/screensavers/slidescreen.xml.h:2
+#: capplets/screensaver/screensavers/slidescreen.xml.h:1
 msgid ""
 "This grabs an image of whatever is on your screen, divides it into a grid, "
 "and then randomly shuffles the squares around as if it was one of those "
@@ -2476,7 +2717,7 @@ msgstr ""
 msgid "Slip"
 msgstr ""
 
-#: capplets/screensaver/screensavers/slip.xml.h:2
+#: capplets/screensaver/screensavers/slip.xml.h:1
 msgid ""
 "This program 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 "
@@ -2488,11 +2729,10 @@ msgid ""
 msgstr ""
 
 #: capplets/screensaver/screensavers/sonar.xml.h:1
-#, fuzzy
 msgid "Sonar"
-msgstr "Dźwięk"
+msgstr ""
 
-#: capplets/screensaver/screensavers/sonar.xml.h:2
+#: capplets/screensaver/screensavers/sonar.xml.h:1
 msgid ""
 "This program draws a simulation of a sonar screen.  Written by default, it "
 "displays a random assortment of ``bogies'' on the screen, but if compiled "
@@ -2508,19 +2748,19 @@ msgid ""
 "by Conrad Parker.\n"
 "\n"
 "\n"
-"!"
-"=============================================================================\n"
+""
+"!============================================================================="
+"\n"
 "!\n"
 "! Documentation for some programs that are not bundled with XScreenSaver\n"
 "!\n"
-"!"
-"============================================================================="
+""
+"!============================================================================="
 msgstr ""
 
-#: capplets/screensaver/screensavers/speedmine.xml.h:9
-#, fuzzy
+#: capplets/screensaver/screensavers/speedmine.xml.h:1
 msgid "SpeedMine"
-msgstr "Szybkość"
+msgstr ""
 
 #: capplets/screensaver/screensavers/sphere.xml.h:1
 msgid ""
@@ -2529,18 +2769,17 @@ msgid ""
 "Duff in 1982."
 msgstr ""
 
-#: capplets/screensaver/screensavers/sphere.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/sphere.xml.h:1
 msgid "Sphere"
-msgstr "Szybkość"
+msgstr "Sfera"
 
-#: capplets/screensaver/screensavers/spiral.xml.h:2
+#: capplets/screensaver/screensavers/spiral.xml.h:1
 msgid ""
 "Moving circular patterns, by Peter Schmitzberger.  Moving circular patterns "
 "means moire; interference patterns, of course."
 msgstr ""
 
-#: capplets/screensaver/screensavers/spiral.xml.h:6
+#: capplets/screensaver/screensavers/spiral.xml.h:1
 msgid "Spiral"
 msgstr ""
 
@@ -2550,7 +2789,7 @@ msgid ""
 "desktop when it passes.  Written by Rick Schultz."
 msgstr ""
 
-#: capplets/screensaver/screensavers/spotlight.xml.h:2
+#: capplets/screensaver/screensavers/spotlight.xml.h:1
 msgid "Spotlight"
 msgstr ""
 
@@ -2558,10 +2797,9 @@ msgstr ""
 msgid "Q-Bert meets Marble Madness!  Written by Ed Mackey."
 msgstr ""
 
-#: capplets/screensaver/screensavers/sproingies.xml.h:2
-#, fuzzy
+#: capplets/screensaver/screensavers/sproingies.xml.h:1
 msgid "Sproingies"
-msgstr "Krzywe"
+msgstr ""
 
 #: capplets/screensaver/screensavers/squiral.xml.h:1
 msgid ""
@@ -2570,7 +2808,7 @@ msgid ""
 "Jeff Epler."
 msgstr ""
 
-#: capplets/screensaver/screensavers/squiral.xml.h:2
+#: capplets/screensaver/screensavers/squiral.xml.h:1
 msgid "Squiral"
 msgstr ""
 
@@ -2578,20 +2816,20 @@ msgstr ""
 msgid "SSystem"
 msgstr ""
 
-#: capplets/screensaver/screensavers/ssystem.xml.h:2
+#: capplets/screensaver/screensavers/ssystem.xml.h:1
 msgid ""
 "SSystem is a GL Solar System simulator.  It simulates flybys of Sun, the "
 "nine planets and a few major satellites, with four camera modes.  Written by "
 "Raul Alonso.  This is not included with the XScreenSaver package, but if you "
-"don't have it already, you can find it at <http://www1.las.es/~amil/ssystem/"
-">."
+"don't have it already, you can find it at "
+"<http://www1.las.es/~amil/ssystem/>."
 msgstr ""
 
 #: capplets/screensaver/screensavers/stairs.xml.h:1
 msgid "Stairs"
-msgstr ""
+msgstr "Schody"
 
-#: capplets/screensaver/screensavers/stairs.xml.h:2
+#: capplets/screensaver/screensavers/stairs.xml.h:1
 msgid ""
 "by Marcelo Vianna's third Escher GL hack, this one draws an ``infinite'' "
 "staircase."
@@ -2601,27 +2839,31 @@ msgstr ""
 msgid "Change to display in monochrome."
 msgstr "Wyświetlanie bez kolorów."
 
-#: capplets/screensaver/screensavers/starfish.xml.h:2
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Duration of current shape."
 msgstr ""
 
-#: capplets/screensaver/screensavers/starfish.xml.h:3
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Quickness of rotation at each step (0 = Random)"
 msgstr "Szybkość obrotu w każdym kroku (0 = losowo)"
 
-#: capplets/screensaver/screensavers/starfish.xml.h:4
+#: capplets/screensaver/screensavers/starfish.xml.h:1
+msgid "Slim"
+msgstr ""
+
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Speed of animation."
 msgstr "Szybkość animacji."
 
-#: capplets/screensaver/screensavers/starfish.xml.h:5
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Starfish"
 msgstr ""
 
-#: capplets/screensaver/screensavers/starfish.xml.h:6
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Thickness of color bands (0 = Random)"
 msgstr ""
 
-#: capplets/screensaver/screensavers/starfish.xml.h:7
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid ""
 "This generates a sequence of undulating, throbbing, star-like patterns which "
 "pulsate, rotate, and turn inside out.  Another display mode uses these "
@@ -2629,7 +2871,7 @@ msgid ""
 "very organic.  Written by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/starfish.xml.h:8
+#: capplets/screensaver/screensavers/starfish.xml.h:1
 msgid "Use raw shapes "
 msgstr ""
 
@@ -2640,9 +2882,9 @@ msgid ""
 "by Jamie Zawinski and Claudio Matauoka."
 msgstr ""
 
-#: capplets/screensaver/screensavers/starwars.xml.h:2
+#: capplets/screensaver/screensavers/starwars.xml.h:1
 msgid "StarWars"
-msgstr ""
+msgstr "StarWars"
 
 #: capplets/screensaver/screensavers/stonerview.xml.h:1
 msgid ""
@@ -2651,7 +2893,7 @@ msgid ""
 "screensaver."
 msgstr ""
 
-#: capplets/screensaver/screensavers/stonerview.xml.h:2
+#: capplets/screensaver/screensavers/stonerview.xml.h:1
 msgid "StonerView"
 msgstr ""
 
@@ -2659,7 +2901,7 @@ msgstr ""
 msgid "Strange"
 msgstr ""
 
-#: capplets/screensaver/screensavers/strange.xml.h:2
+#: capplets/screensaver/screensavers/strange.xml.h:1
 msgid ""
 "This draws strange attractors: it's a colorful, unpredictably-animating "
 "field of dots that swoops and twists around.  The motion is very nice.  "
@@ -2673,7 +2915,7 @@ msgid ""
 "is GL and has specular reflections."
 msgstr ""
 
-#: capplets/screensaver/screensavers/superquadrics.xml.h:2
+#: capplets/screensaver/screensavers/superquadrics.xml.h:1
 msgid "Superquadrics"
 msgstr ""
 
@@ -2684,7 +2926,7 @@ msgid ""
 "There is also a cool Java applet of a similar concept"
 msgstr ""
 
-#: capplets/screensaver/screensavers/swirl.xml.h:2
+#: capplets/screensaver/screensavers/swirl.xml.h:1
 msgid "Swirl"
 msgstr ""
 
@@ -2692,22 +2934,21 @@ msgstr ""
 msgid "T3D"
 msgstr ""
 
-#: capplets/screensaver/screensavers/t3d.xml.h:2
+#: capplets/screensaver/screensavers/t3d.xml.h:1
 msgid ""
 "This draws a working analog clock composed of floating, throbbing bubbles.  "
 "Written by Bernd Paysan."
 msgstr ""
 
-#: capplets/screensaver/screensavers/triangle.xml.h:2
+#: capplets/screensaver/screensavers/triangle.xml.h:1
 msgid ""
 "Generates random mountain ranges using iterative subdivision of triangles.  "
 "Written by Tobias Gloth."
 msgstr ""
 
-#: capplets/screensaver/screensavers/triangle.xml.h:4
-#, fuzzy
+#: capplets/screensaver/screensavers/triangle.xml.h:1
 msgid "Triangle"
-msgstr "Terminal"
+msgstr "Trójkąt"
 
 #: capplets/screensaver/screensavers/truchet.xml.h:1
 msgid ""
@@ -2715,7 +2956,7 @@ msgid ""
 "Written by Adrian Likins."
 msgstr ""
 
-#: capplets/screensaver/screensavers/truchet.xml.h:2
+#: capplets/screensaver/screensavers/truchet.xml.h:1
 msgid "Truchet"
 msgstr ""
 
@@ -2734,28 +2975,27 @@ msgid ""
 "this...)"
 msgstr ""
 
-#: capplets/screensaver/screensavers/vidwhacker.xml.h:4
+#: capplets/screensaver/screensavers/vidwhacker.xml.h:1
 msgid "VidWhacker"
 msgstr ""
 
-#: capplets/screensaver/screensavers/vines.xml.h:3
+#: capplets/screensaver/screensavers/vines.xml.h:1
 msgid ""
 "This one generates a continuous sequence of small, curvy geometric "
 "patterns.  It scatters them around your screen until it fills up, then it "
 "clears the screen and starts over.  Written by Tracy Camp and David Hansen."
 msgstr ""
 
-#: capplets/screensaver/screensavers/vines.xml.h:4
-#, fuzzy
+#: capplets/screensaver/screensavers/vines.xml.h:1
 msgid "Vines"
-msgstr "Linie"
+msgstr ""
 
 #: capplets/screensaver/screensavers/wander.xml.h:1
 msgid ""
 "Draws a colorful random-walk, in various forms.  Written by Rick Campbell."
 msgstr ""
 
-#: capplets/screensaver/screensavers/wander.xml.h:2
+#: capplets/screensaver/screensavers/wander.xml.h:1
 msgid "Wander"
 msgstr ""
 
@@ -2772,7 +3012,7 @@ msgid ""
 "by Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/webcollage.xml.h:4
+#: capplets/screensaver/screensavers/webcollage.xml.h:1
 msgid "WebCollage"
 msgstr ""
 
@@ -2783,7 +3023,7 @@ msgid ""
 "and off at random.  By Paul 'Joey' Clark."
 msgstr ""
 
-#: capplets/screensaver/screensavers/whirlwindwarp.xml.h:2
+#: capplets/screensaver/screensavers/whirlwindwarp.xml.h:1
 msgid "WhirlwindWarp"
 msgstr ""
 
@@ -2792,7 +3032,7 @@ msgid ""
 "Draws zooming chains of sinusoidal spots.  Written by Ashton Trey Belew."
 msgstr ""
 
-#: capplets/screensaver/screensavers/whirlygig.xml.h:2
+#: capplets/screensaver/screensavers/whirlygig.xml.h:1
 msgid "WhirlyGig"
 msgstr ""
 
@@ -2803,7 +3043,7 @@ msgid ""
 "Theiling."
 msgstr ""
 
-#: capplets/screensaver/screensavers/worm.xml.h:2
+#: capplets/screensaver/screensavers/worm.xml.h:1
 msgid "Worm"
 msgstr ""
 
@@ -2811,7 +3051,7 @@ msgstr ""
 msgid "XaoS"
 msgstr ""
 
-#: capplets/screensaver/screensavers/xaos.xml.h:2
+#: capplets/screensaver/screensavers/xaos.xml.h:1
 msgid ""
 "XaoS generates fast fly-through animations of the Mandelbrot and other "
 "fractal sets.  Written by Thomas Marsh and Jan Hubicka.  This is not "
@@ -2823,7 +3063,7 @@ msgstr ""
 msgid "XDaliClock"
 msgstr ""
 
-#: capplets/screensaver/screensavers/xdaliclock.xml.h:2
+#: capplets/screensaver/screensavers/xdaliclock.xml.h:1
 msgid ""
 "XDaliClock draws a large digital clock, the numbers of which change by "
 "``melting'' into their new shapes.  Written by Jamie Zawinski.  This is not "
@@ -2836,22 +3076,22 @@ msgid ""
 "XEarth draws an image of the Earth, as seen from your favorite vantage point "
 "in space, correctly shaded for the current position of the Sun.  Written by "
 "Kirk Johnson.  This is not included with the XScreenSaver package, but if "
-"you don't have it already, you can find it at <http://www.cs.colorado.edu/"
-"~tuna/xearth/>."
+"you don't have it already, you can find it at "
+"<http://www.cs.colorado.edu/~tuna/xearth/>."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xearth.xml.h:2
+#: capplets/screensaver/screensavers/xearth.xml.h:1
 msgid "Xearth"
 msgstr ""
 
 #: capplets/screensaver/screensavers/xfishtank.xml.h:1
 msgid ""
 "Fish!  This is not included with the XScreenSaver package, but if you don't "
-"have it already, you can find it at <http://metalab.unc.edu/pub/Linux/X11/"
-"demos/>."
+"have it already, you can find it at "
+"<http://metalab.unc.edu/pub/Linux/X11/demos/>."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xfishtank.xml.h:2
+#: capplets/screensaver/screensavers/xfishtank.xml.h:1
 msgid "XFishTank"
 msgstr ""
 
@@ -2861,7 +3101,7 @@ msgid ""
 "set it on fire too.  Written by Carsten Haitzler, hacked on by many others."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xflame.xml.h:2
+#: capplets/screensaver/screensavers/xflame.xml.h:1
 msgid "Xflame"
 msgstr ""
 
@@ -2873,7 +3113,7 @@ msgid ""
 "``inspired.''"
 msgstr ""
 
-#: capplets/screensaver/screensavers/xjack.xml.h:2
+#: capplets/screensaver/screensavers/xjack.xml.h:1
 msgid "Xjack"
 msgstr ""
 
@@ -2884,7 +3124,7 @@ msgid ""
 "Record."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xlyap.xml.h:2
+#: capplets/screensaver/screensavers/xlyap.xml.h:1
 msgid "Xlyap"
 msgstr ""
 
@@ -2894,23 +3134,23 @@ msgid ""
 "Jamie Zawinski."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xmatrix.xml.h:2
+#: capplets/screensaver/screensavers/xmatrix.xml.h:1
 msgid "Xmatrix"
-msgstr ""
+msgstr "Xmatrix"
 
 #: capplets/screensaver/screensavers/xmountains.xml.h:1
 msgid ""
 "XMountains generates realistic-looking fractal terrains of snow-capped "
 "mountains near water, with either a top view or a side view.  Written by "
 "Stephen Booth.  This is not included with the XScreenSaver package, but if "
-"you don't have it already, you can find it at <http://www.epcc.ed.ac.uk/~spb/"
-"xmountains/>.  \n"
+"you don't have it already, you can find it at "
+"<http://www.epcc.ed.ac.uk/~spb/xmountains/>.  \n"
 "\n"
 "Be sure to compile it with -DVROOT or it won't work right when launched by "
 "the xscreensaver daemon."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xmountains.xml.h:4
+#: capplets/screensaver/screensavers/xmountains.xml.h:1
 msgid "Xmountains"
 msgstr ""
 
@@ -2920,17 +3160,17 @@ msgid ""
 "color trails behind them.  Written by Chris Leger."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xrayswarm.xml.h:2
+#: capplets/screensaver/screensavers/xrayswarm.xml.h:1
 msgid "XRaySwarm"
 msgstr ""
 
-#: capplets/screensaver/screensavers/xroger.xml.h:2
+#: capplets/screensaver/screensavers/xroger.xml.h:1
 msgid ""
 "The XScreenSaver logo.  Don't you hate it?  So do I.  Would you like to "
 "design a new logo for XScreenSaver?\tIf so, send jwz your submissions."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xroger.xml.h:3
+#: capplets/screensaver/screensavers/xroger.xml.h:1
 msgid "Xroger"
 msgstr ""
 
@@ -2940,7 +3180,7 @@ msgid ""
 "find it at <http://www.euronet.nl/~rja/Xsnow/>."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xsnow.xml.h:2
+#: capplets/screensaver/screensavers/xsnow.xml.h:1
 msgid "Xsnow"
 msgstr ""
 
@@ -2950,7 +3190,7 @@ msgid ""
 "Rohit Singh."
 msgstr ""
 
-#: capplets/screensaver/screensavers/xspirograph.xml.h:2
+#: capplets/screensaver/screensavers/xspirograph.xml.h:1
 msgid "XSpiroGraph"
 msgstr ""
 
@@ -2958,7 +3198,7 @@ msgstr ""
 msgid "XTeeVee"
 msgstr ""
 
-#: capplets/screensaver/screensavers/xteevee.xml.h:2
+#: capplets/screensaver/screensavers/xteevee.xml.h:1
 msgid ""
 "XTeeVee simulates various television problems, including static, loss of "
 "vertical hold, and a test pattern.  By Greg Knauss."
@@ -2968,26 +3208,26 @@ msgstr ""
 msgid "Zoom (Fatbits)"
 msgstr ""
 
-#: capplets/screensaver/screensavers/zoom.xml.h:2
+#: capplets/screensaver/screensavers/zoom.xml.h:1
 msgid ""
 "Zooms in on a part of the screen and then moves around.  With the -lenses "
 "option the result is like looking through many overlapping lenses rather "
 "than just a simple zoom.  Written by James Macnicol."
 msgstr ""
 
-#: capplets/screensaver/selection-dialog.c:99
+#: capplets/screensaver/selection-dialog.c:1
 msgid "Add a new screensaver"
 msgstr "Nowy wygaszacz ekranu"
 
-#: capplets/screensaver/selection-dialog.c:108
+#: capplets/screensaver/selection-dialog.c:1
 msgid "Select the screensaver to run from the list below:"
 msgstr "Wybierz z poniższej listy uruchamiany wygaszacz:"
 
-#: capplets/screensaver/selection-dialog.c:194
+#: capplets/screensaver/selection-dialog.c:1
 msgid "Custom"
 msgstr "Dowolny"
 
-#: capplets/screensaver/selection-dialog.c:220
+#: capplets/screensaver/selection-dialog.c:1
 msgid "New screensaver"
 msgstr "Nowy wygaszacz ekranu"
 
@@ -2995,7 +3235,7 @@ msgstr "Nowy wygaszacz ekranu"
 msgid "Configure GNOME's use of sound"
 msgstr "Konfiguruje wykorzystanie dźwięku przez GNOME"
 
-#: capplets/sound/sound.desktop.in.in.h:2
+#: capplets/sound/sound.desktop.in.in.h:1
 msgid "Sound"
 msgstr "Dźwięk"
 
@@ -3003,40 +3243,40 @@ msgstr "D
 msgid "Enable sound server startup"
 msgstr "Uruchamianie serwera dźwięku"
 
-#: capplets/sound/sound-properties.glade.h:2
+#: capplets/sound/sound-properties.glade.h:1
 msgid "Sounds for events"
 msgstr "Dźwięki dla zdarzeń"
 
-#: control-center/capplet-dir-view.c:296 control-center/gnomecc.desktop.in.h:1
+#: control-center/capplet-dir-view.c:1 control-center/gnomecc.desktop.in.h:1
 msgid "GNOME Control Center"
 msgstr "Centrum Sterowania GNOME"
 
-#: control-center/capplet-dir-view.c:297
+#: control-center/capplet-dir-view.c:1
 msgid "Desktop properties manager."
 msgstr "Menedżer właściwości środowiska."
 
-#: control-center/capplet-dir-view.c:408
+#: control-center/capplet-dir-view.c:1
 #, c-format
 msgid "Gnome Control Center : %s"
 msgstr "Centrum Sterowania GNOME : %s"
 
-#: control-center/capplet-dir-view.c:456
+#: control-center/capplet-dir-view.c:1
 msgid ""
 "No help is available/installed. Please make sure you\n"
 "have the GNOME User's Guide installed on your system."
 msgstr ""
 "Pomoc nie jest dostępna i prawdopodobnie nie została zainstalowana.\n"
-"Upewnij się, że w systemie zainstalowano Przewodnik użytkownika GNOME."
+"Upewnij się, że w systemie zainstalowano Podręcznik Użytkownika GNOME."
 
-#: control-center/capplet-dir-view.c:459
+#: control-center/capplet-dir-view.c:1
 msgid "Close"
 msgstr "Zamknij"
 
-#: control-center/capplet-dir-view-html.c:145
+#: control-center/capplet-dir-view-html.c:1
 msgid "GNOME Control Center:"
 msgstr "Centrum Sterowania GNOME:"
 
-#: control-center/gnomecc.desktop.in.h:2
+#: control-center/gnomecc.desktop.in.h:1
 msgid "The GNOME configuration tool"
 msgstr "Narzędzie konfiguracyjne GNOME"
 
@@ -3044,35 +3284,35 @@ msgstr "Narz
 msgid "Appearance"
 msgstr "Wygląd"
 
-#: control-center/gnomecc.glade.h:2
+#: control-center/gnomecc.glade.h:1
 msgid "Browse with multiple windows"
 msgstr "Przeglądanie w wielu oknach"
 
-#: control-center/gnomecc.glade.h:3
+#: control-center/gnomecc.glade.h:1
 msgid "Browse with single window"
 msgstr "Przeglądanie w jednym oknie"
 
-#: control-center/gnomecc.glade.h:4
+#: control-center/gnomecc.glade.h:1
 msgid "Display control panels as HTML"
 msgstr "Wyświetlanie paneli sterujących w postaci HTML-a"
 
-#: control-center/gnomecc.glade.h:5
+#: control-center/gnomecc.glade.h:1
 msgid "Display control panels as a set of icons"
 msgstr "Wyświetlanie paneli sterujących w postaci zbioru ikon"
 
-#: control-center/gnomecc.glade.h:6
+#: control-center/gnomecc.glade.h:1
 msgid "Display control panels as a tree"
 msgstr "Wyświetlanie paneli sterujących w postaci drzewa"
 
-#: control-center/gnomecc.glade.h:7
+#: control-center/gnomecc.glade.h:1
 msgid "Launch control panels in separate windows"
 msgstr "Uruchamianie paneli sterujących w osobnych oknach"
 
-#: control-center/gnomecc.glade.h:8
+#: control-center/gnomecc.glade.h:1
 msgid "New-control-center"
 msgstr "Nowe Centrum Sterowania"
 
-#: control-center/gnomecc.glade.h:9
+#: control-center/gnomecc.glade.h:1
 msgid "Put control panels in the control center's window"
 msgstr "Uruchamianie paneli sterujących w oknie Centrum Sterowania"
 
@@ -3080,31 +3320,22 @@ msgstr "Uruchamianie paneli steruj
 msgid "Main"
 msgstr "Główne"
 
-#: control-center/Gnome.directory.in.in.h:2
+#: control-center/Gnome.directory.in.in.h:1
 msgid "Main Settings"
 msgstr "Główne ustawienia"
 
-#: control-center/main.c:46
+#: control-center/main.c:1
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: control-center/main.c:72
+#: control-center/main.c:1
 msgid "Run the capplet CAPPLET"
 msgstr "Uruchamia caplet CAPLET"
 
-#: control-center/main.c:72
+#: control-center/main.c:1
 msgid "CAPPLET"
 msgstr "CAPLET"
 
-#: control-center/main.c:80
+#: control-center/main.c:1
 msgid "GNOME Control Center options"
 msgstr "Opcje Centrum Sterowania GNOME"
-
-#~ msgid "(None)"
-#~ msgstr "(Brak)"
-
-#~ msgid "Wallpaper Selection"
-#~ msgstr "Wybór tapety"
-
-#~ msgid "Can't find an hbox, using a normal file selection"
-#~ msgstr "Nie można odnaleźć widgetu hbox, wywołanie zwykłego wyboru pliku"