Commit: 5071577dca3b766e93dd001106b2d6d37e5da6d4 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: 5071577dca3b766e93dd001106b2d6d37e5da6d4 (tree)
• Time: 2017-06-11 03:41:22
• Author: Kristjan SCHMIDT <kristjan.schmidt@goog...>
• Commiter: Kristjan SCHMIDT

Log Message

Updated Esperanto translation

Change Summary

• modified: po/eo.po

Incremental Difference

--- a/po/eo.po
+++ b/po/eo.po
@@ -1,248 +1,271 @@
 # Esperanto translation for dia.
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the dia package.
-# Tiffany Antopolski <[e-mail]>, 2011.
-# Kristjan SCHMIDT <[e-mail]>, 2011.
-#
+# Tiffany ANTOPOLSKI <[e-mail]>, 2011.
+# Kristjan SCHMIDT <[e-mail]>, 2011, 2017.
+#: ../objects/UML/class.c:198
 msgid ""
 msgstr ""
 "Project-Id-Version: dia master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=dia&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-28 19:08+0000\n"
-"PO-Revision-Date: 2011-10-02 09:00+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=dia&ke"
+"ywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-03-05 10:35+0000\n"
+"PO-Revision-Date: 2017-06-10 20:21+0200\n"
 "Last-Translator: Kristjan SCHMIDT <[e-mail]>\n"
-"Language-Team: Esperanto\n"
+"Language-Team: Esperanto <[e-mail]>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Virtaal 0.7.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\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"
 msgstr ""
 
-#: ../app/app_procs.c:337
+#: ../app/app_procs.c:339
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr ""
 
-#: ../app/app_procs.c:346
+#: ../app/app_procs.c:348
 #, c-format
 msgid "%s error: input and output filenames are identical: %s"
 msgstr ""
 
-#: ../app/app_procs.c:354
+#. Translators: Menu item Verb/Channel/Import
+#. Translators: Menu item Verb/Channel/Import/Import
+#: ../app/app_procs.c:354 ../objects/FS/function.c:675
+#: ../objects/FS/function.c:677
+msgid "Import"
+msgstr "Importi"
+
+#: ../app/app_procs.c:357
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr ""
 
 #. if (!quiet)
-#: ../app/app_procs.c:382
+#: ../app/app_procs.c:385
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:553
+#: ../app/app_procs.c:557
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr ""
 
-#: ../app/app_procs.c:623
+#: ../app/app_procs.c:627
 #, c-format
 msgid "Input directory '%s' must exist!\n"
 msgstr ""
 
-#: ../app/app_procs.c:640
+#: ../app/app_procs.c:644
 #, c-format
 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
-#, c-format
-msgid "Select the filter/format out of: %s"
-msgstr ""
-
 #. &export_file_name
-#: ../app/app_procs.c:708
+#: ../app/app_procs.c:697
 msgid "Export loaded file and exit"
 msgstr ""
 
-#: ../app/app_procs.c:708
+#: ../app/app_procs.c:697
 msgid "OUTPUT"
 msgstr "ELIGO"
 
 #. &export_file_format
-#. &export_format_string
-#: ../app/app_procs.c:710
+#: ../app/app_procs.c:699
+msgid "Select the export filter/format"
+msgstr ""
+
+#: ../app/app_procs.c:699
 msgid "TYPE"
 msgstr "TIPO"
 
-#: ../app/app_procs.c:712
+#: ../app/app_procs.c:701
+msgid "List export filters/formats and exit"
+msgstr ""
+
+#: ../app/app_procs.c:703
 msgid "Export graphics size"
 msgstr ""
 
-#: ../app/app_procs.c:712
+#: ../app/app_procs.c:703
 msgid "WxH"
 msgstr ""
 
-#: ../app/app_procs.c:714
+#: ../app/app_procs.c:705
 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:706
 msgid "LAYER,LAYER,..."
 msgstr "TAVOLO,TAVOLO,..."
 
-#: ../app/app_procs.c:717
+#: ../app/app_procs.c:708
 msgid "Don't show the splash screen"
 msgstr "Ne montri la salutŝildon"
 
-#: ../app/app_procs.c:719
+#: ../app/app_procs.c:710
 msgid "Don't create an empty diagram"
 msgstr ""
 
-#: ../app/app_procs.c:721
-msgid "Start integrated user interface (diagrams in tabs)"
+#: ../app/app_procs.c:712
+msgid "Start classic user interface (no diagrams in tabs)"
 msgstr ""
 
-#: ../app/app_procs.c:723
+#: ../app/app_procs.c:714
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr ""
 
-#: ../app/app_procs.c:725
+#: ../app/app_procs.c:716
 msgid "Directory containing input files"
 msgstr ""
 
-#: ../app/app_procs.c:725 ../app/app_procs.c:727
+#: ../app/app_procs.c:716 ../app/app_procs.c:718
 msgid "DIRECTORY"
 msgstr "DOSIERUJO"
 
-#: ../app/app_procs.c:727
+#: ../app/app_procs.c:718
 msgid "Directory containing output files"
 msgstr ""
 
-#: ../app/app_procs.c:729
+#: ../app/app_procs.c:720
 msgid "Display credits list and exit"
 msgstr "Montri liston da kreditoj kaj eliri"
 
-#: ../app/app_procs.c:731
+#: ../app/app_procs.c:722
 msgid "Generate verbose output"
 msgstr ""
 
-#: ../app/app_procs.c:733
+#: ../app/app_procs.c:724
 msgid "Display version and exit"
 msgstr "Montri version kaj eliri"
 
-#: ../app/app_procs.c:760
+#: ../app/app_procs.c:750
 msgid "[FILE...]"
 msgstr "[DOSIERO...]"
 
-#: ../app/app_procs.c:774
+#: ../app/app_procs.c:764
 #, c-format
 msgid "Invalid option?"
 msgstr "Ĉu nevalida opcio?"
 
-#: ../app/app_procs.c:797
+#: ../app/app_procs.c:787
 #, c-format
 msgid "Filename conversion failed: %s\n"
 msgstr ""
 
-#: ../app/app_procs.c:810
+#: ../app/app_procs.c:800
 #, c-format
 msgid "Missing input: %s\n"
 msgstr "Mankas enigo: %s\n"
 
-#: ../app/app_procs.c:835
+#: ../app/app_procs.c:825
 msgid "Can't connect to session manager!\n"
 msgstr ""
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:877
+#: ../app/app_procs.c:865
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr ""
 
-#: ../app/app_procs.c:879
+#: ../app/app_procs.c:867
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia-versio %s\n"
 
-#: ../app/app_procs.c:921
+#: ../app/app_procs.c:913
+#, fuzzy
+#| msgid "Object defaults"
+msgid "Object Defaults"
+msgstr "Defaŭltoj de objekto"
+
+#: ../app/app_procs.c:920
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
 msgstr ""
 
-#: ../app/app_procs.c:923
+#: ../app/app_procs.c:922
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
 "exiting...\n"
 msgstr ""
 
-#: ../app/app_procs.c:987
+#: ../app/app_procs.c:980
 msgid "Diagram1.dia"
 msgstr "Skemo1.dia"
 
-#: ../app/app_procs.c:1022
+#: ../app/app_procs.c:1015
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you caused this message to appear.\n"
 msgstr ""
 
-#: ../app/app_procs.c:1037
+#: ../app/app_procs.c:1030
 msgid "Exiting Dia"
 msgstr ""
 
+#: ../app/app_procs.c:1057 ../app/display.c:1239 ../app/exit_dialog.c:115
+#: ../app/filedlg.c:582
+msgid "Save"
+msgstr "Konservi"
+
 #. no standard buttons
-#: ../app/app_procs.c:1101
+#: ../app/app_procs.c:1099
 msgid "Quitting without saving modified diagrams"
 msgstr ""
 
-#: ../app/app_procs.c:1103
+#: ../app/app_procs.c:1101
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
 msgstr ""
 
-#: ../app/app_procs.c:1107
+#: ../app/app_procs.c:1105 ../app/menus.c:94
 msgid "Quit Dia"
 msgstr "Ĉesi Dian"
 
-#: ../app/app_procs.c:1180 ../app/app_procs.c:1187
+#: ../app/app_procs.c:1135
+msgid "Exit"
+msgstr ""
+
+#: ../app/app_procs.c:1181 ../app/app_procs.c:1188
 msgid "Could not create per-user Dia configuration directory"
 msgstr ""
 
-#: ../app/app_procs.c:1190
+#: ../app/app_procs.c:1191
 msgid ""
 "Could not create per-user Dia configuration directory. Please make sure that "
 "the environment variable HOME points to an existing directory."
 msgstr ""
 
-#: ../app/app_procs.c:1213
+#: ../app/app_procs.c:1214
 msgid "Objects and filters internal to Dia"
 msgstr ""
 
@@ -282,50 +305,78 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../app/autosave.c:90
-msgid "Recovering autosaved diagrams"
+#: ../app/app_procs.c:1321
+msgid "Available Export Filters (for --filter)"
 msgstr ""
 
-#: ../app/autosave.c:98
-msgid ""
-"Autosaved files exist.\n"
-"Please select those you wish to recover."
-msgstr ""
+#. Translators: be brief or mess up the table for --list-filters
+#: ../app/app_procs.c:1324
+#, fuzzy
+#| msgid "By extension"
+msgid "Extension"
+msgstr "Laŭ finaĵo"
+
+#: ../app/app_procs.c:1325 ../lib/prop_dict.c:44
+msgid "Identifier"
+msgstr "Identigilo"
+
+#: ../app/app_procs.c:1326 ../app/plugin-manager.c:276
+msgid "Description"
+msgstr "Priskribo"
 
-#: ../app/color_area.c:327 ../app/color_area.c:374
+#: ../app/color_area.c:333 ../app/color_area.c:343
 msgid "Select foreground color"
 msgstr "Elekti koloron de malfono"
 
-#: ../app/color_area.c:328 ../app/color_area.c:375
+#: ../app/color_area.c:334 ../app/color_area.c:344
 msgid "Select background color"
 msgstr "Elekti koloron de fono"
 
-#: ../app/commands.c:130
+#: ../app/commands.c:131
 msgid "No print plugin found!"
 msgstr ""
 
-#: ../app/commands.c:149
+#: ../app/commands.c:150
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Skemo%d.dia"
 
-#: ../app/commands.c:248
+#: ../app/commands.c:249
 msgid "No image from Clipboard to paste."
 msgstr ""
 
-#: ../app/commands.c:298
+#: ../app/commands.c:300
 msgid "No selected object can take an image."
 msgstr ""
 
-#: ../app/commands.c:543
+#: ../app/commands.c:329
+msgid "Clipboard Paste"
+msgstr ""
+
+#. might become more right some day ;)
+#: ../app/commands.c:337
+#, c-format
+msgid "Failed to import '%s' as SVG."
+msgstr ""
+
+#: ../app/commands.c:353
+#, c-format
+msgid "Paste failed: %s"
+msgstr ""
+
+#: ../app/commands.c:434
+msgid "Clipboard Copy"
+msgstr ""
+
+#: ../app/commands.c:636
 msgid "No existing object to paste.\n"
 msgstr ""
 
-#: ../app/commands.c:851 ../app/commands.c:889
+#: ../app/commands.c:946 ../app/commands.c:984
 msgid "Could not find help directory"
 msgstr "Ne povis trovi helpan dosierujon"
 
-#: ../app/commands.c:858
+#: ../app/commands.c:953
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -334,13 +385,11 @@ msgstr ""
 "Ne povis malfermi helpan dosierujon:\n"
 "%s"
 
-#: ../app/commands.c:927
+#: ../app/commands.c:1021
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
-msgstr ""
-"Tiffany ANTOPOLSKI\n"
-"Kristjan SCHMIDT"
+msgstr "Tiffany ANTOPOLSKI, Kristjan SCHMIDT"
 
-#: ../app/commands.c:929
+#: ../app/commands.c:1023
 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"
@@ -357,51 +406,58 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 "Dia estas libera programaro; vi povas redistribui kaj/aŭ modifi ĝin sub la "
-"kondiĉoj de la Ĝenerala Publika Permesilo de GNU eldonite de la 'Free "
+"kondiĉoj de la ĝenerala Publika Permesilo de GNU eldonite de la 'Free "
 "Software Foundation'; aŭ en la 2a versio de la permesilo aŭ (laŭ via volo) "
 "en iu sekva versio.\n"
 "\n"
-"Dia estas distribuite kun la espero ke ĝi estos utila, sed SEN IA AJN "
+"Dia estas distribuite kun la espero ke ĝi estos utila, sed SEN IA AJN "
 "GARANTIO; eĉ sen la implica garantio de NEGOCEBLO aŭ ADAPTADO AL IU APARTA "
-"CELO. Vidu la Ĝeneralan Publikan Permesilon de GNU por pli da detaloj.\n"
+"CELO. Vidu la ĝeneralan Publikan Permesilon de GNU por pli da detaloj.\n"
 "\n"
-"Vi devintus ricevi kopion de la Ĝenerala Publika Permesilo de GNU kune kun "
+"Vi devintus ricevi kopion de la ĝenerala Publika Permesilo de GNU kune kun "
 "Dia; se ne, skribu al Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301 Usono.\n"
 
-#: ../app/commands.c:956
+#: ../app/commands.c:1050
 msgid "A program for drawing structured diagrams."
 msgstr ""
 
-#: ../app/confirm.c:65
+#: ../app/confirm.c:71
 #, c-format
-msgid "You are about to print a diagram with %d pages."
-msgstr ""
+msgid "You are about to print a diagram with %d page."
+msgid_plural "You are about to print a diagram with %d pages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../app/confirm.c:67
+#: ../app/confirm.c:75
 #, c-format
-msgid "You are about to export a diagram with %d pages."
-msgstr ""
+msgid "You are about to export a diagram with %d page."
+msgid_plural "You are about to export a diagram with %d pages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../app/confirm.c:69
+#: ../app/confirm.c:79
 #, c-format
 msgid ""
+"You are about to export a diagram which may require %s of memory.(%d page)."
+msgid_plural ""
 "You are about to export a diagram which may require %s of memory.(%d pages)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../app/confirm.c:77
+#: ../app/confirm.c:88
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
-"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-"the intended bounds."
+"Alternatively use 'Best Fit' to move objects/handles into the intended "
+"bounds."
 msgstr ""
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:92
 msgid "Confirm Diagram Size"
 msgstr ""
 
-#: ../app/create_object.c:73
+#: ../app/create_object.c:71
 #, c-format
 msgid "'%s' creation failed"
 msgstr "kreo de '%s' malsukcesis"
@@ -418,146 +474,91 @@ msgstr "Ĉi tiu objekto ne havas defaŭltojn"
 msgid "Defaults: "
 msgstr "Defaŭltoj: "
 
-#: ../app/dia-props.c:86
-msgid "Diagram Properties"
-msgstr "Ecoj de skemo"
-
-#: ../app/dia-props.c:120
-msgid "Dynamic grid"
-msgstr ""
-
-#: ../app/dia-props.c:128
-msgid "x"
-msgstr "x"
-
-#: ../app/dia-props.c:132
-msgid "y"
-msgstr "y"
-
-#: ../app/dia-props.c:137
-msgid "Spacing"
-msgstr ""
-
-#: ../app/dia-props.c:157
-msgid "Visible spacing"
-msgstr ""
-
-#. Hexes!
-#: ../app/dia-props.c:178 ../app/preferences.c:243
-msgid "Hex grid"
-msgstr ""
-
-#: ../app/dia-props.c:186
-msgid "Hex grid size"
-msgstr ""
-
-#: ../app/dia-props.c:199
-msgid "Grid"
-msgstr "Krado"
-
-#: ../app/dia-props.c:210 ../lib/diagramdata.c:117
-msgid "Background"
-msgstr "Fono"
-
-#: ../app/dia-props.c:221 ../app/preferences.c:122
-msgid "Grid Lines"
-msgstr "Kradlinioj"
-
-#: ../app/dia-props.c:232
-msgid "Page Breaks"
-msgstr ""
-
-#: ../app/dia-props.c:243
-msgid "Colors"
-msgstr "Koloroj"
-
-#. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:264
-#, c-format
-msgid "Diagram Properties: %s"
-msgstr "Ecoj de skemo: %s"
-
-#: ../app/diagram.c:234
+#: ../app/diagram.c:237
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr ""
 
-#: ../app/diagram.c:237 ../lib/message.c:91 ../lib/message.c:297
+#: ../app/diagram.c:240 ../lib/message.c:91 ../lib/message.c:304
 msgid "Error"
 msgstr "Eraro"
 
-#: ../app/diagram.c:1209
+#. ToDo: move context further up in the callstack and to sth useful with it's content
+#: ../app/diagram.c:272
+msgid "Load Into"
+msgstr ""
+
+#: ../app/diagram.c:1217
 msgid "Trying to group with no selected objects."
 msgstr ""
 
-#: ../app/diagram_tree_view.c:164
+#: ../app/diagram_tree_view.c:165
 msgid "Diagram"
 msgstr "Diagramo"
 
-#: ../app/diagram_tree_view.c:171
-#: ../plug-ins/drs/dia-render-script-import.c:233
+#: ../app/diagram_tree_view.c:172
+#: ../plug-ins/drs/dia-render-script-import.c:464
 msgid "Layer"
 msgstr "Tavolo"
 
-#: ../app/diagram_tree_view.c:177
+#: ../app/diagram_tree_view.c:178
 #, c-format
 msgid "%d Layer"
 msgid_plural "%d Layers"
 msgstr[0] "%d Tavolo"
 msgstr[1] "%d Tavoloj"
 
-#: ../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
+#: ../app/diagram_tree_view.c:182 ../app/diagram_tree_view.c:520
+#: ../objects/Database/table.c:149 ../objects/Istar/actor.c:142
+#: ../objects/Istar/actor.c:143 ../objects/Istar/other.c:147
+#: ../objects/Istar/other.c:148 ../objects/KAOS/other.c:150
+#: ../objects/KAOS/other.c:151 ../objects/UML/association.c:242
 #: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
 #: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
 msgid "Type"
 msgstr "Tipo"
 
-#: ../app/diagram_tree_view.c:184
+#: ../app/diagram_tree_view.c:185
 msgid "object|Position"
 msgstr ""
 
-#: ../app/diagram_tree_view.c:187
+#: ../app/diagram_tree_view.c:188
 msgid "Children"
 msgstr "Idoj"
 
-#: ../app/diagram_tree_view.c:191
+#: ../app/diagram_tree_view.c:192
 #, c-format
 msgid "%d Object"
 msgid_plural "%d Objects"
 msgstr[0] "%d Objekto"
 msgstr[1] "%d Objektoj"
 
-#: ../app/diagram_tree_view.c:448
+#: ../app/diagram_tree_view.c:449
 msgid "Select"
 msgstr "Elekti"
 
 #. 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
+#: ../app/diagram_tree_view.c:450 ../objects/FS/function.c:801
+#: ../objects/FS/function.c:1043
 msgid "Locate"
 msgstr "Loki"
 
-#: ../app/diagram_tree_view.c:450
+#: ../app/diagram_tree_view.c:451
 msgid "Properties"
 msgstr "Ecoj"
 
-#. *** 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
+#: ../app/diagram_tree_view.c:503 ../app/exit_dialog.c:125
+#: ../app/plugin-manager.c:270 ../objects/Database/table.c:147
+#: ../objects/Database/table.c:190 ../objects/Misc/n_gon.c:135
+#: ../objects/UML/association.c:236 ../objects/UML/class.c:145
+#: ../objects/UML/large_package.c:136 ../objects/UML/umlattribute.c:37
 #: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
 #: ../objects/UML/umlparameter.c:43
 msgid "Name"
 msgstr "Nomo"
 
-#: ../app/diagram_tree_view.c:565
+#: ../app/diagram_tree_view.c:566
 msgid "Diagram Tree"
 msgstr "Skemo-arbo"
 
@@ -609,34 +610,121 @@ msgstr ""
 msgid "by"
 msgstr "de"
 
-#: ../app/diapagelayout.c:728
+#: ../app/diapagelayout.c:732
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr ""
 
-#: ../app/diapagelayout.c:832 ../app/pagesetup.c:77
+#: ../app/diapagelayout.c:836 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "Paĝa agordado"
 
-#: ../app/disp_callbacks.c:92 ../app/properties-dialog.c:156
+#: ../app/dia-props.c:86
+msgid "Diagram Properties"
+msgstr "Ecoj de skemo"
+
+#: ../app/dia-props.c:120
+msgid "Dynamic grid"
+msgstr ""
+
+#: ../app/dia-props.c:128
+msgid "x"
+msgstr "x"
+
+#: ../app/dia-props.c:132
+msgid "y"
+msgstr "y"
+
+#: ../app/dia-props.c:137
+msgid "Spacing"
+msgstr ""
+
+#: ../app/dia-props.c:157
+msgid "Visible spacing"
+msgstr ""
+
+#. Hexes!
+#: ../app/dia-props.c:178 ../app/preferences.c:243
+msgid "Hex grid"
+msgstr ""
+
+#: ../app/dia-props.c:186
+msgid "Hex grid size"
+msgstr ""
+
+#: ../app/dia-props.c:199
+msgid "Grid"
+msgstr "Krado"
+
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
+msgid "Background"
+msgstr "Fono"
+
+#: ../app/dia-props.c:221 ../app/preferences.c:122
+msgid "Grid Lines"
+msgstr "Kradlinioj"
+
+#: ../app/dia-props.c:232
+msgid "Page Breaks"
+msgstr ""
+
+#: ../app/dia-props.c:243
+msgid "Colors"
+msgstr "Koloroj"
+
+#. Can we be sure that the filename is the 'proper title'?
+#: ../app/dia-props.c:264
+#, c-format
+msgid "Diagram Properties: %s"
+msgstr "Ecoj de skemo: %s"
+
+#: ../app/disp_callbacks.c:93 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 msgstr ""
 
-#: ../app/disp_callbacks.c:127
+#: ../app/disp_callbacks.c:128
 msgid "Properties…"
 msgstr "Atributoj…"
 
-#: ../app/disp_callbacks.c:166
+#: ../app/disp_callbacks.c:167
 msgid "Follow link…"
 msgstr ""
 
-#: ../app/disp_callbacks.c:288
+#: ../app/disp_callbacks.c:215 ../objects/standard/textobj.c:583
+msgid "Convert to Path"
+msgstr ""
+
+#: ../app/disp_callbacks.c:262 ../app/menus.c:272
+msgid "Union"
+msgstr "Unio"
+
+#: ../app/disp_callbacks.c:263
+#, fuzzy
+#| msgid "Reference"
+msgid "Difference"
+msgstr "Referenco"
+
+#: ../app/disp_callbacks.c:264 ../app/menus.c:273
+msgid "Intersection"
+msgstr "Intersekco"
+
+#: ../app/disp_callbacks.c:265
+msgid "Exclusion"
+msgstr ""
+
+#: ../app/disp_callbacks.c:403
 msgid "Selection"
 msgstr "Elekto"
 
-#: ../app/disp_callbacks.c:1114
+#: ../app/disp_callbacks.c:418
+#, fuzzy
+#| msgid "_Input Methods"
+msgid "Input _Methods"
+msgstr "Metodoj de en_igo"
+
+#: ../app/disp_callbacks.c:1194
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -658,33 +746,33 @@ msgid "Selected '%s'"
 msgstr "Elektita '%s'"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1149
+#: ../app/display.c:1127
 msgid "No antialiased renderer found"
 msgstr ""
 
-#: ../app/display.c:1297
+#: ../app/display.c:1285
 msgid "<unnamed>"
 msgstr ""
 
 #. no standard buttons
-#: ../app/display.c:1303
+#: ../app/display.c:1291
 msgid "Closing diagram without saving"
 msgstr ""
 
-#: ../app/display.c:1305
+#: ../app/display.c:1293
 #, c-format
 msgid ""
 "The diagram '%s'\n"
 "has not been saved. Save changes now?"
 msgstr ""
 
-#: ../app/display.c:1307
+#: ../app/display.c:1295
 msgid "Close Diagram"
 msgstr ""
 
-#: ../app/display.c:1312
+#: ../app/display.c:1300
 msgid "_Discard Changes"
-msgstr "_Ignori ŝanĝojn"
+msgstr "_Ignori ŝanĝojn"
 
 #: ../app/exit_dialog.c:77
 msgid "Do Not Exit"
@@ -702,65 +790,61 @@ msgstr "Konservi elektitan"
 msgid "The following are not saved:"
 msgstr ""
 
-#: ../app/exit_dialog.c:113
-msgid "Save"
-msgstr "Konservi"
-
-#: ../app/exit_dialog.c:129
+#: ../app/exit_dialog.c:131
 msgid "Path"
 msgstr "Vojo"
 
-#: ../app/exit_dialog.c:142
+#: ../app/exit_dialog.c:144
 msgid "Select All"
 msgstr "Elekti ĉion"
 
-#: ../app/exit_dialog.c:150
+#: ../app/exit_dialog.c:152
 msgid "Select None"
 msgstr "Elekti nenion"
 
-#: ../app/exit_dialog.c:236
+#: ../app/exit_dialog.c:244
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr ""
 
-#: ../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:825 ../lib/widgets.c:402
 msgid "Supported Formats"
 msgstr ""
 
-#: ../app/filedlg.c:196 ../app/filedlg.c:198 ../app/filedlg.c:661
-#: ../app/filedlg.c:663
+#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:668
+#: ../app/filedlg.c:670
 msgid "By extension"
 msgstr "Laŭ finaĵo"
 
-#: ../app/filedlg.c:292
+#: ../app/filedlg.c:293
 msgid "Open Diagram"
 msgstr ""
 
-#: ../app/filedlg.c:325
+#: ../app/filedlg.c:326
 msgid "Open Options"
 msgstr "Malfermi opciojn"
 
-#: ../app/filedlg.c:333 ../app/filedlg.c:795
+#: ../app/filedlg.c:334 ../app/filedlg.c:807
 msgid "Determine file type:"
 msgstr ""
 
-#: ../app/filedlg.c:353 ../app/filedlg.c:808 ../lib/widgets.c:414
+#: ../app/filedlg.c:354 ../app/filedlg.c:820 ../lib/widgets.c:410
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../app/filedlg.c:392 ../plug-ins/postscript/paginate_psprint.c:416
+#: ../app/filedlg.c:393 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
 "Some things will break."
 msgstr ""
 
-#: ../app/filedlg.c:402 ../app/filedlg.c:715
+#: ../app/filedlg.c:403 ../app/filedlg.c:722
 #: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "Dosiero jam ekzistas"
 
-#: ../app/filedlg.c:404 ../app/filedlg.c:717
+#: ../app/filedlg.c:405 ../app/filedlg.c:724
 #: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
@@ -768,334 +852,239 @@ msgid ""
 "Do you want to overwrite it?"
 msgstr ""
 
-#: ../app/filedlg.c:488
+#: ../app/filedlg.c:425
+#, fuzzy
+#| msgid "Save"
+msgid "Save as"
+msgstr "Konservi"
+
+#: ../app/filedlg.c:493
 msgid "Save Diagram"
 msgstr ""
 
 #. 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:507
 msgid "Compress diagram files"
 msgstr ""
 
-#: ../app/filedlg.c:511
+#: ../app/filedlg.c:516
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
 msgstr ""
 
-#: ../app/filedlg.c:741
+#. Favored Filter
+#. Translators: Menu item Verb/Channel/Export
+#. Translators: Menu item Verb/Channel/Export/Export
+#: ../app/filedlg.c:744 ../app/preferences.c:220 ../objects/FS/function.c:689
+#: ../objects/FS/function.c:691 ../plug-ins/libart/export_png.c:329
+msgid "Export"
+msgstr "Elporti"
+
+#: ../app/filedlg.c:753
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 msgstr ""
 
-#: ../app/filedlg.c:768
+#: ../app/filedlg.c:780
 msgid "Export Diagram"
 msgstr ""
 
-#: ../app/filedlg.c:787
+#: ../app/filedlg.c:799
 msgid "Export Options"
 msgstr ""
 
-#: ../app/find-and-replace.c:454
+#: ../app/find-and-replace.c:480
 msgid "_Search for:"
 msgstr "_Serĉi por:"
 
-#: ../app/find-and-replace.c:467
+#: ../app/find-and-replace.c:493
 msgid "Replace _with:"
 msgstr "Anstataŭigi _per:"
 
-#: ../app/find-and-replace.c:477
+#: ../app/find-and-replace.c:503
 msgid "_Match case"
 msgstr "Laŭ _uskleco"
 
-#: ../app/find-and-replace.c:481
+#: ../app/find-and-replace.c:507
 msgid "Match _entire word only"
 msgstr "Kongrui nur _plenan vorton"
 
-#: ../app/find-and-replace.c:485
+#: ../app/find-and-replace.c:511
 msgid "Match _all properties (not just object name)"
 msgstr ""
 
-#: ../app/find-and-replace.c:508
+#: ../app/find-and-replace.c:537
 msgid "Find"
 msgstr "Trovi"
 
-#: ../app/find-and-replace.c:538 ../app/menus.c:259
+#: ../app/find-and-replace.c:567 ../app/menus.c:271
 msgid "Replace"
 msgstr "Anstataŭigi"
 
-#: ../app/find-and-replace.c:541
+#: ../app/find-and-replace.c:570
 msgid "Replace _All"
 msgstr "_Anstataŭigi ĉiujn"
 
 #. 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:546
+#: ../app/find-and-replace.c:575
 msgid "_Replace"
 msgstr "A_nstataŭigi"
 
-#: ../app/interface.c:157
-msgid ""
-"Modify object(s)\n"
-"Use <Space> to toggle between this and other tools"
+#: ../app/interface.c:521
+msgid "Pops up the Navigation window."
 msgstr ""
 
-#: ../app/interface.c:163
-msgid ""
-"Text edit(s)\n"
-"Use <Esc> to leave this tool"
+#: ../app/interface.c:738
+msgid "Diagram menu."
 msgstr ""
 
-#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:169 ../app/menus.c:225 ../objects/FS/function.c:991
-msgid "Magnify"
-msgstr ""
+#: ../app/interface.c:777
+msgid "Zoom"
+msgstr "Zomi"
 
-#: ../app/interface.c:175
-msgid "Scroll around the diagram"
+#: ../app/interface.c:792
+msgid "Toggles snap-to-grid for this window."
 msgstr ""
 
-#. 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:144 ../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
-#: ../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/network/basestation.c:135 ../objects/network/radiocell.c:127
-msgid "Text"
-msgstr "Teksto"
-
-#: ../app/interface.c:187 ../app/menus.c:229
-msgid "Box"
-msgstr "Skatolo"
-
-#: ../app/interface.c:193 ../app/menus.c:230
-msgid "Ellipse"
-msgstr "Elipso"
-
-#: ../app/interface.c:199 ../app/menus.c:231
-msgid "Polygon"
+#: ../app/interface.c:803
+msgid "Toggles object snapping for this window."
 msgstr ""
 
-#: ../app/interface.c:205 ../app/menus.c:232
-msgid "Beziergon"
+#: ../app/interface.c:989 ../app/interface.c:1106 ../dia.desktop.in.in.h:2
+msgid "Diagram Editor"
 msgstr ""
 
-#: ../app/interface.c:211 ../app/menus.c:234 ../objects/standard/line.c:232
-msgid "Line"
-msgstr "Linio"
+#: ../app/layer_dialog.c:166
+msgid "New Layer"
+msgstr "Nova tavolo"
 
-#: ../app/interface.c:217 ../app/menus.c:235
-msgid "Arc"
-msgstr "Arko"
+#: ../app/layer_dialog.c:167
+#, fuzzy
+#| msgid "Rename Layer…"
+msgid "Rename Layer"
+msgstr "Alinomi tavolon…"
 
-#: ../app/interface.c:223 ../app/menus.c:236
-msgid "Zigzagline"
-msgstr "Zigzag-linio"
+#: ../app/layer_dialog.c:168
+msgid "Raise Layer"
+msgstr ""
 
-#: ../app/interface.c:229 ../app/menus.c:237
-msgid "Polyline"
+#: ../app/layer_dialog.c:169
+msgid "Lower Layer"
 msgstr ""
 
-#: ../app/interface.c:235 ../app/menus.c:238
-msgid "Bezierline"
+#: ../app/layer_dialog.c:170
+msgid "Delete Layer"
 msgstr ""
 
-#: ../app/interface.c:241 ../app/menus.c:241
-msgid "Image"
-msgstr "Bildo"
+#: ../app/layer_dialog.c:307
+msgid "Layers:"
+msgstr "Tavoloj:"
 
-#: ../app/interface.c:248 ../app/menus.c:239
-msgid "Outline"
-msgstr "Konturo"
-
-#: ../app/interface.c:631 ../app/interface.c:864
-msgid "Pops up the Navigation window."
-msgstr ""
-
-#: ../app/interface.c:826
-msgid "Diagram menu."
-msgstr ""
-
-#: ../app/interface.c:926
-msgid "Zoom"
-msgstr "Zomi"
-
-#: ../app/interface.c:941
-msgid "Toggles snap-to-grid for this window."
-msgstr ""
-
-#: ../app/interface.c:952
-msgid "Toggles object snapping for this window."
-msgstr ""
-
-#: ../app/interface.c:1381
-#, c-format
-msgid "No sheet named %s"
-msgstr ""
-
-#: ../app/interface.c:1419
-msgid "Other sheets"
-msgstr ""
-
-#: ../app/interface.c:1479 ../sheets/Flowchart.sheet.in.h:10
-msgid "Flowchart"
-msgstr "Fluskemo"
-
-#: ../app/interface.c:1539
-msgid ""
-"Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double-click to change "
-"colors."
-msgstr ""
-
-#: ../app/interface.c:1553
-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."
-msgstr ""
-
-#: ../app/interface.c:1596
-msgid ""
-"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details…"
-msgstr ""
-
-#: ../app/interface.c:1601
-msgid ""
-"Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details…"
-msgstr ""
-
-#: ../app/interface.c:1617
-msgid ""
-"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details…"
-msgstr ""
-
-#: ../app/interface.c:1676 ../app/interface.c:1800 ../dia.desktop.in.in.h:3
-msgid "Diagram Editor"
-msgstr ""
-
-#: ../app/layer_dialog.c:165
-msgid "New Layer"
-msgstr "Nova tavolo"
-
-#: ../app/layer_dialog.c:166
-msgid "Raise Layer"
-msgstr ""
-
-#: ../app/layer_dialog.c:167
-msgid "Lower Layer"
-msgstr ""
-
-#: ../app/layer_dialog.c:168
-msgid "Delete Layer"
-msgstr ""
-
-#: ../app/layer_dialog.c:311
-msgid "Layers:"
-msgstr "Tavoloj:"
-
-#: ../app/layer_dialog.c:390
+#: ../app/layer_dialog.c:386
 msgid "Layers"
 msgstr "Tavoloj"
 
-#: ../app/layer_dialog.c:404
+#: ../app/layer_dialog.c:400
 msgid "Diagram:"
 msgstr "Diagramo:"
 
-#: ../app/layer_dialog.c:517 ../app/layer_dialog.c:1230
+#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1252
 #, c-format
 msgid "New layer %d"
 msgstr "Nova tavolo %d"
 
-#: ../app/layer_dialog.c:732
+#: ../app/layer_dialog.c:741
 msgid "none"
 msgstr "neniu"
 
-#: ../app/layer_dialog.c:1200
+#: ../app/layer_dialog.c:1222
 msgid "Edit Layer"
 msgstr "Redakti tavolon"
 
-#: ../app/layer_dialog.c:1200
+#: ../app/layer_dialog.c:1222
 msgid "Add Layer"
 msgstr "Aldoni tavolon"
 
-#: ../app/layer_dialog.c:1219
+#: ../app/layer_dialog.c:1241
 msgid "Layer name:"
 msgstr "Nomo de tavolo:"
 
-#: ../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:626 ../lib/properties.h:629
+#: ../objects/chronogram/chronoline.c:180 ../objects/chronogram/chronoref.c:159
 msgid "Line width"
 msgstr "Larĝo de linio"
 
-#: ../app/linewidth_area.c:260
+#: ../app/linewidth_area.c:258
 msgid "Line width:"
 msgstr "Larĝeco de linio:"
 
-#: ../app/load_save.c:263
+#: ../app/load_save.c:266
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
 msgstr ""
 
-#: ../app/load_save.c:267
+#: ../app/load_save.c:270
 #, c-format
 msgid ""
 "Error loading diagram.\n"
 "Connection handle %d does not exist on '%s'."
 msgstr ""
 
-#: ../app/load_save.c:285
+#: ../app/load_save.c:286
 #, c-format
 msgid ""
 "Error loading diagram.\n"
 "Connection point %d does not exist on '%s'."
 msgstr ""
 
-#: ../app/load_save.c:325
+#: ../app/load_save.c:326
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr ""
 
-#: ../app/load_save.c:375
-msgid "You must specify a file, not a directory.\n"
+#: ../app/load_save.c:393
+msgid "You must specify a file, not a directory."
 msgstr ""
 
-#: ../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:400 ../plug-ins/dxf/dxf-import.c:1289
+#: ../plug-ins/wpg/wpg-import.c:467 ../plug-ins/xfig/xfig-import.c:1291
+#: ../plug-ins/xslt/xslt.c:97
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr ""
 
-#: ../app/load_save.c:400 ../app/load_save.c:406
+#. this was talking about unknown file type but it could as well be broken XML
+#: ../app/load_save.c:418
+#, c-format
+msgid "Error loading diagram %s."
+msgstr ""
+
+#: ../app/load_save.c:427
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
 "Unknown file type."
 msgstr ""
 
-#: ../app/load_save.c:414
+#: ../app/load_save.c:435
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
 "Not a Dia file."
 msgstr ""
 
-#: ../app/load_save.c:672
+#: ../app/load_save.c:680
+msgid "Error reading connections"
+msgstr ""
+
+#: ../app/load_save.c:700
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1103,501 +1092,722 @@ msgid ""
 "A valid Dia file defines at least one layer."
 msgstr ""
 
-#: ../app/load_save.c:1015
+#: ../app/load_save.c:1001
+#, c-format
+msgid "Error saving connections to layer '%s'"
+msgstr ""
+
+#: ../app/load_save.c:1006
+#, c-format
+msgid "Connection saving is incomplete for layer '%s'"
+msgstr ""
+
+#: ../app/load_save.c:1059
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr ""
 
-#: ../app/load_save.c:1047
+#: ../app/load_save.c:1091
 #, 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
-#: ../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
+#: ../app/load_save.c:1114 ../plug-ins/cgm/cgm.c:1086
+#: ../plug-ins/dxf/dxf-export.c:516 ../plug-ins/metapost/render_metapost.c:1022
+#: ../plug-ins/pgf/render_pgf.c:1192 ../plug-ins/postscript/render_eps.c:123
+#: ../plug-ins/pstricks/render_pstricks.c:870 ../plug-ins/vdx/vdx-export.c:1706
+#: ../plug-ins/wmf/wmf.cpp:1347 ../plug-ins/wpg/wpg.c:1062
+#: ../plug-ins/xfig/xfig-export.c:1098
 #, c-format
-msgid "Can't open output file %s: %s\n"
+msgid "Can't open output file %s"
 msgstr ""
 
 #. 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:1125
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr ""
 
-#: ../app/load_save.c:1091
+#: ../app/load_save.c:1136
 #, c-format
-msgid "Can't rename %s to final output file %s: %s\n"
+msgid "Can't rename %s to final output file %s"
+msgstr ""
+
+#. no extra threads supported, stay in this one
+#: ../app/load_save.c:1252 ../app/load_save.c:1266 ../app/load_save.c:1274
+msgid "Auto save"
 msgstr ""
 
-#: ../app/load_save.c:1234 ../app/load_save.c:1239
+#: ../app/load_save.c:1298 ../app/load_save.c:1303
 msgid "Dia Diagram File"
 msgstr ""
 
-#: ../app/menus.c:62
+#: ../app/menus.c:64
 msgid "Fit"
 msgstr "Adapti"
 
-#: ../app/menus.c:79
+#: ../app/menus.c:91
 msgid "_File"
 msgstr "_Doserio"
 
-#: ../app/menus.c:80
+#: ../app/menus.c:92
 msgid "Create a new diagram"
 msgstr "Keri novan diagramon"
 
-#: ../app/menus.c:81
+#: ../app/menus.c:93
+msgid "_Open…"
+msgstr ""
+
+#: ../app/menus.c:93
 msgid "Open a diagram file"
 msgstr "Malfermi dosieron de diagramo"
 
-#: ../app/menus.c:83
+#: ../app/menus.c:95
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../app/menus.c:93
+#: ../app/menus.c:96
+msgid "Dia help"
+msgstr ""
+
+#: ../app/menus.c:97
+msgid "Dia version, authors, license"
+msgstr ""
+
+#: ../app/menus.c:103
 msgid "Sheets and Objects…"
 msgstr ""
 
-#: ../app/menus.c:95
+#: ../app/menus.c:103
+msgid "Manage sheets and their objects"
+msgstr ""
+
+#: ../app/menus.c:104
+#, fuzzy
+#| msgid "Preferences"
+msgid "Dia preferences"
+msgstr "Agordoj"
+
+#: ../app/menus.c:105
 msgid "Plugins…"
 msgstr "Kromprogrametoj…"
 
-#: ../app/menus.c:96
-msgid "_Diagram Tree…"
-msgstr "_Diagrama arbo…"
+#: ../app/menus.c:105
+#, fuzzy
+#| msgid "Python plug-in"
+msgid "Manage plug-ins"
+msgstr "Python kromprogrameto"
+
+#: ../app/menus.c:106
+#| msgid "Diagram Tree"
+msgid "_Diagram Tree"
+msgstr "_Diagrama arbo"
 
-#: ../app/menus.c:101
+#: ../app/menus.c:106
+msgid "Tree representation of diagrams"
+msgstr ""
+
+#: ../app/menus.c:111
 msgid "Show Toolbar"
 msgstr "Montri ilobreton"
 
-#: ../app/menus.c:102
+#: ../app/menus.c:111 ../app/menus.c:264
+#, fuzzy
+#| msgid "Show Toolbar"
+msgid "Show or hide the toolbar"
+msgstr "Montri ilobreton"
+
+#: ../app/menus.c:112
 msgid "Show Statusbar"
 msgstr "Montri statobreton"
 
-#: ../app/menus.c:103
+#: ../app/menus.c:112
+#, fuzzy
+#| msgid "Show Statusbar"
+msgid "Show or hide the statusbar"
+msgstr "Montri statobreton"
+
+#: ../app/menus.c:113
 msgid "Show Layers"
 msgstr "Montri tavolojn"
 
-#: ../app/menus.c:109
+#: ../app/menus.c:113
+msgid "Show or hide the layers toolwindow"
+msgstr ""
+
+#: ../app/menus.c:119
 msgid "Save the diagram"
 msgstr "Konservi la diagramon"
 
-#: ../app/menus.c:110
+#: ../app/menus.c:120
+msgid "Save _As…"
+msgstr ""
+
+#: ../app/menus.c:120
 msgid "Save the diagram with a new name"
 msgstr ""
 
-#: ../app/menus.c:111
+#: ../app/menus.c:121
 msgid "_Export…"
 msgstr "_Elporti…"
 
-#: ../app/menus.c:111
+#: ../app/menus.c:121
 msgid "Export the diagram"
 msgstr "Elporti la diagramon"
 
-#: ../app/menus.c:112
+#: ../app/menus.c:122
 msgid "_Diagram Properties"
 msgstr "Atributoj de _diagramo"
 
-#: ../app/menus.c:113
+#: ../app/menus.c:122
+msgid "Modify diagram properties (grid, background)"
+msgstr ""
+
+#: ../app/menus.c:123
 msgid "Page Set_up…"
-msgstr "Paĝa agordado…"
+msgstr "Paĝa _agordado…"
+
+#: ../app/menus.c:123
+msgid "Modify the diagram pagination"
+msgstr ""
+
+#: ../app/menus.c:124
+#| msgid "Print (GTK) …"
+msgid "_Print…"
+msgstr "_Presi…"
 
-#: ../app/menus.c:114
+#: ../app/menus.c:124
 msgid "Print the diagram"
 msgstr "Presi la diagramon"
 
-#: ../app/menus.c:117
+#: ../app/menus.c:125
+#, fuzzy
+#| msgid "Save the diagram"
+msgid "Close the diagram"
+msgstr "Konservi la diagramon"
+
+#: ../app/menus.c:127
 msgid "_Edit"
 msgstr "R_edakti"
 
-#: ../app/menus.c:121
+#: ../app/menus.c:128
+msgid "Undo"
+msgstr ""
+
+#: ../app/menus.c:129
+msgid "Redo"
+msgstr ""
+
+#: ../app/menus.c:131
 msgid "Copy selection"
 msgstr "Kopii elekton"
 
-#: ../app/menus.c:122
+#: ../app/menus.c:132
 msgid "Cut selection"
 msgstr "Eltondi elekton"
 
-#: ../app/menus.c:123
+#: ../app/menus.c:133
 msgid "Paste selection"
 msgstr "Alglui elekton"
 
-#: ../app/menus.c:124
+#: ../app/menus.c:134
 msgid "_Duplicate"
 msgstr ""
 
+#: ../app/menus.c:134
+#, fuzzy
+#| msgid "Paste selection"
+msgid "Duplicate selection"
+msgstr "Alglui elekton"
+
+#: ../app/menus.c:135
+#, fuzzy
+#| msgid "Paste selection"
+msgid "Delete selection"
+msgstr "Alglui elekton"
+
+#: ../app/menus.c:137
+#| msgid "Find"
+msgid "_Find…"
+msgstr "_Trovi…"
+
+#: ../app/menus.c:137
+#| msgid "_Search for:"
+msgid "Search for text"
+msgstr "Serĉi tekston"
+
+#: ../app/menus.c:138
+#, fuzzy
+#| msgid "_Replace"
+msgid "_Replace…"
+msgstr "A_nstataŭigi"
+
+#: ../app/menus.c:138
+msgid "Search and replace text"
+msgstr ""
+
 #. the following used to bind to <control><shift>C which collides with Unicode input.
 #. * <control><alt> doesn't work either
-#: ../app/menus.c:132
+#: ../app/menus.c:142
 msgid "Copy Text"
 msgstr "Kopii la tekston"
 
-#: ../app/menus.c:133
+#: ../app/menus.c:142
+msgid "Copy object's text to clipboard"
+msgstr ""
+
+#: ../app/menus.c:143
 msgid "Cut Text"
 msgstr "Eltondi tekston"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:143
+msgid "Cut object's text to clipboard"
+msgstr ""
+
+#: ../app/menus.c:144
 msgid "Paste _Text"
 msgstr "Alglui _tekston"
 
-#: ../app/menus.c:136
+#: ../app/menus.c:144
+msgid "Insert text from clipboard"
+msgstr ""
+
+#: ../app/menus.c:146
 msgid "Paste _Image"
 msgstr "Alglui b_ildon"
 
-#: ../app/menus.c:138
+#: ../app/menus.c:146
+msgid "Insert image from clipboard"
+msgstr ""
+
+#: ../app/menus.c:148
 msgid "_Layers"
 msgstr "_Tavoloj"
 
-#: ../app/menus.c:139
+#: ../app/menus.c:149
 msgid "Add Layer…"
 msgstr "Aldoni tavolon…"
 
-#: ../app/menus.c:140
+#: ../app/menus.c:150
 msgid "Rename Layer…"
 msgstr "Alinomi tavolon…"
 
-#: ../app/menus.c:141
+#: ../app/menus.c:151
 msgid "Move Selection to Layer above"
 msgstr "Movi elekton al supra tavolo"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:152
 msgid "Move Selection to Layer below"
 msgstr "Movi elekton al suba tavolo"
 
-#: ../app/menus.c:143
+#: ../app/menus.c:153
 msgid "_Layers…"
 msgstr "_Tavoloj…"
 
-#: ../app/menus.c:144
+#: ../app/menus.c:154
 msgid "_View"
 msgstr "_Vidi"
 
-#: ../app/menus.c:145
+#: ../app/menus.c:155
 msgid "Zoom in"
 msgstr "Enzomi"
 
-#: ../app/menus.c:146
+#: ../app/menus.c:156
 msgid "Zoom out"
 msgstr "Elzomi"
 
-#: ../app/menus.c:147
+#: ../app/menus.c:157
 msgid "_Zoom"
 msgstr "_Zomi"
 
-#: ../app/menus.c:148
+#: ../app/menus.c:158
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:149 ../app/menus.c:574 ../app/menus.c:586
+#: ../app/menus.c:159 ../app/menus.c:597 ../app/menus.c:609
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:150 ../app/menus.c:575 ../app/menus.c:587
+#: ../app/menus.c:160 ../app/menus.c:598 ../app/menus.c:610
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:151
+#: ../app/menus.c:161
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:162
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:163
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:155
+#: ../app/menus.c:165
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:156
+#: ../app/menus.c:166
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:167
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:168
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:159
+#: ../app/menus.c:169
 msgid "25"
 msgstr "25"
 
 #. Show All, Best Fit.  Same as the Gimp, Ctrl+E
-#: ../app/menus.c:161
+#: ../app/menus.c:171
 msgid "Zoom fit"
 msgstr ""
 
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:165
+#: ../app/menus.c:175
 msgid "New _View"
 msgstr "Nova _vido"
 
-#: ../app/menus.c:166
+#: ../app/menus.c:176
 msgid "C_lone View"
 msgstr ""
 
-#: ../app/menus.c:169
+#: ../app/menus.c:179
 msgid "_Objects"
 msgstr "_Objektoj"
 
-#: ../app/menus.c:170
+#: ../app/menus.c:180
 msgid "Send to _Back"
 msgstr "_Sendi malantaŭan"
 
-#: ../app/menus.c:171
+#: ../app/menus.c:180
+#, fuzzy
+#| msgid "Move Selection to Layer above"
+msgid "Move selection to the bottom"
+msgstr "Movi elekton al supra tavolo"
+
+#: ../app/menus.c:181
 msgid "Bring to _Front"
 msgstr ""
 
-#: ../app/menus.c:172
+#: ../app/menus.c:181
+#, fuzzy
+#| msgid "Move Selection to Layer above"
+msgid "Move selection to the top"
+msgstr "Movi elekton al supra tavolo"
+
+#: ../app/menus.c:182
 msgid "Send Backwards"
 msgstr "Sendi malantaŭen"
 
-#: ../app/menus.c:173
+#: ../app/menus.c:183
 msgid "Bring Forwards"
 msgstr ""
 
-#: ../app/menus.c:175
+#: ../app/menus.c:185
 msgid "_Group"
 msgstr "_Grupigi"
 
+#: ../app/menus.c:185
+msgid "Group selected objects"
+msgstr ""
+
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:177
+#: ../app/menus.c:187
 msgid "_Ungroup"
 msgstr "_Malgrupigi"
 
-#: ../app/menus.c:179
+#: ../app/menus.c:187
+msgid "Ungroup selected groups"
+msgstr ""
+
+#: ../app/menus.c:189
 msgid "_Parent"
 msgstr ""
 
-#: ../app/menus.c:180
+#: ../app/menus.c:190
 msgid "_Unparent"
 msgstr ""
 
-#: ../app/menus.c:181
+#: ../app/menus.c:191
 msgid "_Unparent Children"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:183 ../objects/FS/function.c:811
+#: ../app/menus.c:193 ../objects/FS/function.c:799
 msgid "Align"
 msgstr ""
 
-#: ../app/menus.c:188 ../objects/standard/textobj.c:137
+#: ../app/menus.c:198 ../objects/standard/textobj.c:117
 msgid "Top"
 msgstr "Supro"
 
-#: ../app/menus.c:189
+#: ../app/menus.c:199
 msgid "Middle"
 msgstr "Mezo"
 
-#: ../app/menus.c:190 ../objects/standard/textobj.c:136
+#: ../app/menus.c:200 ../objects/standard/textobj.c:116
 msgid "Bottom"
 msgstr "Malsupro"
 
-#: ../app/menus.c:192
+#: ../app/menus.c:202
 msgid "Spread Out Horizontally"
 msgstr ""
 
-#: ../app/menus.c:193
+#: ../app/menus.c:203
 msgid "Spread Out Vertically"
 msgstr ""
 
-#: ../app/menus.c:194
+#: ../app/menus.c:204
 msgid "Adjacent"
 msgstr ""
 
-#: ../app/menus.c:195
+#: ../app/menus.c:205
 msgid "Stacked"
 msgstr ""
 
-#: ../app/menus.c:196 ../app/menus.c:206
+#: ../app/menus.c:206 ../app/menus.c:216
 msgid "Connected"
 msgstr ""
 
-#: ../app/menus.c:200
+#: ../app/menus.c:210
 msgid "_Select"
 msgstr "_Elekti"
 
-#: ../app/menus.c:201
+#: ../app/menus.c:211
 msgid "All"
 msgstr "Ĉio"
 
-#: ../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:212 ../objects/Jackson/domain.c:94
+#: ../objects/UML/association.c:220 ../objects/UML/association.c:226
 msgid "None"
 msgstr "Nenio"
 
-#: ../app/menus.c:203
+#: ../app/menus.c:213
 msgid "Invert"
 msgstr "Inversigi"
 
-#: ../app/menus.c:205
+#: ../app/menus.c:215
 msgid "Transitive"
 msgstr "Transitiva"
 
-#: ../app/menus.c:207
+#: ../app/menus.c:217
 msgid "Same Type"
 msgstr "Sama tipo"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:211
+#: ../app/menus.c:221
 msgid "Select By"
 msgstr "Elekti per:"
 
-#: ../app/menus.c:213
-msgid "_Input Methods"
-msgstr "Metodoj de en_igo"
+#. For placment of the toplevel Layout menu and it's accelerator
+#: ../app/menus.c:224
+msgid "L_ayout"
+msgstr ""
 
-#: ../app/menus.c:215
+#: ../app/menus.c:226
 msgid "D_ialogs"
 msgstr "D_ialogoj"
 
-#: ../app/menus.c:217
+#: ../app/menus.c:228
 msgid "D_ebug"
 msgstr "S_encimigi"
 
-#: ../app/menus.c:223
+#: ../app/menus.c:234
 msgid "_Tools"
 msgstr "_Iloj"
 
-#: ../app/menus.c:224
+#: ../app/menus.c:235
 msgid "Modify"
 msgstr "Modifi"
 
-#: ../app/menus.c:226
+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
+#: ../app/menus.c:236 ../app/toolbox.c:86 ../objects/FS/function.c:979
+msgid "Magnify"
+msgstr ""
+
+#: ../app/menus.c:237
 msgid "Edit Text"
 msgstr "Redakti tekston"
 
-#: ../app/menus.c:227
+#: ../app/menus.c:238
 msgid "Scroll"
 msgstr ""
 
-#: ../app/menus.c:248
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../app/menus.c:239 ../app/toolbox.c:98 ../lib/properties.c:102
+#: ../lib/properties.h:677 ../objects/AADL/aadlbox.c:153
+#: ../objects/custom/custom_object.c:227 ../objects/Jackson/requirement.c:130
+#: ../objects/network/basestation.c:132 ../objects/network/radiocell.c:131
+#: ../objects/UML/activity.c:129 ../objects/UML/actor.c:120
+#: ../objects/UML/classicon.c:145 ../objects/UML/component.c:133
+#: ../objects/UML/component_feature.c:158 ../objects/UML/node.c:127
+#: ../objects/UML/node.c:129 ../objects/UML/note.c:118
+#: ../objects/UML/object.c:164 ../objects/UML/small_package.c:129
+#: ../objects/UML/state.c:154 ../objects/UML/usecase.c:136
+msgid "Text"
+msgstr "Teksto"
+
+#: ../app/menus.c:240 ../app/toolbox.c:104
+msgid "Box"
+msgstr "Skatolo"
+
+#: ../app/menus.c:241 ../app/toolbox.c:110
+msgid "Ellipse"
+msgstr "Elipso"
+
+#: ../app/menus.c:242 ../app/toolbox.c:116
+msgid "Polygon"
+msgstr ""
+
+#: ../app/menus.c:243 ../app/toolbox.c:122
+msgid "Beziergon"
+msgstr ""
+
+#: ../app/menus.c:245 ../app/toolbox.c:128 ../objects/standard/line.c:327
+msgid "Line"
+msgstr "Linio"
+
+#: ../app/menus.c:246 ../app/toolbox.c:134
+msgid "Arc"
+msgstr "Arko"
+
+#: ../app/menus.c:247 ../app/toolbox.c:140
+msgid "Zigzagline"
+msgstr "Zigzag-linio"
+
+#: ../app/menus.c:248 ../app/toolbox.c:146
+msgid "Polyline"
+msgstr ""
+
+#: ../app/menus.c:249 ../app/toolbox.c:152
+msgid "Bezierline"
+msgstr ""
+
+#: ../app/menus.c:250 ../app/toolbox.c:165
+msgid "Outline"
+msgstr "Konturo"
+
+#: ../app/menus.c:252 ../app/toolbox.c:158
+msgid "Image"
+msgstr "Bildo"
+
+#: ../app/menus.c:259
 msgid "_Antialiased"
 msgstr "Gl_atigita"
 
-#: ../app/menus.c:249
+#: ../app/menus.c:260
 msgid "Show _Grid"
 msgstr "Montri _kradon"
 
-#: ../app/menus.c:250
+#: ../app/menus.c:261
 msgid "_Snap to Grid"
 msgstr "_Kapti per krado"
 
-#: ../app/menus.c:251
+#: ../app/menus.c:262
 msgid "Snap to _Objects"
 msgstr "Kapti per _objektoj"
 
-#: ../app/menus.c:252
+#: ../app/menus.c:263
 msgid "Show _Rulers"
 msgstr "Mont_ri mezurilojn"
 
-#: ../app/menus.c:253
+#: ../app/menus.c:264
+#, fuzzy
+#| msgid "Show Toolbar"
+msgid "Show Scrollbars"
+msgstr "Montri ilobreton"
+
+#: ../app/menus.c:265
 msgid "Show _Connection Points"
 msgstr ""
 
-#: ../app/menus.c:260
-msgid "Union"
-msgstr "Unio"
-
-#: ../app/menus.c:261
-msgid "Intersection"
-msgstr "Intersekco"
-
 #. 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:274 ../objects/FS/function.c:699 ../objects/FS/function.c:851
+#: ../objects/FS/function.c:853
 msgid "Remove"
 msgstr "Forigi"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:264
+#: ../app/menus.c:276
 msgid "Inverse"
 msgstr "Inversigi"
 
-#: ../app/menus.c:327
+#: ../app/menus.c:338
 msgid "NULL tooldata in tool_menu_select"
 msgstr ""
 
-#: ../app/menus.c:576 ../app/menus.c:588
+#: ../app/menus.c:599 ../app/menus.c:611
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:577 ../app/menus.c:589
+#: ../app/menus.c:600 ../app/menus.c:612
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:578 ../app/menus.c:590
+#: ../app/menus.c:601 ../app/menus.c:613
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:579 ../app/menus.c:591
+#: ../app/menus.c:602 ../app/menus.c:614
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:580 ../app/menus.c:592
+#: ../app/menus.c:603 ../app/menus.c:615
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:581 ../app/menus.c:593
+#: ../app/menus.c:604 ../app/menus.c:616
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:582 ../app/menus.c:594
+#: ../app/menus.c:605 ../app/menus.c:617
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:583 ../app/menus.c:595
+#: ../app/menus.c:606 ../app/menus.c:618
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:621
+#: ../app/menus.c:644
 msgid "Toggles snap-to-grid."
 msgstr "Baskuligas kapti-per-krado."
 
-#: ../app/menus.c:632
+#: ../app/menus.c:655
 msgid "Toggles object snapping."
 msgstr ""
 
-#: ../app/modify_tool.c:366
+#: ../app/menus.c:1275
+msgid "The function is not available anymore."
+msgstr ""
+
+#: ../app/modify_tool.c:411
 msgid "Couldn't get GTK+ settings"
 msgstr ""
 
-#: ../app/plugin-manager.c:200
+#: ../app/plugin-manager.c:208
 msgid "Plugins"
 msgstr "Kromprogrametoj"
 
-#: ../app/plugin-manager.c:255
+#: ../app/plugin-manager.c:263
 msgid "Loaded"
 msgstr "Ŝargita"
 
-#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-#: ../objects/SISSI/sissi_dialog.c:880
-msgid "Description"
-msgstr "Priskribo"
-
-#: ../app/plugin-manager.c:277
+#: ../app/plugin-manager.c:285
 msgid "Load at Startup"
 msgstr ""
 
-#: ../app/plugin-manager.c:284
+#: ../app/plugin-manager.c:292
 msgid "Filename"
 msgstr "Dosiernomo"
 
@@ -1667,7 +1877,7 @@ msgstr "Vertikala"
 msgid "Paper type:"
 msgstr "Tipo de papero:"
 
-#: ../app/preferences.c:193 ../objects/Database/table_dialog.c:1089
+#: ../app/preferences.c:193
 msgid "Background Color:"
 msgstr "Fona koloro:"
 
@@ -1724,20 +1934,12 @@ msgstr "Glatigo:"
 msgid "view antialiased"
 msgstr "Vidi glatigita"
 
-#. 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
-msgid "Export"
-msgstr "Eksporti"
-
 #: ../app/preferences.c:222
 msgid "Portable Network Graphics"
 msgstr ""
 
-#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:497
-#: ../plug-ins/svg/svg-import.c:1205
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:649
+#: ../plug-ins/svg/svg-import.c:2121
 msgid "Scalable Vector Graphics"
 msgstr ""
 
@@ -1745,11 +1947,11 @@ msgstr ""
 msgid "PostScript"
 msgstr "PostSkripto"
 
-#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1464
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1449
 msgid "Windows Metafile"
 msgstr "Vindozaj metadosieroj"
 
-#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1473
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1458
 msgid "Enhanced Metafile"
 msgstr "Riĉigita Metadosiero"
 
@@ -1785,18 +1987,19 @@ msgstr ""
 msgid "Hex Size:"
 msgstr ""
 
-#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
-#: ../lib/prop_pixbuf.c:270
+#: ../app/preferences.c:470 ../lib/diapatternselector.c:89
+#: ../lib/prop_inttypes.c:159 ../lib/prop_pixbuf.c:296
 msgid "Yes"
 msgstr "Jes"
 
-#: ../app/preferences.c:481 ../app/preferences.c:492
+#: ../app/preferences.c:470 ../app/preferences.c:481
+#: ../lib/diapatternselector.c:93 ../lib/diapatternselector.c:184
 #: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
-#: ../lib/prop_pixbuf.c:272 ../lib/prop_pixbuf.c:278
+#: ../lib/prop_pixbuf.c:298 ../lib/prop_pixbuf.c:304
 msgid "No"
 msgstr "Ne"
 
-#: ../app/preferences.c:595
+#: ../app/preferences.c:584
 msgid "Preferences"
 msgstr "Agordoj"
 
@@ -1816,40 +2019,40 @@ msgstr "Atributoj: "
 msgid "Object properties:"
 msgstr "Objektaj Atributoj:"
 
-#: ../app/sheets.c:157
+#: ../app/sheets.c:159
 #, c-format
 msgid ""
 "%s\n"
 "System sheet"
 msgstr ""
 
-#: ../app/sheets.c:159
+#: ../app/sheets.c:161
 #, c-format
 msgid ""
 "%s\n"
 "User sheet"
 msgstr ""
 
-#: ../app/sheets.c:277
+#: ../app/sheets.c:279
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
 msgstr ""
 
-#: ../app/sheets.c:412
+#: ../app/sheets.c:414
 #, c-format
 msgid "Widget not found: %s"
 msgstr ""
 
-#: ../app/sheets.c:442
+#: ../app/sheets.c:444
 msgid "SVG Shape"
 msgstr ""
 
-#: ../app/sheets.c:444
+#: ../app/sheets.c:446
 msgid "Programmed DiaObject"
 msgstr ""
 
-#: ../app/sheets_dialog.c:255
+#: ../app/sheets_dialog.c:253
 msgid "Select SVG Shape File"
 msgstr ""
 
@@ -1885,7 +2088,7 @@ msgstr "<- Movi"
 msgid "<- Move All"
 msgstr "<- Movi ĉiujn"
 
-#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1071
 msgid "Line Break"
 msgstr "Linisalto"
 
@@ -1912,63 +2115,63 @@ msgid ""
 "Unassigned type"
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:771
+#: ../app/sheets_dialog_callbacks.c:770
 msgid "Please select a .shape file"
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:778
+#: ../app/sheets_dialog_callbacks.c:777
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:786
+#: ../app/sheets_dialog_callbacks.c:785
 #, c-format
 msgid "Error examining %s: %s"
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:817
+#: ../app/sheets_dialog_callbacks.c:816
 msgid "Please export the diagram as a shape."
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:820
+#: ../app/sheets_dialog_callbacks.c:819
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:888
+#: ../app/sheets_dialog_callbacks.c:887
 msgid "Sheet must have a Name"
 msgstr ""
 
-#: ../app/sheets_dialog_callbacks.c:1582 ../app/sheets_dialog_callbacks.c:1589
+#: ../app/sheets_dialog_callbacks.c:1579 ../app/sheets_dialog_callbacks.c:1586
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "Ne povas malfermi '%s': %s"
 
-#: ../app/sheets_dialog_callbacks.c:1643
+#: ../app/sheets_dialog_callbacks.c:1640
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "Ne povas malfermi: '%s' por skribi"
 
-#: ../app/sheets_dialog_callbacks.c:1653
+#: ../app/sheets_dialog_callbacks.c:1650
 msgid "a user"
 msgstr "uzanto"
 
-#: ../app/sheets_dialog_callbacks.c:1666
+#: ../app/sheets_dialog_callbacks.c:1663
 #, c-format
 msgid "File: %s"
 msgstr "Dosiero: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1669
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "Date: %s"
 msgstr "Dato: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1673
+#: ../app/sheets_dialog_callbacks.c:1670
 #, c-format
 msgid "For: %s"
 msgstr "Por: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1690
+#: ../app/sheets_dialog_callbacks.c:1687
 msgid "add shapes here"
 msgstr ""
 
@@ -1981,11 +2184,71 @@ msgstr "Ŝargante …"
 msgid "Dia v %s"
 msgstr "Dia v %s"
 
+#: ../app/toolbox.c:74
+msgid ""
+"Modify object(s)\n"
+"Use <Space> to toggle between this and other tools"
+msgstr ""
+
+#: ../app/toolbox.c:80
+msgid ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+msgstr ""
+
+#: ../app/toolbox.c:92
+msgid "Scroll around the diagram"
+msgstr ""
+
+#: ../app/toolbox.c:352
+#, c-format
+msgid "No sheet named %s"
+msgstr ""
+
+#: ../app/toolbox.c:390
+msgid "Other sheets"
+msgstr ""
+
+#: ../app/toolbox.c:450 ../sheets/Flowchart.sheet.in.h:1
+msgid "Flowchart"
+msgstr "Fluskemo"
+
+#: ../app/toolbox.c:494
+msgid ""
+"Foreground & background colors for new objects.  The small black and white "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"colors."
+msgstr ""
+
+#: ../app/toolbox.c:508
+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."
+msgstr ""
+
+#: ../app/toolbox.c:551
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Details…"
+msgstr ""
+
+#: ../app/toolbox.c:556
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Details…"
+msgstr ""
+
+#: ../app/toolbox.c:572
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Details…"
+msgstr ""
+
 #: ../dia.desktop.in.in.h:1
 msgid "Dia"
 msgstr "Dia"
 
-#: ../dia.desktop.in.in.h:2
+#: ../dia.desktop.in.in.h:3
 msgid "Dia Diagram Editor"
 msgstr "Dia Diagramo-Redaktilo"
 
@@ -1993,284 +2256,453 @@ msgstr "Dia Diagramo-Redaktilo"
 msgid "Edit your Diagrams"
 msgstr "Redakti vian diagramojn"
 
-#: ../lib/arrows.c:1891
+#. 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 ""
+
+#. Installer message: Don't install over pre 0.95 versions
+#: ../installer/win32/gennsh.c:42
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+msgstr ""
+
+#. Installer message:  License Page
+#: ../installer/win32/gennsh.c:45
+msgid "Next >"
+msgstr "Sekva >"
+
+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
+#: ../installer/win32/gennsh.c:48
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:51
+msgid "Dia Diagram Editor (required)"
+msgstr ""
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:54
+msgid "Translations"
+msgstr "Tradukoj"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:57
+msgid "Optional translations of the Dia user interface"
+msgstr ""
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:60
+msgid "Core Dia files and dlls"
+msgstr ""
+
+#. Installer message: Component name
+#: ../installer/win32/gennsh.c:63
+msgid "Python plug-in"
+msgstr "Python kromprogrameto"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:66
+msgid ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+msgstr ""
+
+#. Installer message: hyperlink text on finish page
+#: ../installer/win32/gennsh.c:69
+msgid "Visit the Dia for Windows Web Page"
+msgstr ""
+
+#. Installer message: Dia uninstaller entry in Control Panel
+#: ../installer/win32/gennsh.c:72
+msgid "Dia (remove only)"
+msgstr ""
+
+#. Installer message: directory delete confirmation line 1
+#: ../installer/win32/gennsh.c:75
+msgid ""
+"Your old Dia directory is about to be deleted. Would you like to continue?"
+msgstr ""
+
+#. Installer message: directory delete confirmation line 2
+#: ../installer/win32/gennsh.c:77
+msgid ""
+"Note: Any non-standard plugins that you may have installed will be deleted."
+msgstr ""
+
+#. Installer message: directory delete confirmation line 3
+#: ../installer/win32/gennsh.c:79
+msgid "Dia user settings will not be affected."
+msgstr ""
+
+#. Installer message: DIA_PROMPT_DIR_EXISTS line 1
+#: ../installer/win32/gennsh.c:82
+msgid "The installation directory you specified already exists. Any contents"
+msgstr ""
+
+#. Installer message: DIA_PROMP_DIR_EXISTS line 2
+#: ../installer/win32/gennsh.c:84
+msgid "will be deleted. Would you like to continue?"
+msgstr ""
+
+#. Installer message: registry entries not found line 1
+#: ../installer/win32/gennsh.c:87
+msgid "The uninstaller could not find registry entries for Dia."
+msgstr ""
+
+#. Installer message: registry entries not found line 2
+#: ../installer/win32/gennsh.c:89
+msgid "It is likely that another user installed this application."
+msgstr ""
+
+#. Installer message: Uninstall error message
+#: ../installer/win32/gennsh.c:92
+msgid "You do not have permission to uninstall this application."
+msgstr ""
+
+#. Installer message: Uninstallation warning. Keep $INSTDIR
+#: ../installer/win32/gennsh.c:95
+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
+msgstr ""
+
+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
+#: ../installer/win32/gennsh.c:98
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+msgstr ""
+
+#: ../lib/arrows.c:1823
+#, fuzzy
+#| msgid "None"
+msgctxt "Arrow"
+msgid "None"
+msgstr "Nenio"
+
+#: ../lib/arrows.c:1824
+#, fuzzy
+#| msgid "Lines"
+msgctxt "Arrow"
 msgid "Lines"
 msgstr "Linioj"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1825
+msgctxt "Arrow"
 msgid "Hollow Triangle"
 msgstr ""
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1826
+#, fuzzy
+#| msgid "Filled Ellipse"
+msgctxt "Arrow"
 msgid "Filled Triangle"
-msgstr ""
+msgstr "Plenigita elipso"
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1827
+msgctxt "Arrow"
 msgid "Unfilled Triangle"
 msgstr ""
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1828
+#, fuzzy
+#| msgid "Half Diamond"
+msgctxt "Arrow"
 msgid "Hollow Diamond"
-msgstr ""
+msgstr "Duono diamanto"
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1829
+#, fuzzy
+#| msgid "Half Diamond"
+msgctxt "Arrow"
 msgid "Filled Diamond"
-msgstr ""
+msgstr "Duono diamanto"
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1830
+#, fuzzy
+#| msgid "Half Diamond"
+msgctxt "Arrow"
 msgid "Half Diamond"
 msgstr "Duono diamanto"
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1831
+#, fuzzy
+#| msgid "Half Head"
+msgctxt "Arrow"
 msgid "Half Head"
 msgstr "Duono kapo"
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1832
+msgctxt "Arrow"
 msgid "Slashed Cross"
 msgstr ""
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1833
+#, fuzzy
+#| msgid "Filled Ellipse"
+msgctxt "Arrow"
 msgid "Filled Ellipse"
 msgstr "Plenigita elipso"
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1834
+#, fuzzy
+#| msgid "Filled Ellipse"
+msgctxt "Arrow"
 msgid "Hollow Ellipse"
-msgstr ""
+msgstr "Plenigita elipso"
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1835
+#, fuzzy
+#| msgid "Filled Box"
+msgctxt "Arrow"
 msgid "Filled Dot"
-msgstr ""
+msgstr "Plenigita Skatolo"
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1836
+msgctxt "Arrow"
 msgid "Dimension Origin"
 msgstr ""
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1837
+msgctxt "Arrow"
 msgid "Blanked Dot"
 msgstr ""
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1838
+msgctxt "Arrow"
 msgid "Double Hollow Triangle"
 msgstr ""
 
-#: ../lib/arrows.c:1906
+#: ../lib/arrows.c:1839
+msgctxt "Arrow"
 msgid "Double Filled Triangle"
 msgstr ""
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1840
+msgctxt "Arrow"
 msgid "Filled Dot and Triangle"
 msgstr ""
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1841
+#, fuzzy
+#| msgid "Filled Box"
+msgctxt "Arrow"
 msgid "Filled Box"
 msgstr "Plenigita Skatolo"
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1842
+#, fuzzy
+#| msgid "Filled Box"
+msgctxt "Arrow"
 msgid "Blanked Box"
-msgstr ""
+msgstr "Plenigita Skatolo"
 
-#: ../lib/arrows.c:1910
+#: ../lib/arrows.c:1843
+msgctxt "Arrow"
 msgid "Slashed"
 msgstr ""
 
-#: ../lib/arrows.c:1911
+#: ../lib/arrows.c:1844
+#, fuzzy
+#| msgid "Router symbol"
+msgctxt "Arrow"
 msgid "Integral Symbol"
-msgstr ""
+msgstr "Simbolo de enkursigili"
 
-#: ../lib/arrows.c:1912
+#: ../lib/arrows.c:1845
+msgctxt "Arrow"
 msgid "Crow Foot"
 msgstr ""
 
-#: ../lib/arrows.c:1913
+#: ../lib/arrows.c:1846
+#, fuzzy
+#| msgid "Cross"
+msgctxt "Arrow"
 msgid "Cross"
 msgstr "Kruco"
 
-#: ../lib/arrows.c:1914
+#: ../lib/arrows.c:1847
+#, fuzzy
+#| msgid "1-or-0"
+msgctxt "Arrow"
 msgid "1-or-many"
-msgstr ""
+msgstr "1-aŭ-0"
 
-#: ../lib/arrows.c:1915
+#: ../lib/arrows.c:1848
+msgctxt "Arrow"
 msgid "0-or-many"
 msgstr ""
 
-#: ../lib/arrows.c:1916
+#: ../lib/arrows.c:1849
+#, fuzzy
+#| msgid "1-or-0"
+msgctxt "Arrow"
 msgid "1-or-0"
 msgstr "1-aŭ-0"
 
-#: ../lib/arrows.c:1917
+#: ../lib/arrows.c:1850
+#, fuzzy
+#| msgid "1 exactly"
+msgctxt "Arrow"
 msgid "1 exactly"
 msgstr "precize 1"
 
-#: ../lib/arrows.c:1918
+#: ../lib/arrows.c:1851
+#, fuzzy
+#| msgid "Filled Box"
+msgctxt "Arrow"
 msgid "Filled Concave"
-msgstr ""
+msgstr "Plenigita Skatolo"
 
-#: ../lib/arrows.c:1919
+#: ../lib/arrows.c:1852
+msgctxt "Arrow"
 msgid "Blanked Concave"
 msgstr ""
 
-#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
-#: ../lib/properties.h:489 ../lib/properties.h:495
+#: ../lib/arrows.c:1853
+#, fuzzy
+#| msgid "Round"
+msgctxt "Arrow"
 msgid "Round"
 msgstr "Ronda"
 
-#: ../lib/arrows.c:1921
+#: ../lib/arrows.c:1854
+#, fuzzy
+#| msgid "Open Round"
+msgctxt "Arrow"
 msgid "Open Round"
 msgstr "Malfermi rondan"
 
-#: ../lib/arrows.c:1922
+#: ../lib/arrows.c:1855
+#, fuzzy
+#| msgid "Backslash"
+msgctxt "Arrow"
 msgid "Backslash"
 msgstr "Deklivo"
 
-#: ../lib/arrows.c:1923
+#: ../lib/arrows.c:1856
+#, fuzzy
+#| msgid "Infinite Line"
+msgctxt "Arrow"
 msgid "Infinite Line"
 msgstr "Senlima linio"
 
-#: ../lib/arrows.c:2051
+#: ../lib/arrows.c:1984
 msgid "Arrow head of unknown type"
 msgstr ""
 
-#: ../lib/arrows.c:2059
+#: ../lib/arrows.c:1992
 #, c-format
 msgid "Arrow head of type %s has too small dimensions; removing.\n"
 msgstr ""
 
-#: ../lib/arrows.c:2192
+#: ../lib/arrows.c:2125
 msgid "unknown arrow"
 msgstr ""
 
-#: ../lib/bezier_conn.c:638
-msgid "Internal error: Setting corner type of endpoint of bezier"
-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
+#: ../lib/create.c:160 ../lib/create.c:196 ../lib/create.c:228
+#: ../lib/create.c:252 ../lib/create.c:284 ../lib/create.c:305
+#: ../lib/create.c:335 ../lib/create.c:378 ../plug-ins/svg/svg-import.c:677
+#: ../plug-ins/vdx/vdx-import.c:144
 msgid "Can't find standard object"
 msgstr ""
 
-#: ../lib/dia_dirs.c:328
-#, c-format
-msgid "Too many \"..\"s in filename %s\n"
+#: ../lib/diaarrowchooser.c:367
+msgid "Arrow Properties"
 msgstr ""
 
-#: ../lib/dia_image.c:315 ../plug-ins/pixbuf/pixbuf.c:93
-#, c-format
-msgid ""
-"Could not save file:\n"
-"%s\n"
-"%s"
-msgstr ""
-"Ne povas konservi dosieron:\n"
-"T%s\n"
-"%s"
-
-#: ../lib/dia_xml.c:197
-#, c-format
-msgid ""
-"The file %s has no encoding specification;\n"
-"assuming it is encoded in %s"
-msgstr ""
-
-#: ../lib/dia_xml.c:616
-msgid "Taking point value of non-point node."
-msgstr ""
-
-#: ../lib/dia_xml.c:627
-#, c-format
-msgid "Incorrect x Point value \"%s\" %f; discarding it."
-msgstr ""
-
-#: ../lib/dia_xml.c:634
-msgid "Error parsing point."
-msgstr ""
-
-#. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:642
-#, c-format
-msgid "Incorrect y Point value \"%s\" %f; discarding it."
-msgstr ""
-
-#: ../lib/dia_xml.c:659
-msgid "Taking bezpoint value of non-point node."
-msgstr ""
-
-#: ../lib/dia_xml.c:677
-msgid "Error parsing bezpoint p1."
-msgstr ""
-
-#: ../lib/dia_xml.c:691
-msgid "Error parsing bezpoint p2."
-msgstr ""
-
-#: ../lib/dia_xml.c:705
-msgid "Error parsing bezpoint p3."
-msgstr ""
-
-#: ../lib/diaarrowchooser.c:381
-msgid "Arrow Properties"
-msgstr ""
-
-#: ../lib/diaarrowselector.c:121
+#: ../lib/diaarrowselector.c:123
 msgid "More arrows"
 msgstr ""
 
-#: ../lib/diaarrowselector.c:138
+#: ../lib/diaarrowselector.c:140
 msgid "Size: "
 msgstr "Grando:"
 
-#: ../lib/diacolorselector.c:205
+#: ../lib/diacolorselector.c:203
 msgid "Select color"
 msgstr "Elekti koloron"
 
-#: ../lib/diacolorselector.c:287
+#: ../lib/diacolorselector.c:291
 msgid "More colors…"
 msgstr "Plu koloroj…"
 
-#: ../lib/diadynamicmenu.c:392
+#: ../lib/dia_dirs.c:315
+#, c-format
+msgid "Too many \"..\"s in filename %s\n"
+msgstr ""
+
+#: ../lib/diadynamicmenu.c:396
 msgid "Reset menu"
 msgstr ""
 
-#: ../lib/diafontselector.c:159
+#: ../lib/diafontselector.c:158
 msgid "Other fonts"
 msgstr ""
 
-#: ../lib/diafontselector.c:231
+#: ../lib/diafontselector.c:233
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr ""
 
-#: ../lib/dialinechooser.c:309
+#. pathologic case - pixbuf not even supporting PNG?
+#: ../lib/dia_image.c:345
+#, c-format
+msgid ""
+"Unsupported file format for saving:\n"
+"%s\n"
+msgstr ""
+
+#: ../lib/dia_image.c:348
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not save file:\n"
+#| "%s\n"
+#| "%s"
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"Ne povas konservi dosieron:\n"
+"T%s\n"
+"%s"
+
+#: ../lib/dialinechooser.c:310
 msgid "Line Style Properties"
 msgstr "Atributoj de stilo de linio"
 
-#: ../lib/dialinechooser.c:344
+#: ../lib/dialinechooser.c:345
 msgid "Details…"
 msgstr "Detaloj…"
 
-#: ../lib/dialinestyleselector.c:124
+#: ../lib/dialinestyleselector.c:107
 msgid "line|Solid"
 msgstr ""
 
-#: ../lib/dialinestyleselector.c:130
+#: ../lib/dialinestyleselector.c:108
 msgid "line|Dashed"
 msgstr ""
 
-#: ../lib/dialinestyleselector.c:136
+#: ../lib/dialinestyleselector.c:109
 msgid "line|Dash-Dot"
 msgstr ""
 
-#: ../lib/dialinestyleselector.c:142
+#: ../lib/dialinestyleselector.c:110
 msgid "line|Dash-Dot-Dot"
 msgstr ""
 
-#: ../lib/dialinestyleselector.c:148
+#: ../lib/dialinestyleselector.c:111
 msgid "line|Dotted"
 msgstr ""
 
 #. fs->sizebox = GTK_HBOX(box);
-#: ../lib/dialinestyleselector.c:166
+#: ../lib/dialinestyleselector.c:143
 msgid "Dash length: "
 msgstr ""
 
@@ -2282,21 +2714,123 @@ msgstr "JES"
 msgid "Cancel"
 msgstr "Nuligi"
 
+#: ../lib/diapatternselector.c:110
+#, fuzzy
+#| msgid "Flip Horizontal"
+msgid "Horizontal"
+msgstr "Renversi horizontale"
+
+#: ../lib/diapatternselector.c:111
+#, fuzzy
+#| msgid "Diagram"
+msgid "Diagonal"
+msgstr "Diagramo"
+
+#: ../lib/diapatternselector.c:112
+#, fuzzy
+#| msgid "Flip Vertical"
+msgid "Vertical"
+msgstr "Renversi vertikale"
+
+#: ../lib/diapatternselector.c:113
+msgid "Radial"
+msgstr ""
+
+#: ../lib/dia_xml.c:214
+#, c-format
+msgid ""
+"The file %s has no encoding specification;\n"
+"assuming it is encoded in %s"
+msgstr ""
+
+#: ../lib/dia_xml.c:512
+#, c-format
+msgid "Unknown type of DataNode '%s'"
+msgstr ""
+
+#: ../lib/dia_xml.c:531
+msgid "Taking int value of non-int node."
+msgstr ""
+
+#: ../lib/dia_xml.c:707
+msgid "Taking point value of non-point node."
+msgstr ""
+
+#: ../lib/dia_xml.c:718
+#, c-format
+msgid "Incorrect x Point value \"%s\" %f; discarding it."
+msgstr ""
+
+#: ../lib/dia_xml.c:725
+msgid "Error parsing point."
+msgstr ""
+
+#. don't bother with useless warnings (see above)
+#: ../lib/dia_xml.c:733
+#, c-format
+msgid "Incorrect y Point value \"%s\" %f; discarding it."
+msgstr ""
+
+#: ../lib/dia_xml.c:753
+msgid "Taking bezpoint value of non-point node."
+msgstr ""
+
+#: ../lib/dia_xml.c:771
+msgid "Error parsing bezpoint p1."
+msgstr ""
+
+#: ../lib/dia_xml.c:785
+msgid "Error parsing bezpoint p2."
+msgstr ""
+
+#: ../lib/dia_xml.c:799
+msgid "Error parsing bezpoint p3."
+msgstr ""
+
+#: ../lib/dia_xml.c:826
+msgid "Taking rectangle value of non-rectangle node."
+msgstr ""
+
+#: ../lib/dia_xml.c:838 ../lib/dia_xml.c:849 ../lib/dia_xml.c:860
+msgid "Error parsing rectangle."
+msgstr ""
+
+#: ../lib/dia_xml.c:888
+msgid "Taking string value of non-string node."
+msgstr ""
+
+#: ../lib/dia_xml.c:914
+msgid "Error in string tag."
+msgstr ""
+
+#: ../lib/dia_xml.c:932
+msgid "Error in file, string not starting with #"
+msgstr ""
+
+#: ../lib/dia_xml.c:994
+msgid "Taking font value of non-font node."
+msgstr ""
+
 #: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr ""
 
-#: ../lib/font.c:85
+#: ../lib/filter.c:195
+#, c-format
+msgid "Multiple import filters with unique name %s"
+msgstr ""
+
+#: ../lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr ""
 
-#: ../lib/group.c:618
+#: ../lib/group.c:634
 msgid "Transformation"
 msgstr ""
 
-#: ../lib/message.c:93 ../lib/message.c:282
+#: ../lib/message.c:93 ../lib/message.c:289
 msgid "Warning"
 msgstr "Averto"
 
@@ -2312,16 +2846,18 @@ msgstr ""
 msgid "Don't show this message again"
 msgstr ""
 
-#: ../lib/message.c:204
+#: ../lib/message.c:211
 #, c-format
-msgid "There are %d similar messages."
-msgstr ""
+msgid "There is %d similar message."
+msgid_plural "There are %d similar messages."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../lib/message.c:266
+#: ../lib/message.c:273
 msgid "Notice"
 msgstr "Noto"
 
-#: ../lib/object_defaults.c:128
+#: ../lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2329,51 +2865,54 @@ msgid ""
 msgstr ""
 
 #. base property stuff...
-#: ../lib/orth_conn.h:92
+#: ../lib/orth_conn.h:97
 msgid "Autoroute"
 msgstr ""
 
-#: ../lib/orth_conn.h:103
+#: ../lib/orth_conn.h:108
 msgid "Autorouting"
 msgstr ""
 
-#: ../lib/plug-ins.c:111
+#: ../lib/persistence.c:321
+#, fuzzy
+#| msgid "Preferences"
+msgid "Persistence"
+msgstr "Agordoj"
+
+#: ../lib/plug-ins.c:113
 msgid "???"
 msgstr ""
 
-#: ../lib/plug-ins.c:186
+#: ../lib/plug-ins.c:188
 #, c-format
 msgid "Missing dependencies for '%s'?"
 msgstr ""
 
-#: ../lib/plug-ins.c:197
+#: ../lib/plug-ins.c:199
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr ""
 
-#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
+#: ../lib/plug-ins.c:207 ../lib/plug-ins.c:215
 msgid "dia_plugin_init() call failed"
 msgstr ""
 
-#: ../lib/plug-ins.c:232
-#, c-format
-msgid "%s Plugin could not be unloaded"
+#: ../lib/plug-ins.c:443
+msgid "Plugin Configuration"
 msgstr ""
 
-#: ../lib/plug-ins.c:303
-#, c-format
-msgid ""
-"Could not open `%s'\n"
-"`%s'"
+#: ../lib/propdialogs.c:339 ../objects/UML/association.c:234
+#: ../objects/UML/object.c:144
+msgid "General"
+msgstr "ĝenerale"
+
+#: ../lib/propdialogs.c:340
+msgid "Meta"
 msgstr ""
 
 #: ../lib/prop_dict.c:43
 msgid "Author"
 msgstr "Aŭtoro"
 
-#: ../lib/prop_dict.c:44
-msgid "Identifier"
-msgstr "Identigilo"
-
 #: ../lib/prop_dict.c:45
 msgid "Creation date"
 msgstr "Dato de kreo"
@@ -2382,166 +2921,188 @@ msgstr "Dato de kreo"
 msgid "Modification date"
 msgstr "Dato de modifo"
 
-#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:878
+#: ../lib/prop_dict.c:47
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:18
+#: ../lib/prop_dict.c:243 ../sheets/ciscomisc.sheet.in.h:41
 msgid "Key"
 msgstr "Ŝlosilo"
 
-#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../lib/prop_dict.c:250 ../objects/UML/umlattribute.c:41
 #: ../objects/UML/umlparameter.c:47
 msgid "Value"
 msgstr "Valoro"
 
-#: ../lib/prop_inttypes.c:567
-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
-#, c-format
-msgid "Group with %d objects"
-msgstr ""
-
-#: ../lib/propdialogs.c:324 ../objects/UML/association.c:236
-#: ../objects/UML/object.c:147
-msgid "General"
-msgstr "Ĝenerale"
-
-#: ../lib/propdialogs.c:325
-msgid "Meta"
-msgstr ""
-
-#: ../lib/properties.c:67 ../lib/properties.h:476 ../lib/widgets.c:273
+#: ../lib/properties.c:68 ../lib/properties.h:591 ../lib/widgets.c:269
 msgid "Left"
 msgstr "Maldekstra"
 
-#: ../lib/properties.c:68 ../lib/properties.h:477 ../lib/widgets.c:274
-#: ../objects/standard/textobj.c:138
+#: ../lib/properties.c:69 ../lib/properties.h:592 ../lib/widgets.c:270
+#: ../objects/standard/textobj.c:118
 msgid "Center"
 msgstr "Centre"
 
-#: ../lib/properties.c:69 ../lib/properties.h:478 ../lib/widgets.c:275
+#: ../lib/properties.c:70 ../lib/properties.h:593 ../lib/widgets.c:271
 msgid "Right"
 msgstr "Dekstre"
 
-#: ../lib/properties.c:74 ../lib/properties.h:482
+#: ../lib/properties.c:75 ../lib/properties.h:597
 msgid "Never"
 msgstr "Neniam"
 
-#: ../lib/properties.c:75 ../lib/properties.h:483
+#: ../lib/properties.c:76 ../lib/properties.h:598
 msgid "When Needed"
 msgstr ""
 
-#: ../lib/properties.c:76 ../lib/properties.h:484
+#: ../lib/properties.c:77 ../lib/properties.h:599
 msgid "Always"
 msgstr "Ĉiam"
 
-#: ../lib/properties.c:80 ../lib/properties.h:488
+#: ../lib/properties.c:81 ../lib/properties.h:603
+msgctxt "LineJoin"
 msgid "Miter"
 msgstr ""
 
-#: ../lib/properties.c:82 ../lib/properties.h:490
+#: ../lib/properties.c:82 ../lib/properties.h:604
+#, fuzzy
+#| msgid "Round"
+msgctxt "LineJoin"
+msgid "Round"
+msgstr "Ronda"
+
+#: ../lib/properties.c:83 ../lib/properties.h:605
+msgctxt "LineJoin"
 msgid "Bevel"
 msgstr ""
 
-#: ../lib/properties.c:86 ../lib/properties.h:494
+#: ../lib/properties.c:87 ../lib/properties.h:609
+msgctxt "LineCap"
 msgid "Butt"
 msgstr ""
 
-#: ../lib/properties.c:88 ../lib/properties.h:496
+#: ../lib/properties.c:88 ../lib/properties.h:610
+#, fuzzy
+#| msgid "Round"
+msgctxt "LineCap"
+msgid "Round"
+msgstr "Ronda"
+
+#: ../lib/properties.c:89 ../lib/properties.h:611
+#, fuzzy
+#| msgid "Direction:"
+msgctxt "LineCap"
 msgid "Projecting"
-msgstr ""
+msgstr "Direkto:"
 
-#: ../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:96 ../lib/properties.h:632 ../lib/properties.h:635
+#: ../objects/chronogram/chronoline.c:178 ../objects/chronogram/chronoref.c:157
 msgid "Line color"
 msgstr "Koloro de linio"
 
-#: ../lib/properties.c:96 ../lib/properties.h:523 ../lib/properties.h:526
+#: ../lib/properties.c:97 ../lib/properties.h:638 ../lib/properties.h:641
 msgid "Line style"
 msgstr "Stilo de linio"
 
-#: ../lib/properties.c:97 ../lib/properties.h:542 ../lib/properties.h:545
+#: ../lib/properties.c:98 ../lib/properties.h:657 ../lib/properties.h:660
 msgid "Fill color"
 msgstr "Pleniga koloro"
 
-#: ../lib/properties.c:98 ../lib/properties.h:548 ../lib/properties.h:551
+#. just to simplify transferring properties between objects
+#: ../lib/properties.c:99 ../lib/properties.h:663 ../lib/properties.h:666
+#: ../lib/standard-path.c:135
 msgid "Draw background"
 msgstr ""
 
-#: ../lib/properties.c:99 ../lib/properties.h:555
+#: ../lib/properties.c:100 ../lib/properties.h:670
 msgid "Start arrow"
 msgstr ""
 
-#: ../lib/properties.c:100 ../lib/properties.h:558
+#: ../lib/properties.c:101 ../lib/properties.h:673
 msgid "End arrow"
 msgstr ""
 
-#: ../lib/properties.c:102 ../lib/properties.h:568
+#: ../lib/properties.c:103 ../lib/properties.h:683
 msgid "Text alignment"
 msgstr ""
 
-#. 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
-#: ../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/chronogram/chronoref.c:166
+#: ../lib/properties.c:104 ../lib/properties.h:688
+#: ../objects/chronogram/chronoline.c:182 ../objects/chronogram/chronoref.c:163
+#: ../objects/Database/reference.c:118 ../objects/GRAFCET/condition.c:131
+#: ../objects/GRAFCET/step.c:165 ../objects/GRAFCET/transition.c:141
+#: ../objects/UML/class_dialog.c:455
 msgid "Font"
 msgstr "Tiparo"
 
-#: ../lib/properties.c:104 ../lib/properties.h:581
-#: ../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
+#: ../lib/properties.c:105 ../lib/properties.h:696
+#: ../objects/chronogram/chronoline.c:184 ../objects/chronogram/chronoref.c:165
+#: ../objects/GRAFCET/condition.c:133 ../objects/GRAFCET/step.c:167
+#: ../objects/GRAFCET/transition.c:143
 msgid "Font size"
 msgstr "grando de tiparo"
 
-#: ../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:106 ../lib/properties.h:702
+#: ../objects/chronogram/chronoline.c:186 ../objects/chronogram/chronoref.c:167
+#: ../objects/GRAFCET/step.c:169
 msgid "Text color"
 msgstr "Koloro de teksto"
 
-#: ../lib/properties.h:529 ../lib/properties.h:532
+#: ../lib/properties.h:644 ../lib/properties.h:647
 msgid "Line join"
 msgstr ""
 
-#: ../lib/properties.h:535 ../lib/properties.h:538
+#: ../lib/properties.h:650 ../lib/properties.h:653
 msgid "Line caps"
 msgstr ""
 
-#: ../lib/properties.h:596
+#: ../lib/properties.h:711
 msgid "Text fitting"
 msgstr ""
 
-#: ../lib/proplist.c:163
+#: ../lib/properties.h:715 ../lib/standard-path.c:137
+msgid "Pattern"
+msgstr ""
+
+#: ../lib/prop_inttypes.c:568
+msgid "Property cast from int to enum out of range"
+msgstr ""
+
+#: ../lib/proplist.c:161
 #, c-format
 msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr ""
 
+#: ../lib/prop_pixbuf.c:110 ../lib/prop_pixbuf.c:157
+#, c-format
+msgid ""
+"Failed to load image form diagram:\n"
+"%s"
+msgstr ""
+
+#: ../lib/prop_pixbuf.c:224
+#, c-format
+msgid ""
+"Saving inline pixbuf failed:\n"
+"%s"
+msgstr ""
+
+#: ../lib/prop_pixbuf.c:322
+msgid "Cant create image data from scratch!"
+msgstr ""
+
+#. Todo: get label for the branch view from props, e.g. UML Operations Parameters
+#: ../lib/prop_sdarray_widget.c:559 ../objects/chronogram/chronoline.c:161
+#: ../objects/UML/umloperation.c:79
+msgid "Parameters"
+msgstr ""
+
+#: ../lib/prop_text.c:484
+#, c-format
+msgid "Group with %d object"
+msgid_plural "Group with %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../lib/sheet.c:71 ../lib/sheet.c:86
 #, c-format
 msgid ""
@@ -2549,7 +3110,7 @@ msgid ""
 "It will not be available for use."
 msgstr ""
 
-#: ../lib/sheet.c:316
+#: ../lib/sheet.c:319
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2559,450 +3120,315 @@ msgid ""
 "or remove '%s', using the 'Sheets and Objects' dialog."
 msgstr ""
 
-#: ../lib/sheet.c:375
+#: ../lib/sheet.c:378
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr ""
 
-#: ../lib/widgets.c:394
-msgid "Select image file"
-msgstr "Elekti bilddosieron"
+#: ../lib/standard-path.c:119
+msgid "Stroke"
+msgstr ""
 
-#: ../lib/widgets.c:445
-msgid "Browse"
-msgstr "Foliumi"
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: ../lib/standard-path.c:120 ../objects/FS/function.c:927
+msgid "Fill"
+msgstr "Plenigi"
 
-#. 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."
+#: ../lib/standard-path.c:121
+msgid "Fill & Stroke"
 msgstr ""
 
-#. Installer message: Don't install over pre 0.95 versions
-#: ../installer/win32/gennsh.c:42
-msgid ""
-"Please remove old Dia installations completely or install Dia to a different "
-"location."
+#: ../lib/standard-path.c:126
+msgid "Bezier points"
 msgstr ""
 
-#. Installer message:  License Page
-#: ../installer/win32/gennsh.c:45
-msgid "Next >"
-msgstr "Sekva >"
+#: ../lib/standard-path.c:127
+msgid "Drawing"
+msgstr ""
 
-#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:48
-msgid ""
-"$(^Name) is released under the GPL license. The license is provided here for "
-"information purposes only. $_CLICK"
+#: ../lib/standard-path.c:136
+msgid "Draw Control Lines"
 msgstr ""
 
-#. Installer message: Components page
-#: ../installer/win32/gennsh.c:51
-msgid "Dia Diagram Editor (required)"
+#: ../lib/standard-path.c:729
+msgid "Convert to Bezier"
 msgstr ""
 
-#. Installer message: Components page
-#: ../installer/win32/gennsh.c:54
-msgid "Translations"
-msgstr "Tradukoj"
+#: ../lib/standard-path.c:730
+#, fuzzy
+#| msgid "Invert"
+msgid "Invert Path"
+msgstr "Inversigi"
 
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:57
-msgid "Optional translations of the Dia user interface"
+#: ../lib/standard-path.c:731 ../objects/custom/custom_object.c:198
+#: ../objects/custom/custom_object.c:231
+msgid "Flip horizontal"
+msgstr "Renversi horizontale"
+
+#: ../lib/standard-path.c:732 ../objects/custom/custom_object.c:200
+#: ../objects/custom/custom_object.c:233
+msgid "Flip vertical"
+msgstr "Renversi vertikale"
+
+#. Translators: Menu item Verb/Channel/Guide/Rotate
+#. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
+#: ../lib/standard-path.c:733 ../objects/FS/function.c:739
+#: ../objects/FS/function.c:741
+msgid "Rotate"
 msgstr ""
 
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:60
-msgid "Core Dia files and dlls"
+#: ../lib/standard-path.c:734
+msgid "Shear"
 msgstr ""
 
-#. Installer message: Component name
-#: ../installer/win32/gennsh.c:63
-msgid "Python plug-in"
-msgstr "Python kromprogrameto"
+#: ../lib/standard-path.c:735
+#, fuzzy
+#| msgid "Show attributes"
+msgid "Show Control Lines"
+msgstr "Montri atributojn"
 
-#. Installer message: Component description
-#: ../installer/win32/gennsh.c:66
-msgid ""
-"Support for the Python Scripting Language 2.3. Do not select this if Python "
-"is not installed."
-msgstr ""
-
-#. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:69
-msgid "Visit the Dia for Windows Web Page"
-msgstr ""
-
-#. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:72
-msgid "Dia (remove only)"
-msgstr ""
-
-#. 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 ""
-
-#. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:78
-msgid ""
-"The installation directory you specified already exists. Any contents$\rwill "
-"be deleted. Would you like to continue?"
-msgstr ""
-
-#. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:81
-msgid ""
-"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-"another user installed this application."
-msgstr ""
-
-#. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:84
-msgid "You do not have permission to uninstall this application."
-msgstr ""
-
-#. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:87
-msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-msgstr ""
-
-#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:90
-msgid ""
-"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-msgstr ""
+#: ../lib/widgets.c:390
+msgid "Select image file"
+msgstr "Elekti bilddosieron"
 
-#: ../objects/AADL/aadl.c:52
-msgid "Architecture Analysis & Design Language diagram objects"
-msgstr ""
+#: ../lib/widgets.c:441
+msgid "Browse"
+msgstr "Foliumi"
 
 #: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:358
+#: ../objects/AADL/aadlbox.c:356
 msgid "Add Access Provider"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:360
+#: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Requirer"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:362
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:364
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:366
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:368
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:370
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:372
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:374
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:376
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:378
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:380
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:382
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:386
+#: ../objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:387
+#: ../objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:391
+#: ../objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr ""
 
-#: ../objects/Database/compound.c:198
-msgid "Number of arms"
-msgstr ""
-
-#: ../objects/Database/compound.c:221
-msgid "Flip arms vertically"
+#: ../objects/AADL/aadl.c:52
+msgid "Architecture Analysis & Design Language diagram objects"
 msgstr ""
 
-#: ../objects/Database/compound.c:223
-msgid "Flip arms horizontally"
+#: ../objects/chronogram/chronogram.c:40
+msgid "Chronogram diagram objects"
 msgstr ""
 
-#: ../objects/Database/compound.c:225
-msgid "Center mount point vertically"
-msgstr ""
+#: ../objects/chronogram/chronoline.c:147 ../sheets/AADL.sheet.in.h:5
+msgid "Data"
+msgstr "Datumoj"
 
-#: ../objects/Database/compound.c:227
-msgid "Center mount point horizontally"
+#: ../objects/chronogram/chronoline.c:149
+msgid "Data name"
 msgstr ""
 
-#: ../objects/Database/compound.c:229
-msgid "Center mount point"
+#: ../objects/chronogram/chronoline.c:151
+msgid "Events"
 msgstr ""
 
-#: ../objects/Database/compound.c:234
-msgid "Compound"
+#: ../objects/chronogram/chronoline.c:154
+msgid "Event specification"
 msgstr ""
 
-#: ../objects/Database/database.c:39
-msgid "Entity/Relationship table diagram objects"
+#: ../objects/chronogram/chronoline.c:155
+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"
 msgstr ""
 
-#: ../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/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
-#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
-msgid "Comment"
-msgstr "Komento"
+#: ../objects/chronogram/chronoline.c:163 ../objects/chronogram/chronoref.c:145
+msgid "Start time"
+msgstr "Komenca horo"
 
-#: ../objects/Database/table.c:145
-msgid "Primary key"
-msgstr "Ĉefŝlosilo"
+#: ../objects/chronogram/chronoline.c:165 ../objects/chronogram/chronoref.c:147
+msgid "End time"
+msgstr "Fina horo"
 
-#: ../objects/Database/table.c:147
-msgid "Nullable"
+#: ../objects/chronogram/chronoline.c:167
+msgid "Rise time"
 msgstr ""
 
-#: ../objects/Database/table.c:149
-msgid "Unique"
+#: ../objects/chronogram/chronoline.c:169
+msgid "Fall time"
 msgstr ""
 
-#: ../objects/Database/table.c:151
-msgid "Default value"
-msgstr "Defaŭlta valoro"
-
-#: ../objects/Database/table.c:189
-msgid "Visible comments"
+#: ../objects/chronogram/chronoline.c:170
+msgid "Multi-bit data"
 msgstr ""
 
-#: ../objects/Database/table.c:191 ../objects/UML/class.c:172
-msgid "Comment tagging"
+#: ../objects/chronogram/chronoline.c:172 ../objects/chronogram/chronoref.c:155
+msgid "Aspect"
 msgstr ""
 
-#: ../objects/Database/table.c:193 ../objects/Database/table_dialog.c:985
-msgid "Underline primary keys"
+#: ../objects/chronogram/chronoline.c:174
+msgid "Data color"
 msgstr ""
 
-#: ../objects/Database/table.c:195 ../objects/Database/table_dialog.c:990
-msgid "Use bold font for primary keys"
+#: ../objects/chronogram/chronoline.c:176
+msgid "Data line width"
 msgstr ""
 
-#. property rows
-#: ../objects/Database/table.c:200 ../objects/SADT/arrow.c:137
-#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:461
-msgid "Normal"
+#: ../objects/chronogram/chronoref.c:143
+msgid "Time data"
 msgstr ""
 
-#: ../objects/Database/table.c:202
-msgid "Table name"
-msgstr "Tabelnomo"
-
-#: ../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/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
-msgid " "
-msgstr " "
-
-#: ../objects/Database/table.c:215 ../objects/UML/class.c:212
-#: ../objects/UML/object.c:153
-msgid "Attributes"
-msgstr "Atributoj"
-
-#: ../objects/Database/table.c:252 ../objects/UML/class.c:324
-msgid "Show comments"
-msgstr "Montri komentojn"
-
-#. init data
-#: ../objects/Database/table.c:257 ../objects/Database/table.c:364
-#: ../sheets/Database.sheet.in.h:5
-msgid "Table"
-msgstr "Tabelo"
-
-#. Attributes page:
-#: ../objects/Database/table_dialog.c:609
-#: ../objects/UML/class_attributes_dialog.c:455
-msgid "_Attributes"
-msgstr "_Atributoj"
-
-#. the "new" button
-#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
-#: ../objects/SISSI/sissi_dialog.c:870
-msgid "_New"
-msgstr "_Nova"
-
-#. the "delete" button
-#: ../objects/Database/table_dialog.c:643
-msgid "_Delete"
-msgstr "_Forigi"
-
-#. the "Move up" button
-#: ../objects/Database/table_dialog.c:650
-msgid "Move up"
-msgstr "Movi supre"
-
-#. the "Move down" button
-#: ../objects/Database/table_dialog.c:657
-msgid "Move down"
-msgstr "Movi sube"
-
-#: ../objects/Database/table_dialog.c:666
-#: ../objects/UML/class_attributes_dialog.c:507
-msgid "Attribute data"
-msgstr "Dataro de atributojn"
+#: ../objects/chronogram/chronoref.c:149
+msgid "Major time step"
+msgstr ""
 
-#: ../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 "Nomo:"
+#: ../objects/chronogram/chronoref.c:151
+msgid "Minor time step"
+msgstr ""
 
-#: ../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 "Tipo:"
+#: ../objects/chronogram/chronoref.c:161
+msgid "Minor step line width"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:699
-msgid "Default:"
-msgstr "Defaŭlto:"
+#: ../objects/custom/custom.c:140
+msgid "Custom"
+msgstr "Propre"
 
-#: ../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
-msgid "Comment:"
-msgstr "Komento:"
+#: ../objects/custom/custom.c:140
+msgid "Custom XML shapes loader"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:730
-msgid "_Primary key"
-msgstr "Ĉe_fŝlosilo"
+#: ../objects/custom/custom_object.c:203 ../objects/custom/custom_object.c:236
+msgid "Scale of the sub-shapes"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:737
-msgid "N_ullable"
+#: ../objects/custom/custom_object.c:217 ../objects/flowchart/box.c:152
+#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
+#: ../objects/flowchart/parallelogram.c:154 ../objects/SADT/box.c:135
+msgid "Text padding"
 msgstr ""
 
-#: ../objects/Database/table_dialog.c:744
-msgid "Uni_que"
-msgstr "Uni_ka"
+#: ../objects/custom/custom_object.c:1768
+msgid "Flip Horizontal"
+msgstr "Renversi horizontale"
 
-#: ../objects/Database/table_dialog.c:937
-msgid "_Table"
-msgstr "_Tabelo"
+#: ../objects/custom/custom_object.c:1769
+msgid "Flip Vertical"
+msgstr "Renversi vertikale"
 
-#: ../objects/Database/table_dialog.c:945
-msgid "Table name:"
-msgstr "Tabelnomo:"
+#: ../objects/custom/custom_object.c:1807
+#, c-format
+msgid "Cannot open icon file %s for object type '%s'."
+msgstr ""
 
-#. XXX create a handler and disable the 'show documentation tag' checkbox
-#. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:975
-msgid "Comment visible"
-msgstr "Komento estas videbla"
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "CustomLines"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:980 ../objects/UML/class_dialog.c:413
-msgid "Show documentation tag"
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "Custom XML lines loader"
 msgstr ""
 
-#. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1019 ../objects/UML/class_dialog.c:442
-msgid "_Style"
-msgstr "_Stilo"
+#: ../objects/custom_lines/custom_linetypes.c:259
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:1030
-msgid "Border width:"
+#: ../objects/custom/shape_info.c:170
+#, c-format
+msgid ""
+"The file '%s' has invalid path data.\n"
+"svg:path data must start with moveto."
 msgstr ""
 
-#. head line
-#: ../objects/Database/table_dialog.c:1043 ../objects/UML/class_dialog.c:452
-#: ../objects/UML/umlparameter.c:51
-msgid "Kind"
+#: ../objects/Database/compound.c:196
+msgid "Number of arms"
 msgstr ""
 
-#: ../objects/Database/table_dialog.c:1047 ../objects/UML/class_dialog.c:457
-msgid "Size"
-msgstr "Grando"
+#: ../objects/Database/compound.c:219
+msgid "Flip arms vertically"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:1050
-msgid "Normal:"
+#: ../objects/Database/compound.c:221
+msgid "Flip arms horizontally"
 msgstr ""
 
-#: ../objects/Database/table_dialog.c:1071
-msgid "Text Color:"
-msgstr "Koloro de Teksto:"
+#: ../objects/Database/compound.c:223
+msgid "Center mount point vertically"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:1080
-msgid "Foreground Color:"
-msgstr "Malfona koloro:"
+#: ../objects/Database/compound.c:225
+msgid "Center mount point horizontally"
+msgstr ""
 
-#. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1394
-msgid "not null"
-msgstr "ne nulo"
+#: ../objects/Database/compound.c:227
+msgid "Center mount point"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:1395
-msgid "null"
-msgstr "nulo"
+#: ../objects/Database/compound.c:232
+msgid "Compound"
+msgstr ""
 
-#: ../objects/Database/table_dialog.c:1396
-msgid "unique"
-msgstr "unika"
+#: ../objects/Database/database.c:39
+msgid "Entity/Relationship table diagram objects"
+msgstr ""
 
-#: ../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:109 ../objects/flowchart/box.c:150
+#: ../objects/standard/box.c:149 ../objects/standard/polyline.c:108
+#: ../objects/standard/zigzagline.c:106
 msgid "Corner radius"
 msgstr "Angula radiuso"
 
@@ -3014,21 +3440,32 @@ msgstr ""
 msgid "End description"
 msgstr ""
 
-#: ../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:121 ../objects/Database/table.c:223
+#: ../objects/Database/table.c:225 ../objects/Database/table.c:227
+#: ../objects/UML/association.c:247 ../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/class.c:220 ../objects/UML/class.c:222
+#: ../objects/UML/class.c:224 ../objects/UML/class.c:226
+#: ../objects/UML/class.c:228 ../objects/UML/class.c:230
+msgid " "
+msgstr " "
+
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:404
+#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:309
+#: ../objects/SADT/arrow.c:462 ../objects/standard/zigzagline.c:448
+#: ../objects/UML/association.c:866 ../objects/UML/component_feature.c:189
+#: ../objects/UML/dependency.c:379 ../objects/UML/generalization.c:377
+#: ../objects/UML/realizes.c:366 ../objects/UML/transition.c:172
 msgid "Add segment"
 msgstr "Aldoni segmento"
 
-#: ../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:146 ../objects/ER/participation.c:405
+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:310
+#: ../objects/SADT/arrow.c:463 ../objects/standard/zigzagline.c:449
+#: ../objects/UML/association.c:867 ../objects/UML/component_feature.c:190
+#: ../objects/UML/dependency.c:380 ../objects/UML/generalization.c:378
+#: ../objects/UML/realizes.c:367 ../objects/UML/transition.c:173
 msgid "Delete segment"
 msgstr "Forigi segmento"
 
@@ -3036,36 +3473,136 @@ msgstr "Forigi segmento"
 msgid "Reference"
 msgstr "Referenco"
 
-#: ../objects/ER/attribute.c:157
-msgid "Key:"
-msgstr "Ŝlosilo:"
+#: ../objects/Database/table.c:151 ../objects/Database/table.c:192
+#: ../objects/Database/table.c:220 ../objects/UML/class.c:149
+#: ../objects/UML/class.c:216 ../objects/UML/class_dialog.c:486
+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
+msgid "Comment"
+msgstr "Komento"
 
-#: ../objects/ER/attribute.c:159
-msgid "Weak key:"
+#: ../objects/Database/table.c:153
+#, fuzzy
+#| msgid "Primary key"
+msgid "Primary"
+msgstr "Ĉefŝlosilo"
+
+#: ../objects/Database/table.c:153
+msgid "Primary key"
+msgstr "Ĉefŝlosilo"
+
+#: ../objects/Database/table.c:155
+msgid "Nullable"
 msgstr ""
 
-#: ../objects/ER/attribute.c:161
-msgid "Derived:"
+#: ../objects/Database/table.c:157
+msgid "Unique"
 msgstr ""
 
-#: ../objects/ER/attribute.c:163
-msgid "Multivalue:"
-msgstr "Multavoloro:"
+#: ../objects/Database/table.c:159
+#, fuzzy
+#| msgid "Default:"
+msgid "Default"
+msgstr "Defaŭlto:"
+
+#: ../objects/Database/table.c:159
+msgid "Default value"
+msgstr "Defaŭlta valoro"
+
+#. init data
+#: ../objects/Database/table.c:188 ../objects/Database/table.c:278
+#: ../objects/Database/table.c:387 ../sheets/Database.sheet.in.h:3
+msgid "Table"
+msgstr "Tabelo"
+
+#: ../objects/Database/table.c:197
+msgid "Visible comments"
+msgstr ""
+
+#: ../objects/Database/table.c:199
+msgid "Underline primary keys"
+msgstr ""
+
+#: ../objects/Database/table.c:202 ../objects/UML/class.c:164
+msgid "Comment tagging"
+msgstr ""
+
+#: ../objects/Database/table.c:204
+msgid "Use bold font for primary keys"
+msgstr ""
+
+#: ../objects/Database/table.c:207 ../objects/UML/class.c:186
+#: ../objects/UML/object.c:150
+msgid "Attributes"
+msgstr "Atributoj"
+
+#. umlformalparameters_extra
+#. all this just to make the defaults selectable ...
+#: ../objects/Database/table.c:211 ../objects/UML/association.c:269
+#: ../objects/UML/class.c:201 ../objects/UML/object.c:159
+msgid "Style"
+msgstr "Stilo"
+
+#: ../objects/Database/table.c:212 ../objects/UML/class.c:202
+#, fuzzy
+#| msgid "Font"
+msgid "Fonts"
+msgstr "Tiparo"
+
+#. property rows
+#: ../objects/Database/table.c:216 ../objects/SADT/arrow.c:135
+#: ../objects/UML/class.c:206 ../objects/UML/class_dialog.c:461
+msgid "Normal"
+msgstr ""
+
+#: ../objects/Database/table.c:218
+msgid "Table name"
+msgstr "Tabelnomo"
+
+#: ../objects/Database/table.c:273 ../objects/UML/class.c:347
+msgid "Show comments"
+msgstr "Montri komentojn"
+
+#: ../objects/ER/attribute.c:152 ../objects/ER/entity.c:134
+#: ../objects/ER/relationship.c:139
+#: ../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:132
+#: ../objects/UML/generalization.c:129 ../objects/UML/realizes.c:129
+msgid "Name:"
+msgstr "Nomo:"
+
+#: ../objects/ER/attribute.c:154
+msgid "Key:"
+msgstr "Ŝlosilo:"
 
-#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
+#: ../objects/ER/attribute.c:156
+msgid "Weak key:"
+msgstr ""
+
+#: ../objects/ER/attribute.c:158
+msgid "Derived:"
+msgstr ""
+
+#: ../objects/ER/attribute.c:160
+msgid "Multivalue:"
+msgstr "Multavoloro:"
+
+#: ../objects/ER/attribute.c:431 ../sheets/ER.sheet.in.h:6
 msgid "Attribute"
 msgstr "Atributo"
 
-#: ../objects/ER/entity.c:139
+#: ../objects/ER/entity.c:136
 msgid "Weak:"
 msgstr ""
 
-#: ../objects/ER/entity.c:141
+#: ../objects/ER/entity.c:138
 msgid "Associative:"
 msgstr ""
 
-#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:132
-#: ../sheets/ER.sheet.in.h:4
+#: ../objects/ER/entity.c:407 ../objects/UML/classicon.c:129
+#: ../sheets/ER.sheet.in.h:3
 msgid "Entity"
 msgstr ""
 
@@ -3073,41 +3610,49 @@ msgstr ""
 msgid "Entity/Relationship diagram objects"
 msgstr ""
 
-#: ../objects/ER/participation.c:118
+#: ../objects/ER/participation.c:116
 msgid "Total:"
 msgstr "Sumo:"
 
-#: ../objects/ER/relationship.c:144
+#: ../objects/ER/relationship.c:141
 msgid "Left Cardinality:"
 msgstr ""
 
-#: ../objects/ER/relationship.c:146
+#: ../objects/ER/relationship.c:143
 msgid "Right Cardinality:"
 msgstr ""
 
-#: ../objects/ER/relationship.c:148
+#: ../objects/ER/relationship.c:145
 msgid "Rotate:"
 msgstr ""
 
-#: ../objects/ER/relationship.c:150
+#: ../objects/ER/relationship.c:147
 msgid "Identifying:"
 msgstr ""
 
-#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:454 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr ""
 
+#: ../objects/flowchart/flowchart.c:37
+msgid "Flowchart objects"
+msgstr ""
+
+#: ../objects/flowchart/parallelogram.c:152
+msgid "Shear angle"
+msgstr ""
+
 #. 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.c:135 ../objects/FS/flow.c:626
+#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:623
+#: ../objects/FS/function.c:1089
 msgid "Energy"
 msgstr "Energio"
 
 #. 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.c:136 ../objects/FS/flow.c:627
+#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:624
+#: ../objects/FS/function.c:1065
 msgid "Material"
 msgstr ""
 
@@ -3115,1074 +3660,1068 @@ msgstr ""
 #. 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.c:137 ../objects/FS/flow.c:628
+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:625
+#: ../objects/FS/function.c:1027 ../objects/FS/function.c:1029
+#: ../objects/FS/function.c:1165 ../objects/FS/function.c:1167
 msgid "Signal"
 msgstr "Signalo"
 
+#: ../objects/FS/flow.c:144 ../objects/FS/flow-ortho.c:167
+#: ../objects/Istar/link.c:161 ../objects/Jackson/phenomenon.c:145
+#: ../objects/KAOS/metaandorrel.c:165 ../objects/KAOS/metabinrel.c:172
+#: ../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 "Tipo:"
+
 #: ../objects/FS/fs.c:43
 msgid "Function structure diagram objects"
 msgstr ""
 
-#: ../objects/FS/function.c:144
+#: ../objects/FS/function.c:141
 msgid "Wish function"
 msgstr ""
 
-#: ../objects/FS/function.c:146
+#: ../objects/FS/function.c:143
 msgid "User function"
 msgstr "Uzanta funkcio"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:681
+#: ../objects/FS/function.c:669
 msgid "Verb"
 msgstr "Verbo"
 
 #. 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:671 ../objects/FS/function.c:673
+#: ../objects/FS/function.c:713
 msgid "Channel"
 msgstr "Kanalo"
 
-#. Translators: Menu item Verb/Channel/Import
-#. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
-msgid "Import"
-msgstr "Importi"
-
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
+#: ../objects/FS/function.c:679 ../objects/KAOS/metabinrel.c:164
 msgid "Input"
 msgstr "Enigo"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:693
+#: ../objects/FS/function.c:681
 msgid "Receive"
 msgstr "Ricevi"
 
 #. 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:683 ../objects/FS/function.c:955
 msgid "Allow"
 msgstr "Permesi"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:697
+#: ../objects/FS/function.c:685
 msgid "Form Entrance"
 msgstr ""
 
 #. 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:687 ../objects/FS/function.c:921
 msgid "Capture"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:705
+#: ../objects/FS/function.c:693
 msgid "Discharge"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:707
+#: ../objects/FS/function.c:695
 msgid "Eject"
 msgstr "Elĵeti"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:709
+#: ../objects/FS/function.c:697
 msgid "Dispose"
 msgstr ""
 
 #. 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:701 ../objects/FS/function.c:703
+#: ../objects/FS/function.c:721
 msgid "Transfer"
 msgstr ""
 
 #. 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:705 ../objects/FS/function.c:707
 msgid "Transport"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:721
+#: ../objects/FS/function.c:709
 msgid "Lift"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:723
+#: ../objects/FS/function.c:711
 msgid "Move"
 msgstr "Movi"
 
 #. 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:715 ../objects/FS/function.c:717
 msgid "Transmit"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:731
+#: ../objects/FS/function.c:719
 msgid "Conduct"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:735
+#: ../objects/FS/function.c:723
 msgid "Convey"
 msgstr ""
 
 #. 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:725 ../objects/FS/function.c:727
+#: ../objects/FS/function.c:729
 msgid "Guide"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:743
+#: ../objects/FS/function.c:731
 msgid "Direct"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:745
+#: ../objects/FS/function.c:733
 msgid "Straighten"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:747
+#: ../objects/FS/function.c:735
 msgid "Steer"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:749
+#: ../objects/FS/function.c:737
 msgid "Translate"
 msgstr "Traduki"
 
-#. 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
-msgid "Rotate"
-msgstr ""
-
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:755
+#: ../objects/FS/function.c:743
 msgid "Turn"
 msgstr "Turni"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:757
+#: ../objects/FS/function.c:745
 msgid "Spin"
 msgstr ""
 
 #. 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:747 ../objects/FS/function.c:749
 msgid "Allow DOF"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:763
+#: ../objects/FS/function.c:751
 msgid "Constrain"
 msgstr ""
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:765
+#: ../objects/FS/function.c:753
 msgid "Unlock"
 msgstr ""
 
 #. 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:755 ../objects/FS/function.c:757
 msgid "Support"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
-#: ../sheets/SDL.sheet.in.h:19
+#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
+#: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "Haltigi"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:775
+#: ../objects/FS/function.c:763
 msgid "Insulate"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:777
+#: ../objects/FS/function.c:765
 msgid "Protect"
 msgstr ""
 
 #. 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:767 ../objects/FS/function.c:957
 msgid "Prevent"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:781
+#: ../objects/FS/function.c:769
 msgid "Shield"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:783
+#: ../objects/FS/function.c:771
 msgid "Inhibit"
 msgstr ""
 
 #. 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:773 ../objects/FS/function.c:775
 msgid "Stabilize"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:789
+#: ../objects/FS/function.c:777
 msgid "Steady"
 msgstr ""
 
 #. 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:779 ../objects/FS/function.c:781
 msgid "Secure"
 msgstr ""
 
 #. 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:783 ../objects/FS/function.c:815
 msgid "Attach"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:797
+#: ../objects/FS/function.c:785
 msgid "Mount"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:787 ../sheets/ciscomisc.sheet.in.h:40
 msgid "Lock"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:801
+#: ../objects/FS/function.c:789
 msgid "Fasten"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:803
+#: ../objects/FS/function.c:791
 msgid "Hold"
 msgstr "Teni"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:805 ../objects/FS/function.c:807
-#: ../objects/Istar/actor.c:70
+#: ../objects/FS/function.c:793 ../objects/FS/function.c:795
+#: ../objects/Istar/actor.c:68
 msgid "Position"
 msgstr ""
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:809
+#: ../objects/FS/function.c:797
 msgid "Orient"
 msgstr ""
 
 #. 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:803 ../objects/FS/function.c:805
 msgid "Connect"
 msgstr "Konekti"
 
 #. 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:807 ../objects/FS/function.c:809
 msgid "Couple"
 msgstr ""
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:823
+#: ../objects/FS/function.c:811
 msgid "Join"
 msgstr ""
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:825
+#: ../objects/FS/function.c:813
 msgid "Assemble"
 msgstr ""
 
 #. 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:817 ../objects/FS/function.c:819
 msgid "Mix"
 msgstr ""
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:833
+#: ../objects/FS/function.c:821
 msgid "Combine"
 msgstr ""
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:835
+#: ../objects/FS/function.c:823
 msgid "Blend"
 msgstr ""
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:837
+#: ../objects/FS/function.c:825
 msgid "Add"
 msgstr "Aldoni"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:839
+#: ../objects/FS/function.c:827
 msgid "Pack"
 msgstr "Densigi"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:841
+#: ../objects/FS/function.c:829
 msgid "Coalesce"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
-#: ../sheets/UML.sheet.in.h:5
+#: ../objects/FS/function.c:831 ../objects/FS/function.c:833
+#: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr ""
 
 #. 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:835 ../objects/FS/function.c:837
+#: ../objects/FS/function.c:839
 msgid "Separate"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:853
+#: ../objects/FS/function.c:841
 msgid "Switch"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:855
+#: ../objects/FS/function.c:843
 msgid "Divide"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:857
+#: ../objects/FS/function.c:845
 msgid "Release"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:859
+#: ../objects/FS/function.c:847
 msgid "Detach"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:861
+#: ../objects/FS/function.c:849
 msgid "Disconnect"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:867
+#: ../objects/FS/function.c:855
 msgid "Cut"
 msgstr "Tranĉi"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:869
+#: ../objects/FS/function.c:857
 msgid "Polish"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:871
+#: ../objects/FS/function.c:859
 msgid "Sand"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:873
+#: ../objects/FS/function.c:861
 msgid "Drill"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:875
+#: ../objects/FS/function.c:863
 msgid "Lathe"
 msgstr ""
 
 #. 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:865 ../objects/FS/function.c:867
 msgid "Refine"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:881
+#: ../objects/FS/function.c:869
 msgid "Purify"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:883
+#: ../objects/FS/function.c:871
 msgid "Strain"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:885
+#: ../objects/FS/function.c:873
 msgid "Filter"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:887
+#: ../objects/FS/function.c:875
 msgid "Percolate"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:889
+#: ../objects/FS/function.c:877
 msgid "Clear"
 msgstr "Forigi"
 
 #. 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:879 ../objects/FS/function.c:881
 msgid "Distribute"
 msgstr "Distribui"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:895
+#: ../objects/FS/function.c:883
 msgid "Diverge"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:897
+#: ../objects/FS/function.c:885
 msgid "Scatter"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:899
+#: ../objects/FS/function.c:887
 msgid "Disperse"
 msgstr ""
 
 #. 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:889 ../objects/FS/function.c:903
 msgid "Diffuse"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:903
+#: ../objects/FS/function.c:891
 msgid "Empty"
 msgstr "Malplena"
 
 #. 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:893 ../objects/FS/function.c:895
 msgid "Dissipate"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:909
+#: ../objects/FS/function.c:897
 msgid "Absorb"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:911
+#: ../objects/FS/function.c:899
 msgid "Dampen"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:913
+#: ../objects/FS/function.c:901
 msgid "Dispel"
 msgstr ""
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:917
+#: ../objects/FS/function.c:905
 msgid "Resist"
 msgstr ""
 
 #. 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:907 ../objects/FS/function.c:909
 msgid "Provision"
 msgstr ""
 
 #. 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:911 ../objects/FS/function.c:913
 msgid "Store"
 msgstr "Konservi"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:927
+#: ../objects/FS/function.c:915
 msgid "Contain"
 msgstr "Enhavi"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:929
+#: ../objects/FS/function.c:917
 msgid "Collect"
 msgstr "Kolekti"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:931
+#: ../objects/FS/function.c:919
 msgid "Reserve"
 msgstr ""
 
 #. 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:923 ../objects/FS/function.c:925
 msgid "Supply"
 msgstr ""
 
-#. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:939
-msgid "Fill"
-msgstr "Plenigi"
-
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:941
+#: ../objects/FS/function.c:929
 msgid "Provide"
 msgstr ""
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:943
+#: ../objects/FS/function.c:931
 msgid "Replenish"
 msgstr ""
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:945
+#: ../objects/FS/function.c:933
 msgid "Expose"
 msgstr ""
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:935 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr ""
 
 #. 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:937 ../objects/FS/function.c:939
 msgid "Control Magnitude"
 msgstr ""
 
 #. 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:941 ../objects/FS/function.c:943
 msgid "Actuate"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:957
+#: ../objects/FS/function.c:945
 msgid "Start"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:959
+#: ../objects/FS/function.c:947
 msgid "Initiate"
 msgstr ""
 
 #. 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:949 ../objects/FS/function.c:951
 msgid "Regulate"
 msgstr ""
 
 #. 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:953 ../objects/FS/function.c:1171
+#: ../objects/UML/classicon.c:127
 msgid "Control"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:971
+#: ../objects/FS/function.c:959
 msgid "Enable"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:973
+#: ../objects/FS/function.c:961
 msgid "Disable"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:975
+#: ../objects/FS/function.c:963
 msgid "Limit"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:977
+#: ../objects/FS/function.c:965
 msgid "Interrupt"
 msgstr ""
 
 #. 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:967 ../objects/FS/function.c:969
 msgid "Change"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:983
+#: ../objects/FS/function.c:971
 msgid "Increase"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:985
+#: ../objects/FS/function.c:973
 msgid "Decrease"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:987
+#: ../objects/FS/function.c:975
 msgid "Amplify"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:989
+#: ../objects/FS/function.c:977
 msgid "Reduce"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:993
+#: ../objects/FS/function.c:981
 msgid "Normalize"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:995
+#: ../objects/FS/function.c:983
 msgid "Multiply"
 msgstr ""
 
 #. 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:985 ../objects/Misc/measure.c:185
 msgid "Scale"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:999
+#: ../objects/FS/function.c:987
 msgid "Rectify"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:1001
+#: ../objects/FS/function.c:989
 msgid "Adjust"
 msgstr ""
 
 #. 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:991 ../objects/FS/function.c:993
 msgid "Form"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1007
+#: ../objects/FS/function.c:995
 msgid "Compact"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1009
+#: ../objects/FS/function.c:997
 msgid "Crush"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1011
+#: ../objects/FS/function.c:999
 msgid "Shape"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1013
+#: ../objects/FS/function.c:1001
 msgid "Compress"
 msgstr ""
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1015
+#: ../objects/FS/function.c:1003
 msgid "Pierce"
 msgstr ""
 
 #. 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:1005 ../objects/FS/function.c:1007
 msgid "Convert"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1021
+#: ../objects/FS/function.c:1009
 msgid "Transform"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1023
+#: ../objects/FS/function.c:1011
 msgid "Liquefy"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1025
+#: ../objects/FS/function.c:1013
 msgid "Solidify"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1027
+#: ../objects/FS/function.c:1015
 msgid "Evaporate"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1029
+#: ../objects/FS/function.c:1017
 msgid "Sublimate"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1031
+#: ../objects/FS/function.c:1019
 msgid "Condense"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1033
+#: ../objects/FS/function.c:1021
 msgid "Integrate"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1035
+#: ../objects/FS/function.c:1023
 msgid "Differentiate"
 msgstr ""
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1037 ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1025 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr ""
 
 #. 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:1031 ../objects/FS/function.c:1033
 msgid "Sense"
 msgstr ""
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1047
+#: ../objects/FS/function.c:1035
 msgid "Perceive"
 msgstr ""
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1049
+#: ../objects/FS/function.c:1037
 msgid "Recognize"
 msgstr ""
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1051
+#: ../objects/FS/function.c:1039
 msgid "Discern"
 msgstr ""
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1053
+#: ../objects/FS/function.c:1041
 msgid "Check"
 msgstr ""
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1057
+#: ../objects/FS/function.c:1045
 msgid "Verify"
 msgstr "Kontroli"
 
 #. 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:1047 ../objects/FS/function.c:1049
 msgid "Indicate"
 msgstr "Indiki"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1063
+#: ../objects/FS/function.c:1051
 msgid "Mark"
 msgstr "Marki"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1053 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Montri"
 
 #. 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:1055 ../objects/FS/function.c:1057
 msgid "Measure"
 msgstr ""
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1071
+#: ../objects/FS/function.c:1059
 msgid "Calculate"
 msgstr "Kalkuli"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1073
+#: ../objects/FS/function.c:1061
 msgid "Represent"
 msgstr ""
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1075
+#: ../objects/FS/function.c:1063
 msgid "Noun"
 msgstr "Substantivo"
 
 #. Translators: Menu item Noun/Material/Solid
-#: ../objects/FS/function.c:1079
+#: ../objects/FS/function.c:1067
 msgid "Solid"
 msgstr ""
 
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1081
+#: ../objects/FS/function.c:1069
 msgid "Liquid"
 msgstr ""
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1083
+#: ../objects/FS/function.c:1071
 msgid "Gas"
 msgstr ""
 
 #. 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:1073 ../objects/FS/function.c:1075
+#: ../objects/FS/function.c:1159
 msgid "Human"
 msgstr "Homo"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1089
+#: ../objects/FS/function.c:1077
 msgid "Hand"
 msgstr "Mano"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1091
+#: ../objects/FS/function.c:1079
 msgid "Foot"
 msgstr ""
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1093
+#: ../objects/FS/function.c:1081
 msgid "Head"
 msgstr ""
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1095
+#: ../objects/FS/function.c:1083
 msgid "Finger"
 msgstr "Fingro"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1097
+#: ../objects/FS/function.c:1085
 msgid "Toe"
 msgstr ""
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1099
+#: ../objects/FS/function.c:1087
 msgid "Biological"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1103
+#: ../objects/FS/function.c:1091
 msgid "Mechanical"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1105
+#: ../objects/FS/function.c:1093
 msgid "Mech. Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1107
+#: ../objects/FS/function.c:1095
 msgid "Translation"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1109
+#: ../objects/FS/function.c:1097
 msgid "Force"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1099 ../objects/standard/box.c:154
+#: ../objects/standard/ellipse.c:143 ../objects/standard/outline.c:104
 msgid "Rotation"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1113
+#: ../objects/FS/function.c:1101
 msgid "Torque"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1115
+#: ../objects/FS/function.c:1103
 msgid "Random Motion"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1117
+#: ../objects/FS/function.c:1105
 msgid "Vibration"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1119
+#: ../objects/FS/function.c:1107
 msgid "Rotational Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1121
+#: ../objects/FS/function.c:1109
 msgid "Translational Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1123
+#: ../objects/FS/function.c:1111
 msgid "Electrical"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1125
+#: ../objects/FS/function.c:1113
 msgid "Electricity"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1127
+#: ../objects/FS/function.c:1115
 msgid "Voltage"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1129
+#: ../objects/FS/function.c:1117
 msgid "Current"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1131
+#: ../objects/FS/function.c:1119
 msgid "Hydraulic"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1133
+#: ../objects/FS/function.c:1121
 msgid "Pressure"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1135
+#: ../objects/FS/function.c:1123
 msgid "Volumetric Flow"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1137
+#: ../objects/FS/function.c:1125
 msgid "Thermal"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1139
+#: ../objects/FS/function.c:1127
 msgid "Heat"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1141
+#: ../objects/FS/function.c:1129
 msgid "Conduction"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1143
+#: ../objects/FS/function.c:1131
 msgid "Convection"
 msgstr ""
 
 #. 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:1133 ../objects/FS/function.c:1141
 msgid "Radiation"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1147
+#: ../objects/FS/function.c:1135
 msgid "Pneumatic"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1149
+#: ../objects/FS/function.c:1137
 msgid "Chemical"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1151
+#: ../objects/FS/function.c:1139
 msgid "Radioactive"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1155
+#: ../objects/FS/function.c:1143
 msgid "Microwaves"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1157
+#: ../objects/FS/function.c:1145
 msgid "Radio waves"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1159
+#: ../objects/FS/function.c:1147
 msgid "X-Rays"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1161
+#: ../objects/FS/function.c:1149
 msgid "Gamma Rays"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1163
+#: ../objects/FS/function.c:1151
 msgid "Acoustic Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1165
+#: ../objects/FS/function.c:1153
 msgid "Optical Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1167
+#: ../objects/FS/function.c:1155
 msgid "Solar Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1169
+#: ../objects/FS/function.c:1157
 msgid "Magnetic Energy"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1173
+#: ../objects/FS/function.c:1161
 msgid "Human Motion"
 msgstr ""
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1175
+#: ../objects/FS/function.c:1163
 msgid "Human Force"
 msgstr ""
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1181
+#: ../objects/FS/function.c:1169
 msgid "Status"
 msgstr ""
 
-#: ../objects/FS/function.c:1185
+#: ../objects/FS/function.c:1173
 msgid "User/Device Fn"
 msgstr ""
 
-#: ../objects/FS/function.c:1186
+#: ../objects/FS/function.c:1174
 msgid "Wish Fn"
 msgstr ""
 
-#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:132 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr ""
 
-#: ../objects/GRAFCET/action.c:137
+#: ../objects/GRAFCET/action.c:132
 msgid "This action is a call to a macro-step"
 msgstr ""
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:129
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:129
 msgid "The boolean equation of the condition"
 msgstr "La bulea ekvacio de la kondiĉo"
 
-#: ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/condition.c:131
 msgid "The condition's font"
 msgstr ""
 
-#: ../objects/GRAFCET/condition.c:136
+#: ../objects/GRAFCET/condition.c:133
 msgid "The condition's font size"
 msgstr ""
 
-#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/transition.c:146
 msgid "Color"
 msgstr "Koloro"
 
-#: ../objects/GRAFCET/condition.c:139
+#: ../objects/GRAFCET/condition.c:136
 msgid "The condition's color"
 msgstr "La koloro de la kondiĉo"
 
@@ -4190,138 +4729,138 @@ msgstr "La koloro de la kondiĉo"
 msgid "GRAFCET diagram objects"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "Unua paŝo"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:153
+#: ../objects/GRAFCET/step.c:151
 msgid "Subprogram call step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:160
+#: ../objects/GRAFCET/step.c:158
 msgid "Step name"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:160
+#: ../objects/GRAFCET/step.c:158
 msgid "The name of the step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:161
 msgid "Step type"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:161
 msgid "The kind of step"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/step.c:163
 msgid "Active"
 msgstr ""
 
-#: ../objects/GRAFCET/step.c:165
+#: ../objects/GRAFCET/step.c:163
 msgid "Shows a red dot to figure the step's activity"
 msgstr ""
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:139
 msgid "Receptivity"
 msgstr ""
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:139
 msgid "The boolean equation of the receptivity"
 msgstr ""
 
-#: ../objects/GRAFCET/transition.c:144
+#: ../objects/GRAFCET/transition.c:141
 msgid "The receptivity's font"
 msgstr ""
 
-#: ../objects/GRAFCET/transition.c:146
+#: ../objects/GRAFCET/transition.c:143
 msgid "The receptivity's font size"
 msgstr ""
 
-#: ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/transition.c:146
 msgid "The receptivity's color"
 msgstr ""
 
-#: ../objects/GRAFCET/transition.c:150
+#: ../objects/GRAFCET/transition.c:147
 msgid "North point"
 msgstr "Nordo-punkto"
 
-#: ../objects/GRAFCET/transition.c:151
+#: ../objects/GRAFCET/transition.c:148
 msgid "South point"
 msgstr "Sudo-punkto"
 
-#: ../objects/GRAFCET/vector.c:131
+#: ../objects/GRAFCET/vector.c:126
 msgid "Draw arrow heads on upward arcs:"
 msgstr ""
 
-#: ../objects/GRAFCET/vergent.c:124
+#: ../objects/GRAFCET/vergent.c:120
 msgid "OR"
 msgstr "AŬ"
 
-#: ../objects/GRAFCET/vergent.c:125
+#: ../objects/GRAFCET/vergent.c:121
 msgid "AND"
 msgstr "KAJ"
 
-#: ../objects/GRAFCET/vergent.c:136
+#: ../objects/GRAFCET/vergent.c:132
 msgid "Vergent type:"
 msgstr ""
 
-#: ../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/GRAFCET/vergent.c:403 ../objects/Istar/other.c:464
+#: ../objects/Jackson/domain.c:527 ../objects/KAOS/goal.c:567
+#: ../objects/KAOS/other.c:516 ../objects/SADT/box.c:442
+#: ../objects/standard/line.c:320
 msgid "Add connection point"
 msgstr ""
 
-#: ../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/GRAFCET/vergent.c:404 ../objects/Istar/other.c:465
+#: ../objects/Jackson/domain.c:528 ../objects/KAOS/goal.c:568
+#: ../objects/KAOS/other.c:517 ../objects/SADT/box.c:443
+#: ../objects/standard/line.c:321
 msgid "Delete connection point"
 msgstr ""
 
-#: ../objects/GRAFCET/vergent.c:412
+#: ../objects/GRAFCET/vergent.c:408
 msgid "GRAFCET OR/AND vergent"
 msgstr ""
 
-#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
+#: ../objects/Istar/actor.c:66 ../objects/Istar/link.c:149
 msgid "Unspecified"
 msgstr ""
 
-#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:67 ../objects/KAOS/other.c:73
 msgid "Agent"
 msgstr ""
 
-#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:251
+#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:249
 msgid "Role"
 msgstr ""
 
-#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:74 ../objects/KAOS/goal.c:77
 msgid "Softgoal"
 msgstr ""
 
-#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:75 ../objects/KAOS/goal.c:78
 msgid "Goal"
 msgstr "Celo"
 
-#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
-#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
+#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
+#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
 msgid "Goal Type"
 msgstr "Tipo de celo"
 
@@ -4329,75 +4868,75 @@ msgstr "Tipo de celo"
 msgid "Istar diagram"
 msgstr ""
 
-#: ../objects/Istar/link.c:151
+#: ../objects/Istar/link.c:150
 msgid "Positive contrib"
 msgstr ""
 
-#: ../objects/Istar/link.c:152
+#: ../objects/Istar/link.c:151
 msgid "Negative contrib"
 msgstr ""
 
-#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:152 ../sheets/UML.sheet.in.h:6
 msgid "Dependency"
 msgstr ""
 
-#: ../objects/Istar/link.c:154
+#: ../objects/Istar/link.c:153
 msgid "Decomposition"
 msgstr ""
 
-#: ../objects/Istar/link.c:155
+#: ../objects/Istar/link.c:154
 msgid "Means-Ends"
 msgstr ""
 
-#: ../objects/Istar/other.c:73
+#: ../objects/Istar/other.c:71
 msgid "Resource"
 msgstr "Risurco"
 
-#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:72 ../sheets/BPMN.sheet.in.h:33
 msgid "Task"
 msgstr "Tasko"
 
-#: ../objects/Istar/other.c:477
+#: ../objects/Istar/other.c:470
 msgid "i* other"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:79
+#: ../objects/Jackson/domain.c:77
 msgid "Given Domain"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:80
+#: ../objects/Jackson/domain.c:78
 msgid "Designed Domain"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:81
+#: ../objects/Jackson/domain.c:79
 msgid "Machine Domain"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:97
+#: ../objects/Jackson/domain.c:95
 msgid "Causal"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:98
+#: ../objects/Jackson/domain.c:96
 msgid "Biddable"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:99
+#: ../objects/Jackson/domain.c:97
 msgid "Lexical"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
+#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
 msgid "Domain Type"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:183
+#: ../objects/Jackson/domain.c:180
 msgid "Domain Kind"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:184
+#: ../objects/Jackson/domain.c:181
 msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr ""
 
-#: ../objects/Jackson/domain.c:539
+#: ../objects/Jackson/domain.c:533
 msgid "Jackson domain"
 msgstr ""
 
@@ -4405,30 +4944,30 @@ msgstr ""
 msgid "Jackson diagram"
 msgstr ""
 
-#: ../objects/Jackson/phenomenon.c:136
+#: ../objects/Jackson/phenomenon.c:135
 msgid "Shared"
 msgstr ""
 
-#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:136 ../objects/KAOS/goal.c:79
 msgid "Requirement"
 msgstr ""
 
 #. 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:143 ../objects/UML/message.c:149
+#: ../objects/UML/message.c:151
 msgid "Message:"
 msgstr "Mesaĝo:"
 
-#: ../objects/KAOS/goal.c:82
+#: ../objects/KAOS/goal.c:80
 msgid "Assumption"
 msgstr ""
 
-#: ../objects/KAOS/goal.c:83
+#: ../objects/KAOS/goal.c:81
 msgid "Obstacle"
 msgstr ""
 
-#: ../objects/KAOS/goal.c:580
+#: ../objects/KAOS/goal.c:573
 msgid "KAOS goal"
 msgstr ""
 
@@ -4436,83 +4975,83 @@ msgstr ""
 msgid "KAOS diagram"
 msgstr ""
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: ../objects/KAOS/metaandorrel.c:152
 msgid "AND Refinement"
 msgstr ""
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: ../objects/KAOS/metaandorrel.c:153
 msgid "Complete AND Refinement"
 msgstr ""
 
-#: ../objects/KAOS/metaandorrel.c:155
+#: ../objects/KAOS/metaandorrel.c:154
 msgid "OR Refinement"
 msgstr ""
 
-#: ../objects/KAOS/metaandorrel.c:156
+#: ../objects/KAOS/metaandorrel.c:155
 msgid "Operationalization"
 msgstr ""
 
-#: ../objects/KAOS/metaandorrel.c:163
+#: ../objects/KAOS/metaandorrel.c:162
 msgid "Text:"
 msgstr "Teksto:"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: ../objects/KAOS/metabinrel.c:156
 msgid "Contributes"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:158
+#: ../objects/KAOS/metabinrel.c:157
 msgid "Obstructs"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:159
+#: ../objects/KAOS/metabinrel.c:158
 msgid "Conflicts"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:160
+#: ../objects/KAOS/metabinrel.c:159
 msgid "Responsibility"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:161
+#: ../objects/KAOS/metabinrel.c:160
 msgid "Monitors"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:162
+#: ../objects/KAOS/metabinrel.c:161
 msgid "Controls"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:163
+#: ../objects/KAOS/metabinrel.c:162
 msgid "CapableOf"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:164
+#: ../objects/KAOS/metabinrel.c:163
 msgid "Performs"
 msgstr ""
 
-#: ../objects/KAOS/metabinrel.c:166
+#: ../objects/KAOS/metabinrel.c:165
 msgid "Output"
 msgstr "Eligo"
 
-#: ../objects/KAOS/other.c:531
+#: ../objects/KAOS/other.c:522
 msgid "KAOS other"
 msgstr ""
 
-#: ../objects/Misc/analog_clock.c:139
+#: ../objects/Misc/analog_clock.c:136
 msgid "Arrow color"
 msgstr ""
 
-#: ../objects/Misc/analog_clock.c:141
+#: ../objects/Misc/analog_clock.c:138
 msgid "Arrow line width"
 msgstr ""
 
-#: ../objects/Misc/analog_clock.c:143
+#: ../objects/Misc/analog_clock.c:140
 msgid "Seconds arrow color"
 msgstr ""
 
-#: ../objects/Misc/analog_clock.c:145
+#: ../objects/Misc/analog_clock.c:142
 msgid "Seconds arrow line width"
 msgstr ""
 
-#: ../objects/Misc/analog_clock.c:147
+#: ../objects/Misc/analog_clock.c:144
 msgid "Show hours"
 msgstr "Montri horoj"
 
@@ -4520,700 +5059,820 @@ msgstr "Montri horoj"
 msgid "Diagram file"
 msgstr "Skemo-dosiero"
 
-#: ../objects/Misc/grid_object.c:140
+#: ../objects/Misc/grid_object.c:137
 msgid "Rows"
 msgstr "Horizontaloj"
 
-#: ../objects/Misc/grid_object.c:142
+#: ../objects/Misc/grid_object.c:139
 msgid "Columns"
 msgstr "Vertikaloj"
 
-#: ../objects/Misc/grid_object.c:144
+#: ../objects/Misc/grid_object.c:141
 msgid "Grid line color"
 msgstr ""
 
-#: ../objects/Misc/grid_object.c:146
+#: ../objects/Misc/grid_object.c:143
 msgid "Grid line width"
 msgstr ""
 
-#: ../objects/Misc/libmisc.c:42
+#: ../objects/Misc/libmisc.c:43
 msgid "Miscellaneous objects"
 msgstr ""
 
-#: ../objects/Misc/measure.c:169
+#: ../objects/Misc/measure.c:168
+#, fuzzy
+#| msgid "cm"
+msgctxt "length unit"
 msgid "cm"
 msgstr "cm"
 
-#: ../objects/Misc/measure.c:170
+#: ../objects/Misc/measure.c:169
+#, fuzzy
+#| msgid "dm"
+msgctxt "length unit"
 msgid "dm"
 msgstr "dm"
 
-#: ../objects/Misc/measure.c:171
+#: ../objects/Misc/measure.c:170
+#, fuzzy
+#| msgid "ft"
+msgctxt "length unit"
 msgid "ft"
 msgstr "ft"
 
-#: ../objects/Misc/measure.c:172
+#: ../objects/Misc/measure.c:171
+#, fuzzy
+#| msgid "Find"
+msgctxt "length unit"
 msgid "in"
-msgstr ""
+msgstr "Trovi"
 
-#: ../objects/Misc/measure.c:173
+#: ../objects/Misc/measure.c:172
+#, fuzzy
+#| msgid "cm"
+msgctxt "length unit"
 msgid "m"
-msgstr ""
+msgstr "cm"
 
-#: ../objects/Misc/measure.c:174
+#: ../objects/Misc/measure.c:173
+msgctxt "length unit"
 msgid "mm"
 msgstr ""
 
-#: ../objects/Misc/measure.c:175
+#: ../objects/Misc/measure.c:174
+msgctxt "length unit"
 msgid "pt"
 msgstr ""
 
-#: ../objects/Misc/measure.c:176
+#: ../objects/Misc/measure.c:175
+msgctxt "length unit"
 msgid "pi"
 msgstr ""
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
+#: ../objects/Misc/measure.c:184 ../sheets/ChemEng.sheet.in.h:8
 msgid "Measurement"
 msgstr ""
 
-#: ../objects/Misc/measure.c:187
+#: ../objects/Misc/measure.c:186
 msgid "Unit"
 msgstr ""
 
-#: ../objects/Misc/measure.c:188
+#: ../objects/Misc/measure.c:187
 msgid "Precision"
 msgstr ""
 
-#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
-msgid "Add Handle"
+#: ../objects/Misc/n_gon.c:103
+msgid "Convex"
 msgstr ""
 
-#: ../objects/Misc/tree.c:599 ../objects/network/bus.c:607
-msgid "Delete Handle"
+#: ../objects/Misc/n_gon.c:104
+msgid "Concave"
 msgstr ""
 
-#: ../objects/SADT/arrow.c:138
-msgid "Import resource (not shown upstairs)"
-msgstr ""
+#: ../objects/Misc/n_gon.c:105
+#, fuzzy
+#| msgid "Cross"
+msgid "Crossing"
+msgstr "Kruco"
 
-#: ../objects/SADT/arrow.c:139
-msgid "Imply resource (not shown downstairs)"
+#: ../objects/Misc/n_gon.c:117
+msgid "N-gon kind"
 msgstr ""
 
-#: ../objects/SADT/arrow.c:140
-msgid "Dotted arrow"
+#: ../objects/Misc/n_gon.c:119
+msgid "Number of rays"
 msgstr ""
 
-#: ../objects/SADT/arrow.c:141
-msgid "disable arrow heads"
+#: ../objects/Misc/n_gon.c:121
+msgid "Density"
 msgstr ""
 
-#: ../objects/SADT/arrow.c:148
-msgid "Flow style:"
+#: ../objects/Misc/n_gon.c:121
+msgid "Winding number for Crossing"
 msgstr ""
 
-#: ../objects/SADT/arrow.c:150
-msgid "Automatically gray vertical flows:"
-msgstr ""
+#. no property widget, but still to be serialized
+#: ../objects/Misc/n_gon.c:124
+#, fuzzy
+#| msgid "Intersection"
+msgid "Center position"
+msgstr "Intersekco"
 
-#: ../objects/SADT/arrow.c:151
-msgid ""
-"To improve the ease of reading, flows which begin and end vertically can be "
-"rendered gray"
+#. no property widget, but still to be serialized
+#: ../objects/Misc/n_gon.c:126
+msgid "Ray length"
 msgstr ""
 
-#: ../objects/SADT/arrow.c:470
-msgid "SADT Arrow"
+#: ../objects/Misc/n_gon.c:317
+msgid "Triangle"
 msgstr ""
 
-#: ../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
-msgid "Text padding"
+#: ../objects/Misc/n_gon.c:318 ../objects/standard/box.c:137
+#: ../objects/standard/box.c:759
+msgid "Square"
 msgstr ""
 
-#: ../objects/SADT/box.c:149
-msgid "Activity/Data identifier"
+#: ../objects/Misc/n_gon.c:319
+msgid "Pentagon"
 msgstr ""
 
-#: ../objects/SADT/box.c:150
-msgid "The identifier which appears in the lower-right corner of the Box"
-msgstr ""
+#: ../objects/Misc/n_gon.c:319
+#, fuzzy
+#| msgid "Diagram"
+msgid "Pentagram"
+msgstr "Diagramo"
 
-#: ../objects/SADT/box.c:460
-msgid "SADT box"
+#: ../objects/Misc/n_gon.c:320
+msgid "Hexagon"
 msgstr ""
 
-#: ../objects/SADT/sadt.c:41
-msgid "SADT diagram objects"
-msgstr ""
+#: ../objects/Misc/n_gon.c:320
+#, fuzzy
+#| msgid "Diagram"
+msgid "Hexagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
-msgid "No Protection"
+#: ../objects/Misc/n_gon.c:321
+msgid "Heptagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
-msgid "Restricted Diffusion"
-msgstr ""
+#: ../objects/Misc/n_gon.c:321
+#, fuzzy
+#| msgid "Diagram"
+msgid "Heptagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
-msgid "Special Country Confidential"
+#: ../objects/Misc/n_gon.c:322
+msgid "Octagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:41
-msgid "Confidential"
-msgstr ""
+#: ../objects/Misc/n_gon.c:322
+#, fuzzy
+#| msgid "Diagram"
+msgid "Octagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
-msgid "NATO Confidential"
+#: ../objects/Misc/n_gon.c:323
+msgid "Enneagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
-msgid "Personal Confidential"
-msgstr ""
+#: ../objects/Misc/n_gon.c:323
+#, fuzzy
+#| msgid "Diagram"
+msgid "Enneagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
-msgid "Medical Confidential"
+#: ../objects/Misc/n_gon.c:324
+msgid "Decagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:45
-msgid "Industry Confidential"
-msgstr ""
+#: ../objects/Misc/n_gon.c:324
+#, fuzzy
+#| msgid "Diagram"
+msgid "Decagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:46
-msgid "Defense Confidential"
+#: ../objects/Misc/n_gon.c:325
+msgid "Hendecagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
-msgid "Secret"
-msgstr ""
+#: ../objects/Misc/n_gon.c:325
+#, fuzzy
+#| msgid "New diagram:"
+msgid "Hendecagram"
+msgstr "Nova diagramo:"
 
-#: ../objects/SISSI/classification.h:48
-msgid "Defense Secret"
+#: ../objects/Misc/n_gon.c:326
+msgid "Dodecagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
-msgid "Secret special country"
-msgstr ""
+#: ../objects/Misc/n_gon.c:326
+#, fuzzy
+#| msgid "Diagram"
+msgid "Dodecagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
-msgid "NATO Secret"
+#: ../objects/Misc/n_gon.c:327
+msgid "Tridecagon"
 msgstr ""
 
-#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
-msgid "Very Secret"
-msgstr ""
+#: ../objects/Misc/n_gon.c:327
+#, fuzzy
+#| msgid "Diagram"
+msgid "Tridecagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
-msgid "NATO Very Secret"
+#: ../objects/Misc/n_gon.c:328
+msgid "Tetradecagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi.c:66
-msgid "SISSI diagram"
+#: ../objects/Misc/n_gon.c:328
+msgid "Tetradecagram"
 msgstr ""
 
-#: ../objects/SISSI/sissi.c:923
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Not a regular file: %s"
+#: ../objects/Misc/n_gon.c:329
+msgid "Pentadecagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Incorrect file type: %s"
+#: ../objects/Misc/n_gon.c:329
+#, fuzzy
+#| msgid "Print the diagram"
+msgid "Pentadecagram"
+msgstr "Presi la diagramon"
+
+#: ../objects/Misc/n_gon.c:330
+msgid "Hexadecagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi.c:940
-#, c-format
-msgid ""
-"Error loading object.\n"
-"Not a Dia file: %s"
+#: ../objects/Misc/n_gon.c:330
+msgid "Hexadecagram"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:48
-msgid "Industrial Confidential"
+#: ../objects/Misc/n_gon.c:331
+msgid "Heptadecagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:58
-msgid "No integrity"
+#: ../objects/Misc/n_gon.c:331
+msgid "Heptadecagram"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:59
-msgid "Low integrity"
+#: ../objects/Misc/n_gon.c:332
+msgid "Octadecagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:60
-msgid "Average software integrity"
+#: ../objects/Misc/n_gon.c:332
+msgid "Octadecagram"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:61
-msgid "High software integrity"
+#: ../objects/Misc/n_gon.c:333
+msgid "Enneadecagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:62
-msgid "Average hardware integrity"
+#: ../objects/Misc/n_gon.c:333
+msgid "Enneadecagram"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:63
-msgid "High hardware integrity"
+#: ../objects/Misc/n_gon.c:334
+msgid "Icosagon"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:68
-msgid "Millisecond"
-msgstr "Milisekundo"
+#: ../objects/Misc/n_gon.c:334
+#, fuzzy
+#| msgid "Diagram"
+msgid "Icosagram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/sissi_dialog.c:69
-msgid "Second"
-msgstr "Sekundo"
+#: ../objects/Misc/n_gon.c:350
+msgid "N-gon"
+msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:70
-msgid "Minute"
-msgstr "Minuto"
+#: ../objects/Misc/n_gon.c:352
+#, fuzzy
+#| msgid "Diagram"
+msgid "N-gram"
+msgstr "Diagramo"
 
-#: ../objects/SISSI/sissi_dialog.c:71
-msgid "Hour"
-msgstr "Horo"
+#: ../objects/Misc/n_gon.c:354
+msgid "Star"
+msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:72
-msgid "Day"
-msgstr "Tago"
+#: ../objects/Misc/tree.c:599 ../objects/network/bus.c:599
+msgid "Add Handle"
+msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:73
-msgid "Week"
-msgstr "Semajno"
+#: ../objects/Misc/tree.c:600 ../objects/network/bus.c:600
+msgid "Delete Handle"
+msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:78
-msgid "SYSTEM"
-msgstr "SISTEMO"
+#: ../objects/network/basestation.c:134
+msgid "Sectors"
+msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:79
-msgid "Internet access device"
+#: ../objects/network/basestation.c:365 ../objects/network/basestation.c:367
+msgid "Base Station"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:80
-msgid "Electronic messaging"
+#: ../objects/network/network.c:40
+msgid "Network diagram objects"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:81
-msgid "Intranet"
+#: ../objects/network/radiocell.c:125
+msgid "Radius"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:82
-msgid "Company directory"
+#: ../objects/network/wanlink.c:119 ../objects/Sozi/sozi-frame.c:575
+#: ../objects/Sozi/sozi-media.c:424
+msgid "Width"
+msgstr "Larĝo"
+
+#: ../objects/SADT/arrow.c:136
+msgid "Import resource (not shown upstairs)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:83
-msgid "External portal"
+#: ../objects/SADT/arrow.c:137
+msgid "Imply resource (not shown downstairs)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:88
-msgid "ORGANISATION"
+#: ../objects/SADT/arrow.c:138
+msgid "Dotted arrow"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:89
-msgid "Higher-tier organisation"
+#: ../objects/SADT/arrow.c:139
+msgid "disable arrow heads"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:90
-msgid "Structure of the organisation"
+#: ../objects/SADT/arrow.c:146
+msgid "Flow style:"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:91
-msgid "Project or system organisation"
+#: ../objects/SADT/arrow.c:148
+msgid "Automatically gray vertical flows:"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:92
-msgid "Subcontractors/Suppliers/Manufacturers"
+#: ../objects/SADT/arrow.c:149
+msgid ""
+"To improve the ease of reading, flows which begin and end vertically can be "
+"rendered gray"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:97
-msgid "SITE"
+#: ../objects/SADT/arrow.c:468
+msgid "SADT Arrow"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:98
-msgid "Places"
+#: ../objects/SADT/box.c:144
+msgid "Activity/Data identifier"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:99
-msgid "External environment"
+#: ../objects/SADT/box.c:145
+msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:100
-msgid "Premises"
+#: ../objects/SADT/box.c:448
+msgid "SADT box"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:101
-msgid "Zone"
+#: ../objects/SADT/sadt.c:41
+msgid "SADT diagram objects"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:102
-msgid "Essential Services"
+#: ../objects/Sozi/sozi.c:39
+msgid "Sozi presentation objects"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:103
-msgid "Communication"
+#: ../objects/Sozi/sozi-frame.c:544 ../objects/Sozi/sozi-media.c:398
+#: ../objects/standard/box.c:135 ../objects/standard/ellipse.c:127
+msgid "Free"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:104
-msgid "Power"
+#: ../objects/Sozi/sozi-frame.c:545 ../objects/Sozi/sozi-media.c:399
+#: ../objects/standard/box.c:136 ../objects/standard/ellipse.c:128
+msgid "Fixed"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:105
-msgid "Cooling/Pollution"
+#: ../objects/Sozi/sozi-frame.c:551
+msgid "Constant speed"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:109
-msgid "Thermal detection"
+#: ../objects/Sozi/sozi-frame.c:552
+msgid "Speed up"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:113
-msgid "Fire detection"
+#: ../objects/Sozi/sozi-frame.c:553
+msgid "Speed up (strong)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:117
-msgid "Water detection"
+#: ../objects/Sozi/sozi-frame.c:554
+#, fuzzy
+#| msgid "Move down"
+msgid "Speed down"
+msgstr "Movi sube"
+
+#: ../objects/Sozi/sozi-frame.c:555
+msgid "Speed down (strong)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:121
-msgid "Air detection"
+#: ../objects/Sozi/sozi-frame.c:556
+msgid "Speed up, then down"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:125
-msgid "Energy detection"
+#: ../objects/Sozi/sozi-frame.c:557
+msgid "Speed up, then down (strong)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:129
-msgid "Intrusion detection"
+#: ../objects/Sozi/sozi-frame.c:558
+msgid "Speed down, then up"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:133
-msgid "Thermal action"
+#: ../objects/Sozi/sozi-frame.c:559
+msgid "Speed down, then up (strong)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:137
-msgid "Fire action"
+#: ../objects/Sozi/sozi-frame.c:560
+msgid "Immediate (beginning)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:141
-msgid "Water action"
+#: ../objects/Sozi/sozi-frame.c:561
+msgid "Immediate (end)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:145
-msgid "Air action"
+#: ../objects/Sozi/sozi-frame.c:562
+msgid "Immediate (middle)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:149
-msgid "Energy action"
+#: ../objects/Sozi/sozi-frame.c:572 ../objects/Sozi/sozi-media.c:421
+msgid "Geometry"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:153
-msgid "Intrusion action"
+#: ../objects/Sozi/sozi-frame.c:573 ../objects/Sozi/sozi-media.c:422
+#, fuzzy
+#| msgid "Center"
+msgid "Center x"
+msgstr "Centre"
+
+#: ../objects/Sozi/sozi-frame.c:574 ../objects/Sozi/sozi-media.c:423
+#, fuzzy
+#| msgid "Center"
+msgid "Center y"
+msgstr "Centre"
+
+#: ../objects/Sozi/sozi-frame.c:576 ../objects/Sozi/sozi-media.c:425
+#, fuzzy
+#| msgid "Height:"
+msgid "Height"
+msgstr "Alto:"
+
+#: ../objects/Sozi/sozi-frame.c:577 ../objects/Sozi/sozi-media.c:426
+msgid "Angle (deg)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:158
-msgid "Personal"
+#: ../objects/Sozi/sozi-frame.c:578 ../objects/Sozi/sozi-media.c:427
+#: ../objects/standard/box.c:151 ../objects/standard/ellipse.c:140
+msgid "Aspect ratio"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:159
-msgid "Decision maker"
+#: ../objects/Sozi/sozi-frame.c:579 ../objects/Sozi/sozi-media.c:428
+msgid "Scale from center"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:160
-msgid "SSI Responsible"
+#: ../objects/Sozi/sozi-frame.c:581 ../objects/Sozi/sozi-media.c:430
+msgid "Legend"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:161
-msgid "Users"
-msgstr "Uzantoj"
+#: ../objects/Sozi/sozi-frame.c:582 ../objects/Sozi/sozi-media.c:431
+#, fuzzy
+#| msgid "Comment visible"
+msgid "Legend is visible"
+msgstr "Komento estas videbla"
 
-#: ../objects/SISSI/sissi_dialog.c:162
-msgid "Functional administrator"
+#: ../objects/Sozi/sozi-frame.c:589 ../objects/Sozi/sozi-media.c:438
+#: ../sheets/Sozi.sheet.in.h:1
+msgid "Sozi"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:163
-msgid "Technical administrator"
+#: ../objects/Sozi/sozi-frame.c:590
+msgid "Frame sequence"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:164
-msgid "SSI administrator"
+#: ../objects/Sozi/sozi-frame.c:591
+msgid "Frame title"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:165
-msgid "Developer"
+#: ../objects/Sozi/sozi-frame.c:592
+msgid "Frame hide"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:166
-msgid "Operator/Maintenance"
+#: ../objects/Sozi/sozi-frame.c:593
+msgid "Frame clip"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
-msgid "Network"
-msgstr "Reto"
+#: ../objects/Sozi/sozi-frame.c:594
+msgid "Frame timeout enable"
+msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:172
-msgid "Medium and support"
+#: ../objects/Sozi/sozi-frame.c:595
+msgid "Frame timeout (ms)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:173
-msgid "Passive or active relay"
+#: ../objects/Sozi/sozi-frame.c:596
+msgid "Frame transition profile"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:174
-msgid "Communication interface"
+#: ../objects/Sozi/sozi-frame.c:597
+msgid "Frame transition duration (ms)"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
-msgid "Software"
-msgstr "Programaro"
+#: ../objects/Sozi/sozi-media.c:405
+#, fuzzy
+#| msgid "Undefined"
+msgid "undefined"
+msgstr "Nedifinita"
 
-#: ../objects/SISSI/sissi_dialog.c:180
-msgid "Operating System"
+#: ../objects/Sozi/sozi-media.c:406
+msgid "video/mp4"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:181
-msgid "Service - maintenance or administration software"
+#: ../objects/Sozi/sozi-media.c:407
+msgid "video/webm"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:182
-msgid "Packaged software or standard software"
+#: ../objects/Sozi/sozi-media.c:408
+msgid "video/ogg"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:183
-msgid "Business application"
+#: ../objects/Sozi/sozi-media.c:409
+msgid "audio/mpeg"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:184
-msgid "Standard business application"
+#: ../objects/Sozi/sozi-media.c:410
+msgid "audio/ogg"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:185
-msgid "Specific business application"
+#: ../objects/Sozi/sozi-media.c:411
+msgid "audio/wav"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:190
-msgid "HARDWARE"
-msgstr "APARATARO"
+#: ../objects/Sozi/sozi-media.c:439
+#, fuzzy
+#| msgid "Message type:"
+msgid "Media type"
+msgstr "Tipo de mesaĝo:"
 
-#: ../objects/SISSI/sissi_dialog.c:191
-msgid "Data processing equipment (active)"
-msgstr ""
+#: ../objects/Sozi/sozi-media.c:440
+#, fuzzy
+#| msgid "Diagram file"
+msgid "Media file"
+msgstr "Skemo-dosiero"
 
-#: ../objects/SISSI/sissi_dialog.c:192
-msgid "Mobile equipment"
+#: ../objects/Sozi/sozi-media.c:441
+#, fuzzy
+#| msgid "Start time"
+msgid "Start frame"
+msgstr "Komenca horo"
+
+#: ../objects/Sozi/sozi-media.c:442
+msgid "Stop frame"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:193
-msgid "Fixed equipment"
+#: ../objects/standard/arc.c:120
+msgid "Curve distance"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:194
-msgid "Peripheral processing"
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:127
+#: ../objects/standard/polyline.c:109
+msgid "Line gaps"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:195
-msgid "Electronic medium"
+#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:129
+#: ../objects/standard/polyline.c:111
+msgid "Absolute start gap"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:196
-msgid "Other media"
+#: ../objects/standard/bezier.c:151 ../objects/standard/line.c:131
+#: ../objects/standard/polyline.c:113
+msgid "Absolute end gap"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:197
-msgid "Data medium (passive)"
+#: ../objects/standard/bezier.c:767 ../objects/standard/beziergon.c:524
+msgid "Add Segment"
 msgstr ""
 
-#. Class page:
-#: ../objects/SISSI/sissi_dialog.c:301
-msgid "_Menace"
+#: ../objects/standard/bezier.c:768 ../objects/standard/beziergon.c:525
+msgid "Delete Segment"
 msgstr ""
 
-#. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
-msgid "Menace"
+#: ../objects/standard/bezier.c:770 ../objects/standard/beziergon.c:527
+msgid "Symmetric control"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
-msgid "P Action"
+#: ../objects/standard/bezier.c:772 ../objects/standard/beziergon.c:529
+msgid "Smooth control"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
-msgid "P Detection"
+#: ../objects/standard/bezier.c:774 ../objects/standard/beziergon.c:531
+msgid "Cusp control"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
-msgid "Vulnerability"
+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:143
+msgid "Rotation angle"
 msgstr ""
 
-#. Other properties of page:
-#: ../objects/SISSI/sissi_dialog.c:488
-msgid "Other properties"
+#: ../objects/standard/box.c:755 ../objects/standard/ellipse.c:755
+msgid "Free aspect"
 msgstr ""
 
-#. ********* selection menu of entity ********
-#. ********* Label of board *********
-#: ../objects/SISSI/sissi_dialog.c:726
-msgid "Label"
+#: ../objects/standard/box.c:757 ../objects/standard/ellipse.c:757
+msgid "Fixed aspect"
 msgstr ""
 
-#: ../objects/SISSI/sissi_dialog.c:728
-msgid "value"
-msgstr "valoro"
+#: ../objects/standard/ellipse.c:129 ../objects/standard/ellipse.c:759
+msgid "Circle"
+msgstr "Cirklo"
 
-#. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:861
-msgid "Documents"
-msgstr "Dokumentoj"
+#: ../objects/standard/image.c:124
+msgid "Image file"
+msgstr "Bilddosiero"
 
-#: ../objects/SISSI/sissi_dialog.c:876
-msgid "Document title"
+#: ../objects/standard/image.c:126
+msgid "Inline data"
 msgstr ""
 
-#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
-#: ../sheets/UML.sheet.in.h:2
-msgid "Actor"
+#: ../objects/standard/image.c:126
+msgid "Store image data in diagram"
 msgstr ""
 
-#: ../objects/UML/association.c:223
-msgid "From A to B"
+#: ../objects/standard/image.c:128
+msgid "Pixbuf"
 msgstr ""
 
-#: ../objects/UML/association.c:224
-msgid "From B to A"
+#: ../objects/standard/image.c:128
+msgid "The Pixbuf reference"
 msgstr ""
 
-#: ../objects/UML/association.c:229
-msgid "Aggregation"
+#: ../objects/standard/image.c:130
+msgid "Draw border"
 msgstr ""
 
-#: ../objects/UML/association.c:230
-msgid "Composition"
+#: ../objects/standard/image.c:132
+msgid "Keep aspect ratio"
 msgstr ""
 
-#: ../objects/UML/association.c:240
-msgid "Direction"
+#: ../objects/standard/image.c:134
+msgid "Angle"
 msgstr ""
 
-#: ../objects/UML/association.c:242
-msgid "Show direction"
+#: ../objects/standard/image.c:265
+msgid "Can't save image without filename"
 msgstr ""
 
-#: ../objects/UML/association.c:242
-msgid "Show the small arrow denoting the reading direction"
+#: ../objects/standard/image.c:742
+msgid "Inconsistent pixbuf during image save."
 msgstr ""
 
-#: ../objects/UML/association.c:249
-msgid "Side A"
+#. Didn't find file in current directory.
+#: ../objects/standard/image.c:839
+#, c-format
+msgid "The image file '%s' was not found.\n"
 msgstr ""
 
-#: ../objects/UML/association.c:253
-msgid "Multiplicity"
+#: ../objects/standard/line.c:118
+msgid "Arrows"
 msgstr ""
 
-#: ../objects/UML/association.c:255 ../objects/UML/umlattribute.c:45
-#: ../objects/UML/umloperation.c:71
-msgid "Visibility"
-msgstr "Videbleco"
+#: ../objects/standard/line.c:123
+msgid "Start point"
+msgstr ""
 
-#: ../objects/UML/association.c:257
-msgid "Show arrow"
+#: ../objects/standard/line.c:125
+msgid "End point"
 msgstr ""
 
-#: ../objects/UML/association.c:260
-msgid "Side B"
+#: ../objects/standard/line.c:322
+msgid "Upgrade to Polyline"
 msgstr ""
 
-#: ../objects/UML/association.c:271 ../objects/UML/object.c:162
-msgid "Style"
-msgstr "Stilo"
+#: ../objects/standard/line.c:323
+#, fuzzy
+#| msgid "Zigzagline"
+msgid "Upgrade to Zigzagline"
+msgstr "Zigzag-linio"
 
-#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
-#: ../objects/UML/class.c:1827 ../sheets/UML.sheet.in.h:6
-msgid "Class"
-msgstr "Klaso"
+#: ../objects/standard/outline.c:102
+msgid "Text content"
+msgstr ""
 
-#. 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
-msgid "Stereotype"
+#: ../objects/standard/outline.c:104
+msgid "Angle to rotate the outline"
 msgstr ""
 
-#: ../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
-msgid "Abstract"
+#: ../objects/standard/polygon.c:486 ../objects/standard/polyline.c:624
+msgid "Add Corner"
 msgstr ""
 
-#: ../objects/UML/class.c:153 ../objects/UML/class.c:1824
-msgid "Template"
-msgstr "Ŝablono"
+#: ../objects/standard/polygon.c:487 ../objects/standard/polyline.c:625
+msgid "Delete Corner"
+msgstr ""
 
-#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:368
-msgid "Suppress Attributes"
+#: ../objects/standard/standard.c:58
+msgid "Standard objects"
 msgstr ""
 
-#: ../objects/UML/class.c:158
-msgid "Suppress Operations"
+#: ../objects/standard/textobj.c:119
+msgid "First Line"
 msgstr ""
 
-#: ../objects/UML/class.c:160
-msgid "Visible Attributes"
+#: ../objects/standard/textobj.c:128
+msgid "Vertical text alignment"
 msgstr ""
 
-#: ../objects/UML/class.c:162
-msgid "Visible Operations"
+#: ../objects/standard/textobj.c:133
+#, fuzzy
+#| msgid "Text color"
+msgid "Text angle"
+msgstr "Koloro de teksto"
+
+#: ../objects/standard/textobj.c:138
+msgid "Text margin"
 msgstr ""
 
-#: ../objects/UML/class.c:164
-msgid "Visible Comments"
+#: ../objects/standard/zigzagline.c:450
+msgid "Upgrade to Bezierline"
 msgstr ""
 
-#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:384
-msgid "Wrap Operations"
+#: ../objects/UML/actor.c:347 ../objects/UML/actor.c:349
+#: ../sheets/UML.sheet.in.h:15
+msgid "Actor"
 msgstr ""
 
-#: ../objects/UML/class.c:168
-msgid "Wrap after char"
+#: ../objects/UML/association.c:221
+msgid "From A to B"
 msgstr ""
 
-#: ../objects/UML/class.c:170
-msgid "Comment line length"
+#: ../objects/UML/association.c:222
+msgid "From B to A"
 msgstr ""
 
-#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
-msgid "Allow resizing"
+#: ../objects/UML/association.c:227
+msgid "Aggregation"
 msgstr ""
 
-#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:466
-msgid "Polymorphic"
+#: ../objects/UML/association.c:228
+msgid "Composition"
 msgstr ""
 
-#: ../objects/UML/class.c:188 ../objects/UML/class_dialog.c:476
-msgid "Class Name"
+#: ../objects/UML/association.c:238
+msgid "Direction"
 msgstr ""
 
-#: ../objects/UML/class.c:190
-msgid "Abstract Class Name"
+#: ../objects/UML/association.c:240
+msgid "Show direction"
 msgstr ""
 
-#: ../objects/UML/class.c:214
-msgid "Operations"
+#: ../objects/UML/association.c:240
+msgid "Show the small arrow denoting the reading direction"
 msgstr ""
 
-#: ../objects/UML/class.c:217
-msgid "Template Parameters"
+#: ../objects/UML/association.c:247
+msgid "Side A"
+msgstr ""
+
+#: ../objects/UML/association.c:251
+msgid "Multiplicity"
+msgstr ""
+
+#: ../objects/UML/association.c:253 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/umloperation.c:71
+msgid "Visibility"
+msgstr "Videbleco"
+
+#: ../objects/UML/association.c:255
+msgid "Show arrow"
+msgstr ""
+
+#: ../objects/UML/association.c:258
+msgid "Side B"
 msgstr ""
 
+#. Attributes page:
+#: ../objects/UML/class_attributes_dialog.c:455
+msgid "_Attributes"
+msgstr "_Atributoj"
+
+#: ../objects/UML/class_attributes_dialog.c:507
+msgid "Attribute data"
+msgstr "Dataro de atributojn"
+
 #: ../objects/UML/class_attributes_dialog.c:539
 msgid "Value:"
 msgstr "Valoro:"
 
+#: ../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
+msgid "Comment:"
+msgstr "Komento:"
+
 #: ../objects/UML/class_attributes_dialog.c:572
 #: ../objects/UML/class_operations_dialog.c:811
 msgid "Visibility:"
@@ -5245,6 +5904,89 @@ msgstr ""
 msgid "Class scope"
 msgstr ""
 
+#: ../objects/UML/class.c:143 ../objects/UML/class.c:354
+#: ../objects/UML/class.c:1843 ../sheets/UML.sheet.in.h:3
+msgid "Class"
+msgstr "Klaso"
+
+#. 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:136
+#: ../objects/UML/classicon.c:138 ../objects/UML/component.c:129
+#: ../objects/UML/large_package.c:138 ../objects/UML/object.c:146
+#: ../objects/UML/small_package.c:125 ../objects/UML/umloperation.c:68
+msgid "Stereotype"
+msgstr ""
+
+#: ../objects/UML/class.c:154 ../objects/UML/class.c:210
+#: ../objects/UML/class_dialog.c:359 ../objects/UML/class_dialog.c:471
+#: ../objects/UML/class_operations_dialog.c:832
+#: ../objects/UML/umlattribute.c:48 ../objects/UML/uml.c:111
+msgid "Abstract"
+msgstr ""
+
+#: ../objects/UML/class.c:156
+msgid "Visible Attributes"
+msgstr ""
+
+#: ../objects/UML/class.c:158
+msgid "Visible Operations"
+msgstr ""
+
+#: ../objects/UML/class.c:160 ../objects/UML/class_dialog.c:384
+msgid "Wrap Operations"
+msgstr ""
+
+#: ../objects/UML/class.c:162
+msgid "Visible Comments"
+msgstr ""
+
+#: ../objects/UML/class.c:166 ../objects/UML/class.c:349
+msgid "Allow resizing"
+msgstr ""
+
+#: ../objects/UML/class.c:170 ../objects/UML/class.c:1840
+msgid "Template"
+msgstr "Ŝablono"
+
+#: ../objects/UML/class.c:172 ../objects/UML/class_dialog.c:368
+msgid "Suppress Attributes"
+msgstr ""
+
+#: ../objects/UML/class.c:174
+msgid "Suppress Operations"
+msgstr ""
+
+#: ../objects/UML/class.c:176
+msgid "Wrap after char"
+msgstr ""
+
+#: ../objects/UML/class.c:178
+msgid "Comment line length"
+msgstr ""
+
+#. umlattribute_extra
+#: ../objects/UML/class.c:191
+msgid "Operations"
+msgstr ""
+
+#. umloperations_extra
+#: ../objects/UML/class.c:195
+msgid "Template Parameters"
+msgstr ""
+
+#: ../objects/UML/class.c:208 ../objects/UML/class_dialog.c:466
+msgid "Polymorphic"
+msgstr ""
+
+#: ../objects/UML/class.c:212 ../objects/UML/class_dialog.c:476
+msgid "Class Name"
+msgstr ""
+
+#: ../objects/UML/class.c:214
+msgid "Abstract Class Name"
+msgstr ""
+
 #. Class page:
 #: ../objects/UML/class_dialog.c:320
 msgid "_Class"
@@ -5255,9 +5997,8 @@ msgid "Class name:"
 msgstr "Klasnomo:"
 
 #: ../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_operations_dialog.c:799 ../objects/UML/dependency.c:134
+#: ../objects/UML/generalization.c:131 ../objects/UML/realizes.c:131
 msgid "Stereotype:"
 msgstr ""
 
@@ -5285,6 +6026,24 @@ msgstr ""
 msgid "Wrap comment after this length: "
 msgstr ""
 
+#: ../objects/UML/class_dialog.c:413
+msgid "Show documentation tag"
+msgstr ""
+
+#. * Fonts and Colors selection *
+#: ../objects/UML/class_dialog.c:442
+msgid "_Style"
+msgstr "_Stilo"
+
+#. head line
+#: ../objects/UML/class_dialog.c:452 ../objects/UML/umlparameter.c:51
+msgid "Kind"
+msgstr ""
+
+#: ../objects/UML/class_dialog.c:457
+msgid "Size"
+msgstr "Grando"
+
 #: ../objects/UML/class_dialog.c:481
 msgid "Abstract Class"
 msgstr ""
@@ -5306,6 +6065,14 @@ msgstr ""
 msgid "Background Color"
 msgstr ""
 
+#: ../objects/UML/classicon.c:128
+msgid "Boundary"
+msgstr ""
+
+#: ../objects/UML/classicon.c:141
+msgid "Is object"
+msgstr "Estas objekto"
+
 #. end: Visibility
 #: ../objects/UML/class_operations_dialog.c:827
 msgid "Inheritance type:"
@@ -5320,6 +6087,7 @@ msgid "Leaf (final)"
 msgstr ""
 
 #: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/umloperation.c:75
 msgid "Query"
 msgstr "Informpeto"
 
@@ -5373,7 +6141,7 @@ msgstr "Datumaro de operacio"
 msgid "_Templates"
 msgstr "Ŝ_ablonoj"
 
-#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr ""
 
@@ -5381,1178 +6149,1040 @@ msgstr ""
 msgid "Formal parameter data"
 msgstr ""
 
-#: ../objects/UML/classicon.c:131
-msgid "Boundary"
-msgstr ""
-
-#: ../objects/UML/classicon.c:144
-msgid "Is object"
-msgstr "Estas objekto"
-
-#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr ""
 
-#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr ""
 
-#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr ""
 
-#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr ""
 
-#: ../objects/UML/constraint.c:127
+#: ../objects/UML/constraint.c:126
 msgid "Constraint:"
 msgstr ""
 
-#: ../objects/UML/dependency.c:138
+#: ../objects/UML/dependency.c:136
 msgid "Show arrow:"
 msgstr "Montri la sago:"
 
 #. 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:127 ../objects/UML/implements.c:129
 msgid "Interface:"
 msgstr "Interfaco:"
 
-#: ../objects/UML/lifeline.c:165
+#: ../objects/UML/lifeline.c:164
 msgid "Draw focus of control:"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:167
+#: ../objects/UML/lifeline.c:166
 msgid "Draw destruction mark:"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:535
+#: ../objects/UML/lifeline.c:528
 msgid "Add connection points"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:536
+#: ../objects/UML/lifeline.c:529
 msgid "Remove connection points"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:537
+#: ../objects/UML/lifeline.c:530
 msgid "Increase connection points distance"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:538
+#: ../objects/UML/lifeline.c:531
 msgid "Decrease connection points distance"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:539
+#: ../objects/UML/lifeline.c:532
 msgid "Set default connection points distance"
 msgstr ""
 
-#: ../objects/UML/lifeline.c:543
+#: ../objects/UML/lifeline.c:536
 msgid "UML Lifeline"
 msgstr ""
 
-#: ../objects/UML/message.c:137
+#: ../objects/UML/message.c:136
 msgid "Call"
 msgstr "Voki"
 
-#: ../objects/UML/message.c:138
+#: ../objects/UML/message.c:137
 msgid "Create"
 msgstr "Krei"
 
-#: ../objects/UML/message.c:139
+#: ../objects/UML/message.c:138
 msgid "Destroy"
 msgstr ""
 
-#: ../objects/UML/message.c:140
+#: ../objects/UML/message.c:139
 msgid "Simple"
 msgstr "Simpla"
 
-#: ../objects/UML/message.c:141
+#: ../objects/UML/message.c:140
 msgid "Return"
 msgstr ""
 
-#: ../objects/UML/message.c:142
+#: ../objects/UML/message.c:141
 msgid "Send"
 msgstr "Sendi"
 
-#: ../objects/UML/message.c:143
+#: ../objects/UML/message.c:142
 msgid "Recursive"
 msgstr "Rekursia"
 
-#: ../objects/UML/message.c:154
+#: ../objects/UML/message.c:153
 msgid "Message type:"
 msgstr "Tipo de mesaĝo:"
 
-#: ../objects/UML/object.c:151
+#: ../objects/UML/object.c:148
 msgid "Explicit state"
 msgstr ""
 
-#: ../objects/UML/object.c:156
+#: ../objects/UML/object.c:153
 msgid "Active object"
 msgstr ""
 
-#: ../objects/UML/object.c:158
+#: ../objects/UML/object.c:155
 msgid "Show attributes"
 msgstr "Montri atributojn"
 
-#: ../objects/UML/object.c:160
+#: ../objects/UML/object.c:157
 msgid "Multiple instance"
 msgstr "Multaj instancoj"
 
-#: ../objects/UML/state.c:151
+#: ../objects/UML/state.c:147
 msgid "Entry action"
 msgstr ""
 
-#: ../objects/UML/state.c:152
+#: ../objects/UML/state.c:148
 msgid "Do action"
 msgstr ""
 
-#: ../objects/UML/state.c:153
+#: ../objects/UML/state.c:149
 msgid "Exit action"
 msgstr ""
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:493
+#: ../objects/UML/state.c:482
 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"
 msgstr ""
 
-#: ../objects/UML/state_term.c:127
+#: ../objects/UML/state_term.c:122
 msgid "Is final"
 msgstr ""
 
-#: ../objects/UML/transition.c:142
+#: ../objects/UML/transition.c:141
 msgid "Trigger"
 msgstr ""
 
-#: ../objects/UML/transition.c:143
+#: ../objects/UML/transition.c:142
 msgid "The event that causes this transition to be taken"
 msgstr ""
 
-#: ../objects/UML/transition.c:144
+#: ../objects/UML/transition.c:143
 msgid "Action"
 msgstr ""
 
-#: ../objects/UML/transition.c:145
+#: ../objects/UML/transition.c:144
 msgid "Action to perform when this transition is taken"
 msgstr ""
 
-#: ../objects/UML/transition.c:146 ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:21
 msgid "Guard"
 msgstr ""
 
-#: ../objects/UML/transition.c:147
+#: ../objects/UML/transition.c:146
 msgid "Condition for taking this transition when the event is fired"
 msgstr ""
 
-#: ../objects/UML/uml.c:67
-msgid "Unified Modelling Language diagram objects UML 1.3"
+#: ../objects/UML/umlattribute.c:50 ../objects/UML/umloperation.c:77
+msgid "Scope"
 msgstr ""
 
-#: ../objects/UML/umlattribute.c:47
-msgid "Abstract (?)"
+#: ../objects/UML/umlattribute.c:50
+msgid "Class scope (C++ static class variable)"
 msgstr ""
 
-#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
-msgid "Class scope (static)"
+#: ../objects/UML/uml.c:67
+msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr ""
 
 #: ../objects/UML/umloperation.c:73
-msgid "Inheritance type"
+msgid "Inheritance"
 msgstr ""
 
 #: ../objects/UML/umloperation.c:75
-msgid "Query (const)"
+msgid "C++ const method"
 msgstr ""
 
-#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
-msgid "Parameters"
+#: ../objects/UML/umloperation.c:77
+msgid "Class scope (C++ static method)"
 msgstr ""
 
-#: ../objects/UML/usecase.c:133
+#: ../objects/UML/usecase.c:130
 msgid "Collaboration"
 msgstr ""
 
-#: ../objects/UML/usecase.c:135
+#: ../objects/UML/usecase.c:132
 msgid "Text outside"
 msgstr ""
 
-#: ../objects/chronogram/chronogram.c:40
-msgid "Chronogram diagram objects"
+#: ../plug-ins/cairo/diacairo.c:111 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/hpgl/hpgl.c:665
+#, c-format
+msgid "Can't open output file %s."
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
-msgid "Data"
-msgstr "Datumoj"
-
-#: ../objects/chronogram/chronoline.c:152
-msgid "Data name"
+#: ../plug-ins/cairo/diacairo.c:119
+#, c-format
+msgid ""
+"Can't convert output filename '%s' to locale encoding.\n"
+"Please choose a different name to save with Cairo.\n"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:154
-msgid "Events"
+#: ../plug-ins/cairo/diacairo.c:291 ../plug-ins/cairo/diacairo.c:307
+#, c-format
+msgid "Can't write %d bytes to %s"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:157
-msgid "Event specification"
+#: ../plug-ins/cairo/diacairo.c:320
+msgid "Clipboard copy failed"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:158
-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"
+#: ../plug-ins/cairo/diacairo.c:348 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1476
+msgid "Nothing to print"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
-msgid "Start time"
-msgstr "Komenca horo"
-
-#: ../objects/chronogram/chronoline.c:168
-#: ../objects/chronogram/chronoref.c:150
-msgid "End time"
-msgstr "Fina horo"
-
-#: ../objects/chronogram/chronoline.c:170
-msgid "Rise time"
+#: ../plug-ins/cairo/diacairo.c:365
+msgid "Cairo PostScript"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:172
-msgid "Fall time"
+#: ../plug-ins/cairo/diacairo.c:376
+msgid "Cairo Portable Document Format"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:173
-msgid "Multi-bit data"
+#: ../plug-ins/cairo/diacairo.c:388
+msgid "Cairo Scalable Vector Graphics"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:175
-#: ../objects/chronogram/chronoref.c:158
-msgid "Aspect"
+#: ../plug-ins/cairo/diacairo.c:400
+msgid "CairoScript"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:177
-msgid "Data color"
+#: ../plug-ins/cairo/diacairo.c:411
+msgid "Cairo PNG"
 msgstr ""
 
-#: ../objects/chronogram/chronoline.c:179
-msgid "Data line width"
+#: ../plug-ins/cairo/diacairo.c:419
+msgid "Cairo PNG (with alpha)"
 msgstr ""
 
-#: ../objects/chronogram/chronoref.c:146
-msgid "Time data"
+#: ../plug-ins/cairo/diacairo.c:429
+msgid "Cairo EMF"
 msgstr ""
 
-#: ../objects/chronogram/chronoref.c:152
-msgid "Major time step"
+#: ../plug-ins/cairo/diacairo.c:439
+msgid "Cairo WMF"
 msgstr ""
 
-#: ../objects/chronogram/chronoref.c:154
-msgid "Minor time step"
+#: ../plug-ins/cairo/diacairo.c:453
+msgid "Cairo Clipboard Copy"
 msgstr ""
 
-#: ../objects/chronogram/chronoref.c:164
-msgid "Minor step line width"
-msgstr ""
+#: ../plug-ins/cairo/diacairo.c:467
+msgid "Copy _Diagram"
+msgstr "Kopii _Skemo"
 
-#: ../objects/custom/custom.c:140
-msgid "Custom"
-msgstr "Propre"
+#: ../plug-ins/cairo/diacairo.c:476
+msgid "Print (GTK) …"
+msgstr "Presi (GTK) …"
 
-#: ../objects/custom/custom.c:140
-msgid "Custom XML shapes loader"
+#: ../plug-ins/cairo/diacairo.c:525
+msgid "Cairo-based Rendering"
 msgstr ""
 
-#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:243
-msgid "Flip horizontal"
-msgstr "Renversi horizontale"
-
-#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:245
-msgid "Flip vertical"
-msgstr "Renversi vertikale"
+#: ../plug-ins/cairo/diacairo-interactive.c:408
+#: ../plug-ins/cairo/diacairo-interactive.c:409
+msgid "Zoom pointer"
+msgstr ""
 
-#: ../objects/custom/custom_object.c:215 ../objects/custom/custom_object.c:248
-msgid "Scale of the subshapes"
+#: ../plug-ins/cairo/diacairo-interactive.c:415
+#: ../plug-ins/cairo/diacairo-interactive.c:416
+msgid "Visible rect pointer"
 msgstr ""
 
-#: ../objects/custom/custom_object.c:1764
-msgid "Flip Horizontal"
-msgstr "Renversi horizontale"
+#: ../plug-ins/cairo/diacairo-renderer.c:1030
+#: ../plug-ins/cairo/diacairo-renderer.c:1065
+#: ../plug-ins/libart/dialibartrenderer.c:1226
+#: ../plug-ins/metapost/render_metapost.c:870
+#: ../plug-ins/postscript/diapsrenderer.c:662
+#: ../plug-ins/pstricks/render_pstricks.c:778 ../plug-ins/wpg/wpg.c:888
+msgid "Not enough memory for image drawing."
+msgstr ""
 
-#: ../objects/custom/custom_object.c:1765
-msgid "Flip Vertical"
-msgstr "Renversi vertikale"
+#: ../plug-ins/cgm/cgm.c:1021
+msgid ""
+"Image row length larger than maximum cell array.\n"
+"Image not exported to CGM."
+msgstr ""
 
-#: ../objects/custom/custom_object.c:1802
-#: ../objects/custom_lines/custom_linetypes.c:264
-#, c-format
-msgid "Cannot open icon file %s for object type '%s'."
+#: ../plug-ins/cgm/cgm.c:1292
+msgid "Computer Graphics Metafile"
 msgstr ""
 
-#: ../objects/custom_lines/custom_lines.c:160
-msgid "CustomLines"
+#: ../plug-ins/cgm/cgm.c:1317
+msgid "Computer Graphics Metafile export filter"
 msgstr ""
 
-#: ../objects/custom_lines/custom_lines.c:160
-msgid "Custom XML lines loader"
+#: ../plug-ins/drs/dia-render-script.c:160
+#: ../plug-ins/drs/dia-render-script.c:165
+msgid "DiaRenderScript"
 msgstr ""
 
-#: ../objects/custom_lines/custom_linetypes.c:227
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+#: ../plug-ins/drs/dia-render-script.c:189
+msgid "DiaRenderScript filter"
 msgstr ""
 
-#: ../objects/custom_lines/custom_linetypes.c:252
-#, c-format
-msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
+#: ../plug-ins/drs/dia-render-script-import.c:456
+msgid "Broken file?"
 msgstr ""
 
-#: ../objects/custom/shape_info.c:165
-#, c-format
-msgid ""
-"The file '%s' has invalid path data.\n"
-"svg:path data must start with moveto."
+#: ../plug-ins/dxf/dxf.c:50
+msgid "Drawing Interchange File import and export filters"
 msgstr ""
 
-#: ../objects/flowchart/flowchart.c:37
-msgid "Flowchart objects"
+#: ../plug-ins/dxf/dxf-export.c:572 ../plug-ins/dxf/dxf-import.c:1389
+msgid "Drawing Interchange File"
 msgstr ""
 
-#: ../objects/flowchart/parallelogram.c:156
-msgid "Shear angle"
+#: ../plug-ins/dxf/dxf-import.c:1299
+#, c-format
+msgid "read_dxf_codes failed on '%s'"
 msgstr ""
 
-#: ../objects/network/basestation.c:137
-msgid "Sectors"
+#: ../plug-ins/dxf/dxf-import.c:1306
+#, c-format
+msgid "Binary DXF from '%s' not supported"
 msgstr ""
 
-#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
-msgid "Base Station"
+#: ../plug-ins/hpgl/hpgl.c:708
+msgid "HP Graphics Language"
 msgstr ""
 
-#: ../objects/network/network.c:43
-msgid "Network diagram objects"
+#: ../plug-ins/hpgl/hpgl.c:733
+msgid "HP Graphics Language export filter"
 msgstr ""
 
-#: ../objects/network/radiocell.c:121
-msgid "Radius"
+#: ../plug-ins/layout/layout.cpp:235
+msgid "Please select edges and nodes to layout."
 msgstr ""
 
-#: ../objects/network/wanlink.c:120
-msgid "Width"
-msgstr "Larĝo"
+#: ../plug-ins/layout/layout.cpp:240
+#, fuzzy
+#| msgid "'%s' creation failed"
+msgid "Graph creation failed"
+msgstr "kreo de '%s' malsukcesis"
 
-#: ../objects/standard/arc.c:145
-msgid "Curve distance"
+#: ../plug-ins/layout/layout.cpp:266
+msgid "No such module."
 msgstr ""
 
-#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:141
-msgid "Line gaps"
+#: ../plug-ins/layout/layout.cpp:267
+msgid "Out of memory."
 msgstr ""
 
-#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
-#: ../objects/standard/polyline.c:143
-msgid "Absolute start gap"
+#: ../plug-ins/layout/layout.cpp:268
+msgid "Not a tree."
 msgstr ""
 
-#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
-#: ../objects/standard/polyline.c:145
-msgid "Absolute end gap"
+#: ../plug-ins/layout/layout.cpp:269
+msgid "Not a forest."
 msgstr ""
 
-#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
-msgid "Add Segment"
+#: ../plug-ins/layout/layout.cpp:270
+msgid "Failed algorithm."
 msgstr ""
 
-#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
-msgid "Delete Segment"
+#: ../plug-ins/layout/layout.cpp:271
+msgid "Failed precondition."
 msgstr ""
 
-#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
-msgid "Symmetric control"
+#: ../plug-ins/layout/layout.cpp:272
+msgid "OGDF crashed."
 msgstr ""
 
-#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
-msgid "Smooth control"
+#: ../plug-ins/layout/layout.cpp:273
+msgid "Unknown reason"
 msgstr ""
 
-#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
-msgid "Cusp control"
+#: ../plug-ins/layout/layout.cpp:275
+#, c-format
+msgid ""
+"Layout '%s' failed.\n"
+"%s"
 msgstr ""
 
-#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
-msgid "Free"
+#: ../plug-ins/layout/layout.cpp:416
+msgid "OGDF Layout Algorithms"
 msgstr ""
 
-#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
-msgid "Fixed"
+#: ../plug-ins/libart/dialibart.c:58
+msgid "Libart-based rendering"
 msgstr ""
 
-#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
-msgid "Square"
+#: ../plug-ins/libart/dialibartrenderer.c:1374
+msgid "Renderer transformation"
 msgstr ""
 
-#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
-msgid "Aspect ratio"
+#: ../plug-ins/libart/dialibartrenderer.c:1375
+msgid "Transform pointer"
 msgstr ""
 
-#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
-msgid "Free aspect"
+#: ../plug-ins/libart/export_png.c:159 ../plug-ins/xslt/xslt.c:105
+#, c-format
+msgid "Can't open output file %s: %s\n"
 msgstr ""
 
-#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
-msgid "Fixed aspect"
+#: ../plug-ins/libart/export_png.c:167
+msgid "Could not create PNG write structure"
 msgstr ""
 
-#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
-msgid "Circle"
-msgstr "Cirklo"
-
-#: ../objects/standard/image.c:144
-msgid "Image file"
-msgstr "Bilddosiero"
-
-#: ../objects/standard/image.c:146
-msgid "Inline data"
+#: ../plug-ins/libart/export_png.c:176
+msgid "Could not create PNG header info structure"
 msgstr ""
 
-#: ../objects/standard/image.c:146
-msgid "Store image data in diagram"
+#: ../plug-ins/libart/export_png.c:184
+msgid "Error occurred while writing PNG"
 msgstr ""
 
-#: ../objects/standard/image.c:148
-msgid "Pixbuf"
+#. Create a dialog
+#: ../plug-ins/libart/export_png.c:328
+msgid "PNG Export Options"
 msgstr ""
 
-#: ../objects/standard/image.c:148
-msgid "The Pixbuf reference"
+#: ../plug-ins/libart/export_png.c:334
+msgid "Image width:"
 msgstr ""
 
-#: ../objects/standard/image.c:150
-msgid "Draw border"
+#: ../plug-ins/libart/export_png.c:337
+msgid "Image height:"
 msgstr ""
 
-#: ../objects/standard/image.c:152
-msgid "Keep aspect ratio"
+#: ../plug-ins/libart/export_png.c:384
+msgid "PNG (antialiased)"
 msgstr ""
 
-#: ../objects/standard/image.c:671
-msgid "Inconsistent pixbuf during image save."
+#: ../plug-ins/metapost/metapost.c:46
+msgid "TeX Metapost export filter"
 msgstr ""
 
-#. Found file in same dir as diagram.
-#. Found file in current dir.
-#: ../objects/standard/image.c:768 ../objects/standard/image.c:779
-#, c-format
-msgid ""
-"The image file '%s' was not found in the specified directory.\n"
-"Using the file '%s' instead.\n"
+#: ../plug-ins/metapost/render_metapost.c:1104
+msgid "TeX Metapost macros"
 msgstr ""
 
-#. Didn't find file in current dir.
-#: ../objects/standard/image.c:785 ../objects/standard/image.c:807
-#, c-format
-msgid "The image file '%s' was not found.\n"
+#: ../plug-ins/pdf/pdf.c:30
+msgid "PDF import not available."
 msgstr ""
 
-#: ../objects/standard/line.c:136
-msgid "Arrows"
+#: ../plug-ins/pdf/pdf.c:39
+msgid "Portable Document File"
 msgstr ""
 
-#: ../objects/standard/line.c:141
-msgid "Start point"
+#: ../plug-ins/pdf/pdf.c:57
+msgid "PDF import filter"
 msgstr ""
 
-#: ../objects/standard/line.c:143
-msgid "End point"
+#: ../plug-ins/pdf/pdf-import.cpp:410
+#, c-format
+msgid "Page %d"
 msgstr ""
 
-#: ../objects/standard/outline.c:204
-msgid "Text content"
+#: ../plug-ins/pdf/pdf-import.cpp:871
+#, c-format
+msgid ""
+"PDF document not OK.\n"
+"%s"
 msgstr ""
 
-#: ../objects/standard/outline.c:206
-msgid "Angle to rotate the outline"
+#: ../plug-ins/pgf/pgf.c:26
+msgid "LaTeX PGF export filter"
 msgstr ""
 
-#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
-msgid "Add Corner"
+#: ../plug-ins/pgf/render_pgf.c:1096 ../plug-ins/pstricks/render_pstricks.c:686
+msgid "Not valid UTF-8"
 msgstr ""
 
-#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
-msgid "Delete Corner"
+#: ../plug-ins/pgf/render_pgf.c:1252
+msgid "LaTeX PGF macros"
 msgstr ""
 
-#: ../objects/standard/standard.c:46
-msgid "Standard objects"
+#: ../plug-ins/pixbuf/pixbuf.c:86
+msgid "Failed to create pixbuf from drawable."
 msgstr ""
 
-#: ../objects/standard/textobj.c:139
-msgid "First Line"
+#: ../plug-ins/pixbuf/pixbuf.c:91
+#, c-format
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s"
 msgstr ""
+"Ne povas konservi dosieron:\n"
+"T%s\n"
+"%s"
 
-#: ../objects/standard/textobj.c:146
-msgid "Vertical text alignment"
+#: ../plug-ins/pixbuf/pixbuf.c:112
+msgid "Calling error, missing user_data."
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo-interactive.c:377
-#: ../plug-ins/cairo/diacairo-interactive.c:378
-msgid "Zoom pointer"
+#: ../plug-ins/pixbuf/pixbuf.c:141
+#, c-format
+msgid ""
+"Pixbuf[%s] can't load:\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo-interactive.c:384
-#: ../plug-ins/cairo/diacairo-interactive.c:385
-msgid "Visible rect pointer"
+#: ../plug-ins/pixbuf/pixbuf.c:196
+msgid "gdk-pixbuf-based bitmap export/import"
 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/postscript/paginate_psprint.c:273
+msgid "Select Printer"
+msgstr "Elekti presilon"
+
+#: ../plug-ins/postscript/paginate_psprint.c:285
+#: ../sheets/ciscocomputer.sheet.in.h:37
+msgid "Printer"
+msgstr "Presilo"
+
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
+msgid "File"
+msgstr "Dosiero"
 
-#: ../plug-ins/cairo/diacairo.c:133
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
-msgid ""
-"Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with Cairo.\n"
+msgid "Could not run command '%s': %s"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:305 ../plug-ins/cairo/diacairo.c:321
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
-msgid "Can't write %d bytes to %s"
+msgid "Could not open '%s' for writing: %s"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:334
-msgid "Clipboard copy failed"
+#: ../plug-ins/postscript/paginate_psprint.c:489
+#, c-format
+msgid "Printing error: command '%s' returned %d\n"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:359 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1488
-msgid "Nothing to print"
+#: ../plug-ins/postscript/paginate_psprint.c:500
+#, c-format
+msgid "Printing error: command '%s' caused sigpipe."
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:374
-msgid "Cairo PostScript"
+#: ../plug-ins/postscript/postscript.c:47
+msgid "Print (PS)"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:385
-msgid "Cairo Portable Document Format"
+#: ../plug-ins/postscript/postscript.c:82
+msgid "PostScript Rendering"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:397
-msgid "Cairo Scalable Vector Graphics"
+#: ../plug-ins/postscript/render_eps.c:168
+msgid "Encapsulated PostScript (using Pango fonts)"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:409
-msgid "CairoScript"
+#: ../plug-ins/postscript/render_eps.c:177
+msgid "Encapsulated Postscript with preview (using Pango fonts)"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:420
-msgid "Cairo PNG"
+#: ../plug-ins/postscript/render_eps.c:187
+msgid "Encapsulated PostScript (using PS Latin-1 fonts)"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:428
-msgid "Cairo PNG (with alpha)"
+#: ../plug-ins/pstricks/pstricks.c:26
+msgid "TeX PSTricks export filter"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:438
-msgid "Cairo EMF"
+#: ../plug-ins/pstricks/render_pstricks.c:939
+msgid "TeX PSTricks macros"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:448
-msgid "Cairo WMF"
+#: ../plug-ins/python/pydia-render.c:1102
+#, c-format
+msgid "Couldn't open '%s' for writing.\n"
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:472
-msgid "Copy _Diagram"
-msgstr "Kopii _Skemo"
-
-#: ../plug-ins/cairo/diacairo.c:481
-msgid "Print (GTK) …"
-msgstr "Presi (GTK) …"
+#: ../plug-ins/python/python.c:95
+msgid "Python scripting support"
+msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:528
-msgid "Cairo-based Rendering"
+#: ../plug-ins/shape/shape.c:36
+msgid "Dia shape export filter"
 msgstr ""
 
-#: ../plug-ins/cgm/cgm.c:1118
-msgid ""
-"Image row length larger than maximum cell array.\n"
-"Image not exported to CGM."
+#: ../plug-ins/shape/shape-export.c:622
+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr ""
 
-#: ../plug-ins/cgm/cgm.c:1378
-msgid "Computer Graphics Metafile"
+#: ../plug-ins/shape/shape-export.c:636
+msgid "Can't export PNG icon without export plugin!"
 msgstr ""
 
-#: ../plug-ins/cgm/cgm.c:1403
-msgid "Computer Graphics Metafile export filter"
+#: ../plug-ins/shape/shape-export.c:662
+msgid "Dia Shape File"
 msgstr ""
 
-#: ../plug-ins/drs/dia-render-script-import.c:225
-msgid "Broken file?"
+#: ../plug-ins/svg/svg.c:60
+msgid "Scalable Vector Graphics import and export filters"
 msgstr ""
 
-#: ../plug-ins/drs/dia-render-script.c:156
-#: ../plug-ins/drs/dia-render-script.c:161
-msgid "DiaRenderScript"
+#: ../plug-ins/svg/svg-import.c:220
+#, c-format
+msgid "Failed to apply transformation for '%s'"
 msgstr ""
 
-#: ../plug-ins/drs/dia-render-script.c:185
-msgid "DiaRenderScript filter"
+#: ../plug-ins/svg/svg-import.c:658
+msgid ""
+"Invalid path data.\n"
+"svg:path data must start with moveto."
 msgstr ""
 
-#: ../plug-ins/dxf/dxf-export.c:653 ../plug-ins/dxf/dxf-import.c:1390
-msgid "Drawing Interchange File"
+#: ../plug-ins/svg/svg-import.c:1895
+msgid "'Shape Design' shapes missing."
 msgstr ""
 
-#: ../plug-ins/dxf/dxf-import.c:1300
+#: ../plug-ins/svg/svg-import.c:1929
+#, fuzzy, c-format
+#| msgid "'%s' creation failed"
+msgid "Object '%s' creation failed"
+msgstr "kreo de '%s' malsukcesis"
+
+#: ../plug-ins/svg/svg-import.c:1955
 #, c-format
-msgid "read_dxf_codes failed on '%s'\n"
+msgid ""
+"Parse error for memory block.\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/dxf/dxf-import.c:1307
+#: ../plug-ins/svg/svg-import.c:1973
 #, c-format
-msgid "Binary DXF from '%s' not supported\n"
+msgid ""
+"SVG parser error for %s\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/dxf/dxf.c:50
-msgid "Drawing Interchange File import and export filters"
+#. just a warning
+#: ../plug-ins/svg/svg-import.c:1979
+#, c-format
+msgid ""
+"SVG parser warning for %s\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/hpgl/hpgl.c:751
-msgid "HP Graphics Language"
+#: ../plug-ins/svg/svg-import.c:2012
+msgid "Expected SVG name-space not found in file"
 msgstr ""
 
-#: ../plug-ins/hpgl/hpgl.c:776
-msgid "HP Graphics Language export filter"
+#: ../plug-ins/svg/svg-import.c:2032
+#, c-format
+msgid "root element was '%s' -- expecting 'svg'."
 msgstr ""
 
-#: ../plug-ins/libart/dialibart.c:59
-msgid "Libart-based rendering"
+#: ../plug-ins/vdx/vdx.c:54
+msgid "Visio XML Format import and export filter"
 msgstr ""
 
-#: ../plug-ins/libart/export_png.c:167
-msgid "Could not create PNG write structure"
+#: ../plug-ins/vdx/vdx-export.c:1764
+#, c-format
+msgid "Saving file '%s' failed."
 msgstr ""
 
-#: ../plug-ins/libart/export_png.c:176
-msgid "Could not create PNG header info structure"
+#: ../plug-ins/vdx/vdx-export.c:1775
+msgid "Visio XML format"
 msgstr ""
 
-#: ../plug-ins/libart/export_png.c:184
-msgid "Error occurred while writing PNG"
-msgstr ""
+#: ../plug-ins/vdx/vdx-import.c:222
+#, fuzzy, c-format
+#| msgid "Couldn't open '%s': %s"
+msgid "Couldn't read color: %s"
+msgstr "Ne povas malfermi '%s': %s"
 
-#. Create a dialog
-#: ../plug-ins/libart/export_png.c:327
-msgid "PNG Export Options"
+#: ../plug-ins/vdx/vdx-import.c:536
+#, fuzzy, c-format
+#| msgid "Could not find help directory"
+msgid "Couldn't find shape %d"
+msgstr "Ne povis trovi helpan dosierujon"
+
+#: ../plug-ins/vdx/vdx-import.c:1066
+#, c-format
+msgid "Unexpected Ellipse object: %s"
 msgstr ""
 
-#: ../plug-ins/libart/export_png.c:333
-msgid "Image width:"
+#: ../plug-ins/vdx/vdx-import.c:1080
+msgid "Can't rotate ellipse"
 msgstr ""
 
-#: ../plug-ins/libart/export_png.c:336
-msgid "Image height:"
+#: ../plug-ins/vdx/vdx-import.c:1411
+msgid "MoveTo not at start of Bezier"
 msgstr ""
 
-#: ../plug-ins/libart/export_png.c:382
-msgid "PNG (antialiased)"
+#: ../plug-ins/vdx/vdx-import.c:1761
+msgid "Invalid NURBS formula"
 msgstr ""
 
-#: ../plug-ins/libart/dialibartrenderer.c:304
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
+#: ../plug-ins/vdx/vdx-import.c:2020
+#, c-format
+msgid "Couldn't handle foreign object type %s"
 msgstr ""
 
-#: ../plug-ins/libart/dialibartrenderer.c:1476
-msgid "Renderer transformation"
+#: ../plug-ins/vdx/vdx-import.c:2949
+#, c-format
+msgid ""
+"VDX parser error for %s\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/libart/dialibartrenderer.c:1477
-msgid "Transform pointer"
+#: ../plug-ins/vdx/vdx-import.c:2961
+msgid "Nothing in document!"
 msgstr ""
 
-#: ../plug-ins/metapost/metapost.c:46
-msgid "TeX Metapost export filter"
+#: ../plug-ins/vdx/vdx-import.c:2966
+#, c-format
+msgid "Expecting VisioDocument, got %s"
 msgstr ""
 
-#: ../plug-ins/metapost/render_metapost.c:1265
-msgid "TeX Metapost macros"
+#: ../plug-ins/vdx/vdx-import.c:3050
+msgid "Visio XML File Format"
 msgstr ""
 
-#: ../plug-ins/pgf/pgf.c:26
-msgid "LaTeX PGF export filter"
+#: ../plug-ins/vdx/vdx-xml.c:3343
+#, c-format
+msgid "Can't decode object %s"
 msgstr ""
 
-#: ../plug-ins/pgf/render_pgf.c:1112
-#: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF-8"
+#: ../plug-ins/wmf/wmf.cpp:317
+#, c-format
+msgid ""
+"Couldn't write file %s\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/pgf/render_pgf.c:1263
-msgid "LaTeX PGF macros"
-msgstr ""
-
-#: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf-based bitmap export/import"
-msgstr ""
-
-#: ../plug-ins/postscript/paginate_psprint.c:273
-msgid "Select Printer"
-msgstr "Elekti presilon"
-
-#: ../plug-ins/postscript/paginate_psprint.c:285
-#: ../sheets/ciscocomputer.sheet.in.h:36
-msgid "Printer"
-msgstr "Presilo"
-
-#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
-msgid "File"
-msgstr "Dosiero"
-
-#: ../plug-ins/postscript/paginate_psprint.c:464
-#, c-format
-msgid "Could not run command '%s': %s"
-msgstr ""
-
-#: ../plug-ins/postscript/paginate_psprint.c:467
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr ""
-
-#: ../plug-ins/postscript/paginate_psprint.c:489
-#, c-format
-msgid "Printing error: command '%s' returned %d\n"
-msgstr ""
-
-#: ../plug-ins/postscript/paginate_psprint.c:500
-#, c-format
-msgid "Printing error: command '%s' caused sigpipe."
-msgstr ""
-
-#: ../plug-ins/postscript/render_eps.c:150
-msgid "Encapsulated PostScript (using Pango fonts)"
-msgstr ""
-
-#: ../plug-ins/postscript/render_eps.c:159
-msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr ""
-
-#: ../plug-ins/postscript/render_eps.c:169
-msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
-msgstr ""
-
-#: ../plug-ins/postscript/postscript.c:47
-msgid "Print (PS)"
-msgstr ""
-
-#: ../plug-ins/postscript/postscript.c:71
-msgid "PostScript Rendering"
-msgstr ""
-
-#: ../plug-ins/pstricks/pstricks.c:26
-msgid "TeX PSTricks export filter"
-msgstr ""
-
-#: ../plug-ins/pstricks/render_pstricks.c:990
-msgid "TeX PSTricks macros"
-msgstr ""
-
-#: ../plug-ins/python/pydia-render.c:933
+#: ../plug-ins/wmf/wmf.cpp:557
 #, c-format
-msgid "Couldn't open '%s' for writing.\n"
-msgstr ""
-
-#: ../plug-ins/python/python.c:96
-msgid "Python scripting support"
-msgstr ""
-
-#: ../plug-ins/shape/shape-export.c:480
-msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
-msgstr ""
-
-#: ../plug-ins/shape/shape-export.c:494
-msgid "Can't export PNG icon without export plugin!"
-msgstr ""
-
-#: ../plug-ins/shape/shape-export.c:518
-msgid "Dia Shape File"
-msgstr ""
-
-#: ../plug-ins/shape/shape.c:36
-msgid "Dia shape export filter"
-msgstr ""
-
-#: ../plug-ins/svg/svg-import.c:322
 msgid ""
-"Invalid path data.\n"
-"svg:path data must start with moveto."
-msgstr ""
-
-#: ../plug-ins/svg/svg-import.c:1120
-msgid "Expected SVG Namespace not found in file"
-msgstr ""
-
-#: ../plug-ins/svg/svg-import.c:1140
-#, c-format
-msgid "root element was '%s' -- expecting 'svg'."
-msgstr ""
-
-#: ../plug-ins/svg/svg.c:50
-msgid "Scalable Vector Graphics import and export filters"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-export.c:1863
-msgid "Visio XML format"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:223 ../plug-ins/xfig/xfig-import.c:1049
-#, c-format
-msgid "Couldn't read color: %s\n"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:536
-#, c-format
-msgid "Couldn't find shape %d\n"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:1011
-#, c-format
-msgid "Unexpected Ellipse object: %s\n"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:1025
-msgid "Can't rotate ellipse\n"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:1356
-msgid "MoveTo not at start of Bezier\n"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:1706
-msgid "Invalid NURBS formula"
-msgstr ""
-
-#: ../plug-ins/vdx/vdx-import.c:1964
-#, c-format
-msgid "Couldn't handle foreign object type %s"
+"Cannot render unknown font:\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-import.c:2971
-msgid "Visio XML File Format"
+#: ../plug-ins/wmf/wmf.cpp:1487
+msgid "Print (GDI) ..."
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-xml.c:3344
-#, c-format
-msgid "Can't decode object %s"
+#: ../plug-ins/wmf/wmf.cpp:1503
+msgid "WMF export filter"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx-xml.c:5187
-#, c-format
-msgid "Can't write object %u"
+#: ../plug-ins/wpg/wpg.c:1114 ../plug-ins/wpg/wpg.c:1120
+msgid "WordPerfect Graphics"
 msgstr ""
 
-#: ../plug-ins/vdx/vdx.c:53
-msgid "Visio XML Format import and export filter"
+#: ../plug-ins/wpg/wpg.c:1145
+msgid "WordPerfect Graphics export filter"
 msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:309
+#: ../plug-ins/wpg/wpg-import.c:479
 #, c-format
-msgid ""
-"Couldn't write file %s\n"
-"%s"
+msgid "File: %s type/version unsupported.\n"
 msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:558
+#: ../plug-ins/wpg/wpg-import.c:621
 #, c-format
-msgid ""
-"Cannot render unknown font:\n"
-"%s"
+msgid "Unknown WPG type %d size %d."
 msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:1365
+#: ../plug-ins/wpg/wpg-import.c:626
 #, c-format
-msgid "Couldn't open: '%s' for writing.\n"
-msgstr ""
-
-#: ../plug-ins/wmf/wmf.cpp:1496
-msgid "Print (GDI) ..."
-msgstr ""
-
-#: ../plug-ins/wmf/wmf.cpp:1511
-msgid "WMF export filter"
+msgid "Size 0 on WPG type %d, expecting WPG_END\n"
 msgstr ""
 
-#: ../plug-ins/wpg/wpg.c:1194
+#: ../plug-ins/wpg/wpg-import.c:635
 #, c-format
-msgid "File: %s type/version unsupported.\n"
+msgid "Unexpected end of file. WPG type %d, size %d.\n"
 msgstr ""
 
-#: ../plug-ins/wpg/wpg.c:1325 ../plug-ins/wpg/wpg.c:1332
-msgid "WPG"
+#: ../plug-ins/wpg/wpg-import.c:645
+msgid "Empty WPG file?"
 msgstr ""
 
-#: ../plug-ins/wpg/wpg.c:1360
-msgid "WordPerfect Graphics export filter"
+#: ../plug-ins/xfig/xfig.c:52
+msgid "Fig Format import and export filter"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-export.c:464
+#: ../plug-ins/xfig/xfig-export.c:470
 #, c-format
 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:493
 msgid "No more user-definable colors - using black"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-export.c:1211
+#: ../plug-ins/xfig/xfig-export.c:1154
 msgid "Xfig format"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:111
+#: ../plug-ins/xfig/xfig-import.c:109
 #, c-format
 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:140
 msgid "Patterns are not supported by Dia"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:169
+#: ../plug-ins/xfig/xfig-import.c:168
 msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:173
+#: ../plug-ins/xfig/xfig-import.c:172
 #, c-format
-msgid "Line style %d should not appear\n"
+msgid "Line style %d should not appear"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:241
+#: ../plug-ins/xfig/xfig-import.c:244
 #, c-format
-msgid "Error while reading %dth of %d points: %s\n"
+msgid "Error while reading %dth of %d points"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:269
-msgid "Error while reading arrowhead\n"
+#: ../plug-ins/xfig/xfig-import.c:253
+msgid "Unexpected end of file."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:291
+#: ../plug-ins/xfig/xfig-import.c:273
+msgid "Error while reading arrowhead"
+msgstr ""
+
+#: ../plug-ins/xfig/xfig-import.c:295
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:382
+#: ../plug-ins/xfig/xfig-import.c:387
 #, c-format
-msgid "Depth %d of of range, only 0-%d allowed.\n"
+msgid "Depth %d out of range, only 0-%d allowed.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:429
-#, c-format
-msgid "Couldn't read ellipse info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:435
+msgid "Couldn't read ellipse info."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:497
-#, c-format
-msgid "Couldn't read polyline info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:504
+msgid "Couldn't read polyline info.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:512
-#, c-format
-msgid "Couldn't read flipped bit: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:519
+msgid "Couldn't read flipped bit."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:530
+#: ../plug-ins/xfig/xfig-import.c:537
 msgid "Negative corner radius; negating"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:573
+#: ../plug-ins/xfig/xfig-import.c:580
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:723 ../plug-ins/xfig/xfig-import.c:755
-#, c-format
-msgid "Couldn't read spline info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:732 ../plug-ins/xfig/xfig-import.c:764
+msgid "Couldn't read spline info."
 msgstr ""
 
 #. 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:751 ../plug-ins/xfig/xfig-import.c:768
 msgid "Cannot convert approximated spline yet."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:798
+#: ../plug-ins/xfig/xfig-import.c:806
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:863
-#, c-format
-msgid "Couldn't read arc info: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:871
+msgid "Couldn't read arc info."
 msgstr ""
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:892
+#: ../plug-ins/xfig/xfig-import.c:899
 msgid "Filled arc treated as unfilled"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:896
+#: ../plug-ins/xfig/xfig-import.c:903
 #, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:960
+#: ../plug-ins/xfig/xfig-import.c:968
+msgid "Couldn't read text info."
+msgstr ""
+
+#: ../plug-ins/xfig/xfig-import.c:996
 #, c-format
-msgid "Couldn't read text info: %s\n"
+msgid "Can't find LaTeX font nr. %d, using sans"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1022
+#: ../plug-ins/xfig/xfig-import.c:1004
 #, c-format
-msgid "Couldn't identify Fig object: %s\n"
+msgid "Can't find Postscript font nr. %d, using sans"
+msgstr ""
+
+#: ../plug-ins/xfig/xfig-import.c:1032
+msgid "Couldn't identify Fig object."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1030
+#: ../plug-ins/xfig/xfig-import.c:1040
 msgid "Compound end outside compound\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1054
+#: ../plug-ins/xfig/xfig-import.c:1062
+msgid "Couldn't read color\n"
+msgstr ""
+
+#: ../plug-ins/xfig/xfig-import.c:1067
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1101
-#, c-format
-msgid "Couldn't read group extend: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1114
+msgid "Couldn't read group extent."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1112
+#: ../plug-ins/xfig/xfig-import.c:1125
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1136
+#: ../plug-ins/xfig/xfig-import.c:1150
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1146
-#, c-format
-msgid "Error reading paper size: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1160
+msgid "Error reading paper size."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1157
+#: ../plug-ins/xfig/xfig-import.c:1171
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1169
-#, c-format
-msgid "Error reading paper orientation: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1184
+msgid "Error reading paper orientation."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1179
-#, c-format
-msgid "Error reading justification: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1194
+msgid "Error reading justification."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1189
-#, c-format
-msgid "Error reading units: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1204
+msgid "Error reading units."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1205
-#, c-format
-msgid "Error reading magnification: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1220
+msgid "Error reading magnification."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1218
-#, c-format
-msgid "Error reading multipage indicator: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1233
+msgid "Error reading multipage indicator."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1229
-#, c-format
-msgid "Error reading transparent color: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1244
+msgid "Error reading transparent color."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1238 ../plug-ins/xfig/xfig-import.c:1296
-#: ../plug-ins/xfig/xfig-import.c:1314
-#, c-format
-msgid "Error reading Fig file: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1253 ../plug-ins/xfig/xfig-import.c:1314
+#: ../plug-ins/xfig/xfig-import.c:1332
+msgid "Error reading Fig file."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1240 ../plug-ins/xfig/xfig-import.c:1298
+#: ../plug-ins/xfig/xfig-import.c:1255
 msgid "Premature end of Fig file\n"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1249
-#, c-format
-msgid "Error reading resolution: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1264
+msgid "Error reading resolution."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1283
-#, c-format
-msgid "Doesn't look like a Fig file: %s\n"
+#: ../plug-ins/xfig/xfig-import.c:1300
+msgid "Doesn't look like a Fig file"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1289
+#: ../plug-ins/xfig/xfig-import.c:1306
 #, 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.\n"
+" It may not be importable."
 msgstr ""
 
-#: ../plug-ins/xfig/xfig-import.c:1337
-msgid "Xfig File Format"
+#: ../plug-ins/xfig/xfig-import.c:1316
+msgid "Premature end of Fig file"
 msgstr ""
 
-#: ../plug-ins/xfig/xfig.c:51
-msgid "Fig Format import and export filter"
+#: ../plug-ins/xfig/xfig-import.c:1355
+msgid "Xfig File Format"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:110
+#: ../plug-ins/xslt/xslt.c:114
 #, c-format
-msgid "Error while parsing %s\n"
+msgid ""
+"Error while parsing %s\n"
+"%s"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:119
+#: ../plug-ins/xslt/xslt.c:124
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:126
+#: ../plug-ins/xslt/xslt.c:131
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:135
+#: ../plug-ins/xslt/xslt.c:140
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:144
+#: ../plug-ins/xslt/xslt.c:149
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:152
+#: ../plug-ins/xslt/xslt.c:157
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:336
+#: ../plug-ins/xslt/xslt.c:343
 msgid "XSL Transformation filter"
 msgstr ""
 
-#: ../plug-ins/xslt/xslt.c:363
+#: ../plug-ins/xslt/xslt.c:370
 msgid "No valid configuration files found for the XSLT plugin; not loading."
 msgstr ""
 
@@ -6576,351 +7206,347 @@ msgstr ""
 msgid "AADL Shapes"
 msgstr ""
 
-#: ../sheets/AADL.sheet.in.h:3
-msgid "Bus"
+#: ../sheets/AADL.sheet.in.h:4
+msgid "Thread"
 msgstr ""
 
-#: ../sheets/AADL.sheet.in.h:5
-msgid "Device"
+#: ../sheets/AADL.sheet.in.h:6
+msgid "Processor"
 msgstr ""
 
-#: ../sheets/AADL.sheet.in.h:6
+#: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
 msgstr ""
 
-#: ../sheets/AADL.sheet.in.h:7
-msgid "Package"
-msgstr "Pakaĵo"
+#: ../sheets/AADL.sheet.in.h:8
+msgid "Bus"
+msgstr ""
 
 #: ../sheets/AADL.sheet.in.h:9
-msgid "Processor"
-msgstr ""
+msgid "System"
+msgstr "Sistemo"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
 msgstr ""
 
 #: ../sheets/AADL.sheet.in.h:11
-msgid "System"
-msgstr "Sistemo"
+msgid "Thread Group"
+msgstr ""
 
 #: ../sheets/AADL.sheet.in.h:12
-msgid "Thread"
+msgid "Device"
 msgstr ""
 
 #: ../sheets/AADL.sheet.in.h:13
-msgid "Thread Group"
+msgid "Package"
+msgstr "Pakaĵo"
+
+#. Please talk to me before making any changes to this sheet
+#: ../sheets/Assorted.sheet.in.h:2
+msgid "Assorted"
 msgstr ""
 
 #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
 #. Leave as is for now, renaming too much hassle.
 #. Will probably need to split into seperate sheets soon anyway.
-#: ../sheets/Assorted.sheet.in.h:4
+#: ../sheets/Assorted.sheet.in.h:6
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr ""
 
-#. Please talk to me before making any changes to this sheet
-#: ../sheets/Assorted.sheet.in.h:6
-msgid "Assorted"
-msgstr ""
-
 #: ../sheets/Assorted.sheet.in.h:7
-msgid "Chevron"
+msgid "Right angle triangle"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight-point star"
+msgid "Isosceles triangle"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four-point star"
+msgid "Perfect square, height equals width"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:10
-msgid "Diamond"
+msgid "Perfect circle"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:11
-msgid "Down arrow"
+msgid "Quarter circle"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight-point star"
+msgid "Diamond"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five-point star"
+msgid "Pentagon. Five-point shape"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four-point star"
+msgid "Hexagon. Six-point shape"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:15
-msgid "Heart"
+msgid "Heptagon. Seven-point shape"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven-point shape"
+msgid "Octagon. Eight-point shape"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six-point shape"
+msgid "Horizontal parallelogram"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:18
-msgid "Horizontal parallelogram"
+msgid "Vertical parallelogram"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isosceles triangle"
+msgid "Trapezoid"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:20
-msgid "Left arrow"
+msgid "Four-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:21
-msgid "Left-right arrow"
+msgid "Curved four-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:22
-msgid "Left-right-up arrow"
+msgid "Five-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:23
-msgid "Left-up arrow"
+msgid "Six-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:24
-msgid "Maltese cross"
+msgid "Seven-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:25
-msgid "Notched left arrow"
+msgid "Eight-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:26
-msgid "Notched right arrow"
+msgid "Sharp eight-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octagon. Eight-point shape"
+msgid "Curved eight-point star"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:28
-msgid "Pentagon block arrow"
+msgid "Swiss cross"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five-point shape"
+msgid "Maltese cross"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:30
-msgid "Perfect circle"
+msgid "Down arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:31
-msgid "Perfect square, height equals width"
+msgid "Up arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:32
-msgid "Quad arrow"
+msgid "Left arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:33
-msgid "Quarter circle"
+msgid "Right arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:34
-msgid "Quarter moon"
+msgid "Notched left arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:35
-msgid "Right angle triangle"
+msgid "Notched right arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:36
-msgid "Right arrow"
+msgid "Left-up arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven-point star"
+msgid "Turn-up arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight-point star"
+msgid "Left-right arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six-point star"
+msgid "Up-down arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:40
-msgid "Sun"
+msgid "Quad arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:41
-msgid "Swiss cross"
+msgid "Left-right-up arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:42
-msgid "Trapezoid"
+msgid "Up-down-left arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:43
-msgid "Turn-up arrow"
+msgid "Pentagon block arrow"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:44
-msgid "Up arrow"
+msgid "Chevron"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:45
-msgid "Up-down arrow"
+msgid "Heart"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:46
-msgid "Up-down-left arrow"
+msgid "Sun"
 msgstr ""
 
 #: ../sheets/Assorted.sheet.in.h:47
-msgid "Vertical parallelogram"
+msgid "Quarter moon"
 msgstr ""
 
-#: ../sheets/BPMN.sheet.in.h:1
-msgid "Activity Looping"
+#. For: anthonym
+#: ../sheets/BPMN.sheet.in.h:2
+msgid "BPMN"
 msgstr ""
 
-#: ../sheets/BPMN.sheet.in.h:2
-msgid "Ad-Hoc Collapsed Sub-Process"
+#: ../sheets/BPMN.sheet.in.h:3
+msgid "Business Process Modeling Notation"
 msgstr ""
 
-#. For: anthonym
 #: ../sheets/BPMN.sheet.in.h:4
-msgid "BPMN"
+msgid "Start Event"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:5
-msgid "Business Process Modeling Notation"
+msgid "Start Event — Message"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:6
-msgid "Collapsed Sub-Process"
+msgid "Start Event — Timer"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Compensation Collapsed Sub-Process"
+msgid "Start Event — Rule"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:8
-msgid "Compensation Task"
+msgid "Start Event — Link"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Complex"
+msgid "Start Event — Multiple"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:10
-msgid "Data Object"
+msgid "Intermediate Event"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "End Event"
+msgid "Intermediate Event — Message"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event — Cancel"
+msgid "Intermediate Event — Timer"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event — Compensation"
+msgid "Intermediate Event — Error"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event — Error"
+msgid "Intermediate Event — Cancel"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event — Link"
+msgid "Intermediate Event — Compensation"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event — Message"
+msgid "Intermediate Event — Rule"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event — Multiple"
+msgid "Intermediate Event — Link"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event — Terminate"
+msgid "Intermediate Event — Multiple"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:19
-msgid "Exclusive (XOR) Data Based"
+msgid "End Event"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "Exclusive (XOR) Event Based"
+msgid "End Event — Message"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "Gateway"
+msgid "End Event — Error"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "Group"
+msgid "End Event — Cancel"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "Inclusive (OR)"
+msgid "End Event — Compensation"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:24
-msgid "Intermediate Event"
+msgid "End Event — Link"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event — Cancel"
+msgid "End Event — Multiple"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event — Compensation"
+msgid "End Event — Terminate"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event — Error"
+msgid "Gateway"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event — Link"
+msgid "Exclusive (XOR) Data Based"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event — Message"
+msgid "Exclusive (XOR) Event Based"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event — Multiple"
+msgid "Inclusive (OR)"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event — Rule"
+msgid "Complex"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event — Timer"
-msgstr ""
-
-#: ../sheets/BPMN.sheet.in.h:33
-msgid "Looping Collapsed Sub-Process"
+msgid "Parallel (AND)"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:34
-msgid "Multiple Instance Collapsed Sub-Process"
+msgid "Activity Looping"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:35
@@ -6928,252 +7554,272 @@ msgid "Multiple Instance Task"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:36
-msgid "Parallel (AND)"
+msgid "Compensation Task"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:37
-msgid "Start Event"
+msgid "Collapsed Sub-Process"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event — Link"
+msgid "Looping Collapsed Sub-Process"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event — Message"
+msgid "Multiple Instance Collapsed Sub-Process"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event — Multiple"
+msgid "Ad-Hoc Collapsed Sub-Process"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event — Rule"
+msgid "Compensation Collapsed Sub-Process"
 msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event — Timer"
+msgid "Group"
 msgstr ""
 
-#: ../sheets/BPMN.sheet.in.h:44
-msgid "Text Annotation"
+#: ../sheets/BPMN.sheet.in.h:43
+msgid "Transaction"
 msgstr ""
 
-#: ../sheets/BPMN.sheet.in.h:45
-msgid "Transaction"
+#: ../sheets/BPMN.sheet.in.h:44
+msgid "Data Object"
 msgstr ""
 
-#: ../sheets/ChemEng.sheet.in.h:1
-msgid "AC Generator"
+#: ../sheets/BPMN.sheet.in.h:45
+msgid "Text Annotation"
 msgstr ""
 
+#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:2
-msgid "Air Cooler"
+msgid "ChemEng"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:3
-msgid "Autoclave"
+msgid "Collection for chemical engineering"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:4
-msgid "Axial Flow Fan"
+msgid "Fan or Stirrer"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:5
-msgid "Basic Filter"
+msgid "Spraying Device"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:6
-msgid "Centrifugal Pump or Fan"
+msgid "Pneumatic Line"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:7
-msgid "Centrifuge"
+msgid "Pneumatic Line, vertical"
 msgstr ""
 
-#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:9
-msgid "ChemEng"
+msgid "Simple Heat Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:10
-msgid "Clarifier or Settling Tank"
+msgid "Simple Heat Exchanger, vertical"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:11
-msgid "Collection for chemical engineering"
+msgid "Water Cooler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:12
-msgid "Compressor or Turbine"
+msgid "Water Cooler, vertical"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:13
-msgid "Covered tank"
+msgid "Fixed-Sheet Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:14
-msgid "Cyclone and hydrocyclone"
+msgid "Floating-Head or U-Tube Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:15
-msgid "Double-Pipe Exchanger"
+msgid "Kettle Reboiler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:16
-msgid "Ejector or Injector"
+msgid "Air Cooler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:17
-msgid "Fan or Stirrer"
+msgid "Forced-Flow Air Cooler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:18
-msgid "Fixed-Sheet Exchanger"
+msgid "Induced-Flow Air Cooler"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:19
-msgid "Floating-Head or U-Tube Exchanger"
+msgid "Plate Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:20
-msgid "Fluid Contacting Vessel, simple"
+msgid "Double-Pipe Exchanger"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:21
-msgid "Forced-Flow Air Cooler"
+msgid "Heating/Cooling Coil"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:22
-msgid "Gas Holder, basic"
+msgid "Heating/Cooling Coil, vertical"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:23
-msgid "Heating/Cooling Coil"
+msgid "Simple Furnace"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:24
-msgid "Heating/Cooling Coil, vertical"
+msgid "Simple Vessel"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:25
-msgid "Induced-Flow Air Cooler"
+msgid "Knock-out Drum (with demister pad)"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:26
-msgid "Kettle Reboiler"
+msgid "Tray Column, simple"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:27
-msgid "Knock-out Drum (with demister pad)"
+msgid "Tray Column, detailed"
+msgstr ""
+
+#: ../sheets/ChemEng.sheet.in.h:28
+msgid "Fluid Contacting Vessel, simple"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:29
-msgid "Mixer"
+msgid "Reactor or Absorption Vessel, simple"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:30
-msgid "Open Tank"
+msgid "Autoclave"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:31
-msgid "Plate Exchanger"
+msgid "Open Tank"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:32
-msgid "Pneumatic Line"
+msgid "Clarifier or Settling Tank"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:33
-msgid "Pneumatic Line, vertical"
+msgid "Sealed Tank"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:34
-msgid "Positive Displacement Rotary Pump or Compressor"
+msgid "Covered tank"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:35
-msgid "Pressure Relief Valve"
+msgid "Tank with Fixed Roof"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:36
-msgid "Reactor or Absorption Vessel, simple"
+msgid "Tank with Floating Roof"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:37
-msgid "Reciprocating Compressor or Pump"
+msgid "Storage Sphere"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:38
-msgid "Regulable Valve"
+msgid "Gas Holder, basic"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:39
-msgid "Regulable Valve, vertical"
+msgid "Centrifugal Pump or Fan"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:40
-msgid "Sealed Tank"
+msgid "Positive Displacement Rotary Pump or Compressor"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:41
-msgid "Simple Furnace"
+msgid "Reciprocating Compressor or Pump"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:42
-msgid "Simple Heat Exchanger"
+msgid "Axial Flow Fan"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:43
-msgid "Simple Heat Exchanger, vertical"
+msgid "Compressor or Turbine"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:44
-msgid "Simple Vessel"
+msgid "Ejector or Injector"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:45
-msgid "Spray Drier"
+msgid "AC Generator"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:46
-msgid "Spraying Device"
+msgid "Valve"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:47
-msgid "Storage Sphere"
+msgid "Valve, vertical"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:48
-msgid "Tank with Fixed Roof"
+msgid "Regulable Valve"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:49
-msgid "Tank with Floating Roof"
+msgid "Regulable Valve, vertical"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:50
-msgid "Tray Column, detailed"
+msgid "Basic Filter"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:51
-msgid "Tray Column, simple"
+msgid "Mixer"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:52
-msgid "Valve"
+msgid "Cyclone and hydrocyclone"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:53
-msgid "Valve, vertical"
+msgid "Spray Drier"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:54
-msgid "Water Cooler"
+msgid "Centrifuge"
 msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:55
-msgid "Water Cooler, vertical"
+msgid "Pressure Relief Valve"
+msgstr ""
+
+#: ../sheets/chronogram.sheet.in.h:1
+msgid "Chronogram"
+msgstr ""
+
+#: ../sheets/chronogram.sheet.in.h:2
+msgid "Objects to design chronogram charts"
+msgstr ""
+
+#: ../sheets/chronogram.sheet.in.h:3
+msgid "Time scale"
+msgstr ""
+
+#: ../sheets/chronogram.sheet.in.h:4
+msgid "Data line"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:1
@@ -7185,3237 +7831,3112 @@ msgid "Components for circuit diagrams"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:3
-msgid "Ground point"
+msgid "Vertically aligned resistor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:4
-msgid "Horizontal jumper"
+msgid "Horizontally aligned inductor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:5
-msgid "Horizontal xtal"
+msgid "Vertically aligned inductor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:6
-msgid "Horizontally aligned LED"
+msgid "Horizontally aligned resistor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:7
-msgid "Horizontally aligned capacitor"
+msgid "Vertically aligned resistor (European)"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:8
-msgid "Horizontally aligned diode"
+msgid "Horizontally aligned inductor (European)"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:9
-msgid "Horizontally aligned fuse"
+msgid "Vertically aligned inductor (European)"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:10
-msgid "Horizontally aligned inductor"
+msgid "Horizontally aligned resistor (European)"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned inductor (European)"
+msgid "Horizontally aligned capacitor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:12
-msgid "Horizontally aligned power source"
+msgid "Vertically aligned capacitor"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:13
-msgid "Horizontally aligned resistor"
+#.
+#.
+#: ../sheets/Circuit.sheet.in.h:15
+msgid "NPN bipolar transistor"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:14
-msgid "Horizontally aligned resistor (European)"
+#.
+#.
+#: ../sheets/Circuit.sheet.in.h:18
+msgid "PNP bipolar transistor"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:15
-msgid "Horizontally aligned zener diode"
+#: ../sheets/Circuit.sheet.in.h:19
+msgid "Horizontally aligned diode"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:16
-msgid "Lamp"
+#: ../sheets/Circuit.sheet.in.h:20
+msgid "Vertically aligned diode"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:17 ../sheets/ciscomisc.sheet.in.h:30
-msgid "Microphone"
+#: ../sheets/Circuit.sheet.in.h:21
+msgid "Horizontally aligned zener diode"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:18
-msgid "NMOS transistor"
+#: ../sheets/Circuit.sheet.in.h:22
+msgid "Vertically aligned zener diode"
 msgstr ""
 
-#.
-#.
-#: ../sheets/Circuit.sheet.in.h:21
-msgid "NPN bipolar transistor"
+#: ../sheets/Circuit.sheet.in.h:23
+msgid "Ground point"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:22
+#: ../sheets/Circuit.sheet.in.h:24
 msgid "Operational amplifier"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:23
-msgid "PMOS transistor"
+#: ../sheets/Circuit.sheet.in.h:25
+msgid "Horizontally aligned fuse"
 msgstr ""
 
-#.
-#.
 #: ../sheets/Circuit.sheet.in.h:26
-msgid "PNP bipolar transistor"
+msgid "Vertically aligned fuse"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:27 ../sheets/ciscomisc.sheet.in.h:42
-msgid "Speaker"
+#: ../sheets/Circuit.sheet.in.h:27
+msgid "Horizontally aligned power source"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:28
-msgid "Vertical xtal"
+msgid "Vertically aligned power source"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:29
-msgid "Vertically aligned LED"
+msgid "Lamp"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:30
-msgid "Vertically aligned capacitor"
+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:52
+msgid "Speaker"
 msgstr ""
 
-#: ../sheets/Circuit.sheet.in.h:31
-msgid "Vertically aligned diode"
+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:50
+msgid "Microphone"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:32
-msgid "Vertically aligned fuse"
+msgid "Horizontally aligned LED"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned inductor"
+msgid "Vertically aligned LED"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:34
-msgid "Vertically aligned inductor (European)"
+msgid "NMOS transistor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:35
-msgid "Vertically aligned power source"
+msgid "PMOS transistor"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:36
-msgid "Vertically aligned resistor"
+msgid "Horizontal jumper"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:37
-msgid "Vertically aligned resistor (European)"
+msgid "Horizontal xtal"
 msgstr ""
 
 #: ../sheets/Circuit.sheet.in.h:38
-msgid "Vertically aligned zener diode"
+msgid "Vertical xtal"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:1
-msgid "'if not' (normally closed) ladder contact"
+#: ../sheets/ciscocomputer.sheet.in.h:1
+msgid "Cisco — Computer"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:2
-msgid "'if' (normally open) ladder contact"
+#: ../sheets/ciscocomputer.sheet.in.h:2
+msgid "Computer shapes by Cisco"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:3
-msgid "'jump' output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:3
+msgid "PC"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:4
-msgid "'reset' output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:4
+msgid "Macintosh"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:5
-msgid "'set' output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:5
+msgid "Terminal"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:6
-msgid "Components for LADDER circuits"
+#: ../sheets/ciscocomputer.sheet.in.h:6
+msgid "SUN workstation"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:7
-msgid "Ladder"
+#: ../sheets/ciscocomputer.sheet.in.h:7
+msgid "CiscoWorks workstation"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:8
-msgid "Negative output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:8
+msgid "PC Router Card"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:9
-msgid "Power-saved 'reset' output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:9
+msgid "PC Software"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:10
-msgid "Power-saved 'set' output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:10
+msgid "PC with Router-Based Software"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:11
-msgid "Power-saved negative output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:11
+msgid "Workgroup director"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:12
-msgid "Power-saved simple output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:12
+msgid "CiscoSecurity"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:13
-msgid "Receptivity output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:13
+msgid "Cisco CA"
 msgstr ""
 
-#: ../sheets/Contact.sheet.in.h:14
-msgid "Simple output variable"
+#: ../sheets/ciscocomputer.sheet.in.h:14
+msgid "WWW server"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:1
-msgid "Constant factor below -1"
+#: ../sheets/ciscocomputer.sheet.in.h:15
+msgid "Web browser"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:2
-msgid "Constant factor between 0 and -1"
+#: ../sheets/ciscocomputer.sheet.in.h:16
+msgid "File Server"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:3
-msgid "Constant factor between 0 and 1"
+#: ../sheets/ciscocomputer.sheet.in.h:17
+msgid "Software-Based Router on File Server"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Constant factor greater 1"
+#: ../sheets/ciscocomputer.sheet.in.h:18
+msgid "Server with PC Router"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:5
-msgid "Constant negative shift on the y-axis"
+#: ../sheets/ciscocomputer.sheet.in.h:19
+msgid "IBM Tower"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Constant positive shift on the y-axis"
+#: ../sheets/ciscocomputer.sheet.in.h:20
+msgid "IBM Mini (AS400)"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:7
-msgid "Cybernetics"
+#: ../sheets/ciscocomputer.sheet.in.h:21
+msgid "Front End Processor"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:8
-msgid "Elements of cybernetic circuits"
+#: ../sheets/ciscocomputer.sheet.in.h:22
+msgid "IBM mainframe"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:9
-msgid "Full wave rectifier (absolute value)"
+#: ../sheets/ciscocomputer.sheet.in.h:23
+msgid "IBM mainframe with FEP"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:10
-msgid "Half wave rectifier or ramp input"
+#: ../sheets/ciscocomputer.sheet.in.h:24
+msgid "HP Mini"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:11
-msgid "High pass filter"
+#: ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Supercomputer"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator — input bottom"
+#: ../sheets/ciscocomputer.sheet.in.h:26
+msgid "Web cluster"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator — input left"
+#: ../sheets/ciscocomputer.sheet.in.h:27
+msgid "Mini VAX"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator — input right"
+#: ../sheets/ciscocomputer.sheet.in.h:28
+msgid "PC Card"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator — input top"
+#: ../sheets/ciscocomputer.sheet.in.h:29 ../sheets/Lights.sheet.in.h:14
+msgid "Scanner"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:16
-msgid "Low pass filter"
+#: ../sheets/ciscocomputer.sheet.in.h:30
+msgid "Tablet"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:17
-msgid "Product"
-msgstr "Produkto"
+#: ../sheets/ciscocomputer.sheet.in.h:31
+msgid "EtherClient"
+msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:18
-msgid "Relay characteristic (sigma)"
+#: ../sheets/ciscocomputer.sheet.in.h:32
+msgid "Handheld"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:19
-msgid "Saturation characteristic"
+#: ../sheets/ciscocomputer.sheet.in.h:33
+msgid "Wireless"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor — bottom"
+#: ../sheets/ciscocomputer.sheet.in.h:34
+msgid "PDA"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor — left"
+#: ../sheets/ciscocomputer.sheet.in.h:35
+msgid "Newton"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor — right"
+#: ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Laptop"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor — top"
+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+msgid "Monitor"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:24
-msgid "Sigmoid characteristic"
+#: ../sheets/ciscocomputer.sheet.in.h:39
+msgid "PC Video"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:25
-msgid "Sine characteristic or input"
+#: ../sheets/ciscocomputer.sheet.in.h:40
+msgid "Modem"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:26
-msgid "Sum"
+#: ../sheets/ciscocomputer.sheet.in.h:41
+msgid "BBS"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:27
-msgid "Sum, subtracting bottom input"
+#: ../sheets/ciscocomputer.sheet.in.h:42
+msgid "MicroWebserver"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:28
-msgid "Sum, subtracting left input"
+#: ../sheets/ciscocomputer.sheet.in.h:43
+msgid "Relational Database"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:29
-msgid "Sum, subtracting right input"
+#: ../sheets/ciscocomputer.sheet.in.h:44
+msgid "Diskette"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:30
-msgid "Sum, subtracting top input"
+#: ../sheets/ciscocomputer.sheet.in.h:45
+msgid "Host"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:31
-msgid "Template for custom characteristics"
+#: ../sheets/ciscocomputer.sheet.in.h:46
+msgid "Tape array"
 msgstr ""
 
-#: ../sheets/Cybernetics.sheet.in.h:32
-msgid "Time delay"
+#: ../sheets/ciscocomputer.sheet.in.h:47
+msgid "Disk subsystem"
 msgstr ""
 
-#: ../sheets/Database.sheet.in.h:1
-msgid "Attribute compound"
+#: ../sheets/ciscocomputer.sheet.in.h:48
+msgid "JBOD"
 msgstr ""
 
-#: ../sheets/Database.sheet.in.h:2
-msgid "Database"
-msgstr "Datumbazo"
-
-#: ../sheets/Database.sheet.in.h:3
-msgid "Editor for Database Table Relation Diagrams"
+#: ../sheets/ciscocomputer.sheet.in.h:49
+msgid "Storage array"
 msgstr ""
 
-#: ../sheets/ER.sheet.in.h:2
-msgid "ER"
+#: ../sheets/ciscocomputer.sheet.in.h:50
+msgid "FC Storage"
 msgstr ""
 
-#: ../sheets/ER.sheet.in.h:3
-msgid "Editor for Entity Relations Diagrams"
+#: ../sheets/ciscocomputer.sheet.in.h:51
+msgid "PC Adapter Card"
 msgstr ""
 
-#: ../sheets/ER.sheet.in.h:5
-msgid "Participation"
+#: ../sheets/ciscohub.sheet.in.h:1
+msgid "Cisco — Switch"
 msgstr ""
 
-#: ../sheets/ER.sheet.in.h:7
-msgid "Weak entity"
+#: ../sheets/ciscohub.sheet.in.h:2
+msgid "Router and switch shapes by Cisco"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:1
-msgid "Components for electric circuits"
+#: ../sheets/ciscohub.sheet.in.h:3
+msgid "Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
-msgid "Connection point"
+#: ../sheets/ciscohub.sheet.in.h:4
+msgid "Router subdued"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:3
-msgid "Electric"
+#: ../sheets/ciscohub.sheet.in.h:5
+msgid "Router with Silicon Switch"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:4
-msgid "Lamp or indicator light (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:6
+msgid "NetFlow router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:5
-msgid "Lamp or indicator light (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:7
+msgid "Broadband router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:6
-msgid "Normally closed contact (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:8
+msgid "Wavelength router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:7
-msgid "Normally closed contact (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:9
+msgid "Wireless router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:8
-msgid "Normally closed position switch (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:10
+msgid "7507 Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:9
-msgid "Normally closed position switch (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:11
+msgid "7505 Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:10
-msgid "Normally open contact (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:12
+msgid "7500ARS (7513) Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:11
-msgid "Normally open contact (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:13
+msgid "Edge Label Switch Router with NetFlow"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:12
-msgid "Normally open position switch (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:14
+msgid "Edge Label Switch Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:13
-msgid "Normally open position switch (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:15
+msgid "Router with Firewall"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:14
-msgid "Relay (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:16
+msgid "Optical Services Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:15
-msgid "Relay (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:17
+msgid "Content Router"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:16
-msgid "The command organ of a relay (horizontal)"
+#: ../sheets/ciscohub.sheet.in.h:18
+msgid "Carrier Routing System"
 msgstr ""
 
-#: ../sheets/Electric.sheet.in.h:17
-msgid "The command organ of a relay (vertical)"
+#: ../sheets/ciscohub.sheet.in.h:19
+msgid "Storage Router"
 msgstr ""
 
-#: ../sheets/FS.sheet.in.h:1
-msgid "Editor for Function Structure Diagrams."
+#: ../sheets/ciscohub.sheet.in.h:20
+msgid "NetSonar"
 msgstr ""
 
-#: ../sheets/FS.sheet.in.h:2
-msgid "FS"
+#: ../sheets/ciscohub.sheet.in.h:21
+msgid "Hub"
 msgstr ""
 
-#: ../sheets/FS.sheet.in.h:3
-msgid "Flow"
+#: ../sheets/ciscohub.sheet.in.h:22
+msgid "Hub subdued"
 msgstr ""
 
-#: ../sheets/FS.sheet.in.h:4
-msgid "Function"
-msgstr "Funkcio"
-
-#: ../sheets/FS.sheet.in.h:5
-msgid "Orthogonal polyline flow"
+#: ../sheets/ciscohub.sheet.in.h:23
+msgid "Cisco Hub"
 msgstr ""
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:2
-msgid "Collate"
+#: ../sheets/ciscohub.sheet.in.h:24
+msgid "Small Hub"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:3
-msgid "Connector"
+#: ../sheets/ciscohub.sheet.in.h:25
+msgid "100BaseT Hub"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:4
-msgid "Data source"
+#: ../sheets/ciscohub.sheet.in.h:26
+msgid "Workgroup switch"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-msgid "Decision"
+#: ../sheets/ciscohub.sheet.in.h:27
+msgid "Workgroup switch Subdued"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:6
-msgid "Delay"
+#: ../sheets/ciscohub.sheet.in.h:28
+msgid "Workgroup Switch Voice-Enabled"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:8
-msgid "Document"
+#: ../sheets/ciscohub.sheet.in.h:29
+msgid "BBSM"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:11
-msgid "Input/Output"
+#: ../sheets/ciscohub.sheet.in.h:30
+msgid "ATM Tag Switch Router"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:12
-msgid "Internal storage"
+#: ../sheets/ciscohub.sheet.in.h:31
+msgid "Switch Processor"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:13
-msgid "Magnetic disk"
+#: ../sheets/ciscohub.sheet.in.h:32
+msgid "Route Switch Processor"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:14
-msgid "Magnetic drum"
+#: ../sheets/ciscohub.sheet.in.h:33
+msgid "Route Switch Processor with Si"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:15
-msgid "Magnetic tape"
+#: ../sheets/ciscohub.sheet.in.h:34
+msgid "PXF"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:16
-msgid "Manual input"
+#: ../sheets/ciscohub.sheet.in.h:35
+msgid "ASIC Processor"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:17
-msgid "Manual operation"
+#: ../sheets/ciscohub.sheet.in.h:36
+msgid "Generic Processor"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:18
-msgid "Merge"
+#: ../sheets/ciscohub.sheet.in.h:37
+msgid "Data Center Switch"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:19
-msgid "Objects to draw flowcharts"
+#: ../sheets/ciscohub.sheet.in.h:38
+msgid "Data Center Switch Reversed"
 msgstr ""
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:21
-msgid "Off page connector"
+#: ../sheets/ciscohub.sheet.in.h:39
+msgid "Data Switch Processor"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:22
-msgid "Offline storage"
+#: ../sheets/ciscohub.sheet.in.h:40
+msgid "Content Switch"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:23
-msgid "Or"
+#: ../sheets/ciscohub.sheet.in.h:41
+msgid "Content Service Module"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:24
-msgid "Predefined process"
+#: ../sheets/ciscohub.sheet.in.h:42
+msgid "CSM-S"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:25
-msgid "Preparation"
+#: ../sheets/ciscohub.sheet.in.h:43
+msgid "Access Gateway"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:26
-msgid "Process/Auxiliary Operation"
+#: ../sheets/ciscohub.sheet.in.h:44
+msgid "ATM Switch"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:27
-msgid "Punched card"
+#: ../sheets/ciscohub.sheet.in.h:45
+msgid "ATM 3800"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:28
-msgid "Punched tape"
+#: ../sheets/ciscohub.sheet.in.h:46
+msgid "Cisco 1000"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:29
-msgid "Sort"
-msgstr "Ordigi"
-
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:31
-msgid "Summing junction"
+#: ../sheets/ciscohub.sheet.in.h:47
+msgid "ISDN switch"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:32
-msgid "Terminal Interrupt"
+#: ../sheets/ciscohub.sheet.in.h:48
+msgid "Label Switch Router"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:33
-msgid "Transaction file"
+#: ../sheets/ciscohub.sheet.in.h:49
+msgid "MultiSwitch Device"
 msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:34
-msgid "Transmittal tape"
+#: ../sheets/ciscohub.sheet.in.h:50
+msgid "LAN2LAN Switch"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:1
-msgid "AND vergent"
+#: ../sheets/ciscohub.sheet.in.h:51
+msgid "Multilayer Switch"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:2
-msgid "Action to associate to a step"
+#: ../sheets/ciscohub.sheet.in.h:52
+msgid "Multilayer Switch with Silicon"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:3
-msgid "Arc (upward)"
+#: ../sheets/ciscohub.sheet.in.h:53
+msgid "Multilayer Switch with Silicon subdued"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:4
-msgid "Condition (of an action)"
+#: ../sheets/ciscohub.sheet.in.h:54
+msgid "Programmable Switch"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:5
-msgid "GRAFCET"
+#: ../sheets/ciscohub.sheet.in.h:55
+msgid "Content Service Switch 1100"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:10
-msgid "Macro sub-program call step"
+#: ../sheets/ciscohub.sheet.in.h:56
+msgid "ATM Fast Gigabit Etherswitch"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:11
-msgid "OR vergent"
+#: ../sheets/ciscohub.sheet.in.h:57
+msgid "RateMUX"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:12
-msgid "Objects to design GRAFCET charts"
+#: ../sheets/ciscohub.sheet.in.h:58
+msgid "Workgroup 5500"
 msgstr ""
 
-#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-msgid "Transition"
+#: ../sheets/ciscohub.sheet.in.h:59
+msgid "Workgroup 5000"
 msgstr ""
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-msgid "Alternate external entity"
+#: ../sheets/ciscohub.sheet.in.h:60
+msgid "Workgroup 5002"
 msgstr ""
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-msgid "Data store"
+#: ../sheets/ciscohub.sheet.in.h:61
+msgid "NetRanger"
 msgstr ""
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-msgid "External entity"
+#: ../sheets/ciscohub.sheet.in.h:62
+msgid "MGX 8220"
 msgstr ""
 
-#. Author: Nicholas Moore, 2005. mailto: [e-mail]
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-msgid "Gane and Sarson"
+#: ../sheets/ciscohub.sheet.in.h:63
+msgid "MGX 8240"
 msgstr ""
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-msgid "Gane and Sarson DFD"
+#: ../sheets/ciscohub.sheet.in.h:64
+msgid "MGX 8260"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:1
-msgid "Block 1, 2:4"
+#: ../sheets/ciscohub.sheet.in.h:65
+msgid "Universal Gateway"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:2
-msgid "Block 2, 2:8"
+#: ../sheets/ciscohub.sheet.in.h:66
+msgid "iSCSI switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:3
-msgid "Block 3, 4:4"
+#: ../sheets/ciscohub.sheet.in.h:67
+msgid "Workgroup Fibre Channel intelligent switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:4
-msgid "Block 4, 4:8"
+#: ../sheets/ciscohub.sheet.in.h:68
+msgid "Director-class Fibre Channel intelligent switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:5
-msgid "Block 5, 3:3"
+#: ../sheets/ciscohub.sheet.in.h:69
+msgid "Multi-Fabric Server Switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:6
-msgid "Block 6, 4:6"
+#: ../sheets/ciscohub.sheet.in.h:70
+msgid "Server Switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:7
-msgid "Block 7"
+#: ../sheets/ciscohub.sheet.in.h:71
+msgid "Multilayer Remote Switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:8
-msgid "Car 1, Front View"
+#: ../sheets/ciscohub.sheet.in.h:72
+msgid "Layer 2 Remote Switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:9
-msgid "Car 2, Rear View"
+#: ../sheets/ciscohub.sheet.in.h:73
+msgid "Virtual Layer Switch"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:10
-msgid "Corner 1"
+#: ../sheets/ciscomisc.sheet.in.h:1
+msgid "Cisco — Miscellaneous"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:11
-msgid "Corner 2"
+#: ../sheets/ciscomisc.sheet.in.h:2
+msgid "Miscellaneous shapes by Cisco"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:12
-msgid "Crossroads"
+#: ../sheets/ciscomisc.sheet.in.h:3
+msgid "Government Building"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Elevated Road"
+#: ../sheets/ciscomisc.sheet.in.h:4
+msgid "University"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:14
-msgid "Factory"
+#: ../sheets/ciscomisc.sheet.in.h:5
+msgid "Small Business"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:15
-msgid "Footbridge, Pedestrian Bridge"
+#: ../sheets/ciscomisc.sheet.in.h:6
+msgid "Home office"
 msgstr ""
 
-#. use dc:description instead?
-#: ../sheets/IsometricMap.sheet.in.h:17
-msgid "Isometric Directional Map Shapes"
+#: ../sheets/ciscomisc.sheet.in.h:7
+msgid "Branch office"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:18
-msgid "Long Straight Road Section"
+#: ../sheets/ciscomisc.sheet.in.h:8
+msgid "Branch office subdued"
 msgstr ""
 
-#. use dc:title instead?
-#: ../sheets/IsometricMap.sheet.in.h:20
-msgid "Map, Isometric"
+#: ../sheets/ciscomisc.sheet.in.h:9
+msgid "Branch office blue"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:21
-msgid "One Way Road Sign"
+#: ../sheets/ciscomisc.sheet.in.h:10
+msgid "Generic Building"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:22
-msgid "River"
+#: ../sheets/ciscomisc.sheet.in.h:11
+msgid "Generic Building subdued"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:23
-msgid "Road Section"
+#: ../sheets/ciscomisc.sheet.in.h:12
+msgid "Generic Building blue"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof 1"
+#: ../sheets/ciscomisc.sheet.in.h:13
+msgid "Medium Building"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:25
-msgid "T-Junction"
+#: ../sheets/ciscomisc.sheet.in.h:14
+msgid "Medium Building subdued"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:26
-msgid "Train 1, angled downward"
+#: ../sheets/ciscomisc.sheet.in.h:15
+msgid "Medium Building blue"
 msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:27
-msgid "Train 2, angled upward"
-msgstr ""
+#: ../sheets/ciscomisc.sheet.in.h:16
+msgid "House"
+msgstr "Domo"
 
-#: ../sheets/IsometricMap.sheet.in.h:28
-msgid "Tree 1"
+#: ../sheets/ciscomisc.sheet.in.h:17
+msgid "House blue"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:1
-msgid "An i* agent"
+#: ../sheets/ciscomisc.sheet.in.h:18
+msgid "Telecommuter house"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:2
-msgid "An i* decomposition link"
+#: ../sheets/ciscomisc.sheet.in.h:19
+msgid "Telecommuter house subdued"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:3
-msgid "An i* dependency link"
+#: ../sheets/ciscomisc.sheet.in.h:20
+msgid "MDU"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:4
-msgid "An i* goal"
+#: ../sheets/ciscomisc.sheet.in.h:21
+msgid "Man"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:5
-msgid "An i* means-ends link"
+#: ../sheets/ciscomisc.sheet.in.h:22
+msgid "Man red"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:6
-msgid "An i* negative contribution"
+#: ../sheets/ciscomisc.sheet.in.h:23
+msgid "Man gold"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:7
-msgid "An i* position"
+#: ../sheets/ciscomisc.sheet.in.h:24
+msgid "Man blue"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:8
-msgid "An i* positive contribution"
+#: ../sheets/ciscomisc.sheet.in.h:25
+msgid "Standing Man"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:9
-msgid "An i* resource"
+#: ../sheets/ciscomisc.sheet.in.h:26
+msgid "Standing woman"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:10
-msgid "An i* role"
+#: ../sheets/ciscomisc.sheet.in.h:27
+msgid "Woman"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:11
-msgid "An i* softgoal"
+#: ../sheets/ciscomisc.sheet.in.h:28
+msgid "Woman red"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:12
-msgid "An i* task"
+#: ../sheets/ciscomisc.sheet.in.h:29
+msgid "Woman gold"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:13
-msgid "An i* unspecified actor"
+#: ../sheets/ciscomisc.sheet.in.h:30
+msgid "Woman blue"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:14
-msgid "An i* unspecified link"
+#: ../sheets/ciscomisc.sheet.in.h:31
+msgid "Running man"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:15
-msgid "Objects to design i* diagrams"
+#: ../sheets/ciscomisc.sheet.in.h:32
+msgid "Running man subdued"
 msgstr ""
 
-#: ../sheets/Istar.sheet.in.h:16
-msgid "RE-i*"
+#: ../sheets/ciscomisc.sheet.in.h:33
+msgid "Telecommuter"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:1
-msgid "A Jackson designed domain"
+#: ../sheets/ciscomisc.sheet.in.h:34
+msgid "Running woman"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:2
-msgid "A Jackson given domain"
+#: ../sheets/ciscomisc.sheet.in.h:35
+msgid "CiscoWorks Man"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:3
-msgid "A Jackson machine domain"
+#: ../sheets/ciscomisc.sheet.in.h:36
+msgid "PC Man"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:4
-msgid "A Jackson requirement"
+#: ../sheets/ciscomisc.sheet.in.h:37
+msgid "Sitting Woman"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:5
-msgid "A Jackson requirement phenomenon"
+#: ../sheets/ciscomisc.sheet.in.h:38
+msgid "Mac Woman"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:6
-msgid "A Jackson shared phenomenon"
+#: ../sheets/ciscomisc.sheet.in.h:39
+msgid "Androgynous Person"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:7
-msgid "Objects to design Jackson diagrams"
+#: ../sheets/ciscomisc.sheet.in.h:42
+msgid "Lock and Key"
 msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:8
-msgid "RE-Jackson"
+#: ../sheets/ciscomisc.sheet.in.h:43
+msgid "Satellite dish"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:1
-msgid "A KAOS AND refinement"
+#: ../sheets/ciscomisc.sheet.in.h:44
+msgid "Satellite"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:2
-msgid "A KAOS OR refinement"
+#: ../sheets/ciscomisc.sheet.in.h:45
+msgid "Antenna"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:3
-msgid "A KAOS agent"
+#: ../sheets/ciscomisc.sheet.in.h:46
+msgid "File cabinet"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:4
-msgid "A KAOS assumption"
-msgstr ""
+#: ../sheets/ciscomisc.sheet.in.h:47
+msgid "Car"
+msgstr "Aŭtomobilo"
 
-#: ../sheets/KAOS.sheet.in.h:5
-msgid "A KAOS binary conflict"
+#: ../sheets/ciscomisc.sheet.in.h:48
+msgid "Truck"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:6
-msgid "A KAOS capable-of"
+#: ../sheets/ciscomisc.sheet.in.h:49
+msgid "Video Camera"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:7
-msgid "A KAOS complete AND refinement"
+#: ../sheets/ciscomisc.sheet.in.h:51
+msgid "Headphones"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:8
-msgid "A KAOS complete OR refinement"
+#: ../sheets/cisconetwork.sheet.in.h:1
+msgid "Cisco — Network"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:9
-msgid "A KAOS contribution"
+#: ../sheets/cisconetwork.sheet.in.h:2
+msgid "Network shapes by Cisco"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:10
-msgid "A KAOS control link"
+#: ../sheets/cisconetwork.sheet.in.h:3
+msgid "Network Management"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:11
-msgid "A KAOS goal"
+#: ../sheets/cisconetwork.sheet.in.h:4
+msgid "Detector"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:12
-msgid "A KAOS input"
+#: ../sheets/cisconetwork.sheet.in.h:5
+msgid "Protocol Translator"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:13
-msgid "A KAOS monitor link"
+#: ../sheets/cisconetwork.sheet.in.h:6
+msgid "IP"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:14
-msgid "A KAOS obstacle"
+#: ../sheets/cisconetwork.sheet.in.h:7
+msgid "IP Old-style"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:15
-msgid "A KAOS obstruction"
+#: ../sheets/cisconetwork.sheet.in.h:8
+msgid "NAT"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:16
-msgid "A KAOS operation"
+#: ../sheets/cisconetwork.sheet.in.h:9
+msgid "VIP"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:17
-msgid "A KAOS operationalization"
+#: ../sheets/cisconetwork.sheet.in.h:10
+msgid "Terminal Server"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:18
-msgid "A KAOS output"
+#: ../sheets/cisconetwork.sheet.in.h:11
+msgid "Access Server"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:19
-msgid "A KAOS performs"
+#: ../sheets/cisconetwork.sheet.in.h:12
+msgid "System controller"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:20
-msgid "A KAOS requirement"
+#: ../sheets/cisconetwork.sheet.in.h:13
+msgid "Directory Server"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:21
-msgid "A KAOS responsibility"
+#: ../sheets/cisconetwork.sheet.in.h:14
+msgid "Firewall"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS softgoal"
+#: ../sheets/cisconetwork.sheet.in.h:15
+msgid "Firewall subdued"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:23
-msgid "Objects to design KAOS diagrams"
+#: ../sheets/cisconetwork.sheet.in.h:16
+msgid "Firewall horizontal"
 msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:24
-msgid "RE-KAOS"
+#: ../sheets/cisconetwork.sheet.in.h:17
+msgid "Firewall Service Module"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:1
-msgid "ACL"
+#: ../sheets/cisconetwork.sheet.in.h:18
+msgid "IOS Firewall"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:2
-msgid "Black light"
+#: ../sheets/cisconetwork.sheet.in.h:19
+msgid "PIX Firewall"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:3
-msgid "Blinders"
+#: ../sheets/cisconetwork.sheet.in.h:20
+msgid "Centri Firewall"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:4
-msgid "Ellipsoidal Reflector Spotlight"
+#: ../sheets/cisconetwork.sheet.in.h:22
+msgid "Security appliance"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:5
-msgid "Fresnel lantern"
+#: ../sheets/cisconetwork.sheet.in.h:23
+msgid "VPN Concentrator"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:6
-msgid "Lights"
+#: ../sheets/cisconetwork.sheet.in.h:24
+msgid "VPN Gateway"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:7
-msgid "Moving head"
+#: ../sheets/cisconetwork.sheet.in.h:25
+msgid "LAN to LAN"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:8
-msgid "Objects to design simple lighting plots"
+#: ../sheets/cisconetwork.sheet.in.h:26
+msgid "SSL Terminator"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:9
-msgid "PAR"
+#: ../sheets/cisconetwork.sheet.in.h:27
+msgid "IP DSL Switch"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:10
-msgid "PAR on the floor"
+#: ../sheets/cisconetwork.sheet.in.h:28
+msgid "DSLAM"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:11
-msgid "Pebble Convex lantern"
+#: ../sheets/cisconetwork.sheet.in.h:29
+msgid "Cable Modem"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
-msgid "Scanner"
+#: ../sheets/cisconetwork.sheet.in.h:30
+msgid "Wireless Connectivity"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:13
-msgid "Striplight"
+#: ../sheets/cisconetwork.sheet.in.h:31
+msgid "Wireless Transport"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:14
-msgid "Stroboscope light"
+#: ../sheets/cisconetwork.sheet.in.h:32
+msgid "AccessPoint"
 msgstr ""
 
-#: ../sheets/Lights.sheet.in.h:15
-msgid "Structure"
+#: ../sheets/cisconetwork.sheet.in.h:33
+msgid "Wireless Bridge"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:1
-msgid "AND gate"
+#: ../sheets/cisconetwork.sheet.in.h:34
+msgid "Dual Mode AccessPoint"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:2
-msgid "Boolean Logic"
+#: ../sheets/cisconetwork.sheet.in.h:35
+msgid "Wi-Fi Tag"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:3
-msgid "Cross-connector"
+#: ../sheets/cisconetwork.sheet.in.h:36
+msgid "Wireless Location Appliance"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
-msgid "Inverter"
+#: ../sheets/cisconetwork.sheet.in.h:37
+msgid "Location server"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:5
-msgid "Logic"
+#: ../sheets/cisconetwork.sheet.in.h:38
+msgid "Lightweight AP"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:6
-msgid "NAND gate"
+#: ../sheets/cisconetwork.sheet.in.h:39
+msgid "WLAN controller"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:7
-msgid "NOR gate"
+#: ../sheets/cisconetwork.sheet.in.h:40
+msgid "BBFW"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:8
-msgid "NOT"
+#: ../sheets/cisconetwork.sheet.in.h:41
+msgid "BBFW media"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:9
-msgid "OR gate"
+#: ../sheets/cisconetwork.sheet.in.h:42
+msgid "Channelized Pipe"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:10
-msgid "Simple buffer"
+#: ../sheets/cisconetwork.sheet.in.h:43
+msgid "Concatenated Payload"
 msgstr ""
 
-#: ../sheets/Logic.sheet.in.h:11
-msgid "XOR gate"
+#: ../sheets/cisconetwork.sheet.in.h:44
+msgid "Optical Cross-Connect"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:1
-msgid "Demultiplexer"
+#: ../sheets/cisconetwork.sheet.in.h:45
+msgid "Optical Transport"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:2
-msgid "Large extension node"
+#: ../sheets/cisconetwork.sheet.in.h:46
+msgid "Optical Fiber"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:3
-msgid "MSE"
+#: ../sheets/cisconetwork.sheet.in.h:47
+msgid "Optical Amplifier"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:4
-msgid "Multiplexer"
+#: ../sheets/cisconetwork.sheet.in.h:48
+msgid "Digital Cross-Connect"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:5
-msgid "Node center"
+#: ../sheets/cisconetwork.sheet.in.h:49
+msgid "IP Transport Concentrator"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:6
-msgid "Small extension node"
+#: ../sheets/cisconetwork.sheet.in.h:50
+msgid "DWDM Filter"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:7
-msgid "Tactical satellite communications terminal"
+#: ../sheets/cisconetwork.sheet.in.h:51
+msgid "WDM"
 msgstr ""
 
-#: ../sheets/MSE.sheet.in.h:8
-msgid "U.S. Army Mobile Subscriber Equipment Components"
+#: ../sheets/cisconetwork.sheet.in.h:52
+msgid "15200"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:2
-msgid "Folder"
+#: ../sheets/cisconetwork.sheet.in.h:53
+msgid "15800"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:3
-msgid "Measure distance"
+#: ../sheets/cisconetwork.sheet.in.h:54
+msgid "ONS15104"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:4
-msgid "Miscellaneous"
+#: ../sheets/cisconetwork.sheet.in.h:55
+msgid "10700"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:5
-msgid "Miscellaneous Shapes"
+#: ../sheets/cisconetwork.sheet.in.h:56
+msgid "Metro 1500"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:6
-msgid "New-style group object, for testing"
+#: ../sheets/cisconetwork.sheet.in.h:57
+msgid "ONS15540"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:7
-msgid "Resizable grid"
+#: ../sheets/cisconetwork.sheet.in.h:58
+msgid "Automatic Protection Switching"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:8
-msgid "Traditional clock"
+#: ../sheets/cisconetwork.sheet.in.h:59
+msgid "RPS"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:9
-msgid "Tree"
+#: ../sheets/cisconetwork.sheet.in.h:60
+msgid "UPS"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:10
-msgid "expanded node"
+#: ../sheets/cisconetwork.sheet.in.h:61
+msgid "LongReach CPE"
 msgstr ""
 
-#: ../sheets/Misc.sheet.in.h:11
-msgid "expansible node"
+#: ../sheets/cisconetwork.sheet.in.h:62
+msgid "3X74 (floor) cluster controller"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:1
-msgid "2/2 distributor"
+#: ../sheets/cisconetwork.sheet.in.h:63
+msgid "3174 (desktop) cluster controller"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:2
-msgid "3/2 distributor"
+#: ../sheets/cisconetwork.sheet.in.h:64
+msgid "CSU/DSU"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:3
-msgid "4/2 distributor"
+#: ../sheets/cisconetwork.sheet.in.h:65
+msgid "WAN"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:4
-msgid "5/2 distributor"
+#: ../sheets/cisconetwork.sheet.in.h:66
+msgid "Cloud"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:5
-msgid "Air exhaust orifice"
+#: ../sheets/cisconetwork.sheet.in.h:67
+msgid "Cloud Gold"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:6
-msgid "Components for pneumatic and hydraulic circuits"
+#: ../sheets/cisconetwork.sheet.in.h:68
+msgid "Cloud White"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:8
-msgid "Double-effect jack"
+#: ../sheets/cisconetwork.sheet.in.h:69
+msgid "Cloud Dark"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:9
-msgid "Electric command (double coil)"
+#: ../sheets/cisconetwork.sheet.in.h:70
+msgid "Distributed Director"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:10
-msgid "Electric command (single coil)"
+#: ../sheets/cisconetwork.sheet.in.h:71
+msgid "LocalDirector"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:11
-msgid "Generic pressure source"
+#: ../sheets/cisconetwork.sheet.in.h:72
+msgid "IOS SLB"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:12
-msgid "Hydraulic pressure source"
+#: ../sheets/cisconetwork.sheet.in.h:73
+msgid "MUX"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:13
-msgid "Indirect command by hydraulic driver"
+#: ../sheets/cisconetwork.sheet.in.h:74
+msgid "General Appliance"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:14
-msgid "Indirect command by pneumatic driver"
+#. compatibility
+#. <alias name="Cisco - PAD"/>
+#: ../sheets/cisconetwork.sheet.in.h:77
+msgid "PAD"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:15
-msgid "Mechanical command by spring"
+#: ../sheets/cisconetwork.sheet.in.h:78
+msgid "CDDI/FDDI Concentrator"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:16
-msgid "Mechanical command by tappet"
+#: ../sheets/cisconetwork.sheet.in.h:79
+msgid "FDDI Ring"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:17
-msgid "Muscular command"
+#: ../sheets/cisconetwork.sheet.in.h:80
+msgid "TokenRing"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:18
-msgid "Normally-in simple-effect jack"
+#: ../sheets/cisconetwork.sheet.in.h:81
+msgid "MAU"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:19
-msgid "Normally-out simple-effect jack"
+#: ../sheets/cisconetwork.sheet.in.h:82
+msgid "Repeater"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:20
-msgid "Pneumatic pressure source"
+#: ../sheets/cisconetwork.sheet.in.h:83
+msgid "Bridge"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:21
-msgid "Pneumatic/Hydraulic"
+#: ../sheets/cisconetwork.sheet.in.h:84
+msgid "Breakout box"
 msgstr ""
 
-#: ../sheets/Pneumatic.sheet.in.h:22
-msgid "Push-button command"
+#: ../sheets/cisconetwork.sheet.in.h:85
+msgid "STB (set top box)"
 msgstr ""
 
-#: ../sheets/SADT.sheet.in.h:1
-msgid "Activity/data box"
+#: ../sheets/cisconetwork.sheet.in.h:86
+msgid "TV"
 msgstr ""
 
-#: ../sheets/SADT.sheet.in.h:2
-msgid "Activity/data flow arrow"
+#: ../sheets/cisconetwork.sheet.in.h:87
+msgid "IPTV broadcast server"
 msgstr ""
 
-#: ../sheets/SADT.sheet.in.h:3
-msgid "Flow label"
+#: ../sheets/cisconetwork.sheet.in.h:88
+msgid "IPTV content manager"
 msgstr ""
 
-#: ../sheets/SADT.sheet.in.h:4
-msgid "Objects to design SADT diagrams"
+#: ../sheets/cisconetwork.sheet.in.h:89
+msgid "VN2900"
 msgstr ""
 
-#: ../sheets/SADT.sheet.in.h:5
-msgid "SADT/IDEF0"
+#: ../sheets/cisconetwork.sheet.in.h:90
+msgid "VN5902"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:1
-msgid "Action being executed"
+#: ../sheets/cisconetwork.sheet.in.h:91
+msgid "VN5900"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:2
-msgid "Block type reference"
+#: ../sheets/cisconetwork.sheet.in.h:92
+msgid "Catalyst Access Gateway"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:5
-msgid "Function call"
+#: ../sheets/cisconetwork.sheet.in.h:93
+msgid "Generic Gateway"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:6
-msgid "Function header"
+#: ../sheets/cisconetwork.sheet.in.h:94
+msgid "TransPath"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:7
-msgid "Generic text note"
+#: ../sheets/cisconetwork.sheet.in.h:95
+msgid "uBR910 Cable DSU"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:8
-msgid "In/Out connector"
+#: ../sheets/cisconetwork.sheet.in.h:96
+msgid "Storage Solution Engine"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:10
-msgid "Procedure return"
+#: ../sheets/cisconetwork.sheet.in.h:97
+msgid "Content Engine (Cache Director)"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:11
-msgid "Process type reference"
+#: ../sheets/cisconetwork.sheet.in.h:98
+msgid "CDM Content Distribution Manager"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:12
-msgid "Receive message"
+#: ../sheets/cisconetwork.sheet.in.h:99
+msgid "Content Transformation Engine (CTE)"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:13
-msgid "SDL"
+#: ../sheets/cisconetwork.sheet.in.h:100
+msgid "ME 1100"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:14
-msgid "Save state"
+#: ../sheets/cisconetwork.sheet.in.h:101
+msgid "MAS Gateway"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:15
-msgid "Send message"
+#: ../sheets/cisconetwork.sheet.in.h:102
+msgid "File Engine"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:16
-msgid "Service type reference"
+#: ../sheets/cisconetwork.sheet.in.h:103
+msgid "Service Control"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:17
-msgid "Specification and Description Language."
+#: ../sheets/ciscotelephony.sheet.in.h:1
+msgid "Cisco — Telephony"
 msgstr ""
 
-#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
-msgid "State"
-msgstr "Stato"
-
-#: ../sheets/SISSI.sheet.in.h:1
-msgid "Air conditioner"
+#: ../sheets/ciscotelephony.sheet.in.h:2
+msgid "Telephony shapes by Cisco"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:2
-msgid "Air filter"
+#: ../sheets/ciscotelephony.sheet.in.h:3
+msgid "Phone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Air quality detector"
+#: ../sheets/ciscotelephony.sheet.in.h:4
+msgid "Phone 2"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:4
-msgid "Alarm center"
+#: ../sheets/ciscotelephony.sheet.in.h:5
+msgid "Phone Ethernet"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:5
-msgid "Axial Ventilator"
+#: ../sheets/ciscotelephony.sheet.in.h:6
+msgid "Phone Appliance"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:6
-msgid "Backup"
+#: ../sheets/ciscotelephony.sheet.in.h:7
+msgid "Phone Feature"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:7
-msgid "Badge reader"
+#: ../sheets/ciscotelephony.sheet.in.h:8
+msgid "Phone/Fax"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:8
-msgid "Badge reader/keyboard"
+#: ../sheets/ciscotelephony.sheet.in.h:9
+msgid "HootPhone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:9
-msgid "Biometric reader"
+#: ../sheets/ciscotelephony.sheet.in.h:10
+msgid "IP Phone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:10
-msgid "Cell phone"
+#: ../sheets/ciscotelephony.sheet.in.h:11
+msgid "IP Softphone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:11
-msgid "Centrifugal Ventilator"
+#: ../sheets/ciscotelephony.sheet.in.h:12
+msgid "Softphone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:12
-msgid "Cipher machine"
+#: ../sheets/ciscotelephony.sheet.in.h:13
+msgid "Cellular Phone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:13
-msgid "Circulation pump"
+#: ../sheets/ciscotelephony.sheet.in.h:14
+msgid "Mobile Access IP Phone"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:14
-msgid "Condensator"
+#: ../sheets/ciscotelephony.sheet.in.h:15
+msgid "Pager"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:15
-msgid "Current transducer"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:16
+msgid "Fax"
+msgstr "Faksilo"
 
-#: ../sheets/SISSI.sheet.in.h:16
-msgid "Digital code"
+#: ../sheets/ciscotelephony.sheet.in.h:17
+msgid "Turret"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:17
-msgid "Enthalpy transducer"
+#: ../sheets/ciscotelephony.sheet.in.h:18
+msgid "Octel"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:18
-msgid "Extinguisher"
+#: ../sheets/ciscotelephony.sheet.in.h:19
+msgid "Radio Tower"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:19
-msgid "Faraday cage"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:20
+msgid "PBX"
+msgstr "PBX"
 
-#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-msgid "File cabinet"
+#: ../sheets/ciscotelephony.sheet.in.h:21
+msgid "PBX Switch"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:21
-msgid "Gate"
+#: ../sheets/ciscotelephony.sheet.in.h:22
+msgid "Class 4/5 switch"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:22
-msgid "Geographic site"
+#: ../sheets/ciscotelephony.sheet.in.h:23
+msgid "SONET MUX"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:23
-msgid "Glass-break sensor"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:24
+msgid "ADM"
+msgstr "ADM"
 
-#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
-msgid "Hub"
+#: ../sheets/ciscotelephony.sheet.in.h:25
+msgid "ITP"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:25
-msgid "Information"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:26
+msgid "ATA"
+msgstr "ATA"
 
-#: ../sheets/SISSI.sheet.in.h:26
-msgid "Information system"
+#: ../sheets/ciscotelephony.sheet.in.h:27
+msgid "SIP Proxy Server"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
-msgid "Laptop"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:28
+msgid "Gatekeeper"
+msgstr "Kluzprenilo"
 
-#: ../sheets/SISSI.sheet.in.h:29
-msgid "Level detector"
+#: ../sheets/ciscotelephony.sheet.in.h:29
+msgid "MGX 8000 Series Voice Gateway"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:30
-msgid "Light detector"
+#: ../sheets/ciscotelephony.sheet.in.h:30
+msgid "End Office"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:31
-msgid "Log analysis"
+#: ../sheets/ciscotelephony.sheet.in.h:31
+msgid "Voice-Enabled Access Server"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:32
-msgid "Magnetic storage"
+#: ../sheets/ciscotelephony.sheet.in.h:32
+msgid "Voice-Enabled Router"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
-msgid "Modem"
+#: ../sheets/ciscotelephony.sheet.in.h:33
+msgid "Voice-Enabled ATM Switch"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:34
-msgid "Moisture extractor"
+#: ../sheets/ciscotelephony.sheet.in.h:34
+msgid "CallManager"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:35
-msgid "Moisture sensor"
+#: ../sheets/ciscotelephony.sheet.in.h:35
+msgid "IP Telephony Router"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:36
-msgid "Movement detector"
+#: ../sheets/ciscotelephony.sheet.in.h:36
+msgid "Mobile Access Router"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
-msgid "Network cloud"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:37
+msgid "H.323"
+msgstr "H.323"
 
-#: ../sheets/SISSI.sheet.in.h:38
-msgid "Objects to design sissi diagrams"
+#: ../sheets/ciscotelephony.sheet.in.h:38
+msgid "STP"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
-msgid "PDA"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:39
+msgid "BTS 10200"
+msgstr "BTS 10200"
 
-#: ../sheets/SISSI.sheet.in.h:40
-msgid "Paper storage"
+#: ../sheets/ciscotelephony.sheet.in.h:40
+msgid "Generic softswitch"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:41
-msgid "Person"
+#: ../sheets/ciscotelephony.sheet.in.h:41
+msgid "SC2200/VSC3000 host"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:42
-msgid "Power transducer"
+#: ../sheets/ciscotelephony.sheet.in.h:42
+msgid "Virtual switch controller (VSC 3000)"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:43
-msgid "Pressure transducer"
+#: ../sheets/ciscotelephony.sheet.in.h:43
+msgid "SC2200 (Signalling Controller)"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:44
-msgid "Pump"
+#: ../sheets/ciscotelephony.sheet.in.h:44
+msgid "MoH server (Music on Hold)"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Relational Database"
+#: ../sheets/ciscotelephony.sheet.in.h:45
+msgid "TDM router"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:46
-msgid "Revolving door"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:46
+msgid "6701"
+msgstr "6701"
 
-#: ../sheets/SISSI.sheet.in.h:47
-msgid "Room"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:47
+msgid "6705"
+msgstr "6705"
 
-#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
-msgid "Router"
+#: ../sheets/ciscotelephony.sheet.in.h:48
+msgid "6732"
+msgstr "6732"
+
+#: ../sheets/ciscotelephony.sheet.in.h:49
+msgid "IAD router"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:49
-msgid "Safe"
+#: ../sheets/ciscotelephony.sheet.in.h:50
+msgid "ICS"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:50
-msgid "Security area"
+#: ../sheets/ciscotelephony.sheet.in.h:51
+msgid "ICM"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:51
-msgid "Sensor beam"
+#: ../sheets/ciscotelephony.sheet.in.h:52
+msgid "IntelliSwitch Stack"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:52
-msgid "Server"
+#: ../sheets/ciscotelephony.sheet.in.h:53
+msgid "Unity server"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:53
-msgid "Smoke detector"
+#: ../sheets/ciscotelephony.sheet.in.h:54
+msgid "Unity Express"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
-msgid "Storage array"
+#: ../sheets/ciscotelephony.sheet.in.h:55
+msgid "MCU"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
-msgid "Telephone"
+#: ../sheets/ciscotelephony.sheet.in.h:56
+msgid "uMG series"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:57
-msgid "Vehicle detector"
+#: ../sheets/civil.sheet.in.h:1
+msgid "Civil"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:58
-msgid "Ventilator"
+#: ../sheets/civil.sheet.in.h:2
+msgid "Civil Engineering Components"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:59
-msgid "Vibration sensor"
+#: ../sheets/civil.sheet.in.h:3
+msgid "Vertical rest"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:60
-msgid "Video camera"
+#: ../sheets/civil.sheet.in.h:4
+msgid "Horizontal rest"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:61
-msgid "Video movement detector"
+#: ../sheets/civil.sheet.in.h:5
+msgid "Bivalent vertical rest"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:62
-msgid "Voltage detector"
+#: ../sheets/civil.sheet.in.h:6
+msgid "Reference line"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:63
-msgid "Workstation"
+#: ../sheets/civil.sheet.in.h:7
+msgid "Water level"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:1
-msgid "Activity"
+#: ../sheets/civil.sheet.in.h:8
+msgid "Soil"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:3
-msgid "Aggregation, one class is part of another"
+#: ../sheets/civil.sheet.in.h:9
+msgid "Horizontally aligned arrow"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:4
-msgid "Association, two classes are associated"
+#: ../sheets/civil.sheet.in.h:10
+msgid "Vertically aligned arrow"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:7
-msgid "Class stereotype icon"
+#: ../sheets/civil.sheet.in.h:11
+msgid "Horizontal limiting line"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:8
-msgid "Component"
+#: ../sheets/civil.sheet.in.h:12
+msgid "Vertical limiting line"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:9
-msgid "Constraint, place a constraint on something"
+#: ../sheets/civil.sheet.in.h:13
+msgid "Horizontally aligned pump"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:11
-msgid "Editor for UML Static Structure Diagrams"
+#: ../sheets/civil.sheet.in.h:14
+msgid "Vertically aligned pump"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:15
-msgid "Fork/Union"
+#: ../sheets/civil.sheet.in.h:15
+msgid "Horizontally aligned compressor"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:16
-msgid "Generalization, class inheritance"
+#: ../sheets/civil.sheet.in.h:16
+msgid "Vertically aligned compressor"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:17
-msgid "Implements, class implements a specific interface"
+#: ../sheets/civil.sheet.in.h:17
+msgid "Vertically aligned valve"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:18
-msgid "Initial/End state"
+#: ../sheets/civil.sheet.in.h:18
+msgid "Horizontally aligned valve"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:19
-msgid "Large package"
+#: ../sheets/civil.sheet.in.h:19
+msgid "Backflow preventer"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:20
-msgid "Lifeline"
+#: ../sheets/civil.sheet.in.h:20
+msgid "Motor"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:21
-msgid "Message"
+#: ../sheets/civil.sheet.in.h:21
+msgid "Gas bottle"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:22
-msgid "Node"
+#: ../sheets/civil.sheet.in.h:22
+msgid "Frequency converter"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:23
-msgid "Note"
+#: ../sheets/civil.sheet.in.h:23
+msgid "Vertically aligned propeller"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:24
-msgid "Object"
+#: ../sheets/civil.sheet.in.h:24
+msgid "Aerator with bubbles"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:25
-msgid "Realizes, implements a specific interface"
+#: ../sheets/civil.sheet.in.h:25
+msgid "Rotor"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:27
-msgid "Small package"
+#: ../sheets/civil.sheet.in.h:26
+msgid "Final-settling basin"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:31
-msgid "UML"
+#: ../sheets/civil.sheet.in.h:27
+msgid "Preliminary clarification tank"
 msgstr ""
 
-#: ../sheets/UML.sheet.in.h:32
-msgid "Use case"
+#: ../sheets/civil.sheet.in.h:28
+msgid "Basin"
 msgstr ""
 
-#: ../sheets/chronogram.sheet.in.h:1
-msgid "Chronogram"
-msgstr ""
+#: ../sheets/civil.sheet.in.h:29
+msgid "Container"
+msgstr "Ujo"
 
-#: ../sheets/chronogram.sheet.in.h:2
-msgid "Data line"
+#: ../sheets/Contact.sheet.in.h:1
+msgid "Ladder"
 msgstr ""
 
-#: ../sheets/chronogram.sheet.in.h:3
-msgid "Objects to design chronogram charts"
+#: ../sheets/Contact.sheet.in.h:2
+msgid "Components for LADDER circuits"
 msgstr ""
 
-#: ../sheets/chronogram.sheet.in.h:4
-msgid "Time scale"
+#: ../sheets/Contact.sheet.in.h:3
+msgid "'if' (normally open) ladder contact"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:1
-msgid "BBS"
+#: ../sheets/Contact.sheet.in.h:4
+msgid "'if not' (normally closed) ladder contact"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:2
-msgid "Cisco CA"
+#: ../sheets/Contact.sheet.in.h:5
+msgid "Simple output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:3
-msgid "Cisco — Computer"
+#: ../sheets/Contact.sheet.in.h:6
+msgid "Negative output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:4
-msgid "CiscoSecurity"
+#: ../sheets/Contact.sheet.in.h:7
+msgid "'set' output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:5
-msgid "CiscoWorks workstation"
+#: ../sheets/Contact.sheet.in.h:8
+msgid "'reset' output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:6
-msgid "Computer shapes by Cisco"
+#: ../sheets/Contact.sheet.in.h:9
+msgid "'jump' output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:7
-msgid "Disk subsystem"
+#: ../sheets/Contact.sheet.in.h:10
+msgid "Receptivity output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:8
-msgid "Diskette"
+#: ../sheets/Contact.sheet.in.h:11
+msgid "Power-saved simple output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:9
-msgid "EtherClient"
+#: ../sheets/Contact.sheet.in.h:12
+msgid "Power-saved negative output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:10
-msgid "FC Storage"
+#: ../sheets/Contact.sheet.in.h:13
+msgid "Power-saved 'set' output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:11
-msgid "File Server"
+#: ../sheets/Contact.sheet.in.h:14
+msgid "Power-saved 'reset' output variable"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:12
-msgid "Front End Processor"
+#: ../sheets/Cybernetics.sheet.in.h:1
+msgid "Cybernetics"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:13
-msgid "HP Mini"
+#: ../sheets/Cybernetics.sheet.in.h:2
+msgid "Elements of cybernetic circuits"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:14
-msgid "Handheld"
+#: ../sheets/Cybernetics.sheet.in.h:3
+msgid "Sensor — left"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:15
-msgid "Host"
+#: ../sheets/Cybernetics.sheet.in.h:4
+msgid "Sensor — right"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:16
-msgid "IBM Mini (AS400)"
+#: ../sheets/Cybernetics.sheet.in.h:5
+msgid "Sensor — bottom"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:17
-msgid "IBM Tower"
+#: ../sheets/Cybernetics.sheet.in.h:6
+msgid "Sensor — top"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:18
-msgid "IBM mainframe"
+#: ../sheets/Cybernetics.sheet.in.h:7
+msgid "Sum, subtracting left input"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:19
-msgid "IBM mainframe with FEP"
+#: ../sheets/Cybernetics.sheet.in.h:8
+msgid "Sum, subtracting right input"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:20
-msgid "JBOD"
+#: ../sheets/Cybernetics.sheet.in.h:9
+msgid "Sum, subtracting bottom input"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:22
-msgid "Macintosh"
+#: ../sheets/Cybernetics.sheet.in.h:10
+msgid "Sum, subtracting top input"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:23
-msgid "MicroWebserver"
+#: ../sheets/Cybernetics.sheet.in.h:11
+msgid "Integrator — input left"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:24
-msgid "Mini VAX"
+#: ../sheets/Cybernetics.sheet.in.h:12
+msgid "Integrator — input right"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
-msgid "Monitor"
+#: ../sheets/Cybernetics.sheet.in.h:13
+msgid "Integrator — input bottom"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:27
-msgid "Newton"
+#: ../sheets/Cybernetics.sheet.in.h:14
+msgid "Integrator — input top"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:28
-msgid "PC"
+#: ../sheets/Cybernetics.sheet.in.h:15
+msgid "Sum"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:29
-msgid "PC Adapter Card"
+#: ../sheets/Cybernetics.sheet.in.h:16
+msgid "Product"
+msgstr "Produkto"
+
+#: ../sheets/Cybernetics.sheet.in.h:17
+msgid "High pass filter"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:30
-msgid "PC Card"
+#: ../sheets/Cybernetics.sheet.in.h:18
+msgid "Low pass filter"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:31
-msgid "PC Router Card"
+#: ../sheets/Cybernetics.sheet.in.h:19
+msgid "Sine characteristic or input"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:32
-msgid "PC Software"
+#: ../sheets/Cybernetics.sheet.in.h:20
+msgid "Sigmoid characteristic"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:33
-msgid "PC Video"
+#: ../sheets/Cybernetics.sheet.in.h:21
+msgid "Saturation characteristic"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:34
-msgid "PC with Router-Based Software"
+#: ../sheets/Cybernetics.sheet.in.h:22
+msgid "Relay characteristic (sigma)"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:38
-msgid "SUN workstation"
+#: ../sheets/Cybernetics.sheet.in.h:23
+msgid "Half wave rectifier or ramp input"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:40
-msgid "Server with PC Router"
+#: ../sheets/Cybernetics.sheet.in.h:24
+msgid "Full wave rectifier (absolute value)"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:41
-msgid "Software-Based Router on File Server"
+#: ../sheets/Cybernetics.sheet.in.h:25
+msgid "Constant positive shift on the y-axis"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:43
-msgid "Supercomputer"
-msgstr ""
-
-#: ../sheets/ciscocomputer.sheet.in.h:44
-msgid "Tablet"
+#: ../sheets/Cybernetics.sheet.in.h:26
+msgid "Constant negative shift on the y-axis"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:45
-msgid "Tape array"
+#: ../sheets/Cybernetics.sheet.in.h:27
+msgid "Constant factor greater 1"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:46
-msgid "Terminal"
+#: ../sheets/Cybernetics.sheet.in.h:28
+msgid "Constant factor between 0 and 1"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:47
-msgid "WWW server"
+#: ../sheets/Cybernetics.sheet.in.h:29
+msgid "Constant factor between 0 and -1"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:48
-msgid "Web browser"
+#: ../sheets/Cybernetics.sheet.in.h:30
+msgid "Constant factor below -1"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:49
-msgid "Web cluster"
+#: ../sheets/Cybernetics.sheet.in.h:31
+msgid "Template for custom characteristics"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:50
-msgid "Wireless"
+#: ../sheets/Cybernetics.sheet.in.h:32
+msgid "Time delay"
 msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:51
-msgid "Workgroup director"
-msgstr ""
+#: ../sheets/Database.sheet.in.h:1
+msgid "Database"
+msgstr "Datumbazo"
 
-#: ../sheets/ciscohub.sheet.in.h:1
-msgid "100BaseT Hub"
+#: ../sheets/Database.sheet.in.h:2
+msgid "Editor for Database Table Relation Diagrams"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:2
-msgid "7500ARS (7513) Router"
+#: ../sheets/Database.sheet.in.h:5
+msgid "Attribute compound"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:3
-msgid "7505 Router"
+#: ../sheets/Electric.sheet.in.h:1
+msgid "Electric"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:4
-msgid "7507 Router"
+#: ../sheets/Electric.sheet.in.h:2
+msgid "Components for electric circuits"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:5
-msgid "ASIC Processor"
+#: ../sheets/Electric.sheet.in.h:3
+msgid "Normally open contact (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:6
-msgid "ATM 3800"
+#: ../sheets/Electric.sheet.in.h:4
+msgid "Normally closed contact (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:7
-msgid "ATM Fast Gigabit Etherswitch"
+#: ../sheets/Electric.sheet.in.h:5
+msgid "Normally open position switch (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:8
-msgid "ATM Switch"
+#: ../sheets/Electric.sheet.in.h:6
+msgid "Normally closed position switch (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:9
-msgid "ATM Tag Switch Router"
+#: ../sheets/Electric.sheet.in.h:7
+msgid "Normally open contact (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:10
-msgid "Access Gateway"
+#: ../sheets/Electric.sheet.in.h:8
+msgid "Normally closed contact (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:11
-msgid "BBSM"
+#: ../sheets/Electric.sheet.in.h:9
+msgid "Normally open position switch (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:12
-msgid "Broadband router"
+#: ../sheets/Electric.sheet.in.h:10
+msgid "Normally closed position switch (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:13
-msgid "CSM-S"
+#: ../sheets/Electric.sheet.in.h:11
+msgid "The command organ of a relay (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:14
-msgid "Carrier Routing System"
+#: ../sheets/Electric.sheet.in.h:12
+msgid "Relay (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco 1000"
+#: ../sheets/Electric.sheet.in.h:13
+msgid "Lamp or indicator light (horizontal)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:16
-msgid "Cisco Hub"
+#: ../sheets/Electric.sheet.in.h:14
+msgid "The command organ of a relay (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:17
-msgid "Cisco — Switch"
+#: ../sheets/Electric.sheet.in.h:15
+msgid "Relay (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:18
-msgid "Content Router"
+#: ../sheets/Electric.sheet.in.h:16
+msgid "Lamp or indicator light (vertical)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:19
-msgid "Content Service Module"
+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+msgid "Connection point"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:20
-msgid "Content Service Switch 1100"
+#: ../sheets/ER.sheet.in.h:1
+msgid "ER"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:21
-msgid "Content Switch"
+#: ../sheets/ER.sheet.in.h:2
+msgid "Editor for Entity Relations Diagrams"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:22
-msgid "Data Center Switch"
+#: ../sheets/ER.sheet.in.h:4
+msgid "Weak entity"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:23
-msgid "Data Center Switch Reversed"
+#: ../sheets/ER.sheet.in.h:7
+msgid "Participation"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:24
-msgid "Data Switch Processor"
+#: ../sheets/Flowchart.sheet.in.h:2
+msgid "Objects to draw flowcharts"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:25
-msgid "Director-class Fibre Channel intelligent switch"
+#: ../sheets/Flowchart.sheet.in.h:3
+msgid "Process/Auxiliary Operation"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:26
-msgid "Edge Label Switch Router"
+#: ../sheets/Flowchart.sheet.in.h:4
+msgid "Input/Output"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:27
-msgid "Edge Label Switch Router with NetFlow"
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
+msgid "Decision"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:28
-msgid "Generic Processor"
+#: ../sheets/Flowchart.sheet.in.h:6
+msgid "Connector"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:30
-msgid "Hub subdued"
+#: ../sheets/Flowchart.sheet.in.h:8
+msgid "Transaction file"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:31
-msgid "ISDN switch"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:10
+msgid "Off page connector"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:32
-msgid "LAN2LAN Switch"
+#: ../sheets/Flowchart.sheet.in.h:11
+msgid "Document"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:33
-msgid "Label Switch Router"
+#: ../sheets/Flowchart.sheet.in.h:12
+msgid "Manual operation"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:34
-msgid "Layer 2 Remote Switch"
+#: ../sheets/Flowchart.sheet.in.h:13
+msgid "Preparation"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:35
-msgid "MGX 8220"
+#: ../sheets/Flowchart.sheet.in.h:14
+msgid "Manual input"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:36
-msgid "MGX 8240"
+#: ../sheets/Flowchart.sheet.in.h:15
+msgid "Predefined process"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:37
-msgid "MGX 8260"
+#: ../sheets/Flowchart.sheet.in.h:16
+msgid "Terminal Interrupt"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:38
-msgid "Multi-Fabric Server Switch"
+#: ../sheets/Flowchart.sheet.in.h:17
+msgid "Magnetic disk"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:39
-msgid "MultiSwitch Device"
+#: ../sheets/Flowchart.sheet.in.h:18
+msgid "Magnetic drum"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:40
-msgid "Multilayer Remote Switch"
+#: ../sheets/Flowchart.sheet.in.h:19
+msgid "Magnetic tape"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:41
-msgid "Multilayer Switch"
+#: ../sheets/Flowchart.sheet.in.h:20
+msgid "Internal storage"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:42
-msgid "Multilayer Switch with Silicon"
+#: ../sheets/Flowchart.sheet.in.h:21
+msgid "Merge"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:43
-msgid "Multilayer Switch with Silicon subdued"
+#: ../sheets/Flowchart.sheet.in.h:23
+msgid "Delay"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:44
-msgid "NetFlow router"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:25
+msgid "Summing junction"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:45
-msgid "NetRanger"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:27
+msgid "Collate"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:46
-msgid "NetSonar"
-msgstr ""
+#: ../sheets/Flowchart.sheet.in.h:28
+msgid "Sort"
+msgstr "Ordigi"
 
-#: ../sheets/ciscohub.sheet.in.h:47
-msgid "Optical Services Router"
+#: ../sheets/Flowchart.sheet.in.h:29
+msgid "Or"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:48
-msgid "PXF"
+#: ../sheets/Flowchart.sheet.in.h:30
+msgid "Punched card"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:49
-msgid "Programmable Switch"
+#: ../sheets/Flowchart.sheet.in.h:31
+msgid "Punched tape"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:50
-msgid "RateMUX"
+#: ../sheets/Flowchart.sheet.in.h:32
+msgid "Transmittal tape"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:51
-msgid "Route Switch Processor"
+#: ../sheets/Flowchart.sheet.in.h:33
+msgid "Offline storage"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:52
-msgid "Route Switch Processor with Si"
+#: ../sheets/Flowchart.sheet.in.h:34
+msgid "Data source"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:54
-msgid "Router and switch shapes by Cisco"
+#: ../sheets/FS.sheet.in.h:1
+msgid "FS"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:55
-msgid "Router subdued"
+#: ../sheets/FS.sheet.in.h:2
+msgid "Editor for Function Structure Diagrams."
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:56
-msgid "Router with Firewall"
+#: ../sheets/FS.sheet.in.h:3
+msgid "Flow"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:57
-msgid "Router with Silicon Switch"
+#: ../sheets/FS.sheet.in.h:4
+msgid "Orthogonal polyline flow"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:58
-msgid "Server Switch"
-msgstr ""
+#: ../sheets/FS.sheet.in.h:5
+msgid "Function"
+msgstr "Funkcio"
 
-#: ../sheets/ciscohub.sheet.in.h:59
-msgid "Small Hub"
+#. Author: Nicholas Moore, 2005. mailto: [e-mail]
+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+msgid "Gane and Sarson"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:60
-msgid "Storage Router"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+msgid "Gane and Sarson DFD"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:61
-msgid "Switch Processor"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
+msgid "Alternate external entity"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:62
-msgid "Universal Gateway"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
+msgid "Data store"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:63
-msgid "Virtual Layer Switch"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
+msgid "External entity"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:64
-msgid "Wavelength router"
+#: ../sheets/GRAFCET.sheet.in.h:1
+msgid "GRAFCET"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:65
-msgid "Wireless router"
+#: ../sheets/GRAFCET.sheet.in.h:2
+msgid "Objects to design GRAFCET charts"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:66
-msgid "Workgroup 5000"
+#: ../sheets/GRAFCET.sheet.in.h:8
+msgid "Macro sub-program call step"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:67
-msgid "Workgroup 5002"
+#: ../sheets/GRAFCET.sheet.in.h:9
+msgid "Action to associate to a step"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:68
-msgid "Workgroup 5500"
+#: ../sheets/GRAFCET.sheet.in.h:10
+msgid "Condition (of an action)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:69
-msgid "Workgroup Fibre Channel intelligent switch"
+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
+msgid "Transition"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:70
-msgid "Workgroup Switch Voice-Enabled"
+#: ../sheets/GRAFCET.sheet.in.h:12
+msgid "OR vergent"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:71
-msgid "Workgroup switch"
+#: ../sheets/GRAFCET.sheet.in.h:13
+msgid "AND vergent"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:72
-msgid "Workgroup switch Subdued"
+#: ../sheets/GRAFCET.sheet.in.h:14
+msgid "Arc (upward)"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:73
-msgid "iSCSI switch"
+#. use dc:title instead?
+#: ../sheets/IsometricMap.sheet.in.h:2
+msgid "Map, Isometric"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:1
-msgid "Androgynous Person"
+#. use dc:description instead?
+#: ../sheets/IsometricMap.sheet.in.h:4
+msgid "Isometric Directional Map Shapes"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:2
-msgid "Antenna"
+#: ../sheets/IsometricMap.sheet.in.h:5
+msgid "Road Section"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:3
-msgid "Branch office"
+#: ../sheets/IsometricMap.sheet.in.h:6
+msgid "Long Straight Road Section"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:4
-msgid "Branch office blue"
+#: ../sheets/IsometricMap.sheet.in.h:7
+msgid "Crossroads"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:5
-msgid "Branch office subdued"
+#: ../sheets/IsometricMap.sheet.in.h:8
+msgid "T-Junction"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:6
-msgid "Car"
-msgstr "Aŭtomobilo"
-
-#: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco — Miscellaneous"
+#: ../sheets/IsometricMap.sheet.in.h:9
+msgid "Elevated Road"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:8
-msgid "CiscoWorks Man"
+#: ../sheets/IsometricMap.sheet.in.h:10
+msgid "Corner 1"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:10
-msgid "Generic Building"
+#: ../sheets/IsometricMap.sheet.in.h:11
+msgid "Corner 2"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:11
-msgid "Generic Building blue"
+#: ../sheets/IsometricMap.sheet.in.h:12
+msgid "River"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:12
-msgid "Generic Building subdued"
+#: ../sheets/IsometricMap.sheet.in.h:13
+msgid "Roof 1"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:13
-msgid "Government Building"
+#: ../sheets/IsometricMap.sheet.in.h:14
+msgid "Block 1, 2:4"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:14
-msgid "Headphones"
+#: ../sheets/IsometricMap.sheet.in.h:15
+msgid "Block 2, 2:8"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:15
-msgid "Home office"
+#: ../sheets/IsometricMap.sheet.in.h:16
+msgid "Block 3, 4:4"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:16
-msgid "House"
-msgstr "Domo"
-
-#: ../sheets/ciscomisc.sheet.in.h:17
-msgid "House blue"
+#: ../sheets/IsometricMap.sheet.in.h:17
+msgid "Block 4, 4:8"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:20
-msgid "Lock and Key"
+#: ../sheets/IsometricMap.sheet.in.h:18
+msgid "Block 5, 3:3"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:21
-msgid "MDU"
+#: ../sheets/IsometricMap.sheet.in.h:19
+msgid "Block 6, 4:6"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:22
-msgid "Mac Woman"
+#: ../sheets/IsometricMap.sheet.in.h:20
+msgid "Block 7"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:23
-msgid "Man"
+#: ../sheets/IsometricMap.sheet.in.h:21
+msgid "Factory"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:24
-msgid "Man blue"
+#: ../sheets/IsometricMap.sheet.in.h:22
+msgid "Car 1, Front View"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:25
-msgid "Man gold"
+#: ../sheets/IsometricMap.sheet.in.h:23
+msgid "Car 2, Rear View"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:26
-msgid "Man red"
+#: ../sheets/IsometricMap.sheet.in.h:24
+msgid "Train 1, angled downward"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:27
-msgid "Medium Building"
+#: ../sheets/IsometricMap.sheet.in.h:25
+msgid "Train 2, angled upward"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:28
-msgid "Medium Building blue"
+#: ../sheets/IsometricMap.sheet.in.h:26
+msgid "Tree 1"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:29
-msgid "Medium Building subdued"
+#: ../sheets/IsometricMap.sheet.in.h:27
+msgid "Footbridge, Pedestrian Bridge"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:31
-msgid "Miscellaneous shapes by Cisco"
+#: ../sheets/IsometricMap.sheet.in.h:28
+msgid "One Way Road Sign"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:32
-msgid "PC Man"
+#: ../sheets/Istar.sheet.in.h:1
+msgid "RE-i*"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:33
-msgid "PC Man left"
+#: ../sheets/Istar.sheet.in.h:2
+msgid "Objects to design i* diagrams"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:34
-msgid "Running man"
+#: ../sheets/Istar.sheet.in.h:3
+msgid "An i* softgoal"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:35
-msgid "Running man subdued"
+#: ../sheets/Istar.sheet.in.h:4
+msgid "An i* goal"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:36
-msgid "Running woman"
+#: ../sheets/Istar.sheet.in.h:5
+msgid "An i* resource"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:37
-msgid "Satellite"
+#: ../sheets/Istar.sheet.in.h:6
+msgid "An i* task"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:38
-msgid "Satellite dish"
+#: ../sheets/Istar.sheet.in.h:7
+msgid "An i* unspecified actor"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:39
-msgid "Sitting Woman"
+#: ../sheets/Istar.sheet.in.h:8
+msgid "An i* agent"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:40
-msgid "Sitting Woman right"
+#: ../sheets/Istar.sheet.in.h:9
+msgid "An i* position"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:41
-msgid "Small Business"
+#: ../sheets/Istar.sheet.in.h:10
+msgid "An i* role"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:43
-msgid "Standing Man"
+#: ../sheets/Istar.sheet.in.h:11
+msgid "An i* unspecified link"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:44
-msgid "Standing woman"
+#: ../sheets/Istar.sheet.in.h:12
+msgid "An i* positive contribution"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:45
-msgid "Telecommuter"
+#: ../sheets/Istar.sheet.in.h:13
+msgid "An i* negative contribution"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:46
-msgid "Telecommuter house"
+#: ../sheets/Istar.sheet.in.h:14
+msgid "An i* dependency link"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:47
-msgid "Telecommuter house subdued"
+#: ../sheets/Istar.sheet.in.h:15
+msgid "An i* decomposition link"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:48
-msgid "Truck"
+#: ../sheets/Istar.sheet.in.h:16
+msgid "An i* means-ends link"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:49
-msgid "University"
+#: ../sheets/Jackson.sheet.in.h:1
+msgid "RE-Jackson"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:50
-msgid "Video Camera"
+#: ../sheets/Jackson.sheet.in.h:2
+msgid "Objects to design Jackson diagrams"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:51
-msgid "Video Camera right"
+#: ../sheets/Jackson.sheet.in.h:3
+msgid "A Jackson given domain"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:52
-msgid "Woman"
+#: ../sheets/Jackson.sheet.in.h:4
+msgid "A Jackson designed domain"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:53
-msgid "Woman blue"
+#: ../sheets/Jackson.sheet.in.h:5
+msgid "A Jackson machine domain"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:54
-msgid "Woman gold"
+#: ../sheets/Jackson.sheet.in.h:6
+msgid "A Jackson requirement"
 msgstr ""
 
-#: ../sheets/ciscomisc.sheet.in.h:55
-msgid "Woman red"
+#: ../sheets/Jackson.sheet.in.h:7
+msgid "A Jackson shared phenomenon"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:1
-msgid "10700"
+#: ../sheets/Jackson.sheet.in.h:8
+msgid "A Jackson requirement phenomenon"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:2
-msgid "15200"
+#: ../sheets/jigsaw.sheet.in.h:1
+msgid "Jigsaw"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:3
-msgid "15800"
+#: ../sheets/jigsaw.sheet.in.h:2
+msgid "Pieces of a jigsaw"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:4
-msgid "3174 (desktop) cluster controller"
+#: ../sheets/jigsaw.sheet.in.h:3
+msgid "Jigsaw — part_oioi"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:5
-msgid "3X74 (floor) cluster controller"
+#: ../sheets/jigsaw.sheet.in.h:4
+msgid "Jigsaw — part_ioio"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:6
-msgid "Access Server"
+#: ../sheets/jigsaw.sheet.in.h:5
+msgid "Jigsaw — part_iiii"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:7
-msgid "AccessPoint"
+#: ../sheets/jigsaw.sheet.in.h:6
+msgid "Jigsaw — part_oooo"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:8
-msgid "Automatic Protection Switching"
+#: ../sheets/jigsaw.sheet.in.h:7
+msgid "Jigsaw — part_oooi"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:9
-msgid "BBFW"
+#: ../sheets/jigsaw.sheet.in.h:8
+msgid "Jigsaw — part_iooo"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:10
-msgid "BBFW media"
+#: ../sheets/jigsaw.sheet.in.h:9
+msgid "Jigsaw — part_oioo"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:11
-msgid "Breakout box"
+#: ../sheets/jigsaw.sheet.in.h:10
+msgid "Jigsaw — part_ooio"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:12
-msgid "Bridge"
+#: ../sheets/jigsaw.sheet.in.h:11
+msgid "Jigsaw — part_iioo"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:13
-msgid "CDDI/FDDI Concentrator"
+#: ../sheets/jigsaw.sheet.in.h:12
+msgid "Jigsaw — part_oiio"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:14
-msgid "CDM Content Distribution Manager"
+#: ../sheets/jigsaw.sheet.in.h:13
+msgid "Jigsaw — part_ooii"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:15
-msgid "CSU/DSU"
+#: ../sheets/jigsaw.sheet.in.h:14
+msgid "Jigsaw — part_iooi"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:16
-msgid "Cable Modem"
+#: ../sheets/jigsaw.sheet.in.h:15
+msgid "Jigsaw — part_oiii"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:17
-msgid "Catalyst Access Gateway"
+#: ../sheets/jigsaw.sheet.in.h:16
+msgid "Jigsaw — part_ioii"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:18
-msgid "Centri Firewall"
+#: ../sheets/jigsaw.sheet.in.h:17
+msgid "Jigsaw — part_iioi"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:19
-msgid "Channelized Pipe"
+#: ../sheets/jigsaw.sheet.in.h:18
+msgid "Jigsaw — part_iiio"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco — Network"
+#: ../sheets/KAOS.sheet.in.h:1
+msgid "RE-KAOS"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:21
-msgid "Cloud"
+#: ../sheets/KAOS.sheet.in.h:2
+msgid "Objects to design KAOS diagrams"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:22
-msgid "Cloud Dark"
+#: ../sheets/KAOS.sheet.in.h:3
+msgid "A KAOS softgoal"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:23
-msgid "Cloud Gold"
+#: ../sheets/KAOS.sheet.in.h:4
+msgid "A KAOS goal"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:24
-msgid "Cloud White"
+#: ../sheets/KAOS.sheet.in.h:5
+msgid "A KAOS requirement"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:25
-msgid "Concatenated Payload"
+#: ../sheets/KAOS.sheet.in.h:6
+msgid "A KAOS assumption"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:26
-msgid "Content Engine (Cache Director)"
+#: ../sheets/KAOS.sheet.in.h:7
+msgid "A KAOS obstacle"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:27
-msgid "Content Transformation Engine (CTE)"
+#: ../sheets/KAOS.sheet.in.h:8
+msgid "A KAOS AND refinement"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:28
-msgid "DSLAM"
+#: ../sheets/KAOS.sheet.in.h:9
+msgid "A KAOS complete AND refinement"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:29
-msgid "DWDM Filter"
+#: ../sheets/KAOS.sheet.in.h:10
+msgid "A KAOS OR refinement"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:30
-msgid "Detector"
+#: ../sheets/KAOS.sheet.in.h:11
+msgid "A KAOS complete OR refinement"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:31
-msgid "Digital Cross-Connect"
+#: ../sheets/KAOS.sheet.in.h:12
+msgid "A KAOS operationalization"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:32
-msgid "Directory Server"
+#: ../sheets/KAOS.sheet.in.h:13
+msgid "A KAOS contribution"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:33
-msgid "Distributed Director"
+#: ../sheets/KAOS.sheet.in.h:14
+msgid "A KAOS obstruction"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:34
-msgid "Dual Mode AccessPoint"
+#: ../sheets/KAOS.sheet.in.h:15
+msgid "A KAOS binary conflict"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:35
-msgid "FDDI Ring"
+#: ../sheets/KAOS.sheet.in.h:16
+msgid "A KAOS agent"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:36
-msgid "File Engine"
+#: ../sheets/KAOS.sheet.in.h:17
+msgid "A KAOS responsibility"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:37
-msgid "Firewall"
+#: ../sheets/KAOS.sheet.in.h:18
+msgid "A KAOS monitor link"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:38
-msgid "Firewall Service Module"
+#: ../sheets/KAOS.sheet.in.h:19
+msgid "A KAOS control link"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:39
-msgid "Firewall horizontal"
+#: ../sheets/KAOS.sheet.in.h:20
+msgid "A KAOS capable-of"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:40
-msgid "Firewall subdued"
+#: ../sheets/KAOS.sheet.in.h:21
+msgid "A KAOS performs"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:41
-msgid "General Appliance"
+#: ../sheets/KAOS.sheet.in.h:22
+msgid "A KAOS input"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:42
-msgid "Generic Gateway"
+#: ../sheets/KAOS.sheet.in.h:23
+msgid "A KAOS output"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:44
-msgid "IOS Firewall"
+#: ../sheets/Lights.sheet.in.h:1
+msgid "Lights"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:45
-msgid "IOS SLB"
+#: ../sheets/Lights.sheet.in.h:2
+msgid "Objects to design simple lighting plots"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:46
-msgid "IP"
+#: ../sheets/Lights.sheet.in.h:3
+msgid "PAR"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:47
-msgid "IP DSL Switch"
+#: ../sheets/Lights.sheet.in.h:4
+msgid "PAR on the floor"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:48
-msgid "IP Old-style"
+#: ../sheets/Lights.sheet.in.h:5
+msgid "ACL"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:49
-msgid "IP Transport Concentrator"
+#: ../sheets/Lights.sheet.in.h:6
+msgid "Pebble Convex lantern"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:50
-msgid "IPTV broadcast server"
+#: ../sheets/Lights.sheet.in.h:7
+msgid "Fresnel lantern"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:51
-msgid "IPTV content manager"
+#: ../sheets/Lights.sheet.in.h:8
+msgid "Striplight"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:52
-msgid "LAN to LAN"
+#: ../sheets/Lights.sheet.in.h:9
+msgid "Ellipsoidal Reflector Spotlight"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:53
-msgid "Lightweight AP"
+#: ../sheets/Lights.sheet.in.h:10
+msgid "Blinders"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:54
-msgid "LocalDirector"
+#: ../sheets/Lights.sheet.in.h:11
+msgid "Black light"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:55
-msgid "Location server"
+#: ../sheets/Lights.sheet.in.h:12
+msgid "Stroboscope light"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:56
-msgid "LongReach CPE"
+#: ../sheets/Lights.sheet.in.h:13
+msgid "Moving head"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:57
-msgid "MAS Gateway"
+#: ../sheets/Lights.sheet.in.h:15
+msgid "Structure"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:58
-msgid "MAU"
+#: ../sheets/Logic.sheet.in.h:1
+msgid "Logic"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:59
-msgid "ME 1100"
+#: ../sheets/Logic.sheet.in.h:2
+msgid "Boolean Logic"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:60
-msgid "MUX"
+#: ../sheets/Logic.sheet.in.h:3
+msgid "OR gate"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:61
-msgid "Metro 1500"
+#: ../sheets/Logic.sheet.in.h:4
+msgid "AND gate"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:62
-msgid "NAT"
+#: ../sheets/Logic.sheet.in.h:5
+msgid "XOR gate"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:63
-msgid "Network Management"
+#: ../sheets/Logic.sheet.in.h:6
+msgid "Simple buffer"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:64
-msgid "Network shapes by Cisco"
+#: ../sheets/Logic.sheet.in.h:7
+msgid "Inverter"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:65
-msgid "ONS15104"
+#: ../sheets/Logic.sheet.in.h:8
+msgid "NAND gate"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:66
-msgid "ONS15540"
+#: ../sheets/Logic.sheet.in.h:9
+msgid "NOR gate"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:67
-msgid "Optical Amplifier"
+#: ../sheets/Logic.sheet.in.h:10
+msgid "NOT"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:68
-msgid "Optical Cross-Connect"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:69
-msgid "Optical Fiber"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:70
-msgid "Optical Transport"
-msgstr ""
-
-#. compatibility
-#. <alias name="Cisco - PAD"/>
-#: ../sheets/cisconetwork.sheet.in.h:73
-msgid "PAD"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:74
-msgid "PIX Firewall"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:75
-msgid "PIX Firewall Left"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:76
-msgid "Protocol Translator"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:77
-msgid "RPS"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:78
-msgid "Repeater"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:79
-msgid "SSL Terminator"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:80
-msgid "STB (set top box)"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:81
-msgid "Security appliance"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:82
-msgid "Service Control"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:83
-msgid "Storage Solution Engine"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:84
-msgid "System controller"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:85
-msgid "TV"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:86
-msgid "Terminal Server"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:87
-msgid "TokenRing"
-msgstr ""
-
-#: ../sheets/cisconetwork.sheet.in.h:88
-msgid "TransPath"
+#: ../sheets/Logic.sheet.in.h:11
+msgid "Cross-connector"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:89
-msgid "UPS"
+#: ../sheets/Misc.sheet.in.h:1
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:90
-msgid "VIP"
+#: ../sheets/Misc.sheet.in.h:2
+msgid "Miscellaneous Shapes"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:91
-msgid "VN2900"
+#: ../sheets/Misc.sheet.in.h:3
+msgid "Tree"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:92
-msgid "VN5900"
+#: ../sheets/Misc.sheet.in.h:4
+msgid "Folder"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:93
-msgid "VN5902"
+#: ../sheets/Misc.sheet.in.h:6
+msgid "expansible node"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:94
-msgid "VPN Concentrator"
+#: ../sheets/Misc.sheet.in.h:7
+msgid "expanded node"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:95
-msgid "VPN Gateway"
+#: ../sheets/Misc.sheet.in.h:8
+msgid "Traditional clock"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:96
-msgid "WAN"
+#: ../sheets/Misc.sheet.in.h:9
+msgid "Measure distance"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:97
-msgid "WDM"
+#: ../sheets/Misc.sheet.in.h:10
+msgid "Resizable grid"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:98
-msgid "WLAN controller"
-msgstr ""
+#: ../sheets/Misc.sheet.in.h:11
+#, fuzzy
+#| msgid "Diagram Tree"
+msgid "Diagram object"
+msgstr "Skemo-arbo"
 
-#: ../sheets/cisconetwork.sheet.in.h:99
-msgid "Wi-Fi Tag"
+#: ../sheets/Misc.sheet.in.h:12
+msgid "N-gon or Star object"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:100
-msgid "Wireless Bridge"
+#: ../sheets/MSE.sheet.in.h:1
+msgid "MSE"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:101
-msgid "Wireless Connectivity"
+#: ../sheets/MSE.sheet.in.h:2
+msgid "U.S. Army Mobile Subscriber Equipment Components"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:102
-msgid "Wireless Location Appliance"
+#: ../sheets/MSE.sheet.in.h:3
+msgid "Node center"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:103
-msgid "Wireless Transport"
+#: ../sheets/MSE.sheet.in.h:4
+msgid "Large extension node"
 msgstr ""
 
-#: ../sheets/cisconetwork.sheet.in.h:104
-msgid "uBR910 Cable DSU"
+#: ../sheets/MSE.sheet.in.h:5
+msgid "Small extension node"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:1
-msgid "6701"
-msgstr "6701"
-
-#: ../sheets/ciscotelephony.sheet.in.h:2
-msgid "6705"
-msgstr "6705"
-
-#: ../sheets/ciscotelephony.sheet.in.h:3
-msgid "6732"
-msgstr "6732"
-
-#: ../sheets/ciscotelephony.sheet.in.h:4
-msgid "ADM"
-msgstr "ADM"
-
-#: ../sheets/ciscotelephony.sheet.in.h:5
-msgid "ATA"
-msgstr "ATA"
-
-#: ../sheets/ciscotelephony.sheet.in.h:6
-msgid "BTS 10200"
-msgstr "BTS 10200"
-
-#: ../sheets/ciscotelephony.sheet.in.h:7
-msgid "CallManager"
+#: ../sheets/MSE.sheet.in.h:6
+msgid "Tactical satellite communications terminal"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:8
-msgid "Cellular Phone"
+#: ../sheets/MSE.sheet.in.h:7
+msgid "Multiplexer"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco — Telephony"
+#: ../sheets/MSE.sheet.in.h:8
+msgid "Demultiplexer"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:10
-msgid "Class 4/5 switch"
-msgstr ""
+#: ../sheets/network.sheet.in.h:1
+msgid "Network"
+msgstr "Reto"
 
-#: ../sheets/ciscotelephony.sheet.in.h:11
-msgid "End Office"
+#: ../sheets/network.sheet.in.h:2
+msgid "Objects to design network diagrams with"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:12
-msgid "Fax"
-msgstr "Faksilo"
+#: ../sheets/network.sheet.in.h:3
+msgid "Computer"
+msgstr "Komputilo"
 
-#: ../sheets/ciscotelephony.sheet.in.h:13
-msgid "Gatekeeper"
-msgstr "Kluzprenilo"
+#: ../sheets/network.sheet.in.h:5
+msgid "Storage"
+msgstr "Konservado"
 
-#: ../sheets/ciscotelephony.sheet.in.h:14
-msgid "Generic softswitch"
+#: ../sheets/network.sheet.in.h:6
+msgid "Ethernet bus"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:15
-msgid "H.323"
-msgstr "H.323"
+#: ../sheets/network.sheet.in.h:7
+msgid "Simple printer"
+msgstr "Simpla presilo"
 
-#: ../sheets/ciscotelephony.sheet.in.h:16
-msgid "HootPhone"
-msgstr ""
+#: ../sheets/network.sheet.in.h:8
+msgid "WAN connection"
+msgstr "WAN-konekto"
 
-#: ../sheets/ciscotelephony.sheet.in.h:17
-msgid "IAD router"
-msgstr ""
+#: ../sheets/network.sheet.in.h:9
+msgid "WAN link"
+msgstr "WAN-ligilo"
 
-#: ../sheets/ciscotelephony.sheet.in.h:18
-msgid "ICM"
+#: ../sheets/network.sheet.in.h:10
+msgid "Stackable hub or switch"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:19
-msgid "ICS"
+#: ../sheets/network.sheet.in.h:11
+msgid "Modular switching system"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:20
-msgid "IP Phone"
+#: ../sheets/network.sheet.in.h:12
+msgid "24 Port Patch Panel"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:21
-msgid "IP Softphone"
+#: ../sheets/network.sheet.in.h:13
+msgid "RJ45 wall-plug"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:22
-msgid "IP Telephony Router"
+#: ../sheets/network.sheet.in.h:14
+msgid "Wall-plug for the scEAD cabling system"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:23
-msgid "ITP"
+#: ../sheets/network.sheet.in.h:15
+msgid "Simple modem"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:24
-msgid "IntelliSwitch Stack"
+#: ../sheets/network.sheet.in.h:16
+msgid "Antenna for wireless transmission"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:25
-msgid "MCU"
+#: ../sheets/network.sheet.in.h:17
+msgid "Mobile telephony base station"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:26
-msgid "MGX 8000 Series Voice Gateway"
+#: ../sheets/network.sheet.in.h:18
+msgid "Network cloud"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:27
-msgid "MoH server (Music on Hold)"
+#: ../sheets/network.sheet.in.h:19
+msgid "Mobile telephony cell"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:28
-msgid "Mobile Access IP Phone"
-msgstr ""
+#: ../sheets/network.sheet.in.h:20
+msgid "Router symbol"
+msgstr "Simbolo de enkursigili"
 
-#: ../sheets/ciscotelephony.sheet.in.h:29
-msgid "Mobile Access Router"
+#: ../sheets/network.sheet.in.h:21
+msgid "Switch symbol"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:30
-msgid "Octel"
+#: ../sheets/network.sheet.in.h:22
+msgid "ATM switch symbol"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:31
-msgid "PBX"
-msgstr "PBX"
+#: ../sheets/network.sheet.in.h:23
+msgid "Firewall router"
+msgstr "Fajroŝirmila enkursigilo"
 
-#: ../sheets/ciscotelephony.sheet.in.h:32
-msgid "PBX Switch"
-msgstr ""
+#: ../sheets/network.sheet.in.h:24
+msgid "Workstation monitor"
+msgstr "Kontrolado de laborstacio"
 
-#: ../sheets/ciscotelephony.sheet.in.h:33
-msgid "Pager"
-msgstr ""
+#: ../sheets/network.sheet.in.h:25
+msgid "UNIX workstation"
+msgstr "UNIX-a laborstacio"
 
-#: ../sheets/ciscotelephony.sheet.in.h:34
-msgid "Phone"
+#: ../sheets/network.sheet.in.h:26
+msgid "Desktop PC"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:35
-msgid "Phone 2"
+#: ../sheets/network.sheet.in.h:27
+msgid "Laptop PC"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:36
-msgid "Phone Appliance"
+#: ../sheets/network.sheet.in.h:28
+msgid "Bigtower PC"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:37
-msgid "Phone Ethernet"
+#: ../sheets/network.sheet.in.h:29
+msgid "Miditower PC"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:38
-msgid "Phone Feature"
+#: ../sheets/network.sheet.in.h:30
+msgid "Minitower PC"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:39
-msgid "Phone/Fax"
+#: ../sheets/network.sheet.in.h:31
+msgid "Speaker with integrated amplifier"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:40
-msgid "Radio Tower"
+#: ../sheets/network.sheet.in.h:32
+msgid "Speaker without amplifier"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:41
-msgid "SC2200 (Signalling Controller)"
+#: ../sheets/network.sheet.in.h:33
+msgid "3 1/2 inch diskette"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:42
-msgid "SC2200/VSC3000 host"
+#: ../sheets/network.sheet.in.h:34
+msgid "ZIP disk"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:43
-msgid "SIP Proxy Server"
+#: ../sheets/network.sheet.in.h:35
+msgid "External DAT drive"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:44
-msgid "SONET MUX"
-msgstr ""
+#: ../sheets/network.sheet.in.h:36
+msgid "Mobile phone"
+msgstr "Poŝtelefono"
 
-#: ../sheets/ciscotelephony.sheet.in.h:45
-msgid "STP"
+#: ../sheets/network.sheet.in.h:37
+msgid "Telephone"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:46
-msgid "Softphone"
+#: ../sheets/network.sheet.in.h:38
+msgid "Plotter"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:47
-msgid "TDM router"
+#: ../sheets/network.sheet.in.h:39
+msgid "Digitizing board"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:48
-msgid "Telephony shapes by Cisco"
+#: ../sheets/Pneumatic.sheet.in.h:1
+msgid "Pneumatic/Hydraulic"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:49
-msgid "Turret"
+#: ../sheets/Pneumatic.sheet.in.h:2
+msgid "Components for pneumatic and hydraulic circuits"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:50
-msgid "Unity Express"
+#: ../sheets/Pneumatic.sheet.in.h:3
+msgid "Double-effect jack"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:51
-msgid "Unity server"
+#: ../sheets/Pneumatic.sheet.in.h:4
+msgid "Normally-in simple-effect jack"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:52
-msgid "Virtual switch controller (VSC 3000)"
+#: ../sheets/Pneumatic.sheet.in.h:5
+msgid "Normally-out simple-effect jack"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:53
-msgid "Voice-Enabled ATM Switch"
+#: ../sheets/Pneumatic.sheet.in.h:6
+msgid "Generic pressure source"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:54
-msgid "Voice-Enabled Access Server"
+#: ../sheets/Pneumatic.sheet.in.h:7
+msgid "Hydraulic pressure source"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:55
-msgid "Voice-Enabled Router"
+#: ../sheets/Pneumatic.sheet.in.h:8
+msgid "Pneumatic pressure source"
 msgstr ""
 
-#: ../sheets/ciscotelephony.sheet.in.h:56
-msgid "uMG series"
+#: ../sheets/Pneumatic.sheet.in.h:9
+msgid "Air exhaust orifice"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:1
-msgid "Aerator with bubbles"
+#: ../sheets/Pneumatic.sheet.in.h:10
+msgid "2/2 distributor"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:2
-msgid "Backflow preventer"
+#: ../sheets/Pneumatic.sheet.in.h:11
+msgid "3/2 distributor"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:3
-msgid "Basin"
+#: ../sheets/Pneumatic.sheet.in.h:12
+msgid "4/2 distributor"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:4
-msgid "Bivalent vertical rest"
+#: ../sheets/Pneumatic.sheet.in.h:13
+msgid "5/2 distributor"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:5
-msgid "Civil"
+#: ../sheets/Pneumatic.sheet.in.h:14
+msgid "Muscular command"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:6
-msgid "Civil Engineering Components"
+#: ../sheets/Pneumatic.sheet.in.h:15
+msgid "Push-button command"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:7
-msgid "Container"
-msgstr "Ujo"
-
-#: ../sheets/civil.sheet.in.h:8
-msgid "Final-settling basin"
+#: ../sheets/Pneumatic.sheet.in.h:16
+msgid "Mechanical command by tappet"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:9
-msgid "Frequency converter"
+#: ../sheets/Pneumatic.sheet.in.h:17
+msgid "Mechanical command by spring"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:10
-msgid "Gas bottle"
+#: ../sheets/Pneumatic.sheet.in.h:18
+msgid "Electric command (single coil)"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:11
-msgid "Horizontal limiting line"
+#: ../sheets/Pneumatic.sheet.in.h:19
+msgid "Electric command (double coil)"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:12
-msgid "Horizontal rest"
+#: ../sheets/Pneumatic.sheet.in.h:20
+msgid "Indirect command by hydraulic driver"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:13
-msgid "Horizontally aligned arrow"
+#: ../sheets/Pneumatic.sheet.in.h:21
+msgid "Indirect command by pneumatic driver"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:14
-msgid "Horizontally aligned compressor"
+#: ../sheets/SADT.sheet.in.h:1
+msgid "SADT/IDEF0"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:15
-msgid "Horizontally aligned pump"
+#: ../sheets/SADT.sheet.in.h:2
+msgid "Objects to design SADT diagrams"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:16
-msgid "Horizontally aligned valve"
+#: ../sheets/SADT.sheet.in.h:3
+msgid "Activity/data flow arrow"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:17
-msgid "Motor"
+#: ../sheets/SADT.sheet.in.h:4
+msgid "Activity/data box"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:18
-msgid "Preliminary clarification tank"
+#: ../sheets/SADT.sheet.in.h:5
+msgid "Flow label"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:19
-msgid "Reference line"
+#: ../sheets/SDL.sheet.in.h:1
+msgid "SDL"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:20
-msgid "Rotor"
+#: ../sheets/SDL.sheet.in.h:2
+msgid "Specification and Description Language."
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:21
-msgid "Soil"
+#: ../sheets/SDL.sheet.in.h:3
+msgid "Block type reference"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:22
-msgid "Vertical limiting line"
+#: ../sheets/SDL.sheet.in.h:4
+msgid "Service type reference"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:23
-msgid "Vertical rest"
+#: ../sheets/SDL.sheet.in.h:5
+msgid "Process type reference"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:24
-msgid "Vertically aligned arrow"
-msgstr ""
+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
+msgid "State"
+msgstr "Stato"
 
-#: ../sheets/civil.sheet.in.h:25
-msgid "Vertically aligned compressor"
+#: ../sheets/SDL.sheet.in.h:7
+msgid "Function header"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:26
-msgid "Vertically aligned propeller"
+#: ../sheets/SDL.sheet.in.h:8
+msgid "Send message"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:27
-msgid "Vertically aligned pump"
+#: ../sheets/SDL.sheet.in.h:9
+msgid "Receive message"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:28
-msgid "Vertically aligned valve"
+#: ../sheets/SDL.sheet.in.h:10
+msgid "Function call"
 msgstr ""
 
-#: ../sheets/civil.sheet.in.h:29
-msgid "Water level"
+#: ../sheets/SDL.sheet.in.h:12
+msgid "Action being executed"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:1
-msgid "Jigsaw"
+#: ../sheets/SDL.sheet.in.h:13
+msgid "Save state"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw — part_iiii"
+#: ../sheets/SDL.sheet.in.h:15
+msgid "In/Out connector"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw — part_iiio"
+#: ../sheets/SDL.sheet.in.h:17
+msgid "Procedure return"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw — part_iioi"
+#: ../sheets/SDL.sheet.in.h:19
+msgid "Generic text note"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw — part_iioo"
+#: ../sheets/Shape_Design.sheet.in.h:1
+msgid "Shape Design"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw — part_ioii"
+#: ../sheets/Shape_Design.sheet.in.h:2
+msgid "Design Dia objects with individual connection points"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw — part_ioio"
+#: ../sheets/Shape_Design.sheet.in.h:3
+#, fuzzy
+#| msgid "Connect"
+msgid "Connection Point"
+msgstr "Konekti"
+
+#: ../sheets/Shape_Design.sheet.in.h:4
+msgid "Main Connection Point"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw — part_iooi"
+#: ../sheets/Sozi.sheet.in.h:2
+msgid "Objects to do Sozi (zooming ui) presentations"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw — part_iooo"
+#: ../sheets/Sozi.sheet.in.h:3
+msgid "Sozi frame"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw — part_oiii"
+#: ../sheets/Sozi.sheet.in.h:4
+msgid "Sozi media"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw — part_oiio"
+#: ../sheets/sybase.sheet.in.h:1
+msgid "Sybase"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw — part_oioi"
+#: ../sheets/sybase.sheet.in.h:2
+msgid "Objects to design Sybase replication domain diagrams with"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw — part_oioo"
+#: ../sheets/sybase.sheet.in.h:3
+msgid "Sybase dataserver"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw — part_ooii"
+#: ../sheets/sybase.sheet.in.h:4
+msgid "Sybase replication server"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw — part_ooio"
+#: ../sheets/sybase.sheet.in.h:5
+msgid "Log transfer manager or rep agent"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw — part_oooi"
+#: ../sheets/sybase.sheet.in.h:6
+msgid "Stable storage device"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw — part_oooo"
+#: ../sheets/sybase.sheet.in.h:7
+msgid "Sybase client application"
 msgstr ""
 
-#: ../sheets/jigsaw.sheet.in.h:18
-msgid "Pieces of a jigsaw"
+#: ../sheets/sybase.sheet.in.h:8
+msgid "Replication server manager"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:1
-msgid "24 Port Patch Panel"
+#: ../sheets/UML.sheet.in.h:1
+msgid "UML"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:2
-msgid "3 1/2 inch diskette"
+#: ../sheets/UML.sheet.in.h:2
+msgid "Editor for UML Static Structure Diagrams"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:3
-msgid "ATM switch symbol"
+#: ../sheets/UML.sheet.in.h:5
+msgid "Note"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:4
-msgid "Antenna for wireless transmission"
+#: ../sheets/UML.sheet.in.h:7
+msgid "Realizes, implements a specific interface"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:5
-msgid "Bigtower PC"
+#: ../sheets/UML.sheet.in.h:8
+msgid "Generalization, class inheritance"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:6
-msgid "Computer"
-msgstr "Komputilo"
+#: ../sheets/UML.sheet.in.h:9
+msgid "Association, two classes are associated"
+msgstr ""
 
-#: ../sheets/network.sheet.in.h:7
-msgid "Desktop PC"
+#: ../sheets/UML.sheet.in.h:10
+msgid "Aggregation, one class is part of another"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:8
-msgid "Digitizing board"
+#: ../sheets/UML.sheet.in.h:11
+msgid "Implements, class implements a specific interface"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:9
-msgid "Ethernet bus"
+#: ../sheets/UML.sheet.in.h:12
+msgid "Constraint, place a constraint on something"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:10
-msgid "External DAT drive"
+#: ../sheets/UML.sheet.in.h:13
+msgid "Small package"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:11
-msgid "Firewall router"
-msgstr "Fajroŝirmila enkursigilo"
+#: ../sheets/UML.sheet.in.h:14
+msgid "Large package"
+msgstr ""
 
-#: ../sheets/network.sheet.in.h:12
-msgid "Laptop PC"
+#: ../sheets/UML.sheet.in.h:16
+msgid "Use case"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:13
-msgid "Miditower PC"
+#: ../sheets/UML.sheet.in.h:17
+msgid "Lifeline"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:14
-msgid "Minitower PC"
+#: ../sheets/UML.sheet.in.h:18
+msgid "Object"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:15
-msgid "Mobile phone"
-msgstr "Poŝtelefono"
+#: ../sheets/UML.sheet.in.h:19
+msgid "Message"
+msgstr ""
 
-#: ../sheets/network.sheet.in.h:16
-msgid "Mobile telephony base station"
+#: ../sheets/UML.sheet.in.h:20
+msgid "Component"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:17
-msgid "Mobile telephony cell"
+#: ../sheets/UML.sheet.in.h:25
+msgid "Node"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:18
-msgid "Modular switching system"
+#: ../sheets/UML.sheet.in.h:26
+msgid "Class stereotype icon"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:22
-msgid "Objects to design network diagrams with"
+#: ../sheets/UML.sheet.in.h:27
+msgid "Initial/End state"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:23
-msgid "Plotter"
+#: ../sheets/UML.sheet.in.h:29
+msgid "Activity"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:24
-msgid "RJ45 wall-plug"
+#: ../sheets/UML.sheet.in.h:31
+msgid "Fork/Union"
 msgstr ""
 
-#: ../sheets/network.sheet.in.h:25
-msgid "Router symbol"
-msgstr "Simbolo de enkursigili"
+#~ msgid "_Diagram Tree…"
+#~ msgstr "_Diagrama arbo…"
 
-#: ../sheets/network.sheet.in.h:26
-msgid "Simple modem"
-msgstr ""
+#~ msgid "_New"
+#~ msgstr "_Nova"
 
-#: ../sheets/network.sheet.in.h:27
-msgid "Simple printer"
-msgstr "Simpla presilo"
+#~ msgid "_Delete"
+#~ msgstr "_Forigi"
 
-#: ../sheets/network.sheet.in.h:28
-msgid "Speaker with integrated amplifier"
-msgstr ""
+#~ msgid "Move up"
+#~ msgstr "Movi supre"
 
-#: ../sheets/network.sheet.in.h:29
-msgid "Speaker without amplifier"
-msgstr ""
+#~ msgid "_Primary key"
+#~ msgstr "Ĉe_fŝlosilo"
 
-#: ../sheets/network.sheet.in.h:30
-msgid "Stackable hub or switch"
-msgstr ""
+#~ msgid "Uni_que"
+#~ msgstr "Uni_ka"
 
-#: ../sheets/network.sheet.in.h:31
-msgid "Storage"
-msgstr "Konservado"
+#~ msgid "_Table"
+#~ msgstr "_Tabelo"
 
-#: ../sheets/network.sheet.in.h:32
-msgid "Switch symbol"
-msgstr ""
+#~ msgid "Table name:"
+#~ msgstr "Tabelnomo:"
 
-#: ../sheets/network.sheet.in.h:34
-msgid "UNIX workstation"
-msgstr "UNIX-a laborstacio"
+#~ msgid "Text Color:"
+#~ msgstr "Koloro de Teksto:"
 
-#: ../sheets/network.sheet.in.h:35
-msgid "WAN connection"
-msgstr "WAN-konekto"
+#~ msgid "Foreground Color:"
+#~ msgstr "Malfona koloro:"
 
-#: ../sheets/network.sheet.in.h:36
-msgid "WAN link"
-msgstr "WAN-ligilo"
+#~ msgid "not null"
+#~ msgstr "ne nulo"
 
-#: ../sheets/network.sheet.in.h:37
-msgid "Wall-plug for the scEAD cabling system"
-msgstr ""
+#~ msgid "null"
+#~ msgstr "nulo"
 
-#: ../sheets/network.sheet.in.h:38
-msgid "Workstation monitor"
-msgstr "Kontrolado de laborstacio"
+#~ msgid "unique"
+#~ msgstr "unika"
 
-#: ../sheets/network.sheet.in.h:39
-msgid "ZIP disk"
-msgstr ""
+#~ msgid "Millisecond"
+#~ msgstr "Milisekundo"
 
-#: ../sheets/sybase.sheet.in.h:1
-msgid "Log transfer manager or rep agent"
-msgstr ""
+#~ msgid "Second"
+#~ msgstr "Sekundo"
 
-#: ../sheets/sybase.sheet.in.h:2
-msgid "Objects to design Sybase replication domain diagrams with"
-msgstr ""
+#~ msgid "Minute"
+#~ msgstr "Minuto"
 
-#: ../sheets/sybase.sheet.in.h:3
-msgid "Replication server manager"
-msgstr ""
+#~ msgid "Hour"
+#~ msgstr "Horo"
 
-#: ../sheets/sybase.sheet.in.h:4
-msgid "Stable storage device"
-msgstr ""
+#~ msgid "Day"
+#~ msgstr "Tago"
 
-#: ../sheets/sybase.sheet.in.h:5
-msgid "Sybase"
-msgstr ""
+#~ msgid "Week"
+#~ msgstr "Semajno"
 
-#: ../sheets/sybase.sheet.in.h:6
-msgid "Sybase client application"
-msgstr ""
+#~ msgid "SYSTEM"
+#~ msgstr "SISTEMO"
 
-#: ../sheets/sybase.sheet.in.h:7
-msgid "Sybase dataserver"
-msgstr ""
+#~ msgid "Users"
+#~ msgstr "Uzantoj"
 
-#: ../sheets/sybase.sheet.in.h:8
-msgid "Sybase replication server"
-msgstr ""
+#~ msgid "Software"
+#~ msgstr "Programaro"
+
+#~ msgid "HARDWARE"
+#~ msgstr "APARATARO"
+
+#~ msgid "value"
+#~ msgstr "valoro"
+
+#~ msgid "Documents"
+#~ msgstr "Dokumentoj"