提交: ef46a1170bbbf18bc0892f780b37b03389d921d5 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• 修訂: ef46a1170bbbf18bc0892f780b37b03389d921d5 (tree)
• 時間: 2016-10-22 07:42:05
• 作者: Piotr Drąg <piotrdrag@gmai...>
• Commiter: Piotr Drąg

Log Message

Update Polish translation

Change Summary

• modified: po/pl.po

差異

--- a/po/pl.po
+++ b/po/pl.po
@@ -1,200 +1,201 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Aviary.pl
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# [e-mail]
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Polish translation for dia.
+# Copyright © 1999-2009 the dia authors.
+# This file is distributed under the same license as the dia package.
+# Tomasz Kłoczko <[e-mail]>, 1999.
+# Zbigniew Chyla <[e-mail]>, 1999-2003.
+# Artur Flinta <[e-mail]>, 2003-2004.
 # Maciej Jaros <[e-mail]>, 2009.
+# Aviary.pl <[e-mail]>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: dia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:25+0200\n"
+"POT-Creation-Date: 2016-10-22 00:40+0200\n"
 "PO-Revision-Date: 2012-05-18 16:17+0200\n"
 "Last-Translator: Maciej Jaros <[e-mail]>\n"
-"Language-Team: Polish <[e-mail]>\n"
+"Language-Team: Polish <[e-mail]>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:208
+#: ../app/app_procs.c:209
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
 msgstr ""
 
-#: ../app/app_procs.c:220
+#: ../app/app_procs.c:221
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr ""
 
-#: ../app/app_procs.c:246
+#: ../app/app_procs.c:247
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr ""
 
-#: ../app/app_procs.c:255
+#: ../app/app_procs.c:256
 #, c-format
-msgid "Warning: There is no layer named %s.\n"
+msgid "Warning: There is no layer named %s\n"
 msgstr ""
 
-#: ../app/app_procs.c:337
+#: ../app/app_procs.c:338
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "Błąd %s: nie wiadomo jak wyeksportować do %s\n"
 
-#: ../app/app_procs.c:346
-#, fuzzy, c-format
-msgid "%s error: input and output filenames are identical: %s"
-msgstr "Błąd %s: nazwa pliku wejściowego i wynikowego są identyczne: %s"
+#: ../app/app_procs.c:347
+#, c-format
+msgid "%s error: input and output file name is identical: %s"
+msgstr "Błąd %s: nazwy pliku wejściowego i wynikowego są identyczne: %s"
 
-#: ../app/app_procs.c:354
+#: ../app/app_procs.c:355
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "Błąd %s: wymagany poprawny plik wejściowy %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:382
+#: ../app/app_procs.c:383
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:553
+#: ../app/app_procs.c:558
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr "Nie można znaleźć formatu/filtra wyjściowego %s\n"
 
-#: ../app/app_procs.c:623
+#: ../app/app_procs.c:628
 #, c-format
-msgid "Input directory '%s' must exist!\n"
+msgid "Input-directory '%s' must exist!\n"
 msgstr ""
 
-#: ../app/app_procs.c:640
+#: ../app/app_procs.c:645
 #, c-format
-msgid "Output directory '%s' must exist!\n"
+msgid "Output-directory '%s' must exist!\n"
 msgstr ""
 
 #. Translators:  The argument is a list of options, not to be translated
-#: ../app/app_procs.c:690
+#: ../app/app_procs.c:702
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "Wybierz filtr/format z listy: %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:708
+#: ../app/app_procs.c:720
 msgid "Export loaded file and exit"
 msgstr "Wyeksportuj wczytany plik i zakończy"
 
-#: ../app/app_procs.c:708
+#: ../app/app_procs.c:720
 msgid "OUTPUT"
 msgstr "WYJŚCIE"
 
 #. &export_file_format
 #. &export_format_string
-#: ../app/app_procs.c:710
+#: ../app/app_procs.c:722
 msgid "TYPE"
 msgstr "TYP"
 
-#: ../app/app_procs.c:712
+#: ../app/app_procs.c:724
 #, fuzzy
 msgid "Export graphics size"
 msgstr "Rozmiar eksportowanego pliku"
 
-#: ../app/app_procs.c:712
+#: ../app/app_procs.c:724
 msgid "WxH"
 msgstr ""
 
-#: ../app/app_procs.c:714
+#: ../app/app_procs.c:726
 msgid ""
 "Show only specified layers (e.g. when exporting). Can be either the layer "
 "name or a range of layer numbers (X-Y)"
 msgstr ""
 
-#: ../app/app_procs.c:715
+#: ../app/app_procs.c:727
 msgid "LAYER,LAYER,..."
 msgstr ""
 
-#: ../app/app_procs.c:717
+#: ../app/app_procs.c:729
 msgid "Don't show the splash screen"
 msgstr "Bez ekranu powitalnego"
 
-#: ../app/app_procs.c:719
-msgid "Don't create an empty diagram"
-msgstr ""
+#: ../app/app_procs.c:731
+#, fuzzy
+msgid "Don't create empty diagram"
+msgstr "Tworzy nowy diagram"
 
-#: ../app/app_procs.c:721
+#: ../app/app_procs.c:733
 msgid "Start integrated user interface (diagrams in tabs)"
 msgstr ""
 
-#: ../app/app_procs.c:723
+#: ../app/app_procs.c:735
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr ""
 "Przesyła komunikaty o błędach na wyjście standardowe zamiast wyświetla okien."
 
-#: ../app/app_procs.c:725
+#: ../app/app_procs.c:737
 msgid "Directory containing input files"
 msgstr ""
 
-#: ../app/app_procs.c:725 ../app/app_procs.c:727
+#: ../app/app_procs.c:737 ../app/app_procs.c:739
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: ../app/app_procs.c:727
+#: ../app/app_procs.c:739
 msgid "Directory containing output files"
 msgstr ""
 
-#: ../app/app_procs.c:729
+#: ../app/app_procs.c:741
 msgid "Display credits list and exit"
 msgstr "Wypisuje listę zasług i kończy działanie"
 
-#: ../app/app_procs.c:731
+#: ../app/app_procs.c:743
 msgid "Generate verbose output"
 msgstr ""
 
-#: ../app/app_procs.c:733
+#: ../app/app_procs.c:745
 msgid "Display version and exit"
 msgstr "Wypisuje numer wersji i kończy działanie"
 
-#: ../app/app_procs.c:760
+#: ../app/app_procs.c:768
 msgid "[FILE...]"
 msgstr "[PLIK...]"
 
-#: ../app/app_procs.c:774
-#, fuzzy, c-format
+#: ../app/app_procs.c:780
+#, c-format
 msgid "Invalid option?"
-msgstr "Operacja ręczna"
+msgstr "Nieprawidłowa opcja?"
 
-#: ../app/app_procs.c:797
+#: ../app/app_procs.c:803
 #, fuzzy, c-format
 msgid "Filename conversion failed: %s\n"
 msgstr "Dia wersja %s, skompilowane %s %s\n"
 
-#: ../app/app_procs.c:810
+#: ../app/app_procs.c:816
 #, c-format
 msgid "Missing input: %s\n"
 msgstr ""
 
-#: ../app/app_procs.c:835
+#: ../app/app_procs.c:841
 msgid "Can't connect to session manager!\n"
 msgstr "Nie można nawiązać połączenia z menedżerem sesji!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:877
+#: ../app/app_procs.c:880
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
-msgstr "Dia wersja %s, skompilowane %s %s\n"
+msgstr "Dia w wersji %s, skompilowano %s %s\n"
 
-#: ../app/app_procs.c:879
+#: ../app/app_procs.c:882
 #, c-format
 msgid "Dia version %s\n"
-msgstr "Dia wersja %s\n"
+msgstr "Dia w wersji %s\n"
 
-#: ../app/app_procs.c:921
+#: ../app/app_procs.c:920
 #, fuzzy
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
@@ -202,7 +203,7 @@ msgstr ""
 "Nie można odnaleźć standardowych obiektów w bibliotekach obiektów, "
 "zakończenie...\n"
 
-#: ../app/app_procs.c:923
+#: ../app/app_procs.c:922
 #, fuzzy, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
@@ -211,30 +212,30 @@ msgstr ""
 "Nie można odnaleźć standardowych obiektów w bibliotekach obiektów, "
 "zakończenie...\n"
 
-#: ../app/app_procs.c:987
+#: ../app/app_procs.c:989
 msgid "Diagram1.dia"
 msgstr "Diagram1.dia"
 
-#: ../app/app_procs.c:1022
+#: ../app/app_procs.c:1024
 #, fuzzy
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
-"describing how you caused this message to appear.\n"
+"describing how you can cause this message to appear.\n"
 msgstr ""
 "To nie powinno się wydarzyć. Prześlij raport o błędzie na do\n"
 "bugzilla.gnome.org, opisując co spowodowało pojawienie się tego\n"
 "komunikatu. (w języku angielskim)\n"
 
-#: ../app/app_procs.c:1037
+#: ../app/app_procs.c:1039
 msgid "Exiting Dia"
 msgstr "Kończenie działania programu Dia"
 
 #. no standard buttons
-#: ../app/app_procs.c:1101
+#: ../app/app_procs.c:1103
 msgid "Quitting without saving modified diagrams"
 msgstr "Zamykasz program bez zapisania zmodyfikowanych diagramów"
 
-#: ../app/app_procs.c:1103
+#: ../app/app_procs.c:1105
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
@@ -242,94 +243,108 @@ msgstr ""
 "Istnieją zmodyfikowane, niezapisane diagramy.\n"
 "Czy na pewno chcesz zakończyć bez zapisania zmian?"
 
-#: ../app/app_procs.c:1107
+#: ../app/app_procs.c:1109
 msgid "Quit Dia"
 msgstr "Zakończ pracę z Dia"
 
-#: ../app/app_procs.c:1180 ../app/app_procs.c:1187
+#: ../app/app_procs.c:1178 ../app/app_procs.c:1185
 #, fuzzy
-msgid "Could not create per-user Dia configuration directory"
+msgid "Could not create per-user Dia config directory"
 msgstr "Nie można utworzyć katalogu użytkownika z konfiguracją Dia"
 
-#: ../app/app_procs.c:1190
+#: ../app/app_procs.c:1188
 #, fuzzy
 msgid ""
-"Could not create per-user Dia configuration directory. Please make sure that "
-"the environment variable HOME points to an existing directory."
+"Could not create per-user Dia config directory. Please make sure that the "
+"environment variable HOME points to an existing directory."
 msgstr ""
 "Nie można utworzyć katalogu konfiguracyjnego Dia dla użytkownika. Upewnij "
 "się czy zmienna środowiskowa HOME wskazuje na istniejący katalog."
 
-#: ../app/app_procs.c:1213
+#: ../app/app_procs.c:1211
 #, fuzzy
-msgid "Objects and filters internal to Dia"
+msgid "Objects and filters internal to dia"
 msgstr "Wewnętrzne obiekty i filtry Dia"
 
-#: ../app/app_procs.c:1266
+#: ../app/app_procs.c:1267
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
 "\n"
 msgstr ""
+"Oryginalny autor programu Dia:\n"
+"\n"
 
-#: ../app/app_procs.c:1271
+#: ../app/app_procs.c:1272
 #, c-format
 msgid ""
 "\n"
 "The current maintainers of Dia are:\n"
 "\n"
 msgstr ""
+"\n"
+"Obecni opiekunowie programu Dia:\n"
+"\n"
 
-#: ../app/app_procs.c:1276
+#: ../app/app_procs.c:1277
 #, c-format
 msgid ""
 "\n"
 "Other authors are:\n"
 "\n"
 msgstr ""
+"\n"
+"Inni autorzy:\n"
+"\n"
 
-#: ../app/app_procs.c:1281
+#: ../app/app_procs.c:1282
 #, c-format
 msgid ""
 "\n"
 "Dia is documented by:\n"
 "\n"
 msgstr ""
+"\n"
+"Autorzy dokumentacji:\n"
+"\n"
 
-#: ../app/color_area.c:326 ../app/color_area.c:373
+#: ../app/autosave.c:90
+#, fuzzy
+msgid "Recovering autosaved diagrams"
+msgstr "Drukuje diagram"
+
+#: ../app/autosave.c:98
+msgid ""
+"Autosaved files exist.\n"
+"Please select those you wish to recover."
+msgstr ""
+
+#: ../app/color_area.c:317 ../app/color_area.c:360
 msgid "Select foreground color"
 msgstr "Wybierz kolor pierwszoplanowy"
 
-#: ../app/color_area.c:327 ../app/color_area.c:374
+#: ../app/color_area.c:318 ../app/color_area.c:361
 msgid "Select background color"
 msgstr "Wybierz kolor tła"
 
 #: ../app/commands.c:130
-msgid "No print plugin found!"
+msgid "No print plug-in found!"
 msgstr ""
 
-#: ../app/commands.c:149
+#: ../app/commands.c:150
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Diagram%d.dia"
 
-#: ../app/commands.c:248
-msgid "No image from Clipboard to paste."
-msgstr ""
-
-#: ../app/commands.c:298
-msgid "No selected object can take an image."
-msgstr ""
-
-#: ../app/commands.c:543
+#: ../app/commands.c:344
 msgid "No existing object to paste.\n"
 msgstr "Brak obiektu do wklejenia.\n"
 
-#: ../app/commands.c:853 ../app/commands.c:891
+#: ../app/commands.c:653 ../app/commands.c:691
 msgid "Could not find help directory"
 msgstr "Nie można odnaleźć katalogu pomocy"
 
-#: ../app/commands.c:860
+#: ../app/commands.c:660
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -338,13 +353,16 @@ msgstr ""
 "Nie otworzyć katalogu z plikami pomocy:\n"
 "%s"
 
-#: ../app/commands.c:929
+#: ../app/commands.c:727
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
-"GNOME PL Team <[e-mail]>, 2000, 2001, 2002, 2003, 2004\n"
-"Maciej Jaros <[e-mail]>, 2009"
+"Tomasz Kłoczko <[e-mail]>, 1999\n"
+"Zbigniew Chyla <[e-mail]>, 1999-2003\n"
+"Artur Flinta <[e-mail]>, 2003-2004\n"
+"Maciej Jaros <[e-mail]>, 2009\n"
+"Aviary.pl <[e-mail]>, 2009"
 
-#: ../app/commands.c:931
+#: ../app/commands.c:729
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -373,31 +391,30 @@ msgstr ""
 "\n"
 "Z pewnością wraz z niniejszym programem dostarczono także egzemplarz\n"
 "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli\n"
-"nie - proszę napisać do Free Software Foundation, Inc., 59 Temple Place -\n"
-"Suite 330, Boston, MA 02111-1307, USA.\n"
+"nie - proszę napisać do Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: ../app/commands.c:958
-#, fuzzy
+#: ../app/commands.c:752
 msgid "A program for drawing structured diagrams."
-msgstr "Obiekty diagramu struktury funkcji"
+msgstr "Program do rysowania diagramów."
 
-#: ../app/confirm.c:65
+#: ../app/confirm.c:69
 #, c-format
 msgid "You are about to print a diagram with %d pages."
 msgstr ""
 
-#: ../app/confirm.c:67
+#: ../app/confirm.c:71
 #, c-format
 msgid "You are about to export a diagram with %d pages."
 msgstr ""
 
-#: ../app/confirm.c:69
+#: ../app/confirm.c:73
 #, c-format
 msgid ""
 "You are about to export a diagram which may require %s of memory.(%d pages)."
 msgstr ""
 
-#: ../app/confirm.c:77
+#: ../app/confirm.c:81
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
@@ -405,93 +422,115 @@ msgid ""
 "the intended bounds."
 msgstr ""
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:85
 #, fuzzy
 msgid "Confirm Diagram Size"
 msgstr "Diagram Dia"
 
-#: ../app/create_object.c:73
+#: ../app/create_object.c:71
 #, c-format
 msgid "'%s' creation failed"
 msgstr "Utworzenie \"%s\" nie powiodło się"
 
-#: ../app/defaults.c:44 ../app/defaults.c:147
+#: ../app/defaults.c:43 ../app/defaults.c:150
 msgid "Object defaults"
 msgstr "Domyślne wartości obiektu"
 
-#: ../app/defaults.c:62
+#: ../app/defaults.c:61
 msgid "This object has no defaults."
 msgstr "Obiekt nie ma wartości domyślnych."
 
-#: ../app/defaults.c:111
+#: ../app/defaults.c:115
 msgid "Defaults: "
 msgstr "Wart. domyślne: "
 
-#: ../app/dia-props.c:86
+#: ../app/dia-props.c:85
 msgid "Diagram Properties"
 msgstr "Właściwości diagramu"
 
-#: ../app/dia-props.c:120
+#: ../app/dia-props.c:119
 msgid "Dynamic grid"
 msgstr "Dynamiczna siatka"
 
-#: ../app/dia-props.c:128
+#: ../app/dia-props.c:127
 msgid "x"
 msgstr "x"
 
-#: ../app/dia-props.c:132
+#: ../app/dia-props.c:131
 msgid "y"
 msgstr "y"
 
-#: ../app/dia-props.c:137
+#: ../app/dia-props.c:136
 msgid "Spacing"
 msgstr "Odstępy"
 
-#: ../app/dia-props.c:157
+#: ../app/dia-props.c:156
 msgid "Visible spacing"
 msgstr "Widzialne odstępy"
 
 #. Hexes!
-#: ../app/dia-props.c:178 ../app/preferences.c:243
+#: ../app/dia-props.c:177 ../app/preferences.c:242
 msgid "Hex grid"
 msgstr "Siatka sześciokątna"
 
-#: ../app/dia-props.c:186
+#: ../app/dia-props.c:185
 msgid "Hex grid size"
 msgstr "Wielkość sześciokąta"
 
-#: ../app/dia-props.c:199
+#: ../app/dia-props.c:198
 msgid "Grid"
 msgstr "Siatka"
 
-#: ../app/dia-props.c:210 ../lib/diagramdata.c:117
+#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
 msgid "Background"
 msgstr "Tło"
 
-#: ../app/dia-props.c:221 ../app/preferences.c:122
+#: ../app/dia-props.c:220 ../app/preferences.c:122
 msgid "Grid Lines"
 msgstr "Linie siatki"
 
-#: ../app/dia-props.c:232
+#: ../app/dia-props.c:231
 msgid "Page Breaks"
 msgstr "Separatory stron"
 
-#: ../app/dia-props.c:243
+#: ../app/dia-props.c:242
 msgid "Colors"
 msgstr "Kolory"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:264
+#: ../app/dia-props.c:263
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "Właściwości diagramu: %s"
 
-#: ../app/diagram.c:234
+#: ../app/dia_embedd.c:348
+msgid "Could not initialize Bonobo!"
+msgstr "Nie można zainicjować Bonobo."
+
+#: ../app/diacanvas.c:121
+#, fuzzy
+msgid "X position"
+msgstr "Pozycjonowanie"
+
+#: ../app/diacanvas.c:122
+msgid "X position of child widget"
+msgstr ""
+
+#: ../app/diacanvas.c:131
+#, fuzzy
+msgid "Y position"
+msgstr "Pozycjonowanie"
+
+#: ../app/diacanvas.c:132
+msgid "Y position of child widget"
+msgstr ""
+
+#: ../app/diagram.c:222
 #, fuzzy, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "Nie można otworzyć \"%s\": %s"
 
-#: ../app/diagram.c:237 ../lib/message.c:91 ../lib/message.c:297
+#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
 msgid "Error"
 msgstr "Błąd"
 
@@ -499,140 +538,158 @@ msgstr "Błąd"
 msgid "Trying to group with no selected objects."
 msgstr ""
 
-#: ../app/diagram_tree_view.c:164
-msgid "Diagram"
-msgstr "Diagram"
+#: ../app/diagram.c:1219
+msgid ""
+"You cannot group objects that belong to different groups or have different "
+"parents"
+msgstr ""
 
-#: ../app/diagram_tree_view.c:171
-#: ../plug-ins/drs/dia-render-script-import.c:233
-msgid "Layer"
-msgstr "Warstwa"
+#: ../app/diagram_tree_menu.c:47
+#, fuzzy
+msgid "/_Sort objects"
+msgstr "Obiekty diagramu przepływu"
 
-#: ../app/diagram_tree_view.c:177
-#, fuzzy, c-format
-msgid "%d Layer"
-msgid_plural "%d Layers"
-msgstr[0] "Dodaj warstwę"
-msgstr[1] "Dodaj warstwę"
-msgstr[2] "Dodaj warstwę"
-
-#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
-#: ../objects/Database/table.c:141 ../objects/Istar/actor.c:146
-#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:244
-#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "Typ"
+#: ../app/diagram_tree_menu.c:48
+msgid "/Sort objects/by _name"
+msgstr ""
 
-#: ../app/diagram_tree_view.c:184
-#, fuzzy
-msgid "object|Position"
-msgstr "Pozycjonowanie"
+#: ../app/diagram_tree_menu.c:50
+msgid "/Sort objects/by _type"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:52
+msgid "/Sort objects/as _inserted"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:55
+msgid "/Sort objects/All by name"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:57
+msgid "/Sort objects/All by type"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:59
+msgid "/Sort objects/All as inserted"
+msgstr ""
 
-#: ../app/diagram_tree_view.c:187
+#: ../app/diagram_tree_menu.c:61
+msgid "/Sort objects/_Default"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:62
+msgid "/Sort objects/Default/by _name"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:64
+msgid "/Sort objects/Default/by _type"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:66
+msgid "/Sort objects/Default/as _inserted"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:68
 #, fuzzy
-msgid "Children"
-msgstr "Zdejmij dzieci z rodzica"
+msgid "/Sort _diagrams"
+msgstr "Wyeksportuj diagram"
 
-#: ../app/diagram_tree_view.c:191
-#, fuzzy, c-format
-msgid "%d Object"
-msgid_plural "%d Objects"
-msgstr[0] "Obiekt"
-msgstr[1] "Obiekt"
-msgstr[2] "Obiekt"
+#: ../app/diagram_tree_menu.c:69
+msgid "/Sort _diagrams/by _name"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:71
+msgid "/Sort _diagrams/as _inserted"
+msgstr ""
 
-#: ../app/diagram_tree_view.c:448
+#: ../app/diagram_tree_menu.c:73
 #, fuzzy
-msgid "Select"
-msgstr "_Zaznaczenie"
+msgid "/Sort diagrams/_Default"
+msgstr "Domyślne dla diagramu"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:813
-#: ../objects/FS/function.c:1055
-msgid "Locate"
+#: ../app/diagram_tree_menu.c:74
+msgid "/Sort diagrams/Default/by _name"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:76
+msgid "/Sort diagrams/Default/as _inserted"
+msgstr ""
+
+#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
+#, fuzzy
+msgid "/_Locate"
 msgstr "Lokowanie"
 
-#: ../app/diagram_tree_view.c:450
-msgid "Properties"
-msgstr "Właściwości"
+#: ../app/diagram_tree_menu.c:85
+msgid "/_Properties"
+msgstr "/_Właściwości"
 
-#. *** board of value **************
-#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:123
-#: ../app/plugin-manager.c:262 ../objects/Database/table.c:139
-#: ../objects/Database/table.c:185 ../objects/SISSI/sissi_dialog.c:734
-#: ../objects/UML/association.c:238 ../objects/UML/class.c:145
-#: ../objects/UML/large_package.c:133 ../objects/UML/umlattribute.c:37
-#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
-#: ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "Nazwa"
+#: ../app/diagram_tree_menu.c:86
+msgid "/_Hide this type"
+msgstr ""
 
-#: ../app/diagram_tree_view.c:565
+#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
 msgid "Diagram Tree"
 msgstr "Drzewo diagramu"
 
 #. paper size
-#: ../app/diapagelayout.c:155
+#: ../app/diapagelayout.c:153
 msgid "Paper Size"
 msgstr "Rozmiar papieru"
 
 #. orientation
-#: ../app/diapagelayout.c:184
+#: ../app/diapagelayout.c:186
 msgid "Orientation"
 msgstr "Ułożenie"
 
 #. margins
-#: ../app/diapagelayout.c:213
+#: ../app/diapagelayout.c:224
 msgid "Margins"
 msgstr "Marginesy"
 
-#: ../app/diapagelayout.c:225
+#: ../app/diapagelayout.c:236
 msgid "Top:"
 msgstr "Góra:"
 
-#: ../app/diapagelayout.c:238
+#: ../app/diapagelayout.c:249
 msgid "Bottom:"
 msgstr "Dół:"
 
-#: ../app/diapagelayout.c:251
+#: ../app/diapagelayout.c:262
 msgid "Left:"
 msgstr "Lewy:"
 
-#: ../app/diapagelayout.c:264
+#: ../app/diapagelayout.c:275
 msgid "Right:"
 msgstr "Prawy:"
 
 #. Scaling
-#: ../app/diapagelayout.c:278
+#: ../app/diapagelayout.c:289
 msgid "Scaling"
 msgstr "Skalowanie"
 
-#: ../app/diapagelayout.c:289
+#: ../app/diapagelayout.c:300
 msgid "Scale:"
 msgstr "Skala:"
 
-#: ../app/diapagelayout.c:301
+#: ../app/diapagelayout.c:312
 msgid "Fit to:"
 msgstr "Dopasowanie do:"
 
-#: ../app/diapagelayout.c:313
+#: ../app/diapagelayout.c:324
 msgid "by"
 msgstr "na"
 
-#: ../app/diapagelayout.c:728
+#: ../app/diapagelayout.c:741
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3gcm x %0.3gcm"
 
-#: ../app/diapagelayout.c:832 ../app/pagesetup.c:77
+#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
 msgid "Page Setup"
 msgstr "Ustawienia strony"
 
-#: ../app/disp_callbacks.c:92 ../app/properties-dialog.c:156
+#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -640,19 +697,15 @@ msgstr ""
 "Obiekt nie obsługuje operacji Cofnij/Ponów.\n"
 "Usunięto informację o cofnięciu."
 
-#: ../app/disp_callbacks.c:127
-msgid "Properties…"
+#: ../app/disp_callbacks.c:130
+msgid "Properties..."
 msgstr "Właściwości..."
 
-#: ../app/disp_callbacks.c:166
-msgid "Follow link…"
-msgstr ""
-
-#: ../app/disp_callbacks.c:288
+#: ../app/disp_callbacks.c:248
 msgid "Selection"
 msgstr "Zaznaczenie"
 
-#: ../app/disp_callbacks.c:1114
+#: ../app/disp_callbacks.c:1075
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -663,7 +716,7 @@ msgstr ""
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:109
+#: ../app/display.c:115
 #, fuzzy, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
@@ -671,26 +724,26 @@ msgstr[0] "Zaznaczono %d obiekt"
 msgstr[1] "Zaznaczono %d obiekty"
 msgstr[2] "Zaznaczono %d obiektów"
 
-#: ../app/display.c:119
+#: ../app/display.c:125
 #, fuzzy, c-format
 msgid "Selected '%s'"
 msgstr "_Zaznaczenie"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1149
-msgid "No antialiased renderer found"
+#: ../app/display.c:1121
+msgid "No anti-aliased renderer found"
 msgstr ""
 
-#: ../app/display.c:1297
+#: ../app/display.c:1259
 msgid "<unnamed>"
 msgstr "<bez nazwy>"
 
 #. no standard buttons
-#: ../app/display.c:1303
+#: ../app/display.c:1265
 msgid "Closing diagram without saving"
 msgstr "Zamykasz diagram bez uprzedniego zapisania"
 
-#: ../app/display.c:1305
+#: ../app/display.c:1267
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -699,11 +752,11 @@ msgstr ""
 "Diagram \"%s\"\n"
 "nie został zapisany. Czy chcesz zapisać zmiany teraz?"
 
-#: ../app/display.c:1307
+#: ../app/display.c:1269
 msgid "Close Diagram"
 msgstr "Zamknij diagram"
 
-#: ../app/display.c:1312
+#: ../app/display.c:1274
 msgid "_Discard Changes"
 msgstr "_Nie zapisuj"
 
@@ -727,6 +780,16 @@ msgstr "Następujące diagramy nie są zapisane:"
 msgid "Save"
 msgstr "Zapisz"
 
+#. *** board of value **************
+#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
+#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
+#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
+#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
+#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
+#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
+msgid "Name"
+msgstr "Nazwa"
+
 #: ../app/exit_dialog.c:129
 msgid "Path"
 msgstr "Ścieżka"
@@ -743,33 +806,32 @@ msgstr "Wyczyść zaznaczenie"
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "Nie zaznaczono niczego do zapisania. Czy chcesz spróbować jeszcze raz?"
 
-#: ../app/filedlg.c:143 ../app/filedlg.c:151 ../app/filedlg.c:167
-#: ../app/filedlg.c:813 ../lib/widgets.c:406
+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
+#: ../app/filedlg.c:752 ../lib/widgets.c:1488
 msgid "Supported Formats"
 msgstr "Wspierane formaty"
 
-#: ../app/filedlg.c:196 ../app/filedlg.c:198 ../app/filedlg.c:661
-#: ../app/filedlg.c:663
+#: ../app/filedlg.c:192 ../app/filedlg.c:610
 msgid "By extension"
 msgstr "Według rozszerzenia"
 
-#: ../app/filedlg.c:292
+#: ../app/filedlg.c:281
 msgid "Open Diagram"
 msgstr "Otwórz diagram"
 
-#: ../app/filedlg.c:325
+#: ../app/filedlg.c:309
 msgid "Open Options"
 msgstr "Opcje odczytu"
 
-#: ../app/filedlg.c:333 ../app/filedlg.c:795
+#: ../app/filedlg.c:317 ../app/filedlg.c:734
 msgid "Determine file type:"
 msgstr "Określenie typu pliku:"
 
