[dia] Updated British English translation



commit e56029b919ab1fdcd888922f16bdcd3248879990
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Feb 23 17:08:40 2010 +0000

    Updated British English translation

 po/en_GB.po | 6222 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 3597 insertions(+), 2625 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 62b2257..f32c92d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,247 +2,259 @@
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # David Lodge <dave cirt net>, 2004.
 # Alan Horkan <horkana tcd ie>, 2005.
-#
+# Philip Withnall <philip tecnocode co uk>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dia HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 23:13+0100\n"
+"POT-Creation-Date: 2010-02-23 17:07+0000\n"
 "PO-Revision-Date: 2007-05-15 23:13-0000\n"
-"Last-Translator: David Lodge <dave cirt net>\n"
-"Language-Team: English/GB <en li org>\n"
+"Last-Translator: Philip Withnall <philip tecnocode co uk>\n"
+"Language-Team: British English <en li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:256
+#: ../app/app_procs.c:209
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
-msgstr "Warning: invalid layer range %lu - %lu\n"
+msgstr "Warning: Invalid layer range %luâ??%lu.\n"
 
-#: ../app/app_procs.c:268
+#: ../app/app_procs.c:221
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr "Warning: Layer %lu (%s) selected more than once.\n"
 
-#: ../app/app_procs.c:294
+#: ../app/app_procs.c:247
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr "Warning: Layer %d (%s) selected more than once.\n"
 
-#: ../app/app_procs.c:303
+#: ../app/app_procs.c:256
 #, c-format
 msgid "Warning: There is no layer named %s\n"
-msgstr "Warning: There is no layer named %s\n"
+msgstr "Warning: There is no layer named %s.\n"
 
-#: ../app/app_procs.c:385
+#: ../app/app_procs.c:338
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s error: don't know how to export into %s\n"
 
-#: ../app/app_procs.c:394
+#: ../app/app_procs.c:347
 #, c-format
 msgid "%s error: input and output file name is identical: %s"
-msgstr "%s error: input and output file name is identical: %s"
+msgstr "%s error: input and output filenames are identical: %s"
 
-#: ../app/app_procs.c:402
+#: ../app/app_procs.c:355
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s error: need valid input file %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:427
+#: ../app/app_procs.c:383
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:588
+#: ../app/app_procs.c:554
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr "Can't find output format/filter %s\n"
 
+#: ../app/app_procs.c:624
+#, c-format
+msgid "Input-directory '%s' must exist!\n"
+msgstr "Input directory '%s' must exist!\n"
+
+#: ../app/app_procs.c:641
+#, c-format
+msgid "Output-directory '%s' must exist!\n"
+msgstr "Output directory '%s' must exist!\n"
+
 #. Translators:  The argument is a list of options, not to be translated
-#: ../app/app_procs.c:680
+#: ../app/app_procs.c:691
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "Select the filter/format out of: %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:699
-#: ../app/app_procs.c:726
+#: ../app/app_procs.c:709
 msgid "Export loaded file and exit"
 msgstr "Export loaded file and exit"
 
-#: ../app/app_procs.c:699
-#: ../app/app_procs.c:726
-#: ../app/diaconv.c:88
+#: ../app/app_procs.c:709
 msgid "OUTPUT"
 msgstr "OUTPUT"
 
 #. &export_file_format
 #. &export_format_string
-#. &export_file_format
-#: ../app/app_procs.c:701
-#: ../app/app_procs.c:728
+#: ../app/app_procs.c:711
 msgid "TYPE"
 msgstr "TYPE"
 
-#: ../app/app_procs.c:703
-#: ../app/app_procs.c:731
+#: ../app/app_procs.c:713
 msgid "Export graphics size"
 msgstr "Export graphics size"
 
-#: ../app/app_procs.c:703
-#: ../app/app_procs.c:731
+#: ../app/app_procs.c:713
 msgid "WxH"
-msgstr "WxH"
+msgstr "WÃ?H"
 
-#. 13.3.2004 sampo iki fi
-#: ../app/app_procs.c:705
-#: ../app/app_procs.c:733
-msgid "Show only specified layers (e.g. when exporting). Can be either the layer name or a range of layer numbers (X-Y)"
-msgstr "Show only specified layers (e.g. when exporting). Can be either the layer name or a range of layer numbers (X-Y)"
+#: ../app/app_procs.c:715
+msgid ""
+"Show only specified layers (e.g. when exporting). Can be either the layer "
+"name or a range of layer numbers (X-Y)"
+msgstr ""
+"Show only specified layers (e.g. when exporting). Can be either the layer "
+"name or a range of layer numbers (Xâ??Y)."
 
-#: ../app/app_procs.c:706
-#: ../app/app_procs.c:734
+#: ../app/app_procs.c:716
 msgid "LAYER,LAYER,..."
-msgstr "LAYER,LAYER,..."
+msgstr "LAYER,LAYER,â?¦"
 
-#: ../app/app_procs.c:708
-#: ../app/app_procs.c:736
+#: ../app/app_procs.c:718
 msgid "Don't show the splash screen"
 msgstr "Don't show the splash screen"
 
-#: ../app/app_procs.c:710
-#: ../app/app_procs.c:738
+#: ../app/app_procs.c:720
 msgid "Don't create empty diagram"
-msgstr "Don't create empty diagram"
+msgstr "Don't create an empty diagram"
 
-#: ../app/app_procs.c:712
-#: ../app/app_procs.c:740
+#: ../app/app_procs.c:722
+msgid "Start integrated user interface (diagrams in tabs)"
+msgstr "Start integrated user interface (diagrams in tabs)"
+
+#: ../app/app_procs.c:724
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "Send error messages to stderr instead of showing dialogues."
 
-#: ../app/app_procs.c:714
-#: ../app/app_procs.c:742
+#: ../app/app_procs.c:726
+msgid "Directory containing input files"
+msgstr "Directory containing input files"
+
+#: ../app/app_procs.c:726 ../app/app_procs.c:728
+msgid "DIRECTORY"
+msgstr "DIRECTORY"
+
+#: ../app/app_procs.c:728
+msgid "Directory containing output files"
+msgstr "Directory containing output files"
+
+#: ../app/app_procs.c:730
 msgid "Display credits list and exit"
 msgstr "Display credits list and exit"
 
-#: ../app/app_procs.c:716
-#: ../app/app_procs.c:744
+#: ../app/app_procs.c:732
 msgid "Generate verbose output"
 msgstr "Generate verbose output"
 
-#: ../app/app_procs.c:718
-#: ../app/app_procs.c:746
+#: ../app/app_procs.c:734
 msgid "Display version and exit"
 msgstr "Display version and exit"
 
-#: ../app/app_procs.c:747
-#: ../app/diaconv.c:89
-msgid "Show this help message"
-msgstr "Show this help message"
+#: ../app/app_procs.c:757
+msgid "[FILE...]"
+msgstr "[FILEâ?¦]"
+
+#: ../app/app_procs.c:769
+#, c-format
+msgid "Invalid option?"
+msgstr "Invalid option?"
+
+#: ../app/app_procs.c:792
+#, c-format
+msgid "Filename conversion failed: %s\n"
+msgstr "Filename conversion failed: %s\n"
+
+#: ../app/app_procs.c:805
+#, c-format
+msgid "Missing input: %s\n"
+msgstr "Missing input: %s\n"
 
-#: ../app/app_procs.c:807
+#: ../app/app_procs.c:830
 msgid "Can't connect to session manager!\n"
 msgstr "Can't connect to session manager!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:847
+#: ../app/app_procs.c:870
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia version %s, compiled %s %s\n"
 
-#: ../app/app_procs.c:849
+#: ../app/app_procs.c:872
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia version %s\n"
 
-#: ../app/app_procs.c:906
-#: ../app/diaconv.c:195
-#: ../app/diaconv.c:197
-#, c-format
-msgid "Couldn't find standard objects when looking for object-libs; exiting...\n"
-msgstr "Couldn't find standard objects when looking for object-libs; exiting...\n"
+#: ../app/app_procs.c:910
+msgid ""
+"Couldn't find standard objects when looking for object-libs; exiting...\n"
+msgstr ""
+"Couldn't find standard objects when looking for object-libs; exitingâ?¦\n"
 
-#: ../app/app_procs.c:908
+#: ../app/app_procs.c:912
 #, c-format
-msgid "Couldn't find standard objects when looking for object-libs in '%s'; exiting...\n"
-msgstr "Couldn't find standard objects when looking for object-libs in '%s'; exiting...\n"
+msgid ""
+"Couldn't find standard objects when looking for object-libs in '%s'; "
+"exiting...\n"
+msgstr ""
+"Couldn't find standard objects when looking for object-libs in '%s'; "
+"exitingâ?¦\n"
 
-#: ../app/app_procs.c:950
+#: ../app/app_procs.c:979
 msgid "Diagram1.dia"
 msgstr "Diagram1.dia"
 
-#: ../app/app_procs.c:990
+#: ../app/app_procs.c:1014
 msgid ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
 "describing how you can cause this message to appear.\n"
 msgstr ""
 "This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
-"describing how you can cause this message to appear.\n"
+"describing how you caused this message to appear.\n"
+
+#: ../app/app_procs.c:1029
+msgid "Exiting Dia"
+msgstr "Exiting Dia"
 
 #. no standard buttons
-#: ../app/app_procs.c:1003
+#: ../app/app_procs.c:1093
 msgid "Quitting without saving modified diagrams"
 msgstr "Quitting without saving modified diagrams"
 
-#: ../app/app_procs.c:1005
-msgid "Modified diagrams exist. Are you sure you want to quit Dia without saving them?"
-msgstr "Modified diagrams exist. Are you sure you want to quit Dia without saving them?"
+#: ../app/app_procs.c:1095
+msgid ""
+"Modified diagrams exist. Are you sure you want to quit Dia without saving "
+"them?"
+msgstr ""
+"Modified diagrams exist. Are you sure you want to quit Dia without saving "
+"them?"
 
-#: ../app/app_procs.c:1009
+#: ../app/app_procs.c:1099
 msgid "Quit Dia"
 msgstr "Quit Dia"
 
-#. This printf seems to prevent a race condition with unrefs.
-#. Yuck.  -Lars
-#: ../app/app_procs.c:1060
-msgid "Thank you for using Dia.\n"
-msgstr "Thank you for using Dia.\n"
-
-#: ../app/app_procs.c:1077
-#: ../app/app_procs.c:1084
+#: ../app/app_procs.c:1168 ../app/app_procs.c:1175
 msgid "Could not create per-user Dia config directory"
-msgstr "Could not create per-user Dia config directory"
-
-#: ../app/app_procs.c:1087
-msgid "Could not create per-user Dia config directory. Please make sure that the environment variable HOME points to an existing directory."
-msgstr "Could not create per-user Dia config directory. Please make sure that the environment variable HOME points to an existing directory."
-
-#: ../app/app_procs.c:1110
-#: ../app/diaconv.c:245
-msgid "Objects and filters internal to dia"
-msgstr "Objects and filters internal to dia"
-
-#: ../app/app_procs.c:1152
-#: ../app/diaconv.c:115
-msgid "[OPTION...] [FILE...]"
-msgstr "[OPTION...] [FILE...]"
+msgstr "Could not create per-user Dia configuration directory"
 
-#: ../app/app_procs.c:1155
-#: ../app/diaconv.c:122
-#, c-format
+#: ../app/app_procs.c:1178
 msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"Could not create per-user Dia config directory. Please make sure that the "
+"environment variable HOME points to an existing directory."
 msgstr ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"Could not create per-user Dia configuration directory. Please make sure that "
+"the environment variable HOME points to an existing directory."
 
-#: ../app/app_procs.c:1179
-msgid "[FILE...]"
-msgstr "[FILE...]"
+#: ../app/app_procs.c:1201
+msgid "Objects and filters internal to dia"
+msgstr "Objects and filters internal to Dia"
 
-#: ../app/app_procs.c:1202
+#: ../app/app_procs.c:1257
 #, c-format
-msgid "'%s' not found!\n"
-msgstr "'%s' not found!\n"
-
-#: ../app/app_procs.c:1283
 msgid ""
 "The original author of Dia was:\n"
 "\n"
@@ -250,7 +262,8 @@ msgstr ""
 "The original author of Dia was:\n"
 "\n"
 
-#: ../app/app_procs.c:1288
+#: ../app/app_procs.c:1262
+#, c-format
 msgid ""
 "\n"
 "The current maintainers of Dia are:\n"
@@ -260,7 +273,8 @@ msgstr ""
 "The current maintainers of Dia are:\n"
 "\n"
 
-#: ../app/app_procs.c:1293
+#: ../app/app_procs.c:1267
+#, c-format
 msgid ""
 "\n"
 "Other authors are:\n"
@@ -270,7 +284,8 @@ msgstr ""
 "Other authors are:\n"
 "\n"
 
-#: ../app/app_procs.c:1298
+#: ../app/app_procs.c:1272
+#, c-format
 msgid ""
 "\n"
 "Dia is documented by:\n"
@@ -292,31 +307,32 @@ msgstr ""
 "Autosaved files exist.\n"
 "Please select those you wish to recover."
 
-#: ../app/color_area.c:317
-#: ../app/color_area.c:364
+#: ../app/color_area.c:316 ../app/color_area.c:359
 msgid "Select foreground color"
 msgstr "Select foreground colour"
 
-#: ../app/color_area.c:318
-#: ../app/color_area.c:365
+#: ../app/color_area.c:317 ../app/color_area.c:360
 msgid "Select background color"
 msgstr "Select background colour"
 
-#: ../app/commands.c:133
+#: ../app/commands.c:124
+msgid "No print plug-in found!"
+msgstr "No print plugin found!"
+
+#: ../app/commands.c:143
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Diagram%d.dia"
 
-#: ../app/commands.c:206
+#: ../app/commands.c:336
 msgid "No existing object to paste.\n"
 msgstr "No existing object to paste.\n"
 
-#: ../app/commands.c:582
-#: ../app/commands.c:620
+#: ../app/commands.c:641 ../app/commands.c:679
 msgid "Could not find help directory"
 msgstr "Could not find help directory"
 
-#: ../app/commands.c:589
+#: ../app/commands.c:648
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -325,13 +341,14 @@ msgstr ""
 "Could not open help directory:\n"
 "%s"
 
-#: ../app/commands.c:656
+#: ../app/commands.c:725
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
-"David Lodge <dave cirt net>, \n"
-"Alan Horkan <horkana tcd ie>"
+"David Lodge <dave cirt net>\n"
+"Alan Horkan <horkana tcd ie>\n"
+"Philip Withnall <philip tecnocode co uk>"
 
-#: ../app/commands.c:658
+#: ../app/commands.c:727
 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"
@@ -361,12 +378,49 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: ../app/commands.c:681
+#: ../app/commands.c:750
 msgid "A program for drawing structured diagrams."
 msgstr "A program for drawing structured diagrams."
 
-#: ../app/defaults.c:43
-#: ../app/defaults.c:146
+#: ../app/confirm.c:69
+#, c-format
+msgid "You are about to print a diagram with %d pages."
+msgstr "You are about to print a diagram with %d pages."
+
+#: ../app/confirm.c:71
+#, c-format
+msgid "You are about to export a diagram with %d pages."
+msgstr "You are about to export a diagram with %d pages."
+
+#: ../app/confirm.c:73
+#, c-format
+msgid ""
+"You are about to export a diagram which may require %s of memory.(%d pages)."
+msgstr ""
+"You are about to export a diagram which may require %s of memory.(%d pages)."
+
+#: ../app/confirm.c:81
+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."
+msgstr ""
+"You can adjust the size of the diagram by changing the 'Scaling' in the "
+"'Page Setup' dialogue.\n"
+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
+"the intended bounds."
+
+#: ../app/confirm.c:85
+msgid "Confirm Diagram Size"
+msgstr "Confirm Diagram Size"
+
+#: ../app/create_object.c:71
+#, c-format
+msgid "'%s' creation failed"
+msgstr "'%s' creation failed"
+
+#: ../app/defaults.c:43 ../app/defaults.c:151
 msgid "Object defaults"
 msgstr "Object defaults"
 
@@ -374,7 +428,7 @@ msgstr "Object defaults"
 msgid "This object has no defaults."
 msgstr "This object has no defaults."
 
-#: ../app/defaults.c:111
+#: ../app/defaults.c:115
 msgid "Defaults: "
 msgstr "Defaults: "
 
@@ -403,8 +457,7 @@ msgid "Visible spacing"
 msgstr "Visible spacing"
 
 #. Hexes!
-#: ../app/dia-props.c:177
-#: ../app/preferences.c:188
+#: ../app/dia-props.c:177 ../app/preferences.c:242
 msgid "Hex grid"
 msgstr "Hex grid"
 
@@ -416,13 +469,11 @@ msgstr "Hex grid size"
 msgid "Grid"
 msgstr "Grid"
 
-#: ../app/dia-props.c:209
-#: ../lib/diagramdata.c:113
+#: ../app/dia-props.c:209 ../lib/diagramdata.c:117
 msgid "Background"
 msgstr "Background"
 
-#: ../app/dia-props.c:220
-#: ../app/preferences.c:109
+#: ../app/dia-props.c:220 ../app/preferences.c:122
 msgid "Grid Lines"
 msgstr "Grid Lines"
 
@@ -440,10 +491,6 @@ msgstr "Colours"
 msgid "Diagram Properties: %s"
 msgstr "Diagram Properties: %s"
 
-#: ../app/dia_embedd.c:352
-msgid "Could not initialize Bonobo!"
-msgstr "Could not initialise Bonobo!"
-
 #: ../app/diacanvas.c:121
 msgid "X position"
 msgstr "X position"
@@ -460,228 +507,234 @@ msgstr "Y position"
 msgid "Y position of child widget"
 msgstr "Y position of child widget"
 
-#. &export_file_format
-#: ../app/diaconv.c:86
-msgid "Export format to use"
-msgstr "Export format to use"
-
-#: ../app/diaconv.c:86
-msgid "eps,png,wmf,cgm,dxf,fig"
-msgstr "eps,png,wmf,cgm,dxf,fig"
-
-#. &export_file_name
-#: ../app/diaconv.c:88
-msgid "Export file name to use"
-msgstr "Export file name to use"
-
-#: ../app/diaconv.c:90
-msgid "Quiet operation"
-msgstr "Quiet operation"
-
-#: ../app/diaconv.c:143
-#, c-format
-msgid ""
-"Error: No arguments found.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Error: No arguments found.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-
-#: ../app/diaconv.c:153
-#, c-format
-msgid "%s error: can specify only one of -t or -o."
-msgstr "%s error: can specify only one of -t or -o."
-
-#: ../app/diaconv.c:159
-#, c-format
-msgid ""
-"%s error: must specify only one of -t or -o.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"%s error: must specify only one of -t or -o.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-
-#: ../app/diaconv.c:168
-#, c-format
-msgid "%s error: no input file."
-msgstr "%s error: no input file."
-
-#: ../app/diaconv.c:221
-#, c-format
-msgid "%s error: only one input file expected."
-msgstr "%s error: only one input file expected."
-
-#: ../app/diaconv.c:234
-#, c-format
-msgid "%s error: popt library not available on this system"
-msgstr "%s error: popt library not available on this system"
-
-#: ../app/diagram.c:221
+#: ../app/diagram.c:234
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "Couldn't convert filename '%s' to UTF-8: %s\n"
 
-#: ../app/diagram.c:224
-#: ../lib/message.c:89
-#: ../lib/message.c:292
+#: ../app/diagram.c:237 ../lib/message.c:90 ../lib/message.c:293
 msgid "Error"
 msgstr "Error"
 
-#: ../app/diagram_tree_menu.c:46
-msgid "/_Sort objects"
-msgstr "/_Sort objects"
+#: ../app/diagram.c:1219
+msgid "Trying to group with no selected objects."
+msgstr "Trying to group with no selected objects."
+
+#: ../app/diagram.c:1229
+msgid ""
+"You cannot group objects that belong to different groups or have different "
+"parents"
+msgstr ""
+"You cannot group objects that belong to different groups or have different "
+"parents"
 
 #: ../app/diagram_tree_menu.c:47
+msgid "/_Sort objects"
+msgstr "/_Sort Objects"
+
+#: ../app/diagram_tree_menu.c:48
 msgid "/Sort objects/by _name"
-msgstr "/Sort objects/by _name"
+msgstr "/Sort Objects/By _Name"
 
-#: ../app/diagram_tree_menu.c:49
+#: ../app/diagram_tree_menu.c:50
 msgid "/Sort objects/by _type"
-msgstr "/Sort objects/by _type"
+msgstr "/Sort Objects/By _Type"
 
-#: ../app/diagram_tree_menu.c:51
+#: ../app/diagram_tree_menu.c:52
 msgid "/Sort objects/as _inserted"
-msgstr "/Sort objects/as _inserted"
+msgstr "/Sort Objects/As _Inserted"
 
-#: ../app/diagram_tree_menu.c:54
+#: ../app/diagram_tree_menu.c:55
 msgid "/Sort objects/All by name"
-msgstr "/Sort objects/All by name"
+msgstr "/Sort Objects/All by Name"
 
-#: ../app/diagram_tree_menu.c:56
+#: ../app/diagram_tree_menu.c:57
 msgid "/Sort objects/All by type"
-msgstr "/Sort objects/All by type"
+msgstr "/Sort Objects/All by Type"
 
-#: ../app/diagram_tree_menu.c:58
+#: ../app/diagram_tree_menu.c:59
 msgid "/Sort objects/All as inserted"
-msgstr "/Sort objects/All as inserted"
+msgstr "/Sort Objects/All as Inserted"
 
-#: ../app/diagram_tree_menu.c:60
+#: ../app/diagram_tree_menu.c:61
 msgid "/Sort objects/_Default"
-msgstr "/Sort objects/_Default"
+msgstr "/Sort Objects/_Default"
 
-#: ../app/diagram_tree_menu.c:61
+#: ../app/diagram_tree_menu.c:62
 msgid "/Sort objects/Default/by _name"
-msgstr "/Sort objects/Default/by _name"
+msgstr "/Sort Objects/Default/By _Name"
 
-#: ../app/diagram_tree_menu.c:63
+#: ../app/diagram_tree_menu.c:64
 msgid "/Sort objects/Default/by _type"
-msgstr "/Sort objects/Default/by _type"
+msgstr "/Sort Objects/Default/By _Type"
 
-#: ../app/diagram_tree_menu.c:65
+#: ../app/diagram_tree_menu.c:66
 msgid "/Sort objects/Default/as _inserted"
-msgstr "/Sort objects/Default/as _inserted"
+msgstr "/Sort Objects/Default/As _Inserted"
 
-#: ../app/diagram_tree_menu.c:67
+#: ../app/diagram_tree_menu.c:68
 msgid "/Sort _diagrams"
-msgstr "/Sort _diagrams"
+msgstr "/Sort _Diagrams"
 
-#: ../app/diagram_tree_menu.c:68
+#: ../app/diagram_tree_menu.c:69
 msgid "/Sort _diagrams/by _name"
-msgstr "/Sort _diagrams/by _name"
+msgstr "/Sort _Diagrams/By _Name"
 
-#: ../app/diagram_tree_menu.c:70
+#: ../app/diagram_tree_menu.c:71
 msgid "/Sort _diagrams/as _inserted"
-msgstr "/Sort _diagrams/as _inserted"
+msgstr "/Sort _Diagrams/As _Inserted"
 
-#: ../app/diagram_tree_menu.c:72
+#: ../app/diagram_tree_menu.c:73
 msgid "/Sort diagrams/_Default"
-msgstr "/Sort diagrams/_Default"
+msgstr "/Sort Diagrams/_Default"
 
-#: ../app/diagram_tree_menu.c:73
+#: ../app/diagram_tree_menu.c:74
 msgid "/Sort diagrams/Default/by _name"
-msgstr "/Sort diagrams/Default/by _name"
+msgstr "/Sort Diagrams/Default/By _Name"
 
-#: ../app/diagram_tree_menu.c:75
+#: ../app/diagram_tree_menu.c:76
 msgid "/Sort diagrams/Default/as _inserted"
-msgstr "/Sort diagrams/Default/as _inserted"
+msgstr "/Sort Diagrams/Default/As _Inserted"
 
-#: ../app/diagram_tree_menu.c:83
-#: ../app/diagram_tree_menu.c:94
+#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
 msgid "/_Locate"
 msgstr "/_Locate"
 
-#: ../app/diagram_tree_menu.c:84
+#: ../app/diagram_tree_menu.c:85
 msgid "/_Properties"
 msgstr "/_Properties"
 
-#: ../app/diagram_tree_menu.c:85
+#: ../app/diagram_tree_menu.c:86
 msgid "/_Hide this type"
-msgstr "/_Hide this type"
+msgstr "/_Hide this Type"
+
+#: ../app/diagram_tree_view.c:161
+msgid "Diagram"
+msgstr "Diagram"
+
+#: ../app/diagram_tree_view.c:165
+#: ../plug-ins/drs/dia-render-script-import.c:231
+msgid "Layer"
+msgstr "Layer"
+
+#: ../app/diagram_tree_view.c:169
+msgid "Layer(s)"
+msgstr "Layer(s)"
+
+#: ../app/diagram_tree_view.c:172 ../app/diagram_tree_view.c:465
+#: ../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:240
+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
+msgid "Type"
+msgstr "Type"
 
-#: ../app/diagram_tree_window.c:80
-#: ../app/preferences.c:110
-msgid "Diagram Tree"
-msgstr "Diagram Tree"
+#. Translators: Menu item Verb/Support/Position
+#. Translators: Menu item Verb/Support/Position/Position
+#: ../app/diagram_tree_view.c:173 ../objects/FS/function.c:805
+#: ../objects/FS/function.c:807 ../objects/Istar/actor.c:70
+msgid "Position"
+msgstr "Position"
 
-#: ../app/dialogs.c:51
-msgid "Ok"
-msgstr "Ok"
+#: ../app/diagram_tree_view.c:176
+msgid "Children"
+msgstr "Children"
 
-#: ../app/dialogs.c:52
-#: ../app/paginate_psprint.c:324
-msgid "Cancel"
-msgstr "Cancel"
+#: ../app/diagram_tree_view.c:180
+msgid "Object(s)"
+msgstr "Object(s)"
+
+#: ../app/diagram_tree_view.c:396
+msgid "Select"
+msgstr "Select"
+
+#. Translators: Menu item Verb/Support/Position/Locate
+#. Translators: Menu item Verb/Signal/Sense/Locate
+#: ../app/diagram_tree_view.c:397 ../objects/FS/function.c:813
+#: ../objects/FS/function.c:1055
+msgid "Locate"
+msgstr "Locate"
+
+#: ../app/diagram_tree_view.c:398
+msgid "Properties"
+msgstr "Properties"
+
+#. *** board of value **************
+#: ../app/diagram_tree_view.c:448 ../app/exit_dialog.c:123
+#: ../app/plugin-manager.c:262 ../objects/Database/table.c:139
+#: ../objects/Database/table.c:182 ../objects/SISSI/sissi_dialog.c:734
+#: ../objects/UML/association.c:234 ../objects/UML/class.c:145
+#: ../objects/UML/large_package.c:139 ../objects/UML/umlattribute.c:37
+#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
+#: ../objects/UML/umlparameter.c:43
+msgid "Name"
+msgstr "Name"
+
+#: ../app/diagram_tree_view.c:511 ../app/diagram_tree_window.c:80
+#: ../app/preferences.c:123
+msgid "Diagram Tree"
+msgstr "Diagram Tree"
 
 #. paper size
-#: ../app/diapagelayout.c:117
+#: ../app/diapagelayout.c:153
 msgid "Paper Size"
 msgstr "Paper Size"
 
 #. orientation
-#: ../app/diapagelayout.c:150
+#: ../app/diapagelayout.c:186
 msgid "Orientation"
 msgstr "Orientation"
 
 #. margins
-#: ../app/diapagelayout.c:188
+#: ../app/diapagelayout.c:224
 msgid "Margins"
 msgstr "Margins"
 
-#: ../app/diapagelayout.c:200
+#: ../app/diapagelayout.c:236
 msgid "Top:"
 msgstr "Top:"
 
-#: ../app/diapagelayout.c:213
+#: ../app/diapagelayout.c:249
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#: ../app/diapagelayout.c:226
+#: ../app/diapagelayout.c:262
 msgid "Left:"
 msgstr "Left:"
 
-#: ../app/diapagelayout.c:239
+#: ../app/diapagelayout.c:275
 msgid "Right:"
 msgstr "Right:"
 
 #. Scaling
-#: ../app/diapagelayout.c:253
+#: ../app/diapagelayout.c:289
 msgid "Scaling"
 msgstr "Scaling"
 
-#: ../app/diapagelayout.c:264
+#: ../app/diapagelayout.c:300
 msgid "Scale:"
 msgstr "Scale:"
 
-#: ../app/diapagelayout.c:276
+#: ../app/diapagelayout.c:312
 msgid "Fit to:"
 msgstr "Fit to:"
 
-#: ../app/diapagelayout.c:288
+#: ../app/diapagelayout.c:324
 msgid "by"
 msgstr "by"
 
-#: ../app/diapagelayout.c:699
+#: ../app/diapagelayout.c:741
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
-msgstr "%0.3gcm x %0.3gcm"
+msgstr "%0.3gcm Ã? %0.3gcm"
 
-#: ../app/diapagelayout.c:803
-#: ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
 msgid "Page Setup"
 msgstr "Page Setup"
 
-#: ../app/disp_callbacks.c:84
-#: ../app/properties.c:152
+#: ../app/disp_callbacks.c:91 ../app/properties-dialog.c:158
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -689,11 +742,15 @@ msgstr ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 
-#: ../app/disp_callbacks.c:119
+#: ../app/disp_callbacks.c:126
 msgid "Properties..."
-msgstr "Properties..."
+msgstr "Propertiesâ?¦"
 
-#: ../app/disp_callbacks.c:921
+#: ../app/disp_callbacks.c:244
+msgid "Selection"
+msgstr "Selection"
+
+#: ../app/disp_callbacks.c:1062
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -701,35 +758,36 @@ msgstr ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
 
-#: ../app/display.c:94
-msgid "Diagram modified!"
-msgstr "Diagram modified!"
-
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:121
+#: ../app/display.c:110
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "Selection of %d object"
 msgstr[1] "Selection of %d objects"
 
-#: ../app/display.c:131
+#: ../app/display.c:120
 #, c-format
 msgid "Selected '%s'"
 msgstr "Selected '%s'"
 
-#: ../app/display.c:1134
+#. we really should not come here but instead disable the menu command earlier
+#: ../app/display.c:1084
+msgid "No anti-aliased renderer found"
+msgstr "No antialiased renderer found"
+
+#: ../app/display.c:1222
 msgid "<unnamed>"
 msgstr "<unnamed>"
 
 #. no standard buttons
-#: ../app/display.c:1140
+#: ../app/display.c:1228
 msgid "Closing diagram without saving"
 msgstr "Closing diagram without saving"
 
-#: ../app/display.c:1143
+#: ../app/display.c:1230
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -738,101 +796,76 @@ msgstr ""
 "The diagram '%s'\n"
 "has not been saved. Save changes now?"
 
-#: ../app/display.c:1145
+#: ../app/display.c:1232
 msgid "Close Diagram"
 msgstr "Close Diagram"
 
-#: ../app/display.c:1150
+#: ../app/display.c:1237
 msgid "_Discard Changes"
 msgstr "_Discard Changes"
 
-#: ../app/export_png.c:138
-#: ../app/load_save.c:948
-#: ../app/render_eps.c:105
-#: ../plug-ins/cairo/diacairo.c:984
-#: ../plug-ins/cgm/cgm.c:1153
-#: ../plug-ins/dxf/dxf-export.c:485
-#: ../plug-ins/hpgl/hpgl.c:710
-#: ../plug-ins/metapost/render_metapost.c:1177
-#: ../plug-ins/pgf/render_pgf.c:1208
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:136
-#: ../plug-ins/svg/render_svg.c:152
-#: ../plug-ins/vdx/vdx-export.c:1849
-#: ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1138
-#: ../plug-ins/xslt/xslt.c:96
-#, c-format
-msgid "Can't open output file %s: %s\n"
-msgstr "Can't open output file %s: %s\n"
+#: ../app/exit_dialog.c:77
+msgid "Do Not Exit"
+msgstr "Do Not Exit"
 
-#: ../app/export_png.c:146
-msgid "Could not create PNG write structure"
-msgstr "Could not create PNG write structure"
+#: ../app/exit_dialog.c:79
+msgid "Exit Without Save"
+msgstr "Exit Without Save"
 
-#: ../app/export_png.c:155
-msgid "Could not create PNG header info structure"
-msgstr "Could not create PNG header info structure"
+#: ../app/exit_dialog.c:81
+msgid "Save Selected"
+msgstr "Save Selected"
 
-#: ../app/export_png.c:163
-msgid "Error occurred while writing PNG"
-msgstr "Error occurred while writing PNG"
+#: ../app/exit_dialog.c:87
+msgid "The following are not saved:"
+msgstr "The following are not saved:"
 
-#. Create a dialog
-#: ../app/export_png.c:303
-msgid "PNG Export Options"
-msgstr "PNG Export Options"
+#: ../app/exit_dialog.c:113
+msgid "Save"
+msgstr "Save"
 
-#. Translators: Menu item Verb/Channel/Export
-#. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/export_png.c:304
-#: ../objects/FS/function.c:696
-#: ../objects/FS/function.c:698
-msgid "Export"
-msgstr "Export"
+#: ../app/exit_dialog.c:129
+msgid "Path"
+msgstr "Path"
 
-#: ../app/export_png.c:309
-msgid "Image width:"
-msgstr "Image width:"
+#: ../app/exit_dialog.c:142
+msgid "Select All"
+msgstr "Select All"
 
-#: ../app/export_png.c:312
-msgid "Image height:"
-msgstr "Image height:"
+#: ../app/exit_dialog.c:150
+msgid "Select None"
+msgstr "Select None"
 
-#: ../app/export_png.c:358
-msgid "Portable Network Graphics"
-msgstr "Portable Network Graphics"
+#: ../app/exit_dialog.c:236
+msgid "Nothing selected for saving.  Would you like to try again?"
+msgstr "Nothing selected for saving.  Would you like to try again?"
+
+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
+#: ../app/filedlg.c:739 ../lib/widgets.c:1473
+msgid "Supported Formats"
+msgstr "Supported Formats"
 
-#: ../app/filedlg.c:132
-#: ../app/filedlg.c:534
+#: ../app/filedlg.c:192 ../app/filedlg.c:597
 msgid "By extension"
 msgstr "By extension"
 
-#: ../app/filedlg.c:219
+#: ../app/filedlg.c:281
 msgid "Open Diagram"
 msgstr "Open Diagram"
 
-#: ../app/filedlg.c:248
+#: ../app/filedlg.c:309
 msgid "Open Options"
 msgstr "Open Options"
 
-#: ../app/filedlg.c:256
-#: ../app/filedlg.c:656
+#: ../app/filedlg.c:317 ../app/filedlg.c:721
 msgid "Determine file type:"
 msgstr "Determine file type:"
 
-#: ../app/filedlg.c:272
-#: ../app/filedlg.c:669
+#: ../app/filedlg.c:337 ../app/filedlg.c:734 ../lib/widgets.c:1478
 msgid "All Files"
 msgstr "All Files"
 
-#: ../app/filedlg.c:277
-#: ../app/filedlg.c:674
-msgid "Supported Formats"
-msgstr "Supported Formats"
-
-#: ../app/filedlg.c:312
-#: ../app/paginate_psprint.c:410
+#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -842,15 +875,13 @@ msgstr ""
 "nor your local encoding.\n"
 "Some things will break."
 
-#: ../app/filedlg.c:322
-#: ../app/filedlg.c:581
-#: ../app/paginate_psprint.c:425
+#: ../app/filedlg.c:380 ../app/filedlg.c:644
+#: ../plug-ins/postscript/paginate_psprint.c:422
 msgid "File already exists"
 msgstr "File already exists"
 
-#: ../app/filedlg.c:324
-#: ../app/filedlg.c:583
-#: ../app/paginate_psprint.c:417
+#: ../app/filedlg.c:382 ../app/filedlg.c:646
+#: ../plug-ins/postscript/paginate_psprint.c:418
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -859,21 +890,25 @@ msgstr ""
 "The file '%s' already exists.\n"
 "Do you want to overwrite it?"
 
-#: ../app/filedlg.c:377
+#: ../app/filedlg.c:436
 msgid "Save Diagram"
 msgstr "Save Diagram"
 
 #. 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:389
+#: ../app/filedlg.c:447
 msgid "Compress diagram files"
 msgstr "Compress diagram files"
 
-#: ../app/filedlg.c:398
-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 "Compression reduces file size to less than 1/10th size and speeds up loading and saving. Some text programs cannot manipulate compressed files."
+#: ../app/filedlg.c:456
+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 ""
+"Compression reduces file size to less than 1/10th size and speeds up loading "
+"and saving. Some text programs cannot manipulate compressed files."
 
-#: ../app/filedlg.c:607
+#: ../app/filedlg.c:670
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -882,15 +917,54 @@ msgstr ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 
-#: ../app/filedlg.c:631
+#: ../app/filedlg.c:697
 msgid "Export Diagram"
 msgstr "Export Diagram"
 
-#: ../app/filedlg.c:648
+#: ../app/filedlg.c:713
 msgid "Export Options"
 msgstr "Export Options"
 
-#: ../app/interface.c:144
+#: ../app/find-and-replace.c:454
+msgid "_Search for:"
+msgstr "_Search for:"
+
+#: ../app/find-and-replace.c:467
+msgid "Replace _with:"
+msgstr "Replace _with:"
+
+#: ../app/find-and-replace.c:477
+msgid "_Match case"
+msgstr "_Match case"
+
+#: ../app/find-and-replace.c:481
+msgid "Match _entire word only"
+msgstr "Match _entire word only"
+
+#: ../app/find-and-replace.c:485
+msgid "Match _all properties (not just object name)"
+msgstr "Match _all properties (not just object name)"
+
+#: ../app/find-and-replace.c:508
+msgid "Find"
+msgstr "Find"
+
+#: ../app/find-and-replace.c:538 ../app/menus.c:268
+msgid "Replace"
+msgstr "Replace"
+
+#: ../app/find-and-replace.c:541
+msgid "Replace _All"
+msgstr "Replace _All"
+
+#. 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
+msgid "_Replace"
+msgstr "_Replace"
+
+#: ../app/interface.c:153
 msgid ""
 "Modify object(s)\n"
 "Use <Space> to toggle between this and other tools"
@@ -898,204 +972,213 @@ msgstr ""
 "Modify object(s)\n"
 "Use <Space> to toggle between this and other tools"
 
+#: ../app/interface.c:159
+msgid ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+msgstr ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+
 #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:150
-#: ../app/menus.c:187
-#: ../objects/FS/function.c:986
+#: ../app/interface.c:165 ../app/menus.c:230 ../objects/FS/function.c:991
 msgid "Magnify"
 msgstr "Magnify"
 
-#: ../app/interface.c:156
+#: ../app/interface.c:171
 msgid "Scroll around the diagram"
 msgstr "Scroll around the diagram"
 
-#: ../app/interface.c:162
-#: ../app/menus.c:189
-#: ../lib/properties.c:79
-#: ../lib/properties.h:520
-#: ../objects/AADL/aadlbox.c:144
-#: ../objects/Jackson/requirement.c:142
-#: ../objects/UML/activity.c:127
-#: ../objects/UML/actor.c:122
-#: ../objects/UML/classicon.c:144
-#: ../objects/UML/component.c:128
-#: ../objects/UML/component_feature.c:155
-#: ../objects/UML/node.c:127
-#: ../objects/UML/note.c:121
-#: ../objects/UML/object.c:148
-#: ../objects/UML/small_package.c:128
-#: ../objects/UML/state.c:152
-#: ../objects/UML/usecase.c:138
-#: ../objects/custom/custom_object.c:200
-#: ../objects/network/basestation.c:133
-#: ../objects/network/radiocell.c:125
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../app/interface.c:177 ../app/menus.c:233 ../lib/properties.c:92
+#: ../lib/properties.h:557 ../objects/AADL/aadlbox.c:153
+#: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
+#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
+#: ../objects/UML/node.c:130 ../objects/UML/node.c:132
+#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
+#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
+#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:237
+#: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
 msgid "Text"
 msgstr "Text"
 
-#: ../app/interface.c:168
-#: ../app/menus.c:190
+#: ../app/interface.c:183 ../app/menus.c:234
 msgid "Box"
 msgstr "Box"
 
-#: ../app/interface.c:174
-#: ../app/menus.c:191
+#: ../app/interface.c:189 ../app/menus.c:235
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: ../app/interface.c:180
-#: ../app/menus.c:192
+#: ../app/interface.c:195 ../app/menus.c:236
 msgid "Polygon"
 msgstr "Polygon"
 
-#: ../app/interface.c:186
-#: ../app/menus.c:193
+#: ../app/interface.c:201 ../app/menus.c:237
 msgid "Beziergon"
 msgstr "Beziergon"
 
-#: ../app/interface.c:192
-#: ../app/menus.c:195
-#: ../objects/standard/line.c:225
+#: ../app/interface.c:207 ../app/menus.c:239 ../objects/standard/line.c:232
 msgid "Line"
 msgstr "Line"
 
-#: ../app/interface.c:198
-#: ../app/menus.c:196
+#: ../app/interface.c:213 ../app/menus.c:240
 msgid "Arc"
 msgstr "Arc"
 
-#: ../app/interface.c:204
-#: ../app/menus.c:197
+#: ../app/interface.c:219 ../app/menus.c:241
 msgid "Zigzagline"
 msgstr "Zigzagline"
 
-#: ../app/interface.c:210
-#: ../app/menus.c:198
+#: ../app/interface.c:225 ../app/menus.c:242
 msgid "Polyline"
 msgstr "Polyline"
 
-#: ../app/interface.c:216
-#: ../app/menus.c:199
+#: ../app/interface.c:231 ../app/menus.c:243
 msgid "Bezierline"
 msgstr "Bezierline"
 
-#: ../app/interface.c:222
-#: ../app/menus.c:201
+#: ../app/interface.c:237 ../app/menus.c:246
 msgid "Image"
 msgstr "Image"
 
-#: ../app/interface.c:539
-#: ../app/interface.c:812
+#: ../app/interface.c:244 ../app/menus.c:244
+msgid "Outline"
+msgstr "Outline"
+
+#: ../app/interface.c:623 ../app/interface.c:856
 msgid "Pops up the Navigation window."
 msgstr "Pops up the Navigation window."
 
-#: ../app/interface.c:593
-#: ../app/interface.c:878
+#: ../app/interface.c:818
+msgid "Diagram menu."
+msgstr "Diagram menu."
+
+#: ../app/interface.c:921
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../app/interface.c:608
-#: ../app/interface.c:893
+#: ../app/interface.c:936
 msgid "Toggles snap-to-grid for this window."
 msgstr "Toggles snap-to-grid for this window."
 
-#: ../app/interface.c:618
-#: ../app/interface.c:904
+#: ../app/interface.c:947
 msgid "Toggles object snapping for this window."
 msgstr "Toggles object snapping for this window."
 
-#: ../app/interface.c:774
-msgid "Diagram menu."
-msgstr "Diagram menu."
-
-#: ../app/interface.c:969
-msgid "NULL tooldata in tool_select_update"
-msgstr "NULL tooldata in tool_select_update"
-
-#: ../app/interface.c:1285
+#: ../app/interface.c:1336
 #, c-format
 msgid "No sheet named %s"
 msgstr "No sheet named %s"
 
-#: ../app/interface.c:1323
+#: ../app/interface.c:1374
 msgid "Other sheets"
 msgstr "Other sheets"
 
-#: ../app/interface.c:1382
-#: ../sheets/Misc.sheet.in.h:3
-msgid "Misc"
-msgstr "Misc"
+#: ../app/interface.c:1434 ../sheets/Flowchart.sheet.in.h:10
+msgid "Flowchart"
+msgstr "Flowchart"
 
-#: ../app/interface.c:1443
-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 "Foreground & background colours for new objects.  The small black and white squares reset colours.  The small arrows swap colours.  Double click to change colours."
+#: ../app/interface.c:1494
+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 ""
+"Foreground & background colours for new objects.  The small black and white "
+"squares reset colours.  The small arrows swap colours.  Double-click to "
+"change colours."
 
-#: ../app/interface.c:1458
-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 "Line widths. Click on a line to set the default line width for new objects. Double-click to set the line width more precisely."
+#: ../app/interface.c:1508
+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 ""
+"Line widths. Click on a line to set the default line width for new objects. "
+"Double-click to set the line width more precisely."
 
-#: ../app/interface.c:1498
-msgid "Arrow style at the beginning of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
-msgstr "Arrow style at the beginning of new lines. Click to pick an arrow, or set arrow parameters with Details..."
+#: ../app/interface.c:1551
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Details..."
+msgstr ""
+"Arrow style at the beginning of new lines. Click to pick an arrow, or set "
+"arrow parameters with Detailsâ?¦"
 
-#: ../app/interface.c:1503
-msgid "Line style for new lines.  Click to pick a line style, or set line style parameters with Details..."
-msgstr "Line style for new lines. Click to pick a line style, or set line style parameters with Details..."
+#: ../app/interface.c:1556
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Details..."
+msgstr ""
+"Line style for new lines. Click to pick a line style, or set line style "
+"parameters with Detailsâ?¦"
 
-#: ../app/interface.c:1517
-msgid "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow parameters with Details..."
-msgstr "Arrow style at the end of new lines. Click to pick an arrow, or set arrow parameters with Details..."
+#: ../app/interface.c:1572
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Details..."
+msgstr ""
+"Arrow style at the end of new lines. Click to pick an arrow, or set arrow "
+"parameters with Detailsâ?¦"
 
-#: ../app/interface.c:1621
-#: ../app/interface.c:1739
+#: ../app/interface.c:1632 ../app/interface.c:1756
 msgid "Diagram Editor"
 msgstr "Diagram Editor"
 
-#: ../app/layer_dialog.c:101
+#: ../app/layer_dialog.c:163
 msgid "New Layer"
 msgstr "New Layer"
 
-#: ../app/layer_dialog.c:102
+#: ../app/layer_dialog.c:164
 msgid "Raise Layer"
 msgstr "Raise Layer"
 
-#: ../app/layer_dialog.c:103
+#: ../app/layer_dialog.c:165
 msgid "Lower Layer"
 msgstr "Lower Layer"
 
-#: ../app/layer_dialog.c:104
+#: ../app/layer_dialog.c:166
 msgid "Delete Layer"
 msgstr "Delete Layer"
 
-#: ../app/layer_dialog.c:225
+#: ../app/layer_dialog.c:309
+msgid "Layers:"
+msgstr "Layers:"
+
+#: ../app/layer_dialog.c:389
 msgid "Layers"
 msgstr "Layers"
 
-#: ../app/layer_dialog.c:239
+#: ../app/layer_dialog.c:403
 msgid "Diagram:"
 msgstr "Diagram:"
 
-#: ../app/layer_dialog.c:349
+#: ../app/layer_dialog.c:517 ../app/layer_dialog.c:1231
 #, c-format
 msgid "New layer %d"
 msgstr "New layer %d"
 
-#: ../app/layer_dialog.c:561
+#: ../app/layer_dialog.c:733
 msgid "none"
 msgstr "none"
 
-#: ../app/layer_dialog.c:983
-msgid "Edit Layer Attributes"
-msgstr "Edit Layer Attributes"
+#: ../app/layer_dialog.c:1202
+msgid "Edit Layer"
+msgstr "Edit Layer"
+
+#: ../app/layer_dialog.c:1202
+msgid "Add Layer"
+msgstr "Add Layer"
 
-#: ../app/layer_dialog.c:1002
+#: ../app/layer_dialog.c:1221
 msgid "Layer name:"
 msgstr "Layer name:"
 
-#: ../app/linewidth_area.c:246
-#: ../lib/properties.h:481
-#: ../lib/properties.h:484
-#: ../objects/chronogram/chronoline.c:181
-#: ../objects/chronogram/chronoref.c:160
+#: ../app/linewidth_area.c:246 ../lib/properties.h:506 ../lib/properties.h:509
+#: ../objects/chronogram/chronoline.c:183
+#: ../objects/chronogram/chronoref.c:162
 msgid "Line width"
 msgstr "Line width"
 
@@ -1103,7 +1186,7 @@ msgstr "Line width"
 msgid "Line width:"
 msgstr "Line width:"
 
-#: ../app/load_save.c:260
+#: ../app/load_save.c:296
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1111,63 +1194,41 @@ msgstr ""
 "Error loading diagram.\n"
 "Linked object not found in document."
 
-#: ../app/load_save.c:263
+#: ../app/load_save.c:300
+#, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle does not exist."
+"connection handle %d does not exist on '%s'."
 msgstr ""
 "Error loading diagram.\n"
-"connection handle does not exist."
+"Connection handle %d does not exist on '%s'."
 
-#: ../app/load_save.c:280
+#: ../app/load_save.c:318
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection point %s does not exist."
+"connection point %d does not exist on '%s'."
 msgstr ""
 "Error loading diagram.\n"
-"connection point %s does not exist."
+"Connection point %d does not exist on '%s'."
 
-#: ../app/load_save.c:305
+#: ../app/load_save.c:358
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "Can't find parent %s of %s object\n"
 
-#: ../app/load_save.c:351
-#: ../objects/SISSI/area.c:204
-#: ../objects/SISSI/faraday.c:204
-#: ../objects/SISSI/room.c:204
-#: ../objects/SISSI/sissi_object.c:194
-#: ../objects/SISSI/site.c:207
+#: ../app/load_save.c:408
 msgid "You must specify a file, not a directory.\n"
 msgstr "You must specify a file, not a directory.\n"
 
-#: ../app/load_save.c:358
-#: ../objects/SISSI/area.c:210
-#: ../objects/SISSI/faraday.c:210
-#: ../objects/SISSI/room.c:210
-#: ../objects/SISSI/sissi_object.c:201
-#: ../objects/SISSI/site.c:213
-#: ../plug-ins/dxf/dxf-import.c:1304
-#: ../plug-ins/wpg/wpg.c:1177
-#: ../plug-ins/xfig/xfig-import.c:1260
-#: ../plug-ins/xslt/xslt.c:88
+#: ../app/load_save.c:415 ../plug-ins/dxf/dxf-import.c:1312
+#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
+#: ../plug-ins/xslt/xslt.c:93
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "Couldn't open: '%s' for reading.\n"
 
-#: ../app/load_save.c:376
-#: ../app/load_save.c:382
-#: ../objects/SISSI/area.c:219
-#: ../objects/SISSI/area.c:225
-#: ../objects/SISSI/faraday.c:219
-#: ../objects/SISSI/faraday.c:225
-#: ../objects/SISSI/room.c:219
-#: ../objects/SISSI/room.c:225
-#: ../objects/SISSI/sissi_object.c:211
-#: ../objects/SISSI/sissi_object.c:217
-#: ../objects/SISSI/site.c:222
-#: ../objects/SISSI/site.c:228
+#: ../app/load_save.c:433 ../app/load_save.c:439
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1176,12 +1237,7 @@ msgstr ""
 "Error loading diagram %s.\n"
 "Unknown file type."
 
-#: ../app/load_save.c:390
-#: ../objects/SISSI/area.c:233
-#: ../objects/SISSI/faraday.c:233
-#: ../objects/SISSI/room.c:233
-#: ../objects/SISSI/sissi_object.c:225
-#: ../objects/SISSI/site.c:236
+#: ../app/load_save.c:447
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1190,7 +1246,7 @@ msgstr ""
 "Error loading diagram %s.\n"
 "Not a Dia file."
 
-#: ../app/load_save.c:596
+#: ../app/load_save.c:664
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1201,423 +1257,497 @@ msgstr ""
 "%s.\n"
 "A valid Dia file defines at least one layer."
 
-#: ../app/load_save.c:904
+#: ../app/load_save.c:985
 #, c-format
-msgid "No allowed to write to output file %s\n"
+msgid "Not allowed to write to output file %s\n"
 msgstr "Not allowed to write to output file %s\n"
 
-#: ../app/load_save.c:926
+#: ../app/load_save.c:1017
 #, c-format
-msgid "No allowed to write temporary files in %s\n"
+msgid "Not allowed to write temporary files in %s\n"
 msgstr "Not allowed to write temporary files in %s\n"
 
+#: ../app/load_save.c:1039 ../plug-ins/cairo/diacairo.c:125
+#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
+#: ../plug-ins/libart/export_png.c:159
+#: ../plug-ins/metapost/render_metapost.c:1176
+#: ../plug-ins/pgf/render_pgf.c:1202 ../plug-ins/postscript/render_eps.c:105
+#: ../plug-ins/pstricks/render_pstricks.c:916
+#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:196
+#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
+#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:101
+#, c-format
+msgid "Can't open output file %s: %s\n"
+msgstr "Can't open output file %s: %s\n"
+
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:959
+#: ../app/load_save.c:1050
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "Internal error %d writing file %s\n"
 
-#: ../app/load_save.c:973
+#: ../app/load_save.c:1061
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "Can't rename %s to final output file %s: %s\n"
 
-#: ../app/load_save.c:1061
-#: ../app/load_save.c:1066
+#: ../app/load_save.c:1152 ../app/load_save.c:1157
 msgid "Dia Diagram File"
 msgstr "Dia Diagram File"
 
-#: ../app/menus.c:54
+#: ../app/menus.c:63
+msgid "Fit"
+msgstr "Fit"
+
+#: ../app/menus.c:80
 msgid "_File"
 msgstr "_File"
 
-#: ../app/menus.c:58
+#: ../app/menus.c:81
+msgid "Create a new diagram"
+msgstr "Create a new diagram"
+
+#: ../app/menus.c:82
+msgid "Open a diagram file"
+msgstr "Open a diagram file"
+
+#: ../app/menus.c:84
 msgid "_Help"
 msgstr "_Help"
 
-#: ../app/menus.c:66
+#: ../app/menus.c:92
 msgid "Sheets and Objects..."
-msgstr "Sheets and Objects..."
+msgstr "Sheets and Objectsâ?¦"
 
-#: ../app/menus.c:68
+#: ../app/menus.c:94
 msgid "Plugins..."
-msgstr "Plugins..."
+msgstr "Pluginsâ?¦"
 
-#: ../app/menus.c:74
+#: ../app/menus.c:101
 msgid "_Diagram tree..."
-msgstr "_Diagram tree..."
+msgstr "_Diagram Treeâ?¦"
 
-#: ../app/menus.c:82
+#: ../app/menus.c:102
+msgid "_Diagram tree"
+msgstr "_Diagram tree"
+
+#: ../app/menus.c:108
+msgid "Show Toolbar"
+msgstr "Show Toolbar"
+
+#: ../app/menus.c:109
+msgid "Show Statusbar"
+msgstr "Show Statusbar"
+
+#: ../app/menus.c:110
+msgid "Show Layers"
+msgstr "Show Layers"
+
+#: ../app/menus.c:116
+msgid "Save the diagram"
+msgstr "Save the diagram"
+
+#: ../app/menus.c:117
+msgid "Save the diagram with a new name"
+msgstr "Save the diagram with a new name"
+
+#: ../app/menus.c:118
 msgid "_Export ..."
-msgstr "_Export ..."
+msgstr "_Exportâ?¦"
+
+#: ../app/menus.c:118
+msgid "Export the diagram"
+msgstr "Export the diagram"
 
-#: ../app/menus.c:83
+#: ../app/menus.c:119
+msgid "_Diagram Properties"
+msgstr "_Diagram Properties"
+
+#: ../app/menus.c:120
 msgid "Page Set_up..."
-msgstr "Page Set_up..."
+msgstr "Page Set_upâ?¦"
 
-#: ../app/menus.c:87
-#: ../app/sheets_dialog.c:235
+#: ../app/menus.c:121
+msgid "Print the diagram"
+msgstr "Print the diagram"
+
+#: ../app/menus.c:124
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../app/menus.c:94
+#: ../app/menus.c:128
+msgid "Copy selection"
+msgstr "Copy selection"
+
+#: ../app/menus.c:129
+msgid "Cut selection"
+msgstr "Cut selection"
+
+#: ../app/menus.c:130
+msgid "Paste selection"
+msgstr "Paste selection"
+
+#: ../app/menus.c:131
 msgid "_Duplicate"
 msgstr "_Duplicate"
 
 #. the following used to bind to <control><shift>C which collides with Unicode input.
 #. * <control>>alt> doesn't work either
-#: ../app/menus.c:99
+#: ../app/menus.c:139
 msgid "Copy Text"
 msgstr "Copy Text"
 
-#: ../app/menus.c:100
+#: ../app/menus.c:140
 msgid "Cut Text"
 msgstr "Cut Text"
 
-#: ../app/menus.c:101
+#: ../app/menus.c:141
 msgid "Paste _Text"
 msgstr "Paste _Text"
 
-#: ../app/menus.c:103
-msgid "_Diagram"
-msgstr "_Diagram"
+#: ../app/menus.c:143
+msgid "_Layers"
+msgstr "_Layers"
 
-#: ../app/menus.c:105
+#: ../app/menus.c:144
+msgid "Add Layer..."
+msgstr "Add Layerâ?¦"
+
+#: ../app/menus.c:145
+msgid "Rename Layer..."
+msgstr "Rename Layerâ?¦"
+
+#: ../app/menus.c:146
+msgid "Move selection to layer above"
+msgstr "Move Selection to Layer Above"
+
+#: ../app/menus.c:147
+msgid "Move selection to layer below"
+msgstr "Move Selection to Layer Below"
+
+#: ../app/menus.c:148
 msgid "_Layers..."
-msgstr "_Layers..."
+msgstr "_Layersâ?¦"
 
-#: ../app/menus.c:107
+#: ../app/menus.c:150
 msgid "_View"
 msgstr "_View"
 
-#: ../app/menus.c:110
+#: ../app/menus.c:151
+msgid "Zoom in"
+msgstr "Zoom in"
+
+#: ../app/menus.c:152
+msgid "Zoom out"
+msgstr "Zoom out"
+
+#: ../app/menus.c:153
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../app/menus.c:111
+#: ../app/menus.c:154
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:112
+#: ../app/menus.c:155 ../app/menus.c:574
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:113
+#: ../app/menus.c:156 ../app/menus.c:575
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:114
+#: ../app/menus.c:157
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:115
+#: ../app/menus.c:158
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:116
+#: ../app/menus.c:159
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:118
+#: ../app/menus.c:161
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:119
+#: ../app/menus.c:162
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:120
+#: ../app/menus.c:163
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:121
+#: ../app/menus.c:164
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:122
+#: ../app/menus.c:165
 msgid "25"
 msgstr "25"
 
+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
+#: ../app/menus.c:167
+msgid "Zoom fit"
+msgstr "Zoom fit"
+
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:126
+#: ../app/menus.c:171
 msgid "New _View"
 msgstr "New _View"
 
-#: ../app/menus.c:127
+#: ../app/menus.c:172
 msgid "C_lone View"
 msgstr "C_lone View"
 
-#: ../app/menus.c:132
+#: ../app/menus.c:175
 msgid "_Objects"
 msgstr "_Objects"
 
-#: ../app/menus.c:133
+#: ../app/menus.c:176
 msgid "Send to _Back"
 msgstr "Send to _Back"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:177
 msgid "Bring to _Front"
 msgstr "Bring to _Front"
 
-#: ../app/menus.c:135
+#: ../app/menus.c:178
 msgid "Send Backwards"
 msgstr "Send Backwards"
 
-#: ../app/menus.c:136
+#: ../app/menus.c:179
 msgid "Bring Forwards"
 msgstr "Bring Forwards"
 
-#: ../app/menus.c:138
+#: ../app/menus.c:181
 msgid "_Group"
 msgstr "_Group"
 
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:140
+#: ../app/menus.c:183
 msgid "_Ungroup"
 msgstr "_Ungroup"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:185
 msgid "_Parent"
 msgstr "_Parent"
 
-#: ../app/menus.c:143
+#: ../app/menus.c:186
 msgid "_Unparent"
 msgstr "_Unparent"
 
-#: ../app/menus.c:144
+#: ../app/menus.c:187
 msgid "_Unparent Children"
 msgstr "_Unparent Children"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:146
-#: ../objects/FS/function.c:806
+#: ../app/menus.c:189 ../objects/FS/function.c:811
 msgid "Align"
 msgstr "Align"
 
-#: ../app/menus.c:151
-#: ../objects/standard/textobj.c:132
+#: ../app/menus.c:194 ../objects/standard/textobj.c:137
 msgid "Top"
 msgstr "Top"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:195
 msgid "Middle"
 msgstr "Middle"
 
-#: ../app/menus.c:153
-#: ../objects/standard/textobj.c:131
+#: ../app/menus.c:196 ../objects/standard/textobj.c:136
 msgid "Bottom"
 msgstr "Bottom"
 
-#: ../app/menus.c:155
+#: ../app/menus.c:198
 msgid "Spread Out Horizontally"
 msgstr "Spread Out Horizontally"
 
-#: ../app/menus.c:156
+#: ../app/menus.c:199
 msgid "Spread Out Vertically"
 msgstr "Spread Out Vertically"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:200
 msgid "Adjacent"
 msgstr "Adjacent"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:201
 msgid "Stacked"
 msgstr "Stacked"
 
-#: ../app/menus.c:162
+#: ../app/menus.c:205
 msgid "_Select"
 msgstr "_Select"
 
-#: ../app/menus.c:163
+#: ../app/menus.c:206
 msgid "All"
 msgstr "All"
 
-#: ../app/menus.c:164
-#: ../lib/arrows.c:43
-#: ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:1183
+#: ../app/menus.c:207 ../lib/arrows.c:1876 ../objects/Jackson/domain.c:96
+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
 msgid "None"
 msgstr "None"
 
-#: ../app/menus.c:165
+#: ../app/menus.c:208
 msgid "Invert"
 msgstr "Invert"
 
-#: ../app/menus.c:167
+#: ../app/menus.c:210
 msgid "Transitive"
 msgstr "Transitive"
 
-#: ../app/menus.c:168
+#: ../app/menus.c:211
 msgid "Connected"
 msgstr "Connected"
 
-#: ../app/menus.c:169
+#: ../app/menus.c:212
 msgid "Same Type"
 msgstr "Same Type"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:173
+#: ../app/menus.c:216
 msgid "Select By"
 msgstr "Select By"
 
-#: ../app/menus.c:175
+#: ../app/menus.c:218
 msgid "_Input Methods"
 msgstr "_Input Methods"
 
-#: ../app/menus.c:177
+#: ../app/menus.c:220
 msgid "D_ialogs"
 msgstr "D_ialogues"
 
-#: ../app/menus.c:179
+#: ../app/menus.c:222
 msgid "D_ebug"
 msgstr "D_ebug"
 
-#: ../app/menus.c:185
+#: ../app/menus.c:228
 msgid "_Tools"
 msgstr "_Tools"
 
-#: ../app/menus.c:186
+#: ../app/menus.c:229
 msgid "Modify"
 msgstr "Modify"
 
-#: ../app/menus.c:188
+#: ../app/menus.c:231
+msgid "Edit text"
+msgstr "Edit Text"
+
+#: ../app/menus.c:232
 msgid "Scroll"
 msgstr "Scroll"
 
-#: ../app/menus.c:210
+#: ../app/menus.c:255
 msgid "Fullscr_een"
 msgstr "Fullscr_een"
 
-#. we must have all actions registered to avoid configuration specific ui-files and crashing in GTK+,
-#. * see: http://bugzilla.gnome.org/show_bug.cgi?id=396161
-#.
-#: ../app/menus.c:213
-#: ../app/menus.c:218
+#: ../app/menus.c:257
 msgid "_AntiAliased"
-msgstr "_AntiAliased"
+msgstr "_Antialiased"
 
-#: ../app/menus.c:220
+#: ../app/menus.c:258
 msgid "Show _Grid"
 msgstr "Show _Grid"
 
-#: ../app/menus.c:221
+#: ../app/menus.c:259
 msgid "_Snap To Grid"
-msgstr "_Snap To Grid"
+msgstr "_Snap to Grid"
 
-#: ../app/menus.c:222
+#: ../app/menus.c:260
 msgid "Snap To _Objects"
-msgstr "Snap To _Objects"
+msgstr "Snap to _Objects"
 
-#: ../app/menus.c:223
+#: ../app/menus.c:261
 msgid "Show _Rulers"
 msgstr "Show _Rulers"
 
-#: ../app/menus.c:224
+#: ../app/menus.c:262
 msgid "Show _Connection Points"
 msgstr "Show _Connection Points"
 
-#: ../app/menus.c:230
-msgid "Replace"
-msgstr "Replace"
-
-#: ../app/menus.c:231
+#: ../app/menus.c:269
 msgid "Union"
 msgstr "Union"
 
-#: ../app/menus.c:232
+#: ../app/menus.c:270
 msgid "Intersection"
 msgstr "Intersection"
 
 #. 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:233
-#: ../app/sheets_dialog.c:784
-#: ../objects/FS/function.c:706
-#: ../objects/FS/function.c:858
-#: ../objects/FS/function.c:860
+#: ../app/menus.c:271 ../objects/FS/function.c:711
+#: ../objects/FS/function.c:863 ../objects/FS/function.c:865
 msgid "Remove"
 msgstr "Remove"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:235
+#: ../app/menus.c:273
 msgid "Inverse"
 msgstr "Inverse"
 
-#: ../app/menus.c:291
+#: ../app/menus.c:337
 msgid "NULL tooldata in tool_menu_select"
 msgstr "NULL tooldata in tool_menu_select"
 
-#: ../app/modify_tool.c:344
-msgid "Couldn't get GTK settings"
-msgstr "Couldn't get GTK settings"
+#: ../app/menus.c:576
+msgid "300%"
+msgstr "300%"
 
-#: ../app/newgroup.c:117
-msgid "Open group"
-msgstr "Open group"
+#: ../app/menus.c:577
+msgid "200%"
+msgstr "200%"
 
-#: ../app/paginate_psprint.c:275
-msgid "Select Printer"
-msgstr "Select Printer"
+#: ../app/menus.c:578
+msgid "150%"
+msgstr "150%"
 
-#: ../app/paginate_psprint.c:287
-#: ../sheets/ciscocomputer.sheet.in.h:36
-msgid "Printer"
-msgstr "Printer"
+#: ../app/menus.c:579
+msgid "100%"
+msgstr "100%"
 
-#: ../app/paginate_psprint.c:301
-#: ../sheets/Misc.sheet.in.h:1
-msgid "File"
-msgstr "File"
+#: ../app/menus.c:580
+msgid "75%"
+msgstr "75%"
 
-#: ../app/paginate_psprint.c:316
-msgid "OK"
-msgstr "OK"
+#: ../app/menus.c:581
+msgid "50%"
+msgstr "50%"
 
-#: ../app/paginate_psprint.c:462
-#, c-format
-msgid "Could not run command '%s': %s"
-msgstr "Could not run command '%s': %s"
+#: ../app/menus.c:582
+msgid "25%"
+msgstr "25%"
 
-#: ../app/paginate_psprint.c:465
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "Could not open '%s' for writing: %s"
+#: ../app/menus.c:583
+msgid "10%"
+msgstr "10%"
 
-#: ../app/paginate_psprint.c:487
-#, c-format
-msgid "Printing error: command '%s' returned %d\n"
-msgstr "Printing error: command '%s' returned %d\n"
+#: ../app/menus.c:608
+msgid "Toggles snap-to-grid."
+msgstr "Toggles snap-to-grid."
 
-#: ../app/paginate_psprint.c:498
-#, c-format
-msgid "Printing error: command '%s' caused sigpipe."
-msgstr "Printing error: command '%s' caused sigpipe."
+#: ../app/menus.c:619
+msgid "Toggles object snapping."
+msgstr "Toggles object snapping."
+
+#: ../app/modify_tool.c:392
+msgid "Couldn't get GTK settings"
+msgstr "Couldn't get GTK+ settings"
 
 #: ../app/plugin-manager.c:200
 msgid "Plug-ins"
-msgstr "Plug-ins"
+msgstr "Plugins"
 
 #: ../app/plugin-manager.c:255
 msgid "Loaded"
 msgstr "Loaded"
 
-#. *** board of value **************
-#: ../app/plugin-manager.c:262
-#: ../objects/SISSI/sissi_dialog.c:618
-#: ../objects/UML/class.c:139
-#: ../objects/UML/large_package.c:131
-#: ../objects/UML/umlattribute.c:37
-#: ../objects/UML/umlformalparameter.c:35
-#: ../objects/UML/umloperation.c:62
-#: ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "Name"
-
-#: ../app/plugin-manager.c:268
-#: ../objects/SISSI/sissi_dialog.c:614
-#: ../objects/SISSI/sissi_dialog.c:766
+#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
+#: ../objects/SISSI/sissi_dialog.c:882
 msgid "Description"
 msgstr "Description"
 
@@ -1627,33 +1757,37 @@ msgstr "Load at Startup"
 
 #: ../app/plugin-manager.c:284
 msgid "File Name"
-msgstr "File Name"
+msgstr "Filename"
+
+#: ../app/preferences.c:99 ../app/preferences.c:144
+msgid "any"
+msgstr "any"
 
-#: ../app/preferences.c:106
+#: ../app/preferences.c:118
 msgid "User Interface"
 msgstr "User Interface"
 
-#: ../app/preferences.c:107
+#: ../app/preferences.c:119
 msgid "Diagram Defaults"
 msgstr "Diagram Defaults"
 
-#: ../app/preferences.c:108
+#: ../app/preferences.c:120
 msgid "View Defaults"
 msgstr "View Defaults"
 
-#: ../app/preferences.c:125
+#: ../app/preferences.c:121
+msgid "Favorites"
+msgstr "Favourites"
+
+#: ../app/preferences.c:165
 msgid "Reset tools after create"
 msgstr "Reset tools after create"
 
-#: ../app/preferences.c:128
-msgid "Compress saved files"
-msgstr "Compress saved files"
-
-#: ../app/preferences.c:131
+#: ../app/preferences.c:168
 msgid "Number of undo levels:"
 msgstr "Number of undo levels:"
 
-#: ../app/preferences.c:134
+#: ../app/preferences.c:171
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1661,163 +1795,191 @@ msgstr ""
 "Reverse dragging selects\n"
 "intersecting objects"
 
-#: ../app/preferences.c:137
+#: ../app/preferences.c:174
 msgid "Recent documents list size:"
 msgstr "Recent documents list size:"
 
-#: ../app/preferences.c:140
+#: ../app/preferences.c:177
 msgid "Use menu bar"
 msgstr "Use menu bar"
 
-#: ../app/preferences.c:143
+#: ../app/preferences.c:180
 msgid "Keep tool box on top of diagram windows"
 msgstr "Keep tool box on top of diagram windows"
 
-#: ../app/preferences.c:146
-msgid "Unit for lengths:"
-msgstr "Unit for lengths:"
-
-#: ../app/preferences.c:149
-msgid "Unit for font sizes:"
-msgstr "Unit for font sizes:"
+#: ../app/preferences.c:183
+msgid "Length unit:"
+msgstr "Length unit:"
 
-#: ../app/preferences.c:153
-msgid "Integrated UI"
-msgstr "Integrated UI"
+#: ../app/preferences.c:186
+msgid "Font-size unit:"
+msgstr "Font size unit:"
 
-#: ../app/preferences.c:155
+#: ../app/preferences.c:189
 msgid "New diagram:"
 msgstr "New diagram:"
 
-#: ../app/preferences.c:156
+#: ../app/preferences.c:190
 msgid "Portrait"
 msgstr "Portrait"
 
-#: ../app/preferences.c:158
+#: ../app/preferences.c:192
 msgid "Paper type:"
 msgstr "Paper type:"
 
-#: ../app/preferences.c:161
+#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1075
 msgid "Background Color:"
 msgstr "Background Colour:"
 
-#: ../app/preferences.c:164
+#: ../app/preferences.c:196
+msgid "Compress saved files"
+msgstr "Compress saved files"
+
+#: ../app/preferences.c:199
+msgid "Connection Points:"
+msgstr "Connection Points:"
+
+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
+#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
+msgid "Visible"
+msgstr "Visible"
+
+#: ../app/preferences.c:201
+msgid "Snap to object"
+msgstr "Snap to object"
+
+#: ../app/preferences.c:204
 msgid "New window:"
 msgstr "New window:"
 
-#: ../app/preferences.c:165
+#: ../app/preferences.c:205
 msgid "Width:"
 msgstr "Width:"
 
-#: ../app/preferences.c:166
+#: ../app/preferences.c:206
 msgid "Height:"
 msgstr "Height:"
 
-#: ../app/preferences.c:167
+#: ../app/preferences.c:207
 msgid "Magnify:"
 msgstr "Magnify:"
 
-#: ../app/preferences.c:170
-msgid "Connection Points:"
-msgstr "Connection Points:"
-
-#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:171
-#: ../app/preferences.c:175
-#: ../app/preferences.c:181
-msgid "Visible"
-msgstr "Visible"
-
-#: ../app/preferences.c:174
+#: ../app/preferences.c:210
 msgid "Page breaks:"
 msgstr "Page breaks:"
 
-#: ../app/preferences.c:176
-#: ../app/preferences.c:186
+#: ../app/preferences.c:212 ../app/preferences.c:240
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../app/preferences.c:177
+#: ../app/preferences.c:213
 msgid "Solid lines"
 msgstr "Solid lines"
 
-#: ../app/preferences.c:182
+#: ../app/preferences.c:216
+msgid "Antialias:"
+msgstr "Antialias:"
+
+#: ../app/preferences.c:217
+msgid "view antialised"
+msgstr "view antialised"
+
+#. Favored Filter
+#. Translators: Menu item Verb/Channel/Export
+#. Translators: Menu item Verb/Channel/Export/Export
+#: ../app/preferences.c:221 ../objects/FS/function.c:701
+#: ../objects/FS/function.c:703 ../plug-ins/libart/export_png.c:328
+msgid "Export"
+msgstr "Export"
+
+#: ../app/preferences.c:223
+msgid "Portable Network Graphics"
+msgstr "Portable Network Graphics"
+
+#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:487
+#: ../plug-ins/svg/svg-import.c:884
+msgid "Scalable Vector Graphics"
+msgstr "Scalable Vector Graphics"
+
+#: ../app/preferences.c:227
+msgid "PostScript"
+msgstr "PostScript"
+
+#: ../app/preferences.c:229
+msgid "Windows MetaFile"
+msgstr "Windows Metafile"
+
+#: ../app/preferences.c:231
+msgid "Enhanced MetaFile"
+msgstr "Enhanced Metafile"
+
+#: ../app/preferences.c:236
 msgid "Snap to"
 msgstr "Snap to"
 
-#: ../app/preferences.c:183
+#: ../app/preferences.c:237
 msgid "Dynamic grid resizing"
 msgstr "Dynamic grid resizing"
 
-#: ../app/preferences.c:184
+#: ../app/preferences.c:238
 msgid "X Size:"
 msgstr "X Size:"
 
-#: ../app/preferences.c:185
+#: ../app/preferences.c:239
 msgid "Y Size:"
 msgstr "Y Size:"
 
-#: ../app/preferences.c:187
+#: ../app/preferences.c:241
 msgid "Lines per major line"
 msgstr "Lines per major line"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:243
 msgid "Hex Size:"
 msgstr "Hex Size:"
 
-#: ../app/preferences.c:205
+#. There's really no reason to not pretty format it, and allowing non-pretty
+#. can lead to problems with long lines, CVS etc.
+#. { "pretty_formated_xml", PREF_BOOLEAN,PREF_OFFSET(pretty_formated_xml),
+#. &default_true,0,"pretty formated xml",NULL, TRUE},
+#.
+#: ../app/preferences.c:255
 msgid "Diagram tree window:"
 msgstr "Diagram tree window:"
 
-#: ../app/preferences.c:207
+#: ../app/preferences.c:257
 msgid "Save hidden object types"
 msgstr "Save hidden object types"
 
-#: ../app/preferences.c:415
-#: ../lib/prop_inttypes.c:158
+#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
 msgid "Yes"
 msgstr "Yes"
 
-#: ../app/preferences.c:415
-#: ../app/preferences.c:426
-#: ../lib/prop_inttypes.c:160
-#: ../lib/prop_inttypes.c:186
+#: ../app/preferences.c:485 ../app/preferences.c:496
+#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
 msgid "No"
 msgstr "No"
 
-#: ../app/preferences.c:528
+#: ../app/preferences.c:591
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../app/properties.c:55
+#: ../app/properties-dialog.c:57
 msgid "Object properties"
 msgstr "Object properties"
 
-#: ../app/properties.c:80
+#: ../app/properties-dialog.c:82
 msgid "This object has no properties."
 msgstr "This object has no properties."
 
-#: ../app/properties.c:217
+#: ../app/properties-dialog.c:246
 msgid "Properties: "
 msgstr "Properties: "
 
-#: ../app/properties.c:221
+#: ../app/properties-dialog.c:250
 msgid "Object properties:"
 msgstr "Object properties:"
 
-#: ../app/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
-msgstr "Encapsulated Postscript (using Pango fonts)"
-
-#: ../app/render_eps.c:159
-msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr "Encapsulated Postscript with preview (using Pango fonts)"
-
-#: ../app/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-msgstr "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-
-#: ../app/sheets.c:156
+#: ../app/sheets.c:155
 #, c-format
 msgid ""
 "%s\n"
@@ -1826,7 +1988,7 @@ msgstr ""
 "%s\n"
 "System sheet"
 
-#: ../app/sheets.c:158
+#: ../app/sheets.c:157
 #, c-format
 msgid ""
 "%s\n"
@@ -1835,7 +1997,7 @@ msgstr ""
 "%s\n"
 "User sheet"
 
-#: ../app/sheets.c:273
+#: ../app/sheets.c:275
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
@@ -1843,169 +2005,60 @@ msgstr ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
 
-#: ../app/sheets.c:381
+#: ../app/sheets.c:406
 #, c-format
 msgid "Widget not found: %s"
 msgstr "Widget not found: %s"
 
-#: ../app/sheets.c:456
+#: ../app/sheets.c:481
 msgid "SVG Shape"
 msgstr "SVG Shape"
 
-#: ../app/sheets.c:458
+#: ../app/sheets.c:483
 msgid "Programmed DiaObject"
 msgstr "Programmed DiaObject"
 
-#: ../app/sheets_dialog.c:83
-msgid "Sheets and Objects"
-msgstr "Sheets and Objects"
+#: ../app/sheets_dialog.c:255
+msgid "Select SVG Shape File"
+msgstr "Select SVG Shape File"
 
-#: ../app/sheets_dialog.c:109
-#: ../app/sheets_dialog_callbacks.c:179
-msgid "<- Copy"
-msgstr "<- Copy"
+#: ../app/sheets_dialog_callbacks.c:164
+msgid "Copy ->"
+msgstr "Copy â??"
 
-#: ../app/sheets_dialog.c:119
-#: ../app/sheets_dialog_callbacks.c:181
-msgid "<- Copy All"
-msgstr "<- Copy All"
+#: ../app/sheets_dialog_callbacks.c:166
+msgid "Copy All ->"
+msgstr "Copy All â??"
 
-#: ../app/sheets_dialog.c:126
-#: ../app/sheets_dialog_callbacks.c:183
-msgid "<- Move"
-msgstr "<- Move"
+#: ../app/sheets_dialog_callbacks.c:168
+msgid "Move ->"
+msgstr "Move â??"
 
-#: ../app/sheets_dialog.c:136
-#: ../app/sheets_dialog_callbacks.c:185
-msgid "<- Move All"
-msgstr "<- Move All"
-
-#: ../app/sheets_dialog.c:233
-msgid "Edit"
-msgstr "Edit"
-
-#: ../app/sheets_dialog.c:266
-msgid "Revert"
-msgstr "Revert"
-
-#: ../app/sheets_dialog.c:354
-msgid "New"
-msgstr "New"
-
-#: ../app/sheets_dialog.c:362
-#: ../app/sheets_dialog.c:794
-#: ../objects/Istar/actor.c:144
-#: ../objects/Istar/actor.c:145
-#: ../objects/Istar/other.c:148
-#: ../objects/Istar/other.c:149
-#: ../objects/KAOS/other.c:151
-#: ../objects/KAOS/other.c:152
-#: ../objects/UML/umlattribute.c:39
-#: ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64
-#: ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "Type"
+#: ../app/sheets_dialog_callbacks.c:170
+msgid "Move All ->"
+msgstr "Move All â??"
 
-#: ../app/sheets_dialog.c:377
-msgid "Browse..."
-msgstr "Browse..."
+#: ../app/sheets_dialog_callbacks.c:177
+msgid "<- Copy"
+msgstr "â?? Copy"
 
-#: ../app/sheets_dialog.c:386
-msgid "SVG Shape:"
-msgstr "SVG Shape:"
+#: ../app/sheets_dialog_callbacks.c:179
+msgid "<- Copy All"
+msgstr "â?? Copy All"
 
-#: ../app/sheets_dialog.c:413
-#: ../app/sheets_dialog.c:476
-msgid "description:"
-msgstr "description:"
+#: ../app/sheets_dialog_callbacks.c:181
+msgid "<- Move"
+msgstr "â?? Move"
 
-#: ../app/sheets_dialog.c:425
-msgid "Sheet name:"
-msgstr "Sheet name:"
+#: ../app/sheets_dialog_callbacks.c:183
+msgid "<- Move All"
+msgstr "â?? Move All"
 
-#: ../app/sheets_dialog.c:446
-#: ../app/sheets_dialog_callbacks.c:291
-#: ../app/sheets_dialog_callbacks.c:1094
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1083
 msgid "Line Break"
 msgstr "Line Break"
 
-#: ../app/sheets_dialog.c:568
-msgid "Edit Attributes"
-msgstr "Edit Attributes"
-
-#: ../app/sheets_dialog.c:583
-msgid "DiaObject"
-msgstr "DiaObject"
-
-#: ../app/sheets_dialog.c:599
-#: ../app/sheets_dialog.c:692
-msgid "Description:"
-msgstr "Description:"
-
-#: ../app/sheets_dialog.c:618
-#: ../objects/FS/flow-ortho.c:167
-#: ../objects/FS/flow.c:144
-#: ../objects/Istar/link.c:164
-#: ../objects/Jackson/phenomenon.c:144
-#: ../objects/KAOS/metaandorrel.c:164
-#: ../objects/KAOS/metabinrel.c:171
-#: ../objects/UML/class_dialog.c:977
-#: ../objects/UML/class_dialog.c:1930
-#: ../objects/UML/class_dialog.c:2168
-#: ../objects/UML/class_dialog.c:2694
-msgid "Type:"
-msgstr "Type:"
-
-#: ../app/sheets_dialog.c:656
-msgid "Sheet"
-msgstr "Sheet"
-
-#: ../app/sheets_dialog.c:672
-#: ../objects/ER/attribute.c:153
-#: ../objects/ER/entity.c:135
-#: ../objects/ER/relationship.c:140
-#: ../objects/UML/association.c:238
-#: ../objects/UML/association.c:1160
-#: ../objects/UML/class_dialog.c:966
-#: ../objects/UML/class_dialog.c:1919
-#: ../objects/UML/class_dialog.c:2157
-#: ../objects/UML/class_dialog.c:2683
-#: ../objects/UML/dependency.c:135
-#: ../objects/UML/generalization.c:131
-#: ../objects/UML/realizes.c:132
-msgid "Name:"
-msgstr "Name:"
-
-#: ../app/sheets_dialog.c:809
-msgid "DiaObject:"
-msgstr "DiaObject:"
-
-#: ../app/sheets_dialog.c:836
-msgid "Sheet:"
-msgstr "Sheet:"
-
-#: ../app/sheets_dialog.c:920
-msgid "Select SVG Shape File"
-msgstr "Select SVG Shape File"
-
-#: ../app/sheets_dialog_callbacks.c:166
-msgid "Copy ->"
-msgstr "Copy ->"
-
-#: ../app/sheets_dialog_callbacks.c:168
-msgid "Copy All ->"
-msgstr "Copy All ->"
-
-#: ../app/sheets_dialog_callbacks.c:170
-msgid "Move ->"
-msgstr "Move ->"
-
-#: ../app/sheets_dialog_callbacks.c:172
-msgid "Move All ->"
-msgstr "Move All ->"
-
-#: ../app/sheets_dialog_callbacks.c:305
+#: ../app/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -2014,7 +2067,7 @@ msgstr ""
 "%s\n"
 "Shape"
 
-#: ../app/sheets_dialog_callbacks.c:308
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -2023,7 +2076,7 @@ msgstr ""
 "%s\n"
 "Object"
 
-#: ../app/sheets_dialog_callbacks.c:311
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -2032,64 +2085,71 @@ msgstr ""
 "%s\n"
 "Unassigned type"
 
-#: ../app/sheets_dialog_callbacks.c:802
+#: ../app/sheets_dialog_callbacks.c:780
+msgid "Please select a .shape file"
+msgstr "Please select a .shape file"
+
+#: ../app/sheets_dialog_callbacks.c:787
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "Filename must end with '%s': '%s'"
 
-#: ../app/sheets_dialog_callbacks.c:810
+#: ../app/sheets_dialog_callbacks.c:795
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "Error examining %s: %s"
 
-#: ../app/sheets_dialog_callbacks.c:831
+#: ../app/sheets_dialog_callbacks.c:826
+msgid "Please export the diagram as a shape."
+msgstr "Please export the diagram as a shape."
+
+#: ../app/sheets_dialog_callbacks.c:829
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "Could not interpret shape file: '%s'"
 
-#: ../app/sheets_dialog_callbacks.c:901
+#: ../app/sheets_dialog_callbacks.c:899
 msgid "Sheet must have a Name"
 msgstr "Sheet must have a Name"
 
-#: ../app/sheets_dialog_callbacks.c:1598
-#: ../app/sheets_dialog_callbacks.c:1605
+#: ../app/sheets_dialog_callbacks.c:1593 ../app/sheets_dialog_callbacks.c:1600
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "Couldn't open '%s': %s"
 
-#: ../app/sheets_dialog_callbacks.c:1657
+#: ../app/sheets_dialog_callbacks.c:1654
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "Couldn't open: '%s' for writing"
 
-#: ../app/sheets_dialog_callbacks.c:1667
+#: ../app/sheets_dialog_callbacks.c:1664
 msgid "a user"
 msgstr "a user"
 
-#: ../app/sheets_dialog_callbacks.c:1680
+#: ../app/sheets_dialog_callbacks.c:1677
 #, c-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1683
+#: ../app/sheets_dialog_callbacks.c:1680
 #, c-format
 msgid "Date: %s"
 msgstr "Date: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1687
+#: ../app/sheets_dialog_callbacks.c:1684
 #, c-format
 msgid "For: %s"
 msgstr "For: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1704
+#: ../app/sheets_dialog_callbacks.c:1701
 msgid "add shapes here"
 msgstr "add shapes here"
 
-#: ../app/splash.c:56
+#: ../app/splash.c:57
 msgid "Loading ..."
-msgstr "Loading ..."
+msgstr "Loadingâ?¦"
 
-#: ../app/splash.c:74
+#: ../app/splash.c:75
 #, c-format
 msgid "Dia v %s"
 msgstr "Dia v %s"
@@ -2102,180 +2162,169 @@ msgstr "Dia Diagram Editor"
 msgid "Edit your Diagrams"
 msgstr "Edit your Diagrams"
 
-#: ../lib/arrows.c:44
+#: ../lib/arrows.c:1877
 msgid "Lines"
 msgstr "Lines"
 
-#: ../lib/arrows.c:45
+#: ../lib/arrows.c:1878
 msgid "Hollow Triangle"
 msgstr "Hollow Triangle"
 
-#: ../lib/arrows.c:46
+#: ../lib/arrows.c:1879
 msgid "Filled Triangle"
 msgstr "Filled Triangle"
 
-#: ../lib/arrows.c:47
+#: ../lib/arrows.c:1880
 msgid "Unfilled Triangle"
 msgstr "Unfilled Triangle"
 
-#: ../lib/arrows.c:48
+#: ../lib/arrows.c:1881
 msgid "Hollow Diamond"
 msgstr "Hollow Diamond"
 
-#: ../lib/arrows.c:49
+#: ../lib/arrows.c:1882
 msgid "Filled Diamond"
 msgstr "Filled Diamond"
 
-#: ../lib/arrows.c:50
+#: ../lib/arrows.c:1883
 msgid "Half Diamond"
 msgstr "Half Diamond"
 
-#: ../lib/arrows.c:51
+#: ../lib/arrows.c:1884
 msgid "Half Head"
 msgstr "Half Head"
 
-#: ../lib/arrows.c:52
+#: ../lib/arrows.c:1885
 msgid "Slashed Cross"
 msgstr "Slashed Cross"
 
-#: ../lib/arrows.c:53
+#: ../lib/arrows.c:1886
 msgid "Filled Ellipse"
 msgstr "Filled Ellipse"
 
-#: ../lib/arrows.c:54
+#: ../lib/arrows.c:1887
 msgid "Hollow Ellipse"
 msgstr "Hollow Ellipse"
 
-#: ../lib/arrows.c:55
+#: ../lib/arrows.c:1888
 msgid "Filled Dot"
 msgstr "Filled Dot"
 
-#: ../lib/arrows.c:56
+#: ../lib/arrows.c:1889
 msgid "Dimension Origin"
 msgstr "Dimension Origin"
 
-#: ../lib/arrows.c:57
+#: ../lib/arrows.c:1890
 msgid "Blanked Dot"
 msgstr "Blanked Dot"
 
-#: ../lib/arrows.c:58
+#: ../lib/arrows.c:1891
 msgid "Double Hollow Triangle"
 msgstr "Double Hollow Triangle"
 
-#: ../lib/arrows.c:59
+#: ../lib/arrows.c:1892
 msgid "Double Filled Triangle"
 msgstr "Double Filled Triangle"
 
-#: ../lib/arrows.c:60
+#: ../lib/arrows.c:1893
 msgid "Filled Dot and Triangle"
 msgstr "Filled Dot and Triangle"
 
-#: ../lib/arrows.c:61
+#: ../lib/arrows.c:1894
 msgid "Filled Box"
 msgstr "Filled Box"
 
-#: ../lib/arrows.c:62
+#: ../lib/arrows.c:1895
 msgid "Blanked Box"
 msgstr "Blanked Box"
 
-#: ../lib/arrows.c:63
+#: ../lib/arrows.c:1896
 msgid "Slashed"
 msgstr "Slashed"
 
-#: ../lib/arrows.c:64
+#: ../lib/arrows.c:1897
 msgid "Integral Symbol"
 msgstr "Integral Symbol"
 
-#: ../lib/arrows.c:65
+#: ../lib/arrows.c:1898
 msgid "Crow Foot"
 msgstr "Crow Foot"
 
-#: ../lib/arrows.c:66
+#: ../lib/arrows.c:1899
 msgid "Cross"
 msgstr "Cross"
 
-#: ../lib/arrows.c:67
+#: ../lib/arrows.c:1900
 msgid "1-or-many"
 msgstr "1-or-many"
 
-#: ../lib/arrows.c:68
+#: ../lib/arrows.c:1901
 msgid "0-or-many"
 msgstr "0-or-many"
 
-#: ../lib/arrows.c:69
+#: ../lib/arrows.c:1902
 msgid "1-or-0"
 msgstr "1-or-0"
 
-#: ../lib/arrows.c:70
+#: ../lib/arrows.c:1903
 msgid "1 exactly"
 msgstr "1 exactly"
 
-#: ../lib/arrows.c:71
+#: ../lib/arrows.c:1904
 msgid "Filled Concave"
 msgstr "Filled Concave"
 
-#: ../lib/arrows.c:72
+#: ../lib/arrows.c:1905
 msgid "Blanked Concave"
 msgstr "Blanked Concave"
 
-#: ../lib/arrows.c:73
+#: ../lib/arrows.c:1906 ../lib/properties.c:72 ../lib/properties.c:78
+#: ../lib/properties.h:485 ../lib/properties.h:491
 msgid "Round"
 msgstr "Round"
 
-#: ../lib/arrows.c:74
+#: ../lib/arrows.c:1907
 msgid "Open Round"
 msgstr "Open Round"
 
-#: ../lib/arrows.c:75
+#: ../lib/arrows.c:1908
 msgid "Backslash"
 msgstr "Backslash"
 
-#: ../lib/arrows.c:76
+#: ../lib/arrows.c:1909
 msgid "Infinite Line"
 msgstr "Infinite Line"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:2037
 msgid "Arrow head of unknown type"
 msgstr "Arrow head of unknown type"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:2045
 #, c-format
 msgid "Arrow head of type %s has too small dimensions, removing.\n"
-msgstr "Arrow head of type %s has too small dimensions, removing.\n"
+msgstr "Arrow head of type %s has too small dimensions; removing.\n"
 
-#: ../lib/arrows.c:2021
+#: ../lib/arrows.c:2178
 msgid "unknown arrow"
 msgstr "unknown arrow"
 
-#: ../lib/bezier_conn.c:636
+#: ../lib/bezier_conn.c:638
 msgid "Internal error: Setting corner type of endpoint of bezier"
 msgstr "Internal error: Setting corner type of endpoint of bezier"
 
-#: ../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:335
-#: ../plug-ins/svg/svg-import.c:204
-#: ../plug-ins/vdx/vdx-import.c:140
+#: ../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:267 ../plug-ins/vdx/vdx-import.c:145
 msgid "Can't find standard object"
 msgstr "Can't find standard object"
 
-#: ../lib/dia_dirs.c:237
-#, c-format
-msgid "%s<illegal characters>..."
-msgstr "%s<illegal characters>..."
-
-#: ../lib/dia_dirs.c:268
+#: ../lib/dia_dirs.c:259
 #, c-format
 msgid "Too many ..'s in filename %s\n"
-msgstr "Too many ..'s in filename %s\n"
+msgstr "Too many \"..\"s in filename %s\n"
 
-#: ../lib/dia_xml.c:167
+#: ../lib/dia_xml.c:192
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2284,125 +2333,101 @@ msgstr ""
 "The file %s has no encoding specification;\n"
 "assuming it is encoded in %s"
 
-#: ../lib/dia_xml.c:568
+#: ../lib/dia_xml.c:597
 msgid "Taking point value of non-point node."
 msgstr "Taking point value of non-point node."
 
-#: ../lib/dia_xml.c:579
+#: ../lib/dia_xml.c:608
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "Incorrect x Point value \"%s\" %f; discarding it."
 
-#: ../lib/dia_xml.c:586
+#: ../lib/dia_xml.c:615
 msgid "Error parsing point."
 msgstr "Error parsing point."
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:594
+#: ../lib/dia_xml.c:623
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "Incorrect y Point value \"%s\" %f; discarding it."
 
-#: ../lib/dia_xml.c:1066
-msgid "Your local character set is UTF-8. Because of issues with libxml1 and the support of files generated by previous versions of dia, you will encounter  problems. Please report to dia-list gnome org if you see this message."
-msgstr "Your local character set is UTF-8. Because of issues with libxml1 and the support of files generated by previous versions of dia, you will encounter  problems. Please report to dia-list gnome org if you see this message."
-
-#: ../lib/diaarrowchooser.c:351
-msgid "Arrow Properties"
-msgstr "Arrow Properties"
-
-#. This is the default text shown in the preview entry, though the user
-#. can set it. Remember that some fonts only have capital letters.
-#: ../lib/diagtkfontsel.c:74
-msgid "abcdefghijk ABCDEFGHIJK"
-msgstr "abcdefghijk ABCDEFGHIJK"
-
-#: ../lib/diagtkfontsel.c:209
-msgid "Font name"
-msgstr "Font name"
-
-#: ../lib/diagtkfontsel.c:210
-msgid "The X string that represents this font."
-msgstr "The X string that represents this font."
-
-#: ../lib/diagtkfontsel.c:216
-msgid "Preview text"
-msgstr "Preview text"
-
-#: ../lib/diagtkfontsel.c:217
-msgid "The text to display in order to demonstrate the selected font."
-msgstr "The text to display in order to demonstrate the selected font."
-
-#: ../lib/diagtkfontsel.c:321
-msgid "_Family:"
-msgstr "_Family:"
+#: ../lib/dia_xml.c:640
+msgid "Taking bezpoint value of non-point node."
+msgstr "Taking bezpoint value of non-point node."
 
-#: ../lib/diagtkfontsel.c:327
-msgid "_Style:"
-msgstr "_Style:"
+#: ../lib/dia_xml.c:658
+msgid "Error parsing bezpoint p1."
+msgstr "Error parsing bezpoint p1."
 
-#: ../lib/diagtkfontsel.c:333
-msgid "Si_ze:"
-msgstr "Si_ze:"
+#: ../lib/dia_xml.c:672
+msgid "Error parsing bezpoint p2."
+msgstr "Error parsing bezpoint p2."
 
-#. create the text entry widget
-#: ../lib/diagtkfontsel.c:462
-msgid "_Preview:"
-msgstr "_Preview:"
+#: ../lib/dia_xml.c:686
+msgid "Error parsing bezpoint p3."
+msgstr "Error parsing bezpoint p3."
 
-#: ../lib/diagtkfontsel.c:1252
-msgid "Font Selection"
-msgstr "Font Selection"
-
-#: ../lib/dialibartrenderer.c:295
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
-msgstr "gdk_renderer: Unsupported fill mode specified!\n"
+#: ../lib/diaarrowchooser.c:360
+msgid "Arrow Properties"
+msgstr "Arrow Properties"
 
-#: ../lib/dialinechooser.c:297
+#: ../lib/dialinechooser.c:295
 msgid "Line Style Properties"
 msgstr "Line Style Properties"
 
-#: ../lib/dialinechooser.c:333
+#: ../lib/dialinechooser.c:330
 msgid "Details..."
-msgstr "Details..."
+msgstr "Detailsâ?¦"
+
+#: ../lib/dialogs.c:51
+msgid "Ok"
+msgstr "OK"
 
-#: ../lib/filter.c:126
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
+msgid "Cancel"
+msgstr "Cancel"
+
+#: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr "Multiple export filters with unique name %s"
 
-#: ../lib/font.c:102
+#: ../lib/font.c:85
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "Can't load font %s.\n"
 
-#: ../lib/message.c:91
-#: ../lib/message.c:277
+#: ../lib/message.c:92 ../lib/message.c:278
 msgid "Warning"
 msgstr "Warning"
 
-#: ../lib/message.c:118
+#: ../lib/message.c:119
 msgid "There is one similar message."
 msgstr "There is one similar message."
 
-#: ../lib/message.c:123
+#: ../lib/message.c:124
 msgid "Show repeated messages"
 msgstr "Show repeated messages"
 
-#: ../lib/message.c:144
+#: ../lib/message.c:145
 msgid "Don't show this message again"
 msgstr "Don't show this message again"
 
-#: ../lib/message.c:202
+#: ../lib/message.c:203
 #, c-format
 msgid "There are %d similar messages."
 msgstr "There are %d similar messages."
 
-#: ../lib/message.c:261
+#: ../lib/message.c:262
 msgid "Notice"
 msgstr "Notice"
 
-#: ../lib/object_defaults.c:127
+#: ../lib/newgroup.c:124
+msgid "Open group"
+msgstr "Open group"
+
+#: ../lib/object_defaults.c:128
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2411,44 +2436,29 @@ msgstr ""
 "Error loading defaults '%s'.\n"
 "Not a Dia diagram file."
 
-#: ../lib/plug-ins.c:120
+#: ../lib/plug-ins.c:111
 msgid "???"
 msgstr "???"
 
-#: ../lib/plug-ins.c:227
+#: ../lib/plug-ins.c:186
 #, c-format
-msgid "Could not deduce correct path for `%s'"
-msgstr "Could not deduce correct path for `%s'"
+msgid "Missing dependencies for '%s'?"
+msgstr "Missing dependencies for '%s'?"
 
-#: ../lib/plug-ins.c:233
-#, c-format
-msgid ""
-"Could not load plugin '%s'\n"
-"%s"
-msgstr ""
-"Could not load plugin '%s'\n"
-"%s"
-
-#: ../lib/plug-ins.c:246
-#, c-format
-msgid "Could not find plugin init function in `%s'"
-msgstr "Could not find plugin init function in `%s'"
-
-#: ../lib/plug-ins.c:248
+#: ../lib/plug-ins.c:197
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "Missing symbol 'dia_plugin_init'"
 
-#: ../lib/plug-ins.c:256
-#: ../lib/plug-ins.c:264
+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
 msgid "dia_plugin_init() call failed"
 msgstr "dia_plugin_init() call failed"
 
-#: ../lib/plug-ins.c:283
+#: ../lib/plug-ins.c:232
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "%s Plugin could not be unloaded"
 
-#: ../lib/plug-ins.c:371
+#: ../lib/plug-ins.c:303
 #, c-format
 msgid ""
 "Could not open `%s'\n"
@@ -2457,274 +2467,716 @@ msgstr ""
 "Could not open `%s'\n"
 "`%s'"
 
-#: ../lib/prop_text.c:466
+#: ../lib/prop_dict.c:43
+msgid "Author"
+msgstr "Author"
+
+#: ../lib/prop_dict.c:44
+msgid "Identifier"
+msgstr "Identifier"
+
+#: ../lib/prop_dict.c:45
+msgid "Creation date"
+msgstr "Creation date"
+
+#: ../lib/prop_dict.c:46
+msgid "Modification date"
+msgstr "Modification date"
+
+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
+msgid "URL"
+msgstr "URL"
+
+#: ../lib/prop_inttypes.c:558
+msgid "Property cast from int to enum out of range"
+msgstr "Property cast from int to enum out of range"
+
+#: ../lib/prop_text.c:469
 #, c-format
 msgid "Group with %d objects"
 msgstr "Group with %d objects"
 
-#: ../lib/properties.c:64
-#: ../lib/properties.h:469
-#: ../lib/widgets.c:690
+#: ../lib/properties.c:65 ../lib/properties.h:478 ../lib/widgets.c:715
 msgid "Left"
 msgstr "Left"
 
-#: ../lib/properties.c:65
-#: ../lib/properties.h:470
-#: ../lib/widgets.c:696
-#: ../objects/standard/textobj.c:133
+#: ../lib/properties.c:66 ../lib/properties.h:479 ../lib/widgets.c:721
+#: ../objects/standard/textobj.c:138
 msgid "Center"
 msgstr "Centre"
 
-#: ../lib/properties.c:66
-#: ../lib/properties.h:471
-#: ../lib/widgets.c:702
+#: ../lib/properties.c:67 ../lib/properties.h:480 ../lib/widgets.c:727
 msgid "Right"
 msgstr "Right"
 
-#: ../lib/properties.c:73
-#: ../lib/properties.h:487
-#: ../lib/properties.h:490
-#: ../objects/chronogram/chronoline.c:179
-#: ../objects/chronogram/chronoref.c:158
+#: ../lib/properties.c:71 ../lib/properties.h:484
+msgid "Miter"
+msgstr "Mitre"
+
+#: ../lib/properties.c:73 ../lib/properties.h:486
+msgid "Bevel"
+msgstr "Bevel"
+
+#: ../lib/properties.c:77 ../lib/properties.h:490
+msgid "Butt"
+msgstr "Butt"
+
+#: ../lib/properties.c:79 ../lib/properties.h:492
+msgid "Projecting"
+msgstr "Projecting"
+
+#: ../lib/properties.c:86 ../lib/properties.h:512 ../lib/properties.h:515
+#: ../objects/chronogram/chronoline.c:181
+#: ../objects/chronogram/chronoref.c:160
 msgid "Line color"
 msgstr "Line colour"
 
-#: ../lib/properties.c:74
-#: ../lib/properties.h:493
-#: ../lib/properties.h:496
+#: ../lib/properties.c:87 ../lib/properties.h:518 ../lib/properties.h:521
 msgid "Line style"
 msgstr "Line style"
 
-#: ../lib/properties.c:75
-#: ../lib/properties.h:500
-#: ../lib/properties.h:503
+#: ../lib/properties.c:88 ../lib/properties.h:537 ../lib/properties.h:540
 msgid "Fill color"
 msgstr "Fill colour"
 
-#: ../lib/properties.c:76
-#: ../lib/properties.h:506
-#: ../lib/properties.h:509
+#: ../lib/properties.c:89 ../lib/properties.h:543 ../lib/properties.h:546
 msgid "Draw background"
 msgstr "Draw background"
 
-#: ../lib/properties.c:77
-#: ../lib/properties.h:513
+#: ../lib/properties.c:90 ../lib/properties.h:550
 msgid "Start arrow"
 msgstr "Start arrow"
 
-#: ../lib/properties.c:78
-#: ../lib/properties.h:516
+#: ../lib/properties.c:91 ../lib/properties.h:553
 msgid "End arrow"
 msgstr "End arrow"
 
-#: ../lib/properties.c:80
-#: ../lib/properties.h:526
+#: ../lib/properties.c:93 ../lib/properties.h:563
 msgid "Text alignment"
 msgstr "Text alignment"
 
 #. all this just to make the defaults selectable ...
-#: ../lib/properties.c:81
-#: ../lib/properties.h:531
-#: ../objects/GRAFCET/condition.c:132
-#: ../objects/GRAFCET/step.c:165
-#: ../objects/GRAFCET/transition.c:142
-#: ../objects/UML/class.c:169
-#: ../objects/UML/class_dialog.c:394
-#: ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:164
+#: ../lib/properties.c:94 ../lib/properties.h:568
+#: ../objects/Database/table_dialog.c:1033 ../objects/Database/reference.c:117
+#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:177
+#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
+#: ../objects/chronogram/chronoref.c:166
 msgid "Font"
 msgstr "Font"
 
-#: ../lib/properties.c:82
-#: ../lib/properties.h:539
-#: ../objects/GRAFCET/condition.c:134
-#: ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144
-#: ../objects/chronogram/chronoline.c:185
-#: ../objects/chronogram/chronoref.c:166
+#: ../lib/properties.c:95 ../lib/properties.h:576
+#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
+#: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
+#: ../objects/chronogram/chronoref.c:168
 msgid "Font size"
 msgstr "Font size"
 
-#: ../lib/properties.c:83
-#: ../lib/properties.h:545
-#: ../objects/GRAFCET/step.c:169
-#: ../objects/chronogram/chronoline.c:187
-#: ../objects/chronogram/chronoref.c:168
+#: ../lib/properties.c:96 ../lib/properties.h:582
+#: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
+#: ../objects/chronogram/chronoref.c:170
 msgid "Text color"
 msgstr "Text colour"
 
+#: ../lib/properties.h:524 ../lib/properties.h:527
+msgid "Line join"
+msgstr "Line join"
+
+#: ../lib/properties.h:530 ../lib/properties.h:533
+msgid "Line caps"
+msgstr "Line caps"
+
 #: ../lib/proplist.c:163
 #, c-format
 msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
-msgstr "No attribute '%s' (%p) or no data(%p) in this attribute"
+msgstr "No attribute '%s' (%p) or no data (%p) in this attribute"
+
+#: ../lib/sheet.c:70 ../lib/sheet.c:85
+#, c-format
+msgid ""
+"DiaObject '%s' needed in sheet '%s' was not found.\n"
+"It will not be available for use."
+msgstr ""
+"DiaObject '%s' needed in sheet '%s' was not found.\n"
+"It will not be available for use."
 
-#: ../lib/widgets.c:408
+#: ../lib/sheet.c:315
+#, c-format
+msgid ""
+"The system sheet '%s' appears to be more recent than your custom\n"
+"version and has been loaded as '%s' for this session.\n"
+"\n"
+"Move new objects (if any) from '%s' into your custom sheet\n"
+"or remove '%s', using the 'Sheets and Objects' dialog."
+msgstr ""
+"The system sheet '%s' appears to be more recent than your custom\n"
+"version and has been loaded as '%s' for this session.\n"
+"\n"
+"Move new objects (if any) from '%s' into your custom sheet\n"
+"or remove '%s', using the 'Sheets and Objects' dialogue."
+
+#: ../lib/sheet.c:372
+#, c-format
+msgid "%s: you should use object tags rather than shape tags now"
+msgstr "%s: you should use object tags rather than shape tags now"
+
+#: ../lib/widgets.c:435
 msgid "Other fonts"
 msgstr "Other fonts"
 
-#: ../lib/widgets.c:480
+#: ../lib/widgets.c:507
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr "Couldn't find font family for %s\n"
 
 #. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:838
-#: ../objects/FS/function.c:1074
+#: ../lib/widgets.c:883 ../objects/FS/function.c:1079
 msgid "Solid"
 msgstr "Solid"
 
-#: ../lib/widgets.c:844
+#: ../lib/widgets.c:889
 msgid "Dashed"
 msgstr "Dashed"
 
-#: ../lib/widgets.c:850
+#: ../lib/widgets.c:895
 msgid "Dash-Dot"
 msgstr "Dash-Dot"
 
-#: ../lib/widgets.c:856
+#: ../lib/widgets.c:901
 msgid "Dash-Dot-Dot"
 msgstr "Dash-Dot-Dot"
 
-#: ../lib/widgets.c:862
+#: ../lib/widgets.c:907
 msgid "Dotted"
 msgstr "Dotted"
 
 #. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:881
+#: ../lib/widgets.c:925
 msgid "Dash length: "
 msgstr "Dash length: "
 
-#: ../lib/widgets.c:1006
+#: ../lib/widgets.c:1053
 msgid "Select color"
 msgstr "Select colour"
 
-#: ../lib/widgets.c:1072
+#: ../lib/widgets.c:1119
 msgid "More colors..."
-msgstr "More colours..."
+msgstr "More coloursâ?¦"
 
-#: ../lib/widgets.c:1220
+#: ../lib/widgets.c:1267
 msgid "More arrows"
 msgstr "More arrows"
 
-#: ../lib/widgets.c:1237
+#: ../lib/widgets.c:1284
 msgid "Size: "
 msgstr "Size: "
 
-#: ../lib/widgets.c:1390
+#: ../lib/widgets.c:1460
 msgid "Select image file"
 msgstr "Select image file"
 
-#: ../lib/widgets.c:1424
+#: ../lib/widgets.c:1508
 msgid "Browse"
 msgstr "Browse"
 
-#: ../lib/widgets.c:2063
+#: ../lib/widgets.c:2061
 msgid "Reset menu"
 msgstr "Reset menu"
 
+#. Installer message if no GTK+ was found
+#: ../installer/win32/gennsh.c:38
+msgid ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+msgstr ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+
+#. Installer message: Don't install over pre 0.95 versions
+#: ../installer/win32/gennsh.c:41
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+msgstr ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+
+#. Installer message:  License Page
+#: ../installer/win32/gennsh.c:44
+msgid "Next >"
+msgstr "Next"
+
+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
+#: ../installer/win32/gennsh.c:47
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
+msgstr ""
+"$(^Name) is released under the GPL licence. The licence is provided here for "
+"information purposes only. $_CLICK"
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:50
+msgid "Dia Diagram Editor (required)"
+msgstr "Dia Diagram Editor (required)"
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:53
+msgid "Translations"
+msgstr "Translations"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:56
+msgid "Optional translations of the Dia user interface"
+msgstr "Optional translations of the Dia user interface"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:59
+msgid "Core Dia files and dlls"
+msgstr "Core Dia files and DLLs"
+
+#. Installer message: Component name
+#: ../installer/win32/gennsh.c:62
+msgid "Python plug-in"
+msgstr "Python plugin"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:65
+msgid ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+msgstr ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+
+#. Installer message: hyperlink text on finish page
+#: ../installer/win32/gennsh.c:68
+msgid "Visit the Dia for Windows Web Page"
+msgstr "Visit the Dia for Windows Web Page"
+
+#. Installer message: Dia uninstaller entry in Control Panel
+#: ../installer/win32/gennsh.c:71
+msgid "Dia (remove only)"
+msgstr "Dia (remove only)"
+
+#. Installer message: confirmation question. Keep $\r
+#: ../installer/win32/gennsh.c:74
+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 ""
+"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."
+
+#. Installer message: confirmatin question. Keep $\r
+#: ../installer/win32/gennsh.c:77
+msgid ""
+"The installation directory you specified already exists. Any contents$\rwill "
+"be deleted. Would you like to continue?"
+msgstr ""
+"The installation directory you specified already exists. Any contents$\rwill "
+"be deleted. Would you like to continue?"
+
+#. Installer message: Uninstall Section Prompts. Keep $\r
+#: ../installer/win32/gennsh.c:80
+msgid ""
+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
+"another user installed this application."
+msgstr ""
+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
+"another user installed this application."
+
+#. Installer message: Uninstall error message
+#: ../installer/win32/gennsh.c:83
+msgid "You do not have permission to uninstall this application."
+msgstr "You do not have permission to uninstall this application."
+
+#. Installer message: Uninstallation warning. Keep $INSTDIR
+#: ../installer/win32/gennsh.c:86
+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
+msgstr "This will completely delete $INSTDIR and all subdirectories. Continue?"
+
+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
+#: ../installer/win32/gennsh.c:89
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+msgstr ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+
 #: ../objects/AADL/aadl.c:52
 msgid "Architecture Analysis & Design Language diagram objects"
 msgstr "Architecture Analysis & Design Language diagram objects"
 
-#: ../objects/AADL/aadlbox.c:138
+#: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
 msgstr "Declaration"
 
-#: ../objects/AADL/aadlbox.c:349
+#: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Provider"
 msgstr "Add Access Provider"
 
-#: ../objects/AADL/aadlbox.c:351
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add Access Requirer"
 msgstr "Add Access Requirer"
 
-#: ../objects/AADL/aadlbox.c:353
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Data Port"
 msgstr "Add In Data Port"
 
-#: ../objects/AADL/aadlbox.c:355
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Port"
 msgstr "Add In Event Port"
 
-#: ../objects/AADL/aadlbox.c:357
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add In Event Data Port"
 msgstr "Add In Event Data Port"
 
-#: ../objects/AADL/aadlbox.c:359
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Data Port"
 msgstr "Add Out Data Port"
 
-#: ../objects/AADL/aadlbox.c:361
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Port"
 msgstr "Add Out Event Port"
 
-#: ../objects/AADL/aadlbox.c:363
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add Out Event Data Port"
 msgstr "Add Out Event Data Port"
 
-#: ../objects/AADL/aadlbox.c:365
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Data Port"
 msgstr "Add In Out Data Port"
 
-#: ../objects/AADL/aadlbox.c:367
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Port"
 msgstr "Add In Out Event Port"
 
-#: ../objects/AADL/aadlbox.c:369
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add In Out Event Data Port"
 msgstr "Add In Out Event Data Port"
 
-#: ../objects/AADL/aadlbox.c:371
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Port Group"
 msgstr "Add Port Group"
 
-#: ../objects/AADL/aadlbox.c:373
+#: ../objects/AADL/aadlbox.c:382
 msgid "Add Connection Point"
 msgstr "Add Connection Point"
 
-#: ../objects/AADL/aadlbox.c:377
+#: ../objects/AADL/aadlbox.c:386
 msgid "Delete Port"
 msgstr "Delete Port"
 
-#: ../objects/AADL/aadlbox.c:378
+#: ../objects/AADL/aadlbox.c:387
 msgid "Edit Port Declaration"
 msgstr "Edit Port Declaration"
 
-#: ../objects/AADL/aadlbox.c:382
+#: ../objects/AADL/aadlbox.c:391
 msgid "Delete Connection Point"
 msgstr "Delete Connection Point"
 
-#: ../objects/ER/attribute.c:155
+#: ../objects/Database/compound.c:198
+msgid "Number of arms"
+msgstr "Number of arms"
+
+#: ../objects/Database/compound.c:221
+msgid "Flip arms verticaly"
+msgstr "Flip arms vertically"
+
+#: ../objects/Database/compound.c:223
+msgid "Flip arms horizontaly"
+msgstr "Flip arms horizontally"
+
+#: ../objects/Database/compound.c:225
+msgid "Center mount point verticaly"
+msgstr "Centre mount point vertically"
+
+#: ../objects/Database/compound.c:227
+msgid "Center mount point horizontaly"
+msgstr "Centre mount point horizontally"
+
+#: ../objects/Database/compound.c:229
+msgid "Center mount point"
+msgstr "Centre mount point"
+
+#: ../objects/Database/compound.c:234
+msgid "Compound"
+msgstr "Compound"
+
+#: ../objects/Database/database.c:39
+msgid "Entity/Relationship table diagram objects"
+msgstr "Entity/Relationship table diagram objects"
+
+#: ../objects/Database/table.c:143 ../objects/Database/table.c:184
+#: ../objects/Database/table.c:201 ../objects/UML/class.c:149
+#: ../objects/UML/class.c:192 ../objects/UML/class_dialog.c:595
+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
+msgid "Comment"
+msgstr "Comment"
+
+#: ../objects/Database/table.c:145
+msgid "Primary key"
+msgstr "Primary key"
+
+#: ../objects/Database/table.c:147
+msgid "Nullable"
+msgstr "Nullable"
+
+#: ../objects/Database/table.c:149
+msgid "Unique"
+msgstr "Unique"
+
+#: ../objects/Database/table.c:186
+msgid "Visible comments"
+msgstr "Visible comments"
+
+#: ../objects/Database/table.c:188 ../objects/UML/class.c:172
+msgid "Comment tagging"
+msgstr "Comment tagging"
+
+#: ../objects/Database/table.c:190 ../objects/Database/table_dialog.c:973
+msgid "Underline primary keys"
+msgstr "Underline primary keys"
+
+#: ../objects/Database/table.c:192 ../objects/Database/table_dialog.c:978
+msgid "Use bold font for primary keys"
+msgstr "Use bold font for primary keys"
+
+#. property rows
+#: ../objects/Database/table.c:197 ../objects/SADT/arrow.c:137
+#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:570
+msgid "Normal"
+msgstr "Normal"
+
+#: ../objects/Database/table.c:199
+msgid "Tablename"
+msgstr "Table name"
+
+#: ../objects/Database/table.c:204 ../objects/Database/table.c:206
+#: ../objects/Database/table.c:208 ../objects/Database/reference.c:120
+#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
+#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
+#: ../objects/UML/association.c:262 ../objects/UML/association.c:264
+#: ../objects/UML/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:212 ../objects/UML/class.c:212
+#: ../objects/UML/object.c:157
+msgid "Attributes"
+msgstr "Attributes"
+
+#: ../objects/Database/table.c:249 ../objects/UML/class.c:324
+msgid "Show comments"
+msgstr "Show comments"
+
+#. init data
+#: ../objects/Database/table.c:254 ../objects/Database/table.c:357
+#: ../sheets/Database.sheet.in.h:5
+msgid "Table"
+msgstr "Table"
+
+#. Attributes page:
+#: ../objects/Database/table_dialog.c:608 ../objects/UML/class_dialog.c:1081
+msgid "_Attributes"
+msgstr "_Attributes"
+
+#. the "new" button
+#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
+#: ../objects/SISSI/sissi_dialog.c:871
+msgid "_New"
+msgstr "_New"
+
+#. the "delete" button
+#: ../objects/Database/table_dialog.c:644
+msgid "_Delete"
+msgstr "_Delete"
+
+#. the "Move up" button
+#: ../objects/Database/table_dialog.c:652
+msgid "Move up"
+msgstr "Move up"
+
+#. the "Move down" button
+#: ../objects/Database/table_dialog.c:660
+msgid "Move down"
+msgstr "Move down"
+
+#: ../objects/Database/table_dialog.c:670 ../objects/UML/class_dialog.c:1138
+msgid "Attribute data"
+msgstr "Attribute data"
+
+#: ../objects/Database/table_dialog.c:680
+#: ../objects/Database/table_dialog.c:1043 ../objects/ER/attribute.c:155
+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
+#: ../objects/UML/class_dialog.c:1148 ../objects/UML/class_dialog.c:2014
+#: ../objects/UML/class_dialog.c:2250 ../objects/UML/class_dialog.c:2853
+#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
+#: ../objects/UML/realizes.c:134
+msgid "Name:"
+msgstr "Name:"
+
+#: ../objects/Database/table_dialog.c:692 ../objects/FS/flow-ortho.c:169
+#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:162
+#: ../objects/Jackson/phenomenon.c:146 ../objects/KAOS/metaandorrel.c:166
+#: ../objects/KAOS/metabinrel.c:173 ../objects/UML/class_dialog.c:1159
+#: ../objects/UML/class_dialog.c:2025 ../objects/UML/class_dialog.c:2261
+#: ../objects/UML/class_dialog.c:2864
+msgid "Type:"
+msgstr "Type:"
+
+#: ../objects/Database/table_dialog.c:704
+#: ../objects/Database/table_dialog.c:943
+#: ../objects/Database/table_dialog.c:1048 ../objects/UML/class_dialog.c:452
+#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
+#: ../objects/UML/class_dialog.c:2283
+msgid "Comment:"
+msgstr "Comment:"
+
+#: ../objects/Database/table_dialog.c:723
+msgid "_Primary key"
+msgstr "_Primary key"
+
+#: ../objects/Database/table_dialog.c:730
+msgid "N_ullable"
+msgstr "N_ullable"
+
+#: ../objects/Database/table_dialog.c:737
+msgid "Uni_que"
+msgstr "Uni_que"
+
+#: ../objects/Database/table_dialog.c:925
+msgid "_Table"
+msgstr "_Table"
+
+#: ../objects/Database/table_dialog.c:933
+msgid "Table name:"
+msgstr "Table name:"
+
+#. XXX create a handler and disable the 'show documentation tag' checkbox
+#. if 'comment visible' is not active.
+#: ../objects/Database/table_dialog.c:963
+msgid "Comment visible"
+msgstr "Comment visible"
+
+#: ../objects/Database/table_dialog.c:968 ../objects/UML/class_dialog.c:522
+msgid "Show documentation tag"
+msgstr "Show documentation tag"
+
+#. * Fonts and Colors selection *
+#: ../objects/Database/table_dialog.c:1007 ../objects/UML/class_dialog.c:551
+msgid "_Style"
+msgstr "_Style"
+
+#: ../objects/Database/table_dialog.c:1018
+msgid "Border width:"
+msgstr "Border width:"
+
+#. head line
+#: ../objects/Database/table_dialog.c:1031 ../objects/UML/class_dialog.c:561
+#: ../objects/UML/umlparameter.c:51
+msgid "Kind"
+msgstr "Kind"
+
+#: ../objects/Database/table_dialog.c:1035 ../objects/UML/class_dialog.c:566
+msgid "Size"
+msgstr "Size"
+
+#: ../objects/Database/table_dialog.c:1038
+msgid "Normal:"
+msgstr "Normal:"
+
+#: ../objects/Database/table_dialog.c:1059
+msgid "Text Color:"
+msgstr "Text Colour:"
+
+#: ../objects/Database/table_dialog.c:1067
+msgid "Foreground Color:"
+msgstr "Foreground Colour:"
+
+#. two chars at the beginning
+#: ../objects/Database/table_dialog.c:1380
+msgid "not null"
+msgstr "not null"
+
+#: ../objects/Database/table_dialog.c:1381
+msgid "null"
+msgstr "null"
+
+#: ../objects/Database/table_dialog.c:1382
+msgid "unique"
+msgstr "unique"
+
+#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:140
+#: ../objects/standard/zigzagline.c:136
+msgid "Corner radius"
+msgstr "Corner radius"
+
+#: ../objects/Database/reference.c:111
+msgid "Start description"
+msgstr "Start description"
+
+#: ../objects/Database/reference.c:113
+msgid "End description"
+msgstr "End description"
+
+#: ../objects/Database/reference.c:144 ../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:854
+#: ../objects/UML/component_feature.c:190 ../objects/UML/dependency.c:376
+#: ../objects/UML/generalization.c:372 ../objects/UML/realizes.c:363
+#: ../objects/UML/transition.c:172 ../objects/standard/zigzagline.c:385
+msgid "Add segment"
+msgstr "Add segment"
+
+#: ../objects/Database/reference.c:145 ../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:855
+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:377
+#: ../objects/UML/generalization.c:373 ../objects/UML/realizes.c:364
+#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:386
+msgid "Delete segment"
+msgstr "Delete segment"
+
+#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
+msgid "Reference"
+msgstr "Reference"
+
+#: ../objects/ER/attribute.c:157
 msgid "Key:"
 msgstr "Key:"
 
-#: ../objects/ER/attribute.c:157
+#: ../objects/ER/attribute.c:159
 msgid "Weak key:"
 msgstr "Weak key:"
 
-#: ../objects/ER/attribute.c:159
+#: ../objects/ER/attribute.c:161
 msgid "Derived:"
 msgstr "Derived:"
 
-#: ../objects/ER/attribute.c:161
+#: ../objects/ER/attribute.c:163
 msgid "Multivalue:"
 msgstr "Multivalue:"
 
-#: ../objects/ER/attribute.c:434
-#: ../sheets/ER.sheet.in.h:1
+#: ../objects/ER/attribute.c:436 ../sheets/ER.sheet.in.h:1
 msgid "Attribute"
 msgstr "Attribute"
 
-#: ../objects/ER/entity.c:137
+#: ../objects/ER/entity.c:139
 msgid "Weak:"
 msgstr "Weak:"
 
-#: ../objects/ER/entity.c:139
+#: ../objects/ER/entity.c:141
 msgid "Associative:"
 msgstr "Associative:"
 
-#: ../objects/ER/entity.c:413
-#: ../objects/UML/classicon.c:129
+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
 #: ../sheets/ER.sheet.in.h:4
 msgid "Entity"
 msgstr "Entity"
@@ -2733,74 +3185,41 @@ msgstr "Entity"
 msgid "Entity/Relationship diagram objects"
 msgstr "Entity/Relationship diagram objects"
 
-#: ../objects/ER/participation.c:116
+#: ../objects/ER/participation.c:118
 msgid "Total:"
 msgstr "Total:"
 
-#: ../objects/ER/participation.c:406
-#: ../objects/FS/flow-ortho.c:622
-#: ../objects/GRAFCET/vector.c:312
-#: ../objects/SADT/arrow.c:457
-#: ../objects/UML/association.c:769
-#: ../objects/UML/component_feature.c:184
-#: ../objects/UML/dependency.c:374
-#: ../objects/UML/generalization.c:370
-#: ../objects/UML/realizes.c:361
-#: ../objects/UML/transition.c:161
-#: ../objects/standard/zigzagline.c:348
-msgid "Add segment"
-msgstr "Add segment"
-
-#: ../objects/ER/participation.c:407
-#: ../objects/FS/flow-ortho.c:623
-#: ../objects/GRAFCET/vector.c:313
-#: ../objects/SADT/arrow.c:458
-#: ../objects/UML/association.c:770
-#: ../objects/UML/component_feature.c:185
-#: ../objects/UML/dependency.c:375
-#: ../objects/UML/generalization.c:371
-#: ../objects/UML/realizes.c:362
-#: ../objects/UML/transition.c:162
-#: ../objects/standard/zigzagline.c:349
-msgid "Delete segment"
-msgstr "Delete segment"
-
-#: ../objects/ER/relationship.c:142
+#: ../objects/ER/relationship.c:144
 msgid "Left Cardinality:"
 msgstr "Left Cardinality:"
 
-#: ../objects/ER/relationship.c:144
+#: ../objects/ER/relationship.c:146
 msgid "Right Cardinality:"
 msgstr "Right Cardinality:"
 
-#: ../objects/ER/relationship.c:146
+#: ../objects/ER/relationship.c:148
 msgid "Rotate:"
 msgstr "Rotate:"
 
-#: ../objects/ER/relationship.c:148
+#: ../objects/ER/relationship.c:150
 msgid "Identifying:"
 msgstr "Identifying:"
 
-#: ../objects/ER/relationship.c:457
-#: ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:459 ../sheets/ER.sheet.in.h:6
 msgid "Relationship"
 msgstr "Relationship"
 
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:158
-#: ../objects/FS/flow-ortho.c:619
-#: ../objects/FS/flow.c:135
-#: ../objects/FS/flow.c:571
-#: ../objects/FS/function.c:1096
+#: ../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
 msgid "Energy"
 msgstr "Energy"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:159
-#: ../objects/FS/flow-ortho.c:620
-#: ../objects/FS/flow.c:136
-#: ../objects/FS/flow.c:572
-#: ../objects/FS/function.c:1072
+#: ../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
 msgid "Material"
 msgstr "Material"
 
@@ -2808,14 +3227,10 @@ msgstr "Material"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:160
-#: ../objects/FS/flow-ortho.c:621
-#: ../objects/FS/flow.c:137
-#: ../objects/FS/flow.c:573
-#: ../objects/FS/function.c:1034
-#: ../objects/FS/function.c:1036
-#: ../objects/FS/function.c:1172
-#: ../objects/FS/function.c:1174
+#: ../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
 msgid "Signal"
 msgstr "Signal"
 
@@ -2823,355 +3238,318 @@ msgstr "Signal"
 msgid "Function structure diagram objects"
 msgstr "Function structure diagram objects"
 
-#: ../objects/FS/function.c:142
+#: ../objects/FS/function.c:144
 msgid "Wish function"
 msgstr "Wish function"
 
-#: ../objects/FS/function.c:144
+#: ../objects/FS/function.c:146
 msgid "User function"
 msgstr "User function"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:676
+#: ../objects/FS/function.c:681
 msgid "Verb"
 msgstr "Verb"
 
 #. Translators: Menu item Verb/Channel
 #. Translators: Menu item Verb/Channel/Channel
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-#: ../objects/FS/function.c:678
-#: ../objects/FS/function.c:680
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:683 ../objects/FS/function.c:685
+#: ../objects/FS/function.c:725
 msgid "Channel"
 msgstr "Channel"
 
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:682
-#: ../objects/FS/function.c:684
+#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
 msgid "Import"
 msgstr "Import"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:686
-#: ../objects/KAOS/metabinrel.c:163
+#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
 msgid "Input"
 msgstr "Input"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:688
+#: ../objects/FS/function.c:693
 msgid "Receive"
 msgstr "Receive"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:690
-#: ../objects/FS/function.c:962
+#: ../objects/FS/function.c:695 ../objects/FS/function.c:967
 msgid "Allow"
 msgstr "Allow"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:692
+#: ../objects/FS/function.c:697
 msgid "Form Entrance"
 msgstr "Form Entrance"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:694
-#: ../objects/FS/function.c:928
+#: ../objects/FS/function.c:699 ../objects/FS/function.c:933
 msgid "Capture"
 msgstr "Capture"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:700
+#: ../objects/FS/function.c:705
 msgid "Discharge"
 msgstr "Discharge"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:702
+#: ../objects/FS/function.c:707
 msgid "Eject"
 msgstr "Eject"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:709
 msgid "Dispose"
 msgstr "Dispose"
 
 #. 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:708
-#: ../objects/FS/function.c:710
-#: ../objects/FS/function.c:728
+#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
+#: ../objects/FS/function.c:733
 msgid "Transfer"
 msgstr "Transfer"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:712
-#: ../objects/FS/function.c:714
+#: ../objects/FS/function.c:717 ../objects/FS/function.c:719
 msgid "Transport"
 msgstr "Transport"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:716
+#: ../objects/FS/function.c:721
 msgid "Lift"
 msgstr "Lift"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:718
+#: ../objects/FS/function.c:723
 msgid "Move"
 msgstr "Move"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:722
-#: ../objects/FS/function.c:724
+#: ../objects/FS/function.c:727 ../objects/FS/function.c:729
 msgid "Transmit"
 msgstr "Transmit"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:726
+#: ../objects/FS/function.c:731
 msgid "Conduct"
 msgstr "Conduct"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:735
 msgid "Convey"
 msgstr "Convey"
 
 #. 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:732
-#: ../objects/FS/function.c:734
-#: ../objects/FS/function.c:736
+#: ../objects/FS/function.c:737 ../objects/FS/function.c:739
+#: ../objects/FS/function.c:741
 msgid "Guide"
 msgstr "Guide"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:738
+#: ../objects/FS/function.c:743
 msgid "Direct"
 msgstr "Direct"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:745
 msgid "Straighten"
 msgstr "Straighten"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:747
 msgid "Steer"
 msgstr "Steer"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:749
 msgid "Translate"
 msgstr "Translate"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:746
-#: ../objects/FS/function.c:748
+#: ../objects/FS/function.c:751 ../objects/FS/function.c:753
 msgid "Rotate"
 msgstr "Rotate"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:750
+#: ../objects/FS/function.c:755
 msgid "Turn"
 msgstr "Turn"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:752
+#: ../objects/FS/function.c:757
 msgid "Spin"
 msgstr "Spin"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:754
-#: ../objects/FS/function.c:756
+#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
 msgid "Allow DOF"
 msgstr "Allow DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:758
+#: ../objects/FS/function.c:763
 msgid "Constrain"
 msgstr "Constrain"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:760
+#: ../objects/FS/function.c:765
 msgid "Unlock"
 msgstr "Unlock"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:762
-#: ../objects/FS/function.c:764
+#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
 msgid "Support"
 msgstr "Support"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:766
-#: ../objects/FS/function.c:768
+#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
 #: ../sheets/SDL.sheet.in.h:19
 msgid "Stop"
 msgstr "Stop"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:770
+#: ../objects/FS/function.c:775
 msgid "Insulate"
 msgstr "Insulate"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:772
+#: ../objects/FS/function.c:777
 msgid "Protect"
 msgstr "Protect"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:774
-#: ../objects/FS/function.c:964
+#: ../objects/FS/function.c:779 ../objects/FS/function.c:969
 msgid "Prevent"
 msgstr "Prevent"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:776
+#: ../objects/FS/function.c:781
 msgid "Shield"
 msgstr "Shield"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:778
+#: ../objects/FS/function.c:783
 msgid "Inhibit"
 msgstr "Inhibit"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:780
-#: ../objects/FS/function.c:782
+#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
 msgid "Stabilize"
 msgstr "Stabilise"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:784
+#: ../objects/FS/function.c:789
 msgid "Steady"
 msgstr "Steady"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:786
-#: ../objects/FS/function.c:788
+#: ../objects/FS/function.c:791 ../objects/FS/function.c:793
 msgid "Secure"
 msgstr "Secure"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:790
-#: ../objects/FS/function.c:822
+#: ../objects/FS/function.c:795 ../objects/FS/function.c:827
 msgid "Attach"
 msgstr "Attach"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:792
+#: ../objects/FS/function.c:797
 msgid "Mount"
 msgstr "Mount"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:794
-#: ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:19
 msgid "Lock"
 msgstr "Lock"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:796
+#: ../objects/FS/function.c:801
 msgid "Fasten"
 msgstr "Fasten"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:798
+#: ../objects/FS/function.c:803
 msgid "Hold"
 msgstr "Hold"
 
-#. Translators: Menu item Verb/Support/Position
-#. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:800
-#: ../objects/FS/function.c:802
-#: ../objects/Istar/actor.c:70
-msgid "Position"
-msgstr "Position"
-
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:804
+#: ../objects/FS/function.c:809
 msgid "Orient"
 msgstr "Orient"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../objects/FS/function.c:808
-#: ../objects/FS/function.c:1050
-msgid "Locate"
-msgstr "Locate"
-
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:810
-#: ../objects/FS/function.c:812
+#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
 msgid "Connect"
 msgstr "Connect"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:814
-#: ../objects/FS/function.c:816
+#: ../objects/FS/function.c:819 ../objects/FS/function.c:821
 msgid "Couple"
 msgstr "Couple"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:818
+#: ../objects/FS/function.c:823
 msgid "Join"
 msgstr "Join"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:820
+#: ../objects/FS/function.c:825
 msgid "Assemble"
 msgstr "Assemble"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:824
-#: ../objects/FS/function.c:826
+#: ../objects/FS/function.c:829 ../objects/FS/function.c:831
 msgid "Mix"
 msgstr "Mix"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:828
+#: ../objects/FS/function.c:833
 msgid "Combine"
 msgstr "Combine"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:830
+#: ../objects/FS/function.c:835
 msgid "Blend"
 msgstr "Blend"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:837
 msgid "Add"
 msgstr "Add"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:839
 msgid "Pack"
 msgstr "Pack"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:841
 msgid "Coalesce"
 msgstr "Coalesce"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:838
-#: ../objects/FS/function.c:840
+#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
 #: ../sheets/UML.sheet.in.h:5
 msgid "Branch"
 msgstr "Branch"
@@ -3179,756 +3557,732 @@ msgstr "Branch"
 #. 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:842
-#: ../objects/FS/function.c:844
-#: ../objects/FS/function.c:846
+#: ../objects/FS/function.c:847 ../objects/FS/function.c:849
+#: ../objects/FS/function.c:851
 msgid "Separate"
 msgstr "Separate"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:848
+#: ../objects/FS/function.c:853
 msgid "Switch"
 msgstr "Switch"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:855
 msgid "Divide"
 msgstr "Divide"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:857
 msgid "Release"
 msgstr "Release"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:859
 msgid "Detach"
 msgstr "Detach"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:861
 msgid "Disconnect"
 msgstr "Disconnect"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:862
+#: ../objects/FS/function.c:867
 msgid "Cut"
 msgstr "Cut"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:864
+#: ../objects/FS/function.c:869
 msgid "Polish"
 msgstr "Polish"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:871
 msgid "Sand"
 msgstr "Sand"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:873
 msgid "Drill"
 msgstr "Drill"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:875
 msgid "Lathe"
 msgstr "Lathe"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:872
-#: ../objects/FS/function.c:874
+#: ../objects/FS/function.c:877 ../objects/FS/function.c:879
 msgid "Refine"
 msgstr "Refine"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:876
+#: ../objects/FS/function.c:881
 msgid "Purify"
 msgstr "Purify"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:878
+#: ../objects/FS/function.c:883
 msgid "Strain"
 msgstr "Strain"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:885
 msgid "Filter"
 msgstr "Filter"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:887
 msgid "Percolate"
 msgstr "Percolate"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:889
 msgid "Clear"
 msgstr "Clear"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:886
-#: ../objects/FS/function.c:888
+#: ../objects/FS/function.c:891 ../objects/FS/function.c:893
 msgid "Distribute"
 msgstr "Distribute"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:890
+#: ../objects/FS/function.c:895
 msgid "Diverge"
 msgstr "Diverge"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:892
+#: ../objects/FS/function.c:897
 msgid "Scatter"
 msgstr "Scatter"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:899
 msgid "Disperse"
 msgstr "Disperse"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:896
-#: ../objects/FS/function.c:910
+#: ../objects/FS/function.c:901 ../objects/FS/function.c:915
 msgid "Diffuse"
 msgstr "Diffuse"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:898
+#: ../objects/FS/function.c:903
 msgid "Empty"
 msgstr "Empty"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:900
-#: ../objects/FS/function.c:902
+#: ../objects/FS/function.c:905 ../objects/FS/function.c:907
 msgid "Dissipate"
 msgstr "Dissipate"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:904
+#: ../objects/FS/function.c:909
 msgid "Absorb"
 msgstr "Absorb"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:906
+#: ../objects/FS/function.c:911
 msgid "Dampen"
 msgstr "Dampen"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:913
 msgid "Dispel"
 msgstr "Dispel"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:912
+#: ../objects/FS/function.c:917
 msgid "Resist"
 msgstr "Resist"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:914
-#: ../objects/FS/function.c:916
+#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
 msgid "Provision"
 msgstr "Provision"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:918
-#: ../objects/FS/function.c:920
+#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
 msgid "Store"
 msgstr "Store"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:922
+#: ../objects/FS/function.c:927
 msgid "Contain"
 msgstr "Contain"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:924
+#: ../objects/FS/function.c:929
 msgid "Collect"
 msgstr "Collect"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:931
 msgid "Reserve"
 msgstr "Reserve"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:930
-#: ../objects/FS/function.c:932
+#: ../objects/FS/function.c:935 ../objects/FS/function.c:937
 msgid "Supply"
 msgstr "Supply"
 
 #. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:934
+#: ../objects/FS/function.c:939
 msgid "Fill"
 msgstr "Fill"
 
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:936
+#: ../objects/FS/function.c:941
 msgid "Provide"
 msgstr "Provide"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:938
+#: ../objects/FS/function.c:943
 msgid "Replenish"
 msgstr "Replenish"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:945
 msgid "Expose"
 msgstr "Expose"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:942
-#: ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:9
 msgid "Extract"
 msgstr "Extract"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:944
-#: ../objects/FS/function.c:946
+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
 msgid "Control Magnitude"
 msgstr "Control Magnitude"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:948
-#: ../objects/FS/function.c:950
+#: ../objects/FS/function.c:953 ../objects/FS/function.c:955
 msgid "Actuate"
 msgstr "Actuate"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:952
+#: ../objects/FS/function.c:957
 msgid "Start"
 msgstr "Start"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:954
+#: ../objects/FS/function.c:959
 msgid "Initiate"
 msgstr "Initiate"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:956
-#: ../objects/FS/function.c:958
+#: ../objects/FS/function.c:961 ../objects/FS/function.c:963
 msgid "Regulate"
 msgstr "Regulate"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:960
-#: ../objects/FS/function.c:1178
-#: ../objects/UML/classicon.c:127
+#: ../objects/FS/function.c:965 ../objects/FS/function.c:1183
+#: ../objects/UML/classicon.c:129
 msgid "Control"
 msgstr "Control"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:966
+#: ../objects/FS/function.c:971
 msgid "Enable"
 msgstr "Enable"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:968
+#: ../objects/FS/function.c:973
 msgid "Disable"
 msgstr "Disable"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:975
 msgid "Limit"
 msgstr "Limit"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:977
 msgid "Interrupt"
 msgstr "Interrupt"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:974
-#: ../objects/FS/function.c:976
+#: ../objects/FS/function.c:979 ../objects/FS/function.c:981
 msgid "Change"
 msgstr "Change"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:978
+#: ../objects/FS/function.c:983
 msgid "Increase"
 msgstr "Increase"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:980
+#: ../objects/FS/function.c:985
 msgid "Decrease"
 msgstr "Decrease"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:987
 msgid "Amplify"
 msgstr "Amplify"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:989
 msgid "Reduce"
 msgstr "Reduce"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:988
+#: ../objects/FS/function.c:993
 msgid "Normalize"
 msgstr "Normalise"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:990
+#: ../objects/FS/function.c:995
 msgid "Multiply"
 msgstr "Multiply"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
-#: ../objects/FS/function.c:992
+#. FIXME: mark read-only
+#: ../objects/FS/function.c:997 ../objects/Misc/measure.c:186
 msgid "Scale"
 msgstr "Scale"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:994
+#: ../objects/FS/function.c:999
 msgid "Rectify"
 msgstr "Rectify"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:996
+#: ../objects/FS/function.c:1001
 msgid "Adjust"
 msgstr "Adjust"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:998
-#: ../objects/FS/function.c:1000
+#: ../objects/FS/function.c:1003 ../objects/FS/function.c:1005
 msgid "Form"
 msgstr "Form"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1002
+#: ../objects/FS/function.c:1007
 msgid "Compact"
 msgstr "Compact"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:1009
 msgid "Crush"
 msgstr "Crush"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:1011
 msgid "Shape"
 msgstr "Shape"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:1013
 msgid "Compress"
 msgstr "Compress"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1015
 msgid "Pierce"
 msgstr "Pierce"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1012
-#: ../objects/FS/function.c:1014
+#: ../objects/FS/function.c:1017 ../objects/FS/function.c:1019
 msgid "Convert"
 msgstr "Convert"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1016
+#: ../objects/FS/function.c:1021
 msgid "Transform"
 msgstr "Transform"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1023
 msgid "Liquefy"
 msgstr "Liquefy"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1025
 msgid "Solidify"
 msgstr "Solidify"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1027
 msgid "Evaporate"
 msgstr "Evaporate"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1029
 msgid "Sublimate"
 msgstr "Sublimate"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1031
 msgid "Condense"
 msgstr "Condense"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1033
 msgid "Integrate"
 msgstr "Integrate"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1035
 msgid "Differentiate"
 msgstr "Differentiate"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1032
-#: ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1037 ../sheets/AADL.sheet.in.h:8
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
 msgstr "Process"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1038
-#: ../objects/FS/function.c:1040
+#: ../objects/FS/function.c:1043 ../objects/FS/function.c:1045
 msgid "Sense"
 msgstr "Sense"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1042
+#: ../objects/FS/function.c:1047
 msgid "Perceive"
 msgstr "Perceive"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1049
 msgid "Recognize"
 msgstr "Recognise"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1051
 msgid "Discern"
 msgstr "Discern"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1053
 msgid "Check"
 msgstr "Check"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1052
+#: ../objects/FS/function.c:1057
 msgid "Verify"
 msgstr "Verify"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1054
-#: ../objects/FS/function.c:1056
+#: ../objects/FS/function.c:1059 ../objects/FS/function.c:1061
 msgid "Indicate"
 msgstr "Indicate"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1058
+#: ../objects/FS/function.c:1063
 msgid "Mark"
 msgstr "Mark"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1060
-#: ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "Display"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1062
-#: ../objects/FS/function.c:1064
+#: ../objects/FS/function.c:1067 ../objects/FS/function.c:1069
 msgid "Measure"
 msgstr "Measure"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1066
+#: ../objects/FS/function.c:1071
 msgid "Calculate"
 msgstr "Calculate"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1073
 msgid "Represent"
 msgstr "Represent"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1075
 msgid "Noun"
 msgstr "Noun"
 
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1076
+#: ../objects/FS/function.c:1081
 msgid "Liquid"
 msgstr "Liquid"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1083
 msgid "Gas"
 msgstr "Gas"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1080
-#: ../objects/FS/function.c:1082
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1085 ../objects/FS/function.c:1087
+#: ../objects/FS/function.c:1171
 msgid "Human"
 msgstr "Human"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1084
+#: ../objects/FS/function.c:1089
 msgid "Hand"
 msgstr "Hand"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1086
+#: ../objects/FS/function.c:1091
 msgid "Foot"
 msgstr "Foot"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1093
 msgid "Head"
 msgstr "Head"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1095
 msgid "Finger"
 msgstr "Finger"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1097
 msgid "Toe"
 msgstr "Toe"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1099
 msgid "Biological"
 msgstr "Biological"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1098
+#: ../objects/FS/function.c:1103
 msgid "Mechanical"
 msgstr "Mechanical"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1100
+#: ../objects/FS/function.c:1105
 msgid "Mech. Energy"
 msgstr "Mech. Energy"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1107
 msgid "Translation"
 msgstr "Translation"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1109
 msgid "Force"
 msgstr "Force"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
 msgid "Rotation"
 msgstr "Rotation"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1108
+#: ../objects/FS/function.c:1113
 msgid "Torque"
 msgstr "Torque"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1110
+#: ../objects/FS/function.c:1115
 msgid "Random Motion"
 msgstr "Random Motion"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1117
 msgid "Vibration"
 msgstr "Vibration"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1119
 msgid "Rotational Energy"
 msgstr "Rotational Energy"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1121
 msgid "Translational Energy"
 msgstr "Translational Energy"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1123
 msgid "Electrical"
 msgstr "Electrical"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1125
 msgid "Electricity"
 msgstr "Electricity"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1127
 msgid "Voltage"
 msgstr "Voltage"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1129
 msgid "Current"
 msgstr "Current"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1131
 msgid "Hydraulic"
 msgstr "Hydraulic"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1133
 msgid "Pressure"
 msgstr "Pressure"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1135
 msgid "Volumetric Flow"
 msgstr "Volumetric Flow"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1137
 msgid "Thermal"
 msgstr "Thermal"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1139
 msgid "Heat"
 msgstr "Heat"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1141
 msgid "Conduction"
 msgstr "Conduction"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1143
 msgid "Convection"
 msgstr "Convection"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1140
-#: ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1145 ../objects/FS/function.c:1153
 msgid "Radiation"
 msgstr "Radiation"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1142
+#: ../objects/FS/function.c:1147
 msgid "Pneumatic"
 msgstr "Pneumatic"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1144
+#: ../objects/FS/function.c:1149
 msgid "Chemical"
 msgstr "Chemical"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1151
 msgid "Radioactive"
 msgstr "Radioactive"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1155
 msgid "Microwaves"
 msgstr "Microwaves"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1157
 msgid "Radio waves"
 msgstr "Radio waves"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1159
 msgid "X-Rays"
 msgstr "X-Rays"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1161
 msgid "Gamma Rays"
 msgstr "Gamma Rays"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1163
 msgid "Acoustic Energy"
 msgstr "Acoustic Energy"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1165
 msgid "Optical Energy"
 msgstr "Optical Energy"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1167
 msgid "Solar Energy"
 msgstr "Solar Energy"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1169
 msgid "Magnetic Energy"
 msgstr "Magnetic Energy"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1173
 msgid "Human Motion"
 msgstr "Human Motion"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1175
 msgid "Human Force"
 msgstr "Human Force"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1176
+#: ../objects/FS/function.c:1181
 msgid "Status"
 msgstr "Status"
 
-#: ../objects/FS/function.c:1180
+#: ../objects/FS/function.c:1185
 msgid "User/Device Fn"
 msgstr "User/Device Fn"
 
-#: ../objects/FS/function.c:1181
+#: ../objects/FS/function.c:1186
 msgid "Wish Fn"
 msgstr "Wish Fn"
 
-#: ../objects/GRAFCET/action.c:135
-#: ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:137 ../sheets/SDL.sheet.in.h:9
 msgid "Macro call"
 msgstr "Macro call"
 
-#: ../objects/GRAFCET/action.c:135
+#: ../objects/GRAFCET/action.c:137
 msgid "This action is a call to a macro-step"
 msgstr "This action is a call to a macro-step"
 
-#: ../objects/GRAFCET/condition.c:130
+#: ../objects/GRAFCET/condition.c:132
 msgid "Condition"
 msgstr "Condition"
 
-#: ../objects/GRAFCET/condition.c:130
+#: ../objects/GRAFCET/condition.c:132
 msgid "The boolean equation of the condition"
 msgstr "The boolean equation of the condition"
 
-#: ../objects/GRAFCET/condition.c:132
+#: ../objects/GRAFCET/condition.c:134
 msgid "The condition's font"
 msgstr "The condition's font"
 
-#: ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/condition.c:136
 msgid "The condition's font size"
 msgstr "The condition's font size"
 
-#: ../objects/GRAFCET/condition.c:137
-#: ../objects/GRAFCET/transition.c:147
+#: ../objects/GRAFCET/condition.c:139 ../objects/GRAFCET/transition.c:149
 msgid "Color"
 msgstr "Colour"
 
-#: ../objects/GRAFCET/condition.c:137
+#: ../objects/GRAFCET/condition.c:139
 msgid "The condition's color"
 msgstr "The condition's colour"
 
@@ -3936,149 +4290,138 @@ msgstr "The condition's colour"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET diagram objects"
 
-#: ../objects/GRAFCET/step.c:146
-#: ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:13
 msgid "Regular step"
 msgstr "Regular step"
 
-#: ../objects/GRAFCET/step.c:147
-#: ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Initial step"
 msgstr "Initial step"
 
-#: ../objects/GRAFCET/step.c:148
-#: ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:8
 msgid "Macro entry step"
 msgstr "Macro entry step"
 
-#: ../objects/GRAFCET/step.c:149
-#: ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:9
 msgid "Macro exit step"
 msgstr "Macro exit step"
 
-#: ../objects/GRAFCET/step.c:150
-#: ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:152 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "Macro call step"
 
-#: ../objects/GRAFCET/step.c:151
+#: ../objects/GRAFCET/step.c:153
 msgid "Subprogram call step"
 msgstr "Subprogram call step"
 
-#: ../objects/GRAFCET/step.c:158
+#: ../objects/GRAFCET/step.c:160
 msgid "Step name"
 msgstr "Step name"
 
-#: ../objects/GRAFCET/step.c:158
+#: ../objects/GRAFCET/step.c:160
 msgid "The name of the step"
 msgstr "The name of the step"
 
-#: ../objects/GRAFCET/step.c:161
+#: ../objects/GRAFCET/step.c:163
 msgid "Step type"
 msgstr "Step type"
 
-#: ../objects/GRAFCET/step.c:161
+#: ../objects/GRAFCET/step.c:163
 msgid "The kind of step"
 msgstr "The kind of step"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:165
 msgid "Active"
 msgstr "Active"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:165
 msgid "Shows a red dot to figure the step's activity"
 msgstr "Shows a red dot to figure the step's activity"
 
-#: ../objects/GRAFCET/transition.c:140
+#: ../objects/GRAFCET/transition.c:142
 msgid "Receptivity"
 msgstr "Receptivity"
 
-#: ../objects/GRAFCET/transition.c:140
+#: ../objects/GRAFCET/transition.c:142
 msgid "The boolean equation of the receptivity"
 msgstr "The boolean equation of the receptivity"
 
-#: ../objects/GRAFCET/transition.c:142
+#: ../objects/GRAFCET/transition.c:144
 msgid "The receptivity's font"
 msgstr "The receptivity's font"
 
-#: ../objects/GRAFCET/transition.c:144
+#: ../objects/GRAFCET/transition.c:146
 msgid "The receptivity's font size"
 msgstr "The receptivity's font size"
 
-#: ../objects/GRAFCET/transition.c:147
+#: ../objects/GRAFCET/transition.c:149
 msgid "The receptivity's color"
 msgstr "The receptivity's colour"
 
-#: ../objects/GRAFCET/transition.c:148
+#: ../objects/GRAFCET/transition.c:150
 msgid "North point"
 msgstr "North point"
 
-#: ../objects/GRAFCET/transition.c:149
+#: ../objects/GRAFCET/transition.c:151
 msgid "South point"
 msgstr "South point"
 
-#: ../objects/GRAFCET/vector.c:129
+#: ../objects/GRAFCET/vector.c:131
 msgid "Draw arrow heads on upward arcs:"
 msgstr "Draw arrow heads on upward arcs:"
 
-#: ../objects/GRAFCET/vergent.c:122
+#: ../objects/GRAFCET/vergent.c:124
 msgid "OR"
 msgstr "OR"
 
-#: ../objects/GRAFCET/vergent.c:123
+#: ../objects/GRAFCET/vergent.c:125
 msgid "AND"
 msgstr "AND"
 
-#: ../objects/GRAFCET/vergent.c:134
+#: ../objects/GRAFCET/vergent.c:136
 msgid "Vergent type:"
 msgstr "Vergent type:"
 
-#: ../objects/GRAFCET/vergent.c:405
-#: ../objects/Istar/other.c:469
-#: ../objects/Jackson/domain.c:531
-#: ../objects/KAOS/goal.c:572
-#: ../objects/KAOS/other.c:525
-#: ../objects/SADT/box.c:447
-#: ../objects/standard/line.c:219
+#: ../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
 msgid "Add connection point"
 msgstr "Add connection point"
 
-#: ../objects/GRAFCET/vergent.c:406
-msgid "Delete  connection point"
-msgstr "Delete  connection point"
+#: ../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
+msgid "Delete connection point"
+msgstr "Delete connection point"
 
-#: ../objects/GRAFCET/vergent.c:410
+#: ../objects/GRAFCET/vergent.c:412
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET OR/AND vergent"
 
-#: ../objects/Istar/actor.c:68
-#: ../objects/Istar/link.c:152
+#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:150
 msgid "Unspecified"
 msgstr "Unspecified"
 
-#: ../objects/Istar/actor.c:69
-#: ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
 msgid "Agent"
 msgstr "Agent"
 
-#: ../objects/Istar/actor.c:71
+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
 msgid "Role"
 msgstr "Role"
 
-#: ../objects/Istar/goal.c:76
-#: ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
 msgid "Softgoal"
 msgstr "Softgoal"
 
-#: ../objects/Istar/goal.c:77
-#: ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
 msgid "Goal"
 msgstr "Goal"
 
-#: ../objects/Istar/goal.c:154
-#: ../objects/Istar/goal.c:155
-#: ../objects/KAOS/goal.c:157
-#: ../objects/KAOS/goal.c:158
+#: ../objects/Istar/goal.c:156 ../objects/Istar/goal.c:157
+#: ../objects/KAOS/goal.c:159 ../objects/KAOS/goal.c:160
 msgid "Goal Type"
 msgstr "Goal Type"
 
@@ -4086,24 +4429,23 @@ msgstr "Goal Type"
 msgid "Istar diagram"
 msgstr "Istar diagram"
 
-#: ../objects/Istar/link.c:153
-msgid "Positive Contrib"
-msgstr "Positive Contrib"
+#: ../objects/Istar/link.c:151
+msgid "Positive contrib"
+msgstr "Positive contrib"
 
-#: ../objects/Istar/link.c:154
+#: ../objects/Istar/link.c:152
 msgid "Negative contrib"
 msgstr "Negative contrib"
 
-#: ../objects/Istar/link.c:155
-#: ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:153 ../sheets/UML.sheet.in.h:10
 msgid "Dependency"
 msgstr "Dependency"
 
-#: ../objects/Istar/link.c:156
+#: ../objects/Istar/link.c:154
 msgid "Decomposition"
 msgstr "Decomposition"
 
-#: ../objects/Istar/link.c:157
+#: ../objects/Istar/link.c:155
 msgid "Means-Ends"
 msgstr "Means-Ends"
 
@@ -4111,21 +4453,11 @@ msgstr "Means-Ends"
 msgid "Resource"
 msgstr "Resource"
 
-#: ../objects/Istar/other.c:74
-#: ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
 msgid "Task"
 msgstr "Task"
 
-#: ../objects/Istar/other.c:470
-#: ../objects/Jackson/domain.c:532
-#: ../objects/KAOS/goal.c:573
-#: ../objects/KAOS/other.c:526
-#: ../objects/SADT/box.c:448
-#: ../objects/standard/line.c:220
-msgid "Delete connection point"
-msgstr "Delete connection point"
-
-#: ../objects/Istar/other.c:475
+#: ../objects/Istar/other.c:477
 msgid "i* other"
 msgstr "i* other"
 
@@ -4153,20 +4485,19 @@ msgstr "Biddable"
 msgid "Lexical"
 msgstr "Lexical"
 
-#: ../objects/Jackson/domain.c:176
-#: ../objects/Jackson/domain.c:177
+#: ../objects/Jackson/domain.c:178 ../objects/Jackson/domain.c:179
 msgid "Domain Type"
 msgstr "Domain Type"
 
-#: ../objects/Jackson/domain.c:181
+#: ../objects/Jackson/domain.c:183
 msgid "Domain Kind"
 msgstr "Domain Kind"
 
-#: ../objects/Jackson/domain.c:182
+#: ../objects/Jackson/domain.c:184
 msgid "Optional kind which appears in the lower right corner of the Domain"
-msgstr "Optional kind which appears in the lower right corner of the Domain"
+msgstr "Optional kind which appears in the lower-right corner of the Domain"
 
-#: ../objects/Jackson/domain.c:537
+#: ../objects/Jackson/domain.c:539
 msgid "Jackson domain"
 msgstr "Jackson domain"
 
@@ -4174,17 +4505,18 @@ msgstr "Jackson domain"
 msgid "Jackson diagram"
 msgstr "Jackson diagram"
 
-#: ../objects/Jackson/phenomenon.c:134
+#: ../objects/Jackson/phenomenon.c:136
 msgid "Shared"
 msgstr "Shared"
 
-#: ../objects/Jackson/phenomenon.c:135
-#: ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:137 ../objects/KAOS/goal.c:81
 msgid "Requirement"
 msgstr "Requirement"
 
-#: ../objects/Jackson/phenomenon.c:142
-#: ../objects/UML/message.c:151
+#. 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:153
+#: ../objects/UML/message.c:155
 msgid "Message:"
 msgstr "Message:"
 
@@ -4196,7 +4528,7 @@ msgstr "Assumption"
 msgid "Obstacle"
 msgstr "Obstacle"
 
-#: ../objects/KAOS/goal.c:578
+#: ../objects/KAOS/goal.c:580
 msgid "KAOS goal"
 msgstr "KAOS goal"
 
@@ -4204,59 +4536,59 @@ msgstr "KAOS goal"
 msgid "KAOS diagram"
 msgstr "KAOS diagram"
 
-#: ../objects/KAOS/metaandorrel.c:151
+#: ../objects/KAOS/metaandorrel.c:153
 msgid "AND Refinement"
 msgstr "AND Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:152
+#: ../objects/KAOS/metaandorrel.c:154
 msgid "Complete AND Refinement"
 msgstr "Complete AND Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: ../objects/KAOS/metaandorrel.c:155
 msgid "OR Refinement"
 msgstr "OR Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: ../objects/KAOS/metaandorrel.c:156
 msgid "Operationalization"
 msgstr "Operationalisation"
 
-#: ../objects/KAOS/metaandorrel.c:161
+#: ../objects/KAOS/metaandorrel.c:163
 msgid "Text:"
 msgstr "Text:"
 
-#: ../objects/KAOS/metabinrel.c:155
+#: ../objects/KAOS/metabinrel.c:157
 msgid "Contributes"
 msgstr "Contributes"
 
-#: ../objects/KAOS/metabinrel.c:156
+#: ../objects/KAOS/metabinrel.c:158
 msgid "Obstructs"
 msgstr "Obstructs"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: ../objects/KAOS/metabinrel.c:159
 msgid "Conflicts"
 msgstr "Conflicts"
 
-#: ../objects/KAOS/metabinrel.c:158
+#: ../objects/KAOS/metabinrel.c:160
 msgid "Responsibility"
 msgstr "Responsibility"
 
-#: ../objects/KAOS/metabinrel.c:159
+#: ../objects/KAOS/metabinrel.c:161
 msgid "Monitors"
 msgstr "Monitors"
 
-#: ../objects/KAOS/metabinrel.c:160
+#: ../objects/KAOS/metabinrel.c:162
 msgid "Controls"
 msgstr "Controls"
 
-#: ../objects/KAOS/metabinrel.c:161
+#: ../objects/KAOS/metabinrel.c:163
 msgid "CapableOf"
 msgstr "CapableOf"
 
-#: ../objects/KAOS/metabinrel.c:162
+#: ../objects/KAOS/metabinrel.c:164
 msgid "Performs"
 msgstr "Performs"
 
-#: ../objects/KAOS/metabinrel.c:164
+#: ../objects/KAOS/metabinrel.c:166
 msgid "Output"
 msgstr "Output"
 
@@ -4264,86 +4596,150 @@ msgstr "Output"
 msgid "KAOS other"
 msgstr "KAOS other"
 
-#: ../objects/Misc/analog_clock.c:137
+#: ../objects/Misc/analog_clock.c:139
 msgid "Arrow color"
 msgstr "Arrow colour"
 
-#: ../objects/Misc/analog_clock.c:139
+#: ../objects/Misc/analog_clock.c:141
 msgid "Arrow line width"
 msgstr "Arrow line width"
 
-#: ../objects/Misc/analog_clock.c:141
+#: ../objects/Misc/analog_clock.c:143
 msgid "Seconds arrow color"
 msgstr "Seconds arrow colour"
 
-#: ../objects/Misc/analog_clock.c:143
+#: ../objects/Misc/analog_clock.c:145
 msgid "Seconds arrow line width"
 msgstr "Seconds arrow line width"
 
-#: ../objects/Misc/analog_clock.c:145
+#: ../objects/Misc/analog_clock.c:147
 msgid "Show hours"
 msgstr "Show hours"
 
+#: ../objects/Misc/grid_object.c:140
+msgid "Rows"
+msgstr "Rows"
+
+#: ../objects/Misc/grid_object.c:142
+msgid "Columns"
+msgstr "Columns"
+
+#: ../objects/Misc/grid_object.c:144
+msgid "Gridline color"
+msgstr "Grid line color"
+
+#: ../objects/Misc/grid_object.c:146
+msgid "Gridline width"
+msgstr "Grid line width"
+
 #: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "Miscellaneous objects"
 
-#. property rows
-#: ../objects/SADT/arrow.c:134
-#: ../objects/UML/class.c:174
-#: ../objects/UML/class_dialog.c:400
-msgid "Normal"
-msgstr "Normal"
+#: ../objects/Misc/measure.c:169
+msgid "cm"
+msgstr "cm"
+
+#: ../objects/Misc/measure.c:170
+msgid "dm"
+msgstr "dm"
+
+#: ../objects/Misc/measure.c:171
+msgid "ft"
+msgstr "ft"
+
+#: ../objects/Misc/measure.c:172
+msgid "in"
+msgstr "in"
+
+#: ../objects/Misc/measure.c:173
+msgid "m"
+msgstr "m"
+
+#: ../objects/Misc/measure.c:174
+msgid "mm"
+msgstr "mm"
+
+#: ../objects/Misc/measure.c:175
+msgid "pt"
+msgstr "pt"
+
+#: ../objects/Misc/measure.c:176
+msgid "pi"
+msgstr "pi"
+
+#. PROP_FLAG_VISIBLE|
+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
+msgid "Measurement"
+msgstr "Measurement"
 
-#: ../objects/SADT/arrow.c:135
+#: ../objects/Misc/measure.c:187
+msgid "Unit"
+msgstr "Unit"
+
+#: ../objects/Misc/measure.c:188
+msgid "Precision"
+msgstr "Precision"
+
+#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
+msgid "Add Handle"
+msgstr "Add Handle"
+
+#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
+msgid "Delete Handle"
+msgstr "Delete Handle"
+
+#: ../objects/SADT/arrow.c:138
 msgid "Import resource (not shown upstairs)"
 msgstr "Import resource (not shown upstairs)"
 
-#: ../objects/SADT/arrow.c:136
+#: ../objects/SADT/arrow.c:139
 msgid "Imply resource (not shown downstairs)"
 msgstr "Imply resource (not shown downstairs)"
 
-#: ../objects/SADT/arrow.c:137
+#: ../objects/SADT/arrow.c:140
 msgid "Dotted arrow"
 msgstr "Dotted arrow"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/SADT/arrow.c:141
 msgid "disable arrow heads"
 msgstr "disable arrow heads"
 
-#: ../objects/SADT/arrow.c:144
+#: ../objects/SADT/arrow.c:148
 msgid "Flow style:"
 msgstr "Flow style:"
 
-#: ../objects/SADT/arrow.c:146
+#: ../objects/SADT/arrow.c:150
 msgid "Automatically gray vertical flows:"
 msgstr "Automatically grey vertical flows:"
 
-#: ../objects/SADT/arrow.c:147
-msgid "To improve the ease of reading, flows which begin and end vertically can be rendered gray"
-msgstr "To improve the ease of reading, flows which begin and end vertically can be rendered grey"
+#: ../objects/SADT/arrow.c:151
+msgid ""
+"To improve the ease of reading, flows which begin and end vertically can be "
+"rendered gray"
+msgstr ""
+"To improve the ease of reading, flows which begin and end vertically can be "
+"rendered grey"
 
-#: ../objects/SADT/arrow.c:463
+#: ../objects/SADT/arrow.c:470
 msgid "SADT Arrow"
 msgstr "SADT Arrow"
 
-#: ../objects/SADT/box.c:137
-#: ../objects/flowchart/box.c:152
-#: ../objects/flowchart/diamond.c:150
-#: ../objects/flowchart/ellipse.c:149
-#: ../objects/flowchart/parallelogram.c:154
+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:227
+#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
+#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
 msgid "Text padding"
 msgstr "Text padding"
 
-#: ../objects/SADT/box.c:144
+#: ../objects/SADT/box.c:149
 msgid "Activity/Data identifier"
 msgstr "Activity/Data identifier"
 
-#: ../objects/SADT/box.c:145
+#: ../objects/SADT/box.c:150
 msgid "The identifier which appears in the lower right corner of the Box"
-msgstr "The identifier which appears in the lower right corner of the Box"
+msgstr "The identifier which appears in the lower-right corner of the Box"
 
-#: ../objects/SADT/box.c:453
+#: ../objects/SADT/box.c:460
 msgid "SADT box"
 msgstr "SADT box"
 
@@ -4351,18 +4747,15 @@ msgstr "SADT box"
 msgid "SADT diagram objects"
 msgstr "SADT diagram objects"
 
-#: ../objects/SISSI/classification.h:38
-#: ../objects/SISSI/sissi.h:218
+#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi_dialog.c:42
 msgid "No Protection"
 msgstr "No Protection"
 
-#: ../objects/SISSI/classification.h:39
-#: ../objects/SISSI/sissi.h:219
+#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi_dialog.c:43
 msgid "Restricted Diffusion"
 msgstr "Restricted Diffusion"
 
-#: ../objects/SISSI/classification.h:40
-#: ../objects/SISSI/sissi.h:220
+#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi_dialog.c:44
 msgid "Special Country Confidential"
 msgstr "Special Country Confidential"
 
@@ -4370,23 +4763,19 @@ msgstr "Special Country Confidential"
 msgid "Confidential"
 msgstr "Confidential"
 
-#: ../objects/SISSI/classification.h:42
-#: ../objects/SISSI/sissi.h:221
+#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi_dialog.c:45
 msgid "NATO Confidential"
 msgstr "NATO Confidential"
 
-#: ../objects/SISSI/classification.h:43
-#: ../objects/SISSI/sissi.h:222
+#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi_dialog.c:46
 msgid "Personal Confidential"
 msgstr "Personal Confidential"
 
-#: ../objects/SISSI/classification.h:44
-#: ../objects/SISSI/sissi.h:223
+#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi_dialog.c:47
 msgid "Medical Confidential"
 msgstr "Medical Confidential"
 
 #: ../objects/SISSI/classification.h:45
-#: ../objects/SISSI/sissi.h:224
 msgid "Industrie Confidential"
 msgstr "Industry Confidential"
 
@@ -4394,8 +4783,7 @@ msgstr "Industry Confidential"
 msgid "Defense Confidential"
 msgstr "Defence Confidential"
 
-#: ../objects/SISSI/classification.h:47
-#: ../objects/SISSI/sissi.h:225
+#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi_dialog.c:49
 msgid "Secret"
 msgstr "Secret"
 
@@ -4403,903 +4791,826 @@ msgstr "Secret"
 msgid "Defense Secret"
 msgstr "Defence Secret"
 
-#: ../objects/SISSI/classification.h:49
-#: ../objects/SISSI/sissi.h:226
+#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi_dialog.c:50
 msgid "Secret special country"
 msgstr "Secret special country"
 
-#: ../objects/SISSI/classification.h:50
-#: ../objects/SISSI/sissi.h:227
+#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi_dialog.c:51
 msgid "NATO Secret"
 msgstr "NATO Secret"
 
-#: ../objects/SISSI/classification.h:51
-#: ../objects/SISSI/sissi.h:228
+#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi_dialog.c:52
 msgid "Very Secret"
 msgstr "Very Secret"
 
-#: ../objects/SISSI/classification.h:52
-#: ../objects/SISSI/sissi.h:229
+#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi_dialog.c:53
 msgid "NATO Very Secret"
 msgstr "NATO Very Secret"
 
-#: ../objects/SISSI/sissi.c:64
+#: ../objects/SISSI/sissi.c:66
 msgid "SISSI diagram"
 msgstr "SISSI diagram"
 
-#: ../objects/SISSI/sissi.h:234
+#: ../objects/SISSI/sissi.c:923
+#, c-format
+msgid ""
+"Error loading object.\n"
+"Not a regular file: %s"
+msgstr ""
+"Error loading object.\n"
+"Not a regular file: %s"
+
+#: ../objects/SISSI/sissi.c:928 ../objects/SISSI/sissi.c:932
+#, c-format
+msgid ""
+"Error loading object.\n"
+"Incorrect file type: %s"
+msgstr ""
+"Error loading object.\n"
+"Incorrect file type: %s"
+
+#: ../objects/SISSI/sissi.c:940
+#, c-format
+msgid ""
+"Error loading object.\n"
+"Not a Dia file: %s"
+msgstr ""
+"Error loading object.\n"
+"Not a Dia file: %s"
+
+#: ../objects/SISSI/sissi_dialog.c:48
+msgid "Industrial Confidential"
+msgstr "Industrial Confidential"
+
+#: ../objects/SISSI/sissi_dialog.c:58
 msgid "No integrity"
 msgstr "No integrity"
 
-#: ../objects/SISSI/sissi.h:235
+#: ../objects/SISSI/sissi_dialog.c:59
 msgid "Low integrity"
 msgstr "Low integrity"
 
-#: ../objects/SISSI/sissi.h:236
+#: ../objects/SISSI/sissi_dialog.c:60
 msgid "Average software integrity"
 msgstr "Average software integrity"
 
-#: ../objects/SISSI/sissi.h:237
-msgid "Hight software integrity"
-msgstr "Hight software integrity"
+#: ../objects/SISSI/sissi_dialog.c:61
+msgid "High software integrity"
+msgstr "High software integrity"
 
-#: ../objects/SISSI/sissi.h:238
+#: ../objects/SISSI/sissi_dialog.c:62
 msgid "Average hardware integrity"
 msgstr "Average hardware integrity"
 
-#: ../objects/SISSI/sissi.h:239
-msgid "Hight hardware integrity"
-msgstr "Hight hardware integrity"
+#: ../objects/SISSI/sissi_dialog.c:63
+msgid "High hardware integrity"
+msgstr "High hardware integrity"
 
-#: ../objects/SISSI/sissi.h:244
+#: ../objects/SISSI/sissi_dialog.c:68
 msgid "Millisecond"
 msgstr "Millisecond"
 
-#: ../objects/SISSI/sissi.h:245
+#: ../objects/SISSI/sissi_dialog.c:69
 msgid "Second"
 msgstr "Second"
 
-#: ../objects/SISSI/sissi.h:246
+#: ../objects/SISSI/sissi_dialog.c:70
 msgid "Minute"
 msgstr "Minute"
 
-#: ../objects/SISSI/sissi.h:247
+#: ../objects/SISSI/sissi_dialog.c:71
 msgid "Hour"
 msgstr "Hour"
 
-#: ../objects/SISSI/sissi.h:248
+#: ../objects/SISSI/sissi_dialog.c:72
 msgid "Day"
 msgstr "Day"
 
-#: ../objects/SISSI/sissi.h:249
+#: ../objects/SISSI/sissi_dialog.c:73
 msgid "Week"
 msgstr "Week"
 
-#: ../objects/SISSI/sissi.h:254
+#: ../objects/SISSI/sissi_dialog.c:78
 msgid "SYSTEM"
 msgstr "SYSTEM"
 
-#: ../objects/SISSI/sissi.h:255
+#: ../objects/SISSI/sissi_dialog.c:79
 msgid "Internet access device"
 msgstr "Internet access device"
 
-#: ../objects/SISSI/sissi.h:256
+#: ../objects/SISSI/sissi_dialog.c:80
 msgid "Electronic messaging"
 msgstr "Electronic messaging"
 
-#: ../objects/SISSI/sissi.h:257
+#: ../objects/SISSI/sissi_dialog.c:81
 msgid "Intranet"
 msgstr "Intranet"
 
-#: ../objects/SISSI/sissi.h:258
+#: ../objects/SISSI/sissi_dialog.c:82
 msgid "Company directory"
 msgstr "Company directory"
 
-#: ../objects/SISSI/sissi.h:259
+#: ../objects/SISSI/sissi_dialog.c:83
 msgid "External portal"
 msgstr "External portal"
 
-#: ../objects/SISSI/sissi.h:264
+#: ../objects/SISSI/sissi_dialog.c:88
 msgid "ORGANISATION"
 msgstr "ORGANISATION"
 
-#: ../objects/SISSI/sissi.h:265
+#: ../objects/SISSI/sissi_dialog.c:89
 msgid "Higher-tier organisation"
 msgstr "Higher-tier organisation"
 
-#: ../objects/SISSI/sissi.h:266
+#: ../objects/SISSI/sissi_dialog.c:90
 msgid "Structure of the organisation"
 msgstr "Structure of the organisation"
 
-#: ../objects/SISSI/sissi.h:267
+#: ../objects/SISSI/sissi_dialog.c:91
 msgid "Project or system organisation"
 msgstr "Project or system organisation"
 
-#: ../objects/SISSI/sissi.h:268
+#: ../objects/SISSI/sissi_dialog.c:92
 msgid "Subcontractors / Suppliers / Manufacturers"
 msgstr "Subcontractors/Suppliers/Manufacturers"
 
-#: ../objects/SISSI/sissi.h:273
+#: ../objects/SISSI/sissi_dialog.c:97
 msgid "SITE"
 msgstr "SITE"
 
-#: ../objects/SISSI/sissi.h:274
+#: ../objects/SISSI/sissi_dialog.c:98
 msgid "Places"
 msgstr "Places"
 
-#: ../objects/SISSI/sissi.h:275
+#: ../objects/SISSI/sissi_dialog.c:99
 msgid "External environment"
 msgstr "External environment"
 
-#: ../objects/SISSI/sissi.h:276
+#: ../objects/SISSI/sissi_dialog.c:100
 msgid "Premises"
 msgstr "Premises"
 
-#: ../objects/SISSI/sissi.h:277
+#: ../objects/SISSI/sissi_dialog.c:101
 msgid "Zone"
 msgstr "Zone"
 
-#: ../objects/SISSI/sissi.h:278
-msgid "Service Essentiel"
-msgstr "Service Essential"
+#: ../objects/SISSI/sissi_dialog.c:102
+msgid "Essential Services"
+msgstr "Essential Services"
 
-#: ../objects/SISSI/sissi.h:279
+#: ../objects/SISSI/sissi_dialog.c:103
 msgid "Communication"
 msgstr "Communication"
 
-#: ../objects/SISSI/sissi.h:280
+#: ../objects/SISSI/sissi_dialog.c:104
 msgid "Power"
 msgstr "Power"
 
-#: ../objects/SISSI/sissi.h:281
+#: ../objects/SISSI/sissi_dialog.c:105
 msgid "Cooling / Pollution"
 msgstr "Cooling/Pollution"
 
-#: ../objects/SISSI/sissi.h:285
-msgid "THERMIC DETECTION"
-msgstr "THERMIC DETECTION"
+#: ../objects/SISSI/sissi_dialog.c:109
+msgid "Thermal detection"
+msgstr "Thermal detection"
 
-#: ../objects/SISSI/sissi.h:289
-msgid "FIRE DETECTION"
-msgstr "FIRE DETECTION"
+#: ../objects/SISSI/sissi_dialog.c:113
+msgid "Fire detection"
+msgstr "Fire detection"
 
-#: ../objects/SISSI/sissi.h:293
-msgid "WATER DETECTION"
-msgstr "WATER DETECTION"
+#: ../objects/SISSI/sissi_dialog.c:117
+msgid "Water detection"
+msgstr "Water detection"
 
-#: ../objects/SISSI/sissi.h:297
-msgid "AIR DETECTION"
-msgstr "AIR DETECTION"
+#: ../objects/SISSI/sissi_dialog.c:121
+msgid "Air detection"
+msgstr "Air detection"
 
-#: ../objects/SISSI/sissi.h:301
-msgid "ENERGY DETECTION"
-msgstr "ENERGY DETECTION"
+#: ../objects/SISSI/sissi_dialog.c:125
+msgid "Energy detection"
+msgstr "Energy detection"
 
-#: ../objects/SISSI/sissi.h:305
-msgid "INTRUSION DETECTION"
-msgstr "INTRUSION DETECTION"
+#: ../objects/SISSI/sissi_dialog.c:129
+msgid "Intrusion detection"
+msgstr "Intrusion detection"
 
-#: ../objects/SISSI/sissi.h:309
-msgid "THERMIC ACTION"
-msgstr "THERMIC ACTION"
+#: ../objects/SISSI/sissi_dialog.c:133
+msgid "Thermal action"
+msgstr "Thermal action"
 
-#: ../objects/SISSI/sissi.h:313
-msgid "FIRE ACTION"
-msgstr "FIRE ACTION"
+#: ../objects/SISSI/sissi_dialog.c:137
+msgid "Fire action"
+msgstr "Fire action"
 
-#: ../objects/SISSI/sissi.h:317
-msgid "WATER ACTION"
-msgstr "WATER ACTION"
+#: ../objects/SISSI/sissi_dialog.c:141
+msgid "Water action"
+msgstr "Water action"
 
-#: ../objects/SISSI/sissi.h:321
-msgid "AIR ACTION"
-msgstr "AIR ACTION"
+#: ../objects/SISSI/sissi_dialog.c:145
+msgid "Air action"
+msgstr "Air action"
 
-#: ../objects/SISSI/sissi.h:325
-msgid "ENERGY ACTION"
-msgstr "ENERGY ACTION"
+#: ../objects/SISSI/sissi_dialog.c:149
+msgid "Energy action"
+msgstr "Energy action"
 
-#: ../objects/SISSI/sissi.h:329
-msgid "INTRUSION ACTION"
-msgstr "INTRUSION ACTION"
+#: ../objects/SISSI/sissi_dialog.c:153
+msgid "Intrusion action"
+msgstr "Intrusion action"
 
-#: ../objects/SISSI/sissi.h:334
-msgid "PERSONAL"
-msgstr "PERSONAL"
+#: ../objects/SISSI/sissi_dialog.c:158
+msgid "Personal"
+msgstr "Personal"
 
-#: ../objects/SISSI/sissi.h:335
+#: ../objects/SISSI/sissi_dialog.c:159
 msgid "Decision maker"
 msgstr "Decision maker"
 
-#: ../objects/SISSI/sissi.h:336
+#: ../objects/SISSI/sissi_dialog.c:160
 msgid "SSI Responsible"
 msgstr "SSI Responsible"
 
-#: ../objects/SISSI/sissi.h:337
+#: ../objects/SISSI/sissi_dialog.c:161
 msgid "Users"
 msgstr "Users"
 
-#: ../objects/SISSI/sissi.h:338
-msgid "Fonctionnal administrator"
+#: ../objects/SISSI/sissi_dialog.c:162
+msgid "Functional administrator"
 msgstr "Functional administrator"
 
-#: ../objects/SISSI/sissi.h:339
-msgid "Technician aministrator"
-msgstr "Technician administrator"
+#: ../objects/SISSI/sissi_dialog.c:163
+msgid "Technical administrator"
+msgstr "Technical administrator"
 
-#: ../objects/SISSI/sissi.h:340
+#: ../objects/SISSI/sissi_dialog.c:164
 msgid "SSI administrator"
 msgstr "SSI administrator"
 
-#: ../objects/SISSI/sissi.h:341
+#: ../objects/SISSI/sissi_dialog.c:165
 msgid "Developer"
 msgstr "Developer"
 
-#: ../objects/SISSI/sissi.h:342
+#: ../objects/SISSI/sissi_dialog.c:166
 msgid "Operator / Maintenance"
-msgstr "Operator / Maintenance"
+msgstr "Operator/Maintenance"
 
-#: ../objects/SISSI/sissi.h:347
-msgid "NETWORK"
-msgstr "NETWORK"
+#: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
+msgid "Network"
+msgstr "Network"
 
-#: ../objects/SISSI/sissi.h:348
-msgid "Medium and supports"
-msgstr "Medium and supports"
+#: ../objects/SISSI/sissi_dialog.c:172
+msgid "Medium and support"
+msgstr "Medium and support"
 
-#: ../objects/SISSI/sissi.h:349
+#: ../objects/SISSI/sissi_dialog.c:173
 msgid "Passive or active relay"
 msgstr "Passive or active relay"
 
-#: ../objects/SISSI/sissi.h:350
+#: ../objects/SISSI/sissi_dialog.c:174
 msgid "Communication interface"
 msgstr "Communication interface"
 
-#: ../objects/SISSI/sissi.h:355
-msgid "LOGICIEL"
-msgstr "LOGICAL"
+#: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
+msgid "Software"
+msgstr "Software"
 
-#: ../objects/SISSI/sissi.h:356
+#: ../objects/SISSI/sissi_dialog.c:180
 msgid "Operating System"
 msgstr "Operating System"
 
-#: ../objects/SISSI/sissi.h:357
+#: ../objects/SISSI/sissi_dialog.c:181
 msgid "Service - maintenance or administration software"
-msgstr "Service - maintenance or administration software"
+msgstr "Service â?? maintenance or administration software"
 
-#: ../objects/SISSI/sissi.h:358
-msgid "Package software or standard software"
-msgstr "Package software or standard software"
+#: ../objects/SISSI/sissi_dialog.c:182
+msgid "Packaged software or standard software"
+msgstr "Packaged software or standard software"
 
-#: ../objects/SISSI/sissi.h:359
+#: ../objects/SISSI/sissi_dialog.c:183
 msgid "Business application"
 msgstr "Business application"
 
-#: ../objects/SISSI/sissi.h:360
+#: ../objects/SISSI/sissi_dialog.c:184
 msgid "Standard business application"
 msgstr "Standard business application"
 
-#: ../objects/SISSI/sissi.h:361
+#: ../objects/SISSI/sissi_dialog.c:185
 msgid "Specific business application"
 msgstr "Specific business application"
 
-#: ../objects/SISSI/sissi.h:366
+#: ../objects/SISSI/sissi_dialog.c:190
 msgid "HARDWARE"
 msgstr "HARDWARE"
 
-#: ../objects/SISSI/sissi.h:367
-msgid "Data processing equipement (active)"
-msgstr "Data processing equipement (active)"
+#: ../objects/SISSI/sissi_dialog.c:191
+msgid "Data-processing equipment (active)"
+msgstr "Data processing equipment (active)"
 
-#: ../objects/SISSI/sissi.h:368
-msgid "Transportable equipement"
-msgstr "Transportable equipement"
+#: ../objects/SISSI/sissi_dialog.c:192
+msgid "Mobile equipment"
+msgstr "Mobile equipment"
 
-#: ../objects/SISSI/sissi.h:369
-msgid "Fixed equipement"
-msgstr "Fixed equipement"
+#: ../objects/SISSI/sissi_dialog.c:193
+msgid "Fixed equipment"
+msgstr "Fixed equipment"
 
-#: ../objects/SISSI/sissi.h:370
+#: ../objects/SISSI/sissi_dialog.c:194
 msgid "Peripheral processing"
 msgstr "Peripheral processing"
 
-#: ../objects/SISSI/sissi.h:371
+#: ../objects/SISSI/sissi_dialog.c:195
 msgid "Electronic medium"
 msgstr "Electronic medium"
 
-#: ../objects/SISSI/sissi.h:372
+#: ../objects/SISSI/sissi_dialog.c:196
 msgid "Other media"
 msgstr "Other media"
 
-#: ../objects/SISSI/sissi.h:373
+#: ../objects/SISSI/sissi_dialog.c:197
 msgid "Data medium (passive)"
 msgstr "Data medium (passive)"
 
 #. Class page:
-#: ../objects/SISSI/sissi_dialog.c:185
+#: ../objects/SISSI/sissi_dialog.c:301
 msgid "_Menace"
 msgstr "_Menace"
 
 #. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:201
-#: ../objects/SISSI/sissi_dialog.c:210
+#: ../objects/SISSI/sissi_dialog.c:317 ../objects/SISSI/sissi_dialog.c:326
 msgid "Menace"
 msgstr "Menace"
 
-#: ../objects/SISSI/sissi_dialog.c:203
-#: ../objects/SISSI/sissi_dialog.c:212
+#: ../objects/SISSI/sissi_dialog.c:319 ../objects/SISSI/sissi_dialog.c:328
 msgid "P Action"
 msgstr "P Action"
 
-#: ../objects/SISSI/sissi_dialog.c:205
-#: ../objects/SISSI/sissi_dialog.c:214
+#: ../objects/SISSI/sissi_dialog.c:321 ../objects/SISSI/sissi_dialog.c:330
 msgid "P Detection"
 msgstr "P Detection"
 
-#: ../objects/SISSI/sissi_dialog.c:207
-#: ../objects/SISSI/sissi_dialog.c:216
+#: ../objects/SISSI/sissi_dialog.c:323 ../objects/SISSI/sissi_dialog.c:332
 msgid "Vulnerability"
 msgstr "Vulnerability"
 
 #. Other properties of page:
-#: ../objects/SISSI/sissi_dialog.c:372
-msgid "Others properties"
-msgstr "Others properties"
+#: ../objects/SISSI/sissi_dialog.c:488
+msgid "Other properties"
+msgstr "Other properties"
 
 #. ********* selection menu of entity ********
 #. ********* Label of board *********
-#: ../objects/SISSI/sissi_dialog.c:610
-msgid "Libelle"
+#: ../objects/SISSI/sissi_dialog.c:726
+msgid "Label"
 msgstr "Label"
 
-#: ../objects/SISSI/sissi_dialog.c:612
+#: ../objects/SISSI/sissi_dialog.c:728
 msgid "value"
 msgstr "value"
 
-#: ../objects/SISSI/sissi_dialog.c:623
-#: ../objects/SISSI/sissi_dialog.c:755
-#: ../objects/UML/class_dialog.c:927
-#: ../objects/UML/class_dialog.c:1877
-#: ../objects/UML/class_dialog.c:2114
-#: ../objects/UML/class_dialog.c:2644
-msgid "_New"
-msgstr "_New"
-
 #. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:746
+#: ../objects/SISSI/sissi_dialog.c:862
 msgid "Documents"
 msgstr "Documents"
 
-#: ../objects/SISSI/sissi_dialog.c:762
+#: ../objects/SISSI/sissi_dialog.c:878
 msgid "Document title"
 msgstr "Document title"
 
-#: ../objects/SISSI/sissi_dialog.c:764
-msgid "URL"
-msgstr "URL"
-
-#: ../objects/UML/actor.c:349
-#: ../objects/UML/actor.c:351
+#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
 #: ../sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "Actor"
 
-#: ../objects/UML/association.c:1173
-#: ../objects/UML/class_dialog.c:2210
-msgid "Direction:"
-msgstr "Direction:"
-
-#: ../objects/UML/association.c:1190
+#: ../objects/UML/association.c:222
 msgid "From A to B"
 msgstr "From A to B"
 
-#: ../objects/UML/association.c:1197
+#: ../objects/UML/association.c:223
 msgid "From B to A"
 msgstr "From B to A"
 
-#: ../objects/UML/association.c:1221
-#: ../objects/UML/association.c:1229
-msgid "Side A"
-msgstr "Side A"
-
-#: ../objects/UML/association.c:1223
-#: ../objects/UML/association.c:1231
-msgid "Side B"
-msgstr "Side B"
+#: ../objects/UML/association.c:228
+msgid "Aggregation"
+msgstr "Aggregation"
 
-#: ../objects/UML/association.c:1237
-msgid "Role:"
-msgstr "Role:"
+#: ../objects/UML/association.c:229
+msgid "Composition"
+msgstr "Composition"
 
-#: ../objects/UML/association.c:1249
-msgid "Multiplicity:"
-msgstr "Multiplicity:"
+#: ../objects/UML/association.c:236
+msgid "Direction"
+msgstr "Direction"
 
-#: ../objects/UML/association.c:1260
-#: ../objects/UML/class_dialog.c:1021
-#: ../objects/UML/class_dialog.c:1954
-msgid "Visibility:"
-msgstr "Visibility:"
+#: ../objects/UML/association.c:238
+msgid "Show direction"
+msgstr "Show direction"
 
-#: ../objects/UML/association.c:1269
-#: ../objects/UML/class_dialog.c:1030
-#: ../objects/UML/class_dialog.c:1963
-#: ../objects/UML/uml.c:102
-msgid "Public"
-msgstr "Public"
+#: ../objects/UML/association.c:238
+msgid "Show the small arrow denoting the reading direction"
+msgstr "Show the small arrow denoting the reading direction"
 
-#: ../objects/UML/association.c:1279
-#: ../objects/UML/class_dialog.c:1038
-#: ../objects/UML/class_dialog.c:1971
-#: ../objects/UML/uml.c:103
-msgid "Private"
-msgstr "Private"
+#: ../objects/UML/association.c:245
+msgid "Side A"
+msgstr "Side A"
 
-#: ../objects/UML/association.c:1289
-#: ../objects/UML/class_dialog.c:1046
-#: ../objects/UML/class_dialog.c:1979
-#: ../objects/UML/uml.c:104
-msgid "Protected"
-msgstr "Protected"
+#: ../objects/UML/association.c:249
+msgid "Multiplicity"
+msgstr "Multiplicity"
 
-#: ../objects/UML/association.c:1299
-#: ../objects/UML/class_dialog.c:1054
-#: ../objects/UML/class_dialog.c:1987
-#: ../objects/UML/uml.c:105
-msgid "Implementation"
-msgstr "Implementation"
+#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/umloperation.c:71
+msgid "Visibility"
+msgstr "Visibility"
 
-#. Show arrow:
-#: ../objects/UML/association.c:1318
+#: ../objects/UML/association.c:253
 msgid "Show arrow"
 msgstr "Show arrow"
 
-#. Aggregate
-#: ../objects/UML/association.c:1324
-msgid "Aggregate"
-msgstr "Aggregate"
-
-#. Composition
-#: ../objects/UML/association.c:1332
-msgid "Composition"
-msgstr "Composition"
+#: ../objects/UML/association.c:256
+msgid "Side B"
+msgstr "Side B"
 
-#: ../objects/UML/class.c:137
-#: ../objects/UML/class.c:308
-#: ../objects/UML/class.c:1707
-#: ../sheets/UML.sheet.in.h:6
+#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
+#: ../objects/UML/class.c:1829 ../sheets/UML.sheet.in.h:6
 msgid "Class"
 msgstr "Class"
 
-#: ../objects/UML/class.c:141
-#: ../objects/UML/classicon.c:138
-#: ../objects/UML/component.c:124
-#: ../objects/UML/large_package.c:129
-#: ../objects/UML/object.c:150
-#: ../objects/UML/small_package.c:124
-#: ../objects/UML/umloperation.c:68
+#. 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:140
+#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
+#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
+#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "Stereotype"
 
-#: ../objects/UML/class.c:143
-#: ../objects/UML/class.c:184
-#: ../objects/UML/class_dialog.c:425
-#: ../objects/UML/umlattribute.c:43
-#: ../objects/UML/umloperation.c:66
-#: ../objects/UML/umlparameter.c:49
-#: ../sheets/SDL.sheet.in.h:3
-msgid "Comment"
-msgstr "Comment"
-
-#: ../objects/UML/class.c:145
-#: ../objects/UML/class.c:178
-#: ../objects/UML/class_dialog.c:324
-#: ../objects/UML/class_dialog.c:410
-#: ../objects/UML/class_dialog.c:2018
-#: ../objects/UML/uml.c:110
+#: ../objects/UML/class.c:151 ../objects/UML/class.c:186
+#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
+#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
 msgid "Abstract"
 msgstr "Abstract"
 
-#: ../objects/UML/class.c:147
-#: ../objects/UML/class.c:1704
+#: ../objects/UML/class.c:153 ../objects/UML/class.c:1826
 msgid "Template"
 msgstr "Template"
 
-#: ../objects/UML/class.c:150
-#: ../objects/UML/class_dialog.c:333
+#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:477
 msgid "Suppress Attributes"
 msgstr "Suppress Attributes"
 
-#: ../objects/UML/class.c:152
+#: ../objects/UML/class.c:158
 msgid "Suppress Operations"
 msgstr "Suppress Operations"
 
-#: ../objects/UML/class.c:154
+#: ../objects/UML/class.c:160
 msgid "Visible Attributes"
 msgstr "Visible Attributes"
 
-#: ../objects/UML/class.c:156
+#: ../objects/UML/class.c:162
 msgid "Visible Operations"
 msgstr "Visible Operations"
 
-#: ../objects/UML/class.c:158
+#: ../objects/UML/class.c:164
 msgid "Visible Comments"
 msgstr "Visible Comments"
 
-#: ../objects/UML/class.c:160
-#: ../objects/UML/class_dialog.c:349
+#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:493
 msgid "Wrap Operations"
 msgstr "Wrap Operations"
 
-#: ../objects/UML/class.c:162
+#: ../objects/UML/class.c:168
 msgid "Wrap after char"
 msgstr "Wrap after char"
 
-#: ../objects/UML/class.c:164
+#: ../objects/UML/class.c:170
 msgid "Comment line length"
 msgstr "Comments line length"
 
-#: ../objects/UML/class.c:166
-msgid "Comment tagging"
-msgstr "Comment tagging"
+#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
+msgid "Allow resizing"
+msgstr "Allow resizing"
 
-#: ../objects/UML/class.c:176
-#: ../objects/UML/class_dialog.c:405
+#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:575
 msgid "Polymorphic"
 msgstr "Polymorphic"
 
-#: ../objects/UML/class.c:180
+#: ../objects/UML/class.c:188
 msgid "Classname"
-msgstr "Classname"
-
-#: ../objects/UML/class.c:182
-msgid "Abstract Classname"
-msgstr "Abstract Classname"
+msgstr "Class Name"
 
-#: ../objects/UML/class.c:188
 #: ../objects/UML/class.c:190
-#: ../objects/UML/class.c:192
-#: ../objects/UML/class.c:194
-#: ../objects/UML/class.c:196
-#: ../objects/UML/class.c:198
-msgid " "
-msgstr " "
-
-#: ../objects/UML/class.c:204
-#: ../objects/UML/object.c:154
-msgid "Attributes"
-msgstr "Attributes"
+msgid "Abstract Classname"
+msgstr "Abstract Class Name"
 
-#: ../objects/UML/class.c:206
+#: ../objects/UML/class.c:214
 msgid "Operations"
 msgstr "Operations"
 
-#: ../objects/UML/class.c:209
+#: ../objects/UML/class.c:217
 msgid "Template Parameters"
 msgstr "Template Parameters"
 
-#: ../objects/UML/class.c:303
-msgid "Show Comments"
-msgstr "Show Comments"
-
 #. Class page:
-#: ../objects/UML/class_dialog.c:285
+#: ../objects/UML/class_dialog.c:429
 msgid "_Class"
 msgstr "_Class"
 
-#: ../objects/UML/class_dialog.c:293
+#: ../objects/UML/class_dialog.c:437
 msgid "Class name:"
 msgstr "Class name:"
 
-#: ../objects/UML/class_dialog.c:301
-#: ../objects/UML/class_dialog.c:1941
-#: ../objects/UML/dependency.c:137
-#: ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:134
+#: ../objects/UML/class_dialog.c:445 ../objects/UML/class_dialog.c:2036
+#: ../objects/UML/dependency.c:139 ../objects/UML/generalization.c:135
+#: ../objects/UML/realizes.c:136
 msgid "Stereotype:"
 msgstr "Stereotype:"
 
-#: ../objects/UML/class_dialog.c:308
-#: ../objects/UML/class_dialog.c:999
-#: ../objects/UML/class_dialog.c:2059
-#: ../objects/UML/class_dialog.c:2190
-msgid "Comment:"
-msgstr "Comment:"
-
-#: ../objects/UML/class_dialog.c:330
+#: ../objects/UML/class_dialog.c:474
 msgid "Attributes visible"
 msgstr "Attributes visible"
 
-#: ../objects/UML/class_dialog.c:339
+#: ../objects/UML/class_dialog.c:483
 msgid "Operations visible"
 msgstr "Operations visible"
 
-#: ../objects/UML/class_dialog.c:342
+#: ../objects/UML/class_dialog.c:486
 msgid "Suppress operations"
 msgstr "Suppress operations"
 
-#: ../objects/UML/class_dialog.c:356
+#: ../objects/UML/class_dialog.c:500
 msgid "Wrap after this length: "
 msgstr "Wrap after this length: "
 
-#: ../objects/UML/class_dialog.c:364
+#: ../objects/UML/class_dialog.c:508
 msgid "Comments visible"
 msgstr "Comments visible"
 
-#: ../objects/UML/class_dialog.c:371
+#: ../objects/UML/class_dialog.c:515
 msgid "Wrap comment after this length: "
 msgstr "Wrap comment after this length: "
 
-#: ../objects/UML/class_dialog.c:378
-msgid "Show documenation tag"
-msgstr "Show documenation tag"
-
-#. head line
-#: ../objects/UML/class_dialog.c:391
-#: ../objects/UML/umlparameter.c:51
-msgid "Kind"
-msgstr "Kind"
-
-#: ../objects/UML/class_dialog.c:396
-msgid "Size"
-msgstr "Size"
-
-#: ../objects/UML/class_dialog.c:415
+#: ../objects/UML/class_dialog.c:585
 msgid "Class Name"
 msgstr "Class Name"
 
-#: ../objects/UML/class_dialog.c:420
+#: ../objects/UML/class_dialog.c:590
 msgid "Abstract Class"
 msgstr "Abstract Class"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:607
+msgid "Line Width"
+msgstr "Line Width"
+
+#: ../objects/UML/class_dialog.c:616
 msgid "Text Color"
 msgstr "Text Colour"
 
-#: ../objects/UML/class_dialog.c:445
+#: ../objects/UML/class_dialog.c:624
 msgid "Foreground Color"
 msgstr "Foreground Colour"
 
-#: ../objects/UML/class_dialog.c:453
+#: ../objects/UML/class_dialog.c:632
 msgid "Background Color"
 msgstr "Background Colour"
 
-#. Attributes page:
-#: ../objects/UML/class_dialog.c:899
-msgid "_Attributes"
-msgstr "_Attributes"
+#: ../objects/UML/class_dialog.c:1170
+msgid "Value:"
+msgstr "Value:"
 
-#: ../objects/UML/class_dialog.c:933
-#: ../objects/UML/class_dialog.c:1883
-#: ../objects/UML/class_dialog.c:2121
-#: ../objects/UML/class_dialog.c:2650
-msgid "_Delete"
-msgstr "_Delete"
+#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
+msgid "Visibility:"
+msgstr "Visibility:"
 
-#: ../objects/UML/class_dialog.c:939
-#: ../objects/UML/class_dialog.c:1889
-#: ../objects/UML/class_dialog.c:2128
-#: ../objects/UML/class_dialog.c:2656
-msgid "Move up"
-msgstr "Move up"
+#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
+#: ../objects/UML/uml.c:102
+msgid "Public"
+msgstr "Public"
 
-#: ../objects/UML/class_dialog.c:945
-#: ../objects/UML/class_dialog.c:1895
-#: ../objects/UML/class_dialog.c:2135
-#: ../objects/UML/class_dialog.c:2662
-msgid "Move down"
-msgstr "Move down"
+#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
+#: ../objects/UML/uml.c:103
+msgid "Private"
+msgstr "Private"
 
-#: ../objects/UML/class_dialog.c:956
-msgid "Attribute data"
-msgstr "Attribute data"
+#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
+#: ../objects/UML/uml.c:104
+msgid "Protected"
+msgstr "Protected"
 
-#: ../objects/UML/class_dialog.c:988
-msgid "Value:"
-msgstr "Value:"
+#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
+#: ../objects/UML/uml.c:105
+msgid "Implementation"
+msgstr "Implementation"
 
-#: ../objects/UML/class_dialog.c:1075
-#: ../objects/UML/class_dialog.c:2003
+#. end: Inheritance type
+#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
 msgid "Class scope"
 msgstr "Class scope"
 
-#. Operations page:
-#: ../objects/UML/class_dialog.c:1849
-msgid "_Operations"
-msgstr "_Operations"
-
-#: ../objects/UML/class_dialog.c:1907
-msgid "Operation data"
-msgstr "Operation data"
-
-#: ../objects/UML/class_dialog.c:2009
+#. end: Visibility
+#: ../objects/UML/class_dialog.c:2078
 msgid "Inheritance type:"
 msgstr "Inheritance type:"
 
-#: ../objects/UML/class_dialog.c:2026
-#: ../objects/UML/uml.c:111
+#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
 msgid "Polymorphic (virtual)"
 msgstr "Polymorphic (virtual)"
 
-#: ../objects/UML/class_dialog.c:2034
-#: ../objects/UML/uml.c:112
+#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
 msgid "Leaf (final)"
 msgstr "Leaf (final)"
 
-#: ../objects/UML/class_dialog.c:2052
+#: ../objects/UML/class_dialog.c:2107
 msgid "Query"
 msgstr "Query"
 
-#: ../objects/UML/class_dialog.c:2085
+#: ../objects/UML/class_dialog.c:2154
 msgid "Parameters:"
 msgstr "Parameters:"
 
-#: ../objects/UML/class_dialog.c:2147
+#: ../objects/UML/class_dialog.c:2239
 msgid "Parameter data"
 msgstr "Parameter data"
 
-#: ../objects/UML/class_dialog.c:2179
+#: ../objects/UML/class_dialog.c:2272
 msgid "Def. value:"
 msgstr "Def. value:"
 
-#: ../objects/UML/class_dialog.c:2219
-#: ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_dialog.c:2306
+msgid "Direction:"
+msgstr "Direction:"
+
+#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../objects/UML/class_dialog.c:2227
-#: ../objects/UML/umlparameter.c:35
+#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
 msgid "In"
 msgstr "In"
 
-#: ../objects/UML/class_dialog.c:2236
-#: ../objects/UML/umlparameter.c:36
+#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
 msgid "Out"
 msgstr "Out"
 
-#: ../objects/UML/class_dialog.c:2245
-#: ../objects/UML/umlparameter.c:37
+#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
 msgid "In & Out"
 msgstr "In & Out"
 
+#. Operations page:
+#: ../objects/UML/class_dialog.c:2359
+msgid "_Operations"
+msgstr "_Operations"
+
+#: ../objects/UML/class_dialog.c:2417
+msgid "Operation data"
+msgstr "Operation data"
+
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2610
+#: ../objects/UML/class_dialog.c:2780
 msgid "_Templates"
 msgstr "_Templates"
 
-#: ../objects/UML/class_dialog.c:2616
-#: ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
 msgid "Template class"
 msgstr "Template class"
 
-#: ../objects/UML/class_dialog.c:2673
+#: ../objects/UML/class_dialog.c:2843
 msgid "Formal parameter data"
 msgstr "Formal parameter data"
 
-#: ../objects/UML/classicon.c:128
+#: ../objects/UML/classicon.c:130
 msgid "Boundary"
 msgstr "Boundary"
 
-#: ../objects/UML/classicon.c:140
+#: ../objects/UML/classicon.c:145
 msgid "Is object"
 msgstr "Is object"
 
-#: ../objects/UML/component_feature.c:145
-#: ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:14
 msgid "Facet"
 msgstr "Facet"
 
-#: ../objects/UML/component_feature.c:146
-#: ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:26
 msgid "Receptacle"
 msgstr "Receptacle"
 
-#: ../objects/UML/component_feature.c:147
-#: ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:152 ../sheets/UML.sheet.in.h:13
 msgid "Event Source"
 msgstr "Event Source"
 
-#: ../objects/UML/component_feature.c:148
-#: ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:153 ../sheets/UML.sheet.in.h:12
 msgid "Event Sink"
 msgstr "Event Sink"
 
-#: ../objects/UML/constraint.c:125
+#: ../objects/UML/constraint.c:127
 msgid "Constraint:"
 msgstr "Constraint:"
 
-#: ../objects/UML/dependency.c:139
+#: ../objects/UML/dependency.c:141
 msgid "Show arrow:"
 msgstr "Show arrow:"
 
-#: ../objects/UML/implements.c:129
+#. 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:131 ../objects/UML/implements.c:133
 msgid "Interface:"
 msgstr "Interface:"
 
-#: ../objects/UML/lifeline.c:144
+#: ../objects/UML/lifeline.c:152
 msgid "Draw focus of control:"
 msgstr "Draw focus of control:"
 
-#: ../objects/UML/lifeline.c:146
+#: ../objects/UML/lifeline.c:154
 msgid "Draw destruction mark:"
 msgstr "Draw destruction mark:"
 
-#: ../objects/UML/lifeline.c:417
+#: ../objects/UML/lifeline.c:499
 msgid "Add connection points"
 msgstr "Add connection points"
 
-#: ../objects/UML/lifeline.c:418
+#: ../objects/UML/lifeline.c:500
 msgid "Remove connection points"
 msgstr "Remove connection points"
 
-#: ../objects/UML/lifeline.c:422
+#: ../objects/UML/lifeline.c:501
+msgid "Increase connection points distance"
+msgstr "Increase connection points distance"
+
+#: ../objects/UML/lifeline.c:502
+msgid "Decrease connection points distance"
+msgstr "Decrease connection points distance"
+
+#: ../objects/UML/lifeline.c:503
+msgid "Set default connection points distance"
+msgstr "Set default connection points distance"
+
+#: ../objects/UML/lifeline.c:507
 msgid "UML Lifeline"
 msgstr "UML Lifeline"
 
-#: ../objects/UML/message.c:135
+#: ../objects/UML/message.c:137
 msgid "Call"
 msgstr "Call"
 
-#: ../objects/UML/message.c:136
+#: ../objects/UML/message.c:138
 msgid "Create"
 msgstr "Create"
 
-#: ../objects/UML/message.c:137
+#: ../objects/UML/message.c:139
 msgid "Destroy"
 msgstr "Destroy"
 
-#: ../objects/UML/message.c:138
+#: ../objects/UML/message.c:140
 msgid "Simple"
 msgstr "Simple"
 
-#: ../objects/UML/message.c:139
+#: ../objects/UML/message.c:141
 msgid "Return"
 msgstr "Return"
 
-#: ../objects/UML/message.c:140
+#: ../objects/UML/message.c:142
 msgid "Send"
 msgstr "Send"
 
-#: ../objects/UML/message.c:141
+#: ../objects/UML/message.c:143
 msgid "Recursive"
 msgstr "Recursive"
 
-#: ../objects/UML/message.c:153
+#: ../objects/UML/message.c:158
 msgid "Message type:"
 msgstr "Message type:"
 
-#: ../objects/UML/object.c:152
+#: ../objects/UML/object.c:155
 msgid "Explicit state"
 msgstr "Explicit state"
 
-#: ../objects/UML/object.c:157
+#: ../objects/UML/object.c:160
 msgid "Active object"
 msgstr "Active object"
 
-#: ../objects/UML/object.c:159
+#: ../objects/UML/object.c:162
 msgid "Show attributes"
 msgstr "Show attributes"
 
-#: ../objects/UML/object.c:161
+#: ../objects/UML/object.c:164
 msgid "Multiple instance"
 msgstr "Multiple instance"
 
-#: ../objects/UML/state.c:153
+#: ../objects/UML/state.c:155
 msgid "Entry action"
 msgstr "Entry action"
 
-#: ../objects/UML/state.c:154
+#: ../objects/UML/state.c:156
 msgid "Do action"
 msgstr "Do action"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:157
 msgid "Exit action"
 msgstr "Exit action"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:471
+#: ../objects/UML/state.c:479
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
 "That option will go away in future versions.\n"
@@ -5309,32 +5620,31 @@ msgstr ""
 "This option will go away in future versions.\n"
 "Please use the Initial/Final State object instead\n"
 
-#: ../objects/UML/state_term.c:120
+#: ../objects/UML/state_term.c:127
 msgid "Is final"
 msgstr "Is final"
 
-#: ../objects/UML/transition.c:132
+#: ../objects/UML/transition.c:141
 msgid "Trigger"
 msgstr "Trigger"
 
-#: ../objects/UML/transition.c:133
+#: ../objects/UML/transition.c:142
 msgid "The event that causes this transition to be taken"
 msgstr "The event that causes this transition to be taken"
 
-#: ../objects/UML/transition.c:134
+#: ../objects/UML/transition.c:143
 msgid "Action"
 msgstr "Action"
 
-#: ../objects/UML/transition.c:135
+#: ../objects/UML/transition.c:144
 msgid "Action to perform when this transition is taken"
 msgstr "Action to perform when this transition is taken"
 
-#: ../objects/UML/transition.c:136
-#: ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
 msgid "Guard"
 msgstr "Guard"
 
-#: ../objects/UML/transition.c:137
+#: ../objects/UML/transition.c:146
 msgid "Condition for taking this transition when the event is fired"
 msgstr "Condition for taking this transition when the event is fired"
 
@@ -5342,22 +5652,15 @@ msgstr "Condition for taking this transition when the event is fired"
 msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr "Unified Modelling Language diagram objects UML 1.3"
 
-#: ../objects/UML/umlattribute.c:41
-#: ../objects/UML/umlparameter.c:47
+#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
 msgid "Value"
 msgstr "Value"
 
-#: ../objects/UML/umlattribute.c:45
-#: ../objects/UML/umloperation.c:71
-msgid "Visibility"
-msgstr "Visibility"
-
 #: ../objects/UML/umlattribute.c:47
 msgid "Abstract (?)"
 msgstr "Abstract (?)"
 
-#: ../objects/UML/umlattribute.c:49
-#: ../objects/UML/umloperation.c:77
+#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
 msgid "Class scope (static)"
 msgstr "Class scope (static)"
 
@@ -5369,45 +5672,39 @@ msgstr "Inheritance type"
 msgid "Query (const)"
 msgstr "Query (const)"
 
-#: ../objects/UML/umloperation.c:79
-#: ../objects/chronogram/chronoline.c:162
+#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
 msgid "Parameters"
 msgstr "Parameters"
 
-#: ../objects/UML/usecase.c:132
+#: ../objects/UML/usecase.c:136
 msgid "Text outside"
 msgstr "Text outside"
 
-#: ../objects/UML/usecase.c:134
+#: ../objects/UML/usecase.c:138
 msgid "Collaboration"
 msgstr "Collaboration"
 
-#: ../objects/bondgraph/bondgraph.c:39
-msgid "Bond graph objects"
-msgstr "Bond graph objects"
-
 #: ../objects/chronogram/chronogram.c:40
 msgid "Chronogram diagram objects"
 msgstr "Chronogram diagram objects"
 
-#: ../objects/chronogram/chronoline.c:148
-#: ../sheets/AADL.sheet.in.h:4
+#: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
 msgid "Data"
 msgstr "Data"
 
-#: ../objects/chronogram/chronoline.c:150
+#: ../objects/chronogram/chronoline.c:152
 msgid "Data name"
 msgstr "Data name"
 
-#: ../objects/chronogram/chronoline.c:152
+#: ../objects/chronogram/chronoline.c:154
 msgid "Events"
 msgstr "Events"
 
-#: ../objects/chronogram/chronoline.c:155
+#: ../objects/chronogram/chronoline.c:157
 msgid "Event specification"
 msgstr "Event specification"
 
-#: ../objects/chronogram/chronoline.c:156
+#: ../objects/chronogram/chronoline.c:158
 msgid ""
 "@ time    set the pointer at an absolute time.\n"
 "( duration  sets the signal up, then wait 'duration'.\n"
@@ -5421,89 +5718,109 @@ msgstr ""
 "u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
 "example : @ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:164
-#: ../objects/chronogram/chronoref.c:146
+#: ../objects/chronogram/chronoline.c:166
+#: ../objects/chronogram/chronoref.c:148
 msgid "Start time"
 msgstr "Start time"
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
+#: ../objects/chronogram/chronoline.c:168
+#: ../objects/chronogram/chronoref.c:150
 msgid "End time"
 msgstr "End time"
 
-#: ../objects/chronogram/chronoline.c:168
+#: ../objects/chronogram/chronoline.c:170
 msgid "Rise time"
 msgstr "Rise time"
 
-#: ../objects/chronogram/chronoline.c:170
+#: ../objects/chronogram/chronoline.c:172
 msgid "Fall time"
 msgstr "Fall time"
 
-#: ../objects/chronogram/chronoline.c:171
+#: ../objects/chronogram/chronoline.c:173
 msgid "Multi-bit data"
 msgstr "Multi-bit data"
 
-#: ../objects/chronogram/chronoline.c:173
-#: ../objects/chronogram/chronoref.c:156
+#: ../objects/chronogram/chronoline.c:175
+#: ../objects/chronogram/chronoref.c:158
 msgid "Aspect"
 msgstr "Aspect"
 
-#: ../objects/chronogram/chronoline.c:175
+#: ../objects/chronogram/chronoline.c:177
 msgid "Data color"
 msgstr "Data colour"
 
-#: ../objects/chronogram/chronoline.c:177
+#: ../objects/chronogram/chronoline.c:179
 msgid "Data line width"
 msgstr "Data line width"
 
-#: ../objects/chronogram/chronoref.c:144
+#: ../objects/chronogram/chronoref.c:146
 msgid "Time data"
 msgstr "Time data"
 
-#: ../objects/chronogram/chronoref.c:150
+#: ../objects/chronogram/chronoref.c:152
 msgid "Major time step"
 msgstr "Major time step"
 
-#: ../objects/chronogram/chronoref.c:152
+#: ../objects/chronogram/chronoref.c:154
 msgid "Minor time step"
 msgstr "Minor time step"
 
-#: ../objects/chronogram/chronoref.c:162
+#: ../objects/chronogram/chronoref.c:164
 msgid "Minor step line width"
 msgstr "Minor step line width"
 
-#: ../objects/custom/custom.c:117
+#: ../objects/custom/custom.c:140
 msgid "Custom"
 msgstr "Custom"
 
-#: ../objects/custom/custom.c:117
+#: ../objects/custom/custom.c:140
 msgid "Custom XML shapes loader"
 msgstr "Custom XML shapes loader"
 
-#: ../objects/custom/custom_object.c:178
-#: ../objects/custom/custom_object.c:203
+#: ../objects/custom/custom_object.c:208 ../objects/custom/custom_object.c:240
 msgid "Flip horizontal"
 msgstr "Flip horizontal"
 
-#: ../objects/custom/custom_object.c:180
-#: ../objects/custom/custom_object.c:205
+#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:242
 msgid "Flip vertical"
 msgstr "Flip vertical"
 
-#: ../objects/custom/custom_object.c:1442
+#: ../objects/custom/custom_object.c:213 ../objects/custom/custom_object.c:245
+msgid "Scale of the subshapes"
+msgstr "Scale of the subshapes"
+
+#: ../objects/custom/custom_object.c:1737
 msgid "Flip Horizontal"
 msgstr "Flip Horizontal"
 
-#: ../objects/custom/custom_object.c:1443
+#: ../objects/custom/custom_object.c:1738
 msgid "Flip Vertical"
 msgstr "Flip Vertical"
 
-#: ../objects/custom/custom_object.c:1480
+#: ../objects/custom/custom_object.c:1775
+#: ../objects/custom_lines/custom_linetypes.c:264
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
 msgstr "Cannot open icon file %s for object type '%s'."
 
-#: ../objects/custom/shape_info.c:129
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "CustomLines"
+msgstr "CustomLines"
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "Custom XML lines loader"
+msgstr "Custom XML lines loader"
+
+#: ../objects/custom_lines/custom_linetypes.c:227
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+msgstr "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+
+#: ../objects/custom_lines/custom_linetypes.c:252
+#, c-format
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
+msgstr "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
+
+#: ../objects/custom/shape_info.c:163
 #, c-format
 msgid ""
 "The file '%s' has invalid path data.\n"
@@ -5512,243 +5829,248 @@ msgstr ""
 "The file '%s' has invalid path data.\n"
 "svg:path data must start with moveto."
 
-#: ../objects/flowchart/box.c:150
-#: ../objects/standard/box.c:150
-#: ../objects/standard/polyline.c:134
-#: ../objects/standard/zigzagline.c:130
-msgid "Corner radius"
-msgstr "Corner radius"
-
 #: ../objects/flowchart/flowchart.c:37
 msgid "Flowchart objects"
 msgstr "Flowchart objects"
 
-#: ../objects/flowchart/parallelogram.c:152
+#: ../objects/flowchart/parallelogram.c:154
 msgid "Shear angle"
 msgstr "Shear angle"
 
-#: ../objects/network/basestation.c:135
+#: ../objects/network/basestation.c:137
 msgid "Sectors"
 msgstr "Sectors"
 
-#: ../objects/network/basestation.c:396
-#: ../objects/network/basestation.c:398
+#: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
 msgid "Base Station"
 msgstr "Base Station"
 
-#: ../objects/network/bus.c:611
-msgid "Add Handle"
-msgstr "Add Handle"
-
-#: ../objects/network/bus.c:612
-msgid "Delete Handle"
-msgstr "Delete Handle"
-
 #: ../objects/network/network.c:43
 msgid "Network diagram objects"
 msgstr "Network diagram objects"
 
-#: ../objects/network/radiocell.c:119
+#: ../objects/network/radiocell.c:121
 msgid "Radius"
 msgstr "Radius"
 
-#: ../objects/network/wanlink.c:117
+#: ../objects/network/wanlink.c:119
 msgid "Width"
 msgstr "Width"
 
-#: ../objects/standard/arc.c:140
+#: ../objects/standard/arc.c:143
 msgid "Curve distance"
 msgstr "Curve distance"
 
-#: ../objects/standard/bezier.c:137
-#: ../objects/standard/line.c:141
-#: ../objects/standard/polyline.c:135
+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
+#: ../objects/standard/polyline.c:141
 msgid "Line gaps"
 msgstr "Line gaps"
 
-#: ../objects/standard/bezier.c:139
-#: ../objects/standard/line.c:143
-#: ../objects/standard/polyline.c:137
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
+#: ../objects/standard/polyline.c:143
 msgid "Absolute start gap"
 msgstr "Absolute start gap"
 
-#: ../objects/standard/bezier.c:141
-#: ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:139
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
+#: ../objects/standard/polyline.c:145
 msgid "Absolute end gap"
 msgstr "Absolute end gap"
 
-#: ../objects/standard/bezier.c:698
-#: ../objects/standard/beziergon.c:482
+#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
 msgid "Add Segment"
 msgstr "Add Segment"
 
-#: ../objects/standard/bezier.c:699
-#: ../objects/standard/beziergon.c:483
+#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
 msgid "Delete Segment"
 msgstr "Delete Segment"
 
-#: ../objects/standard/bezier.c:701
-#: ../objects/standard/beziergon.c:485
+#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
 msgid "Symmetric control"
 msgstr "Symmetric control"
 
-#: ../objects/standard/bezier.c:703
-#: ../objects/standard/beziergon.c:487
+#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
 msgid "Smooth control"
 msgstr "Smooth control"
 
-#: ../objects/standard/bezier.c:705
-#: ../objects/standard/beziergon.c:489
+#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
 msgid "Cusp control"
 msgstr "Cusp control"
 
-#: ../objects/standard/box.c:137
-#: ../objects/standard/ellipse.c:131
+#: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
 msgid "Free"
 msgstr "Free"
 
-#: ../objects/standard/box.c:138
-#: ../objects/standard/ellipse.c:132
+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:134
 msgid "Fixed"
 msgstr "Fixed"
 
-#: ../objects/standard/box.c:139
-#: ../objects/standard/box.c:694
+#: ../objects/standard/box.c:141 ../objects/standard/box.c:699
 msgid "Square"
 msgstr "Square"
 
-#: ../objects/standard/box.c:152
-#: ../objects/standard/ellipse.c:144
+#: ../objects/standard/box.c:154 ../objects/standard/ellipse.c:146
 msgid "Aspect ratio"
 msgstr "Aspect ratio"
 
-#: ../objects/standard/box.c:690
-#: ../objects/standard/ellipse.c:668
+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
 msgid "Free aspect"
 msgstr "Free aspect"
 
-#: ../objects/standard/box.c:692
-#: ../objects/standard/ellipse.c:670
+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
 msgid "Fixed aspect"
 msgstr "Fixed aspect"
 
-#: ../objects/standard/ellipse.c:133
-#: ../objects/standard/ellipse.c:672
+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
 msgid "Circle"
 msgstr "Circle"
 
-#: ../objects/standard/image.c:132
+#: ../objects/standard/image.c:139
 msgid "Image file"
 msgstr "Image file"
 
-#: ../objects/standard/image.c:134
+#: ../objects/standard/image.c:141
 msgid "Draw border"
 msgstr "Draw border"
 
-#: ../objects/standard/image.c:136
+#: ../objects/standard/image.c:143
 msgid "Keep aspect ratio"
 msgstr "Keep aspect ratio"
 
 #. Found file in same dir as diagram.
 #. Found file in current dir.
-#: ../objects/standard/image.c:679
-#: ../objects/standard/image.c:690
+#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
 #, c-format
 msgid ""
 "The image file '%s' was not found in that directory.\n"
 "Using the file '%s' instead\n"
 msgstr ""
-"The image file '%s' was not found in specified directory.\n"
+"The image file '%s' was not found in the specified directory.\n"
 "Using the file '%s' instead\n"
 
 #. Didn't find file in current dir.
-#: ../objects/standard/image.c:696
-#: ../objects/standard/image.c:718
+#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
 #, c-format
 msgid "The image file '%s' was not found.\n"
 msgstr "The image file '%s' was not found.\n"
 
-#: ../objects/standard/line.c:132
+#: ../objects/standard/line.c:136
 msgid "Arrows"
 msgstr "Arrows"
 
-#: ../objects/standard/line.c:137
+#: ../objects/standard/line.c:141
 msgid "Start point"
 msgstr "Start point"
 
-#: ../objects/standard/line.c:139
+#: ../objects/standard/line.c:143
 msgid "End point"
 msgstr "End point"
 
-#: ../objects/standard/polygon.c:460
-#: ../objects/standard/polyline.c:577
+#: ../objects/standard/outline.c:204
+msgid "Text content"
+msgstr "Text content"
+
+#: ../objects/standard/outline.c:206
+msgid "Angle to rotate the outline"
+msgstr "Angle to rotate the outline"
+
+#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
 msgid "Add Corner"
 msgstr "Add Corner"
 
-#: ../objects/standard/polygon.c:461
-#: ../objects/standard/polyline.c:578
+#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
 msgid "Delete Corner"
 msgstr "Delete Corner"
 
-#: ../objects/standard/standard.c:45
+#: ../objects/standard/standard.c:46
 msgid "Standard objects"
 msgstr "Standard objects"
 
-#: ../objects/standard/textobj.c:134
+#: ../objects/standard/textobj.c:139
 msgid "First Line"
 msgstr "First Line"
 
-#: ../objects/standard/textobj.c:141
+#: ../objects/standard/textobj.c:146
 msgid "Vertical text alignment"
 msgstr "Vertical text alignment"
 
-#: ../plug-ins/cairo/diacairo.c:976
+#: ../plug-ins/cairo/diacairo-interactive.c:261
+#: ../plug-ins/cairo/diacairo-interactive.c:262
+msgid "Zoom pointer"
+msgstr "Zoom pointer"
+
+#: ../plug-ins/cairo/diacairo-interactive.c:268
+#: ../plug-ins/cairo/diacairo-interactive.c:269
+msgid "Visible rect pointer"
+msgstr "Visible rect pointer"
+
+#: ../plug-ins/cairo/diacairo.c:133
 #, c-format
 msgid ""
 "Can't convert output filename '%s' to locale encoding.\n"
 "Please choose a different name to save with cairo.\n"
 msgstr ""
 "Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with cairo.\n"
+"Please choose a different name to save with Cairo.\n"
+
+#: ../plug-ins/cairo/diacairo.c:276 ../plug-ins/cairo/diacairo.c:292
+#, c-format
+msgid "Can't write %d bytes to %s"
+msgstr "Can't write %d bytes to %s"
 
-#: ../plug-ins/cairo/diacairo.c:1094
+#: ../plug-ins/cairo/diacairo.c:305
+msgid "Clipboard copy failed"
+msgstr "Clipboard copy failed"
+
+#: ../plug-ins/cairo/diacairo.c:330 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1444
+msgid "Nothing to print"
+msgstr "Nothing to print"
+
+#: ../plug-ins/cairo/diacairo.c:345
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:1105
+#: ../plug-ins/cairo/diacairo.c:356
 msgid "Cairo Portable Document Format"
 msgstr "Cairo Portable Document Format"
 
-#: ../plug-ins/cairo/diacairo.c:1116
+#: ../plug-ins/cairo/diacairo.c:367
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Cairo Scalable Vector Graphics"
 
-#: ../plug-ins/cairo/diacairo.c:1126
+#: ../plug-ins/cairo/diacairo.c:379
+msgid "CairoScript"
+msgstr "CairoScript"
+
+#: ../plug-ins/cairo/diacairo.c:390
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:1134
+#: ../plug-ins/cairo/diacairo.c:398
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (with alpha)"
 
-#: ../plug-ins/cairo/diacairo.c:1144
+#: ../plug-ins/cairo/diacairo.c:408
+msgid "Cairo EMF"
+msgstr "Cairo WMF"
+
+#: ../plug-ins/cairo/diacairo.c:418
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:1153
-msgid "Cairo old WMF"
-msgstr "Cairo old WMF"
+#: ../plug-ins/cairo/diacairo.c:440
+msgid "Copy _Diagram"
+msgstr "Copy _Diagram"
 
-#: ../plug-ins/cairo/diacairo.c:1162
-msgid "Cairo Clipboard"
-msgstr "Cairo Clipboard"
+#: ../plug-ins/cairo/diacairo.c:449
+msgid "Print (GTK) ..."
+msgstr "Print (GTK+)â?¦"
 
-#: ../plug-ins/cairo/diacairo.c:1211
+#: ../plug-ins/cairo/diacairo.c:496
 msgid "Cairo based Rendering"
-msgstr "Cairo based Rendering"
+msgstr "Cairo-based Rendering"
 
-#: ../plug-ins/cgm/cgm.c:1105
+#: ../plug-ins/cgm/cgm.c:1106
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -5756,75 +6078,45 @@ msgstr ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
 
-#: ../plug-ins/cgm/cgm.c:1360
+#: ../plug-ins/cgm/cgm.c:1362
 msgid "Computer Graphics Metafile"
 msgstr "Computer Graphics Metafile"
 
-#: ../plug-ins/cgm/cgm.c:1385
+#: ../plug-ins/cgm/cgm.c:1387
 msgid "Computer Graphics Metafile export filter"
 msgstr "Computer Graphics Metafile export filter"
 
-#: ../plug-ins/dxf/dxf-export.c:528
-#: ../plug-ins/dxf/dxf-import.c:1387
-msgid "Drawing Interchange File"
-msgstr "Drawing Interchange File"
+#: ../plug-ins/drs/dia-render-script-import.c:223
+msgid "Broken file?"
+msgstr "Broken file?"
 
-#: ../plug-ins/dxf/dxf-import.c:482
-#: ../plug-ins/dxf/dxf-import.c:499
-msgid "Bad vertex bulge\n"
-msgstr "Bad vertex bulge\n"
+#: ../plug-ins/drs/dia-render-script.c:156
+#: ../plug-ins/drs/dia-render-script.c:161
+msgid "DiaRenderScript"
+msgstr "DiaRenderScript"
 
-#: ../plug-ins/dxf/dxf-import.c:1049
-#, c-format
-msgid "Scale: %f\n"
-msgstr "Scale: %f\n"
+#: ../plug-ins/drs/dia-render-script.c:185
+msgid "DiaRenderScript filter"
+msgstr "DiaRenderScript filter"
+
+#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1405
+msgid "Drawing Interchange File"
+msgstr "Drawing Interchange File"
 
-#: ../plug-ins/dxf/dxf-import.c:1314
+#: ../plug-ins/dxf/dxf-import.c:1322
 #, c-format
 msgid "read_dxf_codes failed on '%s'\n"
 msgstr "read_dxf_codes failed on '%s'\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1322
+#: ../plug-ins/dxf/dxf-import.c:1329
 #, c-format
 msgid "Binary DXF from '%s' not supported\n"
 msgstr "Binary DXF from '%s' not supported\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1353
-#, c-format
-msgid "Unknown dxf code %d\n"
-msgstr "Unknown dxf code %d\n"
-
 #: ../plug-ins/dxf/dxf.c:50
 msgid "Drawing Interchange File import and export filters"
 msgstr "Drawing Interchange File import and export filters"
 
-#: ../plug-ins/gprint/diagnomeprint.c:81
-#, c-format
-msgid ""
-"GNOME Print Backend\n"
-" '%s'\n"
-" not available"
-msgstr ""
-"GNOME Print Backend\n"
-" '%s'\n"
-" not available"
-
-#: ../plug-ins/gprint/diagnomeprint.c:112
-msgid "GNOME PostScript"
-msgstr "GNOME PostScript"
-
-#: ../plug-ins/gprint/diagnomeprint.c:121
-msgid "GNOME Portable Document Format"
-msgstr "GNOME Portable Document Format"
-
-#: ../plug-ins/gprint/diagnomeprint.c:131
-msgid "GNOME Scalable Vector Graphic"
-msgstr "GNOME Scalable Vector Graphic"
-
-#: ../plug-ins/gprint/diagnomeprint.c:164
-msgid "GNOME Print based Rendering"
-msgstr "GNOME Print based Rendering"
-
 #: ../plug-ins/hpgl/hpgl.c:751
 msgid "HP Graphics Language"
 msgstr "HP Graphics Language"
@@ -5833,11 +6125,56 @@ msgstr "HP Graphics Language"
 msgid "HP Graphics Language export filter"
 msgstr "HP Graphics Language export filter"
 
+#: ../plug-ins/libart/dialibart.c:59
+msgid "Libart based rendering"
+msgstr "Libart-based rendering"
+
+#: ../plug-ins/libart/export_png.c:167
+msgid "Could not create PNG write structure"
+msgstr "Could not create PNG write structure"
+
+#: ../plug-ins/libart/export_png.c:176
+msgid "Could not create PNG header info structure"
+msgstr "Could not create PNG header info structure"
+
+#: ../plug-ins/libart/export_png.c:184
+msgid "Error occurred while writing PNG"
+msgstr "Error occurred while writing PNG"
+
+#. Create a dialog
+#: ../plug-ins/libart/export_png.c:327
+msgid "PNG Export Options"
+msgstr "PNG Export Options"
+
+#: ../plug-ins/libart/export_png.c:333
+msgid "Image width:"
+msgstr "Image width:"
+
+#: ../plug-ins/libart/export_png.c:336
+msgid "Image height:"
+msgstr "Image height:"
+
+#: ../plug-ins/libart/export_png.c:382
+msgid "PNG (anti-aliased)"
+msgstr "PNG (antialiased)"
+
+#: ../plug-ins/libart/dialibartrenderer.c:304
+msgid "gdk_renderer: Unsupported fill mode specified!\n"
+msgstr "gdk_renderer: Unsupported fill mode specified!\n"
+
+#: ../plug-ins/libart/dialibartrenderer.c:1478
+msgid "Renderer transformation"
+msgstr "Renderer transformation"
+
+#: ../plug-ins/libart/dialibartrenderer.c:1479
+msgid "Transform pointer"
+msgstr "Transform pointer"
+
 #: ../plug-ins/metapost/metapost.c:46
 msgid "TeX Metapost export filter"
 msgstr "TeX Metapost export filter"
 
-#: ../plug-ins/metapost/render_metapost.c:1262
+#: ../plug-ins/metapost/render_metapost.c:1259
 msgid "TeX Metapost macros"
 msgstr "TeX Metapost macros"
 
@@ -5848,9 +6185,9 @@ msgstr "LaTeX PGF export filter"
 #: ../plug-ins/pgf/render_pgf.c:1112
 #: ../plug-ins/pstricks/render_pstricks.c:733
 msgid "Not valid UTF8"
-msgstr "Not valid UTF8"
+msgstr "Not valid UTF-8"
 
-#: ../plug-ins/pgf/render_pgf.c:1277
+#: ../plug-ins/pgf/render_pgf.c:1262
 msgid "LaTeX PGF macros"
 msgstr "LaTeX PGF macros"
 
@@ -5867,17 +6204,74 @@ msgstr ""
 
 #: ../plug-ins/pixbuf/pixbuf.c:199
 msgid "gdk-pixbuf based bitmap export/import"
-msgstr "gdk-pixbuf based bitmap export/import"
+msgstr "gdk-pixbuf-based bitmap export/import"
+
+#: ../plug-ins/postscript/paginate_psprint.c:273
+msgid "Select Printer"
+msgstr "Select Printer"
+
+#: ../plug-ins/postscript/paginate_psprint.c:285
+#: ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Printer"
+msgstr "Printer"
+
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
+msgid "File"
+msgstr "File"
+
+#: ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "OK"
+
+#: ../plug-ins/postscript/paginate_psprint.c:456
+#, c-format
+msgid "Could not run command '%s': %s"
+msgstr "Could not run command '%s': %s"
+
+#: ../plug-ins/postscript/paginate_psprint.c:459
+#, c-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "Could not open '%s' for writing: %s"
+
+#: ../plug-ins/postscript/paginate_psprint.c:481
+#, c-format
+msgid "Printing error: command '%s' returned %d\n"
+msgstr "Printing error: command '%s' returned %d\n"
+
+#: ../plug-ins/postscript/paginate_psprint.c:492
+#, c-format
+msgid "Printing error: command '%s' caused sigpipe."
+msgstr "Printing error: command '%s' caused sigpipe."
+
+#: ../plug-ins/postscript/render_eps.c:150
+msgid "Encapsulated Postscript (using Pango fonts)"
+msgstr "Encapsulated PostScript (using Pango fonts)"
+
+#: ../plug-ins/postscript/render_eps.c:159
+msgid "Encapsulated Postscript with preview (using Pango fonts)"
+msgstr "Encapsulated PostScript with preview (using Pango fonts)"
+
+#: ../plug-ins/postscript/render_eps.c:169
+msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
+msgstr "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+
+#: ../plug-ins/postscript/postscript.c:46
+msgid "Print (PS)"
+msgstr "Print (PS)"
+
+#: ../plug-ins/postscript/postscript.c:70
+msgid "Postscript Rendering"
+msgstr "PostScript Rendering"
 
 #: ../plug-ins/pstricks/pstricks.c:26
 msgid "TeX Pstricks export filter"
-msgstr "TeX Pstricks export filter"
+msgstr "TeX PSTricks export filter"
 
 #: ../plug-ins/pstricks/render_pstricks.c:987
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks macros"
 
-#: ../plug-ins/python/pydia-render.c:719
+#: ../plug-ins/python/pydia-render.c:779
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "Couldn't open '%s' for writing.\n"
@@ -5886,24 +6280,23 @@ msgstr "Couldn't open '%s' for writing.\n"
 msgid "Python scripting support"
 msgstr "Python scripting support"
 
-#: ../plug-ins/shape/shape-export.c:477
-msgid "Can't export png without libart!"
-msgstr "Can't export png without libart!"
+#: ../plug-ins/shape/shape-export.c:474
+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
+msgstr "Shape files must end in .shape, or they cannot be loaded by Dia"
 
-#: ../plug-ins/shape/shape-export.c:502
+#: ../plug-ins/shape/shape-export.c:488
+msgid "Can't export png icon without export plug-in!"
+msgstr "Can't export PNG icon without export plugin!"
+
+#: ../plug-ins/shape/shape-export.c:512
 msgid "Dia Shape File"
 msgstr "Dia Shape File"
 
 #: ../plug-ins/shape/shape.c:36
 msgid "dia shape export filter"
-msgstr "dia shape export filter"
-
-#: ../plug-ins/svg/render_svg.c:294
-#: ../plug-ins/svg/svg-import.c:676
-msgid "Scalable Vector Graphics"
-msgstr "Scalable Vector Graphics"
+msgstr "Dia shape export filter"
 
-#: ../plug-ins/svg/svg-import.c:195
+#: ../plug-ins/svg/svg-import.c:258
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -5911,74 +6304,71 @@ msgstr ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
 
-#: ../plug-ins/svg/svg-import.c:637
+#: ../plug-ins/svg/svg-import.c:806
 msgid "Expected SVG Namespace not found in file"
 msgstr "Expected SVG Namespace not found in file"
 
-#: ../plug-ins/svg/svg-import.c:657
+#: ../plug-ins/svg/svg-import.c:826
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
-msgstr "root element was '%s' -- expecting 'svg'."
+msgstr "root element was '%s' â?? expecting 'svg'."
 
 #: ../plug-ins/svg/svg.c:50
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "Scalable Vector Graphics import and export filters"
 
-#: ../plug-ins/vdx/vdx-export.c:1376
-#: ../plug-ins/vdx/vdx-export.c:1385
+#: ../plug-ins/vdx/vdx-export.c:1375 ../plug-ins/vdx/vdx-export.c:1384
 #, c-format
 msgid "Couldn't read file %s"
 msgstr "Couldn't read file %s"
 
-#: ../plug-ins/vdx/vdx-export.c:1905
+#: ../plug-ins/vdx/vdx-export.c:1911
 msgid "Visio XML format"
 msgstr "Visio XML format"
 
-#: ../plug-ins/vdx/vdx-import.c:219
-#: ../plug-ins/xfig/xfig-import.c:1036
+#: ../plug-ins/vdx/vdx-import.c:227 ../plug-ins/xfig/xfig-import.c:1046
 #, c-format
 msgid "Couldn't read color: %s\n"
 msgstr "Couldn't read colour: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:513
+#: ../plug-ins/vdx/vdx-import.c:540
 #, c-format
 msgid "Couldn't find shape %d\n"
 msgstr "Couldn't find shape %d\n"
 
-#: ../plug-ins/vdx/vdx-import.c:982
+#: ../plug-ins/vdx/vdx-import.c:1048
 #, c-format
 msgid "Unexpected Ellipse object: %s\n"
 msgstr "Unexpected Ellipse object: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:996
+#: ../plug-ins/vdx/vdx-import.c:1062
 msgid "Can't rotate ellipse\n"
 msgstr "Can't rotate ellipse\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1312
+#: ../plug-ins/vdx/vdx-import.c:1393
 msgid "MoveTo not at start of Bezier\n"
 msgstr "MoveTo not at start of Bezier\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1645
+#: ../plug-ins/vdx/vdx-import.c:1743
 msgid "Invalid NURBS formula"
 msgstr "Invalid NURBS formula"
 
-#: ../plug-ins/vdx/vdx-import.c:1881
+#: ../plug-ins/vdx/vdx-import.c:1990 ../plug-ins/vdx/vdx-import.c:2002
 #, c-format
 msgid "Couldn't write file %s"
 msgstr "Couldn't write file %s"
 
-#: ../plug-ins/vdx/vdx-import.c:1966
-#: ../plug-ins/vdx/vdx-import.c:1979
+#: ../plug-ins/vdx/vdx-import.c:2055 ../plug-ins/vdx/vdx-import.c:2068
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "Couldn't handle foreign object type %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2007
+#: ../plug-ins/vdx/vdx-import.c:2096
 #, c-format
 msgid "Couldn't make object dir %s"
-msgstr "Couldn't make object dir %s"
+msgstr "Couldn't make object directory %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2954
+#: ../plug-ins/vdx/vdx-import.c:3086
 msgid "Visio XML File Format"
 msgstr "Visio XML File Format"
 
@@ -5996,20 +6386,33 @@ msgstr "Can't write object %u"
 msgid "Visio XML Format import and export filter"
 msgstr "Visio XML Format import and export filter"
 
-#: ../plug-ins/wmf/wmf.cpp:1187
+#: ../plug-ins/wmf/wmf.cpp:515
+#, c-format
+msgid ""
+"Can not render unknown font:\n"
+"%s"
+msgstr ""
+"Cannot render unknown font:\n"
+"%s"
+
+#: ../plug-ins/wmf/wmf.cpp:1321
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "Couldn't open: '%s' for writing.\n"
 
-#: ../plug-ins/wmf/wmf.cpp:1272
+#: ../plug-ins/wmf/wmf.cpp:1420
 msgid "Windows Meta File"
-msgstr "Windows Meta File"
+msgstr "Windows Metafile"
 
-#: ../plug-ins/wmf/wmf.cpp:1281
+#: ../plug-ins/wmf/wmf.cpp:1429
 msgid "Enhanced Meta File"
-msgstr "Enhanced Meta File"
+msgstr "Enhanced Metafile"
+
+#: ../plug-ins/wmf/wmf.cpp:1451
+msgid "Print (GDI) ..."
+msgstr "Print (GDI)â?¦"
 
-#: ../plug-ins/wmf/wmf.cpp:1297
+#: ../plug-ins/wmf/wmf.cpp:1466
 msgid "WMF export filter"
 msgstr "WMF export filter"
 
@@ -6018,8 +6421,7 @@ msgstr "WMF export filter"
 msgid "File: %s type/version unsupported.\n"
 msgstr "File: %s type/version unsupported.\n"
 
-#: ../plug-ins/wpg/wpg.c:1321
-#: ../plug-ins/wpg/wpg.c:1328
+#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
 msgid "WPG"
 msgstr "WPG"
 
@@ -6030,20 +6432,21 @@ msgstr "WordPerfect Graphics export filter"
 #: ../plug-ins/xfig/xfig-export.c:461
 #, c-format
 msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-msgstr "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
+msgstr "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
 
-#: ../plug-ins/xfig/xfig-export.c:483
+#: ../plug-ins/xfig/xfig-export.c:484
 msgid "No more user-definable colors - using black"
-msgstr "No more user-definable colours - using black"
+msgstr "No more user-definable colours â?? using black"
 
-#: ../plug-ins/xfig/xfig-export.c:1188
+#: ../plug-ins/xfig/xfig-export.c:1205
 msgid "XFig format"
-msgstr "XFig format"
+msgstr "Xfig format"
 
 #: ../plug-ins/xfig/xfig-import.c:111
 #, c-format
 msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-msgstr "Colour index %d too high, only 512 colours allowed. Using black instead."
+msgstr ""
+"Colour index %d too high; only 512 colours allowed. Using black instead."
 
 #: ../plug-ins/xfig/xfig-import.c:138
 msgid "Patterns are not supported by Dia"
@@ -6051,7 +6454,7 @@ msgstr "Patterns are not supported by Dia"
 
 #: ../plug-ins/xfig/xfig-import.c:166
 msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-msgstr "Triple-dotted lines are not supported by Dia, using double-dotted"
+msgstr "Triple-dotted lines are not supported by Dia; using double-dotted"
 
 #: ../plug-ins/xfig/xfig-import.c:170
 #, c-format
@@ -6075,7 +6478,7 @@ msgstr "Unknown arrow type %d\n"
 #: ../plug-ins/xfig/xfig-import.c:379
 #, c-format
 msgid "Depth %d of of range, only 0-%d allowed.\n"
-msgstr "Depth %d of of range, only 0-%d allowed.\n"
+msgstr "Depth %d of of range; only 0â??%d allowed.\n"
 
 #: ../plug-ins/xfig/xfig-import.c:426
 #, c-format
@@ -6094,24 +6497,21 @@ msgstr "Couldn't read flipped bit: %s\n"
 
 #: ../plug-ins/xfig/xfig-import.c:527
 msgid "Negative corner radius, negating"
-msgstr "Negative corner radius, negating"
+msgstr "Negative corner radius; negating"
 
 #: ../plug-ins/xfig/xfig-import.c:570
-#: ../plug-ins/xfig/xfig-import.c:883
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "Unknown polyline subtype: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:720
-#: ../plug-ins/xfig/xfig-import.c:752
+#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
 #, c-format
 msgid "Couldn't read spline info: %s\n"
 msgstr "Couldn't read spline info: %s\n"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:739
-#: ../plug-ins/xfig/xfig-import.c:757
+#: ../plug-ins/xfig/xfig-import.c:739 ../plug-ins/xfig/xfig-import.c:757
 msgid "Cannot convert approximated spline yet."
 msgstr "Cannot convert approximated spline yet."
 
@@ -6120,162 +6520,175 @@ msgstr "Cannot convert approximated spline yet."
 msgid "Unknown spline subtype: %d\n"
 msgstr "Unknown spline subtype: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:858
+#: ../plug-ins/xfig/xfig-import.c:860
 #, c-format
 msgid "Couldn't read arc info: %s\n"
 msgstr "Couldn't read arc info: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:947
+#. set new fill property on arc?
+#: ../plug-ins/xfig/xfig-import.c:889
+msgid "Filled arc treated as unfilled"
+msgstr "Filled arc treated as unfilled"
+
+#: ../plug-ins/xfig/xfig-import.c:893
+#, c-format
+msgid "Unknown polyline arc: %d\n"
+msgstr "Unknown polyline arc: %d\n"
+
+#: ../plug-ins/xfig/xfig-import.c:957
 #, c-format
 msgid "Couldn't read text info: %s\n"
 msgstr "Couldn't read text info: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1009
+#: ../plug-ins/xfig/xfig-import.c:1019
 #, c-format
 msgid "Couldn't identify FIG object: %s\n"
-msgstr "Couldn't identify FIG object: %s\n"
+msgstr "Couldn't identify Fig object: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1017
+#: ../plug-ins/xfig/xfig-import.c:1027
 msgid "Compound end outside compound\n"
 msgstr "Compound end outside compound\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1041
+#: ../plug-ins/xfig/xfig-import.c:1051
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
-msgstr "Colour number %d out of range 0..%d.  Discarding colour.\n"
+msgstr "Colour number %d out of range 0â??%d.  Discarding colour.\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1087
+#: ../plug-ins/xfig/xfig-import.c:1097
 #, c-format
 msgid "Couldn't read group extend: %s\n"
 msgstr "Couldn't read group extend: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1098
+#: ../plug-ins/xfig/xfig-import.c:1108
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "Unknown object type %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1122
+#: ../plug-ins/xfig/xfig-import.c:1132
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "`%s' is not one of `%s' or `%s'\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
+#: ../plug-ins/xfig/xfig-import.c:1142
 #, c-format
 msgid "Error reading paper size: %s\n"
 msgstr "Error reading paper size: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1143
+#: ../plug-ins/xfig/xfig-import.c:1153
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "Unknown paper size `%s', using default\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1155
+#: ../plug-ins/xfig/xfig-import.c:1165
 #, c-format
 msgid "Error reading paper orientation: %s\n"
 msgstr "Error reading paper orientation: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
+#: ../plug-ins/xfig/xfig-import.c:1175
 #, c-format
 msgid "Error reading justification: %s\n"
 msgstr "Error reading justification: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
+#: ../plug-ins/xfig/xfig-import.c:1185
 #, c-format
 msgid "Error reading units: %s\n"
 msgstr "Error reading units: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1191
+#: ../plug-ins/xfig/xfig-import.c:1201
 #, c-format
 msgid "Error reading magnification: %s\n"
 msgstr "Error reading magnification: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1204
+#: ../plug-ins/xfig/xfig-import.c:1214
 #, c-format
 msgid "Error reading multipage indicator: %s\n"
 msgstr "Error reading multipage indicator: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1215
+#: ../plug-ins/xfig/xfig-import.c:1225
 #, c-format
 msgid "Error reading transparent color: %s\n"
 msgstr "Error reading transparent colour: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1224
-#: ../plug-ins/xfig/xfig-import.c:1280
-#: ../plug-ins/xfig/xfig-import.c:1298
+#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
+#: ../plug-ins/xfig/xfig-import.c:1308
 #, c-format
 msgid "Error reading FIG file: %s\n"
-msgstr "Error reading FIG file: %s\n"
+msgstr "Error reading Fig file: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1226
-#: ../plug-ins/xfig/xfig-import.c:1282
+#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
 msgid "Premature end of FIG file\n"
-msgstr "Premature end of FIG file\n"
+msgstr "Premature end of Fig file\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1235
+#: ../plug-ins/xfig/xfig-import.c:1245
 #, c-format
 msgid "Error reading resolution: %s\n"
 msgstr "Error reading resolution: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1267
+#: ../plug-ins/xfig/xfig-import.c:1277
 #, c-format
 msgid "Doesn't look like a Fig file: %s\n"
 msgstr "Doesn't look like a Fig file: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1273
+#: ../plug-ins/xfig/xfig-import.c:1283
 #, c-format
 msgid "This is a FIG version %d.%d file, I may not understand it\n"
-msgstr "This is a FIG version %d.%d file, I may not understand it\n"
+msgstr "This is a Fig version %d.%d file, I may not understand it\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1321
+#: ../plug-ins/xfig/xfig-import.c:1331
 msgid "XFig File Format"
-msgstr "XFig File Format"
+msgstr "Xfig File Format"
 
 #: ../plug-ins/xfig/xfig.c:51
 msgid "Fig Format import and export filter"
 msgstr "Fig Format import and export filter"
 
-#: ../plug-ins/xslt/xslt.c:105
+#: ../plug-ins/xslt/xslt.c:110
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "Error while parsing %s\n"
 
-#: ../plug-ins/xslt/xslt.c:114
+#: ../plug-ins/xslt/xslt.c:119
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "Error while parsing stylesheet %s\n"
 
-#: ../plug-ins/xslt/xslt.c:121
+#: ../plug-ins/xslt/xslt.c:126
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "Error while applying stylesheet %s\n"
 
-#: ../plug-ins/xslt/xslt.c:130
+#: ../plug-ins/xslt/xslt.c:135
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "Error while parsing stylesheet: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:139
+#: ../plug-ins/xslt/xslt.c:144
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "Error while applying stylesheet: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:325
+#: ../plug-ins/xslt/xslt.c:152
+#, c-format
+msgid "Error while saving result: %s\n"
+msgstr "Error while saving result: %s\n"
+
+#: ../plug-ins/xslt/xslt.c:336
 msgid "XSL Transformation filter"
 msgstr "XSL Transformation filter"
 
-#: ../plug-ins/xslt/xslt.c:349
+#: ../plug-ins/xslt/xslt.c:363
 msgid "No valid configuration files found for the XSLT plugin, not loading."
-msgstr "No valid configuration files found for the XSLT plugin, not loading."
+msgstr "No valid configuration files found for the XSLT plugin; not loading."
 
-#: ../plug-ins/xslt/xsltdialog.c:96
+#: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
 msgstr "Export through XSLT"
 
-#: ../plug-ins/xslt/xsltdialog.c:111
+#: ../plug-ins/xslt/xsltdialog.c:114
 msgid "From:"
 msgstr "From:"
 
-#: ../plug-ins/xslt/xsltdialog.c:146
+#: ../plug-ins/xslt/xsltdialog.c:149
 msgid "To:"
 msgstr "To:"
 
@@ -6327,8 +6740,12 @@ msgstr "Thread Group"
 #. 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
-msgid "An Assorted Collection of Polygons, Beziergons and other Miscellaneous Geometric Shapes"
-msgstr "An Assorted Collection of Polygons, Beziergons and other Miscellaneous Geometric Shapes"
+msgid ""
+"An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
+"Geometric Shapes"
+msgstr ""
+"An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
+"Geometric Shapes"
 
 #. Please talk to me before making any changes to this sheet
 #: ../sheets/Assorted.sheet.in.h:6
@@ -6341,11 +6758,11 @@ msgstr "Chevron"
 
 #: ../sheets/Assorted.sheet.in.h:8
 msgid "Curved eight point star"
-msgstr "Curved eight point star"
+msgstr "Curved eight-point star"
 
 #: ../sheets/Assorted.sheet.in.h:9
 msgid "Curved four point star"
-msgstr "Curved four point star"
+msgstr "Curved four-point star"
 
 #: ../sheets/Assorted.sheet.in.h:10
 msgid "Diamond"
@@ -6357,15 +6774,15 @@ msgstr "Down arrow"
 
 #: ../sheets/Assorted.sheet.in.h:12
 msgid "Eight point star"
-msgstr "Eight point star"
+msgstr "Eight-point star"
 
 #: ../sheets/Assorted.sheet.in.h:13
 msgid "Five point star"
-msgstr "Five point star"
+msgstr "Five-point star"
 
 #: ../sheets/Assorted.sheet.in.h:14
 msgid "Four point star"
-msgstr "Four point star"
+msgstr "Four-point star"
 
 #: ../sheets/Assorted.sheet.in.h:15
 msgid "Heart"
@@ -6373,11 +6790,11 @@ msgstr "Heart"
 
 #: ../sheets/Assorted.sheet.in.h:16
 msgid "Heptagon. Seven sided shape"
-msgstr "Heptagon. Seven sided shape"
+msgstr "Heptagon. Seven-sided shape"
 
 #: ../sheets/Assorted.sheet.in.h:17
 msgid "Hexagon. Six sided shape"
-msgstr "Hexagon. Six sided shape"
+msgstr "Hexagon. Six-sided shape"
 
 #: ../sheets/Assorted.sheet.in.h:18
 msgid "Horizontal parallelogram"
@@ -6417,7 +6834,7 @@ msgstr "Notched right arrow"
 
 #: ../sheets/Assorted.sheet.in.h:27
 msgid "Octogon. Eight sided shape"
-msgstr "Octogon. Eight sided shape"
+msgstr "Octogon. Eight-sided shape"
 
 #: ../sheets/Assorted.sheet.in.h:28
 msgid "Pentagon block arrow"
@@ -6425,7 +6842,7 @@ msgstr "Pentagon block arrow"
 
 #: ../sheets/Assorted.sheet.in.h:29
 msgid "Pentagon. Five sided shape"
-msgstr "Pentagon. Five sided shape"
+msgstr "Pentagon. Five-sided shape"
 
 #: ../sheets/Assorted.sheet.in.h:30
 msgid "Perfect circle"
@@ -6457,15 +6874,15 @@ msgstr "Right arrow"
 
 #: ../sheets/Assorted.sheet.in.h:37
 msgid "Seven point star"
-msgstr "Seven point star"
+msgstr "Seven-point star"
 
 #: ../sheets/Assorted.sheet.in.h:38
 msgid "Sharp eight point star"
-msgstr "Sharp eight point star"
+msgstr "Sharp eight-point star"
 
 #: ../sheets/Assorted.sheet.in.h:39
 msgid "Six point star"
-msgstr "Six point star"
+msgstr "Six-point star"
 
 #: ../sheets/Assorted.sheet.in.h:40
 msgid "Sun"
@@ -6514,7 +6931,7 @@ msgstr "BPMN"
 
 #: ../sheets/BPMN.sheet.in.h:5
 msgid "Business Process Modeling Notation"
-msgstr "Business Process Modeling Notation"
+msgstr "Business Process Modelling Notation"
 
 #: ../sheets/BPMN.sheet.in.h:6
 msgid "Collapsed Sub-Process"
@@ -6542,31 +6959,31 @@ msgstr "End Event"
 
 #: ../sheets/BPMN.sheet.in.h:12
 msgid "End Event - Cancel"
-msgstr "End Event - Cancel"
+msgstr "End Event â?? Cancel"
 
 #: ../sheets/BPMN.sheet.in.h:13
 msgid "End Event - Compensation"
-msgstr "End Event - Compensation"
+msgstr "End Event â?? Compensation"
 
 #: ../sheets/BPMN.sheet.in.h:14
 msgid "End Event - Error"
-msgstr "End Event - Error"
+msgstr "End Event â?? Error"
 
 #: ../sheets/BPMN.sheet.in.h:15
 msgid "End Event - Link"
-msgstr "End Event - Link"
+msgstr "End Event â?? Link"
 
 #: ../sheets/BPMN.sheet.in.h:16
 msgid "End Event - Message"
-msgstr "End Event - Message"
+msgstr "End Event â?? Message"
 
 #: ../sheets/BPMN.sheet.in.h:17
 msgid "End Event - Multiple"
-msgstr "End Event - Multiple"
+msgstr "End Event â?? Multiple"
 
 #: ../sheets/BPMN.sheet.in.h:18
 msgid "End Event - Terminate"
-msgstr "End Event - Terminate"
+msgstr "End Event â?? Terminate"
 
 #: ../sheets/BPMN.sheet.in.h:19
 msgid "Exclusive (XOR) Data Based"
@@ -6594,35 +7011,35 @@ msgstr "Intermediate Event"
 
 #: ../sheets/BPMN.sheet.in.h:25
 msgid "Intermediate Event - Cancel"
-msgstr "Intermediate Event - Cancel"
+msgstr "Intermediate Event â?? Cancel"
 
 #: ../sheets/BPMN.sheet.in.h:26
 msgid "Intermediate Event - Compensation"
-msgstr "Intermediate Event - Compensation"
+msgstr "Intermediate Event â?? Compensation"
 
 #: ../sheets/BPMN.sheet.in.h:27
 msgid "Intermediate Event - Error"
-msgstr "Intermediate Event - Error"
+msgstr "Intermediate Event â?? Error"
 
 #: ../sheets/BPMN.sheet.in.h:28
 msgid "Intermediate Event - Link"
-msgstr "Intermediate Event - Link"
+msgstr "Intermediate Event â?? Link"
 
 #: ../sheets/BPMN.sheet.in.h:29
 msgid "Intermediate Event - Message"
-msgstr "Intermediate Event - Message"
+msgstr "Intermediate Event â?? Message"
 
 #: ../sheets/BPMN.sheet.in.h:30
 msgid "Intermediate Event - Multiple"
-msgstr "Intermediate Event - Multiple"
+msgstr "Intermediate Event â?? Multiple"
 
 #: ../sheets/BPMN.sheet.in.h:31
 msgid "Intermediate Event - Rule"
-msgstr "Intermediate Event - Rule"
+msgstr "Intermediate Event â?? Rule"
 
 #: ../sheets/BPMN.sheet.in.h:32
 msgid "Intermediate Event - Timer"
-msgstr "Intermediate Event - Timer"
+msgstr "Intermediate Event â?? Timer"
 
 #: ../sheets/BPMN.sheet.in.h:33
 msgid "Looping Collapsed Sub-Process"
@@ -6646,23 +7063,23 @@ msgstr "Start Event"
 
 #: ../sheets/BPMN.sheet.in.h:38
 msgid "Start Event - Link"
-msgstr "Start Event - Link"
+msgstr "Start Event â?? Link"
 
 #: ../sheets/BPMN.sheet.in.h:39
 msgid "Start Event - Message"
-msgstr "Start Event - Message"
+msgstr "Start Event â?? Message"
 
 #: ../sheets/BPMN.sheet.in.h:40
 msgid "Start Event - Multiple"
-msgstr "Start Event - Multiple"
+msgstr "Start Event â?? Multiple"
 
 #: ../sheets/BPMN.sheet.in.h:41
 msgid "Start Event - Rule"
-msgstr "Start Event - Rule"
+msgstr "Start Event â?? Rule"
 
 #: ../sheets/BPMN.sheet.in.h:42
 msgid "Start Event - Timer"
-msgstr "Start Event - Timer"
+msgstr "Start Event â?? Timer"
 
 #: ../sheets/BPMN.sheet.in.h:44
 msgid "Text Annotation"
@@ -6777,10 +7194,6 @@ msgstr "Kettle Reboiler"
 msgid "Knock-out Drum (with demister pad)"
 msgstr "Knock-out Drum (with demister pad)"
 
-#: ../sheets/ChemEng.sheet.in.h:28
-msgid "Measurement"
-msgstr "Measurement"
-
 #: ../sheets/ChemEng.sheet.in.h:29
 msgid "Mixer"
 msgstr "Mixer"
@@ -6806,82 +7219,86 @@ msgid "Positive Displacement Rotary Pump or Compressor"
 msgstr "Positive Displacement Rotary Pump or Compressor"
 
 #: ../sheets/ChemEng.sheet.in.h:35
+msgid "Pressure Relief Valve"
+msgstr "Pressure Relief Valve"
+
+#: ../sheets/ChemEng.sheet.in.h:36
 msgid "Reactor or Absorption Vessel, simple"
 msgstr "Reactor or Absorption Vessel, simple"
 
-#: ../sheets/ChemEng.sheet.in.h:36
+#: ../sheets/ChemEng.sheet.in.h:37
 msgid "Reciprocating Compressor or Pump"
 msgstr "Reciprocating Compressor or Pump"
 
-#: ../sheets/ChemEng.sheet.in.h:37
+#: ../sheets/ChemEng.sheet.in.h:38
 msgid "Regulable Valve"
 msgstr "Regulable Valve"
 
-#: ../sheets/ChemEng.sheet.in.h:38
+#: ../sheets/ChemEng.sheet.in.h:39
 msgid "Regulable Valve, vertical"
 msgstr "Regulable Valve, vertical"
 
-#: ../sheets/ChemEng.sheet.in.h:39
+#: ../sheets/ChemEng.sheet.in.h:40
 msgid "Sealed Tank"
 msgstr "Sealed Tank"
 
-#: ../sheets/ChemEng.sheet.in.h:40
+#: ../sheets/ChemEng.sheet.in.h:41
 msgid "Simple Furnace"
 msgstr "Simple Furnace"
 
-#: ../sheets/ChemEng.sheet.in.h:41
+#: ../sheets/ChemEng.sheet.in.h:42
 msgid "Simple Heat Exchanger"
 msgstr "Simple Heat Exchanger"
 
-#: ../sheets/ChemEng.sheet.in.h:42
+#: ../sheets/ChemEng.sheet.in.h:43
 msgid "Simple Heat Exchanger, vertical"
 msgstr "Simple Heat Exchanger, vertical"
 
-#: ../sheets/ChemEng.sheet.in.h:43
+#: ../sheets/ChemEng.sheet.in.h:44
 msgid "Simple Vessel"
 msgstr "Simple Vessel"
 
-#: ../sheets/ChemEng.sheet.in.h:44
+#: ../sheets/ChemEng.sheet.in.h:45
 msgid "Spray Drier"
 msgstr "Spray Drier"
 
-#: ../sheets/ChemEng.sheet.in.h:45
+#: ../sheets/ChemEng.sheet.in.h:46
 msgid "Spraying Device"
 msgstr "Spraying Device"
 
-#: ../sheets/ChemEng.sheet.in.h:46
+#: ../sheets/ChemEng.sheet.in.h:47
 msgid "Storage Sphere"
 msgstr "Storage Sphere"
 
-#: ../sheets/ChemEng.sheet.in.h:47
+#: ../sheets/ChemEng.sheet.in.h:48
 msgid "Tank with Fixed Roof"
 msgstr "Tank with Fixed Roof"
 
-#: ../sheets/ChemEng.sheet.in.h:48
+#: ../sheets/ChemEng.sheet.in.h:49
 msgid "Tank with Floating Roof"
 msgstr "Tank with Floating Roof"
 
-#: ../sheets/ChemEng.sheet.in.h:49
+#: ../sheets/ChemEng.sheet.in.h:50
 msgid "Tray Column, detailed"
 msgstr "Tray Column, detailed"
 
-#: ../sheets/ChemEng.sheet.in.h:50
+#: ../sheets/ChemEng.sheet.in.h:51
 msgid "Tray Column, simple"
 msgstr "Tray Column, simple"
 
-#: ../sheets/ChemEng.sheet.in.h:51
+#: ../sheets/ChemEng.sheet.in.h:52
 msgid "Valve"
 msgstr "Valve"
 
-#: ../sheets/ChemEng.sheet.in.h:52
+#: ../sheets/ChemEng.sheet.in.h:53
 msgid "Valve, vertical"
 msgstr "Valve, vertical"
 
-#: ../sheets/ChemEng.sheet.in.h:53
+#: ../sheets/ChemEng.sheet.in.h:54
 msgid "Water Cooler"
 msgstr "Water Cooler"
 
-#: ../sheets/ChemEng.sheet.in.h:54
+#: ../sheets/ChemEng.sheet.in.h:55
 msgid "Water Cooler, vertical"
 msgstr "Water Cooler, vertical"
 
@@ -6927,7 +7344,7 @@ msgstr "Horizontally aligned inductor (European)"
 
 #: ../sheets/Circuit.sheet.in.h:11
 msgid "Horizontally aligned powersource"
-msgstr "Horizontally aligned powersource"
+msgstr "Horizontally aligned power source"
 
 #: ../sheets/Circuit.sheet.in.h:12
 msgid "Horizontally aligned resistor"
@@ -6945,8 +7362,7 @@ msgstr "Horizontally aligned zener diode"
 msgid "Lamp"
 msgstr "Lamp"
 
-#: ../sheets/Circuit.sheet.in.h:16
-#: ../sheets/ciscomisc.sheet.in.h:30
+#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
 msgid "Microphone"
 msgstr "Microphone"
 
@@ -6974,8 +7390,7 @@ msgstr "PMOS transistor"
 msgid "PNP bipolar transistor"
 msgstr "PNP bipolar transistor"
 
-#: ../sheets/Circuit.sheet.in.h:26
-#: ../sheets/ciscomisc.sheet.in.h:42
+#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Speaker"
 msgstr "Speaker"
 
@@ -7005,7 +7420,7 @@ msgstr "Vertically aligned inductor (European)"
 
 #: ../sheets/Circuit.sheet.in.h:33
 msgid "Vertically aligned powersource"
-msgstr "Vertically aligned powersource"
+msgstr "Vertically aligned power source"
 
 #: ../sheets/Circuit.sheet.in.h:34
 msgid "Vertically aligned resistor"
@@ -7121,19 +7536,19 @@ msgstr "High pass filter"
 
 #: ../sheets/Cybernetics.sheet.in.h:12
 msgid "Integrator - input bottom"
-msgstr "Integrator - input bottom"
+msgstr "Integrator â?? input bottom"
 
 #: ../sheets/Cybernetics.sheet.in.h:13
 msgid "Integrator - input left"
-msgstr "Integrator - input left"
+msgstr "Integrator â?? input left"
 
 #: ../sheets/Cybernetics.sheet.in.h:14
 msgid "Integrator - input right"
-msgstr "Integrator - input right"
+msgstr "Integrator â?? input right"
 
 #: ../sheets/Cybernetics.sheet.in.h:15
 msgid "Integrator - input top"
-msgstr "Integrator - input top"
+msgstr "Integrator â?? input top"
 
 #: ../sheets/Cybernetics.sheet.in.h:16
 msgid "Low pass filter"
@@ -7153,19 +7568,19 @@ msgstr "Saturation characteristic"
 
 #: ../sheets/Cybernetics.sheet.in.h:20
 msgid "Sensor - bottom"
-msgstr "Sensor - bottom"
+msgstr "Sensor â?? bottom"
 
 #: ../sheets/Cybernetics.sheet.in.h:21
 msgid "Sensor - left"
-msgstr "Sensor - left"
+msgstr "Sensor â?? left"
 
 #: ../sheets/Cybernetics.sheet.in.h:22
 msgid "Sensor - right"
-msgstr "Sensor - right"
+msgstr "Sensor â?? right"
 
 #: ../sheets/Cybernetics.sheet.in.h:23
 msgid "Sensor - top"
-msgstr "Sensor - top"
+msgstr "Sensor â?? top"
 
 #: ../sheets/Cybernetics.sheet.in.h:24
 msgid "Sigmoid characteristic"
@@ -7203,6 +7618,18 @@ msgstr "Template for custom characteristics"
 msgid "Time delay"
 msgstr "Time delay"
 
+#: ../sheets/Database.sheet.in.h:1
+msgid "Attribute compound"
+msgstr "Attribute compound"
+
+#: ../sheets/Database.sheet.in.h:2
+msgid "Database"
+msgstr "Database"
+
+#: ../sheets/Database.sheet.in.h:3
+msgid "Editor for Database Table Relation Diagrams"
+msgstr "Editor for Database Table Relation Diagrams"
+
 #: ../sheets/ER.sheet.in.h:2
 msgid "ER"
 msgstr "ER"
@@ -7223,8 +7650,7 @@ msgstr "Weak entity"
 msgid "Components for electric circuits"
 msgstr "Components for electric circuits"
 
-#: ../sheets/Electric.sheet.in.h:2
-#: ../sheets/Pneumatic.sheet.in.h:7
+#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
 msgid "Connection point"
 msgstr "Connection point"
 
@@ -7321,8 +7747,7 @@ msgstr "Connector"
 msgid "Data source"
 msgstr "Data source"
 
-#: ../sheets/Flowchart.sheet.in.h:5
-#: ../sheets/SDL.sheet.in.h:4
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
 msgid "Decision"
 msgstr "Decision"
 
@@ -7334,10 +7759,6 @@ msgstr "Delay"
 msgid "Document"
 msgstr "Document"
 
-#: ../sheets/Flowchart.sheet.in.h:10
-msgid "Flowchart"
-msgstr "Flowchart"
-
 #: ../sheets/Flowchart.sheet.in.h:11
 msgid "Input/Output"
 msgstr "Input/Output"
@@ -7460,8 +7881,7 @@ msgstr "OR vergent"
 msgid "Objects to design GRAFCET charts"
 msgstr "Objects to design GRAFCET charts"
 
-#: ../sheets/GRAFCET.sheet.in.h:14
-#: ../sheets/UML.sheet.in.h:30
+#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
 msgid "Transition"
 msgstr "Transition"
 
@@ -7574,7 +7994,7 @@ msgstr "Road Section"
 
 #: ../sheets/IsometricMap.sheet.in.h:24
 msgid "Roof1"
-msgstr "Roof1"
+msgstr "Roof 1"
 
 #: ../sheets/IsometricMap.sheet.in.h:25
 msgid "T-Junction"
@@ -7754,7 +8174,7 @@ msgstr "A KAOS operation"
 
 #: ../sheets/KAOS.sheet.in.h:17
 msgid "A KAOS operationalization"
-msgstr "A KAOS operationalization"
+msgstr "A KAOS operationalisation"
 
 #: ../sheets/KAOS.sheet.in.h:18
 msgid "A KAOS output"
@@ -7784,6 +8204,66 @@ msgstr "Objects to design KAOS diagrams"
 msgid "RE-KAOS"
 msgstr "RE-KAOS"
 
+#: ../sheets/Lights.sheet.in.h:1
+msgid "ACL"
+msgstr "ACL"
+
+#: ../sheets/Lights.sheet.in.h:2
+msgid "Black light"
+msgstr "Black light"
+
+#: ../sheets/Lights.sheet.in.h:3
+msgid "Blinders"
+msgstr "Blinders"
+
+#: ../sheets/Lights.sheet.in.h:4
+msgid "Ellipsoidal Reflector Spotlight"
+msgstr "Ellipsoidal Reflector Spotlight"
+
+#: ../sheets/Lights.sheet.in.h:5
+msgid "Fresnel lantern"
+msgstr "Fresnel lantern"
+
+#: ../sheets/Lights.sheet.in.h:6
+msgid "Lights"
+msgstr "Lights"
+
+#: ../sheets/Lights.sheet.in.h:7
+msgid "Moving head"
+msgstr "Moving head"
+
+#: ../sheets/Lights.sheet.in.h:8
+msgid "Objects to design simple lighting plots"
+msgstr "Objects to design simple lighting plots"
+
+#: ../sheets/Lights.sheet.in.h:9
+msgid "PAR"
+msgstr "PAR"
+
+#: ../sheets/Lights.sheet.in.h:10
+msgid "PAR on the floor"
+msgstr "PAR on the floor"
+
+#: ../sheets/Lights.sheet.in.h:11
+msgid "Pebble Convex lantern"
+msgstr "Pebble Convex lantern"
+
+#: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
+msgid "Scanner"
+msgstr "Scanner"
+
+#: ../sheets/Lights.sheet.in.h:13
+msgid "Striplight"
+msgstr "Striplight"
+
+#: ../sheets/Lights.sheet.in.h:14
+msgid "Stroboscope light"
+msgstr "Stroboscope light"
+
+#: ../sheets/Lights.sheet.in.h:15
+msgid "Structure"
+msgstr "Structure"
+
 #: ../sheets/Logic.sheet.in.h:1
 msgid "AND gate"
 msgstr "AND gate"
@@ -7794,9 +8274,9 @@ msgstr "Boolean Logic"
 
 #: ../sheets/Logic.sheet.in.h:3
 msgid "Crossconnector"
-msgstr "Crossconnector"
+msgstr "Cross-connector"
 
-#: ../sheets/Logic.sheet.in.h:4
+#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
 msgid "Inverter"
 msgstr "Inverter"
 
@@ -7864,18 +8344,42 @@ msgstr "U.S. Army Mobile Subscriber Equipment Components"
 msgid "Folder"
 msgstr "Folder"
 
+#: ../sheets/Misc.sheet.in.h:3
+msgid "Measure distance"
+msgstr "Measure distance"
+
 #: ../sheets/Misc.sheet.in.h:4
+msgid "Misc"
+msgstr "Miscellaneous"
+
+#: ../sheets/Misc.sheet.in.h:5
 msgid "Miscellaneous Shapes"
 msgstr "Miscellaneous Shapes"
 
-#: ../sheets/Misc.sheet.in.h:5
+#: ../sheets/Misc.sheet.in.h:6
 msgid "New-style group object, for testing"
 msgstr "New-style group object, for testing"
 
-#: ../sheets/Misc.sheet.in.h:6
+#: ../sheets/Misc.sheet.in.h:7
+msgid "Resizable grid"
+msgstr "Resizeable grid"
+
+#: ../sheets/Misc.sheet.in.h:8
 msgid "Traditional clock"
 msgstr "Traditional clock"
 
+#: ../sheets/Misc.sheet.in.h:9
+msgid "Tree"
+msgstr "Tree"
+
+#: ../sheets/Misc.sheet.in.h:10
+msgid "expended node"
+msgstr "expanded node"
+
+#: ../sheets/Misc.sheet.in.h:11
+msgid "expensible node"
+msgstr "expandable node"
+
 #: ../sheets/Pneumatic.sheet.in.h:1
 msgid "2/2 distributor"
 msgstr "2/2 distributor"
@@ -8036,272 +8540,253 @@ msgstr "Service type reference"
 msgid "Specification and Description Language."
 msgstr "Specification and Description Language."
 
-#: ../sheets/SDL.sheet.in.h:18
-#: ../sheets/UML.sheet.in.h:28
+#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
 msgid "State"
 msgstr "State"
 
 #: ../sheets/SISSI.sheet.in.h:1
-msgid "Alarm center"
-msgstr "Alarm centre"
+msgid "Air filter"
+msgstr "Air filter"
 
 #: ../sheets/SISSI.sheet.in.h:2
-msgid "Analyse de Log"
-msgstr "Analyse de Log"
+msgid "Air quality detector"
+msgstr "Air quality detector"
 
 #: ../sheets/SISSI.sheet.in.h:3
-msgid "Backup"
-msgstr "Backup"
+msgid "Airconditioner"
+msgstr "Air conditioner"
 
 #: ../sheets/SISSI.sheet.in.h:4
-msgid "Boitier de chiffrement"
-msgstr "Boitier de chiffrement"
+msgid "Alarm center"
+msgstr "Alarm centre"
 
 #: ../sheets/SISSI.sheet.in.h:5
-msgid "Cellular phone"
-msgstr "Mobile phone"
+msgid "Axial Ventilator"
+msgstr "Axial Ventilator"
 
 #: ../sheets/SISSI.sheet.in.h:6
-#: ../sheets/ciscomisc.sheet.in.h:9
-msgid "File cabinet"
-msgstr "File cabinet"
+msgid "Backup"
+msgstr "Backup"
 
 #: ../sheets/SISSI.sheet.in.h:7
-msgid "Gate"
-msgstr "Gate"
+msgid "Badge reader"
+msgstr "Badge reader"
 
 #: ../sheets/SISSI.sheet.in.h:8
-#: ../sheets/ciscohub.sheet.in.h:29
-msgid "Hub"
-msgstr "Hub"
+msgid "Badge reader/keyboard"
+msgstr "Badge reader/keyboard"
 
 #: ../sheets/SISSI.sheet.in.h:9
-msgid "Information"
-msgstr "Information"
+msgid "Biometric reader"
+msgstr "Biometric reader"
 
 #: ../sheets/SISSI.sheet.in.h:10
-msgid "Information system"
-msgstr "Information system"
+msgid "Cell phone"
+msgstr "Mobile phone"
 
 #: ../sheets/SISSI.sheet.in.h:11
-#: ../sheets/ciscocomputer.sheet.in.h:21
-msgid "Laptop"
-msgstr "Laptop"
+msgid "Centrifugal Ventilator"
+msgstr "Centrifugal Ventilator"
 
 #: ../sheets/SISSI.sheet.in.h:12
-msgid "Magnetic support"
-msgstr "Magnetic support"
+msgid "Cipher machine"
+msgstr "Cipher machine"
 
 #: ../sheets/SISSI.sheet.in.h:13
-#: ../sheets/ciscocomputer.sheet.in.h:25
-msgid "Modem"
-msgstr "Modem"
+msgid "Circulation pump"
+msgstr "Circulation pump"
 
 #: ../sheets/SISSI.sheet.in.h:14
-#: ../sheets/network.sheet.in.h:21
-msgid "Network cloud"
-msgstr "Network cloud"
+msgid "Condensator"
+msgstr "Condensator"
 
 #: ../sheets/SISSI.sheet.in.h:15
-msgid "Objects to design sissi diagrams"
-msgstr "Objects to design sissi diagrams"
+msgid "Current transducer"
+msgstr "Current transducer"
 
 #: ../sheets/SISSI.sheet.in.h:16
-#: ../sheets/ciscocomputer.sheet.in.h:35
-msgid "PDA"
-msgstr "PDA"
+msgid "Digital code"
+msgstr "Digital code"
 
 #: ../sheets/SISSI.sheet.in.h:17
-msgid "Paper support"
-msgstr "Paper support"
+msgid "Enthalpy transducer"
+msgstr "Enthalpy transducer"
 
 #: ../sheets/SISSI.sheet.in.h:18
-msgid "Person"
-msgstr "Person"
+msgid "Extinguisher"
+msgstr "Extinguisher"
 
 #: ../sheets/SISSI.sheet.in.h:19
-#: ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Relational Database"
-msgstr "Relational Database"
+msgid "Faraday cage"
+msgstr "Faraday cage"
 
-#: ../sheets/SISSI.sheet.in.h:20
-msgid "Room"
-msgstr "Room"
+#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
+msgid "File cabinet"
+msgstr "File cabinet"
 
 #: ../sheets/SISSI.sheet.in.h:21
-#: ../sheets/ciscohub.sheet.in.h:53
-msgid "Router"
-msgstr "Router"
+msgid "Gate"
+msgstr "Gate"
 
 #: ../sheets/SISSI.sheet.in.h:22
-msgid "Safe"
-msgstr "Safe"
+msgid "Geographic site"
+msgstr "Geographic site"
 
 #: ../sheets/SISSI.sheet.in.h:23
-msgid "Security area"
-msgstr "Security area"
+msgid "Glass-break sensor"
+msgstr "Glass-break sensor"
 
-#: ../sheets/SISSI.sheet.in.h:24
-msgid "Site geographique"
-msgstr "Site geographique"
+#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
+msgid "Hub"
+msgstr "Hub"
 
 #: ../sheets/SISSI.sheet.in.h:25
-msgid "Software"
-msgstr "Software"
+msgid "Information"
+msgstr "Information"
 
 #: ../sheets/SISSI.sheet.in.h:26
-#: ../sheets/ciscocomputer.sheet.in.h:42
-msgid "Storage array"
-msgstr "Storage array"
-
-#: ../sheets/SISSI.sheet.in.h:27
-#: ../sheets/network.sheet.in.h:33
-msgid "Telephone"
-msgstr "Telephone"
+msgid "Information system"
+msgstr "Information system"
 
-#: ../sheets/SISSI.sheet.in.h:28
-msgid "Video camera"
-msgstr "Video camera"
+#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
+msgid "Laptop"
+msgstr "Laptop"
 
 #: ../sheets/SISSI.sheet.in.h:29
-msgid "Workstation"
-msgstr "Workstation"
+msgid "Level detector"
+msgstr "Level detector"
 
 #: ../sheets/SISSI.sheet.in.h:30
-msgid "cage de faraday"
-msgstr "cage de faraday"
+msgid "Light detector"
+msgstr "Light detector"
 
 #: ../sheets/SISSI.sheet.in.h:31
-msgid "capteur brise glace"
-msgstr "capteur brise glace"
+msgid "Log analysis"
+msgstr "Log analysis"
 
 #: ../sheets/SISSI.sheet.in.h:32
-msgid "capteur faisceau"
-msgstr "capteur faisceau"
+msgid "Magnetic storage"
+msgstr "Magnetic storage"
 
-#: ../sheets/SISSI.sheet.in.h:33
-msgid "climatisation"
-msgstr "climatisation"
+#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Modem"
+msgstr "Modem"
 
 #: ../sheets/SISSI.sheet.in.h:34
-msgid "condensateur"
-msgstr "condensateur"
+msgid "Moisture extractor"
+msgstr "Moisture extractor"
 
 #: ../sheets/SISSI.sheet.in.h:35
-msgid "detecteur d'alimentation"
-msgstr "detecteur d'alimentation"
+msgid "Moisture sensor"
+msgstr "Moisture sensor"
 
 #: ../sheets/SISSI.sheet.in.h:36
-msgid "detecteur d'humidite"
-msgstr "detecteur d'humidite"
+msgid "Movement detector"
+msgstr "Movement detector"
 
-#: ../sheets/SISSI.sheet.in.h:37
-msgid "detecteur de courant"
-msgstr "detecteur de courant"
+#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
+msgid "Network cloud"
+msgstr "Network cloud"
 
 #: ../sheets/SISSI.sheet.in.h:38
-msgid "detecteur de fumee"
-msgstr "detecteur de fumee"
+msgid "Objects to design sissi diagrams"
+msgstr "Objects to design sissi diagrams"
 
-#: ../sheets/SISSI.sheet.in.h:39
-msgid "detecteur de lumiere"
-msgstr "detecteur de lumiere"
+#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
+msgid "PDA"
+msgstr "PDA"
 
 #: ../sheets/SISSI.sheet.in.h:40
-msgid "detecteur de mouvement"
-msgstr "detecteur de mouvement"
+msgid "Paper storage"
+msgstr "Paper storage"
 
 #: ../sheets/SISSI.sheet.in.h:41
-msgid "detecteur de mouvement video"
-msgstr "detecteur de mouvement video"
+msgid "Person"
+msgstr "Person"
 
 #: ../sheets/SISSI.sheet.in.h:42
-msgid "detecteur de niveau"
-msgstr "detecteur de niveau"
+msgid "Power transducer"
+msgstr "Power transducer"
 
 #: ../sheets/SISSI.sheet.in.h:43
-msgid "detecteur de pression"
-msgstr "detecteur de pression"
+msgid "Pressure transducer"
+msgstr "Pressure transducer"
 
 #: ../sheets/SISSI.sheet.in.h:44
-msgid "detecteur de qualite de l'air"
-msgstr "detecteur de qualite de l'air"
+msgid "Pump"
+msgstr "Pump"
 
-#: ../sheets/SISSI.sheet.in.h:45
-msgid "detecteur de tension"
-msgstr "detecteur de tension"
+#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
+msgid "Relational Database"
+msgstr "Relational Database"
 
 #: ../sheets/SISSI.sheet.in.h:46
-msgid "detecteur de vehicule"
-msgstr "detecteur de vehicule"
+msgid "Revolving door"
+msgstr "Revolving door"
 
 #: ../sheets/SISSI.sheet.in.h:47
-msgid "detecteur de vibration"
-msgstr "detecteur de vibration"
+msgid "Room"
+msgstr "Room"
 
-#: ../sheets/SISSI.sheet.in.h:48
-msgid "detecteur enthalpie"
-msgstr "detecteur enthalpie"
+#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
+msgid "Router"
+msgstr "Router"
 
 #: ../sheets/SISSI.sheet.in.h:49
-msgid "digi code"
-msgstr "digi code"
+msgid "Safe"
+msgstr "Safe"
 
 #: ../sheets/SISSI.sheet.in.h:50
-msgid "extincteur"
-msgstr "extincteur"
+msgid "Security area"
+msgstr "Security area"
 
 #: ../sheets/SISSI.sheet.in.h:51
-msgid "extracteur d'humidite"
-msgstr "extracteur d'humidite"
+msgid "Sensor beam"
+msgstr "Sensor beam"
 
 #: ../sheets/SISSI.sheet.in.h:52
-msgid "filtre a air"
-msgstr "filtre a air"
+msgid "Server"
+msgstr "Server"
 
 #: ../sheets/SISSI.sheet.in.h:53
-msgid "lecteur biometrique"
-msgstr "lecteur biometrique"
-
-#: ../sheets/SISSI.sheet.in.h:54
-msgid "lecteur de badge"
-msgstr "lecteur de badge"
+msgid "Smoke detector"
+msgstr "Smoke detector"
 
-#: ../sheets/SISSI.sheet.in.h:55
-msgid "lecteur de badge clavier"
-msgstr "lecteur de badge clavier"
+#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
+msgid "Storage array"
+msgstr "Storage array"
 
-#: ../sheets/SISSI.sheet.in.h:56
-msgid "onduleur"
-msgstr "onduleur"
+#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
+msgid "Telephone"
+msgstr "Telephone"
 
 #: ../sheets/SISSI.sheet.in.h:57
-msgid "pompe"
-msgstr "pompe"
+msgid "Vehicle detector"
+msgstr "Vehicle detector"
 
 #: ../sheets/SISSI.sheet.in.h:58
-msgid "pompe rotative"
-msgstr "pompe rotative"
+msgid "Ventilator"
+msgstr "Ventilator"
 
 #: ../sheets/SISSI.sheet.in.h:59
-msgid "porte tambour"
-msgstr "porte tambour"
+msgid "Vibration sensor"
+msgstr "Vibration sensor"
 
 #: ../sheets/SISSI.sheet.in.h:60
-msgid "server"
-msgstr "server"
+msgid "Video camera"
+msgstr "Video camera"
 
 #: ../sheets/SISSI.sheet.in.h:61
-msgid "ventilateur"
-msgstr "ventilateur"
+msgid "Video movement detector"
+msgstr "Video movement detector"
 
 #: ../sheets/SISSI.sheet.in.h:62
-msgid "ventilateur axial"
-msgstr "ventilateur axial"
+msgid "Voltage detector"
+msgstr "Voltage detector"
 
 #: ../sheets/SISSI.sheet.in.h:63
-msgid "ventilateur centrifuge"
-msgstr "ventilateur centrifuge"
+msgid "Workstation"
+msgstr "Workstation"
 
 #: ../sheets/UML.sheet.in.h:1
 msgid "Activity"
@@ -8333,11 +8818,11 @@ msgstr "Editor for UML Static Structure Diagrams"
 
 #: ../sheets/UML.sheet.in.h:15
 msgid "Fork/union"
-msgstr "Fork/union"
+msgstr "Fork/Union"
 
 #: ../sheets/UML.sheet.in.h:16
 msgid "Generalization, class inheritance"
-msgstr "Generalization, class inheritance"
+msgstr "Generalisation, class inheritance"
 
 #: ../sheets/UML.sheet.in.h:17
 msgid "Implements, class implements a specific interface"
@@ -8345,7 +8830,7 @@ msgstr "Implements, class implements a specific interface"
 
 #: ../sheets/UML.sheet.in.h:18
 msgid "Initial/end state"
-msgstr "Initial/end state"
+msgstr "Initial/End state"
 
 #: ../sheets/UML.sheet.in.h:19
 msgid "Large package"
@@ -8409,7 +8894,7 @@ msgstr "BBS"
 
 #: ../sheets/ciscocomputer.sheet.in.h:2
 msgid "Cisco - Computer"
-msgstr "Cisco - Computer"
+msgstr "Cisco â?? Computer"
 
 #: ../sheets/ciscocomputer.sheet.in.h:3
 msgid "Cisco CA"
@@ -8449,7 +8934,7 @@ msgstr "File Server"
 
 #: ../sheets/ciscocomputer.sheet.in.h:12
 msgid "Front End Processor"
-msgstr "Front End processor"
+msgstr "Front End Processor"
 
 #: ../sheets/ciscocomputer.sheet.in.h:13
 msgid "HP Mini"
@@ -8495,8 +8980,7 @@ msgstr "MicroWebserver"
 msgid "Mini VAX"
 msgstr "Mini VAX"
 
-#: ../sheets/ciscocomputer.sheet.in.h:26
-#: ../sheets/network.sheet.in.h:19
+#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
 msgid "Monitor"
 msgstr "Monitor"
 
@@ -8536,10 +9020,6 @@ msgstr "PC with Router-Based Software"
 msgid "SUN workstation"
 msgstr "SUN workstation"
 
-#: ../sheets/ciscocomputer.sheet.in.h:39
-msgid "Scanner"
-msgstr "Scanner"
-
 #: ../sheets/ciscocomputer.sheet.in.h:40
 msgid "Server with PC Router"
 msgstr "Server with PC Router"
@@ -8610,7 +9090,7 @@ msgstr "ATM 3800"
 
 #: ../sheets/ciscohub.sheet.in.h:7
 msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM fast Gigabit Etherswitch"
+msgstr "ATM Fast Gigabit Etherswitch"
 
 #: ../sheets/ciscohub.sheet.in.h:8
 msgid "ATM Switch"
@@ -8642,7 +9122,7 @@ msgstr "Carrier Routing System"
 
 #: ../sheets/ciscohub.sheet.in.h:15
 msgid "Cisco - Switch"
-msgstr "Cisco - Switch"
+msgstr "Cisco â?? Switch"
 
 #: ../sheets/ciscohub.sheet.in.h:16
 msgid "Cisco 1000"
@@ -8670,11 +9150,11 @@ msgstr "Content Switch"
 
 #: ../sheets/ciscohub.sheet.in.h:22
 msgid "Data Center Switch"
-msgstr "Data Center Switch"
+msgstr "Data Centre Switch"
 
 #: ../sheets/ciscohub.sheet.in.h:23
 msgid "Data Center Switch Reversed"
-msgstr "Data Center Switch Reversed"
+msgstr "Data Centre Switch Reversed"
 
 #: ../sheets/ciscohub.sheet.in.h:24
 msgid "Data Switch Processor"
@@ -8894,7 +9374,7 @@ msgstr "Car"
 
 #: ../sheets/ciscomisc.sheet.in.h:7
 msgid "Cisco - Misc"
-msgstr "Cisco - Misc"
+msgstr "Cisco â?? Miscellaneous"
 
 #: ../sheets/ciscomisc.sheet.in.h:8
 msgid "CiscoWorks Man"
@@ -9150,7 +9630,7 @@ msgstr "Channelized Pipe"
 
 #: ../sheets/cisconetwork.sheet.in.h:20
 msgid "Cisco - Network"
-msgstr "Cisco - Network"
+msgstr "Cisco â?? Network"
 
 #: ../sheets/cisconetwork.sheet.in.h:21
 msgid "Cloud"
@@ -9510,7 +9990,7 @@ msgstr "Mobile Phone"
 
 #: ../sheets/ciscotelephony.sheet.in.h:9
 msgid "Cisco - Telephony"
-msgstr "Cisco - Telephony"
+msgstr "Cisco â?? Telephony"
 
 #: ../sheets/ciscotelephony.sheet.in.h:10
 msgid "Class 4/5 switch"
@@ -9822,67 +10302,67 @@ msgstr "Jigsaw"
 
 #: ../sheets/jigsaw.sheet.in.h:2
 msgid "Jigsaw - part_iiii"
-msgstr "Jigsaw - part_iiii"
+msgstr "Jigsaw â?? part_iiii"
 
 #: ../sheets/jigsaw.sheet.in.h:3
 msgid "Jigsaw - part_iiio"
-msgstr "Jigsaw - part_iiio"
+msgstr "Jigsaw â?? part_iiio"
 
 #: ../sheets/jigsaw.sheet.in.h:4
 msgid "Jigsaw - part_iioi"
-msgstr "Jigsaw - part_iioi"
+msgstr "Jigsaw â?? part_iioi"
 
 #: ../sheets/jigsaw.sheet.in.h:5
 msgid "Jigsaw - part_iioo"
-msgstr "Jigsaw - part_iioo"
+msgstr "Jigsaw â?? part_iioo"
 
 #: ../sheets/jigsaw.sheet.in.h:6
 msgid "Jigsaw - part_ioii"
-msgstr "Jigsaw - part_ioii"
+msgstr "Jigsaw â?? part_ioii"
 
 #: ../sheets/jigsaw.sheet.in.h:7
 msgid "Jigsaw - part_ioio"
-msgstr "Jigsaw - part_ioio"
+msgstr "Jigsaw â?? part_ioio"
 
 #: ../sheets/jigsaw.sheet.in.h:8
 msgid "Jigsaw - part_iooi"
-msgstr "Jigsaw - part_iooi"
+msgstr "Jigsaw â?? part_iooi"
 
 #: ../sheets/jigsaw.sheet.in.h:9
 msgid "Jigsaw - part_iooo"
-msgstr "Jigsaw - part_iooo"
+msgstr "Jigsaw â?? part_iooo"
 
 #: ../sheets/jigsaw.sheet.in.h:10
 msgid "Jigsaw - part_oiii"
-msgstr "Jigsaw - part_oiii"
+msgstr "Jigsaw â?? part_oiii"
 
 #: ../sheets/jigsaw.sheet.in.h:11
 msgid "Jigsaw - part_oiio"
-msgstr "Jigsaw - part_oiio"
+msgstr "Jigsaw â?? part_oiio"
 
 #: ../sheets/jigsaw.sheet.in.h:12
 msgid "Jigsaw - part_oioi"
-msgstr "Jigsaw - part_oioi"
+msgstr "Jigsaw â?? part_oioi"
 
 #: ../sheets/jigsaw.sheet.in.h:13
 msgid "Jigsaw - part_oioo"
-msgstr "Jigsaw - part_oioo"
+msgstr "Jigsaw â?? part_oioo"
 
 #: ../sheets/jigsaw.sheet.in.h:14
 msgid "Jigsaw - part_ooii"
-msgstr "Jigsaw - part_ooii"
+msgstr "Jigsaw â?? part_ooii"
 
 #: ../sheets/jigsaw.sheet.in.h:15
 msgid "Jigsaw - part_ooio"
-msgstr "Jigsaw - part_ooio"
+msgstr "Jigsaw â?? part_ooio"
 
 #: ../sheets/jigsaw.sheet.in.h:16
 msgid "Jigsaw - part_oooi"
-msgstr "Jigsaw - part_oooi"
+msgstr "Jigsaw â?? part_oooi"
 
 #: ../sheets/jigsaw.sheet.in.h:17
 msgid "Jigsaw - part_oooo"
-msgstr "Jigsaw - part_oooo"
+msgstr "Jigsaw â?? part_oooo"
 
 #: ../sheets/jigsaw.sheet.in.h:18
 msgid "Pieces of a jigsaw"
@@ -9960,10 +10440,6 @@ msgstr "Mobile telephony cell"
 msgid "Modular switching system"
 msgstr "Modular switching system"
 
-#: ../sheets/network.sheet.in.h:20
-msgid "Network"
-msgstr "Network"
-
 #: ../sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
 msgstr "Objects to design network diagrams with"
@@ -10064,311 +10540,807 @@ msgstr "Sybase dataserver"
 msgid "Sybase replication server"
 msgstr "Sybase replication server"
 
+#~ msgid "Show this help message"
+#~ msgstr "Show this help message"
+
+#~ msgid "Thank you for using Dia.\n"
+#~ msgstr "Thank you for using Dia.\n"
+
+#~ msgid "[OPTION...] [FILE...]"
+#~ msgstr "[OPTION...] [FILE...]"
+
+#~ msgid ""
+#~ "Error on option %s: %s.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "Error on option %s: %s.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+
+#~ msgid "'%s' not found!\n"
+#~ msgstr "'%s' not found!\n"
+
+#~ msgid "Could not initialize Bonobo!"
+#~ msgstr "Could not initialise Bonobo!"
+
+#~ msgid "Export format to use"
+#~ msgstr "Export format to use"
+
+#~ msgid "eps,png,wmf,cgm,dxf,fig"
+#~ msgstr "eps,png,wmf,cgm,dxf,fig"
+
+#~ msgid "Export file name to use"
+#~ msgstr "Export file name to use"
+
+#~ msgid "Quiet operation"
+#~ msgstr "Quiet operation"
+
+#~ msgid ""
+#~ "Error: No arguments found.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "Error: No arguments found.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+
+#~ msgid "%s error: can specify only one of -t or -o."
+#~ msgstr "%s error: can specify only one of -t or -o."
+
+#~ msgid ""
+#~ "%s error: must specify only one of -t or -o.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "%s error: must specify only one of -t or -o.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+
+#~ msgid "%s error: no input file."
+#~ msgstr "%s error: no input file."
+
+#~ msgid "%s error: only one input file expected."
+#~ msgstr "%s error: only one input file expected."
+
+#~ msgid "%s error: popt library not available on this system"
+#~ msgstr "%s error: popt library not available on this system"
+
+#~ msgid "Diagram modified!"
+#~ msgstr "Diagram modified!"
+
+#~ msgid "NULL tooldata in tool_select_update"
+#~ msgstr "NULL tooldata in tool_select_update"
+
+#~ msgid "Edit Layer Attributes"
+#~ msgstr "Edit Layer Attributes"
+
+#~ msgid "_Diagram"
+#~ msgstr "_Diagram"
+
+#~ msgid "Unit for lengths:"
+#~ msgstr "Unit for lengths:"
+
+#~ msgid "Unit for font sizes:"
+#~ msgstr "Unit for font sizes:"
+
+#~ msgid "Integrated UI"
+#~ msgstr "Integrated UI"
+
+#~ msgid "Sheets and Objects"
+#~ msgstr "Sheets and Objects"
+
+#~ msgid "Revert"
+#~ msgstr "Revert"
+
+#~ msgid "New"
+#~ msgstr "New"
+
+#~ msgid "Browse..."
+#~ msgstr "Browse..."
+
+#~ msgid "SVG Shape:"
+#~ msgstr "SVG Shape:"
+
+#~ msgid "Sheet name:"
+#~ msgstr "Sheet name:"
+
+#~ msgid "Edit Attributes"
+#~ msgstr "Edit Attributes"
+
+#~ msgid "DiaObject"
+#~ msgstr "DiaObject"
+
+#~ msgid "Description:"
+#~ msgstr "Description:"
+
+#~ msgid "Sheet"
+#~ msgstr "Sheet"
+
+#~ msgid "DiaObject:"
+#~ msgstr "DiaObject:"
+
+#~ msgid "Sheet:"
+#~ msgstr "Sheet:"
+
+#~ msgid "%s<illegal characters>..."
+#~ msgstr "%s<illegal characters>..."
+
+#~ msgid ""
+#~ "Your local character set is UTF-8. Because of issues with libxml1 and the "
+#~ "support of files generated by previous versions of dia, you will "
+#~ "encounter  problems. Please report to dia-list gnome org if you see this "
+#~ "message."
+#~ msgstr ""
+#~ "Your local character set is UTF-8. Because of issues with libxml1 and the "
+#~ "support of files generated by previous versions of dia, you will "
+#~ "encounter  problems. Please report to dia-list gnome org if you see this "
+#~ "message."
+
+#~ msgid "abcdefghijk ABCDEFGHIJK"
+#~ msgstr "abcdefghijk ABCDEFGHIJK"
+
+#~ msgid "Font name"
+#~ msgstr "Font name"
+
+#~ msgid "The X string that represents this font."
+#~ msgstr "The X string that represents this font."
+
+#~ msgid "Preview text"
+#~ msgstr "Preview text"
+
+#~ msgid "The text to display in order to demonstrate the selected font."
+#~ msgstr "The text to display in order to demonstrate the selected font."
+
+#~ msgid "_Family:"
+#~ msgstr "_Family:"
+
+#~ msgid "Si_ze:"
+#~ msgstr "Si_ze:"
+
+#~ msgid "_Preview:"
+#~ msgstr "_Preview:"
+
+#~ msgid "Could not deduce correct path for `%s'"
+#~ msgstr "Could not deduce correct path for `%s'"
+
+#~ msgid ""
+#~ "Could not load plugin '%s'\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Could not load plugin '%s'\n"
+#~ "%s"
+
+#~ msgid "Could not find plugin init function in `%s'"
+#~ msgstr "Could not find plugin init function in `%s'"
+
+#~ msgid "Delete  connection point"
+#~ msgstr "Delete  connection point"
+
+#~ msgid "Service Essentiel"
+#~ msgstr "Service Essential"
+
+#~ msgid "THERMIC DETECTION"
+#~ msgstr "THERMIC DETECTION"
+
+#~ msgid "FIRE DETECTION"
+#~ msgstr "FIRE DETECTION"
+
+#~ msgid "WATER DETECTION"
+#~ msgstr "WATER DETECTION"
+
+#~ msgid "AIR DETECTION"
+#~ msgstr "AIR DETECTION"
+
+#~ msgid "ENERGY DETECTION"
+#~ msgstr "ENERGY DETECTION"
+
+#~ msgid "INTRUSION DETECTION"
+#~ msgstr "INTRUSION DETECTION"
+
+#~ msgid "THERMIC ACTION"
+#~ msgstr "THERMIC ACTION"
+
+#~ msgid "WATER ACTION"
+#~ msgstr "WATER ACTION"
+
+#~ msgid "AIR ACTION"
+#~ msgstr "AIR ACTION"
+
+#~ msgid "ENERGY ACTION"
+#~ msgstr "ENERGY ACTION"
+
+#~ msgid "INTRUSION ACTION"
+#~ msgstr "INTRUSION ACTION"
+
+#~ msgid "PERSONAL"
+#~ msgstr "PERSONAL"
+
+#~ msgid "NETWORK"
+#~ msgstr "NETWORK"
+
+#~ msgid "LOGICIEL"
+#~ msgstr "LOGICAL"
+
+#~ msgid "Transportable equipement"
+#~ msgstr "Transportable equipement"
+
+#~ msgid "Role:"
+#~ msgstr "Role:"
+
+#~ msgid "Bond graph objects"
+#~ msgstr "Bond graph objects"
+
+#~ msgid "Cairo old WMF"
+#~ msgstr "Cairo old WMF"
+
+#~ msgid "Cairo Clipboard"
+#~ msgstr "Cairo Clipboard"
+
+#~ msgid "Bad vertex bulge\n"
+#~ msgstr "Bad vertex bulge\n"
+
+#~ msgid "Scale: %f\n"
+#~ msgstr "Scale: %f\n"
+
+#~ msgid "Unknown dxf code %d\n"
+#~ msgstr "Unknown dxf code %d\n"
+
+#~ msgid ""
+#~ "GNOME Print Backend\n"
+#~ " '%s'\n"
+#~ " not available"
+#~ msgstr ""
+#~ "GNOME Print Backend\n"
+#~ " '%s'\n"
+#~ " not available"
+
+#~ msgid "GNOME PostScript"
+#~ msgstr "GNOME PostScript"
+
+#~ msgid "GNOME Portable Document Format"
+#~ msgstr "GNOME Portable Document Format"
+
+#~ msgid "GNOME Scalable Vector Graphic"
+#~ msgstr "GNOME Scalable Vector Graphic"
+
+#~ msgid "GNOME Print based Rendering"
+#~ msgstr "GNOME Print based Rendering"
+
+#~ msgid "Analyse de Log"
+#~ msgstr "Analyse de Log"
+
+#~ msgid "Boitier de chiffrement"
+#~ msgstr "Boitier de chiffrement"
+
+#~ msgid "Magnetic support"
+#~ msgstr "Magnetic support"
+
+#~ msgid "Site geographique"
+#~ msgstr "Site geographique"
+
+#~ msgid "cage de faraday"
+#~ msgstr "cage de faraday"
+
+#~ msgid "capteur brise glace"
+#~ msgstr "capteur brise glace"
+
+#~ msgid "capteur faisceau"
+#~ msgstr "capteur faisceau"
+
+#~ msgid "climatisation"
+#~ msgstr "climatisation"
+
+#~ msgid "detecteur d'alimentation"
+#~ msgstr "detecteur d'alimentation"
+
+#~ msgid "detecteur d'humidite"
+#~ msgstr "detecteur d'humidite"
+
+#~ msgid "detecteur de courant"
+#~ msgstr "detecteur de courant"
+
+#~ msgid "detecteur de fumee"
+#~ msgstr "detecteur de fumee"
+
+#~ msgid "detecteur de lumiere"
+#~ msgstr "detecteur de lumiere"
+
+#~ msgid "detecteur de mouvement"
+#~ msgstr "detecteur de mouvement"
+
+#~ msgid "detecteur de mouvement video"
+#~ msgstr "detecteur de mouvement video"
+
+#~ msgid "detecteur de niveau"
+#~ msgstr "detecteur de niveau"
+
+#~ msgid "detecteur de pression"
+#~ msgstr "detecteur de pression"
+
+#~ msgid "detecteur de qualite de l'air"
+#~ msgstr "detecteur de qualite de l'air"
+
+#~ msgid "detecteur de tension"
+#~ msgstr "detecteur de tension"
+
+#~ msgid "detecteur de vehicule"
+#~ msgstr "detecteur de vehicule"
+
+#~ msgid "detecteur de vibration"
+#~ msgstr "detecteur de vibration"
+
+#~ msgid "detecteur enthalpie"
+#~ msgstr "detecteur enthalpie"
+
+#~ msgid "extincteur"
+#~ msgstr "extincteur"
+
+#~ msgid "extracteur d'humidite"
+#~ msgstr "extracteur d'humidite"
+
+#~ msgid "filtre a air"
+#~ msgstr "filtre a air"
+
+#~ msgid "lecteur biometrique"
+#~ msgstr "lecteur biometrique"
+
+#~ msgid "lecteur de badge"
+#~ msgstr "lecteur de badge"
+
+#~ msgid "lecteur de badge clavier"
+#~ msgstr "lecteur de badge clavier"
+
+#~ msgid "onduleur"
+#~ msgstr "onduleur"
+
+#~ msgid "pompe"
+#~ msgstr "pompe"
+
+#~ msgid "pompe rotative"
+#~ msgstr "pompe rotative"
+
+#~ msgid "porte tambour"
+#~ msgstr "porte tambour"
+
+#~ msgid "ventilateur axial"
+#~ msgstr "ventilateur axial"
+
+#~ msgid "ventilateur centrifuge"
+#~ msgstr "ventilateur centrifuge"
+
 #~ msgid "MoveTo after start of polyline\n"
 #~ msgstr "MoveTo after start of polyline\n"
+
 #~ msgid "Unexpected polyline object: %s\n"
 #~ msgstr "Unexpected polyline object: %s\n"
+
 #~ msgid "Unexpected Ellipse additional objects\n"
 #~ msgstr "Unexpected Ellipse additional objects\n"
+
 #~ msgid "Unexpected Bezier object: %s\n"
 #~ msgstr "Unexpected Bezier object: %s\n"
+
 #~ msgid "Unexpected NURBSTo object: %s\n"
 #~ msgstr "Unexpected NURBSTo object: %s\n"
+
 #~ msgid "Unexpected NURBSTo additional objects\n"
 #~ msgstr "Unexpected NURBSTo additional objects\n"
-#~ msgid "Diagram tree"
-#~ msgstr "Diagram tree"
+
 #~ msgid "MoveTo after start of polygon\n"
 #~ msgstr "MoveTo after start of polygon\n"
+
 #~ msgid "Unexpected polygon object: %s\n"
 #~ msgstr "Unexpected polygon object: %s\n"
+
 #~ msgid "Unexpected Beziergon object: %s\n"
 #~ msgstr "Unexpected Beziergon object: %s\n"
+
 #~ msgid "EML"
 #~ msgstr "EML"
+
 #~ msgid "Editor for EML Static Structure Diagrams."
 #~ msgstr "Editor for EML Static Structure Diagrams."
+
 #~ msgid "Modify object(s)"
 #~ msgstr "Modify object(s)"
+
 #~ msgid "Failed to save file '%s'.\n"
 #~ msgstr "Failed to save file '%s'.\n"
+
 #~ msgid "Instantiation. One process create others"
 #~ msgstr "Instantiation. One process create others"
+
 #~ msgid "Interaction between processes."
 #~ msgstr "Interaction between processes."
+
 #~ msgid "3/3 distributor"
 #~ msgstr "3/3 distributor"
+
 #~ msgid "5/3 distributor"
 #~ msgstr "5/3 distributor"
+
 #~ msgid "Dia"
 #~ msgstr "Dia"
+
 #~ msgid "Copyright (C) 1998-2005 The Free Software Foundation and the authors"
 #~ msgstr ""
 #~ "Copyright (C) 1998-2005 The Free Software Foundation and the authors"
+
 #~ msgid ""
 #~ "Dia is a program for drawing structured diagrams.\n"
 #~ "Please visit http://www.gnome.org/projects/dia for more information."
 #~ msgstr ""
 #~ "Dia is a program for drawing structured diagrams.\n"
 #~ "Please visit http://www.gnome.org/projects/dia for more information."
+
 #~ msgid "About Dia"
 #~ msgstr "About Dia"
+
 #~ msgid "Dia v %s by Alexander Larsson"
 #~ msgstr "Dia v %s by Alexander Larsson"
+
 #~ msgid "Maintainers: Lars Clausen and Cyrille Chepelov"
 #~ msgstr "Maintainers: Lars Clausen and Cyrille Chepelov"
+
 #~ msgid "Please visit http://www.gnome.org/projects/dia for more information"
 #~ msgstr "Please visit http://www.gnome.org/projects/dia for more information"
+
 #~ msgid "Contributors:"
 #~ msgstr "Contributors:"
+
 #~ msgid "/File/_New"
 #~ msgstr "/File/_New"
+
 #~ msgid "/File/_Open..."
 #~ msgstr "/File/_Open..."
+
 #~ msgid "/File/---"
 #~ msgstr "/File/---"
+
 #~ msgid "/File/_Diagram tree"
 #~ msgstr "/File/_Diagram tree"
+
 #~ msgid "/File/Sheets and Objects..."
 #~ msgstr "/File/Sheets and Objects..."
+
 #~ msgid "/File/_Preferences..."
 #~ msgstr "/File/_Preferences..."
+
 #~ msgid "/File/P_lugins..."
 #~ msgstr "/File/P_lugins..."
+
 #~ msgid "/File/_Quit"
 #~ msgstr "/File/_Quit"
+
 #~ msgid "/Help/_Contents"
 #~ msgstr "/Help/_Contents"
+
 #~ msgid "/Help/---"
 #~ msgstr "/Help/---"
+
 #~ msgid "/Help/_About..."
 #~ msgstr "/Help/_About..."
+
 #~ msgid "/File/_Save"
 #~ msgstr "/File/_Save"
+
 #~ msgid "/File/Save _As..."
 #~ msgstr "/File/Save _As..."
+
 #~ msgid "/File/Page Set_up..."
 #~ msgstr "/File/Page Set_up..."
+
 #~ msgid "/File/_Print Diagram..."
 #~ msgstr "/File/_Print Diagram..."
+
 #~ msgid "/File/_Close"
 #~ msgstr "/File/_Close"
+
 #~ msgid "/_Edit"
 #~ msgstr "/_Edit"
+
 #~ msgid "/Edit/_Undo"
 #~ msgstr "/Edit/_Undo"
+
 #~ msgid "/Edit/_Redo"
 #~ msgstr "/Edit/_Redo"
+
 #~ msgid "/Edit/---"
 #~ msgstr "/Edit/---"
+
 #~ msgid "/Edit/_Copy"
 #~ msgstr "/Edit/_Copy"
+
 #~ msgid "/Edit/C_ut"
 #~ msgstr "/Edit/C_ut"
+
 #~ msgid "/Edit/_Paste"
 #~ msgstr "/Edit/_Paste"
+
 #~ msgid "/Edit/_Delete"
 #~ msgstr "/Edit/_Delete"
+
 #~ msgid "/Diagram/_Properties..."
 #~ msgstr "/Diagram/_Properties..."
+
 #~ msgid "/Diagram/_Layers..."
 #~ msgstr "/Diagram/_Layers..."
+
 #~ msgid "/View/Zoom _In"
 #~ msgstr "/View/Zoom _In"
+
 #~ msgid "/View/Zoom _Out"
 #~ msgstr "/View/Zoom _Out"
+
 #~ msgid "/View/_Zoom"
 #~ msgstr "/View/_Zoom"
+
 #~ msgid "/View/Zoom/1600%"
 #~ msgstr "/View/Zoom/1600%"
+
 #~ msgid "/View/Zoom/800%"
 #~ msgstr "/View/Zoom/800%"
+
 #~ msgid "/View/Zoom/400%"
 #~ msgstr "/View/Zoom/400%"
+
 #~ msgid "/View/Zoom/283%"
 #~ msgstr "/View/Zoom/283%"
+
 #~ msgid "/View/Zoom/200%"
 #~ msgstr "/View/Zoom/200%"
+
 #~ msgid "/View/Zoom/141%"
 #~ msgstr "/View/Zoom/141%"
+
 #~ msgid "/View/Zoom/100%"
 #~ msgstr "/View/Zoom/100%"
+
 #~ msgid "/View/Zoom/85%"
 #~ msgstr "/View/Zoom/85%"
+
 #~ msgid "/View/Zoom/70.7%"
 #~ msgstr "/View/Zoom/70.7%"
+
 #~ msgid "/View/Zoom/50%"
 #~ msgstr "/View/Zoom/50%"
+
 #~ msgid "/View/Zoom/35.4%"
 #~ msgstr "/View/Zoom/35.4%"
+
 #~ msgid "/View/Zoom/25%"
 #~ msgstr "/View/Zoom/25%"
+
 #~ msgid "/View/---"
 #~ msgstr "/View/---"
+
 #~ msgid "/View/Show _All"
 #~ msgstr "/View/Show _All"
+
 #~ msgid "/View/Re_draw"
 #~ msgstr "/View/Re_draw"
+
 #~ msgid "/Objects/---"
 #~ msgstr "/Objects/---"
+
 #~ msgid "/Objects/_Group"
 #~ msgstr "/Objects/_Group"
+
 #~ msgid "/Objects/_Parent"
 #~ msgstr "/Objects/_Parent"
+
 #~ msgid "/Objects/Align"
 #~ msgstr "/Objects/Align"
+
 #~ msgid "/Objects/Align/Left"
 #~ msgstr "/Objects/Align/Left"
+
 #~ msgid "/Objects/Align/Center"
 #~ msgstr "/Objects/Align/Center"
+
 #~ msgid "/Objects/Align/Right"
 #~ msgstr "/Objects/Align/Right"
+
 #~ msgid "/Objects/Align/---"
 #~ msgstr "/Objects/Align/---"
+
 #~ msgid "/Objects/Align/Top"
 #~ msgstr "/Objects/Align/Top"
+
 #~ msgid "/Objects/Align/Middle"
 #~ msgstr "/Objects/Align/Middle"
+
 #~ msgid "/Objects/Align/Bottom"
 #~ msgstr "/Objects/Align/Bottom"
+
 #~ msgid "/Objects/Align/Adjacent"
 #~ msgstr "/Objects/Align/Adjacent"
+
 #~ msgid "/Objects/Align/Stacked"
 #~ msgstr "/Objects/Align/Stacked"
+
 #~ msgid "/Objects/_Properties..."
 #~ msgstr "/Objects/_Properties..."
-#~ msgid "/Select/All"
-#~ msgstr "/Select/All"
-#~ msgid "/Select/None"
-#~ msgstr "/Select/None"
+
 #~ msgid "/Select/Invert"
 #~ msgstr "/Select/Invert"
+
 #~ msgid "/Select/---"
 #~ msgstr "/Select/---"
+
 #~ msgid "/Select/Transitive"
 #~ msgstr "/Select/Transitive"
+
 #~ msgid "/Select/Connected"
 #~ msgstr "/Select/Connected"
+
 #~ msgid "/Select/Replace"
 #~ msgstr "/Select/Replace"
-#~ msgid "/Select/Union"
-#~ msgstr "/Select/Union"
+
 #~ msgid "/Select/Remove"
 #~ msgstr "/Select/Remove"
+
 #~ msgid "/Select/Inverse"
 #~ msgstr "/Select/Inverse"
+
 #~ msgid "/Tools/Modify"
 #~ msgstr "/Tools/Modify"
+
 #~ msgid "/Tools/Magnify"
 #~ msgstr "/Tools/Magnify"
+
 #~ msgid "/Tools/Scroll"
 #~ msgstr "/Tools/Scroll"
+
 #~ msgid "/Tools/Text"
 #~ msgstr "/Tools/Text"
+
 #~ msgid "/Tools/Box"
 #~ msgstr "/Tools/Box"
+
 #~ msgid "/Tools/Ellipse"
 #~ msgstr "/Tools/Ellipse"
+
 #~ msgid "/Tools/Polygon"
 #~ msgstr "/Tools/Polygon"
+
 #~ msgid "/Tools/Beziergon"
 #~ msgstr "/Tools/Beziergon"
+
 #~ msgid "/Tools/---"
 #~ msgstr "/Tools/---"
+
 #~ msgid "/Tools/Line"
 #~ msgstr "/Tools/Line"
+
 #~ msgid "/Tools/Arc"
 #~ msgstr "/Tools/Arc"
+
 #~ msgid "/Tools/Zigzagline"
 #~ msgstr "/Tools/Zigzagline"
+
 #~ msgid "/Tools/Polyline"
 #~ msgstr "/Tools/Polyline"
+
 #~ msgid "/Tools/Bezierline"
 #~ msgstr "/Tools/Bezierline"
+
 #~ msgid "/Tools/Image"
 #~ msgstr "/Tools/Image"
+
 #~ msgid "Diagram Menu"
 #~ msgstr "Diagram Menu"
+
 #~ msgid ""
 #~ "Can't find menu entry '%s'!\n"
 #~ "This is probably a i18n problem (try LANG=C)."
 #~ msgstr ""
 #~ "Can't find menu entry '%s'!\n"
 #~ "This is probably a translation problem (try LANG=C)."
+
 #~ msgid "<Toolbox>/File/Plugins..."
 #~ msgstr "<Toolbox>/File/Plugins..."
+
 #~ msgid "<Toolbox>/File/Quit"
 #~ msgstr "<Toolbox>/File/Quit"
+
 #~ msgid "Macro Cell"
 #~ msgstr "Macro Cell"
+
 #~ msgid "Micro Cell"
 #~ msgstr "Micro Cell"
+
 #~ msgid "Pico Cell"
 #~ msgstr "Pico Cell"
+
 #~ msgid "Cell Type:"
 #~ msgstr "Cell Type:"
+
 #~ msgid "Subscribers"
 #~ msgstr "Subscribers"
+
 #~ msgid "Fill colour"
 #~ msgstr "Fill colour"
+
 #~ msgid "Line colour"
 #~ msgstr "Line colour"
+
 #~ msgid "Text colour"
 #~ msgstr "Text colour"
 
 #, fuzzy
 #~ msgid "Implmentation"
 #~ msgstr "Implementation"
+
 #~ msgid "Cisco hub"
 #~ msgstr "Cisco hub"
+
 #~ msgid "Content switch module"
 #~ msgstr "Content switch module"
+
 #~ msgid "Voice switch"
 #~ msgstr "Voice switch"
+
 #~ msgid "Voice switch 2"
 #~ msgstr "Voice switch 2"
+
 #~ msgid "Dot-Dot"
 #~ msgstr "Dot-Dot"
+
 #~ msgid "SVX (interchangeable with End office)"
 #~ msgstr "SVX (interchangeable with End office)"
+
 #~ msgid "Telecommuter house/router"
 #~ msgstr "Telecommuter house/router"
+
 #~ msgid "6732 Multiservice access platform"
 #~ msgstr "6732 Multiservice access platform"
+
 #~ msgid "CDDI-FDDI"
 #~ msgstr "CDDI-FDDI"
+
 #~ msgid "DPT"
 #~ msgstr "DPT"
+
 #~ msgid "IPTC"
 #~ msgstr "IPTC"
+
 #~ msgid "NetRanger intrusion detection system"
 #~ msgstr "NetRanger intrusion detection system"
+
 #~ msgid "NetSonar security scanner"
 #~ msgstr "NetSonar security scanner"
+
 #~ msgid "ONS15500 DWDM platform"
 #~ msgstr "ONS15500 DWDM platform"
+
 #~ msgid "PAD X.28"
 #~ msgstr "PAD X.28"
+
 #~ msgid "7505"
 #~ msgstr "7505"
+
 #~ msgid "ATM router"
 #~ msgstr "ATM router"
+
 #~ msgid "ATM tag sw gigabit router"
 #~ msgstr "ATM tag sw gigabit router"
+
 #~ msgid "Cisco - Router"
 #~ msgstr "Cisco - Router"
+
 #~ msgid "Gigabit switch router (ATM tag)"
 #~ msgstr "Gigabit switch router (ATM tag)"
+
 #~ msgid "Router in building"
 #~ msgstr "Router in building"
+
 #~ msgid "Router shapes by Cisco"
 #~ msgstr "Router shapes by Cisco"
+
 #~ msgid "Workgroup 5000 multilayer switch"
 #~ msgstr "Workgroup 5000 multilayer switch"
+
 #~ msgid "Workgroup 5002 multilayer switch"
 #~ msgstr "Workgroup 5002 multilayer switch"
+
 #~ msgid "Workgroup 5500 multilayer switch"
 #~ msgstr "Workgroup 5500 multilayer switch"
+
 #~ msgid "uBR910"
 #~ msgstr "uBR910"
-



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]