-#: ../app/filedlg.c:353 ../app/filedlg.c:808 ../lib/widgets.c:414
+#: ../app/filedlg.c:337 ../app/filedlg.c:747 ../lib/widgets.c:1493
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
-#: ../app/filedlg.c:392 ../plug-ins/postscript/paginate_psprint.c:416
+#: ../app/filedlg.c:376 ../plug-ins/postscript/paginate_psprint.c:408
 #, fuzzy
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
@@ -780,13 +842,13 @@ msgstr ""
 "nie są w kodowaniu ustawionym jako lokalne.\n"
 "Niektóre rzeczy mogą nie działać."
 
-#: ../app/filedlg.c:402 ../app/filedlg.c:715
-#: ../plug-ins/postscript/paginate_psprint.c:430
+#: ../app/filedlg.c:386 ../app/filedlg.c:657
+#: ../plug-ins/postscript/paginate_psprint.c:422
 msgid "File already exists"
 msgstr "Plik już istnieje"
 
-#: ../app/filedlg.c:404 ../app/filedlg.c:717
-#: ../plug-ins/postscript/paginate_psprint.c:426
+#: ../app/filedlg.c:388 ../app/filedlg.c:659
+#: ../plug-ins/postscript/paginate_psprint.c:418
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -795,17 +857,17 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: ../app/filedlg.c:488
+#: ../app/filedlg.c:442
 msgid "Save Diagram"
 msgstr "Zapis diagramu"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: ../app/filedlg.c:502
+#: ../app/filedlg.c:453
 msgid "Compress diagram files"
 msgstr "Kompresja zapisywanych plików"
 
-#: ../app/filedlg.c:511
+#: ../app/filedlg.c:463 ../app/filedlg.c:468
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -814,7 +876,7 @@ msgstr ""
 "przyspiesza wczytywanie i zapisywanie. Niektóre programu tekstowe nie "
 "potrafią wykonywać operacji na skompresowanych plikach."
 
-#: ../app/filedlg.c:741
+#: ../app/filedlg.c:683
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -823,25 +885,25 @@ msgstr ""
 "Nie można określić filtru do zapisu\n"
 "\"%s\"."
 
-#: ../app/filedlg.c:768
+#: ../app/filedlg.c:710
 msgid "Export Diagram"
 msgstr "Wyeksportuj diagram"
 
-#: ../app/filedlg.c:787
+#: ../app/filedlg.c:726
 msgid "Export Options"
-msgstr "Wyeksportuj opcje"
+msgstr "Opcje eksportu"
 
 #: ../app/find-and-replace.c:454
 msgid "_Search for:"
-msgstr "_Szukaj"
+msgstr "Wy_szukiwanie:"
 
 #: ../app/find-and-replace.c:467
 msgid "Replace _with:"
-msgstr "Z_amień na:"
+msgstr "Z_amiana na:"
 
 #: ../app/find-and-replace.c:477
 msgid "_Match case"
-msgstr "Uwzględnij wielk_ość liter"
+msgstr "_Rozróżnianie małych i wielkich liter"
 
 #: ../app/find-and-replace.c:481
 msgid "Match _entire word only"
@@ -849,153 +911,153 @@ msgstr "Tylko _całe wyrazy"
 
 #: ../app/find-and-replace.c:485
 msgid "Match _all properties (not just object name)"
-msgstr "Przeszukaj wszystkie właściwości (nie tylko nazwy)"
+msgstr "Przeszukiwanie _wszystkich właściwości (nie tylko nazw)"
 
-#: ../app/find-and-replace.c:511
+#: ../app/find-and-replace.c:513
 msgid "Find"
-msgstr "Wyszukaj"
+msgstr "Znajdź"
 
-#: ../app/find-and-replace.c:541 ../app/menus.c:259
+#: ../app/find-and-replace.c:545 ../app/menus.c:267
 msgid "Replace"
 msgstr "Zamień"
 
-#: ../app/find-and-replace.c:544
+#: ../app/find-and-replace.c:548
 msgid "Replace _All"
 msgstr "Zamień _wszystkie"
 
 #. not adding the button in the list above to modify it's text;
 #. * the default "Find and Replace" is just too long for my taste ;)
 #.
-#: ../app/find-and-replace.c:549
+#: ../app/find-and-replace.c:553
 msgid "_Replace"
 msgstr "_Zamień"
 
-#: ../app/interface.c:157
+#: ../app/interface.c:153
 msgid ""
 "Modify object(s)\n"
 "Use <Space> to toggle between this and other tools"
 msgstr ""
 
-#: ../app/interface.c:163
+#: ../app/interface.c:159
 msgid ""
 "Text edit(s)\n"
 "Use <Esc> to leave this tool"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:169 ../app/menus.c:225 ../objects/FS/function.c:991
+#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
 msgid "Magnify"
 msgstr "Powiększenie"
 
-#: ../app/interface.c:175
+#: ../app/interface.c:171
 msgid "Scroll around the diagram"
 msgstr "Przewijanie diagramu"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../app/interface.c:181 ../app/menus.c:228 ../lib/properties.c:101
-#: ../lib/properties.h:562 ../objects/AADL/aadlbox.c:153
-#: ../objects/Jackson/requirement.c:135 ../objects/UML/activity.c:129
-#: ../objects/UML/actor.c:123 ../objects/UML/classicon.c:148
-#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:160
+#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
+#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
+#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
+#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
 #: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-#: ../objects/UML/note.c:121 ../objects/UML/object.c:167
-#: ../objects/UML/small_package.c:132 ../objects/UML/state.c:158
-#: ../objects/UML/usecase.c:139 ../objects/custom/custom_object.c:239
+#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
+#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
+#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
 #: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
 msgid "Text"
 msgstr "Tekst"
 
-#: ../app/interface.c:187 ../app/menus.c:229
+#: ../app/interface.c:183 ../app/menus.c:233
 msgid "Box"
 msgstr "Prostokąt"
 
-#: ../app/interface.c:193 ../app/menus.c:230
+#: ../app/interface.c:189 ../app/menus.c:234
 msgid "Ellipse"
 msgstr "Elipsa"
 
-#: ../app/interface.c:199 ../app/menus.c:231
+#: ../app/interface.c:195 ../app/menus.c:235
 msgid "Polygon"
 msgstr "Wielokąt"
 
-#: ../app/interface.c:205 ../app/menus.c:232
+#: ../app/interface.c:201 ../app/menus.c:236
 msgid "Beziergon"
 msgstr "Obszar Beziera"
 
-#: ../app/interface.c:211 ../app/menus.c:234 ../objects/standard/line.c:232
+#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
 msgid "Line"
 msgstr "Linia prosta"
 
-#: ../app/interface.c:217 ../app/menus.c:235
+#: ../app/interface.c:213 ../app/menus.c:239
 msgid "Arc"
 msgstr "Łuk"
 
-#: ../app/interface.c:223 ../app/menus.c:236
+#: ../app/interface.c:219 ../app/menus.c:240
 msgid "Zigzagline"
 msgstr "Linia prostopadle łamana"
 
-#: ../app/interface.c:229 ../app/menus.c:237
+#: ../app/interface.c:225 ../app/menus.c:241
 msgid "Polyline"
 msgstr "Linia łamana"
 
-#: ../app/interface.c:235 ../app/menus.c:238
+#: ../app/interface.c:231 ../app/menus.c:242
 msgid "Bezierline"
 msgstr "Krzywa Beziera"
 
-#: ../app/interface.c:241 ../app/menus.c:241
+#: ../app/interface.c:237 ../app/menus.c:245
 msgid "Image"
 msgstr "Obraz"
 
-#: ../app/interface.c:248 ../app/menus.c:239
+#: ../app/interface.c:244 ../app/menus.c:243
 msgid "Outline"
 msgstr "Obrys"
 
-#: ../app/interface.c:631 ../app/interface.c:864
+#: ../app/interface.c:634 ../app/interface.c:870
 msgid "Pops up the Navigation window."
 msgstr "Wyświetla wyskakujące okienko nawigacyjne"
 
-#: ../app/interface.c:826
+#: ../app/interface.c:832
 msgid "Diagram menu."
 msgstr "Menu diagramu."
 
-#: ../app/interface.c:926
+#: ../app/interface.c:935
 msgid "Zoom"
 msgstr "Powiększenie"
 
-#: ../app/interface.c:941
+#: ../app/interface.c:950
 msgid "Toggles snap-to-grid for this window."
 msgstr "Przełącza opcję wyrównywania do siatki dla tego okna."
 
-#: ../app/interface.c:952
+#: ../app/interface.c:961
 #, fuzzy
 msgid "Toggles object snapping for this window."
 msgstr "Przełącza opcję wyrównywania do siatki dla tego okna."
 
-#: ../app/interface.c:1381
+#: ../app/interface.c:1351
 #, fuzzy, c-format
 msgid "No sheet named %s"
 msgstr "Nazwa arkusza:"
 
-#: ../app/interface.c:1419
+#: ../app/interface.c:1389
 msgid "Other sheets"
 msgstr "Inne arkusze"
 
-#: ../app/interface.c:1479 ../sheets/Flowchart.sheet.in.h:1
+#: ../app/interface.c:1449 ../sheets/Flowchart.sheet.in.h:1
 msgid "Flowchart"
 msgstr "Diagram przepływu"
 
-#: ../app/interface.c:1539
+#: ../app/interface.c:1509
 #, fuzzy
 msgid ""
 "Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"squares reset colors.  The small arrows swap colors.  Double click to change "
 "colors."
 msgstr ""
 "Kolor tła i obiektu. Para małych kwadratów (czarny i biały) przywraca "
 "domyślne kolory.  Strzałki zamieniają kolory.  Podwójne kliknięcie koloru "
 "pozwala go zmienić."
 
-#: ../app/interface.c:1553
+#: ../app/interface.c:1524
 msgid ""
 "Line widths.  Click on a line to set the default line width for new "
 "objects.  Double-click to set the line width more precisely."
@@ -1003,97 +1065,96 @@ msgstr ""
 "Szerokość linii.   Kliknij linię aby ustawić domyślną szerokość dla nowego "
 "obiektu. Podwójne kliknięcie umożliwia dokładniejszą zmianę szerokości linii."
 
-#: ../app/interface.c:1596
+#: ../app/interface.c:1567
 #, fuzzy
 msgid ""
 "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details…"
+"arrow parameters with Details..."
 msgstr ""
 "Styl strzałki dla początku nowych linii. Kliknij aby wybrać strzałkę lub "
 "ustawić parametry strzałki za pomocą opcji Szczegóły..."
 
-#: ../app/interface.c:1601
+#: ../app/interface.c:1572
 #, fuzzy
 msgid ""
 "Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details…"
+"parameters with Details..."
 msgstr ""
 "Styl nowych linii. Kliknij aby wybrać styl linii lub ustawić parametry stylu "
 "linii za pomocą opcji Szczegóły..."
 
-#: ../app/interface.c:1617
+#: ../app/interface.c:1588
 #, fuzzy
 msgid ""
 "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details…"
+"parameters with Details..."
 msgstr ""
 "Styl strzałki dla zakończenia nowych linii. Kliknij aby wybrać strzałkę lub "
 "ustawić parametry strzałki za pomocą opcji Szczegóły..."
 
-#: ../app/interface.c:1676 ../app/interface.c:1800 ../dia.desktop.in.in.h:2
+#: ../app/interface.c:1648 ../app/interface.c:1775
 msgid "Diagram Editor"
 msgstr "Edytor diagramów"
 
-#: ../app/layer_dialog.c:165
+#: ../app/layer_dialog.c:159
 msgid "New Layer"
 msgstr "Nowa warstwa"
 
-#: ../app/layer_dialog.c:166
+#: ../app/layer_dialog.c:160
 msgid "Raise Layer"
 msgstr "Podnieś warstwę"
 
-#: ../app/layer_dialog.c:167
+#: ../app/layer_dialog.c:161
 msgid "Lower Layer"
 msgstr "Obniż warstwę"
 
-#: ../app/layer_dialog.c:168
+#: ../app/layer_dialog.c:162
 msgid "Delete Layer"
 msgstr "usuń warstwę"
 
-#: ../app/layer_dialog.c:311
+#: ../app/layer_dialog.c:306
 msgid "Layers:"
 msgstr "Warstwy:"
 
-#: ../app/layer_dialog.c:390
+#: ../app/layer_dialog.c:386
 msgid "Layers"
 msgstr "Warstwy"
 
-#: ../app/layer_dialog.c:404
+#: ../app/layer_dialog.c:400
 msgid "Diagram:"
 msgstr "Diagram:"
 
-#: ../app/layer_dialog.c:517 ../app/layer_dialog.c:1230
+#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
 #, c-format
 msgid "New layer %d"
 msgstr "Nowa warstwa %d"
 
-#: ../app/layer_dialog.c:732
+#: ../app/layer_dialog.c:729
 msgid "none"
 msgstr "brak"
 
-#: ../app/layer_dialog.c:1200
+#: ../app/layer_dialog.c:1196
 msgid "Edit Layer"
 msgstr "Edytuj warstwę"
 
-#: ../app/layer_dialog.c:1200
+#: ../app/layer_dialog.c:1196
 msgid "Add Layer"
 msgstr "Dodaj warstwę"
 
-#: ../app/layer_dialog.c:1219
+#: ../app/layer_dialog.c:1215
 msgid "Layer name:"
 msgstr "Nazwa warstwy:"
 
-#: ../app/linewidth_area.c:248 ../lib/properties.h:511 ../lib/properties.h:514
-#: ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:162
+#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
+#: ../objects/chronogram/chronoline.c:183 ../objects/chronogram/chronoref.c:162
 msgid "Line width"
 msgstr "Szerokość linii"
 
-#: ../app/linewidth_area.c:260
+#: ../app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Szerokość linii:"
 
-#: ../app/load_save.c:263
+#: ../app/load_save.c:303
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1101,41 +1162,41 @@ msgstr ""
 "Błąd przy wczytywaniu diagramu.\n"
 "Nie odnaleziono w dokumencie przyłączonego obiektu."
 
-#: ../app/load_save.c:267
+#: ../app/load_save.c:307
 #, fuzzy, c-format
 msgid ""
 "Error loading diagram.\n"
-"Connection handle %d does not exist on '%s'."
+"connection handle %d does not exist on '%s'."
 msgstr ""
 "Błąd przy odczycie diagramu.\n"
 "Uchwyt połączenia %d nie istnieje w \"%s\"."
 
-#: ../app/load_save.c:285
+#: ../app/load_save.c:335
 #, fuzzy, c-format
 msgid ""
 "Error loading diagram.\n"
-"Connection point %d does not exist on '%s'."
+"connection point %d does not exist on '%s'."
 msgstr ""
 "Błąd przy odczycie diagramu.\n"
 "Punkt połączenia %d nie istnieje w \"%s\"."
 
-#: ../app/load_save.c:325
+#: ../app/load_save.c:375
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "Nie można znaleźć obiektu %s nadrzędnego w stosunku do obiektu %s\n"
 
-#: ../app/load_save.c:375
+#: ../app/load_save.c:425
 msgid "You must specify a file, not a directory.\n"
 msgstr "Należy podać plik, nie katalog.\n"
 
-#: ../app/load_save.c:382 ../plug-ins/dxf/dxf-import.c:1290
-#: ../plug-ins/wpg/wpg.c:1181 ../plug-ins/xfig/xfig-import.c:1275
-#: ../plug-ins/xslt/xslt.c:93
+#: ../app/load_save.c:432 ../plug-ins/dxf/dxf-import.c:1309
+#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
+#: ../plug-ins/xslt/xslt.c:91
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Nie można otworzyć: \"%s\" do odczytu.\n"
 
-#: ../app/load_save.c:400 ../app/load_save.c:406
+#: ../app/load_save.c:450 ../app/load_save.c:460
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1144,7 +1205,7 @@ msgstr ""
 "Błąd przy odczycie diagramu %s.\n"
 "Nieznany typ pliku."
 
-#: ../app/load_save.c:414
+#: ../app/load_save.c:468
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1153,7 +1214,7 @@ msgstr ""
 "Błąd przy odczycie diagramu %s.\n"
 "Plik nie jest plikiem Dia."
 
-#: ../app/load_save.c:672
+#: ../app/load_save.c:685
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1164,490 +1225,437 @@ msgstr ""
 "%s.\n"
 "Poprawny plik Dia definiuje co najmniej jedną warstwę."
 
-#: ../app/load_save.c:1015
+#: ../app/load_save.c:1008
 #, fuzzy, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
 
-#: ../app/load_save.c:1047
+#: ../app/load_save.c:1040
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr ""
 
-#: ../app/load_save.c:1069 ../plug-ins/cairo/diacairo.c:125
-#: ../plug-ins/cgm/cgm.c:1170 ../plug-ins/drs/dia-render-script.c:124
-#: ../plug-ins/dxf/dxf-export.c:599 ../plug-ins/hpgl/hpgl.c:710
+#: ../app/load_save.c:1062 ../plug-ins/cairo/diacairo.c:110
+#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
 #: ../plug-ins/libart/export_png.c:159
-#: ../plug-ins/metapost/render_metapost.c:1180
-#: ../plug-ins/pgf/render_pgf.c:1203 ../plug-ins/postscript/render_eps.c:105
-#: ../plug-ins/pstricks/render_pstricks.c:919
-#: ../plug-ins/shape/shape-export.c:138 ../plug-ins/svg/render_svg.c:198
-#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wpg/wpg.c:1076
-#: ../plug-ins/xfig/xfig-export.c:1157 ../plug-ins/xslt/xslt.c:101
+#: ../plug-ins/metapost/render_metapost.c:1177
+#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
+#: ../plug-ins/pstricks/render_pstricks.c:916
+#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
+#: ../plug-ins/vdx/vdx-export.c:1850 ../plug-ins/wpg/wpg.c:1072
+#: ../plug-ins/xfig/xfig-export.c:1153 ../plug-ins/xslt/xslt.c:99
 #, c-format
 msgid "Can't open output file %s: %s\n"
 msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
 
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:1080
+#: ../app/load_save.c:1073
 #, fuzzy, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "Błąd %s: wymagany poprawny plik wejściowy %s\n"
 
-#: ../app/load_save.c:1091
+#: ../app/load_save.c:1084
 #, fuzzy, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "Nie można otworzyć pliku wyjściowego %s: %s\n"
 
-#: ../app/load_save.c:1234 ../app/load_save.c:1239
+#: ../app/load_save.c:1175 ../app/load_save.c:1180
 msgid "Dia Diagram File"
 msgstr "Plik diagramu Dia"
 
-#: ../app/menus.c:62
+#: ../app/menus.c:63
 msgid "Fit"
 msgstr "Dopasuj"
 
-#: ../app/menus.c:79
+#: ../app/menus.c:81
 msgid "_File"
 msgstr "_Plik"
 
-#: ../app/menus.c:80
-msgid "Create a new diagram"
-msgstr "Tworzy nowy diagram"
-
-#: ../app/menus.c:81
-msgid "Open a diagram file"
-msgstr "Otwiera plik diagramu"
-
-#: ../app/menus.c:83
+#: ../app/menus.c:85
 msgid "_Help"
 msgstr "Pomo_c"
 
 #: ../app/menus.c:93
-msgid "Sheets and Objects…"
+msgid "Sheets and Objects..."
 msgstr "Arkusze i obiekty..."
 
 #: ../app/menus.c:95
-msgid "Plugins…"
+msgid "Plugins..."
 msgstr "Wtyczki..."
 
-#: ../app/menus.c:96
-msgid "_Diagram Tree…"
+#: ../app/menus.c:101
+msgid "_Diagram tree..."
 msgstr "_Drzewo diagramu..."
 
-#: ../app/menus.c:101
+#: ../app/menus.c:107
 msgid "Show Toolbar"
-msgstr "Pokaż pasek narzędziowy"
+msgstr "Pasek narzędziowy"
 
-#: ../app/menus.c:102
+#: ../app/menus.c:108
 msgid "Show Statusbar"
-msgstr "Pokaż pasek stanu"
-
-#: ../app/menus.c:103
-msgid "Show Layers"
-msgstr "Pokaż warstwy"
+msgstr "Pasek stanu"
 
 #: ../app/menus.c:109
-msgid "Save the diagram"
-msgstr "Zapisz diagram"
-
-#: ../app/menus.c:110
-msgid "Save the diagram with a new name"
-msgstr "Zapisuje diagram pod nową nazwą"
+msgid "Show Layers"
+msgstr "Warstwy"
 
-#: ../app/menus.c:111
-msgid "_Export…"
+#: ../app/menus.c:117
+msgid "_Export ..."
 msgstr "_Eksportuj..."
 
-#: ../app/menus.c:111
-msgid "Export the diagram"
-msgstr "Eksportuje diagram"
-
-#: ../app/menus.c:112
+#: ../app/menus.c:118
 msgid "_Diagram Properties"
 msgstr "_Właściwości diagramu"
 
-#: ../app/menus.c:113
-msgid "Page Set_up…"
-msgstr "_Ustawienia strony..."
+#: ../app/menus.c:119
+msgid "Page Set_up..."
+msgstr "Ustawienia strony..."
 
-#: ../app/menus.c:114
-msgid "Print the diagram"
-msgstr "Drukuje diagram"
-
-#: ../app/menus.c:117
+#: ../app/menus.c:123 ../app/sheets_dialog.c:236
 msgid "_Edit"
-msgstr "/Edycja"
+msgstr "_Edycja"
 
-#: ../app/menus.c:121
-#, fuzzy
-msgid "Copy selection"
-msgstr "Konwekcja"
-
-#: ../app/menus.c:122
-#, fuzzy
-msgid "Cut selection"
-msgstr "Wykrywanie wody"
-
-#: ../app/menus.c:123
-#, fuzzy
-msgid "Paste selection"
-msgstr "Wykrywanie wody"
-
-#: ../app/menus.c:124
+#: ../app/menus.c:130
 msgid "_Duplicate"
-msgstr "Z_duplikuj"
+msgstr "_Powiel"
 
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control><alt> doesn't work either
-#: ../app/menus.c:132
+#. * <control>>alt> doesn't work either
+#: ../app/menus.c:138
 msgid "Copy Text"
 msgstr "Skopiuj tekst"
 
-#: ../app/menus.c:133
+#: ../app/menus.c:139
 msgid "Cut Text"
 msgstr "Wytnij tekst"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:140
 msgid "Paste _Text"
 msgstr "Wklej _tekst"
 
-#: ../app/menus.c:136
-msgid "Paste _Image"
-msgstr "Wklej _obraz"
-
-#: ../app/menus.c:138
+#: ../app/menus.c:142
 msgid "_Layers"
 msgstr "Wa_rstwy"
 
-#: ../app/menus.c:139
-msgid "Add Layer…"
+#: ../app/menus.c:143
+msgid "Add Layer..."
 msgstr "Dodaj warstwę..."
 
-#: ../app/menus.c:140
-msgid "Rename Layer…"
+#: ../app/menus.c:144
+msgid "Rename Layer..."
 msgstr "Zmień nazwę warstwy..."
 
-#: ../app/menus.c:141
-msgid "Move Selection to Layer above"
+#: ../app/menus.c:145
+msgid "Move selection to layer above"
 msgstr "Przenieś zaznaczenie na wyższą warstwę"
 
-#: ../app/menus.c:142
-msgid "Move Selection to Layer below"
+#: ../app/menus.c:146
+msgid "Move selection to layer below"
 msgstr "Przenieś zaznaczenie na niższą warstwę"
 
-#: ../app/menus.c:143
-msgid "_Layers…"
+#: ../app/menus.c:147
+msgid "_Layers..."
 msgstr "Wa_rstwy..."
 
-#: ../app/menus.c:144
+#: ../app/menus.c:149
 msgid "_View"
 msgstr "_Widok"
 
-#: ../app/menus.c:145
-msgid "Zoom in"
-msgstr "Powiększenie"
-
-#: ../app/menus.c:146
-msgid "Zoom out"
-msgstr "Pomniejszenie"
-
-#: ../app/menus.c:147
+#: ../app/menus.c:152
 msgid "_Zoom"
 msgstr "P_owiększenie"
 
-#: ../app/menus.c:148
+#: ../app/menus.c:153
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:149 ../app/menus.c:574 ../app/menus.c:586
+#: ../app/menus.c:154 ../app/menus.c:573
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:150 ../app/menus.c:575 ../app/menus.c:587
+#: ../app/menus.c:155 ../app/menus.c:574
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:151
+#: ../app/menus.c:156
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:157
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:158
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:155
+#: ../app/menus.c:160
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:156
+#: ../app/menus.c:161
 msgid "70.7"
-msgstr "71"
+msgstr "70,7"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:162
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:163
 msgid "35.4"
-msgstr "35"
+msgstr "35,4"
 
-#: ../app/menus.c:159
+#: ../app/menus.c:164
 msgid "25"
 msgstr "25"
 
-#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
-#: ../app/menus.c:161
-#, fuzzy
-msgid "Zoom fit"
-msgstr "Powiększenie"
-
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:165
+#: ../app/menus.c:170
 msgid "New _View"
 msgstr "_Nowy widok"
 
-#: ../app/menus.c:166
+#: ../app/menus.c:171
 msgid "C_lone View"
 msgstr "S_klonuj widok"
 
-#: ../app/menus.c:169
+#: ../app/menus.c:174
 msgid "_Objects"
 msgstr "_Obiekty"
 
-#: ../app/menus.c:170
+#: ../app/menus.c:175
 msgid "Send to _Back"
 msgstr "Przenieś pod _spód"
 
-#: ../app/menus.c:171
+#: ../app/menus.c:176
 msgid "Bring to _Front"
 msgstr "Przenieś na sam _wierzch"
 
-#: ../app/menus.c:172
+#: ../app/menus.c:177
 msgid "Send Backwards"
 msgstr "Przesuń do _tyłu"
 
-#: ../app/menus.c:173
+#: ../app/menus.c:178
 msgid "Bring Forwards"
 msgstr "Przesuń do _przodu"
 
-#: ../app/menus.c:175
+#: ../app/menus.c:180
 msgid "_Group"
 msgstr "_Grupuj"
 
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:177
+#: ../app/menus.c:182
 msgid "_Ungroup"
 msgstr "_Rozdziel"
 
-#: ../app/menus.c:179
+#: ../app/menus.c:184
 msgid "_Parent"
 msgstr "_Wstaw na rodzica"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:185
 msgid "_Unparent"
 msgstr "_Zdejmij z rodzica"
 
-#: ../app/menus.c:181
+#: ../app/menus.c:186
 msgid "_Unparent Children"
 msgstr "_Zdejmij dzieci z rodzica"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:183 ../objects/FS/function.c:811
+#: ../app/menus.c:188 ../objects/FS/function.c:808
 msgid "Align"
 msgstr "Wyrównywanie"
 
-#: ../app/menus.c:188 ../objects/standard/textobj.c:137
+#: ../app/menus.c:193 ../objects/standard/textobj.c:137
 msgid "Top"
 msgstr "Góra"
 
-#: ../app/menus.c:189
+#: ../app/menus.c:194
 msgid "Middle"
 msgstr "Środek"
 
-#: ../app/menus.c:190 ../objects/standard/textobj.c:136
+#: ../app/menus.c:195 ../objects/standard/textobj.c:136
 msgid "Bottom"
 msgstr "Dół"
 
-#: ../app/menus.c:192
+#: ../app/menus.c:197
 msgid "Spread Out Horizontally"
 msgstr "Rozłóż równomiernie w poziomie"
 
-#: ../app/menus.c:193
+#: ../app/menus.c:198
 msgid "Spread Out Vertically"
 msgstr "Rozłóż równomiernie w pionie"
 
-#: ../app/menus.c:194
+#: ../app/menus.c:199
 msgid "Adjacent"
 msgstr "Ułóż przylegająco"
 
-#: ../app/menus.c:195
+#: ../app/menus.c:200
 #, fuzzy
 msgid "Stacked"
 msgstr "Ułóż na sobie"
 
-#: ../app/menus.c:196 ../app/menus.c:206
-msgid "Connected"
-msgstr "Sąsiednie"
-
-#: ../app/menus.c:200
+#: ../app/menus.c:204
 msgid "_Select"
 msgstr "_Zaznaczenie"
 
-#: ../app/menus.c:201
+#: ../app/menus.c:205
 msgid "All"
 msgstr "Wszystko"
 
-#: ../app/menus.c:202 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:222 ../objects/UML/association.c:228
+#: ../app/menus.c:206 ../lib/arrows.c:1898 ../objects/Jackson/domain.c:96
+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
 msgid "None"
 msgstr "Brak"
 
-#: ../app/menus.c:203
+#: ../app/menus.c:207
 msgid "Invert"
 msgstr "Odwróć"
 
-#: ../app/menus.c:205
+#: ../app/menus.c:209
 msgid "Transitive"
 msgstr "Powiązane"
 
-#: ../app/menus.c:207
+#: ../app/menus.c:210
+msgid "Connected"
+msgstr "Sąsiednie"
+
+#: ../app/menus.c:211
 msgid "Same Type"
 msgstr "Ten sam typ"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:211
+#: ../app/menus.c:215
 msgid "Select By"
 msgstr "_Zaznaczenie"
 
-#: ../app/menus.c:213
+#: ../app/menus.c:217
 msgid "_Input Methods"
 msgstr "Metody we_jściowe"
 
-#: ../app/menus.c:215
+#: ../app/menus.c:219
 msgid "D_ialogs"
 msgstr "Okna d_ialogowe"
 
-#: ../app/menus.c:217
+#: ../app/menus.c:221
 msgid "D_ebug"
 msgstr "D_ebugowanie"
 
-#: ../app/menus.c:223
+#: ../app/menus.c:227
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: ../app/menus.c:224
+#: ../app/menus.c:228
 msgid "Modify"
 msgstr "Modyfikacja"
 
-#: ../app/menus.c:226
-msgid "Edit Text"
+#: ../app/menus.c:230
+msgid "Edit text"
 msgstr "Edycja tekstu"
 
-#: ../app/menus.c:227
+#: ../app/menus.c:231
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: ../app/menus.c:248
-msgid "_Antialiased"
+#: ../app/menus.c:254
+msgid "Fullscr_een"
+msgstr "Pełny _ekran"
+
+#: ../app/menus.c:256
+msgid "_AntiAliased"
 msgstr "_Wygładzanie"
 
-#: ../app/menus.c:249
+#: ../app/menus.c:257
 msgid "Show _Grid"
 msgstr "Wyświetlanie _siatki"
 
-#: ../app/menus.c:250
-msgid "_Snap to Grid"
+#: ../app/menus.c:258
+msgid "_Snap To Grid"
 msgstr "P_rzyciąganie do siatki"
 
-#: ../app/menus.c:251
-msgid "Snap to _Objects"
+#: ../app/menus.c:259
+msgid "Snap To _Objects"
 msgstr "Przyciąganie do _obiektów"
 
-#: ../app/menus.c:252
+#: ../app/menus.c:260
 msgid "Show _Rulers"
 msgstr "Wyświet_lanie podziałki"
 
-#: ../app/menus.c:253
+#: ../app/menus.c:261
 msgid "Show _Connection Points"
 msgstr "Wyświetlanie p_unktów połączeń"
 
-#: ../app/menus.c:260
+#: ../app/menus.c:268
 msgid "Union"
 msgstr "Suma"
 
-#: ../app/menus.c:261
+#: ../app/menus.c:269
 msgid "Intersection"
 msgstr "Część wspólna"
 
 #. Translators: Menu item Verb/Channel/Export/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove
 #. Translators: Menu item Verb/Branch/Separate/Remove/Remove
-#: ../app/menus.c:262 ../objects/FS/function.c:711
-#: ../objects/FS/function.c:863 ../objects/FS/function.c:865
+#: ../app/menus.c:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
+#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
 msgid "Remove"
 msgstr "Usuń"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:264
+#: ../app/menus.c:272
 msgid "Inverse"
 msgstr "Inwersja"
 
-#: ../app/menus.c:327
+#: ../app/menus.c:336
 msgid "NULL tooldata in tool_menu_select"
 msgstr "Dane narzędzia o wartości NULL w tool_menu_select"
 
-#: ../app/menus.c:576 ../app/menus.c:588
+#: ../app/menus.c:575
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:577 ../app/menus.c:589
+#: ../app/menus.c:576
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:578 ../app/menus.c:590
+#: ../app/menus.c:577
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:579 ../app/menus.c:591
+#: ../app/menus.c:578
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:580 ../app/menus.c:592
+#: ../app/menus.c:579
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:581 ../app/menus.c:593
+#: ../app/menus.c:580
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:582 ../app/menus.c:594
+#: ../app/menus.c:581
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:583 ../app/menus.c:595
+#: ../app/menus.c:582
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:621
+#: ../app/menus.c:608
 msgid "Toggles snap-to-grid."
 msgstr "Przełącza przyciąganie do siatki."
 
-#: ../app/menus.c:632
+#: ../app/menus.c:620
 msgid "Toggles object snapping."
 msgstr "Przełącza przyciąganie do obiektów."
 
-#: ../app/modify_tool.c:366
-msgid "Couldn't get GTK+ settings"
+#: ../app/modify_tool.c:392
+msgid "Couldn't get GTK settings"
 msgstr "Nie można pobrać ustawień GTK+"
 
 #: ../app/plugin-manager.c:200
-msgid "Plugins"
+msgid "Plug-ins"
 msgstr "Wtyczki"
 
 #: ../app/plugin-manager.c:255
@@ -1655,7 +1663,7 @@ msgid "Loaded"
 msgstr "Wczytane"
 
 #: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-#: ../objects/SISSI/sissi_dialog.c:880
+#: ../objects/SISSI/sissi_dialog.c:882
 msgid "Description"
 msgstr "Opis"
 
@@ -1664,10 +1672,10 @@ msgid "Load at Startup"
 msgstr "Wczytywanie podczas uruchamiania"
 
 #: ../app/plugin-manager.c:284
-msgid "Filename"
+msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: ../app/preferences.c:100 ../app/preferences.c:143
+#: ../app/preferences.c:99 ../app/preferences.c:144
 msgid "any"
 msgstr "dowolne"
 
@@ -1687,15 +1695,15 @@ msgstr "Domyślny widok"
 msgid "Favorites"
 msgstr "Ulubione"
 
-#: ../app/preferences.c:164
+#: ../app/preferences.c:165
 msgid "Reset tools after create"
 msgstr "Zerowanie narzędzi po utworzeniu"
 
-#: ../app/preferences.c:167
+#: ../app/preferences.c:168
 msgid "Number of undo levels:"
 msgstr "Liczba poziomów cofnięć:"
 
-#: ../app/preferences.c:170
+#: ../app/preferences.c:171
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1703,193 +1711,193 @@ msgstr ""
 "Odwrotne przeciąganie zaznacza\n"
 "wszystkie zahaczone obiekty"
 
-#: ../app/preferences.c:173
+#: ../app/preferences.c:174
 msgid "Recent documents list size:"
 msgstr "Rozmiar listy ostatnio otw. dokumentów:"
 
-#: ../app/preferences.c:176
+#: ../app/preferences.c:177
 msgid "Use menu bar"
 msgstr "Używanie paska menu"
 
-#: ../app/preferences.c:179
+#: ../app/preferences.c:180
 msgid "Keep tool box on top of diagram windows"
 msgstr "Skrzynka narzędziowa nad oknami diagramu"
 
-#: ../app/preferences.c:182
+#: ../app/preferences.c:183
 msgid "Length unit:"
 msgstr "Jednostka długości:"
 
-#: ../app/preferences.c:185
+#: ../app/preferences.c:186
 #, fuzzy
-msgid "Font size unit:"
+msgid "Font-size unit:"
 msgstr "Jednostka dla czcionki"
 
-#: ../app/preferences.c:188
+#: ../app/preferences.c:189
 msgid "New diagram:"
 msgstr "Nowy diagram:"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:190
 msgid "Portrait"
 msgstr "Pionowo"
 
-#: ../app/preferences.c:191
+#: ../app/preferences.c:192
 msgid "Paper type:"
 msgstr "Typ papieru:"
 
-#: ../app/preferences.c:193 ../objects/Database/table_dialog.c:1089
+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1079
 msgid "Background Color:"
 msgstr "Kolor tła:"
 
-#: ../app/preferences.c:195
+#: ../app/preferences.c:196
 msgid "Compress saved files"
 msgstr "Kompresja zapisywanych plików"
 
-#: ../app/preferences.c:198
+#: ../app/preferences.c:199
 msgid "Connection Points:"
 msgstr "Punkty połączenia:"
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
+#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
 msgid "Visible"
 msgstr "Widoczne"
 
-#: ../app/preferences.c:200
+#: ../app/preferences.c:201
 msgid "Snap to object"
 msgstr "Przyciąganie do obiektów"
 
-#: ../app/preferences.c:203
+#: ../app/preferences.c:204
 msgid "New window:"
 msgstr "Nowe okno:"
 
-#: ../app/preferences.c:204
+#: ../app/preferences.c:205
 msgid "Width:"
 msgstr "Szerokość:"
 
-#: ../app/preferences.c:205
+#: ../app/preferences.c:206
 msgid "Height:"
 msgstr "Wysokość:"
 
-#: ../app/preferences.c:206
+#: ../app/preferences.c:207
 msgid "Magnify:"
 msgstr "Powiększenie:"
 
-#: ../app/preferences.c:209
+#: ../app/preferences.c:210
 msgid "Page breaks:"
 msgstr "Podział stron:"
 
-#: ../app/preferences.c:211 ../app/preferences.c:241
+#: ../app/preferences.c:212 ../app/preferences.c:240
 msgid "Color:"
 msgstr "Kolor:"
 
-#: ../app/preferences.c:212
+#: ../app/preferences.c:213
 msgid "Solid lines"
 msgstr "Linie ciągłe"
 
-#: ../app/preferences.c:215
+#: ../app/preferences.c:216
 msgid "Antialias:"
 msgstr "Wygładzanie:"
 
-#: ../app/preferences.c:216
+#: ../app/preferences.c:217
 msgid "view antialised"
 msgstr "zastosuj wygładzanie"
 
 #. Favored Filter
 #. Translators: Menu item Verb/Channel/Export
 #. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:220 ../objects/FS/function.c:701
-#: ../objects/FS/function.c:703 ../plug-ins/libart/export_png.c:328
+#: ../app/preferences.c:221 ../objects/FS/function.c:698
+#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:328
 msgid "Export"
 msgstr "Eksportowanie"
 
-#: ../app/preferences.c:222
+#: ../app/preferences.c:223
 msgid "Portable Network Graphics"
-msgstr "Portable Network Graphics (PNG)"
+msgstr "PNG"
 
-#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:503
-#: ../plug-ins/svg/svg-import.c:1205
+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:521
+#: ../plug-ins/svg/svg-import.c:884
 msgid "Scalable Vector Graphics"
-msgstr "Skalowalna grafika wektorowa (SVG)"
+msgstr "SVG"
 
-#: ../app/preferences.c:226
+#: ../app/preferences.c:227
 msgid "PostScript"
-msgstr "PostScript (PS)"
+msgstr "PostScript"
 
-#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1464
-#, fuzzy
-msgid "Windows Metafile"
-msgstr "Metapliki Windows (WMF)"
+#: ../app/preferences.c:229
+msgid "Windows MetaFile"
+msgstr "WMF"
 
-#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1473
-#, fuzzy
-msgid "Enhanced Metafile"
-msgstr "Rozszerzone metapliki (EMF)"
+#: ../app/preferences.c:231
+msgid "Enhanced MetaFile"
+msgstr "EMF"
 
-#: ../app/preferences.c:235
+#: ../app/preferences.c:236
 msgid "Snap to"
 msgstr "Przyciąganie do"
 
-#: ../app/preferences.c:236
+#: ../app/preferences.c:237
 msgid "Dynamic grid resizing"
 msgstr "Dynamiczna zmiana rozmiaru siatki"
 
-#: ../app/preferences.c:237
+#: ../app/preferences.c:238
 msgid "X Size:"
 msgstr "Rozmiar poziomy:"
 
-#: ../app/preferences.c:238
+#: ../app/preferences.c:239
 msgid "Y Size:"
 msgstr "Rozmiar pionowy:"
 
-#: ../app/preferences.c:239
-#, fuzzy
-msgid "Visual Spacing X:"
-msgstr "Widzialne odstępy"
-
-#: ../app/preferences.c:240
-#, fuzzy
-msgid "Visual Spacing Y:"
-msgstr "Widzialne odstępy"
-
-#: ../app/preferences.c:242
+#: ../app/preferences.c:241
 msgid "Lines per major line"
 msgstr "Linii na główną linię"
 
-#: ../app/preferences.c:244
+#: ../app/preferences.c:243
 msgid "Hex Size:"
 msgstr "Wielkość sześciokąta:"
 
-#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
-#: ../lib/prop_pixbuf.c:270
+#. There's really no reason to not pretty format it, and allowing non-pretty
+#. can lead to problems with long lines, CVS etc.
+#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
+#. &default_true,0,"pretty formated xml",NULL, TRUE},
+#.
+#: ../app/preferences.c:255
+msgid "Diagram tree window:"
+msgstr "Okno drzewa diagramu:"
+
+#: ../app/preferences.c:257
+#, fuzzy
+msgid "Save hidden object types"
+msgstr "Nie można wczytać czcionki %s.\n"
+
+#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "Tak"
 
-#: ../app/preferences.c:481 ../app/preferences.c:492
-#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
-#: ../lib/prop_pixbuf.c:272 ../lib/prop_pixbuf.c:278
+#: ../app/preferences.c:485 ../app/preferences.c:496 ../lib/prop_inttypes.c:160
+#: ../lib/prop_inttypes.c:186
 msgid "No"
 msgstr "Nie"
 
-#: ../app/preferences.c:595
+#: ../app/preferences.c:591
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../app/properties-dialog.c:60
+#: ../app/properties-dialog.c:56
 msgid "Object properties"
 msgstr "Właściwości obiektu"
 
-#: ../app/properties-dialog.c:85
+#: ../app/properties-dialog.c:81
 msgid "This object has no properties."
 msgstr "Obiekt nie posiada właściwości."
 
-#: ../app/properties-dialog.c:248
+#: ../app/properties-dialog.c:245
 msgid "Properties: "
 msgstr "Właściwości: "
 
-#: ../app/properties-dialog.c:252
+#: ../app/properties-dialog.c:249
 msgid "Object properties:"
 msgstr "Właściwości obiektu:"
 
-#: ../app/sheets.c:157
+#: ../app/sheets.c:162
 #, c-format
 msgid ""
 "%s\n"
@@ -1898,7 +1906,7 @@ msgstr ""
 "%s\n"
 "Arkusz systemowy"
 
-#: ../app/sheets.c:159
+#: ../app/sheets.c:164
 #, c-format
 msgid ""
 "%s\n"
@@ -1907,7 +1915,7 @@ msgstr ""
 "%s\n"
 "Arkusz użytkownika"
 
-#: ../app/sheets.c:277
+#: ../app/sheets.c:279
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
@@ -1915,60 +1923,149 @@ msgstr ""
 "Nie można pobrać symbolu \"custom_type\" z żadnego modułu.\n"
 "Możliwość modyfikacji kształtów jest wyłączona."
 
-#: ../app/sheets.c:412
+#: ../app/sheets.c:399
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Nie odnaleziono widżetu: %s"
 
-#: ../app/sheets.c:442
+#: ../app/sheets.c:474
 msgid "SVG Shape"
 msgstr "Kształt SVG"
 
-#: ../app/sheets.c:444
+#: ../app/sheets.c:476
 msgid "Programmed DiaObject"
 msgstr "Zaprogramowany obiekt Dia"
 
-#: ../app/sheets_dialog.c:255
-msgid "Select SVG Shape File"
-msgstr "Wybór pliku kształtu SVG"
-
-#: ../app/sheets_dialog_callbacks.c:164
-msgid "Copy ->"
-msgstr "Skopiuj ->"
-
-#: ../app/sheets_dialog_callbacks.c:166
-msgid "Copy All ->"
-msgstr "Skopiuj wszystko ->"
+#: ../app/sheets_dialog.c:84
+msgid "Sheets and Objects"
+msgstr "Arkusze i obiekty"
 
-#: ../app/sheets_dialog_callbacks.c:168
-msgid "Move ->"
-msgstr "Przesuń ->"
-
-#: ../app/sheets_dialog_callbacks.c:170
-msgid "Move All ->"
-msgstr "Przesuń wszystko ->"
-
-#: ../app/sheets_dialog_callbacks.c:177
+#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
 msgid "<- Copy"
 msgstr "<- Skopiuj"
 
-#: ../app/sheets_dialog_callbacks.c:179
+#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
 msgid "<- Copy All"
 msgstr "<- Skopiuj wszystko"
 
-#: ../app/sheets_dialog_callbacks.c:181
+#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
 msgid "<- Move"
 msgstr "<- Przesuń"
 
-#: ../app/sheets_dialog_callbacks.c:183
+#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
 msgid "<- Move All"
 msgstr "<- Przesuń wszystko"
 
-#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
+#: ../app/sheets_dialog.c:234
+msgid "Edit"
+msgstr "Edycja"
+
+#: ../app/sheets_dialog.c:267
+msgid "Revert"
+msgstr "Odwróć"
+
+#: ../app/sheets_dialog.c:355
+msgid "New"
+msgstr "Nowy"
+
+#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
+#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
+msgid "Type"
+msgstr "Typ"
+
+#: ../app/sheets_dialog.c:378
+msgid "Browse..."
+msgstr "Przeglądaj..."
+
+#: ../app/sheets_dialog.c:387
+msgid "SVG Shape:"
+msgstr "Kształt SVG:"
+
+#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
+msgid "description:"
+msgstr "opis:"
+
+#: ../app/sheets_dialog.c:426
+msgid "Sheet name:"
+msgstr "Nazwa arkusza:"
+
+#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
+#: ../app/sheets_dialog_callbacks.c:1109
 msgid "Line Break"
 msgstr "Odstęp linii"
 
-#: ../app/sheets_dialog_callbacks.c:303
+#: ../app/sheets_dialog.c:569
+#, fuzzy
+msgid "Edit Attributes"
+msgstr "Atrybuty"
+
+#: ../app/sheets_dialog.c:584
+#, fuzzy
+msgid "DiaObject"
+msgstr "Obiekt"
+
+#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:696
+#: ../objects/FS/flow-ortho.c:169 ../objects/FS/flow.c:146
+#: ../objects/Istar/link.c:162 ../objects/Jackson/phenomenon.c:146
+#: ../objects/KAOS/metaandorrel.c:166 ../objects/KAOS/metabinrel.c:173
+#: ../objects/UML/class_dialog.c:1159 ../objects/UML/class_dialog.c:2025
+#: ../objects/UML/class_dialog.c:2261 ../objects/UML/class_dialog.c:2864
+msgid "Type:"
+msgstr "Typ:"
+
+#: ../app/sheets_dialog.c:657
+msgid "Sheet"
+msgstr "Arkusz"
+
+#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:684
+#: ../objects/Database/table_dialog.c:1047 ../objects/ER/attribute.c:155
+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
+#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
+#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
+#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
+#: ../objects/UML/realizes.c:134
+msgid "Name:"
+msgstr "Nazwa:"
+
+#: ../app/sheets_dialog.c:810
+#, fuzzy
+msgid "DiaObject:"
+msgstr "Obiekt"
+
+#: ../app/sheets_dialog.c:837
+msgid "Sheet:"
+msgstr "Arkusz:"
+
+#: ../app/sheets_dialog.c:921
+msgid "Select SVG Shape File"
+msgstr "Wybór pliku kształtu SVG"
+
+#: ../app/sheets_dialog_callbacks.c:167
+msgid "Copy ->"
+msgstr "Skopiuj ->"
+
+#: ../app/sheets_dialog_callbacks.c:169
+msgid "Copy All ->"
+msgstr "Skopiuj wszystko ->"
+
+#: ../app/sheets_dialog_callbacks.c:171
+msgid "Move ->"
+msgstr "Przesuń ->"
+
+#: ../app/sheets_dialog_callbacks.c:173
+msgid "Move All ->"
+msgstr "Przesuń wszystko ->"
+
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -1977,7 +2074,7 @@ msgstr ""
 "%s\n"
 "Kształt"
 
-#: ../app/sheets_dialog_callbacks.c:306
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -1986,7 +2083,7 @@ msgstr ""
 "%s\n"
 "Obiekt"
 
-#: ../app/sheets_dialog_callbacks.c:309
+#: ../app/sheets_dialog_callbacks.c:312
 #, c-format
 msgid ""
 "%s\n"
@@ -1995,235 +2092,225 @@ msgstr ""
 "%s\n"
 "Nieprzypisany typ"
 
-#: ../app/sheets_dialog_callbacks.c:771
-#, fuzzy
-msgid "Please select a .shape file"
-msgstr "Wybór pliku kształtu SVG"
-
-#: ../app/sheets_dialog_callbacks.c:778
+#: ../app/sheets_dialog_callbacks.c:803
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "Nazwa pliku musi kończyć się na \"%s\": \"%s\""
 
-#: ../app/sheets_dialog_callbacks.c:786
+#: ../app/sheets_dialog_callbacks.c:811
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "Błąd przy sprawdzaniu %s: %s"
 
-#: ../app/sheets_dialog_callbacks.c:817
+#: ../app/sheets_dialog_callbacks.c:842
 msgid "Please export the diagram as a shape."
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:820
+#: ../app/sheets_dialog_callbacks.c:845
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "Nie można zinterpretować kształtu: \"%s\""
 
-#: ../app/sheets_dialog_callbacks.c:888
+#: ../app/sheets_dialog_callbacks.c:916
 msgid "Sheet must have a Name"
 msgstr "Arkusz musi posiadać nazwę"
 
-#: ../app/sheets_dialog_callbacks.c:1582 ../app/sheets_dialog_callbacks.c:1589
+#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "Nie można otworzyć \"%s\": %s"
 
-#: ../app/sheets_dialog_callbacks.c:1643
+#: ../app/sheets_dialog_callbacks.c:1680
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "Nie można otworzyć: \"%s\" do zapisu."
 
-#: ../app/sheets_dialog_callbacks.c:1653
+#: ../app/sheets_dialog_callbacks.c:1690
 msgid "a user"
 msgstr "użytkownik"
 
-#: ../app/sheets_dialog_callbacks.c:1666
+#: ../app/sheets_dialog_callbacks.c:1703
 #, c-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1669
+#: ../app/sheets_dialog_callbacks.c:1706
 #, c-format
 msgid "Date: %s"
 msgstr "Data: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1673
+#: ../app/sheets_dialog_callbacks.c:1710
 #, c-format
 msgid "For: %s"
 msgstr "Dla: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1690
+#: ../app/sheets_dialog_callbacks.c:1727
 msgid "add shapes here"
 msgstr "dodaj tutaj kształty"
 
-#: ../app/splash.c:50
-msgid "Loading …"
+#: ../app/splash.c:57
+msgid "Loading ..."
 msgstr "Wczytywanie..."
 
-#: ../app/splash.c:68
+#: ../app/splash.c:75
 #, c-format
 msgid "Dia v %s"
-msgstr "Dia wersja %s"
+msgstr "Dia w wersji %s"
 
 #: ../dia.desktop.in.in.h:1
-msgid "Dia"
-msgstr "Dia"
-
-#: ../dia.desktop.in.in.h:3
 msgid "Dia Diagram Editor"
 msgstr "Edytor diagramów Dia"
 
-#: ../dia.desktop.in.in.h:4
+#: ../dia.desktop.in.in.h:2
 msgid "Edit your Diagrams"
 msgstr "Edycja diagramów"
 
-#: ../lib/arrows.c:1891
+#: ../lib/arrows.c:1899
 msgid "Lines"
 msgstr "Linie"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1900
 msgid "Hollow Triangle"
 msgstr "Pusty trójkąt"
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1901
 msgid "Filled Triangle"
 msgstr "Wypełniony trójkąt"
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1902
 msgid "Unfilled Triangle"
 msgstr "Niewypełniony trójkąt"
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1903
 msgid "Hollow Diamond"
 msgstr "Wydrążony diament"
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1904
 msgid "Filled Diamond"
 msgstr "Wypełniony diament"
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1905
 msgid "Half Diamond"
 msgstr "Przepołowiony diament"
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1906
 msgid "Half Head"
 msgstr "Połowa kąta"
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1907
 msgid "Slashed Cross"
 msgstr "Przekreślony krzyżyk"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1908
 msgid "Filled Ellipse"
 msgstr "Wypełniona elipsa"
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1909
 msgid "Hollow Ellipse"
 msgstr "Pusta elipsa"
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1910
 msgid "Filled Dot"
 msgstr "Wypełniony punkt"
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1911
 msgid "Dimension Origin"
 msgstr "Znacznik wymiaru"
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1912
 msgid "Blanked Dot"
 msgstr "Niewypełniony punkt"
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1913
 msgid "Double Hollow Triangle"
 msgstr "Podwójny pusty trójkąt"
 
-#: ../lib/arrows.c:1906
+#: ../lib/arrows.c:1914
 msgid "Double Filled Triangle"
 msgstr "Podwójny wypełniony trójkąt"
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1915
 msgid "Filled Dot and Triangle"
 msgstr "Wypełniony punkt i trójkąt"
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1916
 msgid "Filled Box"
 msgstr "Wypełniony prostokąt"
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1917
 msgid "Blanked Box"
 msgstr "Pusty prostokąt"
 
-#: ../lib/arrows.c:1910
+#: ../lib/arrows.c:1918
 msgid "Slashed"
 msgstr "Podwójny ukośnik"
 
-#: ../lib/arrows.c:1911
+#: ../lib/arrows.c:1919
 msgid "Integral Symbol"
 msgstr "Symbol liczby całk."
 
-#: ../lib/arrows.c:1912
+#: ../lib/arrows.c:1920
 msgid "Crow Foot"
 msgstr "Stopa kruka"
 
-#: ../lib/arrows.c:1913
+#: ../lib/arrows.c:1921
 msgid "Cross"
 msgstr "Krzyżyk"
 
-#: ../lib/arrows.c:1914
+#: ../lib/arrows.c:1922
 msgid "1-or-many"
 msgstr ""
 
-#: ../lib/arrows.c:1915
+#: ../lib/arrows.c:1923
 msgid "0-or-many"
 msgstr ""
 
-#: ../lib/arrows.c:1916
+#: ../lib/arrows.c:1924
 msgid "1-or-0"
 msgstr ""
 
-#: ../lib/arrows.c:1917
+#: ../lib/arrows.c:1925
 msgid "1 exactly"
 msgstr ""
 
-#: ../lib/arrows.c:1918
+#: ../lib/arrows.c:1926
 msgid "Filled Concave"
 msgstr "Wypełniona wklęsłość"
 
-#: ../lib/arrows.c:1919
+#: ../lib/arrows.c:1927
 msgid "Blanked Concave"
 msgstr "Niewypełniona wklęsłość"
 
-#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
-#: ../lib/properties.h:489 ../lib/properties.h:495
+#: ../lib/arrows.c:1928
 msgid "Round"
 msgstr "Zaokrąglone"
 
-#: ../lib/arrows.c:1921
+#: ../lib/arrows.c:1929
 msgid "Open Round"
 msgstr "Zaokrąglone otwarte"
 
-#: ../lib/arrows.c:1922
+#: ../lib/arrows.c:1930
 msgid "Backslash"
 msgstr "Ukośnik"
 
-#: ../lib/arrows.c:1923
+#: ../lib/arrows.c:1931
 msgid "Infinite Line"
 msgstr "Linia nieskończona"
 
-#: ../lib/arrows.c:2051
+#: ../lib/arrows.c:2059
 msgid "Arrow head of unknown type"
 msgstr "Strzałka nieznanego typu"
 
-#: ../lib/arrows.c:2059
+#: ../lib/arrows.c:2067
 #, fuzzy, c-format
-msgid "Arrow head of type %s has too small dimensions; removing.\n"
+msgid "Arrow head of type %s has too small dimensions, removing.\n"
 msgstr "Strzałka typu %s jest zbyt mała, usuwam.\n"
 
-#: ../lib/arrows.c:2192
+#: ../lib/arrows.c:2200
 msgid "unknown arrow"
 msgstr "nieznana strzałka"
 
-#: ../lib/bezier_conn.c:638
+#: ../lib/bezier_conn.c:636
 msgid "Internal error: Setting corner type of endpoint of bezier"
 msgstr ""
 "Błąd wewnętrzny: Ustawianie typu narożnika końcowego punktu krzywej Beziera"
@@ -2231,36 +2318,21 @@ msgstr ""
 #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
 #: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
 #: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-#: ../plug-ins/svg/svg-import.c:331 ../plug-ins/vdx/vdx-import.c:145
+#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:145
 msgid "Can't find standard object"
 msgstr "Nie można znaleźć obiektu standardowego"
 
-#: ../lib/dia_dirs.c:327
-#, c-format
-msgid "Too many \"..\"s in filename %s\n"
-msgstr ""
-
-#. pathologic case - pixbuf not even supporting PNG?
-#: ../lib/dia_image.c:295
+#: ../lib/dia_dirs.c:242
 #, c-format
-msgid ""
-"Unsupported file format for saving:\n"
-"%s\n"
-"%s"
-msgstr ""
+msgid "%s<illegal characters>..."
+msgstr "%s<niedozwolone znaki>..."
 
-#: ../lib/dia_image.c:298 ../plug-ins/pixbuf/pixbuf.c:93
+#: ../lib/dia_dirs.c:273
 #, c-format
-msgid ""
-"Could not save file:\n"
-"%s\n"
-"%s"
+msgid "Too many ..'s in filename %s\n"
 msgstr ""
-"Nie można zapisać pliku:\n"
-"%s\n"
-"%s"
 
-#: ../lib/dia_xml.c:197
+#: ../lib/dia_xml.c:192
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2269,120 +2341,58 @@ msgstr ""
 "Plik %s nie posiada zakodowanej specyfikacji;\n"
 "przypuszczalnie jest ona zakodowana w %s"
 
-#: ../lib/dia_xml.c:616
+#: ../lib/dia_xml.c:597
 msgid "Taking point value of non-point node."
 msgstr "Pobieranie wartości punktu dla węzła nie będącego punktem."
 
-#: ../lib/dia_xml.c:627
+#: ../lib/dia_xml.c:608
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "Niepoprawna wartość x Punktu \"%s\" %f; odrzucenie tej wartości."
 
-#: ../lib/dia_xml.c:634
+#: ../lib/dia_xml.c:615
 msgid "Error parsing point."
 msgstr "Błąd przetwarzania punktu."
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:642
+#: ../lib/dia_xml.c:623
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "Niepoprawna wartość y Punktu \"%s\" %f; odrzucenie tej wartości."
 
-#: ../lib/dia_xml.c:659
+#: ../lib/dia_xml.c:640
 msgid "Taking bezpoint value of non-point node."
 msgstr "Pobieranie wartości punktu Beziera dla węzła nie będącego punktem."
 
-#: ../lib/dia_xml.c:677
+#: ../lib/dia_xml.c:658
 msgid "Error parsing bezpoint p1."
 msgstr "Błąd przetwarzania punktu Beziera p1."
 
-#: ../lib/dia_xml.c:691
-msgid "Error parsing bezpoint p2."
-msgstr "Błąd przetwarzania punktu Beziera p2."
-
-#: ../lib/dia_xml.c:705
-msgid "Error parsing bezpoint p3."
-msgstr "Błąd przetwarzania punktu Beziera p3."
-
-#: ../lib/diaarrowchooser.c:381
-msgid "Arrow Properties"
-msgstr "Właściwości strzałki"
-
-#: ../lib/diaarrowselector.c:121
-msgid "More arrows"
-msgstr "Więcej strzałek"
-
-#: ../lib/diaarrowselector.c:138
-msgid "Size: "
-msgstr "Rozmiar: "
-
-#: ../lib/diacolorselector.c:205
-msgid "Select color"
-msgstr "Wybierz kolor"
-
-#: ../lib/diacolorselector.c:287
-msgid "More colors…"
-msgstr "Więcej kolorów..."
-
-#: ../lib/diadynamicmenu.c:392
-msgid "Reset menu"
-msgstr "Resetuj menu"
+#: ../lib/dia_xml.c:672
+msgid "Error parsing bezpoint p2."
+msgstr "Błąd przetwarzania punktu Beziera p2."
 
-#: ../lib/diafontselector.c:159
-msgid "Other fonts"
-msgstr "Inne czcionki"
+#: ../lib/dia_xml.c:686
+msgid "Error parsing bezpoint p3."
+msgstr "Błąd przetwarzania punktu Beziera p3."
 
-#: ../lib/diafontselector.c:231
-#, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "Nie można odnaleźć rodziny czcionek dla %s\n"
+#: ../lib/diaarrowchooser.c:361
+msgid "Arrow Properties"
+msgstr "Właściwości strzałki"
 
-#: ../lib/dialinechooser.c:309
+#: ../lib/dialinechooser.c:297
 msgid "Line Style Properties"
 msgstr "Właściwości stylu linii"
 
-#: ../lib/dialinechooser.c:344
-msgid "Details…"
+#: ../lib/dialinechooser.c:339
+msgid "Details..."
 msgstr "Szczegóły..."
 
-# FIXME
-# lib/widgets.c: "Linia ciągła"
-# objects/FS/function.c: "Stały"
-#: ../lib/dialinestyleselector.c:124
-#, fuzzy
-msgid "line|Solid"
-msgstr "Jednolita"
-
-#: ../lib/dialinestyleselector.c:130
-#, fuzzy
-msgid "line|Dashed"
-msgstr "Linia przerywana"
-
-#: ../lib/dialinestyleselector.c:136
-#, fuzzy
-msgid "line|Dash-Dot"
-msgstr "Linia-kropka"
-
-#: ../lib/dialinestyleselector.c:142
-#, fuzzy
-msgid "line|Dash-Dot-Dot"
-msgstr "Linia-kropka-kropka"
-
-#: ../lib/dialinestyleselector.c:148
-#, fuzzy
-msgid "line|Dotted"
-msgstr "Linia kropkowana"
-
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/dialinestyleselector.c:166
-msgid "Dash length: "
-msgstr "Długość odcinka linii: "
-
-#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
-msgid "OK"
+#: ../lib/dialogs.c:51
+msgid "Ok"
 msgstr "OK"
 
-#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -2391,41 +2401,41 @@ msgstr "Anuluj"
 msgid "Multiple export filters with unique name %s"
 msgstr "Wielokrotny eksport filtrów z unikalną nazwą %s"
 
-#: ../lib/font.c:85
+#: ../lib/font.c:84
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "Nie można wczytać czcionki %s.\n"
 
-#: ../lib/group.c:617
-#, fuzzy
-msgid "Transformation"
-msgstr "Informacja"
-
-#: ../lib/message.c:93 ../lib/message.c:282
+#: ../lib/message.c:92 ../lib/message.c:278
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../lib/message.c:120
+#: ../lib/message.c:119
 msgid "There is one similar message."
 msgstr "Istnieje już jeden podobny komunikat."
 
-#: ../lib/message.c:125
+#: ../lib/message.c:124
 msgid "Show repeated messages"
 msgstr "Wyświetlanie powtórzonych komunikatów"
 
-#: ../lib/message.c:146
+#: ../lib/message.c:145
 msgid "Don't show this message again"
 msgstr "Nie pokazuj ponownie tej informacji"
 
-#: ../lib/message.c:204
+#: ../lib/message.c:203
 #, c-format
 msgid "There are %d similar messages."
 msgstr "Istnieje już %d podobnych komunikatów."
 
-#: ../lib/message.c:266
+#: ../lib/message.c:262
 msgid "Notice"
 msgstr "Uwaga"
 
+#: ../lib/newgroup.c:124
+#, fuzzy
+msgid "Open group"
+msgstr "Zaokrąglone otwarte"
+
 #: ../lib/object_defaults.c:128
 #, c-format
 msgid ""
@@ -2435,16 +2445,6 @@ msgstr ""
 "Błąd przy odczycie wartości domyślnych '%s'.\n"
 "Plik nie jest plikiem Dia."
 
-#. base property stuff...
-#: ../lib/orth_conn.h:92
-#, fuzzy
-msgid "Autoroute"
-msgstr "Router IAD"
-
-#: ../lib/orth_conn.h:103
-msgid "Autorouting"
-msgstr ""
-
 #: ../lib/plug-ins.c:111
 msgid "???"
 msgstr "???"
@@ -2492,179 +2492,96 @@ msgstr "Data utworzenia"
 msgid "Modification date"
 msgstr "Data modyfikacji"
 
-#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:878
+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
-msgid "Key"
-msgstr "Klucz"
-
-#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
-#: ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "Wartość"
-
-#: ../lib/prop_inttypes.c:567
+#: ../lib/prop_inttypes.c:558
 msgid "Property cast from int to enum out of range"
 msgstr ""
 
-#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
-#, c-format
-msgid ""
-"Failed to load image form diagram:\n"
-"%s"
-msgstr ""
-
-#: ../lib/prop_pixbuf.c:200
-#, c-format
-msgid ""
-"Saving inline pixbuf failed:\n"
-"%s"
-msgstr ""
-
-#: ../lib/prop_pixbuf.c:296
-msgid "Cant create image data from scratch!"
-msgstr ""
-
-#: ../lib/prop_text.c:473
+#: ../lib/prop_text.c:469
 #, c-format
 msgid "Group with %d objects"
 msgstr ""
 
-#: ../lib/propdialogs.c:324 ../objects/UML/association.c:236
-#: ../objects/UML/object.c:147
-#, fuzzy
-msgid "General"
-msgstr "Generator prądu zmiennego"
-
-#: ../lib/propdialogs.c:325
-msgid "Meta"
-msgstr ""
-
-#: ../lib/properties.c:67 ../lib/properties.h:476 ../lib/widgets.c:273
+#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
 msgid "Left"
 msgstr "Lewa"
 
-#: ../lib/properties.c:68 ../lib/properties.h:477 ../lib/widgets.c:274
+#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
 #: ../objects/standard/textobj.c:138
 msgid "Center"
 msgstr "Wyśrodkowanie"
 
-#: ../lib/properties.c:69 ../lib/properties.h:478 ../lib/widgets.c:275
+#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
 msgid "Right"
 msgstr "Prawa"
 
-#: ../lib/properties.c:74 ../lib/properties.h:482
-msgid "Never"
-msgstr ""
-
-#: ../lib/properties.c:75 ../lib/properties.h:483
-msgid "When Needed"
-msgstr ""
-
-#: ../lib/properties.c:76 ../lib/properties.h:484
-msgid "Always"
-msgstr ""
-
-#: ../lib/properties.c:80 ../lib/properties.h:488
-msgid "Miter"
-msgstr ""
-
-#: ../lib/properties.c:82 ../lib/properties.h:490
-msgid "Bevel"
-msgstr ""
-
-#: ../lib/properties.c:86 ../lib/properties.h:494
-msgid "Butt"
-msgstr ""
-
-#: ../lib/properties.c:88 ../lib/properties.h:496
-#, fuzzy
-msgid "Projecting"
-msgstr "Bez ochrony"
-
-#: ../lib/properties.c:95 ../lib/properties.h:517 ../lib/properties.h:520
-#: ../objects/chronogram/chronoline.c:181
-#: ../objects/chronogram/chronoref.c:160
+#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
+#: ../objects/chronogram/chronoline.c:181 ../objects/chronogram/chronoref.c:160
 msgid "Line color"
 msgstr "Kolor linii"
 
-#: ../lib/properties.c:96 ../lib/properties.h:523 ../lib/properties.h:526
+#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
 msgid "Line style"
 msgstr "Styl linii"
 
-#: ../lib/properties.c:97 ../lib/properties.h:542 ../lib/properties.h:545
+#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
 msgid "Fill color"
 msgstr "Kolor wypełnienia"
 
-#: ../lib/properties.c:98 ../lib/properties.h:548 ../lib/properties.h:551
+#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
 msgid "Draw background"
 msgstr "Rysowanie tła"
 
-#: ../lib/properties.c:99 ../lib/properties.h:555
+#: ../lib/properties.c:78 ../lib/properties.h:523
 msgid "Start arrow"
 msgstr "Początek strzałki"
 
-#: ../lib/properties.c:100 ../lib/properties.h:558
+#: ../lib/properties.c:79 ../lib/properties.h:526
 msgid "End arrow"
 msgstr "Koniec strzałki"
 
-#: ../lib/properties.c:102 ../lib/properties.h:568
+#: ../lib/properties.c:81 ../lib/properties.h:536
 msgid "Text alignment"
 msgstr "Wyrównanie tekstu"
 
 #. all this just to make the defaults selectable ...
-#: ../lib/properties.c:103 ../lib/properties.h:573
-#: ../objects/Database/table_dialog.c:1045 ../objects/Database/reference.c:118
+#: ../lib/properties.c:82 ../lib/properties.h:541
+#: ../objects/Database/table_dialog.c:1037 ../objects/Database/reference.c:117
 #: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:177
-#: ../objects/UML/class_dialog.c:455 ../objects/chronogram/chronoline.c:185
+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
+#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
 #: ../objects/chronogram/chronoref.c:166
 msgid "Font"
 msgstr "Czcionka"
 
-#: ../lib/properties.c:104 ../lib/properties.h:581
+#: ../lib/properties.c:83 ../lib/properties.h:549
 #: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
 #: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
 #: ../objects/chronogram/chronoref.c:168
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
-#: ../lib/properties.c:105 ../lib/properties.h:587
-#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
-#: ../objects/chronogram/chronoref.c:170
+#: ../lib/properties.c:84 ../lib/properties.h:555 ../objects/GRAFCET/step.c:171
+#: ../objects/chronogram/chronoline.c:189 ../objects/chronogram/chronoref.c:170
 msgid "Text color"
 msgstr "Kolor tekstu"
 
-#: ../lib/properties.h:529 ../lib/properties.h:532
-#, fuzzy
-msgid "Line join"
-msgstr "Szerokość linii"
-
-#: ../lib/properties.h:535 ../lib/properties.h:538
-#, fuzzy
-msgid "Line caps"
-msgstr "Odstępy w linii"
-
-#: ../lib/properties.h:596
-#, fuzzy
-msgid "Text fitting"
-msgstr "Wyrównanie tekstu"
-
 #: ../lib/proplist.c:163
 #, c-format
-msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
+msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
 msgstr ""
 
-#: ../lib/sheet.c:71 ../lib/sheet.c:86
+#: ../lib/sheet.c:69 ../lib/sheet.c:84
 #, c-format
 msgid ""
 "DiaObject '%s' needed in sheet '%s' was not found.\n"
 "It will not be available for use."
 msgstr ""
 
-#: ../lib/sheet.c:316
+#: ../lib/sheet.c:314
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2674,27 +2591,89 @@ msgid ""
 "or remove '%s', using the 'Sheets and Objects' dialog."
 msgstr ""
 
-#: ../lib/sheet.c:375
+#: ../lib/sheet.c:371
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr ""
 
-#: ../lib/widgets.c:394
+#: ../lib/widgets.c:441
+msgid "Other fonts"
+msgstr "Inne czcionki"
+
+#: ../lib/widgets.c:513
+#, c-format
+msgid "Couldn't find font family for %s\n"
+msgstr "Nie można odnaleźć rodziny czcionek dla %s\n"
+
+# FIXME
+# lib/widgets.c: "Linia ciągła"
+# objects/FS/function.c: "Stały"
+#. Translators: Menu item Noun/Material/Solid
+#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
+msgid "Solid"
+msgstr "Jednolita"
+
+#: ../lib/widgets.c:902
+#, fuzzy
+msgid "Dashed"
+msgstr "Podwójny ukośnik"
+
+#: ../lib/widgets.c:908
+#, fuzzy
+msgid "Dash-Dot"
+msgstr "Linia-kropka"
+
+#: ../lib/widgets.c:914
+#, fuzzy
+msgid "Dash-Dot-Dot"
+msgstr "Linia-kropka-kropka"
+
+#: ../lib/widgets.c:920
+#, fuzzy
+msgid "Dotted"
+msgstr "Linia kropkowana"
+
+#. fs->sizebox = GTK_HBOX(box);
+#: ../lib/widgets.c:938
+msgid "Dash length: "
+msgstr "Długość odcinka linii: "
+
+#: ../lib/widgets.c:1066
+msgid "Select color"
+msgstr "Wybierz kolor"
+
+#: ../lib/widgets.c:1132
+msgid "More colors..."
+msgstr "Więcej kolorów..."
+
+#: ../lib/widgets.c:1280
+msgid "More arrows"
+msgstr "Więcej strzałek"
+
+#: ../lib/widgets.c:1297
+msgid "Size: "
+msgstr "Rozmiar: "
+
+#: ../lib/widgets.c:1475
 msgid "Select image file"
 msgstr "Wybierz plik z obrazem"
 
-#: ../lib/widgets.c:445
+#: ../lib/widgets.c:1523
 msgid "Browse"
 msgstr "Przeglądaj"
 
+#: ../lib/widgets.c:2087
+msgid "Reset menu"
+msgstr "Resetuj menu"
+
 #. Installer message if no GTK+ was found
 #: ../installer/win32/gennsh.c:39
 msgid ""
 "GTK+ is not installed. Please use the full installer. It is available from "
 "http://dia-installer.de."
 msgstr ""
-"GTK+ nie zostało zainstalowane. Proszę użyć pełnej wersji instalatora. Jest "
-"on dostępny na stronie: http://dia-installer.de."
+"GTK+ nie jest zainstalowane. Proszę użyć pełnej wersji instalatora. Jest on "
+"dostępny na stronie: http://dia-installer.de."
 
 #. Installer message: Don't install over pre 0.95 versions
 #: ../installer/win32/gennsh.c:42
@@ -2702,7 +2681,7 @@ msgid ""
 "Please remove old Dia installations completely or install Dia to a different "
 "location."
 msgstr ""
-"Proszę usunąć całkowicie poprzednią instalację Dia lub zainstalować Dia w "
+"Proszę całkowicie usunąć poprzednią instalację Dia lub zainstalować Dia w "
 "innym miejscu."
 
 #. Installer message:  License Page
@@ -2716,7 +2695,7 @@ msgid ""
 "$(^Name) is released under the GPL license. The license is provided here for "
 "information purposes only. $_CLICK"
 msgstr ""
-"$(^Name) jest rozpowszechniane na licencji GPL. Licencja jest dostępna tutaj "
+"$(^Name) jest rozpowszechniana na licencji GPL. Licencja jest dostępna tutaj "
 "jedynie w celach informacyjnych. $_CLICK"
 
 #. Installer message: Components page
@@ -2742,7 +2721,7 @@ msgstr "Główne pliki Dia i biblioteki DLL"
 #. Installer message: Component name
 #: ../installer/win32/gennsh.c:63
 msgid "Python plug-in"
-msgstr "Wtyczka Pythona"
+msgstr "Wtyczka języka Python"
 
 #. Installer message: Component description
 #: ../installer/win32/gennsh.c:66
@@ -2750,62 +2729,79 @@ msgid ""
 "Support for the Python Scripting Language 2.3. Do not select this if Python "
 "is not installed."
 msgstr ""
-"Wsparcie dla skryptów pisanych w Pythonie 2.3. Nie wybieraj tej opcji jeśli "
-"Python nie jest zainstalowany."
+"Obsługa skryptów pisanych w języku Python 2.3. Nie należy wybierać tej "
+"opcji, jeśli język Python nie jest zainstalowany."
 
-#. Installer message: hyperlink text on finish page
+#. Installer message: Component name
 #: ../installer/win32/gennsh.c:69
+msgid "Desktop Shortcut"
+msgstr "Skrót na pulpicie"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:72
+msgid "Create a shortcut on the Desktop."
+msgstr "Utworzenie skrótu na pulpicie."
+
+#. Installer message: hyperlink text on finish page
+#: ../installer/win32/gennsh.c:76
 msgid "Visit the Dia for Windows Web Page"
-msgstr "Odwiedź stronę \"Dia for Windows\""
+msgstr "Odwiedź stronę \"Dia dla Windows\""
 
 #. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:72
+#: ../installer/win32/gennsh.c:79
 msgid "Dia (remove only)"
-msgstr "Dia (tylko usuń)"
-
-#. Installer message: confirmation question. Keep $\r
-#: ../installer/win32/gennsh.c:75
-msgid ""
-"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
-"$\rNote: Any non-standard plugins that you may have installed will be "
-"deleted.$\rDia user settings will not be affected."
-msgstr ""
-"Twój stary katalog z Dia zostanie za chwilę usunięty. Czy na pewno chcesz "
-"kontynuować?$\r$\rUwaga: Wszelkie niestandardowe wtyczki, które możesz mieć "
-"zainstalowane zostaną usunięte.$\rNie ma to jednak wpływu na ustawienia "
-"użytkownika Dia."
+msgstr "Dia (tylko usuwanie)"
 
-#. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:78
+#. Installer message: directory delete confirmation line 1
+#: ../installer/win32/gennsh.c:82
 msgid ""
-"The installation directory you specified already exists. Any contents$\rwill "
-"be deleted. Would you like to continue?"
-msgstr ""
-"Wskazany katalog do instalacji już istnieje. Wszelka zawartość$\rzostanie "
-"usunięta. Czy na pewno chcesz kontynuować?"
+"Your old Dia directory is about to be deleted. Would you like to continue?"
+msgstr "Poprzedni katalog Dia zostanie usunięty. Kontynuować?"
 
-#. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:81
+#. Installer message: directory delete confirmation line 2
+#: ../installer/win32/gennsh.c:84
 msgid ""
-"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-"another user installed this application."
-msgstr ""
-"Program odinstalowujący nie znalazł wpisów w rejestrach dla Dia.$"
-"\rPrawdopodobnie inny użytkownik zainstalował tę aplikację."
+"Note: Any non-standard plugins that you may have installed will be deleted."
+msgstr "Uwaga: wszelkie zainstalowane niestandardowe wtyczki zostaną usunięte."
+
+#. Installer message: directory delete confirmation line 3
+#: ../installer/win32/gennsh.c:86
+msgid "Dia user settings will not be affected."
+msgstr "Ustawienia użytkownika Dia nie zostaną naruszone."
+
+#. Installer message: DIA_PROMPT_DIR_EXISTS line 1
+#: ../installer/win32/gennsh.c:89
+msgid "The installation directory you specified already exists. Any contents"
+msgstr "Podany katalog instalacji już istnieje. Wszelka zawartość"
+
+#. Installer message: DIA_PROMP_DIR_EXISTS line 2
+#: ../installer/win32/gennsh.c:91
+msgid "will be deleted. Would you like to continue?"
+msgstr "zostanie usunięta. Kontynuować?"
+
+#. Installer message: registry entries not found line 1
+#: ../installer/win32/gennsh.c:94
+msgid "The uninstaller could not find registry entries for Dia."
+msgstr "Program odinstalowujący nie znalazł wpisów rejestru dla Dia."
+
+#. Installer message: registry entries not found line 2
+#: ../installer/win32/gennsh.c:96
+msgid "It is likely that another user installed this application."
+msgstr "Prawdopodobnie inny użytkownik zainstalował tę aplikację."
 
 #. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:84
+#: ../installer/win32/gennsh.c:99
 msgid "You do not have permission to uninstall this application."
-msgstr "Nie masz uprawnień do odinstalowania tej aplikacji."
+msgstr "Brak uprawnień do odinstalowania tej aplikacji."
 
 #. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:87
+#: ../installer/win32/gennsh.c:102
 msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
 msgstr ""
 "$INSTDIR i wszystkie podkatalogi zostaną całkowicie usunięte. Kontynuować?"
 
 #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:90
+#: ../installer/win32/gennsh.c:105
 msgid ""
 "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
 msgstr ""
@@ -2894,22 +2890,22 @@ msgstr "Liczba ramion"
 
 #: ../objects/Database/compound.c:221
 #, fuzzy
-msgid "Flip arms vertically"
+msgid "Flip arms verticaly"
 msgstr "Obróć ramiona w pionie"
 
 #: ../objects/Database/compound.c:223
 #, fuzzy
-msgid "Flip arms horizontally"
+msgid "Flip arms horizontaly"
 msgstr "Obróć ramiona w poziomie"
 
 #: ../objects/Database/compound.c:225
 #, fuzzy
-msgid "Center mount point vertically"
+msgid "Center mount point verticaly"
 msgstr "Wyśrodkuj punkt mocowania w pionie"
 
 #: ../objects/Database/compound.c:227
 #, fuzzy
-msgid "Center mount point horizontally"
+msgid "Center mount point horizontaly"
 msgstr "Wyśrodkuj punkt mocowania w poziomie"
 
 #: ../objects/Database/compound.c:229
@@ -2924,263 +2920,228 @@ msgstr "Złożenie"
 msgid "Entity/Relationship table diagram objects"
 msgstr "Obiekty diagramów encji/zależności między tabelami"
 
-#: ../objects/Database/table.c:143 ../objects/Database/table.c:187
-#: ../objects/Database/table.c:204 ../objects/UML/class.c:149
-#: ../objects/UML/class.c:192 ../objects/UML/class_dialog.c:486
+#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
+#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
+#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
 #: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
 #: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../objects/Database/table.c:145
+#: ../objects/Database/table.c:144
 msgid "Primary key"
 msgstr "Klucz główny (PK)"
 
-#: ../objects/Database/table.c:147
+#: ../objects/Database/table.c:146
 msgid "Nullable"
 msgstr ""
 
-#: ../objects/Database/table.c:149
+#: ../objects/Database/table.c:148
 msgid "Unique"
 msgstr "Unikatowa"
 
-#: ../objects/Database/table.c:151
-#, fuzzy
-msgid "Default value"
-msgstr "Domyślna wartość"
-
-#: ../objects/Database/table.c:189
+#: ../objects/Database/table.c:185
 msgid "Visible comments"
 msgstr "Widoczne komentarze"
 
-#: ../objects/Database/table.c:191 ../objects/UML/class.c:172
+#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
 #, fuzzy
 msgid "Comment tagging"
 msgstr "Komentarz"
 
-#: ../objects/Database/table.c:193 ../objects/Database/table_dialog.c:985
+#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:977
 msgid "Underline primary keys"
 msgstr "Podkreśl klucze główne"
 
-#: ../objects/Database/table.c:195 ../objects/Database/table_dialog.c:990
+#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:982
 msgid "Use bold font for primary keys"
 msgstr "Użyj pogrubienia dla kluczy głównych"
 
 #. property rows
-#: ../objects/Database/table.c:200 ../objects/SADT/arrow.c:137
-#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:461
+#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:137
+#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
 msgid "Normal"
 msgstr "Zwykła"
 
-#: ../objects/Database/table.c:202
-#, fuzzy
-msgid "Table name"
-msgstr "Nazwa tabeli:"
+#: ../objects/Database/table.c:198
+msgid "Tablename"
+msgstr "Nazwa tabeli"
 
-#: ../objects/Database/table.c:207 ../objects/Database/table.c:209
-#: ../objects/Database/table.c:211 ../objects/Database/reference.c:121
-#: ../objects/UML/association.c:249 ../objects/UML/association.c:260
+#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
+#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
+#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
+#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
 #: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-#: ../objects/UML/association.c:266 ../objects/UML/association.c:268
-#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
-#: ../objects/UML/class.c:200 ../objects/UML/class.c:202
-#: ../objects/UML/class.c:204 ../objects/UML/class.c:206
+#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
+#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
+#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
 msgid " "
 msgstr " "
 
-#: ../objects/Database/table.c:215 ../objects/UML/class.c:212
-#: ../objects/UML/object.c:153
+#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
+#: ../objects/UML/object.c:157
 msgid "Attributes"
 msgstr "Atrybuty"
 
-#: ../objects/Database/table.c:252 ../objects/UML/class.c:324
+#: ../objects/Database/table.c:248
 msgid "Show comments"
 msgstr "Wyświetl komentarze"
 
 #. init data
-#: ../objects/Database/table.c:257 ../objects/Database/table.c:364
+#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
 #: ../sheets/Database.sheet.in.h:3
 msgid "Table"
 msgstr "Tabela"
 
 #. Attributes page:
-#: ../objects/Database/table_dialog.c:609
-#: ../objects/UML/class_attributes_dialog.c:455
+#: ../objects/Database/table_dialog.c:612 ../objects/UML/class_dialog.c:1081
 msgid "_Attributes"
 msgstr "_Atrybuty"
 
 #. the "new" button
-#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
-#: ../objects/SISSI/sissi_dialog.c:870
+#: ../objects/Database/table_dialog.c:640 ../objects/SISSI/sissi_dialog.c:739
+#: ../objects/SISSI/sissi_dialog.c:871
 msgid "_New"
 msgstr "_Nowy"
 
 #. the "delete" button
-#: ../objects/Database/table_dialog.c:643
+#: ../objects/Database/table_dialog.c:648
 msgid "_Delete"
 msgstr "_Usuń"
 
 #. the "Move up" button
-#: ../objects/Database/table_dialog.c:650
+#: ../objects/Database/table_dialog.c:656
 msgid "Move up"
 msgstr "Przenieś w górę"
 
 #. the "Move down" button
-#: ../objects/Database/table_dialog.c:657
+#: ../objects/Database/table_dialog.c:664
 msgid "Move down"
 msgstr "Przenieś w dół"
 
-#: ../objects/Database/table_dialog.c:666
-#: ../objects/UML/class_attributes_dialog.c:507
+#: ../objects/Database/table_dialog.c:674 ../objects/UML/class_dialog.c:1138
 msgid "Attribute data"
 msgstr "Dane atrybutu"
 
-#: ../objects/Database/table_dialog.c:676
-#: ../objects/Database/table_dialog.c:1055 ../objects/ER/attribute.c:155
-#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
-#: ../objects/UML/class_attributes_dialog.c:517
-#: ../objects/UML/class_operations_dialog.c:777
-#: ../objects/UML/class_operations_dialog.c:977
-#: ../objects/UML/class_templates_dialog.c:436 ../objects/UML/dependency.c:134
-#: ../objects/UML/generalization.c:131 ../objects/UML/realizes.c:131
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: ../objects/Database/table_dialog.c:688 ../objects/FS/flow-ortho.c:169
-#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:162
-#: ../objects/Jackson/phenomenon.c:146 ../objects/KAOS/metaandorrel.c:166
-#: ../objects/KAOS/metabinrel.c:173
-#: ../objects/UML/class_attributes_dialog.c:528
-#: ../objects/UML/class_operations_dialog.c:788
-#: ../objects/UML/class_operations_dialog.c:988
-#: ../objects/UML/class_templates_dialog.c:447
-msgid "Type:"
-msgstr "Typ:"
-
-#: ../objects/Database/table_dialog.c:699
-#, fuzzy
-msgid "Default:"
-msgstr "Wart. domyślne: "
-
-#: ../objects/Database/table_dialog.c:711
-#: ../objects/Database/table_dialog.c:955
-#: ../objects/Database/table_dialog.c:1060
-#: ../objects/UML/class_attributes_dialog.c:550
-#: ../objects/UML/class_dialog.c:343
-#: ../objects/UML/class_operations_dialog.c:848
-#: ../objects/UML/class_operations_dialog.c:1010
+#: ../objects/Database/table_dialog.c:708
+#: ../objects/Database/table_dialog.c:947
+#: ../objects/Database/table_dialog.c:1052 ../objects/UML/class_dialog.c:452
+#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
+#: ../objects/UML/class_dialog.c:2283
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: ../objects/Database/table_dialog.c:730
+#: ../objects/Database/table_dialog.c:727
 msgid "_Primary key"
 msgstr "Klucz _główny"
 
-#: ../objects/Database/table_dialog.c:737
+#: ../objects/Database/table_dialog.c:734
 msgid "N_ullable"
 msgstr ""
 
-#: ../objects/Database/table_dialog.c:744
+#: ../objects/Database/table_dialog.c:741
 msgid "Uni_que"
 msgstr "Uni_katowa"
 
-#: ../objects/Database/table_dialog.c:937
+#: ../objects/Database/table_dialog.c:929
 msgid "_Table"
 msgstr "_Tabela"
 
-#: ../objects/Database/table_dialog.c:945
+#: ../objects/Database/table_dialog.c:937
 msgid "Table name:"
 msgstr "Nazwa tabeli:"
 
 #. XXX create a handler and disable the 'show documentation tag' checkbox
 #. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:975
+#: ../objects/Database/table_dialog.c:967
 msgid "Comment visible"
 msgstr "Pokaż komentarz"
 
-#: ../objects/Database/table_dialog.c:980 ../objects/UML/class_dialog.c:413
+#: ../objects/Database/table_dialog.c:972 ../objects/UML/class_dialog.c:522
 msgid "Show documentation tag"
 msgstr "Pokaż tag dokumentacji"
 
 #. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1019 ../objects/UML/class_dialog.c:442
+#: ../objects/Database/table_dialog.c:1011 ../objects/UML/class_dialog.c:551
 msgid "_Style"
 msgstr "_Styl"
 
-#: ../objects/Database/table_dialog.c:1030
+#: ../objects/Database/table_dialog.c:1022
 msgid "Border width:"
 msgstr "Szerokość obramowania:"
 
 #. head line
-#: ../objects/Database/table_dialog.c:1043 ../objects/UML/class_dialog.c:452
+#: ../objects/Database/table_dialog.c:1035 ../objects/UML/class_dialog.c:561
 #: ../objects/UML/umlparameter.c:51
 msgid "Kind"
 msgstr "Rodzaj"
 
-#: ../objects/Database/table_dialog.c:1047 ../objects/UML/class_dialog.c:457
+#: ../objects/Database/table_dialog.c:1039 ../objects/UML/class_dialog.c:566
 msgid "Size"
 msgstr "Rozmiar"
 
-#: ../objects/Database/table_dialog.c:1050
+#: ../objects/Database/table_dialog.c:1042
 msgid "Normal:"
-msgstr ""
+msgstr "Zwykły:"
 
-#: ../objects/Database/table_dialog.c:1071
+#: ../objects/Database/table_dialog.c:1063
 msgid "Text Color:"
 msgstr "Kolor tekstu:"
 
-#: ../objects/Database/table_dialog.c:1080
+#: ../objects/Database/table_dialog.c:1071
 msgid "Foreground Color:"
 msgstr "Kolor pierwszoplanowy:"
 
 #. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1394
+#: ../objects/Database/table_dialog.c:1384
 msgid "not null"
 msgstr ""
 
-#: ../objects/Database/table_dialog.c:1395
+#: ../objects/Database/table_dialog.c:1385
 msgid "null"
 msgstr ""
 
-#: ../objects/Database/table_dialog.c:1396
+#: ../objects/Database/table_dialog.c:1386
 msgid "unique"
 msgstr "unikalność"
 
-#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:154
-#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:140
-#: ../objects/standard/zigzagline.c:136
+#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
+#: ../objects/standard/zigzagline.c:132
 msgid "Corner radius"
 msgstr "Promień narożnika"
 
-#: ../objects/Database/reference.c:112
+#: ../objects/Database/reference.c:111
 #, fuzzy
 msgid "Start description"
 msgstr "Początek opisu"
 
-#: ../objects/Database/reference.c:114
+#: ../objects/Database/reference.c:113
 #, fuzzy
 msgid "End description"
 msgstr "Koniec opisu"
 
-#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:406
-#: ../objects/FS/flow-ortho.c:632 ../objects/GRAFCET/vector.c:314
-#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:868
-#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:382
-#: ../objects/UML/generalization.c:379 ../objects/UML/realizes.c:369
-#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:385
+#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
+#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:854
+#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
+#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
+#: ../objects/UML/transition.c:172 ../objects/standard/bezier.c:731
+#: ../objects/standard/beziergon.c:495 ../objects/standard/zigzagline.c:380
 msgid "Add segment"
 msgstr "Dodaj segment"
 
-#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:407
-#: ../objects/FS/flow-ortho.c:633 ../objects/GRAFCET/vector.c:315
-#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:869
-#: ../objects/UML/component_feature.c:192 ../objects/UML/dependency.c:383
-#: ../objects/UML/generalization.c:380 ../objects/UML/realizes.c:370
-#: ../objects/UML/transition.c:174 ../objects/standard/zigzagline.c:386
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:855
+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
+#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
+#: ../objects/UML/transition.c:173 ../objects/standard/bezier.c:732
+#: ../objects/standard/beziergon.c:496 ../objects/standard/zigzagline.c:381
 msgid "Delete segment"
 msgstr "Usuń segment"
 
-#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
+#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
 msgid "Reference"
 msgstr "Referencje"
 
@@ -3212,7 +3173,7 @@ msgstr "Słaby:"
 msgid "Associative:"
 msgstr ""
 
-#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:132
+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
 #: ../sheets/ER.sheet.in.h:3
 msgid "Entity"
 msgstr "Encja"
@@ -3246,16 +3207,16 @@ msgid "Relationship"
 msgstr "Zależność"
 
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:629
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:631
-#: ../objects/FS/function.c:1101
+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
+#: ../objects/FS/function.c:1098
 msgid "Energy"
 msgstr "Energia"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:630
-#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:632
-#: ../objects/FS/function.c:1077
+#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
+#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
+#: ../objects/FS/function.c:1074
 msgid "Material"
 msgstr "Materia"
 
@@ -3263,10 +3224,10 @@ msgstr "Materia"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:631
-#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:633
-#: ../objects/FS/function.c:1039 ../objects/FS/function.c:1041
-#: ../objects/FS/function.c:1177 ../objects/FS/function.c:1179
+#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
+#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
+#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
+#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
 msgid "Signal"
 msgstr "Sygnał"
 
@@ -3283,316 +3244,322 @@ msgid "User function"
 msgstr "Funkcja użytkownika"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:681
+#: ../objects/FS/function.c:678
 msgid "Verb"
 msgstr "Czasownik"
 
 #. Translators: Menu item Verb/Channel
 #. Translators: Menu item Verb/Channel/Channel
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-#: ../objects/FS/function.c:683 ../objects/FS/function.c:685
-#: ../objects/FS/function.c:725
+#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
+#: ../objects/FS/function.c:722
 msgid "Channel"
 msgstr "Kanał"
 
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
+#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
 msgid "Import"
 msgstr "Importowanie"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
+#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
 msgid "Input"
 msgstr "Wejście"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:693
+#: ../objects/FS/function.c:690
 msgid "Receive"
 msgstr "Otrzymywanie"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:695 ../objects/FS/function.c:967
+#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
 msgid "Allow"
 msgstr "Zezwalanie"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:697
+#: ../objects/FS/function.c:694
 msgid "Form Entrance"
 msgstr "Dane wej. formularza"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:699 ../objects/FS/function.c:933
+#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
 msgid "Capture"
 msgstr "Pobieranie"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:705
+#: ../objects/FS/function.c:702
 msgid "Discharge"
 msgstr "Rozładowanie"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:707
+#: ../objects/FS/function.c:704
 msgid "Eject"
 msgstr "Wysuwanie"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:709
+#: ../objects/FS/function.c:706
 msgid "Dispose"
 msgstr "Rozmieszczanie"
 
 #. Translators: Menu item Verb/Channel/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
-#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
-#: ../objects/FS/function.c:733
+#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
+#: ../objects/FS/function.c:730
 msgid "Transfer"
 msgstr "Transferowanie"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:717 ../objects/FS/function.c:719
+#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
 msgid "Transport"
 msgstr "Transportowanie"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:721
+#: ../objects/FS/function.c:718
 msgid "Lift"
 msgstr "Podnoszenie"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:723
+#: ../objects/FS/function.c:720
 msgid "Move"
 msgstr "Przesuwanie"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:727 ../objects/FS/function.c:729
+#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
 msgid "Transmit"
 msgstr "Transmitowanie"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:731
+#: ../objects/FS/function.c:728
 msgid "Conduct"
 msgstr "Przekazywanie"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:735
+#: ../objects/FS/function.c:732
 msgid "Convey"
 msgstr "Przewodzenie"
 
 #. Translators: Menu item Verb/Channel/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
-#: ../objects/FS/function.c:737 ../objects/FS/function.c:739
-#: ../objects/FS/function.c:741
+#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
+#: ../objects/FS/function.c:738
 msgid "Guide"
 msgstr "Prowadzenie"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:743
+#: ../objects/FS/function.c:740
 msgid "Direct"
 msgstr "Kierowanie"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:745
+#: ../objects/FS/function.c:742
 msgid "Straighten"
 msgstr "Poprawianie"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:747
+#: ../objects/FS/function.c:744
 msgid "Steer"
 msgstr "Sterowanie"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:749
+#: ../objects/FS/function.c:746
 msgid "Translate"
 msgstr "Przesuwanie"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:751 ../objects/FS/function.c:753
+#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
 msgid "Rotate"
 msgstr "Obracanie"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:755
+#: ../objects/FS/function.c:752
 msgid "Turn"
 msgstr "Odwracanie"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:757
+#: ../objects/FS/function.c:754
 msgid "Spin"
 msgstr "Wirowanie"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
+#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
 msgid "Allow DOF"
 msgstr "Zezwalanie DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:763
+#: ../objects/FS/function.c:760
 msgid "Constrain"
 msgstr "Wymaganie"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:765
+#: ../objects/FS/function.c:762
 msgid "Unlock"
 msgstr "Odblokowanie"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
+#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
 msgid "Support"
 msgstr "Wspieranie"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
+#: ../objects/FS/function.c:768 ../objects/FS/function.c:770
 #: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "Zatrzymanie"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:775
+#: ../objects/FS/function.c:772
 msgid "Insulate"
 msgstr "Izolowanie"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:777
+#: ../objects/FS/function.c:774
 msgid "Protect"
 msgstr "Chronienie"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:779 ../objects/FS/function.c:969
+#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
 msgid "Prevent"
 msgstr "Zapobieganie"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:781
+#: ../objects/FS/function.c:778
 msgid "Shield"
 msgstr "Osłanianie"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:783
+#: ../objects/FS/function.c:780
 msgid "Inhibit"
 msgstr "Powstrzymywanie"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
+#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
 msgid "Stabilize"
 msgstr "Stabilizowanie"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:789
+#: ../objects/FS/function.c:786
 msgid "Steady"
 msgstr "Podtrzymywanie"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:791 ../objects/FS/function.c:793
+#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
 msgid "Secure"
 msgstr "Zabezpieczanie"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:795 ../objects/FS/function.c:827
+#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
 msgid "Attach"
 msgstr "Dołączanie"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:797
+#: ../objects/FS/function.c:794
 msgid "Mount"
 msgstr "Montowanie"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:42
+#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "Zamykanie"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:801
+#: ../objects/FS/function.c:798
 msgid "Fasten"
 msgstr "Zawiązywanie"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:803
+#: ../objects/FS/function.c:800
 msgid "Hold"
 msgstr "Trzymanie"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:805 ../objects/FS/function.c:807
+#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
 #: ../objects/Istar/actor.c:70
 msgid "Position"
 msgstr "Pozycjonowanie"
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:809
+#: ../objects/FS/function.c:806
 msgid "Orient"
 msgstr "Orientowanie"
 
+#. Translators: Menu item Verb/Support/Position/Locate
+#. Translators: Menu item Verb/Signal/Sense/Locate
+#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
+msgid "Locate"
+msgstr "Lokowanie"
+
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
+#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
 msgid "Connect"
 msgstr "Złączanie"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:819 ../objects/FS/function.c:821
+#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
 msgid "Couple"
 msgstr "Sczepianie"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:823
+#: ../objects/FS/function.c:820
 msgid "Join"
 msgstr "Dołączanie"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:825
+#: ../objects/FS/function.c:822
 msgid "Assemble"
 msgstr "Gromadzenie"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:829 ../objects/FS/function.c:831
+#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
 msgid "Mix"
 msgstr "Mieszanie"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:833
+#: ../objects/FS/function.c:830
 msgid "Combine"
 msgstr "Łączenie"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:835
+#: ../objects/FS/function.c:832
 msgid "Blend"
 msgstr "Wtapianie"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:837
+#: ../objects/FS/function.c:834
 msgid "Add"
 msgstr "Dodawanie"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:839
+#: ../objects/FS/function.c:836
 msgid "Pack"
 msgstr "Pakowanie"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:841
+#: ../objects/FS/function.c:838
 msgid "Coalesce"
 msgstr "Nawęglanie"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
+#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
 #: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "Rozgałęzianie"
@@ -3600,709 +3567,701 @@ msgstr "Rozgałęzianie"
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:847 ../objects/FS/function.c:849
-#: ../objects/FS/function.c:851
+#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
+#: ../objects/FS/function.c:848
 msgid "Separate"
 msgstr "Rozdzielanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:853
+#: ../objects/FS/function.c:850
 msgid "Switch"
 msgstr "Przełączanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:855
+#: ../objects/FS/function.c:852
 msgid "Divide"
 msgstr "Dzielenie"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:857
+#: ../objects/FS/function.c:854
 msgid "Release"
 msgstr "Zwalnianie"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:859
+#: ../objects/FS/function.c:856
 msgid "Detach"
 msgstr "Odłączanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:861
+#: ../objects/FS/function.c:858
 msgid "Disconnect"
 msgstr "Rozłączanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:867
+#: ../objects/FS/function.c:864
 msgid "Cut"
 msgstr "Rozdzielanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:869
+#: ../objects/FS/function.c:866
 msgid "Polish"
 msgstr "Polerowanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:871
+#: ../objects/FS/function.c:868
 msgid "Sand"
 msgstr "Wygładzanie"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:873
+#: ../objects/FS/function.c:870
 msgid "Drill"
 msgstr "Wiercenie"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:875
+#: ../objects/FS/function.c:872
 msgid "Lathe"
 msgstr "Toczenie"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:877 ../objects/FS/function.c:879
+#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
 msgid "Refine"
 msgstr "Rafinowanie"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:881
+#: ../objects/FS/function.c:878
 msgid "Purify"
 msgstr "Czyszczenie"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:883
+#: ../objects/FS/function.c:880
 msgid "Strain"
 msgstr "Wyłapywanie"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:885
+#: ../objects/FS/function.c:882
 msgid "Filter"
 msgstr "Filtrowanie"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:887
+#: ../objects/FS/function.c:884
 msgid "Percolate"
 msgstr "Rozpowszechnianie"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:889
+#: ../objects/FS/function.c:886
 msgid "Clear"
 msgstr "Rozjaśnianie"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:891 ../objects/FS/function.c:893
+#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
 msgid "Distribute"
 msgstr "Rozdzielanie"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:895
+#: ../objects/FS/function.c:892
 msgid "Diverge"
 msgstr "Odchylanie"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:897
+#: ../objects/FS/function.c:894
 msgid "Scatter"
 msgstr "Rozrzucanie"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:899
+#: ../objects/FS/function.c:896
 msgid "Disperse"
 msgstr "Rozpraszanie"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:901 ../objects/FS/function.c:915
+#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
 msgid "Diffuse"
 msgstr "Wtapianie"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:903
+#: ../objects/FS/function.c:900
 msgid "Empty"
 msgstr "Opróżnianie"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:905 ../objects/FS/function.c:907
+#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
 msgid "Dissipate"
 msgstr "Odprowadzanie"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:909
+#: ../objects/FS/function.c:906
 msgid "Absorb"
 msgstr "Absorbowanie"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:911
+#: ../objects/FS/function.c:908
 msgid "Dampen"
 msgstr "Zwilżanie"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:913
+#: ../objects/FS/function.c:910
 msgid "Dispel"
 msgstr "Rozpędzanie"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:917
+#: ../objects/FS/function.c:914
 msgid "Resist"
 msgstr "Opieranie"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
+#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
 msgid "Provision"
 msgstr "Zaopatrywanie"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
+#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
 msgid "Store"
 msgstr "Magazynowanie"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:927
+#: ../objects/FS/function.c:924
 msgid "Contain"
 msgstr "Zawieranie"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:929
+#: ../objects/FS/function.c:926
 msgid "Collect"
 msgstr "Zbieranie"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:931
+#: ../objects/FS/function.c:928
 msgid "Reserve"
 msgstr "Rezerwowanie"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:935 ../objects/FS/function.c:937
+#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
 msgid "Supply"
 msgstr "Zaopatrzanie"
 
 #. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:939
+#: ../objects/FS/function.c:936
 msgid "Fill"
 msgstr "Wypełnianie"
 
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:941
+#: ../objects/FS/function.c:938
 msgid "Provide"
 msgstr "Dostarczanie"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:943
+#: ../objects/FS/function.c:940
 msgid "Replenish"
 msgstr "Uzupełnianie"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:945
+#: ../objects/FS/function.c:942
 msgid "Expose"
 msgstr "Wystawianie"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:22
+#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "Wydobywanie"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
+#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
 msgid "Control Magnitude"
 msgstr "Rozmiar kontroli"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:953 ../objects/FS/function.c:955
+#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
 msgid "Actuate"
 msgstr "Pobudzanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:957
+#: ../objects/FS/function.c:954
 msgid "Start"
 msgstr "Rozpoczynanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:959
+#: ../objects/FS/function.c:956
 msgid "Initiate"
 msgstr "Inicjowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:961 ../objects/FS/function.c:963
+#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
 msgid "Regulate"
 msgstr "Regulowanie"
 
 #  Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:965 ../objects/FS/function.c:1183
-#: ../objects/UML/classicon.c:130
+#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
+#: ../objects/UML/classicon.c:129
 msgid "Control"
 msgstr "Kontrolowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:971
+#: ../objects/FS/function.c:968
 msgid "Enable"
 msgstr "Umożliwianie"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:973
+#: ../objects/FS/function.c:970
 msgid "Disable"
 msgstr "Blokowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:975
+#: ../objects/FS/function.c:972
 msgid "Limit"
 msgstr "Limitowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:977
+#: ../objects/FS/function.c:974
 msgid "Interrupt"
 msgstr "Przerywanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:979 ../objects/FS/function.c:981
+#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
 msgid "Change"
 msgstr "Zmienianie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:983
+#: ../objects/FS/function.c:980
 msgid "Increase"
 msgstr "Powiększanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:985
+#: ../objects/FS/function.c:982
 msgid "Decrease"
 msgstr "Zmniejszanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:987
+#: ../objects/FS/function.c:984
 msgid "Amplify"
 msgstr "Wzmacnianie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:989
+#: ../objects/FS/function.c:986
 msgid "Reduce"
 msgstr "Redukowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:993
+#: ../objects/FS/function.c:990
 msgid "Normalize"
 msgstr "Normalizowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:995
+#: ../objects/FS/function.c:992
 msgid "Multiply"
 msgstr "Zwielokrotnianie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:997 ../objects/Misc/measure.c:186
+#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:186
 msgid "Scale"
 msgstr "Skalowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:999
+#: ../objects/FS/function.c:996
 msgid "Rectify"
 msgstr "Naprawianie"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:1001
+#: ../objects/FS/function.c:998
 msgid "Adjust"
 msgstr "Wyrównywanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:1003 ../objects/FS/function.c:1005
+#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
 msgid "Form"
 msgstr "Formowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1007
+#: ../objects/FS/function.c:1004
 msgid "Compact"
 msgstr "Zwieranie"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1009
+#: ../objects/FS/function.c:1006
 msgid "Crush"
 msgstr "Kruszenie"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1011
+#: ../objects/FS/function.c:1008
 msgid "Shape"
 msgstr "Kształtowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1013
+#: ../objects/FS/function.c:1010
 msgid "Compress"
 msgstr "Kompresowanie"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1015
+#: ../objects/FS/function.c:1012
 msgid "Pierce"
 msgstr "Nacieranie"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1017 ../objects/FS/function.c:1019
+#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
 msgid "Convert"
 msgstr "Konwertowanie"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1021
+#: ../objects/FS/function.c:1018
 msgid "Transform"
 msgstr "Przemienianie"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1023
+#: ../objects/FS/function.c:1020
 msgid "Liquefy"
 msgstr "Skraplanie"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1025
+#: ../objects/FS/function.c:1022
 msgid "Solidify"
 msgstr "Scalanie"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1027
+#: ../objects/FS/function.c:1024
 msgid "Evaporate"
 msgstr "Parowanie"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1029
+#: ../objects/FS/function.c:1026
 msgid "Sublimate"
 msgstr "Sublimowanie"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1031
+#: ../objects/FS/function.c:1028
 msgid "Condense"
 msgstr "Kondensowanie"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1033
+#: ../objects/FS/function.c:1030
 msgid "Integrate"
 msgstr "Łączenie"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1035
+#: ../objects/FS/function.c:1032
 msgid "Differentiate"
 msgstr "Rozdzielanie"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1037 ../sheets/AADL.sheet.in.h:3
+#: ../objects/FS/function.c:1034 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "Przetwarzanie"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1043 ../objects/FS/function.c:1045
+#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
 msgid "Sense"
 msgstr "Odczuwanie"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1047
+#: ../objects/FS/function.c:1044
 msgid "Perceive"
 msgstr "Postrzeganie"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1049
+#: ../objects/FS/function.c:1046
 msgid "Recognize"
 msgstr "Rozpoznawanie"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1051
+#: ../objects/FS/function.c:1048
 msgid "Discern"
 msgstr "Rozróżnianie"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1053
+#: ../objects/FS/function.c:1050
 msgid "Check"
 msgstr "Sprawdzanie"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1057
+#: ../objects/FS/function.c:1054
 msgid "Verify"
 msgstr "Weryfikowanie"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1059 ../objects/FS/function.c:1061
+#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
 msgid "Indicate"
 msgstr "Wskazywanie"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1063
+#: ../objects/FS/function.c:1060
 msgid "Mark"
 msgstr "Zaznaczanie"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Wyświetlanie"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1067 ../objects/FS/function.c:1069
+#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
 msgid "Measure"
 msgstr "Mierzenie"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1071
+#: ../objects/FS/function.c:1068
 msgid "Calculate"
 msgstr "Obliczanie"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1073
+#: ../objects/FS/function.c:1070
 msgid "Represent"
 msgstr "Reprezentowanie"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1075
+#: ../objects/FS/function.c:1072
 msgid "Noun"
 msgstr "Ciało stałe"
 
-# FIXME
-# lib/widgets.c: "Linia ciągła"
-# objects/FS/function.c: "Stały"
-#. Translators: Menu item Noun/Material/Solid
-#: ../objects/FS/function.c:1079
-msgid "Solid"
-msgstr "Jednolita"
-
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1081
+#: ../objects/FS/function.c:1078
 msgid "Liquid"
 msgstr "Ciecz"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1083
+#: ../objects/FS/function.c:1080
 msgid "Gas"
 msgstr "Gaz"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1085 ../objects/FS/function.c:1087
-#: ../objects/FS/function.c:1171
+#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
+#: ../objects/FS/function.c:1168
 msgid "Human"
 msgstr "Człowiek"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1089
+#: ../objects/FS/function.c:1086
 msgid "Hand"
 msgstr "Ręka"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1091
+#: ../objects/FS/function.c:1088
 msgid "Foot"
 msgstr "Stopa"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1093
+#: ../objects/FS/function.c:1090
 msgid "Head"
 msgstr "Głowa"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1095
+#: ../objects/FS/function.c:1092
 msgid "Finger"
 msgstr "Palec"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1097
+#: ../objects/FS/function.c:1094
 msgid "Toe"
 msgstr "Palec u nogi"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1099
+#: ../objects/FS/function.c:1096
 msgid "Biological"
 msgstr "Biologiczna"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1103
+#: ../objects/FS/function.c:1100
 msgid "Mechanical"
 msgstr "Mechaniczna"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1105
+#: ../objects/FS/function.c:1102
 msgid "Mech. Energy"
 msgstr "Energia Mech."
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1107
+#: ../objects/FS/function.c:1104
 msgid "Translation"
 msgstr "Przemiana"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1109
+#: ../objects/FS/function.c:1106
 msgid "Force"
 msgstr "Siła fizyczna"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
 msgid "Rotation"
 msgstr "Obrót"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1113
+#: ../objects/FS/function.c:1110
 msgid "Torque"
 msgstr "Moment obrotowy"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1115
+#: ../objects/FS/function.c:1112
 msgid "Random Motion"
 msgstr "Losowy Ruch"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1117
+#: ../objects/FS/function.c:1114
 msgid "Vibration"
 msgstr "Wibracja"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1119
+#: ../objects/FS/function.c:1116
 msgid "Rotational Energy"
 msgstr "Energia Obrotowa"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1121
+#: ../objects/FS/function.c:1118
 msgid "Translational Energy"
 msgstr "Energia potencjalna"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1123
+#: ../objects/FS/function.c:1120
 msgid "Electrical"
 msgstr "Elektryczny"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1125
+#: ../objects/FS/function.c:1122
 msgid "Electricity"
 msgstr "Elektryczność"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1127
+#: ../objects/FS/function.c:1124
 msgid "Voltage"
 msgstr "Napięcie"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1129
+#: ../objects/FS/function.c:1126
 msgid "Current"
 msgstr "Natężenie prądu"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1131
+#: ../objects/FS/function.c:1128
 msgid "Hydraulic"
 msgstr "Hydrauliczny"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1133
+#: ../objects/FS/function.c:1130
 msgid "Pressure"
 msgstr "Ciśnieniowy"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1135
+#: ../objects/FS/function.c:1132
 msgid "Volumetric Flow"
 msgstr "Przepływ objętościowy"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1137
+#: ../objects/FS/function.c:1134
 msgid "Thermal"
 msgstr "Cieplny"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1139
+#: ../objects/FS/function.c:1136
 msgid "Heat"
 msgstr "Ocieplanie"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1141
+#: ../objects/FS/function.c:1138
 msgid "Conduction"
 msgstr "Przewodzenie"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1143
+#: ../objects/FS/function.c:1140
 msgid "Convection"
 msgstr "Konwekcja"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1145 ../objects/FS/function.c:1153
+#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
 msgid "Radiation"
 msgstr "Promieniowanie"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1147
+#: ../objects/FS/function.c:1144
 msgid "Pneumatic"
 msgstr "Pneumatyczny"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1149
+#: ../objects/FS/function.c:1146
 msgid "Chemical"
 msgstr "Chemiczny"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1151
+#: ../objects/FS/function.c:1148
 msgid "Radioactive"
 msgstr "Radioaktywny"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1155
+#: ../objects/FS/function.c:1152
 msgid "Microwaves"
 msgstr "Mikrofalowy"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1157
+#: ../objects/FS/function.c:1154
 msgid "Radio waves"
 msgstr "Fale radiowe"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1159
+#: ../objects/FS/function.c:1156
 msgid "X-Rays"
 msgstr "Promieniowanie X"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1161
+#: ../objects/FS/function.c:1158
 msgid "Gamma Rays"
 msgstr "Promieniowanie Gamma"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1163
+#: ../objects/FS/function.c:1160
 msgid "Acoustic Energy"
 msgstr "Energia akustyczna"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1165
+#: ../objects/FS/function.c:1162
 msgid "Optical Energy"
 msgstr "Energia świetlna"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1167
+#: ../objects/FS/function.c:1164
 msgid "Solar Energy"
 msgstr "Energia słoneczna"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1169
+#: ../objects/FS/function.c:1166
 msgid "Magnetic Energy"
 msgstr "Energia magnetyczna"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1173
+#: ../objects/FS/function.c:1170
 msgid "Human Motion"
 msgstr "Ruch ludzkiego ciała"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1175
+#: ../objects/FS/function.c:1172
 msgid "Human Force"
 msgstr "Siła człowieka"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1181
+#: ../objects/FS/function.c:1178
 msgid "Status"
 msgstr "Stan"
 
-#: ../objects/FS/function.c:1185
+#: ../objects/FS/function.c:1182
 msgid "User/Device Fn"
 msgstr "Funkcja użytkownika/urządzenia"
 
-#: ../objects/FS/function.c:1186
+#: ../objects/FS/function.c:1183
 msgid "Wish Fn"
 msgstr ""
 
@@ -4436,15 +4395,15 @@ msgstr "Typ przejścia:"
 
 #: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
 #: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:454
-#: ../objects/standard/line.c:226
+#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:454
+#: ../objects/standard/line.c:223
 msgid "Add connection point"
 msgstr "Dodaj punkt połączenia"
 
 #: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
 #: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-#: ../objects/KAOS/other.c:526 ../objects/SADT/box.c:455
-#: ../objects/standard/line.c:227
+#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:455
+#: ../objects/standard/line.c:224
 msgid "Delete connection point"
 msgstr "Usuń punkt połączenia"
 
@@ -4461,7 +4420,7 @@ msgstr "Nie zdefiniowano"
 msgid "Agent"
 msgstr "Dodaj segment"
 
-#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:251
+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
 msgid "Role"
 msgstr "Rola"
 
@@ -4561,7 +4520,7 @@ msgstr ""
 
 #: ../objects/Jackson/domain.c:184
 #, fuzzy
-msgid "Optional kind which appears in the lower-right corner of the Domain"
+msgid "Optional kind which appears in the lower right corner of the Domain"
 msgstr "Identyfikator pojawiający się w prawym dolnym narożniku prostokąta"
 
 #: ../objects/Jackson/domain.c:539
@@ -4586,8 +4545,8 @@ msgstr "Reprezentowanie"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:150
-#: ../objects/UML/message.c:152
+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
+#: ../objects/UML/message.c:155
 msgid "Message:"
 msgstr "Komunikat:"
 
@@ -4676,7 +4635,7 @@ msgstr ""
 msgid "Output"
 msgstr "Wejście/wyjście"
 
-#: ../objects/KAOS/other.c:531
+#: ../objects/KAOS/other.c:533
 #, fuzzy
 msgid "KAOS other"
 msgstr "Router IAD"
@@ -4701,11 +4660,6 @@ msgstr "Szerokość linii wskazówki sekund"
 msgid "Show hours"
 msgstr "Wyświetlanie godzin"
 
-#: ../objects/Misc/diagram_as_object.c:112
-#, fuzzy
-msgid "Diagram file"
-msgstr "Diagram Dia"
-
 #: ../objects/Misc/grid_object.c:140
 msgid "Rows"
 msgstr "Wiersze"
@@ -4716,15 +4670,15 @@ msgstr "Kolumny"
 
 #: ../objects/Misc/grid_object.c:144
 #, fuzzy
-msgid "Grid line color"
+msgid "Gridline color"
 msgstr "Kolor linii siatki"
 
 #: ../objects/Misc/grid_object.c:146
 #, fuzzy
-msgid "Grid line width"
+msgid "Gridline width"
 msgstr "Szerokość linii siatki"
 
-#: ../objects/Misc/libmisc.c:42
+#: ../objects/Misc/libmisc.c:41
 msgid "Miscellaneous objects"
 msgstr "Różne obiekty"
 
@@ -4763,7 +4717,7 @@ msgstr "pi"
 #. PROP_FLAG_VISIBLE|
 #: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
 msgid "Measurement"
-msgstr ""
+msgstr "Miary"
 
 #: ../objects/Misc/measure.c:187
 msgid "Unit"
@@ -4773,11 +4727,11 @@ msgstr "Jednostka"
 msgid "Precision"
 msgstr "Precyzja"
 
-#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
+#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
 msgid "Add Handle"
 msgstr "Dodaj uchwyt"
 
-#: ../objects/Misc/tree.c:599 ../objects/network/bus.c:607
+#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
 msgid "Delete Handle"
 msgstr "Usuń uchwyt"
 
@@ -4817,9 +4771,9 @@ msgstr ""
 msgid "SADT Arrow"
 msgstr "Strzałka SADT"
 
-#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:229
-#: ../objects/flowchart/box.c:156 ../objects/flowchart/diamond.c:154
-#: ../objects/flowchart/ellipse.c:153 ../objects/flowchart/parallelogram.c:158
+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:226
+#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
+#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
 msgid "Text padding"
 msgstr "Wyrównanie tekstu"
 
@@ -4829,7 +4783,7 @@ msgstr "Identyfikator aktywacji/danych"
 
 #: ../objects/SADT/box.c:150
 #, fuzzy
-msgid "The identifier which appears in the lower-right corner of the Box"
+msgid "The identifier which appears in the lower right corner of the Box"
 msgstr "Identyfikator pojawiający się w prawym dolnym narożniku prostokąta"
 
 #: ../objects/SADT/box.c:460
@@ -4870,7 +4824,7 @@ msgstr ""
 
 #: ../objects/SISSI/classification.h:45
 #, fuzzy
-msgid "Industry Confidential"
+msgid "Industrie Confidential"
 msgstr "Poufne"
 
 #: ../objects/SISSI/classification.h:46
@@ -5023,7 +4977,7 @@ msgid "Project or system organisation"
 msgstr ""
 
 #: ../objects/SISSI/sissi_dialog.c:92
-msgid "Subcontractors/Suppliers/Manufacturers"
+msgid "Subcontractors / Suppliers / Manufacturers"
 msgstr ""
 
 #: ../objects/SISSI/sissi_dialog.c:97
@@ -5059,7 +5013,7 @@ msgid "Power"
 msgstr "Moc"
 
 #: ../objects/SISSI/sissi_dialog.c:105
-msgid "Cooling/Pollution"
+msgid "Cooling / Pollution"
 msgstr ""
 
 #: ../objects/SISSI/sissi_dialog.c:109
@@ -5143,8 +5097,9 @@ msgid "Developer"
 msgstr ""
 
 #: ../objects/SISSI/sissi_dialog.c:166
-msgid "Operator/Maintenance"
-msgstr ""
+#, fuzzy
+msgid "Operator / Maintenance"
+msgstr "Dane operacji"
 
 #: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:1
 msgid "Network"
@@ -5195,7 +5150,7 @@ msgid "HARDWARE"
 msgstr ""
 
 #: ../objects/SISSI/sissi_dialog.c:191
-msgid "Data processing equipment (active)"
+msgid "Data-processing equipment (active)"
 msgstr ""
 
 #: ../objects/SISSI/sissi_dialog.c:192
@@ -5260,331 +5215,321 @@ msgid "value"
 msgstr "wartość"
 
 #. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:861
+#: ../objects/SISSI/sissi_dialog.c:862
 msgid "Documents"
 msgstr "Dokumenty"
 
-#: ../objects/SISSI/sissi_dialog.c:876
+#: ../objects/SISSI/sissi_dialog.c:878
 msgid "Document title"
 msgstr "Tytuł dokumentu"
 
-#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
+#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
 #: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "Aktor"
 
-#: ../objects/UML/association.c:223
+#: ../objects/UML/association.c:222
 msgid "From A to B"
 msgstr "Od A do B"
 
-#: ../objects/UML/association.c:224
+#: ../objects/UML/association.c:223
 msgid "From B to A"
 msgstr "Od B do A"
 
-#: ../objects/UML/association.c:229
+#: ../objects/UML/association.c:228
 msgid "Aggregation"
 msgstr "Agregacja"
 
-#: ../objects/UML/association.c:230
+#: ../objects/UML/association.c:229
 msgid "Composition"
 msgstr "Złożenie"
 
-#: ../objects/UML/association.c:240
+#: ../objects/UML/association.c:236
 msgid "Direction"
 msgstr "Kierunek"
 
-#: ../objects/UML/association.c:242
+#: ../objects/UML/association.c:238
 msgid "Show direction"
 msgstr "Pokaż kierunek"
 
-#: ../objects/UML/association.c:242
+#: ../objects/UML/association.c:238
 msgid "Show the small arrow denoting the reading direction"
 msgstr "Pokaż małą strzałkę wskazującą kierunek związku"
 
-#: ../objects/UML/association.c:249
+#: ../objects/UML/association.c:245
 msgid "Side A"
 msgstr "Strona A"
 
-#: ../objects/UML/association.c:253
+#: ../objects/UML/association.c:249
 msgid "Multiplicity"
 msgstr "Krotność"
 
-#: ../objects/UML/association.c:255 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
 #: ../objects/UML/umloperation.c:71
 msgid "Visibility"
 msgstr "Widoczność"
 
-#: ../objects/UML/association.c:257
+#: ../objects/UML/association.c:253
 msgid "Show arrow"
 msgstr "Wyświetlanie strzałki"
 
-#: ../objects/UML/association.c:260
+#: ../objects/UML/association.c:256
 msgid "Side B"
 msgstr "Strona B"
 
-#: ../objects/UML/association.c:271 ../objects/UML/object.c:162
-#, fuzzy
-msgid "Style"
-msgstr "_Styl"
-
-#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
-#: ../objects/UML/class.c:1827 ../sheets/UML.sheet.in.h:3
+#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
+#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:3
 msgid "Class"
 msgstr "Klasa"
 
 #. how it used to be before 0.96+SVN
 #. one name, one type: but breaks forward-compatibiliy so kind of reverted
-#: ../objects/UML/class.c:147 ../objects/UML/classicon.c:139
-#: ../objects/UML/classicon.c:141 ../objects/UML/component.c:126
-#: ../objects/UML/large_package.c:135 ../objects/UML/object.c:149
-#: ../objects/UML/small_package.c:128 ../objects/UML/umloperation.c:68
+#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
+#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
+#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
+#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "Stereotyp"
 
-#: ../objects/UML/class.c:151 ../objects/UML/class.c:186
-#: ../objects/UML/class_dialog.c:359 ../objects/UML/class_dialog.c:471
-#: ../objects/UML/class_operations_dialog.c:832 ../objects/UML/uml.c:111
+#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
+#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
+#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
 msgid "Abstract"
 msgstr "Abstrakcyjna"
 
-#: ../objects/UML/class.c:153 ../objects/UML/class.c:1824
+#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
 msgid "Template"
 msgstr "Wzorzec"
 
-#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:368
+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
 msgid "Suppress Attributes"
 msgstr "Ukryte atrybuty"
 
-#: ../objects/UML/class.c:158
+#: ../objects/UML/class.c:157
 msgid "Suppress Operations"
 msgstr "Ukryte operacje"
 
-#: ../objects/UML/class.c:160
+#: ../objects/UML/class.c:159
 msgid "Visible Attributes"
 msgstr "Widoczne atrybuty"
 
-#: ../objects/UML/class.c:162
+#: ../objects/UML/class.c:161
 msgid "Visible Operations"
 msgstr "Widoczne operacje"
 
-#: ../objects/UML/class.c:164
+#: ../objects/UML/class.c:163
 msgid "Visible Comments"
 msgstr "Widoczne komentarze"
 
-#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:384
+#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
 msgid "Wrap Operations"
 msgstr "Zawijaj operacje"
 
-#: ../objects/UML/class.c:168
+#: ../objects/UML/class.c:167
 msgid "Wrap after char"
 msgstr "Zawijaj po"
 
-#: ../objects/UML/class.c:170
+#: ../objects/UML/class.c:169
 msgid "Comment line length"
 msgstr "Długość wiersza komentarza"
 
-#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
-#, fuzzy
-msgid "Allow resizing"
-msgstr "Pusty trójkąt"
-
-#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:466
+#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
 msgid "Polymorphic"
 msgstr "Polimorficzna"
 
-#: ../objects/UML/class.c:188 ../objects/UML/class_dialog.c:476
-msgid "Class Name"
+#: ../objects/UML/class.c:185
+msgid "Classname"
 msgstr "Nazwa klasy"
 
-#: ../objects/UML/class.c:190
-#, fuzzy
-msgid "Abstract Class Name"
+#: ../objects/UML/class.c:187
+msgid "Abstract Classname"
 msgstr "Nazwa klasy abstrakcyjnej"
 
-#: ../objects/UML/class.c:214
+#: ../objects/UML/class.c:211
 msgid "Operations"
 msgstr "Operacje"
 
-#: ../objects/UML/class.c:217
+#: ../objects/UML/class.c:214
 msgid "Template Parameters"
 msgstr "Parametry szablonu"
 
-#: ../objects/UML/class_attributes_dialog.c:539
-msgid "Value:"
-msgstr "Wartość:"
-
-#: ../objects/UML/class_attributes_dialog.c:572
-#: ../objects/UML/class_operations_dialog.c:811
-msgid "Visibility:"
-msgstr "Widoczność:"
-
-#: ../objects/UML/class_attributes_dialog.c:577
-#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
-msgid "Public"
-msgstr "Publiczna"
-
-#: ../objects/UML/class_attributes_dialog.c:578
-#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
-msgid "Private"
-msgstr "Prywatna"
-
-#: ../objects/UML/class_attributes_dialog.c:579
-#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
-msgid "Protected"
-msgstr "Chroniona"
-
-#: ../objects/UML/class_attributes_dialog.c:580
-#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
-msgid "Implementation"
-msgstr "Implementacja"
-
-#. end: Inheritance type
-#: ../objects/UML/class_attributes_dialog.c:592
-#: ../objects/UML/class_operations_dialog.c:840
-msgid "Class scope"
-msgstr "Zasięg klasy"
+#: ../objects/UML/class.c:320
+msgid "Show Comments"
+msgstr "Wyświetl komentarze"
 
 #. Class page:
-#: ../objects/UML/class_dialog.c:320
+#: ../objects/UML/class_dialog.c:429
 msgid "_Class"
 msgstr "_Klasa"
 
-#: ../objects/UML/class_dialog.c:328
+#: ../objects/UML/class_dialog.c:437
 msgid "Class name:"
 msgstr "Nazwa klasy:"
 
-#: ../objects/UML/class_dialog.c:336
-#: ../objects/UML/class_operations_dialog.c:799
-#: ../objects/UML/dependency.c:136 ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:133
+#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
+#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
+#: ../objects/UML/realizes.c:136
 msgid "Stereotype:"
 msgstr "Stereotyp:"
 
-#: ../objects/UML/class_dialog.c:365
+#: ../objects/UML/class_dialog.c:474
 msgid "Attributes visible"
-msgstr "Wyświetlanie części zawierającej arybuty"
+msgstr "Wyświetlanie części zawierającej atrybuty"
 
-#: ../objects/UML/class_dialog.c:374
+#: ../objects/UML/class_dialog.c:483
 msgid "Operations visible"
 msgstr "Wyświetlanie części zawierającej operacje"
 
-#: ../objects/UML/class_dialog.c:377
+#: ../objects/UML/class_dialog.c:486
 msgid "Suppress operations"
 msgstr "Ukryte operacje"
 
-#: ../objects/UML/class_dialog.c:391
+#: ../objects/UML/class_dialog.c:500
 msgid "Wrap after this length: "
 msgstr "Zawijaj po tej długości: "
 
-#: ../objects/UML/class_dialog.c:399
+#: ../objects/UML/class_dialog.c:508
 msgid "Comments visible"
 msgstr "Widoczne komentarze"
 
-#: ../objects/UML/class_dialog.c:406
+#: ../objects/UML/class_dialog.c:515
 msgid "Wrap comment after this length: "
 msgstr "Zawijaj komentarze po: "
 
-#: ../objects/UML/class_dialog.c:481
+#: ../objects/UML/class_dialog.c:585
+msgid "Class Name"
+msgstr "Nazwa klasy"
+
+#: ../objects/UML/class_dialog.c:590
 msgid "Abstract Class"
 msgstr "Klasa abstrakcyjna"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:498
+#: ../objects/UML/class_dialog.c:607
 msgid "Line Width"
 msgstr "Szerokość linii"
 
-#: ../objects/UML/class_dialog.c:507
+#: ../objects/UML/class_dialog.c:616
 msgid "Text Color"
 msgstr "Kolor tekstu"
 
-#: ../objects/UML/class_dialog.c:516
+#: ../objects/UML/class_dialog.c:624
 msgid "Foreground Color"
 msgstr "Kolor pierwszoplanowy"
 
-#: ../objects/UML/class_dialog.c:525
+#: ../objects/UML/class_dialog.c:632
 msgid "Background Color"
 msgstr "Kolor tła"
 
+#: ../objects/UML/class_dialog.c:1170
+msgid "Value:"
+msgstr "Wartość:"
+
+#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
+msgid "Visibility:"
+msgstr "Widoczność:"
+
+#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
+#: ../objects/UML/uml.c:102
+msgid "Public"
+msgstr "Publiczna"
+
+#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
+#: ../objects/UML/uml.c:103
+msgid "Private"
+msgstr "Prywatna"
+
+#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
+#: ../objects/UML/uml.c:104
+msgid "Protected"
+msgstr "Chroniona"
+
+#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
+#: ../objects/UML/uml.c:105
+msgid "Implementation"
+msgstr "Implementacja"
+
+#. end: Inheritance type
+#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
+msgid "Class scope"
+msgstr "Zasięg klasy"
+
 #. end: Visibility
-#: ../objects/UML/class_operations_dialog.c:827
+#: ../objects/UML/class_dialog.c:2078
 msgid "Inheritance type:"
 msgstr "Rodzaj dziedziczenia:"
 
-#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
+#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
 msgid "Polymorphic (virtual)"
 msgstr "Polimorficzne (wirtualne)"
 
-#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
+#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
 msgid "Leaf (final)"
 msgstr "Liściaste (końcowe)"
 
-#: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/class_dialog.c:2107
 msgid "Query"
 msgstr "Zapytanie"
 
-#: ../objects/UML/class_operations_dialog.c:888
+#: ../objects/UML/class_dialog.c:2154
 msgid "Parameters:"
 msgstr "Parametry:"
 
-#: ../objects/UML/class_operations_dialog.c:966
+#: ../objects/UML/class_dialog.c:2239
 msgid "Parameter data"
 msgstr "Dane parametru"
 
-#: ../objects/UML/class_operations_dialog.c:999
+#: ../objects/UML/class_dialog.c:2272
 msgid "Def. value:"
 msgstr "Domyślna wartość"
 
-#: ../objects/UML/class_operations_dialog.c:1030
+#: ../objects/UML/class_dialog.c:2306
 msgid "Direction:"
 msgstr "Kierunek:"
 
-#: ../objects/UML/class_operations_dialog.c:1035
-#: ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "Nie zdefiniowano"
 
-#: ../objects/UML/class_operations_dialog.c:1036
-#: ../objects/UML/umlparameter.c:35
+#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
 msgid "In"
 msgstr "Wejście"
 
-#: ../objects/UML/class_operations_dialog.c:1037
-#: ../objects/UML/umlparameter.c:36
+#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
 msgid "Out"
 msgstr "Wyjście"
 
-#: ../objects/UML/class_operations_dialog.c:1038
-#: ../objects/UML/umlparameter.c:37
+#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
 msgid "In & Out"
 msgstr "Wejście i wyjście"
 
 #. Operations page:
-#: ../objects/UML/class_operations_dialog.c:1069
+#: ../objects/UML/class_dialog.c:2359
 msgid "_Operations"
 msgstr "_Operacje"
 
-#: ../objects/UML/class_operations_dialog.c:1124
+#: ../objects/UML/class_dialog.c:2417
 msgid "Operation data"
 msgstr "Dane operacji"
 
 #. Templates page:
-#: ../objects/UML/class_templates_dialog.c:368
+#: ../objects/UML/class_dialog.c:2780
 msgid "_Templates"
 msgstr "_Szablony"
 
-#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr "Wzorzec klasy"
 
-#: ../objects/UML/class_templates_dialog.c:426
+#: ../objects/UML/class_dialog.c:2843
 msgid "Formal parameter data"
 msgstr "Dane parametru formalnego"
 
-#: ../objects/UML/classicon.c:131
+#: ../objects/UML/classicon.c:130
 msgid "Boundary"
 msgstr "Granica"
 
-#: ../objects/UML/classicon.c:144
+#: ../objects/UML/classicon.c:145
 msgid "Is object"
 msgstr "Jest obiektem"
 
@@ -5608,45 +5553,45 @@ msgstr "Zbiornik zdarzeń"
 msgid "Constraint:"
 msgstr "Wymóg:"
 
-#: ../objects/UML/dependency.c:138
+#: ../objects/UML/dependency.c:141
 msgid "Show arrow:"
 msgstr "Wyświetlanie strzałki:"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-#: ../objects/UML/implements.c:128 ../objects/UML/implements.c:130
+#: ../objects/UML/implements.c:131 ../objects/UML/implements.c:133
 msgid "Interface:"
 msgstr "Interfejs:"
 
-#: ../objects/UML/lifeline.c:165
+#: ../objects/UML/lifeline.c:152
 msgid "Draw focus of control:"
 msgstr "Wyświetlanie skupienia sterowania:"
 
-#: ../objects/UML/lifeline.c:167
+#: ../objects/UML/lifeline.c:154
 msgid "Draw destruction mark:"
 msgstr "Wyświetlanie znacznika usunięcia:"
 
-#: ../objects/UML/lifeline.c:535
+#: ../objects/UML/lifeline.c:505
 msgid "Add connection points"
 msgstr "Dodaj punkty połączenia"
 
-#: ../objects/UML/lifeline.c:536
+#: ../objects/UML/lifeline.c:506
 msgid "Remove connection points"
 msgstr "Usuń punkty połączenia"
 
-#: ../objects/UML/lifeline.c:537
+#: ../objects/UML/lifeline.c:507
 msgid "Increase connection points distance"
 msgstr "Zwiększ odległość między punktami połączeń"
 
-#: ../objects/UML/lifeline.c:538
+#: ../objects/UML/lifeline.c:508
 msgid "Decrease connection points distance"
 msgstr "Zmniejsz odległość między punktami połączeń"
 
-#: ../objects/UML/lifeline.c:539
+#: ../objects/UML/lifeline.c:509
 msgid "Set default connection points distance"
 msgstr "Ustaw domyślną odległość między punktami połączeń"
 
-#: ../objects/UML/lifeline.c:543
+#: ../objects/UML/lifeline.c:513
 msgid "UML Lifeline"
 msgstr "Linia życia UML"
 
@@ -5678,47 +5623,47 @@ msgstr "Wysyła"
 msgid "Recursive"
 msgstr "Rekurencyjny"
 
-#: ../objects/UML/message.c:154
+#: ../objects/UML/message.c:158
 msgid "Message type:"
 msgstr "Rodzaj komunikatu:"
 
-#: ../objects/UML/object.c:151
+#: ../objects/UML/object.c:155
 msgid "Explicit state"
 msgstr "Sprecyzowany stan"
 
-#: ../objects/UML/object.c:156
+#: ../objects/UML/object.c:160
 msgid "Active object"
 msgstr "Aktywny obiekt"
 
-#: ../objects/UML/object.c:158
+#: ../objects/UML/object.c:162
 msgid "Show attributes"
 msgstr "Wyświetlanie atrybutów"
 
-#: ../objects/UML/object.c:160
+#: ../objects/UML/object.c:164
 msgid "Multiple instance"
 msgstr "Wielokrotna instancja"
 
-#: ../objects/UML/state.c:151
+#: ../objects/UML/state.c:155
 msgid "Entry action"
 msgstr "Akcja wejściowa"
 
 # CHECK Translation (Akcja czynna?)
-#: ../objects/UML/state.c:152
+#: ../objects/UML/state.c:156
 msgid "Do action"
 msgstr "Akcja"
 
-#: ../objects/UML/state.c:153
+#: ../objects/UML/state.c:157
 msgid "Exit action"
 msgstr "Akcja wyjściowa"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:493
+#: ../objects/UML/state.c:479
 #, fuzzy
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
-"This option will go away in future versions.\n"
-"Please use the Initial/Final State object instead.\n"
+"That option will go away in future versions.\n"
+"Please use the Initial/Final State object instead\n"
 msgstr ""
 "Ten diagram używa obiektów stanu do stanów początkowych/końcowych.\n"
 "Ta opcja zostanie usunięta w przyszłych wersjach.\n"
@@ -5728,34 +5673,38 @@ msgstr ""
 msgid "Is final"
 msgstr "Jest końcowy"
 
-#: ../objects/UML/transition.c:142
+#: ../objects/UML/transition.c:141
 msgid "Trigger"
 msgstr "Wyzwalacz"
 
-#: ../objects/UML/transition.c:143
+#: ../objects/UML/transition.c:142
 msgid "The event that causes this transition to be taken"
 msgstr "Zdarzenie wywołujące to przejście"
 
-#: ../objects/UML/transition.c:144
+#: ../objects/UML/transition.c:143
 msgid "Action"
 msgstr "Akcja"
 
-#: ../objects/UML/transition.c:145
+#: ../objects/UML/transition.c:144
 msgid "Action to perform when this transition is taken"
 msgstr "Akcja jaką należy wykonać w czasie przejścia"
 
-#: ../objects/UML/transition.c:146 ../sheets/cisconetwork.sheet.in.h:22
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
 msgid "Guard"
 msgstr "Warunek"
 
-#: ../objects/UML/transition.c:147
+#: ../objects/UML/transition.c:146
 msgid "Condition for taking this transition when the event is fired"
 msgstr "Warunek jaki musi zostać spełniony, aby nastąpiło przejście"
 
-#: ../objects/UML/uml.c:67
+#: ../objects/UML/uml.c:66
 msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr "Obiekty diagramów Ujednoliconego Języka Modelowania UML 1.3"
 
+#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "Wartość"
+
 # CHECK Translation (Abstrakcyjna, Abstrakcyjny?)
 #: ../objects/UML/umlattribute.c:47
 msgid "Abstract (?)"
@@ -5777,14 +5726,14 @@ msgstr "Zapytanie (const)"
 msgid "Parameters"
 msgstr "Parametry"
 
-#: ../objects/UML/usecase.c:133
-msgid "Collaboration"
-msgstr "Współpraca"
-
-#: ../objects/UML/usecase.c:135
+#: ../objects/UML/usecase.c:136
 msgid "Text outside"
 msgstr "Napis na zewnątrz"
 
+#: ../objects/UML/usecase.c:138
+msgid "Collaboration"
+msgstr "Współpraca"
+
 #: ../objects/chronogram/chronogram.c:40
 msgid "Chronogram diagram objects"
 msgstr "Obiekty diagramu czasowego"
@@ -5808,11 +5757,11 @@ msgstr "Określenie zdarzenia"
 #: ../objects/chronogram/chronoline.c:158
 #, fuzzy
 msgid ""
-"@ time    set the pointer to an absolute time.\n"
-"( duration  set the signal up, then wait 'duration'.\n"
-") duration  set the signal down, then wait 'duration'.\n"
-"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
-"Example: @ 1.0 (2.0)1.0(2.0)\n"
+"@ time    set the pointer at an absolute time.\n"
+"( duration  sets the signal up, then wait 'duration'.\n"
+") duration  sets the signal down, then wait 'duration'.\n"
+"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
+"example : @ 1.0 (2.0)1.0(2.0)\n"
 msgstr ""
 "@ czas    ustawia wskaźnik w czasie bezwzględnym.\n"
 "( czas trwania  ustawia sygnał na podniesiony i oczekuje przez podany czas.\n"
@@ -5821,13 +5770,11 @@ msgstr ""
 "czas.\n"
 "przykład : @ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
+#: ../objects/chronogram/chronoline.c:166 ../objects/chronogram/chronoref.c:148
 msgid "Start time"
 msgstr "Czas rozpoczęcia"
 
-#: ../objects/chronogram/chronoline.c:168
-#: ../objects/chronogram/chronoref.c:150
+#: ../objects/chronogram/chronoline.c:168 ../objects/chronogram/chronoref.c:150
 msgid "End time"
 msgstr "Czas zakończenia"
 
@@ -5843,8 +5790,7 @@ msgstr "Czas opadania"
 msgid "Multi-bit data"
 msgstr "Wielobitowe dane"
 
-#: ../objects/chronogram/chronoline.c:175
-#: ../objects/chronogram/chronoref.c:158
+#: ../objects/chronogram/chronoline.c:175 ../objects/chronogram/chronoref.c:158
 msgid "Aspect"
 msgstr "Wygląd"
 
@@ -5880,28 +5826,22 @@ msgstr "Niestandardowe"
 msgid "Custom XML shapes loader"
 msgstr "Wczytywanie niestandardowych kształtów (XML)"
 
-#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:243
+#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
+#: ../objects/custom/custom_object.c:1782
 msgid "Flip horizontal"
 msgstr "Obróć poziomo"
 
-#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:245
+#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
+#: ../objects/custom/custom_object.c:1783
 msgid "Flip vertical"
 msgstr "Obróć pionowo"
 
-#: ../objects/custom/custom_object.c:215 ../objects/custom/custom_object.c:248
+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
 msgid "Scale of the subshapes"
 msgstr ""
 
-#: ../objects/custom/custom_object.c:1764
-msgid "Flip Horizontal"
-msgstr "Obróć poziomo"
-
-#: ../objects/custom/custom_object.c:1765
-msgid "Flip Vertical"
-msgstr "Obróć pionowo"
-
-#: ../objects/custom/custom_object.c:1802
-#: ../objects/custom_lines/custom_linetypes.c:281
+#: ../objects/custom/custom_object.c:1820
+#: ../objects/custom_lines/custom_linetypes.c:263
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
 msgstr "Nie można otworzyć pliku ikony %s dla rodzaju obiektu \"%s\"."
@@ -5914,16 +5854,16 @@ msgstr "Niestandardowe krzywe"
 msgid "Custom XML lines loader"
 msgstr "Wczytywanie niestandardowych krzywych (XML)"
 
-#: ../objects/custom_lines/custom_linetypes.c:244
+#: ../objects/custom_lines/custom_linetypes.c:226
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
 msgstr ""
 
-#: ../objects/custom_lines/custom_linetypes.c:269
+#: ../objects/custom_lines/custom_linetypes.c:251
 #, c-format
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
 msgstr ""
 
-#: ../objects/custom/shape_info.c:165
+#: ../objects/custom/shape_info.c:162
 #, c-format
 msgid ""
 "The file '%s' has invalid path data.\n"
@@ -5934,7 +5874,7 @@ msgstr ""
 msgid "Flowchart objects"
 msgstr "Obiekty diagramu przepływu"
 
-#: ../objects/flowchart/parallelogram.c:156
+#: ../objects/flowchart/parallelogram.c:154
 msgid "Shear angle"
 msgstr "Kąt ostry"
 
@@ -5954,46 +5894,38 @@ msgstr "Obiekty schematu sieci"
 msgid "Radius"
 msgstr "Promień"
 
-#: ../objects/network/wanlink.c:120
+#: ../objects/network/wanlink.c:119
 msgid "Width"
 msgstr "Szerokość"
 
-#: ../objects/standard/arc.c:145
+#: ../objects/standard/arc.c:141
 msgid "Curve distance"
 msgstr "Odległość krzywej"
 
-#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:141
+#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
+#: ../objects/standard/polyline.c:137
 msgid "Line gaps"
 msgstr "Odstępy w linii"
 
-#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
-#: ../objects/standard/polyline.c:143
+#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
+#: ../objects/standard/polyline.c:139
 msgid "Absolute start gap"
 msgstr "Odstęp od początku"
 
-#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
-#: ../objects/standard/polyline.c:145
+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
+#: ../objects/standard/polyline.c:141
 msgid "Absolute end gap"
 msgstr "Odstęp od końca"
 
-#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
-msgid "Add Segment"
-msgstr "Dodaj segment"
-
-#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
-msgid "Delete Segment"
-msgstr "Usuń segment"
-
-#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
+#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
 msgid "Symmetric control"
 msgstr "Kontrola symetryczna"
 
-#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
+#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
 msgid "Smooth control"
 msgstr "Płynna kontrola"
 
-#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
+#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
 msgid "Cusp control"
 msgstr "Kontrola niezależna"
 
@@ -6025,66 +5957,44 @@ msgstr "Usztywnione proporcje"
 msgid "Circle"
 msgstr "Okrąg"
 
-#: ../objects/standard/image.c:144
+#: ../objects/standard/image.c:139
 msgid "Image file"
 msgstr "Plik z obrazem"
 
-#: ../objects/standard/image.c:146
-#, fuzzy
-msgid "Inline data"
-msgstr "czas danej"
-
-#: ../objects/standard/image.c:146
-msgid "Store image data in diagram"
-msgstr ""
-
-#: ../objects/standard/image.c:148
-msgid "Pixbuf"
-msgstr ""
-
-#: ../objects/standard/image.c:148
-#, fuzzy
-msgid "The Pixbuf reference"
-msgstr "Preferencje"
-
-#: ../objects/standard/image.c:150
+#: ../objects/standard/image.c:141
 msgid "Draw border"
 msgstr "Rysowanie obramowania"
 
-#: ../objects/standard/image.c:152
+#: ../objects/standard/image.c:143
 msgid "Keep aspect ratio"
 msgstr "Zachowane proporcje"
 
-#: ../objects/standard/image.c:671
-msgid "Inconsistent pixbuf during image save."
-msgstr ""
-
 #. Found file in same dir as diagram.
 #. Found file in current dir.
-#: ../objects/standard/image.c:768 ../objects/standard/image.c:779
+#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
 #, fuzzy, c-format
 msgid ""
-"The image file '%s' was not found in the specified directory.\n"
-"Using the file '%s' instead.\n"
+"The image file '%s' was not found in that directory.\n"
+"Using the file '%s' instead\n"
 msgstr ""
 "Nie odnaleziono w katalogu pliku z obrazem \"%s\".\n"
 "Zostanie wykorzystany \"%s\".\n"
 
 #. Didn't find file in current dir.
-#: ../objects/standard/image.c:785 ../objects/standard/image.c:807
+#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
 #, c-format
 msgid "The image file '%s' was not found.\n"
 msgstr "Nie odnaleziono pliku z obrazem \"%s\".\n"
 
-#: ../objects/standard/line.c:136
+#: ../objects/standard/line.c:134
 msgid "Arrows"
 msgstr "Strzałki"
 
-#: ../objects/standard/line.c:141
+#: ../objects/standard/line.c:139
 msgid "Start point"
 msgstr "Punkt początkowy"
 
-#: ../objects/standard/line.c:143
+#: ../objects/standard/line.c:141
 msgid "End point"
 msgstr "Punkt końcowy"
 
@@ -6096,11 +6006,11 @@ msgstr "Tekst"
 msgid "Angle to rotate the outline"
 msgstr "Kąt o jaki obrócić obrys"
 
-#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
+#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
 msgid "Add Corner"
 msgstr "Dodaj narożnik"
 
-#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
+#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
 msgid "Delete Corner"
 msgstr "Usuń narożnik"
 
@@ -6116,92 +6026,83 @@ msgstr "Pierwszy wiersz"
 msgid "Vertical text alignment"
 msgstr "Wyrównanie tekstu w pionie"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:377
-#: ../plug-ins/cairo/diacairo-interactive.c:378
+#: ../plug-ins/cairo/diacairo-interactive.c:263
+#: ../plug-ins/cairo/diacairo-interactive.c:264
 msgid "Zoom pointer"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo-interactive.c:384
-#: ../plug-ins/cairo/diacairo-interactive.c:385
+#: ../plug-ins/cairo/diacairo-interactive.c:270
+#: ../plug-ins/cairo/diacairo-interactive.c:271
 msgid "Visible rect pointer"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo-renderer.c:834
-#: ../plug-ins/cairo/diacairo-renderer.c:869 ../plug-ins/cgm/cgm.c:1125
-#: ../plug-ins/libart/dialibartrenderer.c:1325
-#: ../plug-ins/metapost/render_metapost.c:1110
-#: ../plug-ins/postscript/diapsrenderer.c:719
-#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:891
-msgid "Not enough memory for image drawing."
-msgstr ""
-
-#: ../plug-ins/cairo/diacairo.c:133
+#: ../plug-ins/cairo/diacairo.c:118
 #, c-format
 msgid ""
 "Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with Cairo.\n"
+"Please choose a different name to save with cairo.\n"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:305 ../plug-ins/cairo/diacairo.c:321
+#: ../plug-ins/cairo/diacairo.c:245 ../plug-ins/cairo/diacairo.c:261
 #, fuzzy, c-format
 msgid "Can't write %d bytes to %s"
 msgstr "Nie można znaleźć obiektu standardowego"
 
-#: ../plug-ins/cairo/diacairo.c:334
+#: ../plug-ins/cairo/diacairo.c:274
 msgid "Clipboard copy failed"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:359 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1488
+#: ../plug-ins/cairo/diacairo.c:300 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1381
 msgid "Nothing to print"
 msgstr "Nie ma czego drukować"
 
-#: ../plug-ins/cairo/diacairo.c:374
+#: ../plug-ins/cairo/diacairo.c:311
+msgid "Printing with Gtk+(cairo) requires at least version 2.10."
+msgstr ""
+
+#: ../plug-ins/cairo/diacairo.c:318
 msgid "Cairo PostScript"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:385
+#: ../plug-ins/cairo/diacairo.c:329
 msgid "Cairo Portable Document Format"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:397
+#: ../plug-ins/cairo/diacairo.c:344
 #, fuzzy
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Scalable Vector Graphics"
 
-#: ../plug-ins/cairo/diacairo.c:409
-msgid "CairoScript"
-msgstr "CairoScript"
-
-#: ../plug-ins/cairo/diacairo.c:420
+#: ../plug-ins/cairo/diacairo.c:355
 msgid "Cairo PNG"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:428
+#: ../plug-ins/cairo/diacairo.c:363
 msgid "Cairo PNG (with alpha)"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:438
+#: ../plug-ins/cairo/diacairo.c:373
 msgid "Cairo EMF"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:448
+#: ../plug-ins/cairo/diacairo.c:383
 msgid "Cairo WMF"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:472
+#: ../plug-ins/cairo/diacairo.c:405
 msgid "Copy _Diagram"
 msgstr "Skopiuj _diagram"
 
-#: ../plug-ins/cairo/diacairo.c:481
-msgid "Print (GTK) …"
-msgstr "Wydrukuj (GTK)..."
+#: ../plug-ins/cairo/diacairo.c:415
+msgid "Print (GTK) ..."
+msgstr "Wydruk (GTK+)..."
 
-#: ../plug-ins/cairo/diacairo.c:528
-msgid "Cairo-based Rendering"
+#: ../plug-ins/cairo/diacairo.c:460
+msgid "Cairo based Rendering"
 msgstr ""
 
-#: ../plug-ins/cgm/cgm.c:1118
+#: ../plug-ins/cgm/cgm.c:1106
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -6209,37 +6110,32 @@ msgstr ""
 "Długość wiersza obrazu przekracza maksymalny rozmiar tablicy komórek.\n"
 "Obraz nie został wyeksportowany do formatu CGM."
 
-#: ../plug-ins/cgm/cgm.c:1378
+#: ../plug-ins/cgm/cgm.c:1362
 msgid "Computer Graphics Metafile"
-msgstr "Computer Graphics Metafile"
+msgstr "CGM"
 
-#: ../plug-ins/cgm/cgm.c:1403
+#: ../plug-ins/cgm/cgm.c:1387
 msgid "Computer Graphics Metafile export filter"
-msgstr "Filtr eksportu CGM (Computer Graphics Metafile)"
+msgstr "Filtr eksportu CGM"
 
-#: ../plug-ins/drs/dia-render-script-import.c:225
-msgid "Broken file?"
-msgstr "Uszkodzony plik?"
-
-#: ../plug-ins/drs/dia-render-script.c:156
-#: ../plug-ins/drs/dia-render-script.c:161
+#: ../plug-ins/drs/dia-render-script.c:153
 msgid "DiaRenderScript"
 msgstr "DiaRenderScript"
 
-#: ../plug-ins/drs/dia-render-script.c:185
+#: ../plug-ins/drs/dia-render-script.c:164
 msgid "DiaRenderScript filter"
-msgstr ""
+msgstr "Filtr DiaRenderScript"
 
-#: ../plug-ins/dxf/dxf-export.c:653 ../plug-ins/dxf/dxf-import.c:1390
+#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
 msgid "Drawing Interchange File"
-msgstr "PLIK DIF (Drawing Interchange File)"
+msgstr "PLIK DIF"
 
-#: ../plug-ins/dxf/dxf-import.c:1300
+#: ../plug-ins/dxf/dxf-import.c:1319
 #, fuzzy, c-format
 msgid "read_dxf_codes failed on '%s'\n"
 msgstr "Wywołanie read_dxf_codes zakończone niepowodzeniem\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1307
+#: ../plug-ins/dxf/dxf-import.c:1326
 #, c-format
 msgid "Binary DXF from '%s' not supported\n"
 msgstr ""
@@ -6256,63 +6152,8 @@ msgstr "HP Graphics Language"
 msgid "HP Graphics Language export filter"
 msgstr "Filtr eksportu HP Graphics Language"
 
-#: ../plug-ins/layout/layout.cpp:211
-msgid "Please select edges and nodes to layout."
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:219
-#, fuzzy
-msgid "Graph creation failed"
-msgstr "Utworzenie \"%s\" nie powiodło się"
-
-#: ../plug-ins/layout/layout.cpp:245
-msgid "No such module."
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:246
-msgid "Out of memory."
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:247
-msgid "Not a tree."
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:248
-msgid "Not a forest."
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:249
-msgid "Failed algorithm."
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:250
-#, fuzzy
-msgid "Failed precondition."
-msgstr "Klimatyzacja"
-
-#: ../plug-ins/layout/layout.cpp:251
-#, fuzzy
-msgid "OGDF crashed."
-msgstr "Linia przerywana"
-
-#: ../plug-ins/layout/layout.cpp:252
-#, fuzzy
-msgid "Unknown reason"
-msgstr "nieznana strzałka"
-
-#: ../plug-ins/layout/layout.cpp:254
-#, c-format
-msgid ""
-"Layout '%s' failed.\n"
-"%s"
-msgstr ""
-
-#: ../plug-ins/layout/layout.cpp:365
-msgid "OGDF Layout Algorithms"
-msgstr ""
-
 #: ../plug-ins/libart/dialibart.c:59
-msgid "Libart-based rendering"
+msgid "Libart based rendering"
 msgstr ""
 
 #: ../plug-ins/libart/export_png.c:167
@@ -6341,11 +6182,10 @@ msgid "Image height:"
 msgstr "Wysokość obrazu:"
 
 #: ../plug-ins/libart/export_png.c:382
-#, fuzzy
-msgid "PNG (antialiased)"
-msgstr "PNG (wygładzone - antyaliasing)"
+msgid "PNG (anti-aliased)"
+msgstr "PNG (wygładzane)"
 
-#: ../plug-ins/libart/dialibartrenderer.c:304
+#: ../plug-ins/libart/dialibartrenderer.c:295
 msgid "gdk_renderer: Unsupported fill mode specified!\n"
 msgstr "gdk_renderer: Podano nieobsługiwany tryb wypełniania!\n"
 
@@ -6361,7 +6201,7 @@ msgstr ""
 msgid "TeX Metapost export filter"
 msgstr "Filtr eksportu TeX Metapost"
 
-#: ../plug-ins/metapost/render_metapost.c:1265
+#: ../plug-ins/metapost/render_metapost.c:1262
 msgid "TeX Metapost macros"
 msgstr "Makra TeX Metapost"
 
@@ -6369,19 +6209,29 @@ msgstr "Makra TeX Metapost"
 msgid "LaTeX PGF export filter"
 msgstr "Filtr eksportu LaTeX PGF"
 
-#: ../plug-ins/pgf/render_pgf.c:1112
-#: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF-8"
+#: ../plug-ins/pgf/render_pgf.c:1112 ../plug-ins/pstricks/render_pstricks.c:733
+msgid "Not valid UTF8"
 msgstr ""
 
-#: ../plug-ins/pgf/render_pgf.c:1263
+#: ../plug-ins/pgf/render_pgf.c:1277
 msgid "LaTeX PGF macros"
 msgstr "Makra LaTeX PGF"
 
+#: ../plug-ins/pixbuf/pixbuf.c:93
+#, c-format
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Nie można zapisać pliku:\n"
+"%s\n"
+"%s"
+
 #: ../plug-ins/pixbuf/pixbuf.c:199
 #, fuzzy
-msgid "gdk-pixbuf-based bitmap export/import"
-msgstr "Eksport/import bitmapy bazującej na gdk-pixbuf"
+msgid "gdk-pixbuf based bitmap export/import"
+msgstr "Eksport/import bitmapy oparty na gdk-pixbuf"
 
 #: ../plug-ins/postscript/paginate_psprint.c:273
 msgid "Select Printer"
@@ -6396,29 +6246,33 @@ msgstr "Drukarka"
 msgid "File"
 msgstr "Plik"
 
-#: ../plug-ins/postscript/paginate_psprint.c:464
-#, fuzzy, c-format
+#: ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "OK"
+
+#: ../plug-ins/postscript/paginate_psprint.c:456
+#, c-format
 msgid "Could not run command '%s': %s"
-msgstr "Nie można wykonać polecenia \"%s\""
+msgstr "Nie można wykonać polecenia \"%s\": %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:467
-#, fuzzy, c-format
+#: ../plug-ins/postscript/paginate_psprint.c:459
+#, c-format
 msgid "Could not open '%s' for writing: %s"
-msgstr "Nie można otworzyć \"%s\" do zapisu"
+msgstr "Nie można otworzyć \"%s\" do zapisu: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:489
+#: ../plug-ins/postscript/paginate_psprint.c:481
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr ""
 
-#: ../plug-ins/postscript/paginate_psprint.c:500
+#: ../plug-ins/postscript/paginate_psprint.c:492
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr ""
 
 #: ../plug-ins/postscript/render_eps.c:150
 #, fuzzy
-msgid "Encapsulated PostScript (using Pango fonts)"
+msgid "Encapsulated Postscript (using Pango fonts)"
 msgstr "Encapsulated Postscript (używający czcionek Pango)"
 
 #: ../plug-ins/postscript/render_eps.c:159
@@ -6427,28 +6281,28 @@ msgstr "Encapsulated Postscript z podglądem (używający czcionek Pango)"
 
 #: ../plug-ins/postscript/render_eps.c:169
 #, fuzzy
-msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
 msgstr "Encapsulated Postscript (używający czcionek postscriptowych Latin-1)"
 
-#: ../plug-ins/postscript/postscript.c:47
+#: ../plug-ins/postscript/postscript.c:46
 msgid "Print (PS)"
 msgstr ""
 
-#: ../plug-ins/postscript/postscript.c:71
+#: ../plug-ins/postscript/postscript.c:70
 #, fuzzy
-msgid "PostScript Rendering"
+msgid "Postscript Rendering"
 msgstr "PostScript (PS)"
 
 #: ../plug-ins/pstricks/pstricks.c:26
 #, fuzzy
-msgid "TeX PSTricks export filter"
+msgid "TeX Pstricks export filter"
 msgstr "Filtr eksportu TeX Pstricks"
 
-#: ../plug-ins/pstricks/render_pstricks.c:990
+#: ../plug-ins/pstricks/render_pstricks.c:987
 msgid "TeX PSTricks macros"
 msgstr "Makra TeX Pstricks"
 
-#: ../plug-ins/python/pydia-render.c:933
+#: ../plug-ins/python/pydia-render.c:779
 #, fuzzy, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "Nie można otworzyć: \"%s\" do zapisu.\n"
@@ -6457,35 +6311,35 @@ msgstr "Nie można otworzyć: \"%s\" do zapisu.\n"
 msgid "Python scripting support"
 msgstr "Obsługa skryptów Pythona"
 
-#: ../plug-ins/shape/shape-export.c:480
+#: ../plug-ins/shape/shape-export.c:474
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr ""
 
-#: ../plug-ins/shape/shape-export.c:494
+#: ../plug-ins/shape/shape-export.c:488
 #, fuzzy
-msgid "Can't export PNG icon without export plugin!"
+msgid "Can't export png icon without export plug-in!"
 msgstr "Nie można eksportować obrazu PNG bez biblioteki libart!"
 
-#: ../plug-ins/shape/shape-export.c:518
+#: ../plug-ins/shape/shape-export.c:512
 msgid "Dia Shape File"
 msgstr "Plik kształtów Dia"
 
 #: ../plug-ins/shape/shape.c:36
 #, fuzzy
-msgid "Dia shape export filter"
+msgid "dia shape export filter"
 msgstr "Filtr eksportu kształtów Dia"
 
-#: ../plug-ins/svg/svg-import.c:322
+#: ../plug-ins/svg/svg-import.c:258
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
 msgstr ""
 
-#: ../plug-ins/svg/svg-import.c:1120
+#: ../plug-ins/svg/svg-import.c:806
 msgid "Expected SVG Namespace not found in file"
 msgstr ""
 
-#: ../plug-ins/svg/svg-import.c:1140
+#: ../plug-ins/svg/svg-import.c:826
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "głównym elementem jest \"%s\" -- spodziewano się \"svg\"."
@@ -6494,54 +6348,74 @@ msgstr "głównym elementem jest \"%s\" -- spodziewano się \"svg\"."
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "Filtr eksportu i importu Scalable Vector Graphics"
 
-#: ../plug-ins/vdx/vdx-export.c:1863
+#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
+#, fuzzy, c-format
+msgid "Couldn't read file %s"
+msgstr "Nie można odczytać koloru: %s\n"
+
+#: ../plug-ins/vdx/vdx-export.c:1912
 msgid "Visio XML format"
 msgstr "Format Visio XML"
 
-#: ../plug-ins/vdx/vdx-import.c:223 ../plug-ins/xfig/xfig-import.c:1049
+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
 #, c-format
 msgid "Couldn't read color: %s\n"
 msgstr "Nie można odczytać koloru: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:536
+#: ../plug-ins/vdx/vdx-import.c:541
 #, fuzzy, c-format
 msgid "Couldn't find shape %d\n"
 msgstr "Nie można odnaleźć katalogu pomocy"
 
-#: ../plug-ins/vdx/vdx-import.c:1011
+#: ../plug-ins/vdx/vdx-import.c:1047
 #, c-format
 msgid "Unexpected Ellipse object: %s\n"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:1025
+#: ../plug-ins/vdx/vdx-import.c:1061
 #, fuzzy
 msgid "Can't rotate ellipse\n"
 msgstr "Nie można wczytać informacji o elipsie: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1356
+#: ../plug-ins/vdx/vdx-import.c:1392
 msgid "MoveTo not at start of Bezier\n"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:1706
-msgid "Invalid NURBS formula"
+#: ../plug-ins/vdx/vdx-import.c:1740
+msgid "Invalid NURBS formula\n"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:1964
+#: ../plug-ins/vdx/vdx-import.c:1984
+#, fuzzy, c-format
+msgid "Couldn't write file %s"
+msgstr "Nie można odczytać koloru: %s\n"
+
+#: ../plug-ins/vdx/vdx-import.c:2069
+#, fuzzy, c-format
+msgid "Couldn't handle foreign object type %s\n"
+msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
+
+#: ../plug-ins/vdx/vdx-import.c:2082
 #, fuzzy, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:2971
+#: ../plug-ins/vdx/vdx-import.c:2110
+#, fuzzy, c-format
+msgid "Couldn't make object dir %s"
+msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
+
+#: ../plug-ins/vdx/vdx-import.c:3118
 #, fuzzy
 msgid "Visio XML File Format"
 msgstr "Format pliku XFig"
 
 #: ../plug-ins/vdx/vdx-xml.c:3344
 #, fuzzy, c-format
-msgid "Can't decode object %s"
+msgid "Can't decode object %s\n"
 msgstr "Nie można wczytać czcionki %s.\n"
 
-#: ../plug-ins/vdx/vdx-xml.c:5187
+#: ../plug-ins/vdx/vdx-xml.c:5125
 #, fuzzy, c-format
 msgid "Can't write object %u"
 msgstr "Nie można znaleźć obiektu standardowego"
@@ -6551,315 +6425,314 @@ msgstr "Nie można znaleźć obiektu standardowego"
 msgid "Visio XML Format import and export filter"
 msgstr "Filtry importu i eksportu Fig Format"
 
-#: ../plug-ins/wmf/wmf.cpp:309
-#, fuzzy, c-format
-msgid ""
-"Couldn't write file %s\n"
-"%s"
-msgstr "Nie można odczytać koloru: %s\n"
-
-#: ../plug-ins/wmf/wmf.cpp:558
+#: ../plug-ins/wmf/wmf.cpp:499
 #, c-format
 msgid ""
-"Cannot render unknown font:\n"
+"Can not render unknown font:\n"
 "%s"
 msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:1365
+#: ../plug-ins/wmf/wmf.cpp:1258
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Nie można otworzyć: \"%s\" do zapisu.\n"
 
-#: ../plug-ins/wmf/wmf.cpp:1496
+#: ../plug-ins/wmf/wmf.cpp:1357
+msgid "Windows Meta File"
+msgstr "WMF"
+
+#: ../plug-ins/wmf/wmf.cpp:1366
+msgid "Enhanced Meta File"
+msgstr "EMF"
+
+#: ../plug-ins/wmf/wmf.cpp:1388
 msgid "Print (GDI) ..."
 msgstr "Wydruk (GDI)..."
 
-#: ../plug-ins/wmf/wmf.cpp:1512
+#: ../plug-ins/wmf/wmf.cpp:1403
 msgid "WMF export filter"
 msgstr "Filtr eksportu dla WMF"
 
-#: ../plug-ins/wpg/wpg.c:1194
+#: ../plug-ins/wpg/wpg.c:1190
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "Plik: %s nieobsługiwany typ/wersja.\n"
 
-#: ../plug-ins/wpg/wpg.c:1325 ../plug-ins/wpg/wpg.c:1332
+#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
 msgid "WPG"
 msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1360
+#: ../plug-ins/wpg/wpg.c:1356
 msgid "WordPerfect Graphics export filter"
 msgstr "Filtr eksportu WordPerfect Graphics"
 
-#: ../plug-ins/xfig/xfig-export.c:464
+#: ../plug-ins/xfig/xfig-export.c:463
 #, c-format
-msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
+msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-export.c:487
+#: ../plug-ins/xfig/xfig-export.c:486
 msgid "No more user-definable colors - using black"
 msgstr "Brak kolorów zdefiniowanych przez użytkownika - użyto czarnego"
 
-#: ../plug-ins/xfig/xfig-export.c:1211
-#, fuzzy
-msgid "Xfig format"
-msgstr "Format pliku XFig"
+#: ../plug-ins/xfig/xfig-export.c:1207
+msgid "XFig format"
+msgstr "Format XFig"
 
 #: ../plug-ins/xfig/xfig-import.c:111
 #, c-format
-msgid "Color index %d too high; only 512 colors allowed. Using black instead."
+msgid "Color index %d too high, only 512 colors allowed. Using black instead."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:141
+#: ../plug-ins/xfig/xfig-import.c:138
 msgid "Patterns are not supported by Dia"
 msgstr "Wypełnienia (patterny) nie są obsługiwane przez Dia"
 
-#: ../plug-ins/xfig/xfig-import.c:169
+#: ../plug-ins/xfig/xfig-import.c:166
 #, fuzzy
-msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
+msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
 msgstr ""
 "Potrójnie kropkowane linie nie są obsługiwane przez Dia, użyto podwójnie "
 "kropkowanych"
 
-#: ../plug-ins/xfig/xfig-import.c:173
+#: ../plug-ins/xfig/xfig-import.c:170
 #, c-format
 msgid "Line style %d should not appear\n"
 msgstr "Styl linii %d nie powinien się pojawiać\n"
 
-#: ../plug-ins/xfig/xfig-import.c:241
+#: ../plug-ins/xfig/xfig-import.c:238
 #, c-format
 msgid "Error while reading %dth of %d points: %s\n"
 msgstr "Błąd podczas odczytu %d. z %d punktów: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:269
+#: ../plug-ins/xfig/xfig-import.c:266
 msgid "Error while reading arrowhead\n"
 msgstr "Błąd podczas zakańczania strzałki\n"
 
-#: ../plug-ins/xfig/xfig-import.c:291
+#: ../plug-ins/xfig/xfig-import.c:288
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "Nieznany typ strzałki %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:382
+#: ../plug-ins/xfig/xfig-import.c:379
 #, c-format
 msgid "Depth %d of of range, only 0-%d allowed.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:429
+#: ../plug-ins/xfig/xfig-import.c:426
 #, c-format
 msgid "Couldn't read ellipse info: %s\n"
 msgstr "Nie można wczytać informacji o elipsie: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:497
+#: ../plug-ins/xfig/xfig-import.c:494
 #, c-format
 msgid "Couldn't read polyline info: %s\n"
 msgstr "Nie można wczytać informacji o łamanej: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:512
+#: ../plug-ins/xfig/xfig-import.c:509
 #, c-format
 msgid "Couldn't read flipped bit: %s\n"
 msgstr "Nie można odczytać przekłamanego bitu: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:530
+#: ../plug-ins/xfig/xfig-import.c:527
 #, fuzzy
-msgid "Negative corner radius; negating"
+msgid "Negative corner radius, negating"
 msgstr "Ujemny kąt, zmiana znaku"
 
-#: ../plug-ins/xfig/xfig-import.c:573
+#: ../plug-ins/xfig/xfig-import.c:570
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "Nieznany podtyp łamanej: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:723 ../plug-ins/xfig/xfig-import.c:755
+#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
 #, c-format
 msgid "Couldn't read spline info: %s\n"
 msgstr "Nie można odczytać informacji o krzywej sklejanej: %s\n"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:742 ../plug-ins/xfig/xfig-import.c:760
+#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
 msgid "Cannot convert approximated spline yet."
 msgstr "Nie można jeszcze konwertować krzywych sklejanych."
 
-#: ../plug-ins/xfig/xfig-import.c:798
+#: ../plug-ins/xfig/xfig-import.c:795
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "Nieznany podtyp krzywej sklejanej: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:863
+#: ../plug-ins/xfig/xfig-import.c:860
 #, c-format
 msgid "Couldn't read arc info: %s\n"
 msgstr "Nie można przeczytać informacji o łuku: %s\n"
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:892
+#: ../plug-ins/xfig/xfig-import.c:889
 msgid "Filled arc treated as unfilled"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:896
+#: ../plug-ins/xfig/xfig-import.c:893
 #, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "Nieznany łuk w krzywej: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:960
+#: ../plug-ins/xfig/xfig-import.c:957
 #, c-format
 msgid "Couldn't read text info: %s\n"
 msgstr "Nie można przeczytać informacji tekstowej: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1022
+#: ../plug-ins/xfig/xfig-import.c:1019
 #, fuzzy, c-format
-msgid "Couldn't identify Fig object: %s\n"
+msgid "Couldn't identify FIG object: %s\n"
 msgstr "Nie można zidentyfikować obiektu FIG: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1030
+#: ../plug-ins/xfig/xfig-import.c:1027
 msgid "Compound end outside compound\n"
 msgstr "Domknięcie na zewnątrz obszaru domykanego\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1054
+#: ../plug-ins/xfig/xfig-import.c:1051
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1101
+#: ../plug-ins/xfig/xfig-import.c:1097
 #, c-format
 msgid "Couldn't read group extend: %s\n"
 msgstr "Nie można odczytać rozszerzenia grupy: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1112
+#: ../plug-ins/xfig/xfig-import.c:1108
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "Nieznany typ obiektu %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1136
+#: ../plug-ins/xfig/xfig-import.c:1132
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "\"%s\" nie jest jednym z \"%s\" lub \"%s\"\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1146
+#: ../plug-ins/xfig/xfig-import.c:1142
 #, c-format
 msgid "Error reading paper size: %s\n"
 msgstr "Błąd przy odczycie rozmiaru papieru: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1157
+#: ../plug-ins/xfig/xfig-import.c:1153
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "Nieznany rozmiar papieru \"%s\". Wykorzystano domyślny.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1169
+#: ../plug-ins/xfig/xfig-import.c:1165
 #, c-format
 msgid "Error reading paper orientation: %s\n"
 msgstr "Błąd przy odczycie ułożenia dokumentu: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1179
+#: ../plug-ins/xfig/xfig-import.c:1175
 #, c-format
 msgid "Error reading justification: %s\n"
 msgstr "Błąd przy odczycie wyrównania: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1189
+#: ../plug-ins/xfig/xfig-import.c:1185
 #, c-format
 msgid "Error reading units: %s\n"
 msgstr "Błąd przy odczycie jednostek: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1205
+#: ../plug-ins/xfig/xfig-import.c:1201
 #, c-format
 msgid "Error reading magnification: %s\n"
 msgstr "Błąd wczytywania powiększenia: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1218
+#: ../plug-ins/xfig/xfig-import.c:1214
 #, c-format
 msgid "Error reading multipage indicator: %s\n"
 msgstr "Błąd podczas wczytywania wskaźnika wielostronnicowego: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1229
+#: ../plug-ins/xfig/xfig-import.c:1225
 #, c-format
 msgid "Error reading transparent color: %s\n"
 msgstr "Błąd przy odczycie koloru przezroczystości: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1238 ../plug-ins/xfig/xfig-import.c:1296
-#: ../plug-ins/xfig/xfig-import.c:1314
+#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
+#: ../plug-ins/xfig/xfig-import.c:1308
 #, fuzzy, c-format
-msgid "Error reading Fig file: %s\n"
+msgid "Error reading FIG file: %s\n"
 msgstr "Błąd przy odczycie pliku FIG: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1240 ../plug-ins/xfig/xfig-import.c:1298
+#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
 #, fuzzy
-msgid "Premature end of Fig file\n"
+msgid "Premature end of FIG file\n"
 msgstr "Przedwczesny koniec pliku FIG\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1249
+#: ../plug-ins/xfig/xfig-import.c:1245
 #, c-format
 msgid "Error reading resolution: %s\n"
 msgstr "Błąd przy odczycie rozdzielczości: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1283
+#: ../plug-ins/xfig/xfig-import.c:1277
 #, c-format
 msgid "Doesn't look like a Fig file: %s\n"
 msgstr "Plik %s nie wygląda na plik Fig\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1289
+#: ../plug-ins/xfig/xfig-import.c:1283
 #, fuzzy, c-format
-msgid "This is a Fig version %d.%d file. It may not be importable.\n"
+msgid "This is a FIG version %d.%d file, I may not understand it\n"
 msgstr "To jest plik FIG w wersji %d.%d, nie można go odczytać.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1337
-#, fuzzy
-msgid "Xfig File Format"
+#: ../plug-ins/xfig/xfig-import.c:1331
+msgid "XFig File Format"
 msgstr "Format pliku XFig"
 
 #: ../plug-ins/xfig/xfig.c:51
 msgid "Fig Format import and export filter"
 msgstr "Filtry importu i eksportu Fig Format"
 
-#: ../plug-ins/xslt/xslt.c:110
+#: ../plug-ins/xslt/xslt.c:108
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "Błąd podczas przetwarzania %s\n"
 
-#: ../plug-ins/xslt/xslt.c:119
+#: ../plug-ins/xslt/xslt.c:117
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "Błąd podczas przetwarzania arkusza stylów %s\n"
 
-#: ../plug-ins/xslt/xslt.c:126
+#: ../plug-ins/xslt/xslt.c:124
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "Błąd podczas próby zastosowania arkusza stylów: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:135
+#: ../plug-ins/xslt/xslt.c:133
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "Błąd podczas przetwarzania arkusza stylów: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:144
+#: ../plug-ins/xslt/xslt.c:142
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Błąd podczas próby zastosowania arkusza stylów: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:152
+#: ../plug-ins/xslt/xslt.c:150
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "Błąd podczas zapisywania wyniku: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:336
+#: ../plug-ins/xslt/xslt.c:335
 msgid "XSL Transformation filter"
 msgstr "Filtr Przekształcania XSL"
 
-#: ../plug-ins/xslt/xslt.c:363
+#: ../plug-ins/xslt/xslt.c:362
 #, fuzzy
-msgid "No valid configuration files found for the XSLT plugin; not loading."
+msgid "No valid configuration files found for the XSLT plugin, not loading."
 msgstr ""
 "Nie znaleziono poprawnych plików konfiguracyjnych dla wtyczki XSLT. Nie "
 "została ona wczytana."
 
-#: ../plug-ins/xslt/xsltdialog.c:99
+#: ../plug-ins/xslt/xsltdialog.c:97
 msgid "Export through XSLT"
 msgstr "Eksportowanie z wykorzystaniem XSLT"
 
-#: ../plug-ins/xslt/xsltdialog.c:114
+#: ../plug-ins/xslt/xsltdialog.c:112
 msgid "From:"
-msgstr "Z:"
+msgstr "Od:"
 
-#: ../plug-ins/xslt/xsltdialog.c:149
+#: ../plug-ins/xslt/xsltdialog.c:147
 msgid "To:"
 msgstr "Do:"
 
@@ -6873,39 +6746,39 @@ msgstr "Kształty AADL"
 
 #: ../sheets/AADL.sheet.in.h:4
 msgid "Thread"
-msgstr ""
+msgstr "Wątek"
 
 #: ../sheets/AADL.sheet.in.h:6
 msgid "Processor"
-msgstr ""
+msgstr "Procesor"
 
 #: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
-msgstr ""
+msgstr "Pamięć"
 
 #: ../sheets/AADL.sheet.in.h:8
 msgid "Bus"
-msgstr ""
+msgstr "Magistrala"
 
 #: ../sheets/AADL.sheet.in.h:9
 msgid "System"
-msgstr ""
+msgstr "System"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
-msgstr ""
+msgstr "Podprogram"
 
 #: ../sheets/AADL.sheet.in.h:11
 msgid "Thread Group"
-msgstr ""
+msgstr "Grupa wątków"
 
 #: ../sheets/AADL.sheet.in.h:12
 msgid "Device"
-msgstr ""
+msgstr "Urządzenie"
 
 #: ../sheets/AADL.sheet.in.h:13
 msgid "Package"
-msgstr ""
+msgstr "Pakiet"
 
 #. Please talk to me before making any changes to this sheet
 #: ../sheets/Assorted.sheet.in.h:2
@@ -6929,7 +6802,7 @@ msgstr "Trójkąt prostokątny"
 
 #: ../sheets/Assorted.sheet.in.h:8
 #, fuzzy
-msgid "Isosceles triangle"
+msgid "Isoceles triangle"
 msgstr "Podwójny wypełniony trójkąt"
 
 #: ../sheets/Assorted.sheet.in.h:9
@@ -6950,22 +6823,22 @@ msgstr "Diament"
 
 #: ../sheets/Assorted.sheet.in.h:13
 #, fuzzy
-msgid "Pentagon. Five-point shape"
+msgid "Pentagon. Five sided shape"
 msgstr "Pięciokąt. Kształt z pięcioma krawędziami"
 
 #: ../sheets/Assorted.sheet.in.h:14
 #, fuzzy
-msgid "Hexagon. Six-point shape"
+msgid "Hexagon. Six sided shape"
 msgstr "Sześciokąt. Kształt z sześcioma krawędziami"
 
 #: ../sheets/Assorted.sheet.in.h:15
 #, fuzzy
-msgid "Heptagon. Seven-point shape"
+msgid "Heptagon. Seven sided shape"
 msgstr "Siedmiokąt. Kształt z siedmioma krawędziami"
 
 #: ../sheets/Assorted.sheet.in.h:16
 #, fuzzy
-msgid "Octogon. Eight-point shape"
+msgid "Octogon. Eight sided shape"
 msgstr "Ośmiokąt. Kształt z ośmioma krawędziami"
 
 #: ../sheets/Assorted.sheet.in.h:17
@@ -6982,42 +6855,42 @@ msgstr "Trapezoid"
 
 #: ../sheets/Assorted.sheet.in.h:20
 #, fuzzy
-msgid "Four-point star"
+msgid "Four point star"
 msgstr "Czteroramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:21
 #, fuzzy
-msgid "Curved four-point star"
+msgid "Curved four point star"
 msgstr "Zakrzywiona czteroramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:22
 #, fuzzy
-msgid "Five-point star"
+msgid "Five point star"
 msgstr "Pięcioramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:23
 #, fuzzy
-msgid "Six-point star"
+msgid "Six point star"
 msgstr "Sześcioramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:24
 #, fuzzy
-msgid "Seven-point star"
+msgid "Seven point star"
 msgstr "Siedmioramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:25
 #, fuzzy
-msgid "Eight-point star"
+msgid "Eight point star"
 msgstr "Ośmioramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:26
 #, fuzzy
-msgid "Sharp eight-point star"
+msgid "Sharp eight point star"
 msgstr "Ostra ośmioramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:27
 #, fuzzy
-msgid "Curved eight-point star"
+msgid "Curved eight point star"
 msgstr "Zakrzywiona ośmioramienna gwiazda"
 
 #: ../sheets/Assorted.sheet.in.h:28
@@ -7104,7 +6977,7 @@ msgstr "Ćwierć księżyca"
 #. For: anthonym
 #: ../sheets/BPMN.sheet.in.h:2
 msgid "BPMN"
-msgstr ""
+msgstr "BPMN"
 
 #: ../sheets/BPMN.sheet.in.h:3
 msgid "Business Process Modeling Notation"
@@ -7115,61 +6988,66 @@ msgid "Start Event"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:5
-msgid "Start Event — Message"
-msgstr ""
+#, fuzzy
+msgid "Start Event - Message"
+msgstr "Czas rozpoczęcia"
 
 #: ../sheets/BPMN.sheet.in.h:6
 #, fuzzy
-msgid "Start Event — Timer"
+msgid "Start Event - Timer"
 msgstr "Czas rozpoczęcia"
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Start Event — Rule"
-msgstr ""
+#, fuzzy
+msgid "Start Event - Rule"
+msgstr "Czas rozpoczęcia"
 
 #: ../sheets/BPMN.sheet.in.h:8
 #, fuzzy
-msgid "Start Event — Link"
+msgid "Start Event - Link"
 msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Start Event — Multiple"
-msgstr ""
+#, fuzzy
+msgid "Start Event - Multiple"
+msgstr "Czas rozpoczęcia"
 
 #: ../sheets/BPMN.sheet.in.h:10
 msgid "Intermediate Event"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "Intermediate Event — Message"
+msgid "Intermediate Event - Message"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "Intermediate Event — Timer"
-msgstr ""
+#, fuzzy
+msgid "Intermediate Event - Timer"
+msgstr "Czas rozpoczęcia"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "Intermediate Event — Error"
+msgid "Intermediate Event - Error"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "Intermediate Event — Cancel"
+msgid "Intermediate Event - Cancel"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "Intermediate Event — Compensation"
+msgid "Intermediate Event - Compensation"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "Intermediate Event — Rule"
+msgid "Intermediate Event - Rule"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "Intermediate Event — Link"
-msgstr ""
+#, fuzzy
+msgid "Intermediate Event - Link"
+msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "Intermediate Event — Multiple"
+msgid "Intermediate Event - Multiple"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:19
@@ -7177,33 +7055,38 @@ msgid "End Event"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "End Event — Message"
+msgid "End Event - Message"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "End Event — Error"
-msgstr ""
+#, fuzzy
+msgid "End Event - Error"
+msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "End Event — Cancel"
-msgstr ""
+#, fuzzy
+msgid "End Event - Cancel"
+msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "End Event — Compensation"
-msgstr ""
+#, fuzzy
+msgid "End Event - Compensation"
+msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:24
 #, fuzzy
-msgid "End Event — Link"
+msgid "End Event - Link"
 msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "End Event — Multiple"
-msgstr ""
+#, fuzzy
+msgid "End Event - Multiple"
+msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "End Event — Terminate"
-msgstr ""
+#, fuzzy
+msgid "End Event - Terminate"
+msgstr "Zbiornik zdarzeń"
 
 #: ../sheets/BPMN.sheet.in.h:27
 msgid "Gateway"
@@ -7585,12 +7468,12 @@ msgstr "Pionowo ułożony bezpiecznik"
 
 #: ../sheets/Circuit.sheet.in.h:27
 #, fuzzy
-msgid "Horizontally aligned power source"
+msgid "Horizontally aligned powersource"
 msgstr "Poziomo ułożone źródło zasilania"
 
 #: ../sheets/Circuit.sheet.in.h:28
 #, fuzzy
-msgid "Vertically aligned power source"
+msgid "Vertically aligned powersource"
 msgstr "Pionowo ułożone źródło zasilania"
 
 #: ../sheets/Circuit.sheet.in.h:29
@@ -7625,16 +7508,6 @@ msgstr "Tranzystor PMOS"
 msgid "Horizontal jumper"
 msgstr "Poziomo ułożona zworka"
 
-#: ../sheets/Circuit.sheet.in.h:37
-#, fuzzy
-msgid "Horizontal xtal"
-msgstr "Pozioma podpora"
-
-#: ../sheets/Circuit.sheet.in.h:38
-#, fuzzy
-msgid "Vertical xtal"
-msgstr "Pionowa podpora"
-
 #: ../sheets/Contact.sheet.in.h:1
 msgid "Ladder"
 msgstr "Układy drabinkowe"
@@ -7701,21 +7574,23 @@ msgstr "Komponenty do budowy obwodów cybernetycznych"
 
 #: ../sheets/Cybernetics.sheet.in.h:3
 #, fuzzy
-msgid "Sensor — left"
+msgid "Sensor - left"
 msgstr "Wiązka czujnika"
 
 #: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Sensor — right"
-msgstr ""
+#, fuzzy
+msgid "Sensor - right"
+msgstr "Wiązka czujnika"
 
 #: ../sheets/Cybernetics.sheet.in.h:5
 #, fuzzy
-msgid "Sensor — bottom"
+msgid "Sensor - bottom"
 msgstr "Wiązka czujnika"
 
 #: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Sensor — top"
-msgstr ""
+#, fuzzy
+msgid "Sensor - top"
+msgstr "Wiązka czujnika"
 
 #: ../sheets/Cybernetics.sheet.in.h:7
 msgid "Sum, subtracting left input"
@@ -7734,19 +7609,19 @@ msgid "Sum, subtracting top input"
 msgstr ""
 
 #: ../sheets/Cybernetics.sheet.in.h:11
-msgid "Integrator — input left"
+msgid "Integrator - input left"
 msgstr ""
 
 #: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator — input right"
+msgid "Integrator - input right"
 msgstr ""
 
 #: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator — input bottom"
+msgid "Integrator - input bottom"
 msgstr ""
 
 #: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator — input top"
+msgid "Integrator - input top"
 msgstr ""
 
 #: ../sheets/Cybernetics.sheet.in.h:15
@@ -8152,7 +8027,7 @@ msgid "River"
 msgstr "Rzeka"
 
 #: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Roof 1"
+msgid "Roof1"
 msgstr ""
 
 #: ../sheets/IsometricMap.sheet.in.h:14
@@ -8217,7 +8092,7 @@ msgstr ""
 
 #: ../sheets/Istar.sheet.in.h:1
 msgid "RE-i*"
-msgstr ""
+msgstr "RE-i*"
 
 #: ../sheets/Istar.sheet.in.h:2
 msgid "Objects to design i* diagrams"
@@ -8417,7 +8292,7 @@ msgstr "Obiekty do projektowania prostych planów oświetlenia"
 
 #: ../sheets/Lights.sheet.in.h:3
 msgid "PAR"
-msgstr ""
+msgstr "PAR"
 
 #: ../sheets/Lights.sheet.in.h:4
 msgid "PAR on the floor"
@@ -8425,14 +8300,14 @@ msgstr ""
 
 #: ../sheets/Lights.sheet.in.h:5
 msgid "ACL"
-msgstr ""
+msgstr "ACL"
 
 #: ../sheets/Lights.sheet.in.h:6
 msgid "Pebble Convex lantern"
 msgstr ""
 
 #: ../sheets/Lights.sheet.in.h:7
-msgid "Fresnel lantern"
+msgid "Fresel lantern"
 msgstr ""
 
 #: ../sheets/Lights.sheet.in.h:8
@@ -8509,7 +8384,7 @@ msgstr "NOT"
 
 #: ../sheets/Logic.sheet.in.h:11
 #, fuzzy
-msgid "Cross-connector"
+msgid "Crossconnector"
 msgstr "Złącze krzyżakowe"
 
 #: ../sheets/MSE.sheet.in.h:1
@@ -8545,9 +8420,8 @@ msgid "Demultiplexer"
 msgstr "Demultiplekser"
 
 #: ../sheets/Misc.sheet.in.h:1
-#, fuzzy
-msgid "Miscellaneous"
-msgstr "Różne kształty"
+msgid "Misc"
+msgstr ""
 
 #: ../sheets/Misc.sheet.in.h:2
 msgid "Miscellaneous Shapes"
@@ -8563,12 +8437,12 @@ msgstr "Folder"
 
 #: ../sheets/Misc.sheet.in.h:6
 #, fuzzy
-msgid "expansible node"
+msgid "expensible node"
 msgstr "rozwijalny węzeł"
 
 #: ../sheets/Misc.sheet.in.h:7
 #, fuzzy
-msgid "expanded node"
+msgid "expended node"
 msgstr "rozwinięty węzeł"
 
 #: ../sheets/Misc.sheet.in.h:8
@@ -8697,7 +8571,7 @@ msgstr "SDL"
 
 #: ../sheets/SDL.sheet.in.h:2
 msgid "Specification and Description Language."
-msgstr "Język specyfikacji i opisu (SDL)"
+msgstr "Język specyfikacji i opisu (SDL)."
 
 #: ../sheets/SDL.sheet.in.h:3
 msgid "Block type reference"
@@ -8989,7 +8863,7 @@ msgstr "Gaśnica"
 
 #: ../sheets/SISSI.sheet.in.h:62
 #, fuzzy
-msgid "Air conditioner"
+msgid "Airconditioner"
 msgstr "Klimatyzacja"
 
 #: ../sheets/SISSI.sheet.in.h:63
@@ -9070,7 +8944,7 @@ msgstr "Ikona stereotypowej klasy"
 
 #: ../sheets/UML.sheet.in.h:27
 #, fuzzy
-msgid "Initial/End state"
+msgid "Initial/end state"
 msgstr "Początkowy/końcowy krok"
 
 #: ../sheets/UML.sheet.in.h:29
@@ -9079,7 +8953,7 @@ msgstr "Aktywność"
 
 #: ../sheets/UML.sheet.in.h:31
 #, fuzzy
-msgid "Fork/Union"
+msgid "Fork/union"
 msgstr "Rozwidlenie/unia"
 
 #: ../sheets/chronogram.sheet.in.h:1
@@ -9099,8 +8973,7 @@ msgid "Data line"
 msgstr "Linia danych"
 
 #: ../sheets/ciscocomputer.sheet.in.h:1
-#, fuzzy
-msgid "Cisco — Computer"
+msgid "Cisco - Computer"
 msgstr "Cisco - komputer"
 
 #: ../sheets/ciscocomputer.sheet.in.h:2
@@ -9283,8 +9156,7 @@ msgid "PC Adapter Card"
 msgstr "Karta rozszerzeń PC"
 
 #: ../sheets/ciscohub.sheet.in.h:1
-#, fuzzy
-msgid "Cisco — Switch"
+msgid "Cisco - Switch"
 msgstr "Cisco - przełącznica"
 
 #: ../sheets/ciscohub.sheet.in.h:2
@@ -9373,12 +9245,10 @@ msgid "Hub subdued"
 msgstr ""
 
 #: ../sheets/ciscohub.sheet.in.h:23
-#, fuzzy
 msgid "Cisco Hub"
 msgstr "Cisco - koncentrator"
 
 #: ../sheets/ciscohub.sheet.in.h:24
-#, fuzzy
 msgid "Small Hub"
 msgstr "Mały koncentrator"
 
@@ -9608,8 +9478,7 @@ msgid "Virtual Layer Switch"
 msgstr "Switch wielowarstwowy"
 
 #: ../sheets/ciscomisc.sheet.in.h:1
-#, fuzzy
-msgid "Cisco — Miscellaneous"
+msgid "Cisco - Misc"
 msgstr "Cisco - różne"
 
 #: ../sheets/ciscomisc.sheet.in.h:2
@@ -9625,7 +9494,6 @@ msgid "University"
 msgstr "Uniwersytet"
 
 #: ../sheets/ciscomisc.sheet.in.h:5
-#, fuzzy
 msgid "Small Business"
 msgstr "Mały biznes"
 
@@ -9789,6 +9657,10 @@ msgstr "Kobieta Mac"
 msgid "Androgynous Person"
 msgstr ""
 
+#: ../sheets/ciscomisc.sheet.in.h:43
+msgid "Key"
+msgstr "Klucz"
+
 #: ../sheets/ciscomisc.sheet.in.h:44
 msgid "Lock and Key"
 msgstr ""
@@ -9827,8 +9699,7 @@ msgid "Headphones"
 msgstr "Słuchawki"
 
 #: ../sheets/cisconetwork.sheet.in.h:1
-#, fuzzy
-msgid "Cisco — Network"
+msgid "Cisco - Network"
 msgstr "Cisco - sieć komputerowa"
 
 #: ../sheets/cisconetwork.sheet.in.h:2
@@ -10150,128 +10021,126 @@ msgstr "MUX"
 msgid "General Appliance"
 msgstr ""
 
-#. compatibility
-#. <alias name="Cisco - PAD"/>
-#: ../sheets/cisconetwork.sheet.in.h:78
+#: ../sheets/cisconetwork.sheet.in.h:76
 msgid "PAD"
 msgstr "PAD"
 
-#: ../sheets/cisconetwork.sheet.in.h:79
+#: ../sheets/cisconetwork.sheet.in.h:77
 msgid "CDDI/FDDI Concentrator"
 msgstr "Koncentrator CDDI/FDDI"
 
-#: ../sheets/cisconetwork.sheet.in.h:80
+#: ../sheets/cisconetwork.sheet.in.h:78
 #, fuzzy
 msgid "FDDI Ring"
 msgstr "Pierścień FDDI"
 
-#: ../sheets/cisconetwork.sheet.in.h:81
+#: ../sheets/cisconetwork.sheet.in.h:79
 msgid "TokenRing"
 msgstr "TokenRing"
 
-#: ../sheets/cisconetwork.sheet.in.h:82
+#: ../sheets/cisconetwork.sheet.in.h:80
 msgid "MAU"
 msgstr "MAU"
 
-#: ../sheets/cisconetwork.sheet.in.h:83
+#: ../sheets/cisconetwork.sheet.in.h:81
 msgid "Repeater"
 msgstr "Powielacz"
 
-#: ../sheets/cisconetwork.sheet.in.h:84
+#: ../sheets/cisconetwork.sheet.in.h:82
 msgid "Bridge"
 msgstr "Mostek"
 
-#: ../sheets/cisconetwork.sheet.in.h:85
+#: ../sheets/cisconetwork.sheet.in.h:83
 msgid "Breakout box"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:86
+#: ../sheets/cisconetwork.sheet.in.h:84
 msgid "STB (set top box)"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:87
+#: ../sheets/cisconetwork.sheet.in.h:85
 msgid "TV"
 msgstr "TV"
 
-#: ../sheets/cisconetwork.sheet.in.h:88
+#: ../sheets/cisconetwork.sheet.in.h:86
 msgid "IPTV broadcast server"
 msgstr "Serwer rozgłoszeniowy IPTV"
 
-#: ../sheets/cisconetwork.sheet.in.h:89
+#: ../sheets/cisconetwork.sheet.in.h:87
 msgid "IPTV content manager"
 msgstr "Menedżer zawartości IPTV"
 
-#: ../sheets/cisconetwork.sheet.in.h:90
+#: ../sheets/cisconetwork.sheet.in.h:88
 msgid "VN2900"
 msgstr "VN2900"
 
-#: ../sheets/cisconetwork.sheet.in.h:91
+#: ../sheets/cisconetwork.sheet.in.h:89
 msgid "VN5902"
 msgstr "VN5902"
 
-#: ../sheets/cisconetwork.sheet.in.h:92
+#: ../sheets/cisconetwork.sheet.in.h:90
 msgid "VN5900"
 msgstr "VN5900"
 
-#: ../sheets/cisconetwork.sheet.in.h:93
+#: ../sheets/cisconetwork.sheet.in.h:91
 msgid "Catalyst Access Gateway"
 msgstr "Bramka dostępowa Catalyst"
 
-#: ../sheets/cisconetwork.sheet.in.h:94
+#: ../sheets/cisconetwork.sheet.in.h:92
 #, fuzzy
 msgid "Generic Gateway"
 msgstr "Zwykła brama"
 
-#: ../sheets/cisconetwork.sheet.in.h:95
+#: ../sheets/cisconetwork.sheet.in.h:93
 msgid "TransPath"
 msgstr "TransPath"
 
-#: ../sheets/cisconetwork.sheet.in.h:96
+#: ../sheets/cisconetwork.sheet.in.h:94
 msgid "uBR910 Cable DSU"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:97
+#: ../sheets/cisconetwork.sheet.in.h:95
 #, fuzzy
 msgid "Storage Solution Engine"
 msgstr "Router zasobów"
 
-#: ../sheets/cisconetwork.sheet.in.h:98
+#: ../sheets/cisconetwork.sheet.in.h:96
 #, fuzzy
 msgid "Content Engine (Cache Director)"
 msgstr "Mechanizm zawartości (zarządca pamięci podręcznej)"
 
-#: ../sheets/cisconetwork.sheet.in.h:99
+#: ../sheets/cisconetwork.sheet.in.h:97
 #, fuzzy
 msgid "CDM Content Distribution Manager"
 msgstr "Menedżer dystrybucji zawartości CDM"
 
-#: ../sheets/cisconetwork.sheet.in.h:100
+#: ../sheets/cisconetwork.sheet.in.h:98
 #, fuzzy
 msgid "Content Transformation Engine (CTE)"
 msgstr "Mechanizm przekształcania zawartości (CTE)"
 
-#: ../sheets/cisconetwork.sheet.in.h:101
+#: ../sheets/cisconetwork.sheet.in.h:99
 msgid "ME 1100"
 msgstr "ME 1100"
 
-#: ../sheets/cisconetwork.sheet.in.h:102
+#: ../sheets/cisconetwork.sheet.in.h:100
 #, fuzzy
 msgid "MAS Gateway"
 msgstr "Brama MAS"
 
-#: ../sheets/cisconetwork.sheet.in.h:103
+#: ../sheets/cisconetwork.sheet.in.h:101
 #, fuzzy
 msgid "File Engine"
 msgstr "Wypełniona elipsa"
 
-#: ../sheets/cisconetwork.sheet.in.h:104
+#: ../sheets/cisconetwork.sheet.in.h:102
 #, fuzzy
 msgid "Service Control"
 msgstr "Kontrola symetryczna"
 
 #: ../sheets/ciscotelephony.sheet.in.h:1
 #, fuzzy
-msgid "Cisco — Telephony"
+msgid "Cisco - Telephony"
 msgstr "Cisco - sieć komputerowa"
 
 #: ../sheets/ciscotelephony.sheet.in.h:2
@@ -10627,83 +10496,67 @@ msgid "Pieces of a jigsaw"
 msgstr "Elementy puzzli"
 
 #: ../sheets/jigsaw.sheet.in.h:3
-#, fuzzy
-msgid "Jigsaw — part_oioi"
+msgid "Jigsaw - part_oioi"
 msgstr "Puzzle - część_oioi"
 
 #: ../sheets/jigsaw.sheet.in.h:4
-#, fuzzy
-msgid "Jigsaw — part_ioio"
+msgid "Jigsaw - part_ioio"
 msgstr "Puzzle - część_ioio"
 
 #: ../sheets/jigsaw.sheet.in.h:5
-#, fuzzy
-msgid "Jigsaw — part_iiii"
+msgid "Jigsaw - part_iiii"
 msgstr "Puzzle - część_iiii"
 
 #: ../sheets/jigsaw.sheet.in.h:6
-#, fuzzy
-msgid "Jigsaw — part_oooo"
+msgid "Jigsaw - part_oooo"
 msgstr "Puzzle - część_oooo"
 
 #: ../sheets/jigsaw.sheet.in.h:7
-#, fuzzy
-msgid "Jigsaw — part_oooi"
+msgid "Jigsaw - part_oooi"
 msgstr "Puzzle - część_oooi"
 
 #: ../sheets/jigsaw.sheet.in.h:8
-#, fuzzy
-msgid "Jigsaw — part_iooo"
+msgid "Jigsaw - part_iooo"
 msgstr "Puzzle - część_iooo"
 
 #: ../sheets/jigsaw.sheet.in.h:9
-#, fuzzy
-msgid "Jigsaw — part_oioo"
+msgid "Jigsaw - part_oioo"
 msgstr "Puzzle - część_oioo"
 
 #: ../sheets/jigsaw.sheet.in.h:10
-#, fuzzy
-msgid "Jigsaw — part_ooio"
+msgid "Jigsaw - part_ooio"
 msgstr "Puzzle - część_ooio"
 
 #: ../sheets/jigsaw.sheet.in.h:11
-#, fuzzy
-msgid "Jigsaw — part_iioo"
+msgid "Jigsaw - part_iioo"
 msgstr "Puzzle - część_iioo"
 
 #: ../sheets/jigsaw.sheet.in.h:12
-#, fuzzy
-msgid "Jigsaw — part_oiio"
+msgid "Jigsaw - part_oiio"
 msgstr "Puzzle - część_oiio"
 
 #: ../sheets/jigsaw.sheet.in.h:13
-#, fuzzy
-msgid "Jigsaw — part_ooii"
+msgid "Jigsaw - part_ooii"
 msgstr "Puzzle - część_ooii"
 
 #: ../sheets/jigsaw.sheet.in.h:14
-#, fuzzy
-msgid "Jigsaw — part_iooi"
+msgid "Jigsaw - part_iooi"
 msgstr "Puzzle - część_iooi"
 
 #: ../sheets/jigsaw.sheet.in.h:15
-#, fuzzy
-msgid "Jigsaw — part_oiii"
+msgid "Jigsaw - part_oiii"
 msgstr "Puzzle - część_oiii"
 
 #: ../sheets/jigsaw.sheet.in.h:16
-#, fuzzy
-msgid "Jigsaw — part_ioii"
+msgid "Jigsaw - part_ioii"
 msgstr "Puzzle - część_ioii"
 
 #: ../sheets/jigsaw.sheet.in.h:17
-#, fuzzy
-msgid "Jigsaw — part_iioi"
+msgid "Jigsaw - part_iioi"
 msgstr "Puzzle - część_iioi"
 
 #: ../sheets/jigsaw.sheet.in.h:18
-#, fuzzy
-msgid "Jigsaw — part_iiio"
+msgid "Jigsaw - part_iiio"
 msgstr "Puzzle - część_iioo"
 
 #: ../sheets/network.sheet.in.h:2