[dia] Updated Japanese translation



commit d5df7758ecb77c4b4c0ee5ed169924d9521085bb
Author: OKANO Takayoshi <kano na rim or jp>
Date:   Thu Nov 3 14:39:22 2011 +0900

    Updated Japanese translation

 po/ja.po | 4734 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 2587 insertions(+), 2147 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 9121584..71d0d04 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dia master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=dia&component=general\n"
-"POT-Creation-Date: 2010-10-02 12:38+0000\n"
-"PO-Revision-Date: 2010-10-12 21:55+0900\n"
-"Last-Translator: Takayuki KUSANO <AE5T-KSN asahi-net or jp>\n"
+"product=dia&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-10-09 15:13+0000\n"
+"PO-Revision-Date: 2011-09-21 00:55+0900\n"
+"Last-Translator: OKANO Takayoshi <kano na rim or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,160 +25,188 @@ msgstr ""
 # UMLèèé http://www.umtp-japan.org/pdf/japanese.pdf
 #
 #. This is not an errror
-#: ../app/app_procs.c:214
+#: ../app/app_procs.c:208
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
-msgstr "èå: ããããçå (%lu - %lu) ãééããããã\n"
+msgstr "èå: ãããããçå (%lu - %lu) ãééããããã\n"
 
-#: ../app/app_procs.c:226
+#: ../app/app_procs.c:220
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
-msgstr "èå: ããã %lu (%s) ã2åääéæãããã\n"
+msgstr "èå: ãããã %lu (%s) ã2åääéæãããã\n"
 
-#: ../app/app_procs.c:252
+#: ../app/app_procs.c:246
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
-msgstr "èå: ããã %d (%s) ã2åääéæãããã\n"
+msgstr "èå: ãããã %d (%s) ã2åääéæãããã\n"
 
-#: ../app/app_procs.c:261
+#: ../app/app_procs.c:255
 #, c-format
-msgid "Warning: There is no layer named %s\n"
-msgstr "èå: %s ãããããããããããã\n"
+msgid "Warning: There is no layer named %s.\n"
+msgstr "èå: %s ãããããããããããããã\n"
 
-#: ../app/app_procs.c:343
+#: ../app/app_procs.c:337
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s ããã: %s ãããããããããææãäæãã\n"
 
-#: ../app/app_procs.c:352
+#: ../app/app_procs.c:346
 #, c-format
-msgid "%s error: input and output file name is identical: %s"
+msgid "%s error: input and output filenames are identical: %s"
 msgstr "%s ããã: ååãããããååãããããååãåããã: %s"
 
-#: ../app/app_procs.c:360
+#: ../app/app_procs.c:354
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s ããã: éåãååãããã %s ãåèãã\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:385
+#: ../app/app_procs.c:382
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:556
+#: ../app/app_procs.c:553
 #, c-format
 msgid "Can't find output format/filter %s\n"
-msgstr "%s ãããååããããããããããããããããããã\n"
+msgstr "%s ãããååãããããããããããããããããããã\n"
+
+#: ../app/app_procs.c:623
+#, c-format
+msgid "Input directory '%s' must exist!\n"
+msgstr "ååããããããèããããããããã: %s\n"
+
+#: ../app/app_procs.c:640
+#, c-format
+msgid "Output directory '%s' must exist!\n"
+msgstr "ååããããããèããããããããã: %s\n"
 
 #. Translators:  The argument is a list of options, not to be translated
-#: ../app/app_procs.c:634
+#: ../app/app_procs.c:690
 #, c-format
 msgid "Select the filter/format out of: %s"
-msgstr "ããããããããããããããæåãã: %s"
+msgstr "ãããããããããããããããæåãã: %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:652
+#: ../app/app_procs.c:708
 msgid "Export loaded file and exit"
 msgstr "èãèãããããããããããããããçäãã"
 
-#: ../app/app_procs.c:652
+#: ../app/app_procs.c:708
 msgid "OUTPUT"
 msgstr "OUTPUT"
 
 #. &export_file_format
 #. &export_format_string
-#: ../app/app_procs.c:654
+#: ../app/app_procs.c:710
 msgid "TYPE"
 msgstr "TYPE"
 
-#: ../app/app_procs.c:656
+#: ../app/app_procs.c:712
 msgid "Export graphics size"
 msgstr "æåãããããããããããããããããããããã"
 
-#: ../app/app_procs.c:656
+#: ../app/app_procs.c:712
 msgid "WxH"
 msgstr "WxH"
 
-#: ../app/app_procs.c:658
+#: ../app/app_procs.c:714
 msgid ""
 "Show only specified layers (e.g. when exporting). Can be either the layer "
 "name or a range of layer numbers (X-Y)"
 msgstr ""
-"æåãããããããèçãã (äããããããããããæãã): ãããåããããã"
-"ãçåãçå (X-Y) ãæåãã"
+"æåããããããããèçãã (äããããããããããæãã): ããããåããã"
+"ããããçåãçå (X-Y) ãæåãã"
 
-#: ../app/app_procs.c:659
+#: ../app/app_procs.c:715
 msgid "LAYER,LAYER,..."
 msgstr "LAYER,LAYER,..."
 
-#: ../app/app_procs.c:661
+#: ../app/app_procs.c:717
 msgid "Don't show the splash screen"
 msgstr "ããããããããããããèçããã"
 
-#: ../app/app_procs.c:663
-msgid "Don't create empty diagram"
+#: ../app/app_procs.c:719
+msgid "Don't create an empty diagram"
 msgstr "çããããããããçæããã"
 
-#: ../app/app_procs.c:665
+#: ../app/app_procs.c:721
 msgid "Start integrated user interface (diagrams in tabs)"
 msgstr ""
-"åãèãåãããããããããããããèåãã (ãããããããããåãã)"
+"åãèãåããããããããããããããèåãã (ãããããããããåãã)"
 
-#: ../app/app_procs.c:667
+#: ../app/app_procs.c:723
 msgid "Send error messages to stderr instead of showing dialogs."
-msgstr ""
-"ããããããããããããããããèçããäãããææãããååãååãã"
+msgstr "ãããããããããããããããèçããäãããææãããååãååãã"
 
-#. &input_directory
-#: ../app/app_procs.c:669
+#: ../app/app_procs.c:725
 msgid "Directory containing input files"
-msgstr "ååãããããæçãããããããæåãã"
+msgstr "ååãããããæçããããããããæåãã"
 
-#: ../app/app_procs.c:669 ../app/app_procs.c:671
+#: ../app/app_procs.c:725 ../app/app_procs.c:727
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#. &output_directory
-#: ../app/app_procs.c:671
+#: ../app/app_procs.c:727
 msgid "Directory containing output files"
-msgstr "ååãããããæçãããããããæåãã"
+msgstr "ååãããããæçããããããããæåãã"
 
-#: ../app/app_procs.c:673
+#: ../app/app_procs.c:729
 msgid "Display credits list and exit"
 msgstr "ããããããèçããçäãã"
 
-#: ../app/app_procs.c:675
+#: ../app/app_procs.c:731
 msgid "Generate verbose output"
 msgstr "èçãååãèçãã"
 
-#: ../app/app_procs.c:677
+#: ../app/app_procs.c:733
 msgid "Display version and exit"
 msgstr "ããããããèçããçäãã"
 
-#: ../app/app_procs.c:734
+#: ../app/app_procs.c:760
+msgid "[FILE...]"
+msgstr "[ãããã...]"
+
+#: ../app/app_procs.c:774
+#, fuzzy, c-format
+#| msgid "Manual operation"
+msgid "Invalid option?"
+msgstr "æåæä"
+
+#: ../app/app_procs.c:797
+#, fuzzy, c-format
+#| msgid "Dia version %s, compiled %s %s\n"
+msgid "Filename conversion failed: %s\n"
+msgstr "Dia ããããã %1$s (ãããããææ %3$s %2$s)\n"
+
+#: ../app/app_procs.c:810
+#, c-format
+msgid "Missing input: %s\n"
+msgstr ""
+
+#: ../app/app_procs.c:835
 msgid "Can't connect to session manager!\n"
-msgstr "ããããããããããããæçããããã!\n"
+msgstr "ããããããããããããæçããããã!\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:774
+#: ../app/app_procs.c:877
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia ããããã %1$s (ãããããææ %3$s %2$s)\n"
 
-#: ../app/app_procs.c:776
+#: ../app/app_procs.c:879
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia ããããã %s\n"
 
-#: ../app/app_procs.c:814
+#: ../app/app_procs.c:921
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
 msgstr ""
 "ããããããããããããããææãããããããèããããããããããçäãã"
 "ã...\n"
 
-#: ../app/app_procs.c:816
+#: ../app/app_procs.c:923
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
@@ -187,28 +215,28 @@ msgstr ""
 "ãããããããããããã '%s' ããææãããããããèããããããããããç"
 "äããã...\n"
 
-#: ../app/app_procs.c:882
+#: ../app/app_procs.c:987
 msgid "Diagram1.dia"
 msgstr "Diagram1.dia"
 
-#: ../app/app_procs.c:926
+#: ../app/app_procs.c:1022
 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"
+"describing how you caused this message to appear.\n"
 msgstr ""
-"ãããèåçãåéãããããåéãåçææãèèãããããããããã\n"
+"ãããèåçãåéãããããåéãåçææãèèããããããããã\n"
 "bugzilla.gnome.org ããååããããããã\n"
 
-#: ../app/app_procs.c:941
+#: ../app/app_procs.c:1037
 msgid "Exiting Dia"
 msgstr "Dia ãçä"
 
 #. no standard buttons
-#: ../app/app_procs.c:1005
+#: ../app/app_procs.c:1101
 msgid "Quitting without saving modified diagrams"
 msgstr "çéäããããããããäåãããçäããã"
 
-#: ../app/app_procs.c:1007
+#: ../app/app_procs.c:1103
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
@@ -216,51 +244,27 @@ msgstr ""
 "ãããããããåæãããããããæåãäåããã Dia ãçäããããããããã"
 "ã?"
 
-#: ../app/app_procs.c:1011
+#: ../app/app_procs.c:1107
 msgid "Quit Dia"
 msgstr "Dia ãçä"
 
-#: ../app/app_procs.c:1080 ../app/app_procs.c:1087
-msgid "Could not create per-user Dia config directory"
-msgstr "Dia ããããèåãããããäæãããããããã"
+#: ../app/app_procs.c:1180 ../app/app_procs.c:1187
+msgid "Could not create per-user Dia configuration directory"
+msgstr "Dia ãããããèåããããããäæãããããããã"
 
-#: ../app/app_procs.c:1090
+#: ../app/app_procs.c:1190
 msgid ""
-"Could not create per-user Dia config directory. Please make sure that the "
-"environment variable HOME points to an existing directory."
+"Could not create per-user Dia configuration directory. Please make sure that "
+"the environment variable HOME points to an existing directory."
 msgstr ""
-"ãããçã Dia èåãããããäæãããããããããçååæ $HOME ãæåã"
-"ãããããæãããããçèããããããã"
-
-#: ../app/app_procs.c:1113
-msgid "Objects and filters internal to dia"
-msgstr "Dia ãåèãããããããããããããã"
-
-#: ../app/app_procs.c:1146
-msgid "[FILE...]"
-msgstr "[ãããã...]"
+"ããããçã Dia èåããããããäæãããããããããçååæ $HOME ãæå"
+"ãããããããæãããããçèããããããã"
 
-#: ../app/app_procs.c:1166
-#, c-format
-msgid "Input-directory '%s' must exist!\n"
-msgstr "ååãããããèããããããããã: %s\n"
-
-#: ../app/app_procs.c:1171
-#, c-format
-msgid "Output-directory '%s' must exist!\n"
-msgstr "ååãããããèããããããããã: %s\n"
+#: ../app/app_procs.c:1213
+msgid "Objects and filters internal to Dia"
+msgstr "Dia ãåèããããããããããããããã"
 
-#: ../app/app_procs.c:1177
-#, c-format
-msgid "'%s' not found!\n"
-msgstr "'%s' ãããããããããããããï\n"
-
-#: ../app/app_procs.c:1185
-#, c-format
-msgid "'%s' not found in '%s'!\n"
-msgstr "'%s' ã '%s' ãããååãããããããããããï\n"
-
-#: ../app/app_procs.c:1234
+#: ../app/app_procs.c:1266
 #, c-format
 msgid ""
 "The original author of Dia was:\n"
@@ -269,7 +273,7 @@ msgstr ""
 "ããããããéçè:\n"
 "\n"
 
-#: ../app/app_procs.c:1239
+#: ../app/app_procs.c:1271
 #, c-format
 msgid ""
 "\n"
@@ -277,10 +281,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"çåããããã:\n"
+"çåãããããã:\n"
 "\n"
 
-#: ../app/app_procs.c:1244
+#: ../app/app_procs.c:1276
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +295,7 @@ msgstr ""
 "ããäãèçè:\n"
 "\n"
 
-#: ../app/app_procs.c:1249
+#: ../app/app_procs.c:1281
 #, c-format
 msgid ""
 "\n"
@@ -314,41 +318,49 @@ msgstr ""
 "èåäåãããããããååãããã\n"
 "æãããçæããããããéæããããããã"
 
-#: ../app/color_area.c:317 ../app/color_area.c:360
+#: ../app/color_area.c:327 ../app/color_area.c:374
 msgid "Select foreground color"
 msgstr "åæèãéæ"
 
-#: ../app/color_area.c:318 ../app/color_area.c:361
+#: ../app/color_area.c:328 ../app/color_area.c:375
 msgid "Select background color"
 msgstr "èæèãéæ"
 
 #: ../app/commands.c:130
-msgid "No print plug-in found!"
+msgid "No print plugin found!"
 msgstr "ååããããããèããããããããã!"
 
-#: ../app/commands.c:150
+#: ../app/commands.c:149
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "Diagram%d.dia"
 
-#: ../app/commands.c:343
+#: ../app/commands.c:248
+msgid "No image from Clipboard to paste."
+msgstr ""
+
+#: ../app/commands.c:298
+msgid "No selected object can take an image."
+msgstr ""
+
+#: ../app/commands.c:543
 msgid "No existing object to paste.\n"
 msgstr "èãäããããããããããããããã\n"
 
-#: ../app/commands.c:646 ../app/commands.c:684
+#: ../app/commands.c:851 ../app/commands.c:889
 msgid "Could not find help directory"
 msgstr "ããããèããããããããã"
 
-#: ../app/commands.c:653
+#: ../app/commands.c:858
 #, c-format
 msgid ""
 "Could not open help directory:\n"
 "%s"
 msgstr ""
-"ããããæçãããããããèããããããããã:\n"
+"ããããæçããããããããèããããããããã:\n"
 "%s"
 
-#: ../app/commands.c:720
+#: ../app/commands.c:927
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "çè æ <takeshi aihana gmail com>\n"
@@ -359,7 +371,7 @@ msgstr ""
 "èé èä <AE5T-KSN asahi-net or jp>\n"
 "ææGNOMEããããä <http://www.gnome.gr.jp/>"
 
-#: ../app/commands.c:722
+#: ../app/commands.c:929
 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"
@@ -390,27 +402,27 @@ msgstr ""
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, \n"
 "MA 02110-1301, USA ããéçããããããã\n"
 
-#: ../app/commands.c:745
+#: ../app/commands.c:956
 msgid "A program for drawing structured diagrams."
 msgstr "æéåãããããããæçããããããããããããã"
 
-#: ../app/confirm.c:69
+#: ../app/confirm.c:65
 #, c-format
 msgid "You are about to print a diagram with %d pages."
 msgstr "%d ãããããããããããååãããããã"
 
-#: ../app/confirm.c:71
+#: ../app/confirm.c:67
 #, c-format
 msgid "You are about to export a diagram with %d pages."
 msgstr "%d ããããããããããããããããããããããã"
 
-#: ../app/confirm.c:73
+#: ../app/confirm.c:69
 #, c-format
 msgid ""
 "You are about to export a diagram which may require %s of memory.(%d pages)."
 msgstr "ãããã %s (%d ããã) ããããããããããããããããããã"
 
-#: ../app/confirm.c:81
+#: ../app/confirm.c:77
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
@@ -422,112 +434,92 @@ msgstr ""
 "ããããã\"ãããéæ\" ãã \"ããããããã\" ããããããããããããåã"
 "ããåæããããã"
 
-#: ../app/confirm.c:85
+#: ../app/confirm.c:81
 msgid "Confirm Diagram Size"
 msgstr "ãããããããããããçè"
 
-#: ../app/create_object.c:71
+#: ../app/create_object.c:73
 #, c-format
 msgid "'%s' creation failed"
 msgstr "'%s' ãçæãåæãããã"
 
-#: ../app/defaults.c:43 ../app/defaults.c:150
+#: ../app/defaults.c:44 ../app/defaults.c:147
 msgid "Object defaults"
 msgstr "ãããããããããããã"
 
-#: ../app/defaults.c:61
+#: ../app/defaults.c:62
 msgid "This object has no defaults."
 msgstr "ããããããããããããããããããããã"
 
-#: ../app/defaults.c:115
+#: ../app/defaults.c:111
 msgid "Defaults: "
 msgstr "ããããã: "
 
-#: ../app/dia-props.c:85
+#: ../app/dia-props.c:86
 msgid "Diagram Properties"
 msgstr "ãããããããèå"
 
-#: ../app/dia-props.c:119
+#: ../app/dia-props.c:120
 msgid "Dynamic grid"
 msgstr "ãããããããããååããã"
 
-#: ../app/dia-props.c:127
+#: ../app/dia-props.c:128
 msgid "x"
 msgstr "Xæå"
 
-#: ../app/dia-props.c:131
+#: ../app/dia-props.c:132
 msgid "y"
 msgstr "Yæå"
 
-#: ../app/dia-props.c:136
+#: ../app/dia-props.c:137
 msgid "Spacing"
 msgstr "åéãéé"
 
-#: ../app/dia-props.c:156
+#: ../app/dia-props.c:157
 msgid "Visible spacing"
 msgstr "èçããéé"
 
 #. Hexes!
-#: ../app/dia-props.c:177 ../app/preferences.c:242
+#: ../app/dia-props.c:178 ../app/preferences.c:243
 msgid "Hex grid"
 msgstr "ãããããåèåããã"
 
-#: ../app/dia-props.c:185
+#: ../app/dia-props.c:186
 msgid "Hex grid size"
 msgstr "ãããããããã"
 
-#: ../app/dia-props.c:198
+#: ../app/dia-props.c:199
 msgid "Grid"
 msgstr "ãããã"
 
-#: ../app/dia-props.c:209 ../lib/diagramdata.c:112
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:117
 msgid "Background"
 msgstr "èæ"
 
-#: ../app/dia-props.c:220 ../app/preferences.c:122
+#: ../app/dia-props.c:221 ../app/preferences.c:122
 msgid "Grid Lines"
 msgstr "ããããç"
 
-#: ../app/dia-props.c:231
+#: ../app/dia-props.c:232
 msgid "Page Breaks"
 msgstr "ããããåç"
 
-#: ../app/dia-props.c:242
+#: ../app/dia-props.c:243
 msgid "Colors"
 msgstr "è"
 
 #. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:263
+#: ../app/dia-props.c:264
 #, c-format
 msgid "Diagram Properties: %s"
 msgstr "ãããããããããããã: %s"
 
-#: ../app/dia_embedd.c:348
-msgid "Could not initialize Bonobo!"
-msgstr "Bonobo ãåæåãããããããã!"
-
-#: ../app/diacanvas.c:121
-msgid "X position"
-msgstr "Xäç"
-
-#: ../app/diacanvas.c:122
-msgid "X position of child widget"
-msgstr "åãããããããXäç"
-
-#: ../app/diacanvas.c:131
-msgid "Y position"
-msgstr "Yäç"
-
-#: ../app/diacanvas.c:132
-msgid "Y position of child widget"
-msgstr "åãããããããYäç"
-
-#: ../app/diagram.c:222
+#: ../app/diagram.c:234
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "'%s' ãããããåã UTF-8 ãåæãããããããã: %s\n"
 
-#: ../app/diagram.c:225 ../lib/message.c:90 ../lib/message.c:293
+#: ../app/diagram.c:237 ../lib/message.c:91 ../lib/message.c:297
 msgid "Error"
 msgstr "ããã"
 
@@ -535,156 +527,143 @@ msgstr "ããã"
 msgid "Trying to group with no selected objects."
 msgstr "ãããããããéæãããããããåãããããããã"
 
-#: ../app/diagram.c:1219
-msgid ""
-"You cannot group objects that belong to different groups or have different "
-"parents"
-msgstr ""
-"åããããããæåããããããããããããããèãçãããããããããããã"
-"ãåãããããã"
-
-#: ../app/diagram_tree_menu.c:47
-msgid "/_Sort objects"
-msgstr "/ãããããããäãæã(_S)"
-
-#: ../app/diagram_tree_menu.c:48
-msgid "/Sort objects/by _name"
-msgstr "/ãããããããäãæã/ååé(_N)"
-
-#: ../app/diagram_tree_menu.c:50
-msgid "/Sort objects/by _type"
-msgstr "/ãããããããäãæã/çéé(_T)"
-
-#: ../app/diagram_tree_menu.c:52
-msgid "/Sort objects/as _inserted"
-msgstr "/ãããããããäãæã/æåé(_I)"
-
-#: ../app/diagram_tree_menu.c:55
-msgid "/Sort objects/All by name"
-msgstr "/ãããããããäãæã/ååéãããã"
-
-#: ../app/diagram_tree_menu.c:57
-msgid "/Sort objects/All by type"
-msgstr "/ãããããããäãæã/çééãããã"
-
-#: ../app/diagram_tree_menu.c:59
-msgid "/Sort objects/All as inserted"
-msgstr "/ãããããããäãæã/æåéãããã"
-
-#: ../app/diagram_tree_menu.c:61
-msgid "/Sort objects/_Default"
-msgstr "/ãããããããäãæã/ããããã(_D)"
-
-#: ../app/diagram_tree_menu.c:62
-msgid "/Sort objects/Default/by _name"
-msgstr "/ãããããããäãæã/ããããã/ååé(_N)"
-
-#: ../app/diagram_tree_menu.c:64
-msgid "/Sort objects/Default/by _type"
-msgstr "/ãããããããäãæã/ããããã/çéé(_T)"
-
-#: ../app/diagram_tree_menu.c:66
-msgid "/Sort objects/Default/as _inserted"
-msgstr "/ãããããããäãæã/ããããã/æåé(_I)"
+#: ../app/diagram_tree_view.c:164
+msgid "Diagram"
+msgstr "ãããããã"
 
-#: ../app/diagram_tree_menu.c:68
-msgid "/Sort _diagrams"
-msgstr "/ãããããããäãæã(_D)"
+#: ../app/diagram_tree_view.c:171
+#: ../plug-ins/drs/dia-render-script-import.c:233
+msgid "Layer"
+msgstr "ãããã"
 
-#: ../app/diagram_tree_menu.c:69
-msgid "/Sort _diagrams/by _name"
-msgstr "/ãããããããäãæã(_D)/ååé(_N)"
+#: ../app/diagram_tree_view.c:177
+#, fuzzy, c-format
+#| msgid "Add Layer"
+msgid "%d Layer"
+msgid_plural "%d Layers"
+msgstr[0] "ãããããèå"
 
-#: ../app/diagram_tree_menu.c:71
-msgid "/Sort _diagrams/as _inserted"
-msgstr "/ãããããããäãæã(_D)/æåé(_I)"
+#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
+#: ../objects/Database/table.c:141 ../objects/Istar/actor.c:146
+#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
+#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
+#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:244
+#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
+#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
+msgid "Type"
+msgstr "çé"
 
-#: ../app/diagram_tree_menu.c:73
-msgid "/Sort diagrams/_Default"
-msgstr "/ãããããããäãæã/ããããã(_D)"
+#: ../app/diagram_tree_view.c:184
+#, fuzzy
+#| msgid "Position"
+msgid "object|Position"
+msgstr "äç"
 
-#: ../app/diagram_tree_menu.c:74
-msgid "/Sort diagrams/Default/by _name"
-msgstr "/ãããããããäãæã/ããããã/ååé(_N)"
+#: ../app/diagram_tree_view.c:187
+#, fuzzy
+#| msgid "_Unparent Children"
+msgid "Children"
+msgstr "èãããåããã(_U)"
 
-#: ../app/diagram_tree_menu.c:76
-msgid "/Sort diagrams/Default/as _inserted"
-msgstr "ãããããããäãæã/ããããã/æåé(_I)"
+#: ../app/diagram_tree_view.c:191
+#, fuzzy, c-format
+#| msgid "Object"
+msgid "%d Object"
+msgid_plural "%d Objects"
+msgstr[0] "ããããããå"
+
+#: ../app/diagram_tree_view.c:448
+#, fuzzy
+#| msgid "_Select"
+msgid "Select"
+msgstr "éæ(_S)"
 
-#: ../app/diagram_tree_menu.c:84 ../app/diagram_tree_menu.c:95
-msgid "/_Locate"
-msgstr "/åæ(_L)"
+#. Translators: Menu item Verb/Support/Position/Locate
+#. Translators: Menu item Verb/Signal/Sense/Locate
+#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:813
+#: ../objects/FS/function.c:1055
+msgid "Locate"
+msgstr "åæ"
 
-#: ../app/diagram_tree_menu.c:85
-msgid "/_Properties"
+#: ../app/diagram_tree_view.c:450
+#, fuzzy
+#| msgid "/_Properties"
+msgid "Properties"
 msgstr "/ããããã(_P)"
 
-#: ../app/diagram_tree_menu.c:86
-msgid "/_Hide this type"
-msgstr "/ããçéãéã(_H)"
+#. *** board of value **************
+#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:123
+#: ../app/plugin-manager.c:262 ../objects/Database/table.c:139
+#: ../objects/Database/table.c:185 ../objects/SISSI/sissi_dialog.c:734
+#: ../objects/UML/association.c:238 ../objects/UML/class.c:145
+#: ../objects/UML/large_package.c:133 ../objects/UML/umlattribute.c:37
+#: ../objects/UML/umlformalparameter.c:35 ../objects/UML/umloperation.c:62
+#: ../objects/UML/umlparameter.c:43
+msgid "Name"
+msgstr "åå"
 
-#: ../app/diagram_tree_window.c:80 ../app/preferences.c:123
+#: ../app/diagram_tree_view.c:565
 msgid "Diagram Tree"
 msgstr "ãããããããããã"
 
 #. paper size
-#: ../app/diapagelayout.c:153
+#: ../app/diapagelayout.c:155
 msgid "Paper Size"
 msgstr "ççãããã"
 
 #. orientation
-#: ../app/diapagelayout.c:186
+#: ../app/diapagelayout.c:184
 msgid "Orientation"
 msgstr "åã"
 
 #. margins
-#: ../app/diapagelayout.c:224
+#: ../app/diapagelayout.c:213
 msgid "Margins"
 msgstr "äç"
 
-#: ../app/diapagelayout.c:236
+#: ../app/diapagelayout.c:225
 msgid "Top:"
 msgstr "ä:"
 
-#: ../app/diapagelayout.c:249
+#: ../app/diapagelayout.c:238
 msgid "Bottom:"
 msgstr "ä:"
 
-#: ../app/diapagelayout.c:262
+#: ../app/diapagelayout.c:251
 msgid "Left:"
 msgstr "å:"
 
-#: ../app/diapagelayout.c:275
+#: ../app/diapagelayout.c:264
 msgid "Right:"
 msgstr "å:"
 
 #. Scaling
-#: ../app/diapagelayout.c:289
+#: ../app/diapagelayout.c:278
 msgid "Scaling"
 msgstr "åç"
 
-#: ../app/diapagelayout.c:300
+#: ../app/diapagelayout.c:289
 msgid "Scale:"
 msgstr "åç:"
 
-#: ../app/diapagelayout.c:312
+#: ../app/diapagelayout.c:301
 msgid "Fit to:"
 msgstr "æç:"
 
-#: ../app/diapagelayout.c:324
+#: ../app/diapagelayout.c:313
 msgid "by"
 msgstr "å"
 
-#: ../app/diapagelayout.c:741
+#: ../app/diapagelayout.c:728
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3gcm x %0.3gcm"
 
-#: ../app/diapagelayout.c:845 ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:832 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "ãããèå"
 
-#: ../app/disp_callbacks.c:95 ../app/properties-dialog.c:157
+#: ../app/disp_callbacks.c:92 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -692,11 +671,23 @@ msgstr ""
 "ããããããããã \"åãæã/ããçã\" ãããããããããããã\n"
 "åãæããããæåãåããããããã"
 
-#: ../app/disp_callbacks.c:130
-msgid "Properties..."
-msgstr "ããããã..."
+#: ../app/disp_callbacks.c:127
+#, fuzzy
+#| msgid "/_Properties"
+msgid "Propertiesâ"
+msgstr "/ããããã(_P)"
+
+#: ../app/disp_callbacks.c:166
+msgid "Follow linkâ"
+msgstr ""
+
+#: ../app/disp_callbacks.c:288
+#, fuzzy
+#| msgid "Select None"
+msgid "Selection"
+msgstr "éæãèé"
 
-#: ../app/disp_callbacks.c:1066
+#: ../app/disp_callbacks.c:1114
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -707,32 +698,32 @@ msgstr ""
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:115
+#: ../app/display.c:109
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "%dåããããããããéæãããã"
 
-#: ../app/display.c:125
+#: ../app/display.c:119
 #, c-format
 msgid "Selected '%s'"
 msgstr "'%s' ãéæãããã"
 
 #. we really should not come here but instead disable the menu command earlier
-#: ../app/display.c:1071
-msgid "No anti-aliased renderer found"
-msgstr "ããããããããçããããããèããããããããã"
+#: ../app/display.c:1149
+msgid "No antialiased renderer found"
+msgstr "ããããããããçãããããããèããããããããã"
 
-#: ../app/display.c:1209
+#: ../app/display.c:1297
 msgid "<unnamed>"
 msgstr "<ååçã>"
 
 #. no standard buttons
-#: ../app/display.c:1215
+#: ../app/display.c:1303
 msgid "Closing diagram without saving"
 msgstr "çéäããããããããäåãããéããããããããã"
 
-#: ../app/display.c:1217
+#: ../app/display.c:1305
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -741,11 +732,11 @@ msgstr ""
 "'%s' ãããããããããäåããããããã\n"
 "äããäåãããã?"
 
-#: ../app/display.c:1219
+#: ../app/display.c:1307
 msgid "Close Diagram"
 msgstr "ãããããããéãã"
 
-#: ../app/display.c:1224
+#: ../app/display.c:1312
 msgid "_Discard Changes"
 msgstr "çæãã(_D)"
 
@@ -769,20 +760,6 @@ msgstr "æããããããããæãäåãããããã:"
 msgid "Save"
 msgstr "äå"
 
-#: ../app/exit_dialog.c:114
-msgid "active"
-msgstr "æå"
-
-#. *** board of value **************
-#: ../app/exit_dialog.c:123 ../app/plugin-manager.c:262
-#: ../objects/Database/table.c:138 ../objects/Database/table.c:181
-#: ../objects/SISSI/sissi_dialog.c:734 ../objects/UML/association.c:234
-#: ../objects/UML/class.c:144 ../objects/UML/large_package.c:139
-#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "åå"
-
 #: ../app/exit_dialog.c:129
 msgid "Path"
 msgstr "ããå"
@@ -795,36 +772,37 @@ msgstr "ãããéæ"
 msgid "Select None"
 msgstr "éæãèé"
 
-#: ../app/exit_dialog.c:232
+#: ../app/exit_dialog.c:236
 msgid "Nothing selected for saving.  Would you like to try again?"
 msgstr "äåãããããããããéæããããããããéæãçãããã?"
 
-#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
-#: ../app/filedlg.c:746 ../lib/widgets.c:1488
+#: ../app/filedlg.c:143 ../app/filedlg.c:151 ../app/filedlg.c:167
+#: ../app/filedlg.c:813 ../lib/widgets.c:406
 msgid "Supported Formats"
 msgstr "ãããããããããããããã"
 
-#: ../app/filedlg.c:192 ../app/filedlg.c:604
+#: ../app/filedlg.c:196 ../app/filedlg.c:198 ../app/filedlg.c:661
+#: ../app/filedlg.c:663
 msgid "By extension"
 msgstr "æååãåæãã"
 
-#: ../app/filedlg.c:281
+#: ../app/filedlg.c:292
 msgid "Open Diagram"
 msgstr "ãããããããéã"
 
-#: ../app/filedlg.c:309
+#: ../app/filedlg.c:325
 msgid "Open Options"
 msgstr "ãããããããããã"
 
-#: ../app/filedlg.c:317 ../app/filedlg.c:728
+#: ../app/filedlg.c:333 ../app/filedlg.c:795
 msgid "Determine file type:"
 msgstr "çéãæå:"
 
-#: ../app/filedlg.c:337 ../app/filedlg.c:741 ../lib/widgets.c:1493
+#: ../app/filedlg.c:353 ../app/filedlg.c:808 ../lib/widgets.c:414
 msgid "All Files"
 msgstr "ãããããããã"
 
-#: ../app/filedlg.c:370 ../plug-ins/postscript/paginate_psprint.c:408
+#: ../app/filedlg.c:392 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -834,13 +812,13 @@ msgstr ""
 "ãäãããããããããããããããããã\n"
 "\"æååã\" ãåãèãããããããããã"
 
-#: ../app/filedlg.c:380 ../app/filedlg.c:651
-#: ../plug-ins/postscript/paginate_psprint.c:422
+#: ../app/filedlg.c:402 ../app/filedlg.c:715
+#: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "ãããããæãååããã"
 
-#: ../app/filedlg.c:382 ../app/filedlg.c:653
-#: ../plug-ins/postscript/paginate_psprint.c:418
+#: ../app/filedlg.c:404 ../app/filedlg.c:717
+#: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -849,40 +827,40 @@ msgstr ""
 "ãããã '%s' ãæãååãããã\n"
 "äæããããã?"
 
-#: ../app/filedlg.c:436
+#: ../app/filedlg.c:488
 msgid "Save Diagram"
 msgstr "ãããããããäå"
 
 #. Need better way to make it a reasonable size.  Isn't there some
 #. standard look for them (or is that just Gnome?)
-#: ../app/filedlg.c:447
+#: ../app/filedlg.c:502
 msgid "Compress diagram files"
 msgstr "ãããããåçãã"
 
-#: ../app/filedlg.c:457 ../app/filedlg.c:462
+#: ../app/filedlg.c:511
 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 ""
-"åçããããããããããããã 1/10 ääãæãããèãèããäåãééåãã"
-"ããããã (ææ: åçãããããããåçããããããããåçãããããããã"
-"ãããããã)"
+"åçãããããããããããã 1/10 ääãæãããèãèããäåãééåããã"
+"ãããã (ææ: åçãããããããåçããããããããåçããããããããã"
+"ããããã)"
 
-#: ../app/filedlg.c:677
+#: ../app/filedlg.c:741
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 msgstr ""
 "'%s' ãäåãäçãã\n"
-"ãããããããããããã\n"
+"ããããããããããããã\n"
 "æåããããããããããããã"
 
-#: ../app/filedlg.c:704
+#: ../app/filedlg.c:768
 msgid "Export Diagram"
 msgstr "ããããããããããããã"
 
-#: ../app/filedlg.c:720
+#: ../app/filedlg.c:787
 msgid "Export Options"
 msgstr "ãããããããããããã"
 
@@ -906,26 +884,26 @@ msgstr "åèåäããããããã(_E)"
 msgid "Match _all properties (not just object name)"
 msgstr "ããããããããã (ããããããåãéã) ããããããã(_A)"
 
-#: ../app/find-and-replace.c:510
+#: ../app/find-and-replace.c:508
 msgid "Find"
 msgstr "æç"
 
-#: ../app/find-and-replace.c:542 ../app/menus.c:267
+#: ../app/find-and-replace.c:538 ../app/menus.c:259
 msgid "Replace"
 msgstr "çãæã"
 
-#: ../app/find-and-replace.c:545
+#: ../app/find-and-replace.c:541
 msgid "Replace _All"
 msgstr "ãããçãæã(_A)"
 
 #. 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:550
+#: ../app/find-and-replace.c:546
 msgid "_Replace"
 msgstr "çãæã(_R)"
 
-#: ../app/interface.c:153
+#: ../app/interface.c:157
 msgid ""
 "Modify object(s)\n"
 "Use <Space> to toggle between this and other tools"
@@ -933,7 +911,7 @@ msgstr ""
 "ãããããããäæããã\n"
 "(<Space> ãããåãäããããããããåãæããåèãã)"
 
-#: ../app/interface.c:159
+#: ../app/interface.c:163
 msgid ""
 "Text edit(s)\n"
 "Use <Esc> to leave this tool"
@@ -942,212 +920,212 @@ msgstr ""
 "(<ESC> ãããçäããã)"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:165 ../app/menus.c:229 ../objects/FS/function.c:988
+#: ../app/interface.c:169 ../app/menus.c:225 ../objects/FS/function.c:991
 msgid "Magnify"
 msgstr "æå"
 
-#: ../app/interface.c:171
+#: ../app/interface.c:175
 msgid "Scroll around the diagram"
 msgstr "ãããããããåèããããããããã"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../app/interface.c:177 ../app/menus.c:232 ../lib/properties.c:80
-#: ../lib/properties.h:530 ../objects/AADL/aadlbox.c:153
+#: ../app/interface.c:181 ../app/menus.c:228 ../lib/properties.c:101
+#: ../lib/properties.h:562 ../objects/AADL/aadlbox.c:153
 #: ../objects/Jackson/requirement.c:144 ../objects/UML/activity.c:129
-#: ../objects/UML/actor.c:126 ../objects/UML/classicon.c:149
-#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:161
+#: ../objects/UML/actor.c:123 ../objects/UML/classicon.c:148
+#: ../objects/UML/component.c:130 ../objects/UML/component_feature.c:160
 #: ../objects/UML/node.c:130 ../objects/UML/node.c:132
-#: ../objects/UML/note.c:124 ../objects/UML/object.c:151
-#: ../objects/UML/small_package.c:135 ../objects/UML/state.c:154
-#: ../objects/UML/usecase.c:142 ../objects/custom/custom_object.c:236
+#: ../objects/UML/note.c:121 ../objects/UML/object.c:167
+#: ../objects/UML/small_package.c:132 ../objects/UML/state.c:158
+#: ../objects/UML/usecase.c:139 ../objects/custom/custom_object.c:239
 #: ../objects/network/basestation.c:135 ../objects/network/radiocell.c:127
 msgid "Text"
 msgstr "æååãæç"
 
-#: ../app/interface.c:183 ../app/menus.c:233
+#: ../app/interface.c:187 ../app/menus.c:229
 msgid "Box"
 msgstr "çåãæç"
 
-#: ../app/interface.c:189 ../app/menus.c:234
+#: ../app/interface.c:193 ../app/menus.c:230
 msgid "Ellipse"
 msgstr "æåãæç"
 
-#: ../app/interface.c:195 ../app/menus.c:235
+#: ../app/interface.c:199 ../app/menus.c:231
 msgid "Polygon"
 msgstr "åèåãæç"
 
-#: ../app/interface.c:201 ../app/menus.c:236
+#: ../app/interface.c:205 ../app/menus.c:232
 msgid "Beziergon"
-msgstr "ããããããæç"
+msgstr "ããããããæç"
 
-#: ../app/interface.c:207 ../app/menus.c:238 ../objects/standard/line.c:229
+#: ../app/interface.c:211 ../app/menus.c:234 ../objects/standard/line.c:232
 msgid "Line"
 msgstr "çãæç"
 
-#: ../app/interface.c:213 ../app/menus.c:239
+#: ../app/interface.c:217 ../app/menus.c:235
 msgid "Arc"
 msgstr "ååãæç"
 
-#: ../app/interface.c:219 ../app/menus.c:240
+#: ../app/interface.c:223 ../app/menus.c:236
 msgid "Zigzagline"
 msgstr "ããããçãæç"
 
-#: ../app/interface.c:225 ../app/menus.c:241
+#: ../app/interface.c:229 ../app/menus.c:237
 msgid "Polyline"
 msgstr "éççãæç"
 
-#: ../app/interface.c:231 ../app/menus.c:242
+#: ../app/interface.c:235 ../app/menus.c:238
 msgid "Bezierline"
 msgstr "ãããæçãæç"
 
-#: ../app/interface.c:237 ../app/menus.c:245
+#: ../app/interface.c:241 ../app/menus.c:241
 msgid "Image"
 msgstr "çåãåãèã"
 
-#: ../app/interface.c:244 ../app/menus.c:243
+#: ../app/interface.c:248 ../app/menus.c:239
 msgid "Outline"
 msgstr "ãããããããæç"
 
-#: ../app/interface.c:619 ../app/interface.c:855
+#: ../app/interface.c:631 ../app/interface.c:864
 msgid "Pops up the Navigation window."
-msgstr "ããããããããããããããããããããããã"
+msgstr "ãããããããããããããããããããããã"
 
-#: ../app/interface.c:817
+#: ../app/interface.c:826
 msgid "Diagram menu."
 msgstr "ããããããããããããã"
 
-#: ../app/interface.c:920
+#: ../app/interface.c:926
 msgid "Zoom"
 msgstr "ããã"
 
-#: ../app/interface.c:935
+#: ../app/interface.c:941
 msgid "Toggles snap-to-grid for this window."
 msgstr "ããããããããããããåãããããåããããããåãæããã"
 
-#: ../app/interface.c:946
+#: ../app/interface.c:952
 msgid "Toggles object snapping for this window."
 msgstr "ãããããããããããããããåãããããåããããããåãæããã"
 
-#: ../app/interface.c:1336
+#: ../app/interface.c:1381
 #, c-format
 msgid "No sheet named %s"
 msgstr "%s ãããããããããããã"
 
-#: ../app/interface.c:1374
+#: ../app/interface.c:1419
 msgid "Other sheets"
 msgstr "äãããã"
 
-#: ../app/interface.c:1434 ../sheets/Flowchart.sheet.in.h:10
+#: ../app/interface.c:1479 ../sheets/Flowchart.sheet.in.h:10
 msgid "Flowchart"
 msgstr "ããããããã"
 
-#: ../app/interface.c:1494
+#: ../app/interface.c:1539
 msgid ""
 "Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double click to change "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
 "colors."
 msgstr ""
 "æãããããããããåæèãèæèããåããæãéãçãåèãããããããã"
-"èãããããããåããçåããããããããåæãèãäæããã (ããããã"
-"ããããããèãåæãããã)"
+"èãããããããåããçåããããããããåæãèãäæããã (ãããããã"
+"ããããèãåæãããã)"
 
-#: ../app/interface.c:1509
+#: ../app/interface.c:1553
 msgid ""
 "Line widths.  Click on a line to set the default line width for new "
 "objects.  Double-click to set the line width more precisely."
 msgstr ""
 "æãããããããããçãåãããçããããããããããããããåãããããã"
-"ãã (ãããããããããããããèçãèåãããã)"
+"ãã (ããããããããããããèçãèåãããã)"
 
-#: ../app/interface.c:1552
+#: ../app/interface.c:1596
 msgid ""
 "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details..."
+"arrow parameters with Detailsâ"
 msgstr ""
 "æããçãããããããçåãåçããããããããããããçåãéæãããã[è"
-"ç...] ãçåãããããããèåããã"
+"çâ] ãçåããããããããèåããã"
 
-#: ../app/interface.c:1557
+#: ../app/interface.c:1601
 msgid ""
 "Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details..."
+"parameters with Detailsâ"
 msgstr ""
-"æããçãããããããççããããããããççãéæãããã[èç...] ãçç"
-"ãããããããèåããã"
+"æããçãããããããççããããããããççãéæãããã[èçâ] ãççã"
+"ãããããããèåããã"
 
-#: ../app/interface.c:1573
+#: ../app/interface.c:1617
 msgid ""
 "Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details..."
+"parameters with Detailsâ"
 msgstr ""
 "æããçãããããããçåãççããããããããããããçåãéæãããã[è"
-"ç...] ãçåãããããããèåããã"
+"çâ] ãçåããããããããèåããã"
 
-#: ../app/interface.c:1633 ../app/interface.c:1760
+#: ../app/interface.c:1676 ../app/interface.c:1800 ../dia.desktop.in.in.h:3
 msgid "Diagram Editor"
-msgstr "ããããããããããã"
+msgstr "ããããããããããã"
 
-#: ../app/layer_dialog.c:159
+#: ../app/layer_dialog.c:165
 msgid "New Layer"
-msgstr "æããããããèåããã"
+msgstr "æãããããããèåããã"
 
-#: ../app/layer_dialog.c:160
+#: ../app/layer_dialog.c:166
 msgid "Raise Layer"
-msgstr "ããããåéãéããã"
+msgstr "ãããããåéãéããã"
 
-#: ../app/layer_dialog.c:161
+#: ../app/layer_dialog.c:167
 msgid "Lower Layer"
-msgstr "ããããèéãéããã"
+msgstr "ãããããèéãéããã"
 
-#: ../app/layer_dialog.c:162
+#: ../app/layer_dialog.c:168
 msgid "Delete Layer"
-msgstr "ããããåéããã"
+msgstr "ãããããåéããã"
 
-#: ../app/layer_dialog.c:306
+#: ../app/layer_dialog.c:311
 msgid "Layers:"
-msgstr "ããã:"
+msgstr "ãããã:"
 
-#: ../app/layer_dialog.c:386
+#: ../app/layer_dialog.c:390
 msgid "Layers"
-msgstr "ããã"
+msgstr "ãããã"
 
-#: ../app/layer_dialog.c:400
+#: ../app/layer_dialog.c:404
 msgid "Diagram:"
 msgstr "ãããããã:"
 
-#: ../app/layer_dialog.c:514 ../app/layer_dialog.c:1225
+#: ../app/layer_dialog.c:517 ../app/layer_dialog.c:1230
 #, c-format
 msgid "New layer %d"
-msgstr "æããããã %d"
+msgstr "æãããããã %d"
 
-#: ../app/layer_dialog.c:729
+#: ../app/layer_dialog.c:732
 msgid "none"
 msgstr "ãã"
 
-#: ../app/layer_dialog.c:1196
+#: ../app/layer_dialog.c:1200
 msgid "Edit Layer"
-msgstr "ããããçé"
+msgstr "ãããããçé"
 
-#: ../app/layer_dialog.c:1196
+#: ../app/layer_dialog.c:1200
 msgid "Add Layer"
-msgstr "ããããèå"
+msgstr "ãããããèå"
 
-#: ../app/layer_dialog.c:1215
+#: ../app/layer_dialog.c:1219
 msgid "Layer name:"
-msgstr "ãããå:"
+msgstr "ããããå:"
 
-#: ../app/linewidth_area.c:246 ../lib/properties.h:491 ../lib/properties.h:494
+#: ../app/linewidth_area.c:248 ../lib/properties.h:511 ../lib/properties.h:514
 #: ../objects/chronogram/chronoline.c:183
 #: ../objects/chronogram/chronoref.c:162
 msgid "Line width"
 msgstr "çå"
 
-#: ../app/linewidth_area.c:258
+#: ../app/linewidth_area.c:260
 msgid "Line width:"
 msgstr "çå:"
 
-#: ../app/load_save.c:295
+#: ../app/load_save.c:263
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1155,41 +1133,41 @@ msgstr ""
 "ãããããããèãèãéãããããççãããã\n"
 "(ãããããããäãããããããããããããããããã)"
 
-#: ../app/load_save.c:299
+#: ../app/load_save.c:267
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle %d does not exist on '%s'."
+"Connection handle %d does not exist on '%s'."
 msgstr ""
 "ãããããããèãèãéãããããççãããã\n"
 "(æçãããã %d ã '%s' äããååãããã)"
 
-#: ../app/load_save.c:327
+#: ../app/load_save.c:285
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection point %d does not exist on '%s'."
+"Connection point %d does not exist on '%s'."
 msgstr ""
 "ãããããããèãèãéãããããççãããã\n"
 "(æçç %d ã '%s' äããååãããã)"
 
-#: ../app/load_save.c:367
+#: ../app/load_save.c:325
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "ãããããã %2$s ãèãããããã %1$s ãããããã\n"
 
-#: ../app/load_save.c:416
+#: ../app/load_save.c:375
 msgid "You must specify a file, not a directory.\n"
-msgstr "ããããããããããããããæåããããããã\n"
+msgstr "ãããããããããããããããæåããããããã\n"
 
-#: ../app/load_save.c:423 ../plug-ins/dxf/dxf-import.c:1309
-#: ../plug-ins/wpg/wpg.c:1177 ../plug-ins/xfig/xfig-import.c:1270
-#: ../plug-ins/xslt/xslt.c:91
+#: ../app/load_save.c:382 ../plug-ins/dxf/dxf-import.c:1290
+#: ../plug-ins/wpg/wpg.c:1181 ../plug-ins/xfig/xfig-import.c:1275
+#: ../plug-ins/xslt/xslt.c:93
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "'%s' ãèãèãããããéãããããããã\n"
 
-#: ../app/load_save.c:441 ../app/load_save.c:447
+#: ../app/load_save.c:400 ../app/load_save.c:406
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1198,7 +1176,7 @@ msgstr ""
 "ãããããã %s ãèãèãéãããã\n"
 "(ãããããçéãäæãã)"
 
-#: ../app/load_save.c:455
+#: ../app/load_save.c:414
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1216,438 +1194,509 @@ msgid ""
 msgstr ""
 "ãããããããèãèãéãããã:\n"
 "%s\n"
-"æãã Dia ããããããåãããããããäããããã"
+"æãã Dia ããããããåããããããããäããããã"
 
-#: ../app/load_save.c:995
+#: ../app/load_save.c:1015
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "ååããããã %s ãæãèãæéãããããã\n"
 
-#: ../app/load_save.c:1027
+#: ../app/load_save.c:1047
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "äæããããã %s ãæãèãæéãããããã\n"
 
-#: ../app/load_save.c:1049 ../plug-ins/cairo/diacairo.c:121
-#: ../plug-ins/cgm/cgm.c:1154 ../plug-ins/drs/dia-render-script.c:121
-#: ../plug-ins/dxf/dxf-export.c:547 ../plug-ins/hpgl/hpgl.c:710
-#: ../plug-ins/libart/export_png.c:157
-#: ../plug-ins/metapost/render_metapost.c:1177
-#: ../plug-ins/pgf/render_pgf.c:1208 ../plug-ins/postscript/render_eps.c:105
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:137 ../plug-ins/svg/render_svg.c:199
-#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1151 ../plug-ins/xslt/xslt.c:99
+#: ../app/load_save.c:1069 ../plug-ins/cairo/diacairo.c:125
+#: ../plug-ins/cgm/cgm.c:1170 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/dxf/dxf-export.c:599 ../plug-ins/hpgl/hpgl.c:710
+#: ../plug-ins/libart/export_png.c:159
+#: ../plug-ins/metapost/render_metapost.c:1180
+#: ../plug-ins/pgf/render_pgf.c:1203 ../plug-ins/postscript/render_eps.c:105
+#: ../plug-ins/pstricks/render_pstricks.c:919
+#: ../plug-ins/shape/shape-export.c:138 ../plug-ins/svg/render_svg.c:198
+#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wpg/wpg.c:1076
+#: ../plug-ins/xfig/xfig-export.c:1157 ../plug-ins/xslt/xslt.c:101
 #, c-format
 msgid "Can't open output file %s: %s\n"
 msgstr "'%s'ãéããããããããã: %s\n"
 
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:1060
+#: ../app/load_save.c:1080
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "ãããã %2$s ãæãèãéãåéããã %1$d ãççãããã\n"
 
-#: ../app/load_save.c:1071
+#: ../app/load_save.c:1091
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "%s ãæççãååããããããã %s ãåæããããã: %s\n"
 
-#: ../app/load_save.c:1162 ../app/load_save.c:1167
+#: ../app/load_save.c:1234 ../app/load_save.c:1239
 msgid "Dia Diagram File"
-msgstr "Dia ããããããããããã"
+msgstr "Dia ãããããããããã"
 
-#: ../app/menus.c:63
+#: ../app/menus.c:62
 msgid "Fit"
 msgstr "ãããã"
 
-#: ../app/menus.c:81
+#: ../app/menus.c:79
 msgid "_File"
 msgstr "ãããã(_F)"
 
-#: ../app/menus.c:85
+#: ../app/menus.c:80
+#, fuzzy
+#| msgid "Don't create empty diagram"
+msgid "Create a new diagram"
+msgstr "çããããããããçæããã"
+
+#: ../app/menus.c:81
+#, fuzzy
+#| msgid "Compress diagram files"
+msgid "Open a diagram file"
+msgstr "ãããããåçãã"
+
+#: ../app/menus.c:83
 msgid "_Help"
 msgstr "ããã(_H)"
 
 #: ../app/menus.c:93
-msgid "Sheets and Objects..."
-msgstr "ãããããããããã..."
+msgid "Sheets and Objectsâ"
+msgstr "ããããããããããâ"
 
 #: ../app/menus.c:95
-msgid "Plugins..."
-msgstr "ããããã..."
+msgid "Pluginsâ"
+msgstr "ãããããâ"
 
-#: ../app/menus.c:101
-msgid "_Diagram tree..."
-msgstr "ãããããããããã(_D)..."
+#: ../app/menus.c:96
+msgid "_Diagram Treeâ"
+msgstr "ãããããããããã(_D)â"
 
-#: ../app/menus.c:107
+#: ../app/menus.c:101
 msgid "Show Toolbar"
 msgstr "ããããã"
 
-#: ../app/menus.c:108
+#: ../app/menus.c:102
 msgid "Show Statusbar"
 msgstr "ããããããã"
 
-#: ../app/menus.c:109
+#: ../app/menus.c:103
 msgid "Show Layers"
-msgstr "ããããäè"
+msgstr "ãããããäè"
 
-#: ../app/menus.c:117
-msgid "_Export ..."
-msgstr "ãããããã(_E)..."
+#: ../app/menus.c:109
+msgid "Save the diagram"
+msgstr "ãããããããäå"
+
+#: ../app/menus.c:110
+msgid "Save the diagram with a new name"
+msgstr ""
+
+#: ../app/menus.c:111
+msgid "_Exportâ"
+msgstr " ãããããã(_E)â"
 
-#: ../app/menus.c:118
+#: ../app/menus.c:111
+#, fuzzy
+#| msgid "Export Diagram"
+msgid "Export the diagram"
+msgstr "ããããããããããããã"
+
+#: ../app/menus.c:112
 msgid "_Diagram Properties"
 msgstr "ãããããããããããã(_D)"
 
-#: ../app/menus.c:119
-msgid "Page Set_up..."
-msgstr "ãããèå(_U)..."
+#: ../app/menus.c:113
+msgid "Page Set_upâ"
+msgstr "ãããèå(_U)â"
 
-#: ../app/menus.c:123 ../app/sheets_dialog.c:236
+#: ../app/menus.c:114
+#, fuzzy
+#| msgid "Scroll around the diagram"
+msgid "Print the diagram"
+msgstr "ãããããããåèããããããããã"
+
+#: ../app/menus.c:117
 msgid "_Edit"
 msgstr "çé(_E)"
 
-#: ../app/menus.c:130
+#: ../app/menus.c:121
+#, fuzzy
+#| msgid "Convection"
+msgid "Copy selection"
+msgstr "åæ"
+
+#: ../app/menus.c:122
+#, fuzzy
+#| msgid "P Detection"
+msgid "Cut selection"
+msgstr "P æç"
+
+#: ../app/menus.c:123
+#, fuzzy
+#| msgid "Water detection"
+msgid "Paste selection"
+msgstr "Water detection"
+
+#: ../app/menus.c:124
 msgid "_Duplicate"
 msgstr "èè(_D)"
 
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control>>alt> doesn't work either
-#: ../app/menus.c:138
+#. * <control><alt> doesn't work either
+#: ../app/menus.c:132
 msgid "Copy Text"
 msgstr "æååãããã"
 
-#: ../app/menus.c:139
+#: ../app/menus.c:133
 msgid "Cut Text"
 msgstr "æååãåãåã"
 
-#: ../app/menus.c:140
+#: ../app/menus.c:134
 msgid "Paste _Text"
 msgstr "æååãèãäã(_T)"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:136
+#, fuzzy
+#| msgid "Paste _Text"
+msgid "Paste _Image"
+msgstr "æååãèãäã(_T)"
+
+#: ../app/menus.c:138
 msgid "_Layers"
-msgstr "ããã(_L)"
+msgstr "ãããã(_L)"
+
+#: ../app/menus.c:139
+msgid "Add Layerâ"
+msgstr "ãããããèåâ"
+
+#: ../app/menus.c:140
+msgid "Rename Layerâ"
+msgstr "ããããåãåæâ"
+
+#: ../app/menus.c:141
+msgid "Move Selection to Layer above"
+msgstr "ãããããããäããããããçåãã"
+
+#: ../app/menus.c:142
+msgid "Move Selection to Layer below"
+msgstr "ãããããããäããããããçåãã"
 
 #: ../app/menus.c:143
-msgid "Add Layer..."
-msgstr "ããããèå..."
+msgid "_Layersâ"
+msgstr "ãããã(_L)â"
 
 #: ../app/menus.c:144
-msgid "Rename Layer..."
-msgstr "ãããåãåæ..."
+msgid "_View"
+msgstr "èç(_V)"
 
 #: ../app/menus.c:145
-msgid "Move selection to layer above"
-msgstr "ãããããããäãããããçåãã"
+#, fuzzy
+#| msgid "Zoom pointer"
+msgid "Zoom in"
+msgstr "ãããããããã"
 
 #: ../app/menus.c:146
-msgid "Move selection to layer below"
-msgstr "ãããããããäãããããçåãã"
+#, fuzzy
+#| msgid "Zoom pointer"
+msgid "Zoom out"
+msgstr "ãããããããã"
 
 #: ../app/menus.c:147
-msgid "_Layers..."
-msgstr "ããã(_L)..."
-
-#: ../app/menus.c:149
-msgid "_View"
-msgstr "èç(_V)"
-
-#: ../app/menus.c:152
 msgid "_Zoom"
 msgstr "ããã(_Z)"
 
-#: ../app/menus.c:153
+#: ../app/menus.c:148
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:154 ../app/menus.c:573
+#: ../app/menus.c:149 ../app/menus.c:574 ../app/menus.c:586
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:155 ../app/menus.c:574
+#: ../app/menus.c:150 ../app/menus.c:575 ../app/menus.c:587
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:156
+#: ../app/menus.c:151
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:157
+#: ../app/menus.c:152
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:158
+#: ../app/menus.c:153
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:160
+#: ../app/menus.c:155
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:161
+#: ../app/menus.c:156
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:162
+#: ../app/menus.c:157
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:163
+#: ../app/menus.c:158
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:164
+#: ../app/menus.c:159
 msgid "25"
 msgstr "25"
 
+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
+#: ../app/menus.c:161
+#, fuzzy
+#| msgid "Zoom pointer"
+msgid "Zoom fit"
+msgstr "ãããããããã"
+
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:170
+#: ../app/menus.c:165
 msgid "New _View"
 msgstr "æããããã(_V)"
 
-#: ../app/menus.c:171
+#: ../app/menus.c:166
 msgid "C_lone View"
 msgstr "ããããããã(_L)"
 
-#: ../app/menus.c:174
+#: ../app/menus.c:169
 msgid "_Objects"
 msgstr "ãããããã(_O)"
 
-#: ../app/menus.c:175
+#: ../app/menus.c:170
 msgid "Send to _Back"
 msgstr "æèéãéã(_B)"
 
-#: ../app/menus.c:176
+#: ../app/menus.c:171
 msgid "Bring to _Front"
 msgstr "æåéãéã(_F)"
 
-#: ../app/menus.c:177
+#: ../app/menus.c:172
 msgid "Send Backwards"
 msgstr "èéãéã"
 
-#: ../app/menus.c:178
+#: ../app/menus.c:173
 msgid "Bring Forwards"
 msgstr "åéãéã"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:175
 msgid "_Group"
 msgstr "ããããå(_G)"
 
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:182
+#: ../app/menus.c:177
 msgid "_Ungroup"
 msgstr "ããããåãèé(_U)"
 
-#: ../app/menus.c:184
+#: ../app/menus.c:179
 msgid "_Parent"
 msgstr "èããã(_P)"
 
-#: ../app/menus.c:185
+#: ../app/menus.c:180
 msgid "_Unparent"
 msgstr "èãèé(_U)"
 
-#: ../app/menus.c:186
+#: ../app/menus.c:181
 msgid "_Unparent Children"
 msgstr "èãããåããã(_U)"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:188 ../objects/FS/function.c:808
+#: ../app/menus.c:183 ../objects/FS/function.c:811
 msgid "Align"
 msgstr "éç"
 
-#: ../app/menus.c:193 ../objects/standard/textobj.c:137
+#: ../app/menus.c:188 ../objects/standard/textobj.c:137
 msgid "Top"
 msgstr "ä"
 
-#: ../app/menus.c:194
+#: ../app/menus.c:189
 msgid "Middle"
 msgstr "ä"
 
-#: ../app/menus.c:195 ../objects/standard/textobj.c:136
+#: ../app/menus.c:190 ../objects/standard/textobj.c:136
 msgid "Bottom"
 msgstr "ä"
 
-#: ../app/menus.c:197
+#: ../app/menus.c:192
 msgid "Spread Out Horizontally"
 msgstr "æåæåãåãã"
 
-#: ../app/menus.c:198
+#: ../app/menus.c:193
 msgid "Spread Out Vertically"
 msgstr "åçæåãåãã"
 
-#: ../app/menus.c:199
+#: ../app/menus.c:194
 msgid "Adjacent"
 msgstr "éãäãã"
 
-#: ../app/menus.c:200
+#: ../app/menus.c:195
 msgid "Stacked"
 msgstr "çãäãã"
 
-#: ../app/menus.c:204
+#: ../app/menus.c:196 ../app/menus.c:206
+msgid "Connected"
+msgstr "çææç"
+
+#: ../app/menus.c:200
 msgid "_Select"
 msgstr "éæ(_S)"
 
-#: ../app/menus.c:205
+#: ../app/menus.c:201
 msgid "All"
 msgstr "ããã"
 
-#: ../app/menus.c:206 ../lib/arrows.c:1882 ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
+#: ../app/menus.c:202 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:96
+#: ../objects/UML/association.c:222 ../objects/UML/association.c:228
 msgid "None"
 msgstr "ãã"
 
-#: ../app/menus.c:207
+#: ../app/menus.c:203
 msgid "Invert"
 msgstr "åè"
 
-#: ../app/menus.c:209
+#: ../app/menus.c:205
 msgid "Transitive"
 msgstr "åéåè"
 
-#: ../app/menus.c:210
-msgid "Connected"
-msgstr "çææç"
-
-#: ../app/menus.c:211
+#: ../app/menus.c:207
 msgid "Same Type"
 msgstr "åãçé"
 
 #. display_select_radio_entries go here
-#: ../app/menus.c:215
+#: ../app/menus.c:211
 msgid "Select By"
 msgstr "æãéæ"
 
-#: ../app/menus.c:217
+#: ../app/menus.c:213
 msgid "_Input Methods"
 msgstr "ååãããã(_I)"
 
-#: ../app/menus.c:219
+#: ../app/menus.c:215
 msgid "D_ialogs"
 msgstr "ããããã(_I)"
 
-#: ../app/menus.c:221
+#: ../app/menus.c:217
 msgid "D_ebug"
 msgstr "ãããã(_E)"
 
-#: ../app/menus.c:227
+#: ../app/menus.c:223
 msgid "_Tools"
 msgstr "ããã(_T)"
 
-#: ../app/menus.c:228
+#: ../app/menus.c:224
 msgid "Modify"
 msgstr "åæ"
 
-#: ../app/menus.c:230
-msgid "Edit text"
+#: ../app/menus.c:226
+msgid "Edit Text"
 msgstr "æååãçé"
 
-#: ../app/menus.c:231
+#: ../app/menus.c:227
 msgid "Scroll"
 msgstr "ããããã"
 
-#: ../app/menus.c:254
-msgid "Fullscr_een"
-msgstr "ããããããã(_E)"
-
-#: ../app/menus.c:256
-msgid "_AntiAliased"
+#: ../app/menus.c:248
+msgid "_Antialiased"
 msgstr "ãããããããã(_A)"
 
-#: ../app/menus.c:257
+#: ../app/menus.c:249
 msgid "Show _Grid"
 msgstr "ãããã(_G)"
 
-#: ../app/menus.c:258
-msgid "_Snap To Grid"
+#: ../app/menus.c:250
+msgid "_Snap to Grid"
 msgstr "ãããããåããã(_S)"
 
-#: ../app/menus.c:259
-msgid "Snap To _Objects"
+#: ../app/menus.c:251
+msgid "Snap to _Objects"
 msgstr "ãããããããéçãã(_O)"
 
-#: ../app/menus.c:260
+#: ../app/menus.c:252
 msgid "Show _Rulers"
 msgstr "ççã(_R)"
 
-#: ../app/menus.c:261
+#: ../app/menus.c:253
 msgid "Show _Connection Points"
 msgstr "æçç(_C)"
 
-#: ../app/menus.c:268
+#: ../app/menus.c:260
 msgid "Union"
 msgstr "çå"
 
-#: ../app/menus.c:269
+#: ../app/menus.c:261
 msgid "Intersection"
 msgstr "äå"
 
 #. 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:270 ../app/sheets_dialog.c:785 ../objects/FS/function.c:708
-#: ../objects/FS/function.c:860 ../objects/FS/function.c:862
+#: ../app/menus.c:262 ../objects/FS/function.c:711
+#: ../objects/FS/function.c:863 ../objects/FS/function.c:865
 msgid "Remove"
 msgstr "åé"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:272
+#: ../app/menus.c:264
 msgid "Inverse"
 msgstr "åè"
 
-#: ../app/menus.c:336
+#: ../app/menus.c:327
 msgid "NULL tooldata in tool_menu_select"
 msgstr "tool_menu_select ãäã NULL ã tooldata ããããã"
 
-#: ../app/menus.c:575
+#: ../app/menus.c:576 ../app/menus.c:588
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:576
+#: ../app/menus.c:577 ../app/menus.c:589
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:577
+#: ../app/menus.c:578 ../app/menus.c:590
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:578
+#: ../app/menus.c:579 ../app/menus.c:591
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:579
+#: ../app/menus.c:580 ../app/menus.c:592
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:580
+#: ../app/menus.c:581 ../app/menus.c:593
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:581
+#: ../app/menus.c:582 ../app/menus.c:594
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:582
+#: ../app/menus.c:583 ../app/menus.c:595
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:608
+#: ../app/menus.c:621
 msgid "Toggles snap-to-grid."
 msgstr "ãããããåããããããããåãæããã"
 
-#: ../app/menus.c:620
+#: ../app/menus.c:632
 msgid "Toggles object snapping."
 msgstr "ãããããããéçãããããããåãæããã"
 
-#: ../app/modify_tool.c:392
-msgid "Couldn't get GTK settings"
+#: ../app/modify_tool.c:366
+msgid "Couldn't get GTK+ settings"
 msgstr "GTK+ ãèåãååãããããããã"
 
 #: ../app/plugin-manager.c:200
-msgid "Plug-ins"
+msgid "Plugins"
 msgstr "ããããã"
 
 #: ../app/plugin-manager.c:255
@@ -1655,7 +1704,7 @@ msgid "Loaded"
 msgstr "èãèãåä"
 
 #: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:730
-#: ../objects/SISSI/sissi_dialog.c:882
+#: ../objects/SISSI/sissi_dialog.c:880
 msgid "Description"
 msgstr "èæ"
 
@@ -1664,16 +1713,16 @@ msgid "Load at Startup"
 msgstr "èåæãèãèã"
 
 #: ../app/plugin-manager.c:284
-msgid "File Name"
+msgid "Filename"
 msgstr "ããããå"
 
-#: ../app/preferences.c:99 ../app/preferences.c:144
+#: ../app/preferences.c:100 ../app/preferences.c:143
 msgid "any"
 msgstr "ããã"
 
 #: ../app/preferences.c:118
 msgid "User Interface"
-msgstr "ããããããã"
+msgstr "ãããããããã"
 
 #: ../app/preferences.c:119
 msgid "Diagram Defaults"
@@ -1687,15 +1736,15 @@ msgstr "èç"
 msgid "Favorites"
 msgstr "åååå"
 
-#: ../app/preferences.c:165
+#: ../app/preferences.c:164
 msgid "Reset tools after create"
 msgstr "éçããåãããããéæããããããã"
 
-#: ../app/preferences.c:168
+#: ../app/preferences.c:167
 msgid "Number of undo levels:"
 msgstr "\"åãæã\" ãåæ:"
 
-#: ../app/preferences.c:171
+#: ../app/preferences.c:170
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1703,191 +1752,192 @@ msgstr ""
 "ãããããããããæãã\n"
 "ãããããããäåããã"
 
-#: ../app/preferences.c:174
+#: ../app/preferences.c:173
 msgid "Recent documents list size:"
 msgstr "æèéãããããããããæ:"
 
-#: ../app/preferences.c:177
+#: ../app/preferences.c:176
 msgid "Use menu bar"
-msgstr "ããããããããäã"
+msgstr "ãããããããäã"
 
-#: ../app/preferences.c:180
+#: ../app/preferences.c:179
 msgid "Keep tool box on top of diagram windows"
-msgstr "ãããããããããããããããããåéãéçãã"
+msgstr "ããããããããããããããããåéãéçãã"
 
-#: ../app/preferences.c:183
+#: ../app/preferences.c:182
 msgid "Length unit:"
 msgstr "éããåä:"
 
-#: ../app/preferences.c:186
-msgid "Font-size unit:"
-msgstr "ãããããããããåä:"
+#: ../app/preferences.c:185
+msgid "Font size unit:"
+msgstr "ããããããããåä:"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:188
 msgid "New diagram:"
 msgstr " æãããããããã "
 
-#: ../app/preferences.c:190
+#: ../app/preferences.c:189
 msgid "Portrait"
 msgstr "æéããã"
 
-#: ../app/preferences.c:192
+#: ../app/preferences.c:191
 msgid "Paper type:"
 msgstr "ççãçé:"
 
-#: ../app/preferences.c:194 ../objects/Database/table_dialog.c:1078
+#: ../app/preferences.c:193 ../objects/Database/table_dialog.c:1089
 msgid "Background Color:"
 msgstr "èæè:"
 
-#: ../app/preferences.c:196
+#: ../app/preferences.c:195
 msgid "Compress saved files"
 msgstr "ãããããåçããäåãã"
 
-#: ../app/preferences.c:199
+#: ../app/preferences.c:198
 msgid "Connection Points:"
 msgstr " æçç "
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:200 ../app/preferences.c:211 ../app/preferences.c:235
+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
 msgid "Visible"
 msgstr "èçãã"
 
-#: ../app/preferences.c:201
+#: ../app/preferences.c:200
 msgid "Snap to object"
 msgstr "ãããããããéçãã"
 
-#: ../app/preferences.c:204
+#: ../app/preferences.c:203
 msgid "New window:"
 msgstr " æããããããã "
 
-#: ../app/preferences.c:205
+#: ../app/preferences.c:204
 msgid "Width:"
 msgstr "å:"
 
-#: ../app/preferences.c:206
+#: ../app/preferences.c:205
 msgid "Height:"
 msgstr "éã:"
 
-#: ../app/preferences.c:207
+#: ../app/preferences.c:206
 msgid "Magnify:"
 msgstr "ãããç:"
 
-#: ../app/preferences.c:210
+#: ../app/preferences.c:209
 msgid "Page breaks:"
 msgstr " ããããåçç "
 
-#: ../app/preferences.c:212 ../app/preferences.c:240
+#: ../app/preferences.c:211 ../app/preferences.c:241
 msgid "Color:"
 msgstr "è:"
 
-#: ../app/preferences.c:213
+#: ../app/preferences.c:212
 msgid "Solid lines"
 msgstr "åçãæçãã"
 
-#: ../app/preferences.c:216
+#: ../app/preferences.c:215
 msgid "Antialias:"
 msgstr " ãããããããã "
 
-#: ../app/preferences.c:217
+#: ../app/preferences.c:216
 msgid "view antialised"
 msgstr "ããããããããåæãääãã"
 
 #. Favored Filter
 #. Translators: Menu item Verb/Channel/Export
 #. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:221 ../objects/FS/function.c:698
-#: ../objects/FS/function.c:700 ../plug-ins/libart/export_png.c:323
+#: ../app/preferences.c:220 ../objects/FS/function.c:701
+#: ../objects/FS/function.c:703 ../plug-ins/libart/export_png.c:328
 msgid "Export"
 msgstr " ãããããã "
 
-#: ../app/preferences.c:223
+#: ../app/preferences.c:222
 msgid "Portable Network Graphics"
 msgstr "PNG çå:"
 
-#: ../app/preferences.c:225 ../plug-ins/svg/render_svg.c:515
-#: ../plug-ins/svg/svg-import.c:884
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:497
+#: ../plug-ins/svg/svg-import.c:1205
 msgid "Scalable Vector Graphics"
-msgstr "ãããããããããããããããããã (SVG):"
+msgstr "ããããããããããããããããã (SVG):"
 
-#: ../app/preferences.c:227
+#: ../app/preferences.c:226
 msgid "PostScript"
 msgstr "PostScript:"
 
-#: ../app/preferences.c:229
-msgid "Windows MetaFile"
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1464
+msgid "Windows Metafile"
 msgstr "Windows ãããããã:"
 
-#: ../app/preferences.c:231
-msgid "Enhanced MetaFile"
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1473
+msgid "Enhanced Metafile"
 msgstr "æåãããããã:"
 
-#: ../app/preferences.c:236
+#: ../app/preferences.c:235
 msgid "Snap to"
 msgstr "ãããããåãã"
 
-#: ../app/preferences.c:237
+#: ../app/preferences.c:236
 msgid "Dynamic grid resizing"
 msgstr "ãããããããããååããã"
 
-#: ../app/preferences.c:238
+#: ../app/preferences.c:237
 msgid "X Size:"
 msgstr "Xæåãããã:"
 
-#: ../app/preferences.c:239
+#: ../app/preferences.c:238
 msgid "Y Size:"
 msgstr "Yæåãããã:"
 
-#: ../app/preferences.c:241
+#: ../app/preferences.c:239
+#, fuzzy
+#| msgid "Visible spacing"
+msgid "Visual Spacing X:"
+msgstr "èçããéé"
+
+#: ../app/preferences.c:240
+#, fuzzy
+#| msgid "Visible spacing"
+msgid "Visual Spacing Y:"
+msgstr "èçããéé"
+
+#: ../app/preferences.c:242
 msgid "Lines per major line"
 msgstr "èåçãæ:"
 
-#: ../app/preferences.c:243
+#: ../app/preferences.c:244
 msgid "Hex Size:"
 msgstr "åèåãããã:"
 
-#. 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 " ãããããããããããããããã "
-
-#: ../app/preferences.c:257
-msgid "Save hidden object types"
-msgstr "éãããããããããçéãäåãã"
-
-#: ../app/preferences.c:485 ../lib/prop_inttypes.c:158
+#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
+#: ../lib/prop_pixbuf.c:270
 msgid "Yes"
 msgstr "ãã"
 
-#: ../app/preferences.c:485 ../app/preferences.c:496
-#: ../lib/prop_inttypes.c:160 ../lib/prop_inttypes.c:186
+#: ../app/preferences.c:481 ../app/preferences.c:492
+#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
+#: ../lib/prop_pixbuf.c:272 ../lib/prop_pixbuf.c:278
 msgid "No"
 msgstr "ããã"
 
-#: ../app/preferences.c:591
+#: ../app/preferences.c:595
 msgid "Preferences"
 msgstr "ããããããèå"
 
-#: ../app/properties-dialog.c:56
+#: ../app/properties-dialog.c:60
 msgid "Object properties"
 msgstr "ãããããããããããã"
 
-#: ../app/properties-dialog.c:81
+#: ../app/properties-dialog.c:85
 msgid "This object has no properties."
 msgstr "ããããããããããããããããããããã"
 
-#: ../app/properties-dialog.c:245
+#: ../app/properties-dialog.c:248
 msgid "Properties: "
 msgstr "ããããã: "
 
-#: ../app/properties-dialog.c:249
+#: ../app/properties-dialog.c:252
 msgid "Object properties:"
 msgstr "ãããããããããããã:"
 
-#: ../app/sheets.c:162
+#: ../app/sheets.c:157
 #, c-format
 msgid ""
 "%s\n"
@@ -1896,16 +1946,16 @@ msgstr ""
 "%s\n"
 "ãããããããã"
 
-#: ../app/sheets.c:164
+#: ../app/sheets.c:159
 #, c-format
 msgid ""
 "%s\n"
 "User sheet"
 msgstr ""
 "%s\n"
-"ããããããã"
+"ãããããããã"
 
-#: ../app/sheets.c:279
+#: ../app/sheets.c:277
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
@@ -1913,146 +1963,60 @@ msgstr ""
 "ããããããã 'custom_type' ããããããããååããããã\n"
 "(ãããããçéãçåãããã)"
 
-#: ../app/sheets.c:399
+#: ../app/sheets.c:412
 #, c-format
 msgid "Widget not found: %s"
 msgstr "ãããããããããããã: %s"
 
-#: ../app/sheets.c:474
+#: ../app/sheets.c:442
 msgid "SVG Shape"
 msgstr "SVG ãããã"
 
-#: ../app/sheets.c:476
+#: ../app/sheets.c:444
 msgid "Programmed DiaObject"
 msgstr "ãããããåããã DiaObject"
 
-#: ../app/sheets_dialog.c:84
-msgid "Sheets and Objects"
-msgstr "ãããããããããã"
+#: ../app/sheets_dialog.c:255
+msgid "Select SVG Shape File"
+msgstr "SVG ãããããããããéæ"
+
+#: ../app/sheets_dialog_callbacks.c:164
+msgid "Copy ->"
+msgstr "ããã ->"
+
+#: ../app/sheets_dialog_callbacks.c:166
+msgid "Copy All ->"
+msgstr "ãããããã ->"
 
-#: ../app/sheets_dialog.c:110 ../app/sheets_dialog_callbacks.c:180
+#: ../app/sheets_dialog_callbacks.c:168
+msgid "Move ->"
+msgstr "çå ->"
+
+#: ../app/sheets_dialog_callbacks.c:170
+msgid "Move All ->"
+msgstr "ãããçå ->"
+
+#: ../app/sheets_dialog_callbacks.c:177
 msgid "<- Copy"
 msgstr "<- ããã"
 
-#: ../app/sheets_dialog.c:120 ../app/sheets_dialog_callbacks.c:182
+#: ../app/sheets_dialog_callbacks.c:179
 msgid "<- Copy All"
 msgstr "<- ãããããã"
 
-#: ../app/sheets_dialog.c:127 ../app/sheets_dialog_callbacks.c:184
+#: ../app/sheets_dialog_callbacks.c:181
 msgid "<- Move"
 msgstr "<- çå"
 
-#: ../app/sheets_dialog.c:137 ../app/sheets_dialog_callbacks.c:186
+#: ../app/sheets_dialog_callbacks.c:183
 msgid "<- Move All"
 msgstr "<- ãããçå"
 
-#: ../app/sheets_dialog.c:234
-msgid "Edit"
-msgstr "çé"
-
-#: ../app/sheets_dialog.c:267
-msgid "Revert"
-msgstr "åå"
-
-#: ../app/sheets_dialog.c:355
-msgid "New"
-msgstr "æè"
-
-#: ../app/sheets_dialog.c:363 ../app/sheets_dialog.c:795
-#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:146
-#: ../objects/Istar/actor.c:147 ../objects/Istar/other.c:150
-#: ../objects/Istar/other.c:151 ../objects/KAOS/other.c:153
-#: ../objects/KAOS/other.c:154 ../objects/UML/association.c:240
-#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "çé"
-
-#: ../app/sheets_dialog.c:378
-msgid "Browse..."
-msgstr "åç..."
-
-#: ../app/sheets_dialog.c:387
-msgid "SVG Shape:"
-msgstr "SVG ãããã:"
-
-#: ../app/sheets_dialog.c:414 ../app/sheets_dialog.c:477
-msgid "description:"
-msgstr "èæ:"
-
-#: ../app/sheets_dialog.c:426
-msgid "Sheet name:"
-msgstr "ãããå:"
-
-#: ../app/sheets_dialog.c:447 ../app/sheets_dialog_callbacks.c:292
-#: ../app/sheets_dialog_callbacks.c:1109
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
 msgid "Line Break"
 msgstr "æèãã"
 
-#: ../app/sheets_dialog.c:569
-msgid "Edit Attributes"
-msgstr "åæãçé"
-
-#: ../app/sheets_dialog.c:584
-msgid "DiaObject"
-msgstr "DiaObject"
-
-#: ../app/sheets_dialog.c:600 ../app/sheets_dialog.c:693
-msgid "Description:"
-msgstr "èæ:"
-
-#: ../app/sheets_dialog.c:619 ../objects/Database/table_dialog.c:695
-#: ../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 "çé:"
-
-#: ../app/sheets_dialog.c:657
-msgid "Sheet"
-msgstr "ãããå"
-
-#: ../app/sheets_dialog.c:673 ../objects/Database/table_dialog.c:683
-#: ../objects/Database/table_dialog.c:1046 ../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 "åå:"
-
-#: ../app/sheets_dialog.c:810
-msgid "DiaObject:"
-msgstr "DiaObject:"
-
-#: ../app/sheets_dialog.c:837
-msgid "Sheet:"
-msgstr "ããã:"
-
-#: ../app/sheets_dialog.c:921
-msgid "Select SVG Shape File"
-msgstr "SVG ããããããããããéæ"
-
-#: ../app/sheets_dialog_callbacks.c:167
-msgid "Copy ->"
-msgstr "ããã ->"
-
-#: ../app/sheets_dialog_callbacks.c:169
-msgid "Copy All ->"
-msgstr "ãããããã ->"
-
-#: ../app/sheets_dialog_callbacks.c:171
-msgid "Move ->"
-msgstr "çå ->"
-
-#: ../app/sheets_dialog_callbacks.c:173
-msgid "Move All ->"
-msgstr "ãããçå ->"
-
-#: ../app/sheets_dialog_callbacks.c:306
+#: ../app/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -2061,7 +2025,7 @@ msgstr ""
 "%s\n"
 "ãããã"
 
-#: ../app/sheets_dialog_callbacks.c:309
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -2070,7 +2034,7 @@ msgstr ""
 "%s\n"
 "ãããããã"
 
-#: ../app/sheets_dialog_callbacks.c:312
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -2079,246 +2043,265 @@ msgstr ""
 "%s\n"
 "äæãçé"
 
-#: ../app/sheets_dialog_callbacks.c:803
+#: ../app/sheets_dialog_callbacks.c:771
+#, fuzzy
+#| msgid "Select SVG Shape File"
+msgid "Please select a .shape file"
+msgstr "SVG ãããããããããéæ"
+
+#: ../app/sheets_dialog_callbacks.c:778
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "ããããåãæåã '%s' ããããããã: '%s'"
 
-#: ../app/sheets_dialog_callbacks.c:811
+#: ../app/sheets_dialog_callbacks.c:786
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "%s ãèæäãããã: %s"
 
-#: ../app/sheets_dialog_callbacks.c:842
+#: ../app/sheets_dialog_callbacks.c:817
 msgid "Please export the diagram as a shape."
 msgstr "ãããããããããããããããããããããããããã"
 
-#: ../app/sheets_dialog_callbacks.c:845
+#: ../app/sheets_dialog_callbacks.c:820
 #, c-format
 msgid "Could not interpret shape file: '%s'"
-msgstr "ããããããããããèéãããããããã: '%s'"
+msgstr "ãããããããããèéãããããããã: '%s'"
 
-#: ../app/sheets_dialog_callbacks.c:916
+#: ../app/sheets_dialog_callbacks.c:888
 msgid "Sheet must have a Name"
 msgstr "ããããååãäãããããã"
 
-#: ../app/sheets_dialog_callbacks.c:1621 ../app/sheets_dialog_callbacks.c:1628
+#: ../app/sheets_dialog_callbacks.c:1582 ../app/sheets_dialog_callbacks.c:1589
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "'%s' ãéãããããããããããã: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1680
+#: ../app/sheets_dialog_callbacks.c:1643
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "'%s' ãæãèãããããéããããããã"
 
-#: ../app/sheets_dialog_callbacks.c:1690
+#: ../app/sheets_dialog_callbacks.c:1653
 msgid "a user"
-msgstr "ããã"
+msgstr "ãããã"
 
-#: ../app/sheets_dialog_callbacks.c:1703
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "File: %s"
 msgstr "ãããã: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1706
+#: ../app/sheets_dialog_callbacks.c:1669
 #, c-format
 msgid "Date: %s"
 msgstr "æä: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1710
+#: ../app/sheets_dialog_callbacks.c:1673
 #, c-format
 msgid "For: %s"
 msgstr "äæè: %s"
 
-#: ../app/sheets_dialog_callbacks.c:1727
+#: ../app/sheets_dialog_callbacks.c:1690
 msgid "add shapes here"
 msgstr "ããããããããèå"
 
-#: ../app/splash.c:57
-msgid "Loading ..."
-msgstr "èãèãä ..."
+#: ../app/splash.c:50
+msgid "Loading â"
+msgstr "èãèãä â"
 
-#: ../app/splash.c:75
+#: ../app/splash.c:68
 #, c-format
 msgid "Dia v %s"
 msgstr "Dia ããããã %s"
 
 #: ../dia.desktop.in.in.h:1
-msgid "Dia Diagram Editor"
-msgstr "Dia ããããããããããã"
+#, fuzzy
+#| msgid "Day"
+msgid "Dia"
+msgstr "æé"
 
 #: ../dia.desktop.in.in.h:2
+msgid "Dia Diagram Editor"
+msgstr "Dia ããããããããããã"
+
+#: ../dia.desktop.in.in.h:4
 msgid "Edit your Diagrams"
 msgstr "ãããããããçéããã"
 
-#: ../lib/arrows.c:1883
+#: ../lib/arrows.c:1891
 msgid "Lines"
 msgstr "çåãã"
 
-#: ../lib/arrows.c:1884
+#: ../lib/arrows.c:1892
 msgid "Hollow Triangle"
 msgstr "\"äèå (äæã)\""
 
-#: ../lib/arrows.c:1885
+#: ../lib/arrows.c:1893
 msgid "Filled Triangle"
 msgstr "\"äèå (åãããã)\""
 
-#: ../lib/arrows.c:1886
+#: ../lib/arrows.c:1894
 msgid "Unfilled Triangle"
 msgstr "\"äèå (åãããããã)\""
 
-#: ../lib/arrows.c:1887
+#: ../lib/arrows.c:1895
 msgid "Hollow Diamond"
 msgstr "\"èå (åãããããã)\""
 
-#: ../lib/arrows.c:1888
+#: ../lib/arrows.c:1896
 msgid "Filled Diamond"
 msgstr "\"èå (åãããã)\""
 
-#: ../lib/arrows.c:1889
+#: ../lib/arrows.c:1897
 msgid "Half Diamond"
 msgstr "\"èå (åå)\""
 
-#: ../lib/arrows.c:1890
+#: ../lib/arrows.c:1898
 msgid "Half Head"
 msgstr "\"ååãçå\""
 
-#: ../lib/arrows.c:1891
+#: ../lib/arrows.c:1899
 msgid "Slashed Cross"
 msgstr "\"äåããããããã\""
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:1900
 msgid "Filled Ellipse"
 msgstr "\"æå (åãããããã)\""
 
-#: ../lib/arrows.c:1893
+#: ../lib/arrows.c:1901
 msgid "Hollow Ellipse"
 msgstr "\"æå (äæã)\""
 
-#: ../lib/arrows.c:1894
+#: ../lib/arrows.c:1902
 msgid "Filled Dot"
 msgstr "\"ç (åãããã)\""
 
-#: ../lib/arrows.c:1895
+#: ../lib/arrows.c:1903
 msgid "Dimension Origin"
 msgstr "\"åæçãåç\""
 
-#: ../lib/arrows.c:1896
+#: ../lib/arrows.c:1904
 msgid "Blanked Dot"
 msgstr "\"ç (äæã)\""
 
-#: ../lib/arrows.c:1897
+#: ../lib/arrows.c:1905
 msgid "Double Hollow Triangle"
 msgstr "\"äèåäã (äæã)\""
 
-#: ../lib/arrows.c:1898
+#: ../lib/arrows.c:1906
 msgid "Double Filled Triangle"
 msgstr "\"äèåäã (åãããã)\""
 
-#: ../lib/arrows.c:1899
+#: ../lib/arrows.c:1907
 msgid "Filled Dot and Triangle"
 msgstr "\"çãäèå (åãããã)\""
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:1908
 msgid "Filled Box"
 msgstr "\"çå (åãããã)\""
 
-#: ../lib/arrows.c:1901
+#: ../lib/arrows.c:1909
 msgid "Blanked Box"
 msgstr "\"çå (äæã)\""
 
-#: ../lib/arrows.c:1902
+#: ../lib/arrows.c:1910
 msgid "Slashed"
 msgstr "\"ããããã\""
 
-#: ../lib/arrows.c:1903
+#: ../lib/arrows.c:1911
 msgid "Integral Symbol"
 msgstr "\"çåãèå\""
 
-#: ../lib/arrows.c:1904
+#: ../lib/arrows.c:1912
 msgid "Crow Foot"
 msgstr "\"ããããè\""
 
-#: ../lib/arrows.c:1905
+#: ../lib/arrows.c:1913
 msgid "Cross"
 msgstr "\"ååæ\""
 
-#: ../lib/arrows.c:1906
+#: ../lib/arrows.c:1914
 msgid "1-or-many"
 msgstr "\"1 ãããä\""
 
-#: ../lib/arrows.c:1907
+#: ../lib/arrows.c:1915
 msgid "0-or-many"
 msgstr "\"0 ãããä\""
 
-#: ../lib/arrows.c:1908
+#: ../lib/arrows.c:1916
 msgid "1-or-0"
 msgstr "\"1 ã 0\""
 
-#: ../lib/arrows.c:1909
+#: ../lib/arrows.c:1917
 msgid "1 exactly"
 msgstr "\"1 ã 1\""
 
-#: ../lib/arrows.c:1910
+#: ../lib/arrows.c:1918
 msgid "Filled Concave"
 msgstr "\"åãèã (åãããã)\""
 
-#: ../lib/arrows.c:1911
+#: ../lib/arrows.c:1919
 msgid "Blanked Concave"
 msgstr "\"åãèã (äæã)\""
 
-#: ../lib/arrows.c:1912
+#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
+#: ../lib/properties.h:489 ../lib/properties.h:495
 msgid "Round"
 msgstr "\"åå (åå)\""
 
-#: ../lib/arrows.c:1913
+#: ../lib/arrows.c:1921
 msgid "Open Round"
 msgstr "\"éããåå (åå)\""
 
-#: ../lib/arrows.c:1914
+#: ../lib/arrows.c:1922
 msgid "Backslash"
 msgstr "ãããããããã"
 
-#: ../lib/arrows.c:1915
+#: ../lib/arrows.c:1923
 msgid "Infinite Line"
 msgstr "çéãç"
 
-#: ../lib/arrows.c:2043
+#: ../lib/arrows.c:2051
 msgid "Arrow head of unknown type"
 msgstr "äæãçéãçåãé"
 
-#: ../lib/arrows.c:2051
+#: ../lib/arrows.c:2059
 #, c-format
-msgid "Arrow head of type %s has too small dimensions, removing.\n"
+msgid "Arrow head of type %s has too small dimensions; removing.\n"
 msgstr "%s ãããçéãçåãéãæåãåããããããåéããã\n"
 
-#: ../lib/arrows.c:2184
+#: ../lib/arrows.c:2192
 msgid "unknown arrow"
 msgstr "äæãçå"
 
-#: ../lib/bezier_conn.c:636
+#: ../lib/bezier_conn.c:638
 msgid "Internal error: Setting corner type of endpoint of bezier"
 msgstr "åéããã: ãããæçãççãçéãèå"
 
 #: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
 #: ../lib/create.c:161 ../lib/create.c:197 ../lib/create.c:224
 #: ../lib/create.c:260 ../lib/create.c:295 ../lib/create.c:338
-#: ../plug-ins/svg/svg-import.c:267 ../plug-ins/vdx/vdx-import.c:144
+#: ../plug-ins/svg/svg-import.c:331 ../plug-ins/vdx/vdx-import.c:145
 msgid "Can't find standard object"
 msgstr "ææãããããããèãããããã"
 
-#: ../lib/dia_dirs.c:242
+#: ../lib/dia_dirs.c:328
 #, c-format
-msgid "%s<illegal characters>..."
-msgstr "%s<äæãæå>..."
+msgid "Too many \"..\"s in filename %s\n"
+msgstr "ããããå %s ãåããã \"..\" ãåãããã\n"
 
-#: ../lib/dia_dirs.c:273
+#: ../lib/dia_image.c:315 ../plug-ins/pixbuf/pixbuf.c:93
 #, c-format
-msgid "Too many ..'s in filename %s\n"
-msgstr "ããããå %s ãåããã .. ãåãããã\n"
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s"
+msgstr ""
+"ãããããäåãããããããã:\n"
+"%s\n"
+"%s"
 
-#: ../lib/dia_xml.c:192
+#: ../lib/dia_xml.c:197
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2327,100 +2310,166 @@ msgstr ""
 "ãããã %s ããçåããããããããããããããã;\n"
 "%s ãäããã"
 
-#: ../lib/dia_xml.c:597
+#: ../lib/dia_xml.c:616
 msgid "Taking point value of non-point node."
 msgstr "åæãããããããåæåãååããããããããã"
 
-#: ../lib/dia_xml.c:608
+#: ../lib/dia_xml.c:627
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "äæãXåæå \"%s\" %fãã; ããåãçæããã"
 
-#: ../lib/dia_xml.c:615
+#: ../lib/dia_xml.c:634
 msgid "Error parsing point."
 msgstr "åæãèææãããããççãããã"
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:623
+#: ../lib/dia_xml.c:642
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "äæãYåæå \"%s\" %fãã; ããåãçæããã"
 
-#: ../lib/dia_xml.c:640
+#: ../lib/dia_xml.c:659
 msgid "Taking bezpoint value of non-point node."
 msgstr "åæããããããã bezpoint åãååããããããããã"
 
-#: ../lib/dia_xml.c:658
+#: ../lib/dia_xml.c:677
 msgid "Error parsing bezpoint p1."
 msgstr "bezpoint p1 ãèææãããããççãããã"
 
-#: ../lib/dia_xml.c:672
+#: ../lib/dia_xml.c:691
 msgid "Error parsing bezpoint p2."
 msgstr "bezpoint p2 ãèææãããããççãããã"
 
-#: ../lib/dia_xml.c:686
+#: ../lib/dia_xml.c:705
 msgid "Error parsing bezpoint p3."
 msgstr "bezpoint p3 ãèææãããããççãããã"
 
-#: ../lib/diaarrowchooser.c:352
+#: ../lib/diaarrowchooser.c:381
 msgid "Arrow Properties"
 msgstr "çåãããããã"
 
-#: ../lib/dialinechooser.c:297
+#: ../lib/diaarrowselector.c:121
+msgid "More arrows"
+msgstr "ããäãçå"
+
+#: ../lib/diaarrowselector.c:138
+msgid "Size: "
+msgstr "ããã:"
+
+#: ../lib/diacolorselector.c:205
+msgid "Select color"
+msgstr "èãéæ"
+
+#: ../lib/diacolorselector.c:287
+msgid "More colorsâ"
+msgstr "ããäãèâ"
+
+#: ../lib/diadynamicmenu.c:392
+msgid "Reset menu"
+msgstr "ããããããããã"
+
+#: ../lib/diafontselector.c:159
+msgid "Other fonts"
+msgstr "ããäããããã"
+
+#: ../lib/diafontselector.c:231
+#, c-format
+msgid "Couldn't find font family for %s\n"
+msgstr "%s çããããããããããèããããããããã\n"
+
+#: ../lib/dialinechooser.c:309
 msgid "Line Style Properties"
 msgstr "ççãããããã"
 
-#: ../lib/dialinechooser.c:339
-msgid "Details..."
-msgstr "èç..."
+#: ../lib/dialinechooser.c:344
+msgid "Detailsâ"
+msgstr "èçâ"
+
+#: ../lib/dialinestyleselector.c:124
+#, fuzzy
+#| msgid "Solid"
+msgid "line|Solid"
+msgstr "åç"
+
+#: ../lib/dialinestyleselector.c:130
+#, fuzzy
+#| msgid "Dashed"
+msgid "line|Dashed"
+msgstr "éç"
+
+#: ../lib/dialinestyleselector.c:136
+#, fuzzy
+#| msgid "Dash-Dot"
+msgid "line|Dash-Dot"
+msgstr "äçéç"
+
+#: ../lib/dialinestyleselector.c:142
+#, fuzzy
+#| msgid "Dash-Dot-Dot"
+msgid "line|Dash-Dot-Dot"
+msgstr "äçéç"
+
+#: ../lib/dialinestyleselector.c:148
+#, fuzzy
+#| msgid "Dotted"
+msgid "line|Dotted"
+msgstr "çç"
+
+#. fs->sizebox = GTK_HBOX(box);
+#: ../lib/dialinestyleselector.c:166
+msgid "Dash length: "
+msgstr "éçãéã:"
 
-#: ../lib/dialogs.c:51
-msgid "Ok"
+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
 msgstr "OK"
 
-#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:322
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
 msgid "Cancel"
 msgstr "ããããã"
 
 #: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
-msgstr "%s ãããéèãããååãäããèæãããããããçãããã"
+msgstr "%s ãããéèãããååãäããèæãããããããçããããã"
 
-#: ../lib/font.c:84
+#: ../lib/font.c:85
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "%s ããããããããèãèããããã\n"
 
-#: ../lib/message.c:92 ../lib/message.c:278
+#: ../lib/group.c:618
+#, fuzzy
+#| msgid "Translation"
+msgid "Transformation"
+msgstr "åå"
+
+#: ../lib/message.c:93 ../lib/message.c:282
 msgid "Warning"
 msgstr "èå"
 
-#: ../lib/message.c:119
+#: ../lib/message.c:120
 msgid "There is one similar message."
-msgstr "éäãããããããããããããããã:"
+msgstr "éäããããããããããããããã:"
 
-#: ../lib/message.c:124
+#: ../lib/message.c:125
 msgid "Show repeated messages"
-msgstr "èæãããããããããããèçãã"
+msgstr "èæããããããããããèçãã"
 
-#: ../lib/message.c:145
+#: ../lib/message.c:146
 msgid "Don't show this message again"
 msgstr "æåããããããããããèçããã"
 
-#: ../lib/message.c:203
+#: ../lib/message.c:204
 #, c-format
 msgid "There are %d similar messages."
-msgstr "%d åãéäãããããããããããããããã"
+msgstr "%d åãéäããããããããããããããã"
 
-#: ../lib/message.c:262
+#: ../lib/message.c:266
 msgid "Notice"
 msgstr "ææ"
 
-#: ../lib/newgroup.c:124
-msgid "Open group"
-msgstr "ãããããéã"
-
 #: ../lib/object_defaults.c:128
 #, c-format
 msgid ""
@@ -2428,7 +2477,18 @@ msgid ""
 "Not a Dia diagram file."
 msgstr ""
 "ããããã '%s' ãèãèãéãããããççãããã\n"
-"(Dia ãããããããããããããããããã)"
+"(Dia ããããããããããããããããã)"
+
+#. base property stuff...
+#: ../lib/orth_conn.h:92
+#, fuzzy
+#| msgid "Author"
+msgid "Autoroute"
+msgstr "äè"
+
+#: ../lib/orth_conn.h:103
+msgid "Autorouting"
+msgstr ""
 
 #: ../lib/plug-ins.c:111
 msgid "???"
@@ -2477,91 +2537,185 @@ msgstr "äææ"
 msgid "Modification date"
 msgstr "åææ"
 
-#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:880
+#: ../lib/prop_dict.c:47 ../objects/SISSI/sissi_dialog.c:878
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_inttypes.c:558
+#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:18
+msgid "Key"
+msgstr "ãã"
+
+#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "å"
+
+#: ../lib/prop_inttypes.c:567
 msgid "Property cast from int to enum out of range"
 msgstr "ææåããåæåãããããããããããçåãèããããã"
 
-#: ../lib/prop_text.c:469
+#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
+#, c-format
+msgid ""
+"Failed to load image form diagram:\n"
+"%s"
+msgstr ""
+
+#: ../lib/prop_pixbuf.c:200
+#, c-format
+msgid ""
+"Saving inline pixbuf failed:\n"
+"%s"
+msgstr ""
+
+#: ../lib/prop_pixbuf.c:296
+msgid "Cant create image data from scratch!"
+msgstr ""
+
+#: ../lib/prop_text.c:473
 #, c-format
 msgid "Group with %d objects"
-msgstr "%dåãããããããããããã"
+msgstr "%dåããããããããããã"
+
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:236
+#: ../objects/UML/object.c:147
+#, fuzzy
+#| msgid "AC Generator"
+msgid "General"
+msgstr "AC ããããããã"
+
+#: ../lib/propdialogs.c:325
+#, fuzzy
+#| msgid "Detach"
+msgid "Meta"
+msgstr "åãéã"
 
-#: ../lib/properties.c:65 ../lib/properties.h:477 ../lib/widgets.c:724
+#: ../lib/properties.c:67 ../lib/properties.h:476 ../lib/widgets.c:273
 msgid "Left"
 msgstr "å"
 
-#: ../lib/properties.c:66 ../lib/properties.h:478 ../lib/widgets.c:730
+#: ../lib/properties.c:68 ../lib/properties.h:477 ../lib/widgets.c:274
 #: ../objects/standard/textobj.c:138
 msgid "Center"
 msgstr "äå"
 
-#: ../lib/properties.c:67 ../lib/properties.h:479 ../lib/widgets.c:736
+#: ../lib/properties.c:69 ../lib/properties.h:478 ../lib/widgets.c:275
 msgid "Right"
 msgstr "å"
 
-#: ../lib/properties.c:74 ../lib/properties.h:497 ../lib/properties.h:500
+#: ../lib/properties.c:74 ../lib/properties.h:482
+#, fuzzy
+#| msgid "Revert"
+msgid "Never"
+msgstr "åå"
+
+#: ../lib/properties.c:75 ../lib/properties.h:483
+msgid "When Needed"
+msgstr ""
+
+#: ../lib/properties.c:76 ../lib/properties.h:484
+msgid "Always"
+msgstr ""
+
+#: ../lib/properties.c:80 ../lib/properties.h:488
+#, fuzzy
+#| msgid "Mixer"
+msgid "Miter"
+msgstr "ãããã"
+
+#: ../lib/properties.c:82 ../lib/properties.h:490
+msgid "Bevel"
+msgstr ""
+
+#: ../lib/properties.c:86 ../lib/properties.h:494
+#, fuzzy
+#| msgid "Bottom"
+msgid "Butt"
+msgstr "ä"
+
+#: ../lib/properties.c:88 ../lib/properties.h:496
+#, fuzzy
+#| msgid "Protect"
+msgid "Projecting"
+msgstr "äè"
+
+#: ../lib/properties.c:95 ../lib/properties.h:517 ../lib/properties.h:520
 #: ../objects/chronogram/chronoline.c:181
 #: ../objects/chronogram/chronoref.c:160
 msgid "Line color"
 msgstr "çãè"
 
-#: ../lib/properties.c:75 ../lib/properties.h:503 ../lib/properties.h:506
+#: ../lib/properties.c:96 ../lib/properties.h:523 ../lib/properties.h:526
 msgid "Line style"
 msgstr "çããããã"
 
-#: ../lib/properties.c:76 ../lib/properties.h:510 ../lib/properties.h:513
+#: ../lib/properties.c:97 ../lib/properties.h:542 ../lib/properties.h:545
 msgid "Fill color"
 msgstr "åããããè"
 
-#: ../lib/properties.c:77 ../lib/properties.h:516 ../lib/properties.h:519
+#: ../lib/properties.c:98 ../lib/properties.h:548 ../lib/properties.h:551
 msgid "Draw background"
 msgstr "èæãæç"
 
-#: ../lib/properties.c:78 ../lib/properties.h:523
+#: ../lib/properties.c:99 ../lib/properties.h:555
 msgid "Start arrow"
 msgstr "åçãçå"
 
-#: ../lib/properties.c:79 ../lib/properties.h:526
+#: ../lib/properties.c:100 ../lib/properties.h:558
 msgid "End arrow"
 msgstr "ççãçå"
 
-#: ../lib/properties.c:81 ../lib/properties.h:536
+#: ../lib/properties.c:102 ../lib/properties.h:568
 msgid "Text alignment"
 msgstr "æåæåãäç"
 
 #. all this just to make the defaults selectable ...
-#: ../lib/properties.c:82 ../lib/properties.h:541
-#: ../objects/Database/table_dialog.c:1036 ../objects/Database/reference.c:117
+#: ../lib/properties.c:103 ../lib/properties.h:573
+#: ../objects/Database/table_dialog.c:1045 ../objects/Database/reference.c:118
 #: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:174
-#: ../objects/UML/class_dialog.c:564 ../objects/chronogram/chronoline.c:185
+#: ../objects/GRAFCET/transition.c:144 ../objects/UML/class.c:177
+#: ../objects/UML/class_dialog.c:455 ../objects/chronogram/chronoline.c:185
 #: ../objects/chronogram/chronoref.c:166
 msgid "Font"
 msgstr "ãããã"
 
-#: ../lib/properties.c:83 ../lib/properties.h:549
+#: ../lib/properties.c:104 ../lib/properties.h:581
 #: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/step.c:169
 #: ../objects/GRAFCET/transition.c:146 ../objects/chronogram/chronoline.c:187
 #: ../objects/chronogram/chronoref.c:168
 msgid "Font size"
 msgstr "ãããããããã"
 
-#: ../lib/properties.c:84 ../lib/properties.h:555
+#: ../lib/properties.c:105 ../lib/properties.h:587
 #: ../objects/GRAFCET/step.c:171 ../objects/chronogram/chronoline.c:189
 #: ../objects/chronogram/chronoref.c:170
 msgid "Text color"
 msgstr "æåãè"
 
+#: ../lib/properties.h:529 ../lib/properties.h:532
+#, fuzzy
+#| msgid "Line width"
+msgid "Line join"
+msgstr "çå"
+
+#: ../lib/properties.h:535 ../lib/properties.h:538
+#, fuzzy
+#| msgid "Line gaps"
+msgid "Line caps"
+msgstr "ãã (gap)"
+
+#: ../lib/properties.h:596
+#, fuzzy
+#| msgid "Text padding"
+msgid "Text fitting"
+msgstr "æåãããããã"
+
 #: ../lib/proplist.c:163
 #, c-format
-msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "ããåæãã '%s' (%p) ãããåæããããããã (%p) ãããããã"
 
-#: ../lib/sheet.c:69 ../lib/sheet.c:84
+#: ../lib/sheet.c:71 ../lib/sheet.c:86
 #, c-format
 msgid ""
 "DiaObject '%s' needed in sheet '%s' was not found.\n"
@@ -2570,7 +2724,7 @@ msgstr ""
 "DiaObject ã '%s' ã '%s' ãããããããäãããããããããã\n"
 "(ãããããããããåçããããã)"
 
-#: ../lib/sheet.c:314
+#: ../lib/sheet.c:316
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2586,86 +2740,31 @@ msgstr ""
 "æããããããããã '%s' ããçèãããããããçåãããã\n"
 "ããã '%s' ãããããåéãããããã"
 
-#: ../lib/sheet.c:371
+#: ../lib/sheet.c:375
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr "%s: ãããããããããããããããããããããæåãããããã"
 
-#: ../lib/widgets.c:441
-msgid "Other fonts"
-msgstr "ããäããããã"
-
-#: ../lib/widgets.c:513
-#, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "%s çãããããããããããèããããããããã\n"
-
-#. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:896 ../objects/FS/function.c:1076
-msgid "Solid"
-msgstr "åç"
-
-#: ../lib/widgets.c:902
-msgid "Dashed"
-msgstr "éç"
-
-#: ../lib/widgets.c:908
-msgid "Dash-Dot"
-msgstr "äçéç"
-
-#: ../lib/widgets.c:914
-msgid "Dash-Dot-Dot"
-msgstr "äçéç"
-
-#: ../lib/widgets.c:920
-msgid "Dotted"
-msgstr "çç"
-
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:938
-msgid "Dash length: "
-msgstr "éçãéã:"
-
-#: ../lib/widgets.c:1066
-msgid "Select color"
-msgstr "èãéæ"
-
-#: ../lib/widgets.c:1132
-msgid "More colors..."
-msgstr "ããäãè..."
-
-#: ../lib/widgets.c:1280
-msgid "More arrows"
-msgstr "ããäãçå"
-
-#: ../lib/widgets.c:1297
-msgid "Size: "
-msgstr "ããã:"
-
-#: ../lib/widgets.c:1475
+#: ../lib/widgets.c:394
 msgid "Select image file"
 msgstr "çåãããããéæ"
 
-#: ../lib/widgets.c:1523
+#: ../lib/widgets.c:445
 msgid "Browse"
 msgstr "åç"
 
-#: ../lib/widgets.c:2076
-msgid "Reset menu"
-msgstr "ããããããããã"
-
 #. Installer message if no GTK+ was found
-#: ../installer/win32/gennsh.c:38
+#: ../installer/win32/gennsh.c:39
 msgid ""
 "GTK+ is not installed. Please use the full installer. It is available from "
 "http://dia-installer.de.";
 msgstr ""
-"GTK+ ããããããããããããããããããããããããããããããäãã Dia "
-"ããããããããããããããããããããããã http://dia-installer.de ããã"
-"ããã"
+"GTK+ ãããããããããããããããããããããããããããããããäãã "
+"Dia ãããããããããããããããããããããããã http://dia-installer.de "
+"ãããããã"
 
 #. Installer message: Don't install over pre 0.95 versions
-#: ../installer/win32/gennsh.c:41
+#: ../installer/win32/gennsh.c:42
 msgid ""
 "Please remove old Dia installations completely or install Dia to a different "
 "location."
@@ -2674,12 +2773,12 @@ msgstr ""
 "ãã"
 
 #. Installer message:  License Page
-#: ../installer/win32/gennsh.c:44
+#: ../installer/win32/gennsh.c:45
 msgid "Next >"
 msgstr "æã >"
 
 #. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:47
+#: ../installer/win32/gennsh.c:48
 msgid ""
 "$(^Name) is released under the GPL license. The license is provided here for "
 "information purposes only. $_CLICK"
@@ -2688,32 +2787,32 @@ msgstr ""
 "çãããããã)ã$_CLICK"
 
 #. Installer message: Components page
-#: ../installer/win32/gennsh.c:50
+#: ../installer/win32/gennsh.c:51
 msgid "Dia Diagram Editor (required)"
-msgstr "Dia ãããããããããããæä (åé)"
+msgstr "Dia ãããããããããããæä (åé)"
 
 #. Installer message: Components page
-#: ../installer/win32/gennsh.c:53
+#: ../installer/win32/gennsh.c:54
 msgid "Translations"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:56
+#: ../installer/win32/gennsh.c:57
 msgid "Optional translations of the Dia user interface"
-msgstr "Dia ãããããããããããããèçããçèæãããããããã"
+msgstr "Dia ããããããããããããããèçããçèæãããããããã"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:59
+#: ../installer/win32/gennsh.c:60
 msgid "Core Dia files and dlls"
 msgstr "Dia ãããããã .dll ãããããã"
 
 #. Installer message: Component name
-#: ../installer/win32/gennsh.c:62
+#: ../installer/win32/gennsh.c:63
 msgid "Python plug-in"
 msgstr "Python ãããããã"
 
 #. Installer message: Component description
-#: ../installer/win32/gennsh.c:65
+#: ../installer/win32/gennsh.c:66
 msgid ""
 "Support for the Python Scripting Language 2.3. Do not select this if Python "
 "is not installed."
@@ -2722,63 +2821,63 @@ msgstr ""
 "ãããããããããååãéæããããã)"
 
 #. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:68
+#: ../installer/win32/gennsh.c:69
 msgid "Visit the Dia for Windows Web Page"
-msgstr "Dia ã Windows åãããããããããèåãã"
+msgstr "Dia ã Windows åããããããããèåãã"
 
 #. Installer message: Dia uninstaller entry in Control Panel
-#: ../installer/win32/gennsh.c:71
+#: ../installer/win32/gennsh.c:72
 msgid "Dia (remove only)"
 msgstr "Dia (åéãã)"
 
 #. Installer message: confirmation question. Keep $\r
-#: ../installer/win32/gennsh.c:74
+#: ../installer/win32/gennsh.c:75
 msgid ""
 "Your old Dia directory is about to be deleted. Would you like to continue?$\r"
 "$\rNote: Any non-standard plugins that you may have installed will be "
 "deleted.$\rDia user settings will not be affected."
 msgstr ""
-"åã Dia ããããããåéãããããçèãããããããããã?$\r$\rææ: ãã"
-"ãããããããããææäåãããããããåéããããã$\rDia ãèåããåéã"
-"ããããã"
+"åã Dia ãããããããåéãããããçèãããããããããã?$\r$\rææ: ã"
+"ããããããããããææäåãããããããåéããããã$\rDia ãèåããåé"
+"ãããããã"
 
 #. Installer message: confirmatin question. Keep $\r
-#: ../installer/win32/gennsh.c:77
+#: ../installer/win32/gennsh.c:78
 msgid ""
 "The installation directory you specified already exists. Any contents$\rwill "
 "be deleted. Would you like to continue?"
 msgstr ""
-"æåããããããããåããããããæãååããããããããäããããããã"
+"æåããããããããåãããããããæãååããããããããäããããããã"
 "ãããã$\rãåéãããããçèãããããããããã?"
 
 #. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:80
+#: ../installer/win32/gennsh.c:81
 msgid ""
 "The uninstaller could not find registry entries for Dia.$\rIt is likely that "
 "another user installed this application."
 msgstr ""
 "ããããããäã Dia ããããããèããããããããããããããã$\rDia ãå"
-"ãããããããããããããããåèæãããããã"
+"ããããããããããããããããåèæãããããã"
 
 #. Installer message: Uninstall error message
-#: ../installer/win32/gennsh.c:83
+#: ../installer/win32/gennsh.c:84
 msgid "You do not have permission to uninstall this application."
 msgstr "ãããããããããããããããããããããæéããããããã"
 
 #. Installer message: Uninstallation warning. Keep $INSTDIR
-#: ../installer/win32/gennsh.c:86
+#: ../installer/win32/gennsh.c:87
 msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
-msgstr "$INSTDIR ãããããããããããããåéããããçèãããã?"
+msgstr "$INSTDIR ããããããããããããããåéããããçèãããã?"
 
 #. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
-#: ../installer/win32/gennsh.c:89
+#: ../installer/win32/gennsh.c:90
 msgid ""
 "This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
-msgstr "$PROFILE\\.dia ãããããããããããåéããããçèãããã?"
+msgstr "$PROFILE\\.dia ããããããããããããåéããããçèãããã?"
 
 #: ../objects/AADL/aadl.c:52
 msgid "Architecture Analysis & Design Language diagram objects"
-msgstr "æéèæ/èèèè (AADL) ãããããããããããããã"
+msgstr "æéèæ/èèèè (AADL) ããããããããããããã"
 
 #: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
@@ -2786,51 +2885,51 @@ msgstr "åç"
 
 #: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Provider"
-msgstr "ãããããããããããèå"
+msgstr "ãããããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:360
 msgid "Add Access Requirer"
-msgstr "ãããããããããããèå"
+msgstr "ããããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:362
 msgid "Add In Data Port"
-msgstr "ååããããããããèå"
+msgstr "ååãããããããèå"
 
 #: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Port"
-msgstr "ååãããããããããèå"
+msgstr "ååããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:366
 msgid "Add In Event Data Port"
-msgstr "ååãããããããããããããèå"
+msgstr "ååãããããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Data Port"
-msgstr "ååããããããããèå"
+msgstr "ååãããããããèå"
 
 #: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Port"
-msgstr "ååãããããããããèå"
+msgstr "ååããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:372
 msgid "Add Out Event Data Port"
-msgstr "ååãããããããããããããèå"
+msgstr "ååãããããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Data Port"
-msgstr "åååããããããããèå"
+msgstr "åååãããããããèå"
 
 #: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Port"
-msgstr "åååãããããããããèå"
+msgstr "åååããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:378
 msgid "Add In Out Event Data Port"
-msgstr "åååãããããããããããããèå"
+msgstr "åååãããããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:380
 msgid "Add Port Group"
-msgstr "ãããããããããèå"
+msgstr "ããããããããèå"
 
 #: ../objects/AADL/aadlbox.c:382
 msgid "Add Connection Point"
@@ -2853,19 +2952,19 @@ msgid "Number of arms"
 msgstr "ããããåæ:"
 
 #: ../objects/Database/compound.c:221
-msgid "Flip arms verticaly"
+msgid "Flip arms vertically"
 msgstr "ããããåçæåãæãèã"
 
 #: ../objects/Database/compound.c:223
-msgid "Flip arms horizontaly"
+msgid "Flip arms horizontally"
 msgstr "ããããæåæåãæãèã"
 
 #: ../objects/Database/compound.c:225
-msgid "Center mount point verticaly"
+msgid "Center mount point vertically"
 msgstr "ãããããããããåçæåãäåããã"
 
 #: ../objects/Database/compound.c:227
-msgid "Center mount point horizontaly"
+msgid "Center mount point horizontally"
 msgstr "ãããããããããæåæåãäåããã"
 
 #: ../objects/Database/compound.c:229
@@ -2878,225 +2977,261 @@ msgstr "åæ"
 
 #: ../objects/Database/database.c:39
 msgid "Entity/Relationship table diagram objects"
-msgstr "ãããããã/ãããããããããããããããããããããããããããã"
+msgstr "ãããããã/ãããããããããããããããããããããããããã"
 
-#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
-#: ../objects/Database/table.c:200 ../objects/UML/class.c:148
-#: ../objects/UML/class.c:189 ../objects/UML/class_dialog.c:595
+#: ../objects/Database/table.c:143 ../objects/Database/table.c:187
+#: ../objects/Database/table.c:204 ../objects/UML/class.c:149
+#: ../objects/UML/class.c:192 ../objects/UML/class_dialog.c:486
 #: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
 #: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:3
 msgid "Comment"
 msgstr "ãããã"
 
-#: ../objects/Database/table.c:144
+#: ../objects/Database/table.c:145
 msgid "Primary key"
-msgstr "ãããããããã"
+msgstr "ããããããã"
 
-#: ../objects/Database/table.c:146
+#: ../objects/Database/table.c:147
 msgid "Nullable"
 msgstr "Nullable"
 
-#: ../objects/Database/table.c:148
+#: ../objects/Database/table.c:149
 msgid "Unique"
 msgstr "Unique"
 
-#: ../objects/Database/table.c:185
+#: ../objects/Database/table.c:151
+#, fuzzy
+#| msgid "Def. value:"
+msgid "Default value"
+msgstr "åçå:"
+
+#: ../objects/Database/table.c:189
 msgid "Visible comments"
 msgstr "ãããããèçåèããã"
 
-#: ../objects/Database/table.c:187 ../objects/UML/class.c:171
+#: ../objects/Database/table.c:191 ../objects/UML/class.c:172
 msgid "Comment tagging"
 msgstr "ãããããããå"
 
-#: ../objects/Database/table.c:189 ../objects/Database/table_dialog.c:976
+#: ../objects/Database/table.c:193 ../objects/Database/table_dialog.c:985
 msgid "Underline primary keys"
-msgstr "ãããããããããäçãääãã"
+msgstr "ããããããããäçãääãã"
 
-#: ../objects/Database/table.c:191 ../objects/Database/table_dialog.c:981
+#: ../objects/Database/table.c:195 ../objects/Database/table_dialog.c:990
 msgid "Use bold font for primary keys"
-msgstr "ãããããããããååããã"
+msgstr "ããããããããååããã"
 
 #. property rows
-#: ../objects/Database/table.c:196 ../objects/SADT/arrow.c:136
-#: ../objects/UML/class.c:179 ../objects/UML/class_dialog.c:570
+#: ../objects/Database/table.c:200 ../objects/SADT/arrow.c:137
+#: ../objects/UML/class.c:182 ../objects/UML/class_dialog.c:461
 msgid "Normal"
 msgstr "ææ"
 
-#: ../objects/Database/table.c:198
-msgid "Tablename"
+#: ../objects/Database/table.c:202
+msgid "Table name"
 msgstr "ããããå"
 
-#: ../objects/Database/table.c:203 ../objects/Database/table.c:205
-#: ../objects/Database/table.c:207 ../objects/Database/reference.c:120
-#: ../objects/UML/association.c:245 ../objects/UML/association.c:256
-#: ../objects/UML/association.c:258 ../objects/UML/association.c:260
+#: ../objects/Database/table.c:207 ../objects/Database/table.c:209
+#: ../objects/Database/table.c:211 ../objects/Database/reference.c:121
+#: ../objects/UML/association.c:249 ../objects/UML/association.c:260
 #: ../objects/UML/association.c:262 ../objects/UML/association.c:264
-#: ../objects/UML/class.c:193 ../objects/UML/class.c:195
-#: ../objects/UML/class.c:197 ../objects/UML/class.c:199
-#: ../objects/UML/class.c:201 ../objects/UML/class.c:203
+#: ../objects/UML/association.c:266 ../objects/UML/association.c:268
+#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
+#: ../objects/UML/class.c:200 ../objects/UML/class.c:202
+#: ../objects/UML/class.c:204 ../objects/UML/class.c:206
 msgid " "
 msgstr " "
 
-#: ../objects/Database/table.c:211 ../objects/UML/class.c:209
-#: ../objects/UML/object.c:157
+#: ../objects/Database/table.c:215 ../objects/UML/class.c:212
+#: ../objects/UML/object.c:153
 msgid "Attributes"
 msgstr "åæ"
 
-#: ../objects/Database/table.c:248
+#: ../objects/Database/table.c:252 ../objects/UML/class.c:324
 msgid "Show comments"
 msgstr "ãããããèçãã"
 
 #. init data
-#: ../objects/Database/table.c:253 ../objects/Database/table.c:356
+#: ../objects/Database/table.c:257 ../objects/Database/table.c:364
 #: ../sheets/Database.sheet.in.h:5
 msgid "Table"
 msgstr "ãããã"
 
 #. Attributes page:
-#: ../objects/Database/table_dialog.c:611 ../objects/UML/class_dialog.c:1081
+#: ../objects/Database/table_dialog.c:609
+#: ../objects/UML/class_attributes_dialog.c:455
 msgid "_Attributes"
 msgstr "åæ(_A)"
 
 #. the "new" button
-#: ../objects/Database/table_dialog.c:639 ../objects/SISSI/sissi_dialog.c:739
-#: ../objects/SISSI/sissi_dialog.c:871
+#: ../objects/Database/table_dialog.c:636 ../objects/SISSI/sissi_dialog.c:739
+#: ../objects/SISSI/sissi_dialog.c:870
 msgid "_New"
 msgstr "æè(_N)"
 
 #. the "delete" button
-#: ../objects/Database/table_dialog.c:647
+#: ../objects/Database/table_dialog.c:643
 msgid "_Delete"
 msgstr "åé(_D)"
 
 #. the "Move up" button
-#: ../objects/Database/table_dialog.c:655
+#: ../objects/Database/table_dialog.c:650
 msgid "Move up"
 msgstr "äã"
 
 #. the "Move down" button
-#: ../objects/Database/table_dialog.c:663
+#: ../objects/Database/table_dialog.c:657
 msgid "Move down"
 msgstr "äã"
 
-#: ../objects/Database/table_dialog.c:673 ../objects/UML/class_dialog.c:1138
+#: ../objects/Database/table_dialog.c:666
+#: ../objects/UML/class_attributes_dialog.c:507
 msgid "Attribute data"
 msgstr "åæå"
 
-#: ../objects/Database/table_dialog.c:707
-#: ../objects/Database/table_dialog.c:946
-#: ../objects/Database/table_dialog.c:1051 ../objects/UML/class_dialog.c:452
-#: ../objects/UML/class_dialog.c:1181 ../objects/UML/class_dialog.c:2111
-#: ../objects/UML/class_dialog.c:2283
+#: ../objects/Database/table_dialog.c:676
+#: ../objects/Database/table_dialog.c:1055 ../objects/ER/attribute.c:155
+#: ../objects/ER/entity.c:137 ../objects/ER/relationship.c:142
+#: ../objects/UML/class_attributes_dialog.c:517
+#: ../objects/UML/class_operations_dialog.c:777
+#: ../objects/UML/class_operations_dialog.c:977
+#: ../objects/UML/class_templates_dialog.c:436 ../objects/UML/dependency.c:134
+#: ../objects/UML/generalization.c:131 ../objects/UML/realizes.c:131
+msgid "Name:"
+msgstr "åå:"
+
+#: ../objects/Database/table_dialog.c:688 ../objects/FS/flow-ortho.c:169
+#: ../objects/FS/flow.c:146 ../objects/Istar/link.c:162
+#: ../objects/Jackson/phenomenon.c:146 ../objects/KAOS/metaandorrel.c:166
+#: ../objects/KAOS/metabinrel.c:173
+#: ../objects/UML/class_attributes_dialog.c:528
+#: ../objects/UML/class_operations_dialog.c:788
+#: ../objects/UML/class_operations_dialog.c:988
+#: ../objects/UML/class_templates_dialog.c:447
+msgid "Type:"
+msgstr "çé:"
+
+#: ../objects/Database/table_dialog.c:699
+msgid "Default:"
+msgstr "ããããã:"
+
+#: ../objects/Database/table_dialog.c:711
+#: ../objects/Database/table_dialog.c:955
+#: ../objects/Database/table_dialog.c:1060
+#: ../objects/UML/class_attributes_dialog.c:550
+#: ../objects/UML/class_dialog.c:343
+#: ../objects/UML/class_operations_dialog.c:848
+#: ../objects/UML/class_operations_dialog.c:1010
 msgid "Comment:"
 msgstr "ãããã:"
 
-#: ../objects/Database/table_dialog.c:726
+#: ../objects/Database/table_dialog.c:730
 msgid "_Primary key"
-msgstr "ãããããããã(_P)"
+msgstr "ããããããã(_P)"
 
-#: ../objects/Database/table_dialog.c:733
+#: ../objects/Database/table_dialog.c:737
 msgid "N_ullable"
 msgstr "Nullable(_U)"
 
-#: ../objects/Database/table_dialog.c:740
+#: ../objects/Database/table_dialog.c:744
 msgid "Uni_que"
 msgstr "Unique(_Q)"
 
-#: ../objects/Database/table_dialog.c:928
+#: ../objects/Database/table_dialog.c:937
 msgid "_Table"
 msgstr "ãããã(_T)"
 
-#: ../objects/Database/table_dialog.c:936
+#: ../objects/Database/table_dialog.c:945
 msgid "Table name:"
 msgstr "ããããå:"
 
 #. XXX create a handler and disable the 'show documentation tag' checkbox
 #. if 'comment visible' is not active.
-#: ../objects/Database/table_dialog.c:966
+#: ../objects/Database/table_dialog.c:975
 msgid "Comment visible"
 msgstr "ãããããèçåèããã"
 
-#: ../objects/Database/table_dialog.c:971 ../objects/UML/class_dialog.c:522
+#: ../objects/Database/table_dialog.c:980 ../objects/UML/class_dialog.c:413
 msgid "Show documentation tag"
 msgstr "ããããããããããèçãã"
 
 #. * Fonts and Colors selection *
-#: ../objects/Database/table_dialog.c:1010 ../objects/UML/class_dialog.c:551
+#: ../objects/Database/table_dialog.c:1019 ../objects/UML/class_dialog.c:442
 msgid "_Style"
 msgstr "ãããã(_S)"
 
-#: ../objects/Database/table_dialog.c:1021
+#: ../objects/Database/table_dialog.c:1030
 msgid "Border width:"
 msgstr "åççãå:"
 
 #. head line
-#: ../objects/Database/table_dialog.c:1034 ../objects/UML/class_dialog.c:561
+#: ../objects/Database/table_dialog.c:1043 ../objects/UML/class_dialog.c:452
 #: ../objects/UML/umlparameter.c:51
 msgid "Kind"
 msgstr "çé"
 
-#: ../objects/Database/table_dialog.c:1038 ../objects/UML/class_dialog.c:566
+#: ../objects/Database/table_dialog.c:1047 ../objects/UML/class_dialog.c:457
 msgid "Size"
 msgstr "ããã"
 
-#: ../objects/Database/table_dialog.c:1041
+#: ../objects/Database/table_dialog.c:1050
 msgid "Normal:"
 msgstr "ææ:"
 
-#: ../objects/Database/table_dialog.c:1062
+#: ../objects/Database/table_dialog.c:1071
 msgid "Text Color:"
 msgstr "æåãè:"
 
-#: ../objects/Database/table_dialog.c:1070
+#: ../objects/Database/table_dialog.c:1080
 msgid "Foreground Color:"
 msgstr "åæè:"
 
 #. two chars at the beginning
-#: ../objects/Database/table_dialog.c:1383
+#: ../objects/Database/table_dialog.c:1394
 msgid "not null"
 msgstr "null ãããã"
 
-#: ../objects/Database/table_dialog.c:1384
+#: ../objects/Database/table_dialog.c:1395
 msgid "null"
 msgstr "null ããã"
 
-#: ../objects/Database/table_dialog.c:1385
+#: ../objects/Database/table_dialog.c:1396
 msgid "unique"
 msgstr "éèããã"
 
-#: ../objects/Database/reference.c:108 ../objects/flowchart/box.c:152
-#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:136
-#: ../objects/standard/zigzagline.c:132
+#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:154
+#: ../objects/standard/box.c:152 ../objects/standard/polyline.c:140
+#: ../objects/standard/zigzagline.c:136
 msgid "Corner radius"
 msgstr "åéãäãäã:"
 
-#: ../objects/Database/reference.c:111
+#: ../objects/Database/reference.c:112
 msgid "Start description"
 msgstr "æåã Description"
 
-#: ../objects/Database/reference.c:113
+#: ../objects/Database/reference.c:114
 msgid "End description"
 msgstr "æåã Description"
 
-#: ../objects/Database/reference.c:144 ../objects/ER/participation.c:408
-#: ../objects/FS/flow-ortho.c:626 ../objects/GRAFCET/vector.c:314
-#: ../objects/SADT/arrow.c:459 ../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:380
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:406
+#: ../objects/FS/flow-ortho.c:632 ../objects/GRAFCET/vector.c:314
+#: ../objects/SADT/arrow.c:464 ../objects/UML/association.c:868
+#: ../objects/UML/component_feature.c:191 ../objects/UML/dependency.c:382
+#: ../objects/UML/generalization.c:379 ../objects/UML/realizes.c:369
+#: ../objects/UML/transition.c:173 ../objects/standard/zigzagline.c:385
 msgid "Add segment"
 msgstr "ããããããèå"
 
-#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:409
-#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:315
-#: ../objects/SADT/arrow.c:460 ../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:381
+#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:407
+#: ../objects/FS/flow-ortho.c:633 ../objects/GRAFCET/vector.c:315
+#: ../objects/SADT/arrow.c:465 ../objects/UML/association.c:869
+#: ../objects/UML/component_feature.c:192 ../objects/UML/dependency.c:383
+#: ../objects/UML/generalization.c:380 ../objects/UML/realizes.c:370
+#: ../objects/UML/transition.c:174 ../objects/standard/zigzagline.c:386
 msgid "Delete segment"
 msgstr "ããããããåé"
 
-#: ../objects/Database/reference.c:151 ../sheets/Database.sheet.in.h:4
+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
 msgid "Reference"
 msgstr "ãããããã"
 
@@ -3106,7 +3241,7 @@ msgstr "ãã:"
 
 #: ../objects/ER/attribute.c:159
 msgid "Weak key:"
-msgstr "ããããããã:"
+msgstr "ãããããã:"
 
 #: ../objects/ER/attribute.c:161
 msgid "Derived:"
@@ -3128,14 +3263,14 @@ msgstr "ãããã:"
 msgid "Associative:"
 msgstr "éæãã:"
 
-#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:131
+#: ../objects/ER/entity.c:415 ../objects/UML/classicon.c:132
 #: ../sheets/ER.sheet.in.h:4
 msgid "Entity"
 msgstr "ãããããã"
 
 #: ../objects/ER/er.c:44
 msgid "Entity/Relationship diagram objects"
-msgstr "ãããããã/ãããããããããããããããããããããã"
+msgstr "ãããããã/ããããããããããããããããããããã"
 
 #: ../objects/ER/participation.c:118
 msgid "Total:"
@@ -3162,16 +3297,16 @@ msgid "Relationship"
 msgstr "ããããããããã"
 
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:623
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:625
-#: ../objects/FS/function.c:1098
+#: ../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 "ããããã"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:161 ../objects/FS/flow-ortho.c:624
-#: ../objects/FS/flow.c:138 ../objects/FS/flow.c:626
-#: ../objects/FS/function.c:1074
+#: ../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 "ããããã"
 
@@ -3179,10 +3314,10 @@ msgstr "ããããã"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:162 ../objects/FS/flow-ortho.c:625
-#: ../objects/FS/flow.c:139 ../objects/FS/flow.c:627
-#: ../objects/FS/function.c:1036 ../objects/FS/function.c:1038
-#: ../objects/FS/function.c:1174 ../objects/FS/function.c:1176
+#: ../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 "ãããã"
 
@@ -3196,325 +3331,319 @@ msgstr "æåéæ"
 
 #: ../objects/FS/function.c:146
 msgid "User function"
-msgstr "ãããåçéæ"
+msgstr "ããããåçéæ"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:678
+#: ../objects/FS/function.c:681
 msgid "Verb"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Channel
 #. Translators: Menu item Verb/Channel/Channel
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Channel
-#: ../objects/FS/function.c:680 ../objects/FS/function.c:682
-#: ../objects/FS/function.c:722
+#: ../objects/FS/function.c:683 ../objects/FS/function.c:685
+#: ../objects/FS/function.c:725
 msgid "Channel"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:684 ../objects/FS/function.c:686
+#: ../objects/FS/function.c:687 ../objects/FS/function.c:689
 msgid "Import"
 msgstr "ããããã"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:688 ../objects/KAOS/metabinrel.c:165
+#: ../objects/FS/function.c:691 ../objects/KAOS/metabinrel.c:165
 msgid "Input"
 msgstr "ããããã"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:690
+#: ../objects/FS/function.c:693
 msgid "Receive"
 msgstr "ãããã"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:692 ../objects/FS/function.c:964
+#: ../objects/FS/function.c:695 ../objects/FS/function.c:967
 msgid "Allow"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:694
+#: ../objects/FS/function.c:697
 msgid "Form Entrance"
 msgstr "ãããããåå"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:696 ../objects/FS/function.c:930
+#: ../objects/FS/function.c:699 ../objects/FS/function.c:933
 msgid "Capture"
 msgstr "ããããã"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:702
+#: ../objects/FS/function.c:705
 msgid "Discharge"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:707
 msgid "Eject"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:706
+#: ../objects/FS/function.c:709
 msgid "Dispose"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Channel/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transfer
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transfer
-#: ../objects/FS/function.c:710 ../objects/FS/function.c:712
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
+#: ../objects/FS/function.c:733
 msgid "Transfer"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:714 ../objects/FS/function.c:716
+#: ../objects/FS/function.c:717 ../objects/FS/function.c:719
 msgid "Transport"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:718
+#: ../objects/FS/function.c:721
 msgid "Lift"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:723
 msgid "Move"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:724 ../objects/FS/function.c:726
+#: ../objects/FS/function.c:727 ../objects/FS/function.c:729
 msgid "Transmit"
 msgstr "éä"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:728
+#: ../objects/FS/function.c:731
 msgid "Conduct"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:732
+#: ../objects/FS/function.c:735
 msgid "Convey"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Channel/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide
 #. Translators: Menu item Verb/Channel/Guide/Guide/Guide
-#: ../objects/FS/function.c:734 ../objects/FS/function.c:736
-#: ../objects/FS/function.c:738
+#: ../objects/FS/function.c:737 ../objects/FS/function.c:739
+#: ../objects/FS/function.c:741
 msgid "Guide"
 msgstr "ããã"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:743
 msgid "Direct"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:745
 msgid "Straighten"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:747
 msgid "Steer"
 msgstr "éè"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:746
+#: ../objects/FS/function.c:749
 msgid "Translate"
 msgstr "çè"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:748 ../objects/FS/function.c:750
+#: ../objects/FS/function.c:751 ../objects/FS/function.c:753
 msgid "Rotate"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:752
+#: ../objects/FS/function.c:755
 msgid "Turn"
 msgstr "åããåãã"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:754
+#: ../objects/FS/function.c:757
 msgid "Spin"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Allow DOF
-#: ../objects/FS/function.c:756 ../objects/FS/function.c:758
+#: ../objects/FS/function.c:759 ../objects/FS/function.c:761
 msgid "Allow DOF"
 msgstr "DOFãèå"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:760
+#: ../objects/FS/function.c:763
 msgid "Constrain"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:762
+#: ../objects/FS/function.c:765
 msgid "Unlock"
 msgstr "ãããèé"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:764 ../objects/FS/function.c:766
+#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
 msgid "Support"
 msgstr "ãããã"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:768 ../objects/FS/function.c:770
+#: ../objects/FS/function.c:771 ../objects/FS/function.c:773
 #: ../sheets/SDL.sheet.in.h:19
 msgid "Stop"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:772
+#: ../objects/FS/function.c:775
 msgid "Insulate"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:774
+#: ../objects/FS/function.c:777
 msgid "Protect"
 msgstr "äè"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:776 ../objects/FS/function.c:966
+#: ../objects/FS/function.c:779 ../objects/FS/function.c:969
 msgid "Prevent"
 msgstr "äé"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:778
+#: ../objects/FS/function.c:781
 msgid "Shield"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:780
+#: ../objects/FS/function.c:783
 msgid "Inhibit"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:782 ../objects/FS/function.c:784
+#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
 msgid "Stabilize"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:786
+#: ../objects/FS/function.c:789
 msgid "Steady"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:788 ../objects/FS/function.c:790
+#: ../objects/FS/function.c:791 ../objects/FS/function.c:793
 msgid "Secure"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:792 ../objects/FS/function.c:824
+#: ../objects/FS/function.c:795 ../objects/FS/function.c:827
 msgid "Attach"
 msgstr "åãäã"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:794
+#: ../objects/FS/function.c:797
 msgid "Mount"
 msgstr "åãèã"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:796 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:799 ../sheets/ciscomisc.sheet.in.h:19
 msgid "Lock"
 msgstr "ããã"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:798
+#: ../objects/FS/function.c:801
 msgid "Fasten"
 msgstr "çãäãã"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:800
+#: ../objects/FS/function.c:803
 msgid "Hold"
 msgstr "ãããã"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:802 ../objects/FS/function.c:804
+#: ../objects/FS/function.c:805 ../objects/FS/function.c:807
 #: ../objects/Istar/actor.c:70
 msgid "Position"
 msgstr "äç"
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:806
+#: ../objects/FS/function.c:809
 msgid "Orient"
 msgstr "æå"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../objects/FS/function.c:810 ../objects/FS/function.c:1052
-msgid "Locate"
-msgstr "åæ"
-
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:812 ../objects/FS/function.c:814
+#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
 msgid "Connect"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:816 ../objects/FS/function.c:818
+#: ../objects/FS/function.c:819 ../objects/FS/function.c:821
 msgid "Couple"
 msgstr "éç"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:820
+#: ../objects/FS/function.c:823
 msgid "Join"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:822
+#: ../objects/FS/function.c:825
 msgid "Assemble"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:826 ../objects/FS/function.c:828
+#: ../objects/FS/function.c:829 ../objects/FS/function.c:831
 msgid "Mix"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:830
+#: ../objects/FS/function.c:833
 msgid "Combine"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:835
 msgid "Blend"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:837
 msgid "Add"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:839
 msgid "Pack"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:838
+#: ../objects/FS/function.c:841
 msgid "Coalesce"
 msgstr "åä"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:840 ../objects/FS/function.c:842
+#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
 #: ../sheets/UML.sheet.in.h:5
 msgid "Branch"
 msgstr "åå"
@@ -3522,700 +3651,705 @@ msgstr "åå"
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:844 ../objects/FS/function.c:846
-#: ../objects/FS/function.c:848
+#: ../objects/FS/function.c:847 ../objects/FS/function.c:849
+#: ../objects/FS/function.c:851
 msgid "Separate"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:853
 msgid "Switch"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:855
 msgid "Divide"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:857
 msgid "Release"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:859
 msgid "Detach"
 msgstr "åãéã"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:858
+#: ../objects/FS/function.c:861
 msgid "Disconnect"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:864
+#: ../objects/FS/function.c:867
 msgid "Cut"
 msgstr "ååã"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:869
 msgid "Polish"
 msgstr "èãåã"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:871
 msgid "Sand"
 msgstr "çã"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:873
 msgid "Drill"
 msgstr "ããã"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:872
+#: ../objects/FS/function.c:875
 msgid "Lathe"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:874 ../objects/FS/function.c:876
+#: ../objects/FS/function.c:877 ../objects/FS/function.c:879
 msgid "Refine"
 msgstr "çé"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:878
+#: ../objects/FS/function.c:881
 msgid "Purify"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:883
 msgid "Strain"
 msgstr "ããããã"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:885
 msgid "Filter"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:887
 msgid "Percolate"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:886
+#: ../objects/FS/function.c:889
 msgid "Clear"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:888 ../objects/FS/function.c:890
+#: ../objects/FS/function.c:891 ../objects/FS/function.c:893
 msgid "Distribute"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:892
+#: ../objects/FS/function.c:895
 msgid "Diverge"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:897
 msgid "Scatter"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:896
+#: ../objects/FS/function.c:899
 msgid "Disperse"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:898 ../objects/FS/function.c:912
+#: ../objects/FS/function.c:901 ../objects/FS/function.c:915
 msgid "Diffuse"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:900
+#: ../objects/FS/function.c:903
 msgid "Empty"
 msgstr "ç"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:902 ../objects/FS/function.c:904
+#: ../objects/FS/function.c:905 ../objects/FS/function.c:907
 msgid "Dissipate"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:906
+#: ../objects/FS/function.c:909
 msgid "Absorb"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:911
 msgid "Dampen"
 msgstr "ää"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:910
+#: ../objects/FS/function.c:913
 msgid "Dispel"
 msgstr "Dispel"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:914
+#: ../objects/FS/function.c:917
 msgid "Resist"
 msgstr "Resist"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:916 ../objects/FS/function.c:918
+#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
 msgid "Provision"
 msgstr "äç"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:920 ../objects/FS/function.c:922
+#: ../objects/FS/function.c:923 ../objects/FS/function.c:925
 msgid "Store"
 msgstr "äå"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:924
+#: ../objects/FS/function.c:927
 msgid "Contain"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:929
 msgid "Collect"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:928
+#: ../objects/FS/function.c:931
 msgid "Reserve"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:932 ../objects/FS/function.c:934
+#: ../objects/FS/function.c:935 ../objects/FS/function.c:937
 msgid "Supply"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:936
+#: ../objects/FS/function.c:939
 msgid "Fill"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:938
+#: ../objects/FS/function.c:941
 msgid "Provide"
 msgstr "äç"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:943
 msgid "Replenish"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:942
+#: ../objects/FS/function.c:945
 msgid "Expose"
 msgstr "ãããããã"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:944 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:947 ../sheets/Flowchart.sheet.in.h:9
 msgid "Extract"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:946 ../objects/FS/function.c:948
+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
 msgid "Control Magnitude"
 msgstr "ããããããåç"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:950 ../objects/FS/function.c:952
+#: ../objects/FS/function.c:953 ../objects/FS/function.c:955
 msgid "Actuate"
 msgstr "äå"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:954
+#: ../objects/FS/function.c:957
 msgid "Start"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:956
+#: ../objects/FS/function.c:959
 msgid "Initiate"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:958 ../objects/FS/function.c:960
+#: ../objects/FS/function.c:961 ../objects/FS/function.c:963
 msgid "Regulate"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:962 ../objects/FS/function.c:1180
-#: ../objects/UML/classicon.c:129
+#: ../objects/FS/function.c:965 ../objects/FS/function.c:1183
+#: ../objects/UML/classicon.c:130
 msgid "Control"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:968
+#: ../objects/FS/function.c:971
 msgid "Enable"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:973
 msgid "Disable"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:975
 msgid "Limit"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:974
+#: ../objects/FS/function.c:977
 msgid "Interrupt"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:976 ../objects/FS/function.c:978
+#: ../objects/FS/function.c:979 ../objects/FS/function.c:981
 msgid "Change"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:980
+#: ../objects/FS/function.c:983
 msgid "Increase"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:985
 msgid "Decrease"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:987
 msgid "Amplify"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:986
+#: ../objects/FS/function.c:989
 msgid "Reduce"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:990
+#: ../objects/FS/function.c:993
 msgid "Normalize"
 msgstr "æèå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:992
+#: ../objects/FS/function.c:995
 msgid "Multiply"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:994 ../objects/Misc/measure.c:187
+#: ../objects/FS/function.c:997 ../objects/Misc/measure.c:186
 msgid "Scale"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:996
+#: ../objects/FS/function.c:999
 msgid "Rectify"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:998
+#: ../objects/FS/function.c:1001
 msgid "Adjust"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:1000 ../objects/FS/function.c:1002
+#: ../objects/FS/function.c:1003 ../objects/FS/function.c:1005
 msgid "Form"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:1007
 msgid "Compact"
 msgstr "ããããã"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:1009
 msgid "Crush"
 msgstr "ããããã"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:1011
 msgid "Shape"
 msgstr "ãããã"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1013
 msgid "Compress"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1012
+#: ../objects/FS/function.c:1015
 msgid "Pierce"
 msgstr "ãããã"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1014 ../objects/FS/function.c:1016
+#: ../objects/FS/function.c:1017 ../objects/FS/function.c:1019
 msgid "Convert"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1021
 msgid "Transform"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1023
 msgid "Liquefy"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1025
 msgid "Solidify"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1027
 msgid "Evaporate"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1029
 msgid "Sublimate"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1031
 msgid "Condense"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1033
 msgid "Integrate"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1032
+#: ../objects/FS/function.c:1035
 msgid "Differentiate"
 msgstr "ååå"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1034 ../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 "ãããã"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1040 ../objects/FS/function.c:1042
+#: ../objects/FS/function.c:1043 ../objects/FS/function.c:1045
 msgid "Sense"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1047
 msgid "Perceive"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1049
 msgid "Recognize"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1051
 msgid "Discern"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1050
+#: ../objects/FS/function.c:1053
 msgid "Check"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1054
+#: ../objects/FS/function.c:1057
 msgid "Verify"
 msgstr "çè"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1056 ../objects/FS/function.c:1058
+#: ../objects/FS/function.c:1059 ../objects/FS/function.c:1061
 msgid "Indicate"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1060
+#: ../objects/FS/function.c:1063
 msgid "Mark"
 msgstr "ããã"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1062 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1065 ../sheets/Flowchart.sheet.in.h:7
 msgid "Display"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1064 ../objects/FS/function.c:1066
+#: ../objects/FS/function.c:1067 ../objects/FS/function.c:1069
 msgid "Measure"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1071
 msgid "Calculate"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1073
 msgid "Represent"
 msgstr "èç"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1072
+#: ../objects/FS/function.c:1075
 msgid "Noun"
 msgstr "çè"
 
+#. Translators: Menu item Noun/Material/Solid
+#: ../objects/FS/function.c:1079
+msgid "Solid"
+msgstr "åç"
+
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1081
 msgid "Liquid"
 msgstr "æä"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1080
+#: ../objects/FS/function.c:1083
 msgid "Gas"
 msgstr "ãã"
 
 #. Translators: Menu item Noun/Material/Human
 #. Translators: Menu item Noun/Material/Human/Human
 #. Translators: Menu item Noun/Energy/Human
-#: ../objects/FS/function.c:1082 ../objects/FS/function.c:1084
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1085 ../objects/FS/function.c:1087
+#: ../objects/FS/function.c:1171
 msgid "Human"
 msgstr "ää"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1086
+#: ../objects/FS/function.c:1089
 msgid "Hand"
 msgstr "æ"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1091
 msgid "Foot"
 msgstr "è"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1093
 msgid "Head"
 msgstr "é"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1095
 msgid "Finger"
 msgstr "æ"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1097
 msgid "Toe"
 msgstr "èæ"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1096
+#: ../objects/FS/function.c:1099
 msgid "Biological"
 msgstr "ççå"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1100
+#: ../objects/FS/function.c:1103
 msgid "Mechanical"
 msgstr "ææ"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1105
 msgid "Mech. Energy"
 msgstr "Mech. Energy"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1107
 msgid "Translation"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1109
 msgid "Force"
 msgstr "å"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1108 ../objects/standard/outline.c:206
+#: ../objects/FS/function.c:1111 ../objects/standard/outline.c:206
 msgid "Rotation"
 msgstr "åè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1110
+#: ../objects/FS/function.c:1113
 msgid "Torque"
 msgstr "ããã"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1115
 msgid "Random Motion"
 msgstr "ãããããåã"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1117
 msgid "Vibration"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1119
 msgid "Rotational Energy"
 msgstr "åèããããã"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1121
 msgid "Translational Energy"
 msgstr "åæããããã"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1123
 msgid "Electrical"
 msgstr "éæ"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1125
 msgid "Electricity"
 msgstr "ééæ"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1127
 msgid "Voltage"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1129
 msgid "Current"
 msgstr "éæ"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1131
 msgid "Hydraulic"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1133
 msgid "Pressure"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1135
 msgid "Volumetric Flow"
 msgstr "æé"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1137
 msgid "Thermal"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1139
 msgid "Heat"
 msgstr "ç"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1141
 msgid "Conduction"
 msgstr "äå"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1140
+#: ../objects/FS/function.c:1143
 msgid "Convection"
 msgstr "åæ"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1142 ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1145 ../objects/FS/function.c:1153
 msgid "Radiation"
 msgstr "æç"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1144
+#: ../objects/FS/function.c:1147
 msgid "Pneumatic"
 msgstr "æä"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1149
 msgid "Chemical"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1151
 msgid "Radioactive"
 msgstr "æåè"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1155
 msgid "Microwaves"
 msgstr "ããããæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1157
 msgid "Radio waves"
 msgstr "éçæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1159
 msgid "X-Rays"
 msgstr "Xç"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1161
 msgid "Gamma Rays"
 msgstr "ãããç"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1163
 msgid "Acoustic Energy"
 msgstr "ééããããã"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1165
 msgid "Optical Energy"
 msgstr "ååããããã"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1167
 msgid "Solar Energy"
 msgstr "åéããããã"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1169
 msgid "Magnetic Energy"
 msgstr "çå"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1173
 msgid "Human Motion"
 msgstr "ääãåã"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1172
+#: ../objects/FS/function.c:1175
 msgid "Human Force"
 msgstr "ääãå"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1178
+#: ../objects/FS/function.c:1181
 msgid "Status"
 msgstr "çæ"
 
-#: ../objects/FS/function.c:1182
+#: ../objects/FS/function.c:1185
 msgid "User/Device Fn"
-msgstr "ããã/ããããéæ"
+msgstr "ãããã/ããããéæ"
 
-#: ../objects/FS/function.c:1183
+#: ../objects/FS/function.c:1186
 msgid "Wish Fn"
 msgstr "åæããéæ"
 
@@ -4317,7 +4451,7 @@ msgstr "Receptivity ããããã"
 
 #: ../objects/GRAFCET/transition.c:146
 msgid "The receptivity's font size"
-msgstr "Receptivity ããããããããã"
+msgstr "Receptivity ãããããããã"
 
 #: ../objects/GRAFCET/transition.c:149
 msgid "The receptivity's color"
@@ -4349,15 +4483,15 @@ msgstr "ååãçé:"
 
 #: ../objects/GRAFCET/vergent.c:407 ../objects/Istar/other.c:471
 #: ../objects/Jackson/domain.c:533 ../objects/KAOS/goal.c:574
-#: ../objects/KAOS/other.c:527 ../objects/SADT/box.c:449
-#: ../objects/standard/line.c:223
+#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:454
+#: ../objects/standard/line.c:226
 msgid "Add connection point"
 msgstr "æççãèå"
 
 #: ../objects/GRAFCET/vergent.c:408 ../objects/Istar/other.c:472
 #: ../objects/Jackson/domain.c:534 ../objects/KAOS/goal.c:575
-#: ../objects/KAOS/other.c:528 ../objects/SADT/box.c:450
-#: ../objects/standard/line.c:224
+#: ../objects/KAOS/other.c:526 ../objects/SADT/box.c:455
+#: ../objects/standard/line.c:227
 msgid "Delete connection point"
 msgstr "æççãåé"
 
@@ -4373,7 +4507,7 @@ msgstr "ææå"
 msgid "Agent"
 msgstr "ãããããã"
 
-#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:247
+#: ../objects/Istar/actor.c:71 ../objects/UML/association.c:251
 msgid "Role"
 msgstr "åå"
 
@@ -4459,7 +4593,7 @@ msgid "Domain Kind"
 msgstr "ãããããçé"
 
 #: ../objects/Jackson/domain.c:184
-msgid "Optional kind which appears in the lower right corner of the Domain"
+msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "ãããããåäéãèçããããããããçé"
 
 #: ../objects/Jackson/domain.c:539
@@ -4480,8 +4614,8 @@ msgstr "æä"
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule
-#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:153
-#: ../objects/UML/message.c:155
+#: ../objects/Jackson/phenomenon.c:144 ../objects/UML/message.c:150
+#: ../objects/UML/message.c:152
 msgid "Message:"
 msgstr "ããããã:"
 
@@ -4539,7 +4673,7 @@ msgstr "èä"
 
 #: ../objects/KAOS/metabinrel.c:161
 msgid "Monitors"
-msgstr "ããã"
+msgstr "ãããã"
 
 #: ../objects/KAOS/metabinrel.c:162
 msgid "Controls"
@@ -4557,7 +4691,7 @@ msgstr "åè"
 msgid "Output"
 msgstr "åå"
 
-#: ../objects/KAOS/other.c:533
+#: ../objects/KAOS/other.c:531
 msgid "KAOS other"
 msgstr "KAOS ããä"
 
@@ -4581,6 +4715,12 @@ msgstr "çéãå"
 msgid "Show hours"
 msgstr "æéççãèç"
 
+#: ../objects/Misc/diagram_as_object.c:112
+#, fuzzy
+#| msgid "Dia Diagram File"
+msgid "Diagram file"
+msgstr "Dia ãããããããããã"
+
 #: ../objects/Misc/grid_object.c:140
 msgid "Rows"
 msgstr "èæ"
@@ -4590,120 +4730,120 @@ msgid "Columns"
 msgstr "åæ"
 
 #: ../objects/Misc/grid_object.c:144
-msgid "Gridline color"
+msgid "Grid line color"
 msgstr "ããããçãè"
 
 #: ../objects/Misc/grid_object.c:146
-msgid "Gridline width"
+msgid "Grid line width"
 msgstr "ããããçãå"
 
-#: ../objects/Misc/libmisc.c:41
+#: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "ããããããããããã"
 
-#: ../objects/Misc/measure.c:170
+#: ../objects/Misc/measure.c:169
 msgid "cm"
 msgstr "cm"
 
-#: ../objects/Misc/measure.c:171
+#: ../objects/Misc/measure.c:170
 msgid "dm"
 msgstr "dm"
 
-#: ../objects/Misc/measure.c:172
+#: ../objects/Misc/measure.c:171
 msgid "ft"
 msgstr "ft"
 
-#: ../objects/Misc/measure.c:173
+#: ../objects/Misc/measure.c:172
 msgid "in"
 msgstr "in"
 
-#: ../objects/Misc/measure.c:174
+#: ../objects/Misc/measure.c:173
 msgid "m"
 msgstr "m"
 
-#: ../objects/Misc/measure.c:175
+#: ../objects/Misc/measure.c:174
 msgid "mm"
 msgstr "mm"
 
-#: ../objects/Misc/measure.c:176
+#: ../objects/Misc/measure.c:175
 msgid "pt"
 msgstr "pt"
 
-#: ../objects/Misc/measure.c:177
+#: ../objects/Misc/measure.c:176
 msgid "pi"
 msgstr "pi"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:186 ../sheets/ChemEng.sheet.in.h:28
+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:28
 msgid "Measurement"
 msgstr "æåå"
 
-#: ../objects/Misc/measure.c:188
+#: ../objects/Misc/measure.c:187
 msgid "Unit"
 msgstr "åä"
 
-#: ../objects/Misc/measure.c:189
+#: ../objects/Misc/measure.c:188
 msgid "Precision"
 msgstr "çå (ææ)"
 
-#: ../objects/Misc/tree.c:605 ../objects/network/bus.c:613
+#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
 msgid "Add Handle"
 msgstr "ãããããèå"
 
-#: ../objects/Misc/tree.c:606 ../objects/network/bus.c:614
+#: ../objects/Misc/tree.c:599 ../objects/network/bus.c:607
 msgid "Delete Handle"
 msgstr "ãããããåé"
 
-#: ../objects/SADT/arrow.c:137
+#: ../objects/SADT/arrow.c:138
 msgid "Import resource (not shown upstairs)"
 msgstr "éèãããã (ääãèçããã)"
 
-#: ../objects/SADT/arrow.c:138
+#: ../objects/SADT/arrow.c:139
 msgid "Imply resource (not shown downstairs)"
 msgstr "éèãããã (ääãèçããã)"
 
-#: ../objects/SADT/arrow.c:139
+#: ../objects/SADT/arrow.c:140
 msgid "Dotted arrow"
 msgstr "ãããäãçå"
 
-#: ../objects/SADT/arrow.c:140
+#: ../objects/SADT/arrow.c:141
 msgid "disable arrow heads"
 msgstr "çåãã"
 
-#: ../objects/SADT/arrow.c:146
+#: ../objects/SADT/arrow.c:148
 msgid "Flow style:"
 msgstr "ãããããããã:"
 
-#: ../objects/SADT/arrow.c:148
+#: ../objects/SADT/arrow.c:150
 msgid "Automatically gray vertical flows:"
 msgstr "èåçãçèãåçãããããã:"
 
-#: ../objects/SADT/arrow.c:149
+#: ../objects/SADT/arrow.c:151
 msgid ""
 "To improve the ease of reading, flows which begin and end vertically can be "
 "rendered gray"
 msgstr ""
 "èããããåäããããããåçãççãåçæåãããããçèãæçããã"
 
-#: ../objects/SADT/arrow.c:465
+#: ../objects/SADT/arrow.c:470
 msgid "SADT Arrow"
 msgstr "SADT çå"
 
-#: ../objects/SADT/box.c:139 ../objects/custom/custom_object.c:226
-#: ../objects/flowchart/box.c:154 ../objects/flowchart/diamond.c:152
-#: ../objects/flowchart/ellipse.c:151 ../objects/flowchart/parallelogram.c:156
+#: ../objects/SADT/box.c:140 ../objects/custom/custom_object.c:229
+#: ../objects/flowchart/box.c:156 ../objects/flowchart/diamond.c:154
+#: ../objects/flowchart/ellipse.c:153 ../objects/flowchart/parallelogram.c:158
 msgid "Text padding"
 msgstr "æåãããããã"
 
-#: ../objects/SADT/box.c:146
+#: ../objects/SADT/box.c:149
 msgid "Activity/Data identifier"
 msgstr "ãããèåå"
 
-#: ../objects/SADT/box.c:147
-msgid "The identifier which appears in the lower right corner of the Box"
+#: ../objects/SADT/box.c:150
+msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr "Box ãåäãèçããèååãã"
 
-#: ../objects/SADT/box.c:455
+#: ../objects/SADT/box.c:460
 msgid "SADT box"
 msgstr "SADT box"
 
@@ -4740,7 +4880,7 @@ msgid "Medical Confidential"
 msgstr "åçæå"
 
 #: ../objects/SISSI/classification.h:45
-msgid "Industrie Confidential"
+msgid "Industry Confidential"
 msgstr "äææå"
 
 #: ../objects/SISSI/classification.h:46
@@ -4860,7 +5000,7 @@ msgstr "SYSTEM"
 
 #: ../objects/SISSI/sissi_dialog.c:79
 msgid "Internet access device"
-msgstr "ããããããããããããããããã"
+msgstr "ããããããããããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:80
 msgid "Electronic messaging"
@@ -4872,7 +5012,7 @@ msgstr "ããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:82
 msgid "Company directory"
-msgstr "äæããããã"
+msgstr "äæãããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:83
 msgid "External portal"
@@ -4895,7 +5035,9 @@ msgid "Project or system organisation"
 msgstr "Project or system organisation"
 
 #: ../objects/SISSI/sissi_dialog.c:92
-msgid "Subcontractors / Suppliers / Manufacturers"
+#, fuzzy
+#| msgid "Subcontractors / Suppliers / Manufacturers"
+msgid "Subcontractors/Suppliers/Manufacturers"
 msgstr "Subcontractors / Suppliers / Manufacturers"
 
 #: ../objects/SISSI/sissi_dialog.c:97
@@ -4931,7 +5073,9 @@ msgid "Power"
 msgstr "Power"
 
 #: ../objects/SISSI/sissi_dialog.c:105
-msgid "Cooling / Pollution"
+#, fuzzy
+#| msgid "Cooling / Pollution"
+msgid "Cooling/Pollution"
 msgstr "Cooling / Pollution"
 
 #: ../objects/SISSI/sissi_dialog.c:109
@@ -5015,7 +5159,9 @@ msgid "Developer"
 msgstr "Developer"
 
 #: ../objects/SISSI/sissi_dialog.c:166
-msgid "Operator / Maintenance"
+#, fuzzy
+#| msgid "Operator / Maintenance"
+msgid "Operator/Maintenance"
 msgstr "Operator / Maintenance"
 
 #: ../objects/SISSI/sissi_dialog.c:171 ../sheets/network.sheet.in.h:20
@@ -5032,7 +5178,7 @@ msgstr "Passive or active relay"
 
 #: ../objects/SISSI/sissi_dialog.c:174
 msgid "Communication interface"
-msgstr "éäããããããã"
+msgstr "éäãããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:179 ../sheets/SISSI.sheet.in.h:54
 msgid "Software"
@@ -5052,22 +5198,22 @@ msgstr "ããããããããéåããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:183
 msgid "Business application"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:184
 msgid "Standard business application"
-msgstr "ææçãããããããããããããã"
+msgstr "ææçããããããããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:185
 msgid "Specific business application"
-msgstr "çåãããããããããããããã"
+msgstr "çåããããããããããããã"
 
 #: ../objects/SISSI/sissi_dialog.c:190
 msgid "HARDWARE"
 msgstr "HARDWARE"
 
 #: ../objects/SISSI/sissi_dialog.c:191
-msgid "Data-processing equipment (active)"
+msgid "Data processing equipment (active)"
 msgstr "ãããåçèç"
 
 #: ../objects/SISSI/sissi_dialog.c:192
@@ -5132,322 +5278,333 @@ msgid "value"
 msgstr "å"
 
 #. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:862
+#: ../objects/SISSI/sissi_dialog.c:861
 msgid "Documents"
 msgstr "ææ"
 
-#: ../objects/SISSI/sissi_dialog.c:878
+#: ../objects/SISSI/sissi_dialog.c:876
 msgid "Document title"
 msgstr "ææããããã"
 
 # UMLèèé http://www.umtp-japan.org/pdf/japanese.pdf
-#: ../objects/UML/actor.c:357 ../objects/UML/actor.c:359
+#: ../objects/UML/actor.c:356 ../objects/UML/actor.c:358
 #: ../sheets/UML.sheet.in.h:2
 msgid "Actor"
 msgstr "ãããã"
 
-#: ../objects/UML/association.c:222
+#: ../objects/UML/association.c:223
 msgid "From A to B"
 msgstr "AããBã"
 
-#: ../objects/UML/association.c:223
+#: ../objects/UML/association.c:224
 msgid "From B to A"
 msgstr "BããAã"
 
-#: ../objects/UML/association.c:228
+#: ../objects/UML/association.c:229
 msgid "Aggregation"
 msgstr "ãããããããã"
 
-#: ../objects/UML/association.c:229
+#: ../objects/UML/association.c:230
 msgid "Composition"
 msgstr "ããããããã"
 
-#: ../objects/UML/association.c:236
+#: ../objects/UML/association.c:240
 msgid "Direction"
 msgstr "åã"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:242
 msgid "Show direction"
 msgstr "åããèçãã"
 
-#: ../objects/UML/association.c:238
+#: ../objects/UML/association.c:242
 msgid "Show the small arrow denoting the reading direction"
 msgstr "èãæåãèãåããçåãèçããã"
 
-#: ../objects/UML/association.c:245
+#: ../objects/UML/association.c:249
 msgid "Side A"
 msgstr "Aå"
 
-#: ../objects/UML/association.c:249
+#: ../objects/UML/association.c:253
 msgid "Multiplicity"
 msgstr "åææ"
 
-#: ../objects/UML/association.c:251 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/association.c:255 ../objects/UML/umlattribute.c:45
 #: ../objects/UML/umloperation.c:71
 msgid "Visibility"
 msgstr "åèæ"
 
-#: ../objects/UML/association.c:253
+#: ../objects/UML/association.c:257
 msgid "Show arrow"
 msgstr "çåãèçãã"
 
-#: ../objects/UML/association.c:256
+#: ../objects/UML/association.c:260
 msgid "Side B"
 msgstr "Bå"
 
-#: ../objects/UML/class.c:142 ../objects/UML/class.c:325
-#: ../objects/UML/class.c:1773 ../sheets/UML.sheet.in.h:6
+#: ../objects/UML/association.c:271 ../objects/UML/object.c:162
+#, fuzzy
+#| msgid "_Style"
+msgid "Style"
+msgstr "ãããã(_S)"
+
+#: ../objects/UML/class.c:143 ../objects/UML/class.c:331
+#: ../objects/UML/class.c:1827 ../sheets/UML.sheet.in.h:6
 msgid "Class"
 msgstr "ããã"
 
 #. how it used to be before 0.96+SVN
 #. one name, one type: but breaks forward-compatibiliy so kind of reverted
-#: ../objects/UML/class.c:146 ../objects/UML/classicon.c:140
-#: ../objects/UML/classicon.c:142 ../objects/UML/component.c:126
-#: ../objects/UML/large_package.c:137 ../objects/UML/object.c:153
-#: ../objects/UML/small_package.c:131 ../objects/UML/umloperation.c:68
+#: ../objects/UML/class.c:147 ../objects/UML/classicon.c:139
+#: ../objects/UML/classicon.c:141 ../objects/UML/component.c:126
+#: ../objects/UML/large_package.c:135 ../objects/UML/object.c:149
+#: ../objects/UML/small_package.c:128 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "ããããããã"
 
-#: ../objects/UML/class.c:150 ../objects/UML/class.c:183
-#: ../objects/UML/class_dialog.c:468 ../objects/UML/class_dialog.c:580
-#: ../objects/UML/class_dialog.c:2087 ../objects/UML/uml.c:110
+#: ../objects/UML/class.c:151 ../objects/UML/class.c:186
+#: ../objects/UML/class_dialog.c:359 ../objects/UML/class_dialog.c:471
+#: ../objects/UML/class_operations_dialog.c:832 ../objects/UML/uml.c:111
 msgid "Abstract"
 msgstr "æèå"
 
-#: ../objects/UML/class.c:152 ../objects/UML/class.c:1770
+#: ../objects/UML/class.c:153 ../objects/UML/class.c:1824
 msgid "Template"
 msgstr "ãããããã"
 
-#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:477
+#: ../objects/UML/class.c:156 ../objects/UML/class_dialog.c:368
 msgid "Suppress Attributes"
 msgstr "åæãæåãã"
 
-#: ../objects/UML/class.c:157
+#: ../objects/UML/class.c:158
 msgid "Suppress Operations"
 msgstr "ããããããããæåãã"
 
-#: ../objects/UML/class.c:159
+#: ../objects/UML/class.c:160
 msgid "Visible Attributes"
 msgstr "åæãèçãã"
 
-#: ../objects/UML/class.c:161
+#: ../objects/UML/class.c:162
 msgid "Visible Operations"
 msgstr "æäãèç"
 
-#: ../objects/UML/class.c:163
+#: ../objects/UML/class.c:164
 msgid "Visible Comments"
 msgstr "ãããããèç"
 
-#: ../objects/UML/class.c:165 ../objects/UML/class_dialog.c:493
+#: ../objects/UML/class.c:166 ../objects/UML/class_dialog.c:384
 msgid "Wrap Operations"
 msgstr "ããããããããããããã"
 
-#: ../objects/UML/class.c:167
+#: ../objects/UML/class.c:168
 msgid "Wrap after char"
 msgstr "æåãåããããããã"
 
-#: ../objects/UML/class.c:169
+#: ../objects/UML/class.c:170
 msgid "Comment line length"
 msgstr "ããããèãéã"
 
-#: ../objects/UML/class.c:181 ../objects/UML/class_dialog.c:575
+#: ../objects/UML/class.c:174 ../objects/UML/class.c:326
+#, fuzzy
+#| msgid "Hollow Triangle"
+msgid "Allow resizing"
+msgstr "\"äèå (äæã)\""
+
+#: ../objects/UML/class.c:184 ../objects/UML/class_dialog.c:466
 msgid "Polymorphic"
 msgstr "åææ"
 
-#: ../objects/UML/class.c:185
-msgid "Classname"
+#: ../objects/UML/class.c:188 ../objects/UML/class_dialog.c:476
+msgid "Class Name"
 msgstr "ãããå"
 
-#: ../objects/UML/class.c:187
-msgid "Abstract Classname"
+#: ../objects/UML/class.c:190
+msgid "Abstract Class Name"
 msgstr "æèåãããå"
 
-#: ../objects/UML/class.c:211
+#: ../objects/UML/class.c:214
 msgid "Operations"
 msgstr "ããããããã"
 
-#: ../objects/UML/class.c:214
+#: ../objects/UML/class.c:217
 msgid "Template Parameters"
 msgstr "ãããããããåæ"
 
-#: ../objects/UML/class.c:320
-msgid "Show Comments"
-msgstr "ãããããèçãã"
+#: ../objects/UML/class_attributes_dialog.c:539
+msgid "Value:"
+msgstr "å:"
+
+#: ../objects/UML/class_attributes_dialog.c:572
+#: ../objects/UML/class_operations_dialog.c:811
+msgid "Visibility:"
+msgstr "åé/éåé:"
+
+#: ../objects/UML/class_attributes_dialog.c:577
+#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
+msgid "Public"
+msgstr "ããããã"
+
+#: ../objects/UML/class_attributes_dialog.c:578
+#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
+msgid "Private"
+msgstr "ãããããã"
+
+#: ../objects/UML/class_attributes_dialog.c:579
+#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
+msgid "Protected"
+msgstr "ããããããã"
+
+#: ../objects/UML/class_attributes_dialog.c:580
+#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
+msgid "Implementation"
+msgstr "ããããããããããã"
+
+#. end: Inheritance type
+#: ../objects/UML/class_attributes_dialog.c:592
+#: ../objects/UML/class_operations_dialog.c:840
+msgid "Class scope"
+msgstr "ããããããããããã"
 
 #. Class page:
-#: ../objects/UML/class_dialog.c:429
+#: ../objects/UML/class_dialog.c:320
 msgid "_Class"
 msgstr "ããã(_C)"
 
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:328
 msgid "Class name:"
 msgstr "ãããå:"
 
-#: ../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
+#: ../objects/UML/class_dialog.c:336
+#: ../objects/UML/class_operations_dialog.c:799
+#: ../objects/UML/dependency.c:136 ../objects/UML/generalization.c:133
+#: ../objects/UML/realizes.c:133
 msgid "Stereotype:"
 msgstr "ããããããã:"
 
-#: ../objects/UML/class_dialog.c:474
+#: ../objects/UML/class_dialog.c:365
 msgid "Attributes visible"
 msgstr "åæãèçãã"
 
-#: ../objects/UML/class_dialog.c:483
+#: ../objects/UML/class_dialog.c:374
 msgid "Operations visible"
 msgstr "ããããããããèçãã"
 
-#: ../objects/UML/class_dialog.c:486
+#: ../objects/UML/class_dialog.c:377
 msgid "Suppress operations"
 msgstr "ããããããããæåãã"
 
-#: ../objects/UML/class_dialog.c:500
+#: ../objects/UML/class_dialog.c:391
 msgid "Wrap after this length: "
 msgstr "æãéããããããã: "
 
-#: ../objects/UML/class_dialog.c:508
+#: ../objects/UML/class_dialog.c:399
 msgid "Comments visible"
 msgstr "ãããããèçãã"
 
-#: ../objects/UML/class_dialog.c:515
+#: ../objects/UML/class_dialog.c:406
 msgid "Wrap comment after this length: "
 msgstr "ãããããæãéããããããã:"
 
-#: ../objects/UML/class_dialog.c:585
-msgid "Class Name"
-msgstr "ãããå"
-
-#: ../objects/UML/class_dialog.c:590
+#: ../objects/UML/class_dialog.c:481
 msgid "Abstract Class"
 msgstr "æèåããã"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:607
+#: ../objects/UML/class_dialog.c:498
 msgid "Line Width"
 msgstr "çãå"
 
-#: ../objects/UML/class_dialog.c:616
+#: ../objects/UML/class_dialog.c:507
 msgid "Text Color"
 msgstr "æåãè"
 
-#: ../objects/UML/class_dialog.c:624
+#: ../objects/UML/class_dialog.c:516
 msgid "Foreground Color"
 msgstr "åæè"
 
-#: ../objects/UML/class_dialog.c:632
+#: ../objects/UML/class_dialog.c:525
 msgid "Background Color"
 msgstr "èæè"
 
-#: ../objects/UML/class_dialog.c:1170
-msgid "Value:"
-msgstr "å:"
-
-#: ../objects/UML/class_dialog.c:1203 ../objects/UML/class_dialog.c:2048
-msgid "Visibility:"
-msgstr "åé/éåé:"
-
-#: ../objects/UML/class_dialog.c:1212 ../objects/UML/class_dialog.c:2057
-#: ../objects/UML/uml.c:102
-msgid "Public"
-msgstr "ããããã"
-
-#: ../objects/UML/class_dialog.c:1215 ../objects/UML/class_dialog.c:2060
-#: ../objects/UML/uml.c:103
-msgid "Private"
-msgstr "ãããããã"
-
-#: ../objects/UML/class_dialog.c:1218 ../objects/UML/class_dialog.c:2063
-#: ../objects/UML/uml.c:104
-msgid "Protected"
-msgstr "ããããããã"
-
-#: ../objects/UML/class_dialog.c:1221 ../objects/UML/class_dialog.c:2066
-#: ../objects/UML/uml.c:105
-msgid "Implementation"
-msgstr "ããããããããããã"
-
-#. end: Inheritance type
-#: ../objects/UML/class_dialog.c:1237 ../objects/UML/class_dialog.c:2103
-msgid "Class scope"
-msgstr "ããããããããããã"
-
 #. end: Visibility
-#: ../objects/UML/class_dialog.c:2078
+#: ../objects/UML/class_operations_dialog.c:827
 msgid "Inheritance type:"
 msgstr "çæããå:"
 
-#: ../objects/UML/class_dialog.c:2090 ../objects/UML/uml.c:111
+#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
 msgid "Polymorphic (virtual)"
 msgstr "åææ (virtual)"
 
-#: ../objects/UML/class_dialog.c:2093 ../objects/UML/uml.c:112
+#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
 msgid "Leaf (final)"
 msgstr "ããã (final)"
 
-#: ../objects/UML/class_dialog.c:2107
+#: ../objects/UML/class_operations_dialog.c:844
 msgid "Query"
 msgstr "ããã"
 
-#: ../objects/UML/class_dialog.c:2154
+#: ../objects/UML/class_operations_dialog.c:888
 msgid "Parameters:"
-msgstr "ããããã:"
+msgstr "ãããããã:"
 
-#: ../objects/UML/class_dialog.c:2239
+#: ../objects/UML/class_operations_dialog.c:966
 msgid "Parameter data"
-msgstr "ããããããããã"
+msgstr "ãããããããããã"
 
-#: ../objects/UML/class_dialog.c:2272
+#: ../objects/UML/class_operations_dialog.c:999
 msgid "Def. value:"
 msgstr "åçå:"
 
-#: ../objects/UML/class_dialog.c:2306
+#: ../objects/UML/class_operations_dialog.c:1030
 msgid "Direction:"
 msgstr "æå:"
 
-#: ../objects/UML/class_dialog.c:2315 ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_operations_dialog.c:1035
+#: ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "æåç"
 
-#: ../objects/UML/class_dialog.c:2318 ../objects/UML/umlparameter.c:35
+#: ../objects/UML/class_operations_dialog.c:1036
+#: ../objects/UML/umlparameter.c:35
 msgid "In"
 msgstr "åå"
 
-#: ../objects/UML/class_dialog.c:2321 ../objects/UML/umlparameter.c:36
+#: ../objects/UML/class_operations_dialog.c:1037
+#: ../objects/UML/umlparameter.c:36
 msgid "Out"
 msgstr "åå"
 
-#: ../objects/UML/class_dialog.c:2324 ../objects/UML/umlparameter.c:37
+#: ../objects/UML/class_operations_dialog.c:1038
+#: ../objects/UML/umlparameter.c:37
 msgid "In & Out"
 msgstr "ååãåå"
 
 #. Operations page:
-#: ../objects/UML/class_dialog.c:2359
+#: ../objects/UML/class_operations_dialog.c:1069
 msgid "_Operations"
 msgstr "ããããããã(_O)"
 
-#: ../objects/UML/class_dialog.c:2417
+#: ../objects/UML/class_operations_dialog.c:1124
 msgid "Operation data"
 msgstr "ããããããããããã"
 
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2780
+#: ../objects/UML/class_templates_dialog.c:368
 msgid "_Templates"
 msgstr "ãããããã(_T)"
 
-#: ../objects/UML/class_dialog.c:2786 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:29
 msgid "Template class"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
-#: ../objects/UML/class_dialog.c:2843
+#: ../objects/UML/class_templates_dialog.c:426
 msgid "Formal parameter data"
-msgstr "æèããããããããã"
+msgstr "æèãããããããããã"
 
-#: ../objects/UML/classicon.c:130
+#: ../objects/UML/classicon.c:131
 msgid "Boundary"
 msgstr "åç"
 
-#: ../objects/UML/classicon.c:145
+#: ../objects/UML/classicon.c:144
 msgid "Is object"
 msgstr "ãããããã"
 
@@ -5471,45 +5628,45 @@ msgstr "Event Sink"
 msgid "Constraint:"
 msgstr "åç:"
 
-#: ../objects/UML/dependency.c:141
+#: ../objects/UML/dependency.c:138
 msgid "Show arrow:"
 msgstr "çåãèç:"
 
 #. 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
+#: ../objects/UML/implements.c:128 ../objects/UML/implements.c:130
 msgid "Interface:"
-msgstr "ããããããã:"
+msgstr "ãããããããã:"
 
-#: ../objects/UML/lifeline.c:152
+#: ../objects/UML/lifeline.c:165
 msgid "Draw focus of control:"
 msgstr "ãããããããããããããèç:"
 
-#: ../objects/UML/lifeline.c:154
+#: ../objects/UML/lifeline.c:167
 msgid "Draw destruction mark:"
 msgstr "ããããããããããããèç:"
 
-#: ../objects/UML/lifeline.c:505
+#: ../objects/UML/lifeline.c:535
 msgid "Add connection points"
 msgstr "æççãèå"
 
-#: ../objects/UML/lifeline.c:506
+#: ../objects/UML/lifeline.c:536
 msgid "Remove connection points"
 msgstr "æççãåé"
 
-#: ../objects/UML/lifeline.c:507
+#: ../objects/UML/lifeline.c:537
 msgid "Increase connection points distance"
 msgstr "æççãèéãåãã"
 
-#: ../objects/UML/lifeline.c:508
+#: ../objects/UML/lifeline.c:538
 msgid "Decrease connection points distance"
 msgstr "æççãèéãæãã"
 
-#: ../objects/UML/lifeline.c:509
+#: ../objects/UML/lifeline.c:539
 msgid "Set default connection points distance"
 msgstr "æççãããããããèéãæåãã"
 
-#: ../objects/UML/lifeline.c:513
+#: ../objects/UML/lifeline.c:543
 msgid "UML Lifeline"
 msgstr "UML ãããããã"
 
@@ -5541,45 +5698,45 @@ msgstr "éä"
 msgid "Recursive"
 msgstr "çãèã"
 
-#: ../objects/UML/message.c:158
+#: ../objects/UML/message.c:154
 msgid "Message type:"
 msgstr "ããããããçé:"
 
-#: ../objects/UML/object.c:155
+#: ../objects/UML/object.c:151
 msgid "Explicit state"
 msgstr "æççãçæ"
 
-#: ../objects/UML/object.c:160
+#: ../objects/UML/object.c:156
 msgid "Active object"
 msgstr "ããããããããããããå"
 
-#: ../objects/UML/object.c:162
+#: ../objects/UML/object.c:158
 msgid "Show attributes"
 msgstr "åæãèç"
 
-#: ../objects/UML/object.c:164
+#: ../objects/UML/object.c:160
 msgid "Multiple instance"
 msgstr "èæãããããã"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:151
 msgid "Entry action"
 msgstr "åçæãããããã"
 
-#: ../objects/UML/state.c:156
+#: ../objects/UML/state.c:152
 msgid "Do action"
 msgstr "ããããããåè"
 
-#: ../objects/UML/state.c:157
+#: ../objects/UML/state.c:153
 msgid "Exit action"
 msgstr "ããããããçä"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:479
+#: ../objects/UML/state.c:493
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
-"That option will go away in future versions.\n"
-"Please use the Initial/Final State object instead\n"
+"This option will go away in future versions.\n"
+"Please use the Initial/Final State object instead.\n"
 msgstr ""
 "ãããããããããã initial/final ãçæãããããããæãããã\n"
 "ããããããåæãããããããçãããäåããã\n"
@@ -5589,38 +5746,34 @@ msgstr ""
 msgid "Is final"
 msgstr "çäçæ"
 
-#: ../objects/UML/transition.c:141
+#: ../objects/UML/transition.c:142
 msgid "Trigger"
-msgstr "ããã"
+msgstr "ãããã"
 
-#: ../objects/UML/transition.c:142
+#: ../objects/UML/transition.c:143
 msgid "The event that causes this transition to be taken"
 msgstr "ããéçãåèããéããããããã"
 
-#: ../objects/UML/transition.c:143
+#: ../objects/UML/transition.c:144
 msgid "Action"
 msgstr "ããããã"
 
-#: ../objects/UML/transition.c:144
+#: ../objects/UML/transition.c:145
 msgid "Action to perform when this transition is taken"
 msgstr "ããéçãåãåããéãåèããããããããã"
 
-#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:146 ../sheets/cisconetwork.sheet.in.h:43
 msgid "Guard"
 msgstr "ããã"
 
-#: ../objects/UML/transition.c:146
+#: ../objects/UML/transition.c:147
 msgid "Condition for taking this transition when the event is fired"
 msgstr "ãããããçèãããæãããéçãåãåããããæäãã"
 
-#: ../objects/UML/uml.c:66
+#: ../objects/UML/uml.c:67
 msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr "UML ãããããããããããã (UML 1.3)"
 
-#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "å"
-
 #: ../objects/UML/umlattribute.c:47
 msgid "Abstract (?)"
 msgstr "æèå (?)"
@@ -5639,19 +5792,19 @@ msgstr "ããã (const)"
 
 #: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:164
 msgid "Parameters"
-msgstr "ããããã"
-
-#: ../objects/UML/usecase.c:136
-msgid "Text outside"
-msgstr "æåããããã"
+msgstr "ãããããã"
 
-#: ../objects/UML/usecase.c:138
+#: ../objects/UML/usecase.c:133
 msgid "Collaboration"
 msgstr "ãããããããã"
 
+#: ../objects/UML/usecase.c:135
+msgid "Text outside"
+msgstr "æåããããã"
+
 #: ../objects/chronogram/chronogram.c:40
 msgid "Chronogram diagram objects"
-msgstr "ãããããããããããããããããããã"
+msgstr "ããããããããããããããããããã"
 
 #: ../objects/chronogram/chronoline.c:150 ../sheets/AADL.sheet.in.h:4
 msgid "Data"
@@ -5671,13 +5824,13 @@ msgstr "ãããããèè"
 
 #: ../objects/chronogram/chronoline.c:158
 msgid ""
-"@ time    set the pointer at an absolute time.\n"
-"( duration  sets the signal up, then wait 'duration'.\n"
-") duration  sets the signal down, then wait 'duration'.\n"
-"u duration  sets the signal to \"unknown\" state, then wait 'duration'.\n"
-"example : @ 1.0 (2.0)1.0(2.0)\n"
+"@ time    set the pointer to an absolute time.\n"
+"( duration  set the signal up, then wait 'duration'.\n"
+") duration  set the signal down, then wait 'duration'.\n"
+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
+"Example: @ 1.0 (2.0)1.0(2.0)\n"
 msgstr ""
-"@ æé  ãããããçåæéããããããã\n"
+"@ æé  ããããããçåæéããããããã\n"
 "( æé  ãããããäããã\"æé\" ååæããã\n"
 ") æé  ãããããäããã\"æé\" ååæããã\n"
 "u æé  ããããã \"unknown\" çæãããã\"æé\" ååæããã\n"
@@ -5724,15 +5877,15 @@ msgstr "æéããã"
 
 #: ../objects/chronogram/chronoref.c:152
 msgid "Major time step"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../objects/chronogram/chronoref.c:154
 msgid "Minor time step"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../objects/chronogram/chronoref.c:164
 msgid "Minor step line width"
-msgstr "ããããããããããçå"
+msgstr "ãããããããããçå"
 
 #: ../objects/custom/custom.c:140
 msgid "Custom"
@@ -5740,33 +5893,33 @@ msgstr "ãããã"
 
 #: ../objects/custom/custom.c:140
 msgid "Custom XML shapes loader"
-msgstr "ãããã XML ãããããããã"
+msgstr "ãããã XML ããããããããã"
 
-#: ../objects/custom/custom_object.c:207 ../objects/custom/custom_object.c:239
+#: ../objects/custom/custom_object.c:210 ../objects/custom/custom_object.c:243
 msgid "Flip horizontal"
 msgstr "æåæåããæãèã"
 
-#: ../objects/custom/custom_object.c:209 ../objects/custom/custom_object.c:241
+#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:245
 msgid "Flip vertical"
 msgstr "åçæåããæãèã"
 
-#: ../objects/custom/custom_object.c:212 ../objects/custom/custom_object.c:244
+#: ../objects/custom/custom_object.c:215 ../objects/custom/custom_object.c:248
 msgid "Scale of the subshapes"
 msgstr "ãããããããåãã"
 
-#: ../objects/custom/custom_object.c:1780
+#: ../objects/custom/custom_object.c:1764
 msgid "Flip Horizontal"
 msgstr "æåæåãæãèã"
 
-#: ../objects/custom/custom_object.c:1781
+#: ../objects/custom/custom_object.c:1765
 msgid "Flip Vertical"
 msgstr "åçæåãæãèã"
 
-#: ../objects/custom/custom_object.c:1818
-#: ../objects/custom_lines/custom_linetypes.c:263
+#: ../objects/custom/custom_object.c:1802
+#: ../objects/custom_lines/custom_linetypes.c:264
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
-msgstr "ãããããããçé '%2$s' ãããããããããã %1$s ãéãããã"
+msgstr "ãããããããçé '%2$s' ããããããããã %1$s ãéãããã"
 
 #: ../objects/custom_lines/custom_lines.c:160
 msgid "CustomLines"
@@ -5774,22 +5927,22 @@ msgstr "CustomLines"
 
 #: ../objects/custom_lines/custom_lines.c:160
 msgid "Custom XML lines loader"
-msgstr "ãããã XML ããããããã"
+msgstr "ãããã XML ãããããããã"
 
-#: ../objects/custom_lines/custom_linetypes.c:226
+#: ../objects/custom_lines/custom_linetypes.c:227
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
 msgstr ""
 "INTERNAL: CustomLines: LineInfo ãããããããäãããçãçéãééãããã"
 "ã"
 
-#: ../objects/custom_lines/custom_linetypes.c:251
+#: ../objects/custom_lines/custom_linetypes.c:252
 #, c-format
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object %s."
 msgstr ""
 "INTERNAL: CustomLines: LineInfo ãããããã (%s) ãäãããçãçéãééã"
 "ãããã"
 
-#: ../objects/custom/shape_info.c:162
+#: ../objects/custom/shape_info.c:165
 #, c-format
 msgid ""
 "The file '%s' has invalid path data.\n"
@@ -5802,68 +5955,68 @@ msgstr ""
 msgid "Flowchart objects"
 msgstr "ãããããããããããããã"
 
-#: ../objects/flowchart/parallelogram.c:154
+#: ../objects/flowchart/parallelogram.c:156
 msgid "Shear angle"
 msgstr "ããããèå"
 
 #: ../objects/network/basestation.c:137
 msgid "Sectors"
-msgstr "ããã"
+msgstr "ãããã"
 
 #: ../objects/network/basestation.c:401 ../objects/network/basestation.c:403
 msgid "Base Station"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../objects/network/network.c:43
 msgid "Network diagram objects"
-msgstr "ãããããããããããããããããããã"
+msgstr "ããããããããããããããããããã"
 
 #: ../objects/network/radiocell.c:121
 msgid "Radius"
 msgstr "åå"
 
-#: ../objects/network/wanlink.c:119
+#: ../objects/network/wanlink.c:120
 msgid "Width"
 msgstr "å"
 
-#: ../objects/standard/arc.c:142
+#: ../objects/standard/arc.c:145
 msgid "Curve distance"
 msgstr "æçãéã"
 
-#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
-#: ../objects/standard/polyline.c:137
+#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:145
+#: ../objects/standard/polyline.c:141
 msgid "Line gaps"
 msgstr "ãã (gap)"
 
-#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:139
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:147
+#: ../objects/standard/polyline.c:143
 msgid "Absolute start gap"
 msgstr "åçãçåå"
 
-#: ../objects/standard/bezier.c:143 ../objects/standard/line.c:147
-#: ../objects/standard/polyline.c:141
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:149
+#: ../objects/standard/polyline.c:145
 msgid "Absolute end gap"
 msgstr "ççãçåå"
 
-#: ../objects/standard/bezier.c:731 ../objects/standard/beziergon.c:495
+#: ../objects/standard/bezier.c:755 ../objects/standard/beziergon.c:507
 msgid "Add Segment"
 msgstr "ããããããèå"
 
-#: ../objects/standard/bezier.c:732 ../objects/standard/beziergon.c:496
+#: ../objects/standard/bezier.c:756 ../objects/standard/beziergon.c:508
 msgid "Delete Segment"
 msgstr "ããããããåé"
 
-#: ../objects/standard/bezier.c:734 ../objects/standard/beziergon.c:498
+#: ../objects/standard/bezier.c:758 ../objects/standard/beziergon.c:510
 msgid "Symmetric control"
 msgstr "åçãããããã"
 
-#: ../objects/standard/bezier.c:736 ../objects/standard/beziergon.c:500
+#: ../objects/standard/bezier.c:760 ../objects/standard/beziergon.c:512
 msgid "Smooth control"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
-#: ../objects/standard/bezier.c:738 ../objects/standard/beziergon.c:502
+#: ../objects/standard/bezier.c:762 ../objects/standard/beziergon.c:514
 msgid "Cusp control"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../objects/standard/box.c:139 ../objects/standard/ellipse.c:133
 msgid "Free"
@@ -5881,56 +6034,83 @@ msgstr "ææå"
 msgid "Aspect ratio"
 msgstr "ãããããæ"
 
-#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:670
+#: ../objects/standard/box.c:695 ../objects/standard/ellipse.c:673
 msgid "Free aspect"
 msgstr "èçãããããã"
 
-#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:672
+#: ../objects/standard/box.c:697 ../objects/standard/ellipse.c:675
 msgid "Fixed aspect"
 msgstr "ååããããã"
 
-#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:674
+#: ../objects/standard/ellipse.c:135 ../objects/standard/ellipse.c:677
 msgid "Circle"
 msgstr "å"
 
-#: ../objects/standard/image.c:139
+#: ../objects/standard/image.c:144
 msgid "Image file"
 msgstr "çåãããã"
 
-#: ../objects/standard/image.c:141
+#: ../objects/standard/image.c:146
+#, fuzzy
+#| msgid "Time data"
+msgid "Inline data"
+msgstr "æéããã"
+
+#: ../objects/standard/image.c:146
+msgid "Store image data in diagram"
+msgstr ""
+
+#: ../objects/standard/image.c:148
+msgid "Pixbuf"
+msgstr ""
+
+#: ../objects/standard/image.c:148
+#, fuzzy
+#| msgid "Preferences"
+msgid "The Pixbuf reference"
+msgstr "ããããããèå"
+
+#: ../objects/standard/image.c:150
 msgid "Draw border"
 msgstr "åççãèç"
 
-#: ../objects/standard/image.c:143
+#: ../objects/standard/image.c:152
 msgid "Keep aspect ratio"
 msgstr "ãããããæãäæ"
 
+#: ../objects/standard/image.c:671
+msgid "Inconsistent pixbuf during image save."
+msgstr ""
+
 #. Found file in same dir as diagram.
 #. Found file in current dir.
-#: ../objects/standard/image.c:697 ../objects/standard/image.c:708
-#, c-format
+#: ../objects/standard/image.c:768 ../objects/standard/image.c:779
+#, fuzzy, c-format
+#| msgid ""
+#| "The image file '%s' was not found in that directory.\n"
+#| "Using the file '%s' instead\n"
 msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
+"The image file '%s' was not found in the specified directory.\n"
+"Using the file '%s' instead.\n"
 msgstr ""
-"çåãããã '%s' ãããããããããããããããã\n"
+"çåãããã '%s' ããããããããããããããããã\n"
 "(äããããããã '%s' ãäããã)\n"
 
 #. Didn't find file in current dir.
-#: ../objects/standard/image.c:714 ../objects/standard/image.c:736
+#: ../objects/standard/image.c:785 ../objects/standard/image.c:807
 #, c-format
 msgid "The image file '%s' was not found.\n"
 msgstr "çåãããã '%s' ããããããããã\n"
 
-#: ../objects/standard/line.c:134
+#: ../objects/standard/line.c:136
 msgid "Arrows"
 msgstr "çå"
 
-#: ../objects/standard/line.c:139
+#: ../objects/standard/line.c:141
 msgid "Start point"
 msgstr "éåç"
 
-#: ../objects/standard/line.c:141
+#: ../objects/standard/line.c:143
 msgid "End point"
 msgstr "çäç"
 
@@ -5942,11 +6122,11 @@ msgstr "æåå"
 msgid "Angle to rotate the outline"
 msgstr "ãããããããåèèãã"
 
-#: ../objects/standard/polygon.c:462 ../objects/standard/polyline.c:616
+#: ../objects/standard/polygon.c:473 ../objects/standard/polyline.c:638
 msgid "Add Corner"
 msgstr "åéãèå"
 
-#: ../objects/standard/polygon.c:463 ../objects/standard/polyline.c:617
+#: ../objects/standard/polygon.c:474 ../objects/standard/polyline.c:639
 msgid "Delete Corner"
 msgstr "åéãåé"
 
@@ -5962,84 +6142,98 @@ msgstr "ããããç"
 msgid "Vertical text alignment"
 msgstr "åçæåãäç"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:263
-#: ../plug-ins/cairo/diacairo-interactive.c:264
+#: ../plug-ins/cairo/diacairo-interactive.c:377
+#: ../plug-ins/cairo/diacairo-interactive.c:378
 msgid "Zoom pointer"
-msgstr "ãããããããã"
+msgstr "ãããããããã"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:270
-#: ../plug-ins/cairo/diacairo-interactive.c:271
+#: ../plug-ins/cairo/diacairo-interactive.c:384
+#: ../plug-ins/cairo/diacairo-interactive.c:385
 msgid "Visible rect pointer"
-msgstr "Rect ãããããèçãã"
+msgstr "Rect ããããããèçãã"
+
+#: ../plug-ins/cairo/diacairo-renderer.c:834
+#: ../plug-ins/cairo/diacairo-renderer.c:869 ../plug-ins/cgm/cgm.c:1125
+#: ../plug-ins/libart/dialibartrenderer.c:1325
+#: ../plug-ins/metapost/render_metapost.c:1110
+#: ../plug-ins/postscript/diapsrenderer.c:719
+#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:891
+msgid "Not enough memory for image drawing."
+msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:129
-#, c-format
+#: ../plug-ins/cairo/diacairo.c:133
+#, fuzzy, c-format
+#| msgid ""
+#| "Can't convert output filename '%s' to locale encoding.\n"
+#| "Please choose a different name to save with cairo.\n"
 msgid ""
 "Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with cairo.\n"
+"Please choose a different name to save with Cairo.\n"
 msgstr ""
 "ååãããããåå ('%s') ãããããããããããããããããããã\n"
 "åãååãéæããããäåããããããã\n"
 
-#: ../plug-ins/cairo/diacairo.c:256 ../plug-ins/cairo/diacairo.c:272
+#: ../plug-ins/cairo/diacairo.c:305 ../plug-ins/cairo/diacairo.c:321
 #, c-format
 msgid "Can't write %d bytes to %s"
 msgstr "%d ãããã %s ãæãèãããã"
 
-#: ../plug-ins/cairo/diacairo.c:285
+#: ../plug-ins/cairo/diacairo.c:334
 msgid "Clipboard copy failed"
 msgstr "ãããããããããããããåæãããã"
 
-#: ../plug-ins/cairo/diacairo.c:311 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1388
+#: ../plug-ins/cairo/diacairo.c:359 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1488
 msgid "Nothing to print"
 msgstr "ååãããããããããã"
 
-#: ../plug-ins/cairo/diacairo.c:322
-msgid "Printing with Gtk+(cairo) requires at least version 2.10."
-msgstr "Cairo ãäããååãã GTK+ ãããããã 2.10 ääãåèããã"
-
-#: ../plug-ins/cairo/diacairo.c:329
+#: ../plug-ins/cairo/diacairo.c:374
 msgid "Cairo PostScript"
-msgstr "Cairo ãããããããã"
+msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:340
+#: ../plug-ins/cairo/diacairo.c:385
 msgid "Cairo Portable Document Format"
 msgstr "Cairo PDF"
 
-#: ../plug-ins/cairo/diacairo.c:355
+#: ../plug-ins/cairo/diacairo.c:397
 msgid "Cairo Scalable Vector Graphics"
-msgstr "Cairo ãããããããããããããããããã"
+msgstr "Cairo ããããããããããããããããã"
+
+#: ../plug-ins/cairo/diacairo.c:409
+#, fuzzy
+#| msgid "Cairo PostScript"
+msgid "CairoScript"
+msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:366
+#: ../plug-ins/cairo/diacairo.c:420
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:374
+#: ../plug-ins/cairo/diacairo.c:428
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (Îãããããäã)"
 
-#: ../plug-ins/cairo/diacairo.c:384
+#: ../plug-ins/cairo/diacairo.c:438
 msgid "Cairo EMF"
 msgstr "Cairo EMF"
 
-#: ../plug-ins/cairo/diacairo.c:394
+#: ../plug-ins/cairo/diacairo.c:448
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:416
+#: ../plug-ins/cairo/diacairo.c:472
 msgid "Copy _Diagram"
-msgstr "ãããããããããã(_C)"
+msgstr "ãããããããããã(_D)"
 
-#: ../plug-ins/cairo/diacairo.c:426
-msgid "Print (GTK) ..."
-msgstr "åå (GTK+) ..."
+#: ../plug-ins/cairo/diacairo.c:481
+msgid "Print (GTK) â"
+msgstr "åå (GTK) â"
 
-#: ../plug-ins/cairo/diacairo.c:471
-msgid "Cairo based Rendering"
+#: ../plug-ins/cairo/diacairo.c:528
+msgid "Cairo-based Rendering"
 msgstr "Cairo ãããããããããã"
 
-#: ../plug-ins/cgm/cgm.c:1106
+#: ../plug-ins/cgm/cgm.c:1118
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -6047,39 +6241,44 @@ msgstr ""
 "çåãèãéãããããæåæãèããããã\n"
 "(çåã CGM ãããããããããããã)"
 
-#: ../plug-ins/cgm/cgm.c:1361
+#: ../plug-ins/cgm/cgm.c:1378
 msgid "Computer Graphics Metafile"
 msgstr "Computer Graphics ãããããã"
 
-#: ../plug-ins/cgm/cgm.c:1386
+#: ../plug-ins/cgm/cgm.c:1403
 msgid "Computer Graphics Metafile export filter"
-msgstr "Computer Graphics ãããããããããããããçãããã"
+msgstr "Computer Graphics ãããããããããããããçããããã"
+
+#: ../plug-ins/drs/dia-render-script-import.c:225
+msgid "Broken file?"
+msgstr ""
 
-#: ../plug-ins/drs/dia-render-script.c:153
+#: ../plug-ins/drs/dia-render-script.c:156
+#: ../plug-ins/drs/dia-render-script.c:161
 msgid "DiaRenderScript"
 msgstr "DiaRenderScript"
 
-#: ../plug-ins/drs/dia-render-script.c:164
+#: ../plug-ins/drs/dia-render-script.c:185
 msgid "DiaRenderScript filter"
-msgstr "DiaRenderScript ããããã"
+msgstr "DiaRenderScript ãããããã"
 
-#: ../plug-ins/dxf/dxf-export.c:598 ../plug-ins/dxf/dxf-import.c:1402
+#: ../plug-ins/dxf/dxf-export.c:653 ../plug-ins/dxf/dxf-import.c:1390
 msgid "Drawing Interchange File"
 msgstr "Drawing Interchange ãããã"
 
-#: ../plug-ins/dxf/dxf-import.c:1319
+#: ../plug-ins/dxf/dxf-import.c:1300
 #, c-format
 msgid "read_dxf_codes failed on '%s'\n"
 msgstr "'%s' ã read_dxf_codes ãåæãããã\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1326
+#: ../plug-ins/dxf/dxf-import.c:1307
 #, c-format
 msgid "Binary DXF from '%s' not supported\n"
 msgstr "'%s' ããããããã DXF ããããããããããã\n"
 
 #: ../plug-ins/dxf/dxf.c:50
 msgid "Drawing Interchange File import and export filters"
-msgstr "Drawing Interchange ãããããããããããããããããçãããã"
+msgstr "Drawing Interchange ãããããããããããããããããçããããã"
 
 #: ../plug-ins/hpgl/hpgl.c:751
 msgid "HP Graphics Language"
@@ -6087,87 +6286,133 @@ msgstr "HP Graphics Language"
 
 #: ../plug-ins/hpgl/hpgl.c:776
 msgid "HP Graphics Language export filter"
-msgstr "HP Graphics Language ãããããããçãããã"
+msgstr "HP Graphics Language ãããããããçããããã"
+
+#: ../plug-ins/layout/layout.cpp:211
+msgid "Please select edges and nodes to layout."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:219
+#, fuzzy
+#| msgid "'%s' creation failed"
+msgid "Graph creation failed"
+msgstr "'%s' ãçæãåæãããã"
+
+#: ../plug-ins/layout/layout.cpp:245
+msgid "No such module."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:246
+msgid "Out of memory."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:247
+msgid "Not a tree."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:248
+msgid "Not a forest."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:249
+msgid "Failed algorithm."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:250
+#, fuzzy
+#| msgid "Air conditioner"
+msgid "Failed precondition."
+msgstr "ãããã"
+
+#: ../plug-ins/layout/layout.cpp:251
+msgid "OGDF crashed."
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:252
+#, fuzzy
+#| msgid "unknown arrow"
+msgid "Unknown reason"
+msgstr "äæãçå"
+
+#: ../plug-ins/layout/layout.cpp:254
+#, c-format
+msgid ""
+"Layout '%s' failed.\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/layout/layout.cpp:365
+msgid "OGDF Layout Algorithms"
+msgstr ""
 
 #: ../plug-ins/libart/dialibart.c:59
-msgid "Libart based rendering"
+msgid "Libart-based rendering"
 msgstr "Libart ããããæç"
 
-#: ../plug-ins/libart/export_png.c:165
+#: ../plug-ins/libart/export_png.c:167
 msgid "Could not create PNG write structure"
 msgstr "PNG ãååæéäãçæãããããããã"
 
-#: ../plug-ins/libart/export_png.c:174
+#: ../plug-ins/libart/export_png.c:176
 msgid "Could not create PNG header info structure"
-msgstr "PNG ããããæåæéäãçæãããããããã"
+msgstr "PNG ãããããæåæéäãçæãããããããã"
 
-#: ../plug-ins/libart/export_png.c:182
+#: ../plug-ins/libart/export_png.c:184
 msgid "Error occurred while writing PNG"
 msgstr "PNG ãååäãããããèãããã"
 
 #. Create a dialog
-#: ../plug-ins/libart/export_png.c:322
+#: ../plug-ins/libart/export_png.c:327
 msgid "PNG Export Options"
 msgstr "PNG ãããããããããããã"
 
-#: ../plug-ins/libart/export_png.c:328
+#: ../plug-ins/libart/export_png.c:333
 msgid "Image width:"
 msgstr "çåãå:"
 
-#: ../plug-ins/libart/export_png.c:331
+#: ../plug-ins/libart/export_png.c:336
 msgid "Image height:"
 msgstr "çåãéã:"
 
-#: ../plug-ins/libart/export_png.c:377
-msgid "PNG (anti-aliased)"
+#: ../plug-ins/libart/export_png.c:382
+msgid "PNG (antialiased)"
 msgstr "PNG (ããããããããåå)"
 
-#: ../plug-ins/libart/dialibartrenderer.c:295
+#: ../plug-ins/libart/dialibartrenderer.c:304
 msgid "gdk_renderer: Unsupported fill mode specified!\n"
 msgstr "gdk_renderer: æåããåãããããããããããããããããã!\n"
 
 #: ../plug-ins/libart/dialibartrenderer.c:1476
 msgid "Renderer transformation"
-msgstr "ãããããåæ"
+msgstr "ããããããåæ"
 
 #: ../plug-ins/libart/dialibartrenderer.c:1477
 msgid "Transform pointer"
-msgstr "åæãããã"
+msgstr "åæããããã"
 
 #: ../plug-ins/metapost/metapost.c:46
 msgid "TeX Metapost export filter"
-msgstr "TeX Metapost ãããããããçãããã"
+msgstr "TeX Metapost ãããããããçããããã"
 
-#: ../plug-ins/metapost/render_metapost.c:1262
+#: ../plug-ins/metapost/render_metapost.c:1265
 msgid "TeX Metapost macros"
 msgstr "Tex Metapost ããã"
 
 #: ../plug-ins/pgf/pgf.c:26
 msgid "LaTeX PGF export filter"
-msgstr "LaTeX PGF ãããããããçãããã"
+msgstr "LaTeX PGF ãããããããçããããã"
 
 #: ../plug-ins/pgf/render_pgf.c:1112
 #: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF8"
-msgstr "UTF8 ãæããããããã"
+msgid "Not valid UTF-8"
+msgstr "UTF-8 ãæããããããã"
 
-#: ../plug-ins/pgf/render_pgf.c:1277
+#: ../plug-ins/pgf/render_pgf.c:1263
 msgid "LaTeX PGF macros"
 msgstr "LaTex PGF ããã"
 
-#: ../plug-ins/pixbuf/pixbuf.c:93
-#, c-format
-msgid ""
-"Could not save file:\n"
-"%s\n"
-"%s"
-msgstr ""
-"ãããããäåãããããããã:\n"
-"%s\n"
-"%s"
-
 #: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf based bitmap export/import"
+msgid "gdk-pixbuf-based bitmap export/import"
 msgstr "gdk-pixbuf ããããããããããããã/ããããã"
 
 #: ../plug-ins/postscript/paginate_psprint.c:273
@@ -6177,66 +6422,61 @@ msgstr "åååãéæ"
 #: ../plug-ins/postscript/paginate_psprint.c:285
 #: ../sheets/ciscocomputer.sheet.in.h:36
 msgid "Printer"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:1
 msgid "File"
 msgstr "ãããã"
 
-#: ../plug-ins/postscript/paginate_psprint.c:314
-msgid "OK"
-msgstr "OK"
-
-#: ../plug-ins/postscript/paginate_psprint.c:456
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
 msgid "Could not run command '%s': %s"
 msgstr "ãããã \"%s\" ãåèãããããããã: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:459
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "'%s' ãæãèãããããéããããããã: %s"
 
-#: ../plug-ins/postscript/paginate_psprint.c:481
+#: ../plug-ins/postscript/paginate_psprint.c:489
 #, c-format
 msgid "Printing error: command '%s' returned %d\n"
 msgstr "ååããã: ãããã \"%s\" ã %d ãèãããã\n"
 
-#: ../plug-ins/postscript/paginate_psprint.c:492
+#: ../plug-ins/postscript/paginate_psprint.c:500
 #, c-format
 msgid "Printing error: command '%s' caused sigpipe."
 msgstr "ååããã: ãããã '%s' ã SIGPIPE (Broken PIPE) ãççãããã"
 
 #: ../plug-ins/postscript/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
-msgstr "Encapsulated ãããããããã (Pango ããããäç)"
+msgid "Encapsulated PostScript (using Pango fonts)"
+msgstr "Encapsulated PostScript (Pango ããããäç)"
 
 #: ../plug-ins/postscript/render_eps.c:159
 msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr "ãããããäã Encapsulated ãããããããã (Pango ããããäç)"
+msgstr "ãããããäã Encapsulated PostScript (Pango ããããäç)"
 
 #: ../plug-ins/postscript/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-msgstr ""
-"Encapsulated ãããããããã (ããããããããã Latin-1 ããããäç)"
+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+msgstr "Encapsulated PostScript (PostScript ã Latin-1 ããããäç)"
 
-#: ../plug-ins/postscript/postscript.c:46
+#: ../plug-ins/postscript/postscript.c:47
 msgid "Print (PS)"
 msgstr "åå (PS)"
 
-#: ../plug-ins/postscript/postscript.c:70
-msgid "Postscript Rendering"
-msgstr "Postscript ãæç"
+#: ../plug-ins/postscript/postscript.c:71
+msgid "PostScript Rendering"
+msgstr "PostScript ãæç"
 
 #: ../plug-ins/pstricks/pstricks.c:26
-msgid "TeX Pstricks export filter"
-msgstr "TeX Pstricks ãããããããçãããã"
+msgid "TeX PSTricks export filter"
+msgstr "TeX PSTricks ãããããããçããããã"
 
-#: ../plug-ins/pstricks/render_pstricks.c:987
+#: ../plug-ins/pstricks/render_pstricks.c:990
 msgid "TeX PSTricks macros"
 msgstr "Tex PSTricks ããã"
 
-#: ../plug-ins/python/pydia-render.c:779
+#: ../plug-ins/python/pydia-render.c:933
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "'%s' ãæãèãããããéããããããã\n"
@@ -6245,25 +6485,27 @@ msgstr "'%s' ãæãèãããããéããããããã\n"
 msgid "Python scripting support"
 msgstr "Python ãããããããããã"
 
-#: ../plug-ins/shape/shape-export.c:474
+#: ../plug-ins/shape/shape-export.c:480
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr ""
-"ããããããããããæååã .shape ãããããããã Dia ãèãèãããããã"
-"ããããããã"
+"ãããããããããæååã .shape ãããããããã Dia ãèãèããããããã"
+"ãããããã"
 
-#: ../plug-ins/shape/shape-export.c:485
-msgid "Can't export png without libart!"
-msgstr "libartããã PNG ããããããããããããï"
+#: ../plug-ins/shape/shape-export.c:494
+#, fuzzy
+#| msgid "Can't export png without libart!"
+msgid "Can't export PNG icon without export plugin!"
+msgstr "libartããã PNG ããããããããããããï"
 
-#: ../plug-ins/shape/shape-export.c:510
+#: ../plug-ins/shape/shape-export.c:518
 msgid "Dia Shape File"
-msgstr "Dia ããããããããã"
+msgstr "Dia ãããããããã"
 
 #: ../plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
-msgstr "Dia ãããããããããããçãããã"
+msgid "Dia shape export filter"
+msgstr "Dia ãããããããããããçããããã"
 
-#: ../plug-ins/svg/svg-import.c:258
+#: ../plug-ins/svg/svg-import.c:322
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -6271,71 +6513,56 @@ msgstr ""
 "ãããééãããããã\n"
 "svg:path ãããã moveto ãåããããããã"
 
-#: ../plug-ins/svg/svg-import.c:806
+#: ../plug-ins/svg/svg-import.c:1120
 msgid "Expected SVG Namespace not found in file"
 msgstr "ãããããäã SVG ååçéããããããããã"
 
-#: ../plug-ins/svg/svg-import.c:826
+#: ../plug-ins/svg/svg-import.c:1140
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "ããããèçã '%s' ããã -- 'svg' ããããããã."
 
 #: ../plug-ins/svg/svg.c:50
 msgid "Scalable Vector Graphics import and export filters"
-msgstr "SVG ãããããã/ããããããçãããã"
+msgstr "SVG ãããããã/ããããããçããããã"
 
-#: ../plug-ins/vdx/vdx-export.c:1376 ../plug-ins/vdx/vdx-export.c:1385
-#, c-format
-msgid "Couldn't read file %s"
-msgstr "ãããã %s ãèãèããããããã"
-
-#: ../plug-ins/vdx/vdx-export.c:1905
+#: ../plug-ins/vdx/vdx-export.c:1863
 msgid "Visio XML format"
 msgstr "Visio ã XML åå"
 
-#: ../plug-ins/vdx/vdx-import.c:226 ../plug-ins/xfig/xfig-import.c:1046
+#: ../plug-ins/vdx/vdx-import.c:223 ../plug-ins/xfig/xfig-import.c:1049
 #, c-format
 msgid "Couldn't read color: %s\n"
 msgstr "èãèãèããããããã: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:540
+#: ../plug-ins/vdx/vdx-import.c:536
 #, c-format
 msgid "Couldn't find shape %d\n"
 msgstr "åå %d ãèããããããããã\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1046
+#: ../plug-ins/vdx/vdx-import.c:1011
 #, c-format
 msgid "Unexpected Ellipse object: %s\n"
 msgstr "æååã Ellipse ãããããã: %s\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1060
+#: ../plug-ins/vdx/vdx-import.c:1025
 msgid "Can't rotate ellipse\n"
 msgstr "ellipse ãåèããããã              \n"
 
-#: ../plug-ins/vdx/vdx-import.c:1391
+#: ../plug-ins/vdx/vdx-import.c:1356
 msgid "MoveTo not at start of Bezier\n"
 msgstr "MoveTo not at start of Bezier\n"
 
-#: ../plug-ins/vdx/vdx-import.c:1739
+#: ../plug-ins/vdx/vdx-import.c:1706
 msgid "Invalid NURBS formula"
 msgstr "ééãã NURBS å"
 
-#: ../plug-ins/vdx/vdx-import.c:1983
-#, c-format
-msgid "Couldn't write file %s"
-msgstr "ãããã %s ãæãèããããããã"
-
-#: ../plug-ins/vdx/vdx-import.c:2068 ../plug-ins/vdx/vdx-import.c:2081
+#: ../plug-ins/vdx/vdx-import.c:1964
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "åéããããããã %s ãæãããããããããããã"
 
-#: ../plug-ins/vdx/vdx-import.c:2109
-#, c-format
-msgid "Couldn't make object dir %s"
-msgstr "ããããããããããããã %s ãäæãããããããã"
-
-#: ../plug-ins/vdx/vdx-import.c:3090
+#: ../plug-ins/vdx/vdx-import.c:2971
 msgid "Visio XML File Format"
 msgstr "Visio XFIG ããããåå"
 
@@ -6344,322 +6571,326 @@ msgstr "Visio XFIG ããããåå"
 msgid "Can't decode object %s"
 msgstr "ãããããã %s ãèæããããã"
 
-#: ../plug-ins/vdx/vdx-xml.c:5125
+#: ../plug-ins/vdx/vdx-xml.c:5187
 #, c-format
 msgid "Can't write object %u"
 msgstr "ãããããã %u ãæãèãããã"
 
 #: ../plug-ins/vdx/vdx.c:53
 msgid "Visio XML Format import and export filter"
-msgstr "Visio XML ååãããããã/ããããããçãããã"
+msgstr "Visio XML ååãããããã/ããããããçããããã"
+
+#: ../plug-ins/wmf/wmf.cpp:309
+#, c-format
+msgid ""
+"Couldn't write file %s\n"
+"%s"
+msgstr ""
+"ãããã %s ãæãèããããããã\n"
+"%s"
 
-#: ../plug-ins/wmf/wmf.cpp:506
+#: ../plug-ins/wmf/wmf.cpp:558
 #, c-format
 msgid ""
-"Can not render unknown font:\n"
+"Cannot render unknown font:\n"
 "%s"
 msgstr ""
 "äæããããããæçããããã:\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1265
+#: ../plug-ins/wmf/wmf.cpp:1365
 #, c-format
 msgid "Couldn't open: '%s' for writing.\n"
 msgstr "'%s' ãæãèãããããéããããããã\n"
 
-#: ../plug-ins/wmf/wmf.cpp:1364
-msgid "Windows Meta File"
-msgstr "Windows ããããããã"
-
-#: ../plug-ins/wmf/wmf.cpp:1373
-msgid "Enhanced Meta File"
-msgstr "æåããããããã"
-
-#: ../plug-ins/wmf/wmf.cpp:1395
+#: ../plug-ins/wmf/wmf.cpp:1496
 msgid "Print (GDI) ..."
 msgstr "åå (GDI) ..."
 
-#: ../plug-ins/wmf/wmf.cpp:1410
+#: ../plug-ins/wmf/wmf.cpp:1511
 msgid "WMF export filter"
-msgstr "WMF ãããããããçãããã"
+msgstr "WMF ãããããããçããããã"
 
-#: ../plug-ins/wpg/wpg.c:1190
+#: ../plug-ins/wpg/wpg.c:1194
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "ãããã: %s ãçé/ãããããããããããããããã\n"
 
-#: ../plug-ins/wpg/wpg.c:1321 ../plug-ins/wpg/wpg.c:1328
+#: ../plug-ins/wpg/wpg.c:1325 ../plug-ins/wpg/wpg.c:1332
 msgid "WPG"
 msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1356
+#: ../plug-ins/wpg/wpg.c:1360
 msgid "WordPerfect Graphics export filter"
-msgstr "WordPerfect Graphics ãããããããçãããã"
+msgstr "WordPerfect Graphics ãããããããçããããã"
 
-#: ../plug-ins/xfig/xfig-export.c:461
+#: ../plug-ins/xfig/xfig-export.c:464
 #, c-format
-msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
+msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
 msgstr ""
-"FIG ããããããããçåãããã %s ãåçããããããããã (ææãçåãä"
+"Fig ããããããããçåãããã %s ãåçããããããããã (ææãçåãä"
 "çããã)\n"
 
-#: ../plug-ins/xfig/xfig-export.c:484
+#: ../plug-ins/xfig/xfig-export.c:487
 msgid "No more user-definable colors - using black"
-msgstr "ããääããããåçãããèããããããäããéãäçããã"
+msgstr "ããääãããããåçãããèããããããäããéãäçããã"
 
-#: ../plug-ins/xfig/xfig-export.c:1205
-msgid "XFig format"
-msgstr "XFIG åå"
+#: ../plug-ins/xfig/xfig-export.c:1211
+msgid "Xfig format"
+msgstr "Xfig åå"
 
 #: ../plug-ins/xfig/xfig-import.c:111
 #, c-format
-msgid "Color index %d too high, only 512 colors allowed. Using black instead."
+msgid "Color index %d too high; only 512 colors allowed. Using black instead."
 msgstr "%d èãåéãããã ( 512èããåèãã)ãäããéãäçããã"
 
-#: ../plug-ins/xfig/xfig-import.c:138
+#: ../plug-ins/xfig/xfig-import.c:141
 msgid "Patterns are not supported by Dia"
 msgstr "Dia ããããããããããããããããã"
 
-#: ../plug-ins/xfig/xfig-import.c:166
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
+#: ../plug-ins/xfig/xfig-import.c:169
+msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
 msgstr "Dia ããäçéçããããããããããã (äééçãäçããã)"
 
-#: ../plug-ins/xfig/xfig-import.c:170
+#: ../plug-ins/xfig/xfig-import.c:173
 #, c-format
 msgid "Line style %d should not appear\n"
 msgstr "çãããã %d ãåçããããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:238
+#: ../plug-ins/xfig/xfig-import.c:241
 #, c-format
 msgid "Error while reading %dth of %d points: %s\n"
 msgstr "%2$d ã %1$d ççãèãèãéãããããççãããã: %3$s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:266
+#: ../plug-ins/xfig/xfig-import.c:269
 msgid "Error while reading arrowhead\n"
 msgstr "çåãèãèãéãããããççãããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:288
+#: ../plug-ins/xfig/xfig-import.c:291
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "çåãçé %d ãèèããããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:379
+#: ../plug-ins/xfig/xfig-import.c:382
 #, c-format
 msgid "Depth %d of of range, only 0-%d allowed.\n"
 msgstr "æã %d ãäéãèããããã ( 0ã%d ããåèãã)\n"
 
-#: ../plug-ins/xfig/xfig-import.c:426
+#: ../plug-ins/xfig/xfig-import.c:429
 #, c-format
 msgid "Couldn't read ellipse info: %s\n"
 msgstr "æåãæåãèãèããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:494
+#: ../plug-ins/xfig/xfig-import.c:497
 #, c-format
 msgid "Couldn't read polyline info: %s\n"
 msgstr "éççãæåãèãèããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:509
+#: ../plug-ins/xfig/xfig-import.c:512
 #, c-format
 msgid "Couldn't read flipped bit: %s\n"
 msgstr "åèããããèãèããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:527
-msgid "Negative corner radius, negating"
+#: ../plug-ins/xfig/xfig-import.c:530
+msgid "Negative corner radius; negating"
 msgstr "ããããèãååãæãæããã"
 
-#: ../plug-ins/xfig/xfig-import.c:570
+#: ../plug-ins/xfig/xfig-import.c:573
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "äæãéççãããããããã: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:720 ../plug-ins/xfig/xfig-import.c:752
+#: ../plug-ins/xfig/xfig-import.c:723 ../plug-ins/xfig/xfig-import.c:755
 #, c-format
 msgid "Couldn't read spline info: %s\n"
 msgstr "éççãæåãèãèããããããã: %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:742 ../plug-ins/xfig/xfig-import.c:760
 msgid "Cannot convert approximated spline yet."
 msgstr "èäããããããåæããããã"
 
-#: ../plug-ins/xfig/xfig-import.c:795
+#: ../plug-ins/xfig/xfig-import.c:798
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "äæãéççãããããããã: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:860
+#: ../plug-ins/xfig/xfig-import.c:863
 #, c-format
 msgid "Couldn't read arc info: %s\n"
 msgstr "ååãæåãèãèããããããã: %s\n"
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:889
+#: ../plug-ins/xfig/xfig-import.c:892
 msgid "Filled arc treated as unfilled"
-msgstr "åãããããååã unfiled ãããæããã"
+msgstr "åãããããååã unfilled ãããæããã"
 
-#: ../plug-ins/xfig/xfig-import.c:893
+#: ../plug-ins/xfig/xfig-import.c:896
 #, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "äæãéççãååãã: %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:957
+#: ../plug-ins/xfig/xfig-import.c:960
 #, c-format
 msgid "Couldn't read text info: %s\n"
 msgstr "ãããããæåãèãèããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1019
+#: ../plug-ins/xfig/xfig-import.c:1022
 #, c-format
-msgid "Couldn't identify FIG object: %s\n"
-msgstr "FIG ãããããããèåãããããããã: %s\n"
+msgid "Couldn't identify Fig object: %s\n"
+msgstr "Fig ãããããããèåãããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1027
+#: ../plug-ins/xfig/xfig-import.c:1030
 msgid "Compound end outside compound\n"
 msgstr "Compound end outside compound\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1051
+#: ../plug-ins/xfig/xfig-import.c:1054
 #, c-format
 msgid "Color number %d out of range 0..%d.  Discarding color.\n"
 msgstr ""
 "èçå %d ãäéãèãããããã (æåçåã 0ã%d)ãåããçåãèãããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1097
+#: ../plug-ins/xfig/xfig-import.c:1101
 #, c-format
 msgid "Couldn't read group extend: %s\n"
 msgstr "ããããæåãèãèããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1108
+#: ../plug-ins/xfig/xfig-import.c:1112
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "ãããããããçé %d ãèèããããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
+#: ../plug-ins/xfig/xfig-import.c:1136
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "'%s' ã `%s' ãããã `%s' ããããããããããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1142
+#: ../plug-ins/xfig/xfig-import.c:1146
 #, c-format
 msgid "Error reading paper size: %s\n"
 msgstr "ççãããããèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1153
+#: ../plug-ins/xfig/xfig-import.c:1157
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "ççãããã '%s' ãèèããããã (ããããããäçããã)\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
+#: ../plug-ins/xfig/xfig-import.c:1169
 #, c-format
 msgid "Error reading paper orientation: %s\n"
 msgstr "ççãåããèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
+#: ../plug-ins/xfig/xfig-import.c:1179
 #, c-format
 msgid "Error reading justification: %s\n"
 msgstr "éçãèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1185
+#: ../plug-ins/xfig/xfig-import.c:1189
 #, c-format
 msgid "Error reading units: %s\n"
 msgstr "åäãèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1201
+#: ../plug-ins/xfig/xfig-import.c:1205
 #, c-format
 msgid "Error reading magnification: %s\n"
 msgstr "åçãèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1214
+#: ../plug-ins/xfig/xfig-import.c:1218
 #, c-format
 msgid "Error reading multipage indicator: %s\n"
 msgstr "èæãããèååãèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1225
+#: ../plug-ins/xfig/xfig-import.c:1229
 #, c-format
 msgid "Error reading transparent color: %s\n"
 msgstr "éæèãèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1234 ../plug-ins/xfig/xfig-import.c:1290
-#: ../plug-ins/xfig/xfig-import.c:1308
+#: ../plug-ins/xfig/xfig-import.c:1238 ../plug-ins/xfig/xfig-import.c:1296
+#: ../plug-ins/xfig/xfig-import.c:1314
 #, c-format
-msgid "Error reading FIG file: %s\n"
-msgstr "FIG ãããããèãèãéãããããççãããã: %s\n"
+msgid "Error reading Fig file: %s\n"
+msgstr "Fig ãããããèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1236 ../plug-ins/xfig/xfig-import.c:1292
-msgid "Premature end of FIG file\n"
-msgstr "FIG ãããããççãæãããã\n"
+#: ../plug-ins/xfig/xfig-import.c:1240 ../plug-ins/xfig/xfig-import.c:1298
+msgid "Premature end of Fig file\n"
+msgstr "Fig ãããããççãæãããã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1245
+#: ../plug-ins/xfig/xfig-import.c:1249
 #, c-format
 msgid "Error reading resolution: %s\n"
 msgstr "èååãèãèãéãããããççãããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1277
+#: ../plug-ins/xfig/xfig-import.c:1283
 #, c-format
 msgid "Doesn't look like a Fig file: %s\n"
 msgstr "FIG ãããããããããããã: %s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1283
-#, c-format
-msgid "This is a FIG version %d.%d file, I may not understand it\n"
+#: ../plug-ins/xfig/xfig-import.c:1289
+#, fuzzy, c-format
+#| msgid "This is a FIG version %d.%d file, I may not understand it\n"
+msgid "This is a Fig version %d.%d file. It may not be importable.\n"
 msgstr ""
 "ããã FIG ããããã %d.%d ããããããã (èèããããããããããã)\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1331
-msgid "XFig File Format"
-msgstr "XFIG ããããåå"
+#: ../plug-ins/xfig/xfig-import.c:1337
+msgid "Xfig File Format"
+msgstr "Xfig ããããåå"
 
 #: ../plug-ins/xfig/xfig.c:51
 msgid "Fig Format import and export filter"
-msgstr "FIG ååãããããã/ããããããçãããã"
+msgstr "FIG ååãããããã/ããããããçããããã"
 
-#: ../plug-ins/xslt/xslt.c:108
+#: ../plug-ins/xslt/xslt.c:110
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "%s ãèæããéãããããççãããã\n"
 
-#: ../plug-ins/xslt/xslt.c:117
+#: ../plug-ins/xslt/xslt.c:119
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "ããããããã %s ãèæããéãããããççãããã\n"
 
-#: ../plug-ins/xslt/xslt.c:124
+#: ../plug-ins/xslt/xslt.c:126
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "ããããããããéçããéãããããççãããã: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:133
+#: ../plug-ins/xslt/xslt.c:135
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "ããããããããèæããéãããããççãããã: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:142
+#: ../plug-ins/xslt/xslt.c:144
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "ããããããããéçããéãããããççãããã: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:150
+#: ../plug-ins/xslt/xslt.c:152
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "çæãäåããéãããããççãããã: %s\n"
 
-#: ../plug-ins/xslt/xslt.c:335
+#: ../plug-ins/xslt/xslt.c:336
 msgid "XSL Transformation filter"
-msgstr "XSL åæçãããã"
+msgstr "XSL åæçããããã"
 
-#: ../plug-ins/xslt/xslt.c:362
-msgid "No valid configuration files found for the XSLT plugin, not loading."
+#: ../plug-ins/xslt/xslt.c:363
+#, fuzzy
+#| msgid "No valid configuration files found for the XSLT plugin, not loading."
+msgid "No valid configuration files found for the XSLT plugin; not loading."
 msgstr ""
 "XSLT ããããããéåãèåãããããèãããããããèãèããããããã"
 
-#: ../plug-ins/xslt/xsltdialog.c:97
+#: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
 msgstr "XSLT ãäãããããããã"
 
-#: ../plug-ins/xslt/xsltdialog.c:112
+#: ../plug-ins/xslt/xsltdialog.c:114
 msgid "From:"
 msgstr "åæå:"
 
-#: ../plug-ins/xslt/xsltdialog.c:147
+#: ../plug-ins/xslt/xsltdialog.c:149
 msgid "To:"
 msgstr "åæå:"
 
@@ -6705,7 +6936,7 @@ msgstr "ãããã"
 
 #: ../sheets/AADL.sheet.in.h:13
 msgid "Thread Group"
-msgstr "ããããããããã"
+msgstr "ãããããããã"
 
 #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
 #. Leave as is for now, renaming too much hassle.
@@ -6726,11 +6957,11 @@ msgid "Chevron"
 msgstr "ããããã"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
+msgid "Curved eight-point star"
 msgstr "ããããããããåçæ"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
+msgid "Curved four-point star"
 msgstr "ããããããããåçæ"
 
 #: ../sheets/Assorted.sheet.in.h:10
@@ -6742,15 +6973,15 @@ msgid "Down arrow"
 msgstr "äåããçå"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
+msgid "Eight-point star"
 msgstr "åçæ"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
+msgid "Five-point star"
 msgstr "äçæ"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
+msgid "Four-point star"
 msgstr "åçæ"
 
 #: ../sheets/Assorted.sheet.in.h:15
@@ -6758,11 +6989,11 @@ msgid "Heart"
 msgstr "ããã"
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven sided shape"
+msgid "Heptagon. Seven-point shape"
 msgstr "äèå"
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
+msgid "Hexagon. Six-point shape"
 msgstr "åèå"
 
 #: ../sheets/Assorted.sheet.in.h:18
@@ -6770,7 +7001,7 @@ msgid "Horizontal parallelogram"
 msgstr "åèåèå (æåã)"
 
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isoceles triangle"
+msgid "Isosceles triangle"
 msgstr "äçèäèå"
 
 #: ../sheets/Assorted.sheet.in.h:20
@@ -6802,7 +7033,7 @@ msgid "Notched right arrow"
 msgstr "åãèãåãååããçå"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
+msgid "Octogon. Eight-point shape"
 msgstr "åèå"
 
 #: ../sheets/Assorted.sheet.in.h:28
@@ -6810,7 +7041,7 @@ msgid "Pentagon block arrow"
 msgstr "äèåãçå"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
+msgid "Pentagon. Five-point shape"
 msgstr "äèå"
 
 #: ../sheets/Assorted.sheet.in.h:30
@@ -6842,15 +7073,15 @@ msgid "Right arrow"
 msgstr "ååããçå"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
+msgid "Seven-point star"
 msgstr "äçæ"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
+msgid "Sharp eight-point star"
 msgstr "ãããããåçæ"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
+msgid "Six-point star"
 msgstr "åçæ"
 
 #: ../sheets/Assorted.sheet.in.h:40
@@ -6900,7 +7131,7 @@ msgstr "BPMN"
 
 #: ../sheets/BPMN.sheet.in.h:5
 msgid "Business Process Modeling Notation"
-msgstr "ãããããããããããããããèæ"
+msgstr "ãããããããããããããèæ"
 
 #: ../sheets/BPMN.sheet.in.h:6
 msgid "Collapsed Sub-Process"
@@ -6927,32 +7158,32 @@ msgid "End Event"
 msgstr "End Event"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
-msgstr "End Event - Cancel"
+msgid "End Event â Cancel"
+msgstr "End Event â Cancel"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
-msgstr "End Event - Compensation"
+msgid "End Event â Compensation"
+msgstr "End Event â Compensation"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
-msgstr "End Event - Error"
+msgid "End Event â Error"
+msgstr "End Event â Error"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
-msgstr "End Event - Link"
+msgid "End Event â Link"
+msgstr "End Event â Link"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
-msgstr "End Event - Message"
+msgid "End Event â Message"
+msgstr "End Event â Message"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
-msgstr "End Event - Multiple"
+msgid "End Event â Multiple"
+msgstr "End Event â Multiple"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
-msgstr "End Event - Terminate"
+msgid "End Event â Terminate"
+msgstr "End Event â Terminate"
 
 #: ../sheets/BPMN.sheet.in.h:19
 msgid "Exclusive (XOR) Data Based"
@@ -6979,36 +7210,36 @@ msgid "Intermediate Event"
 msgstr "Intermediate Event"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
-msgstr "Intermediate Event - Cancel"
+msgid "Intermediate Event â Cancel"
+msgstr "Intermediate Event â Cancel"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
-msgstr "Intermediate Event - Compensation"
+msgid "Intermediate Event â Compensation"
+msgstr "Intermediate Event â Compensation"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
-msgstr "Intermediate Event - Error"
+msgid "Intermediate Event â Error"
+msgstr "Intermediate Event â Error"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
-msgstr "Intermediate Event - Link"
+msgid "Intermediate Event â Link"
+msgstr "Intermediate Event â Link"
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
-msgstr "Intermediate Event - Message"
+msgid "Intermediate Event â Message"
+msgstr "Intermediate Event â Message"
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
-msgstr "Intermediate Event - Multiple"
+msgid "Intermediate Event â Multiple"
+msgstr "Intermediate Event â Multiple"
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
-msgstr "Intermediate Event - Rule"
+msgid "Intermediate Event â Rule"
+msgstr "Intermediate Event â Rule"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
-msgstr "Intermediate Event - Timer"
+msgid "Intermediate Event â Timer"
+msgstr "Intermediate Event â Timer"
 
 #: ../sheets/BPMN.sheet.in.h:33
 msgid "Looping Collapsed Sub-Process"
@@ -7031,24 +7262,24 @@ msgid "Start Event"
 msgstr "Start Event"
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
-msgstr "Start Event - Link"
+msgid "Start Event â Link"
+msgstr "Start Event â Link"
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
-msgstr "Start Event - Message"
+msgid "Start Event â Message"
+msgstr "Start Event â Message"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
-msgstr "Start Event - Multiple"
+msgid "Start Event â Multiple"
+msgstr "Start Event â Multiple"
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
-msgstr "Start Event - Rule"
+msgid "Start Event â Rule"
+msgstr "Start Event â Rule"
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
-msgstr "Start Event - Timer"
+msgid "Start Event â Timer"
+msgstr "Start Event â Timer"
 
 #: ../sheets/BPMN.sheet.in.h:44
 msgid "Text Annotation"
@@ -7060,7 +7291,7 @@ msgstr "Transaction"
 
 #: ../sheets/ChemEng.sheet.in.h:1
 msgid "AC Generator"
-msgstr "AC ãããããã"
+msgstr "AC ããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:2
 msgid "Air Cooler"
@@ -7076,7 +7307,7 @@ msgstr "Axial Flow Fan"
 
 #: ../sheets/ChemEng.sheet.in.h:5
 msgid "Basic Filter"
-msgstr "ãããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:6
 msgid "Centrifugal Pump or Fan"
@@ -7101,7 +7332,7 @@ msgstr "ååååããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:12
 msgid "Compressor or Turbine"
-msgstr "ãããããã/ãããã"
+msgstr "ããããããã/ãããã"
 
 #: ../sheets/ChemEng.sheet.in.h:13
 msgid "Covered tank"
@@ -7113,11 +7344,11 @@ msgstr "ããããããããããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:15
 msgid "Double-Pipe Exchanger"
-msgstr "äæãããããäãããããããããã"
+msgstr "äæãããããäããããããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:16
 msgid "Ejector or Injector"
-msgstr "ããããã/ãããããã"
+msgstr "ãããããã/ããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:17
 msgid "Fan or Stirrer"
@@ -7125,7 +7356,7 @@ msgstr "ããã/ããããå"
 
 #: ../sheets/ChemEng.sheet.in.h:18
 msgid "Fixed-Sheet Exchanger"
-msgstr "ãããååãããããããã"
+msgstr "ãããååããããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:19
 msgid "Floating-Head or U-Tube Exchanger"
@@ -7165,7 +7396,7 @@ msgstr "Knock-out Drum (with demister pad)"
 
 #: ../sheets/ChemEng.sheet.in.h:29
 msgid "Mixer"
-msgstr "ããã"
+msgstr "ãããã"
 
 #: ../sheets/ChemEng.sheet.in.h:30
 msgid "Open Tank"
@@ -7173,7 +7404,7 @@ msgstr "ããããéã"
 
 #: ../sheets/ChemEng.sheet.in.h:31
 msgid "Plate Exchanger"
-msgstr "ããããããããããããã"
+msgstr "ããããããããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:32
 msgid "Pneumatic Line"
@@ -7217,11 +7448,11 @@ msgstr "ãããããç"
 
 #: ../sheets/ChemEng.sheet.in.h:42
 msgid "Simple Heat Exchanger"
-msgstr "ããããããããããããããããã"
+msgstr "ããããããããããããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:43
 msgid "Simple Heat Exchanger, vertical"
-msgstr "ããããããããããããããããã (åç)"
+msgstr "ããããããããããããããããã (åç)"
 
 #: ../sheets/ChemEng.sheet.in.h:44
 msgid "Simple Vessel"
@@ -7229,7 +7460,7 @@ msgstr "ãããããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:45
 msgid "Spray Drier"
-msgstr "ããããåãããã"
+msgstr "ããããåããããã"
 
 #: ../sheets/ChemEng.sheet.in.h:46
 msgid "Spraying Device"
@@ -7285,121 +7516,133 @@ msgstr "ãããçå"
 
 #: ../sheets/Circuit.sheet.in.h:4
 msgid "Horizontal jumper"
-msgstr "æåçãããã (æåã)"
+msgstr "æåçããããã (æåã)"
 
 #: ../sheets/Circuit.sheet.in.h:5
+#, fuzzy
+#| msgid "Horizontal rest"
+msgid "Horizontal xtal"
+msgstr "æåããã"
+
+#: ../sheets/Circuit.sheet.in.h:6
 msgid "Horizontally aligned LED"
 msgstr "LED (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:6
+#: ../sheets/Circuit.sheet.in.h:7
 msgid "Horizontally aligned capacitor"
-msgstr "ããããã (æåã)"
+msgstr "ãããããã (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:7
+#: ../sheets/Circuit.sheet.in.h:8
 msgid "Horizontally aligned diode"
 msgstr "ããããã (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:8
+#: ../sheets/Circuit.sheet.in.h:9
 msgid "Horizontally aligned fuse"
 msgstr "ãããã (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:9
+#: ../sheets/Circuit.sheet.in.h:10
 msgid "Horizontally aligned inductor"
-msgstr "ããããã (æåã)"
+msgstr "ãããããã (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:10
+#: ../sheets/Circuit.sheet.in.h:11
 msgid "Horizontally aligned inductor (European)"
-msgstr "ãããããåãããããã (æåã)"
+msgstr "ãããããåããããããã (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
+#: ../sheets/Circuit.sheet.in.h:12
+msgid "Horizontally aligned power source"
 msgstr "éæ (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:12
+#: ../sheets/Circuit.sheet.in.h:13
 msgid "Horizontally aligned resistor"
 msgstr "ææ (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:13
+#: ../sheets/Circuit.sheet.in.h:14
 msgid "Horizontally aligned resistor (European)"
 msgstr "ãããããåãææ (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:14
+#: ../sheets/Circuit.sheet.in.h:15
 msgid "Horizontally aligned zener diode"
 msgstr "åéåããããã (æåã)"
 
-#: ../sheets/Circuit.sheet.in.h:15
+#: ../sheets/Circuit.sheet.in.h:16
 msgid "Lamp"
 msgstr "ããã"
 
-#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
+#: ../sheets/Circuit.sheet.in.h:17 ../sheets/ciscomisc.sheet.in.h:30
 msgid "Microphone"
 msgstr "ããããããã"
 
-#: ../sheets/Circuit.sheet.in.h:17
+#: ../sheets/Circuit.sheet.in.h:18
 msgid "NMOS transistor"
 msgstr "NMOS ãããããã"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:20
+#: ../sheets/Circuit.sheet.in.h:21
 msgid "NPN bipolar transistor"
 msgstr "NPN æåããããããããããã"
 
-#: ../sheets/Circuit.sheet.in.h:21
+#: ../sheets/Circuit.sheet.in.h:22
 msgid "Operational amplifier"
 msgstr "ããããã"
 
-#: ../sheets/Circuit.sheet.in.h:22
+#: ../sheets/Circuit.sheet.in.h:23
 msgid "PMOS transistor"
 msgstr "PMOS ãããããã"
 
 #.
 #.
-#: ../sheets/Circuit.sheet.in.h:25
+#: ../sheets/Circuit.sheet.in.h:26
 msgid "PNP bipolar transistor"
 msgstr "PNP æåããããããããããã"
 
-#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
+#: ../sheets/Circuit.sheet.in.h:27 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Speaker"
-msgstr "ãããã"
+msgstr "ããããã"
+
+#: ../sheets/Circuit.sheet.in.h:28
+#, fuzzy
+#| msgid "Vertical rest"
+msgid "Vertical xtal"
+msgstr "åçããã"
 
-#: ../sheets/Circuit.sheet.in.h:27
+#: ../sheets/Circuit.sheet.in.h:29
 msgid "Vertically aligned LED"
 msgstr "LED (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:28
+#: ../sheets/Circuit.sheet.in.h:30
 msgid "Vertically aligned capacitor"
-msgstr "ããããã (çåã)"
+msgstr "ãããããã (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:29
+#: ../sheets/Circuit.sheet.in.h:31
 msgid "Vertically aligned diode"
 msgstr "ããããã (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:30
+#: ../sheets/Circuit.sheet.in.h:32
 msgid "Vertically aligned fuse"
 msgstr "ãããã (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:31
+#: ../sheets/Circuit.sheet.in.h:33
 msgid "Vertically aligned inductor"
-msgstr "ããããã (çåã)"
+msgstr "ãããããã (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:32
+#: ../sheets/Circuit.sheet.in.h:34
 msgid "Vertically aligned inductor (European)"
-msgstr "ãããããåãããããã (çåã)"
+msgstr "ãããããåããããããã (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
+#: ../sheets/Circuit.sheet.in.h:35
+msgid "Vertically aligned power source"
 msgstr "éæ (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:34
+#: ../sheets/Circuit.sheet.in.h:36
 msgid "Vertically aligned resistor"
 msgstr "ææ (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:35
+#: ../sheets/Circuit.sheet.in.h:37
 msgid "Vertically aligned resistor (European)"
 msgstr "ãããããåãææ (çåã)"
 
-#: ../sheets/Circuit.sheet.in.h:36
+#: ../sheets/Circuit.sheet.in.h:38
 msgid "Vertically aligned zener diode"
 msgstr "åéåããããã (çåã)"
 
@@ -7501,27 +7744,27 @@ msgstr "åæææåè/ããããåå"
 
 #: ../sheets/Cybernetics.sheet.in.h:11
 msgid "High pass filter"
-msgstr "éåééãããã"
+msgstr "éåééããããã"
 
 #: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
-msgstr "çåå - åå (ä)"
+msgid "Integrator â input bottom"
+msgstr "çåå â åå (ä)"
 
 #: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator - input left"
-msgstr "çåå - åå (å)"
+msgid "Integrator â input left"
+msgstr "çåå â åå (å)"
 
 #: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator - input right"
-msgstr "çåå - åå (å)"
+msgid "Integrator â input right"
+msgstr "çåå â åå (å)"
 
 #: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator - input top"
-msgstr "çåå - åå (ä)"
+msgid "Integrator â input top"
+msgstr "çåå â åå (ä)"
 
 #: ../sheets/Cybernetics.sheet.in.h:16
 msgid "Low pass filter"
-msgstr "äåééãããã"
+msgstr "äåééããããã"
 
 #: ../sheets/Cybernetics.sheet.in.h:17
 msgid "Product"
@@ -7536,20 +7779,20 @@ msgid "Saturation characteristic"
 msgstr "ååçæ"
 
 #: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
-msgstr "ããã - ä"
+msgid "Sensor â bottom"
+msgstr "ãããã â ä"
 
 #: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
-msgstr "ããã - å"
+msgid "Sensor â left"
+msgstr "ãããã â å"
 
 #: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
-msgstr "ããã - å"
+msgid "Sensor â right"
+msgstr "ãããã â å"
 
 #: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
-msgstr "ããã - ä"
+msgid "Sensor â top"
+msgstr "ãããã â ä"
 
 #: ../sheets/Cybernetics.sheet.in.h:24
 msgid "Sigmoid characteristic"
@@ -7597,7 +7840,7 @@ msgstr "ãããããã"
 
 #: ../sheets/Database.sheet.in.h:3
 msgid "Editor for Database Table Relation Diagrams"
-msgstr "ããããããããããããããããããããããããããçé"
+msgstr "ããããããããããããããããããããããããçé"
 
 #: ../sheets/ER.sheet.in.h:2
 msgid "ER"
@@ -7605,7 +7848,7 @@ msgstr "ER"
 
 #: ../sheets/ER.sheet.in.h:3
 msgid "Editor for Entity Relations Diagrams"
-msgstr "ãããããããããããããããããããããçé"
+msgstr "ãããããããããããããããããããçé"
 
 #: ../sheets/ER.sheet.in.h:5
 msgid "Participation"
@@ -7613,7 +7856,7 @@ msgstr "ãããããããããã"
 
 #: ../sheets/ER.sheet.in.h:7
 msgid "Weak entity"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/Electric.sheet.in.h:1
 msgid "Components for electric circuits"
@@ -7685,7 +7928,7 @@ msgstr "ããããããããèç (çåã)"
 
 #: ../sheets/FS.sheet.in.h:1
 msgid "Editor for Function Structure Diagrams."
-msgstr "éææéäããããããããããã"
+msgstr "éææéäãããããããããããã"
 
 #: ../sheets/FS.sheet.in.h:2
 msgid "FS"
@@ -7767,11 +8010,11 @@ msgstr "ããããããããæçããããããããããã"
 #. XXX
 #: ../sheets/Flowchart.sheet.in.h:21
 msgid "Off page connector"
-msgstr "ãããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/Flowchart.sheet.in.h:22
 msgid "Offline storage"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/Flowchart.sheet.in.h:23
 msgid "Or"
@@ -7791,11 +8034,11 @@ msgstr "åç"
 
 #: ../sheets/Flowchart.sheet.in.h:27
 msgid "Punched card"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/Flowchart.sheet.in.h:28
 msgid "Punched tape"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/Flowchart.sheet.in.h:29
 msgid "Sort"
@@ -7840,7 +8083,7 @@ msgstr "GRAFCET"
 
 #: ../sheets/GRAFCET.sheet.in.h:10
 msgid "Macro sub-program call step"
-msgstr "ãããããããããããåãåããããã"
+msgstr "ããããããããããåãåããããã"
 
 #: ../sheets/GRAFCET.sheet.in.h:11
 msgid "OR vergent"
@@ -7873,7 +8116,7 @@ msgstr "æéååæãèè"
 
 #: ../sheets/Gane_and_Sarson.sheet.in.h:6
 msgid "Gane and Sarson DFD"
-msgstr "æéååæãèèããããããããããããããã"
+msgstr "æéååæãèèããããããããããããã"
 
 #: ../sheets/IsometricMap.sheet.in.h:1
 msgid "Block 1, 2:4"
@@ -7962,8 +8205,8 @@ msgid "Road Section"
 msgstr "éè"
 
 #: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
-msgstr "åæ1"
+msgid "Roof 1"
+msgstr "åæ 1"
 
 #: ../sheets/IsometricMap.sheet.in.h:25
 msgid "T-Junction"
@@ -8055,7 +8298,7 @@ msgstr "A Jackson æåãããã"
 
 #: ../sheets/Jackson.sheet.in.h:3
 msgid "A Jackson machine domain"
-msgstr "Jackson ãããããããã"
+msgstr "Jackson ããããããã"
 
 #: ../sheets/Jackson.sheet.in.h:4
 msgid "A Jackson requirement"
@@ -8123,7 +8366,7 @@ msgstr "KAOS ããã"
 
 #: ../sheets/KAOS.sheet.in.h:12
 msgid "A KAOS input"
-msgstr "AOS åå"
+msgstr "KAOS åå"
 
 #: ../sheets/KAOS.sheet.in.h:13
 msgid "A KAOS monitor link"
@@ -8190,8 +8433,8 @@ msgid "Ellipsoidal Reflector Spotlight"
 msgstr "Ellipsoidal Reflector Spotlight"
 
 #: ../sheets/Lights.sheet.in.h:5
-msgid "Fresel lantern"
-msgstr "Fresel lantern"
+msgid "Fresnel lantern"
+msgstr "Fresnel lantern"
 
 #: ../sheets/Lights.sheet.in.h:6
 msgid "Lights"
@@ -8219,7 +8462,7 @@ msgstr "Pebble Convex lantern"
 
 #: ../sheets/Lights.sheet.in.h:12 ../sheets/ciscocomputer.sheet.in.h:39
 msgid "Scanner"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../sheets/Lights.sheet.in.h:13
 msgid "Striplight"
@@ -8242,7 +8485,7 @@ msgid "Boolean Logic"
 msgstr "ãããèç"
 
 #: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
+msgid "Cross-connector"
 msgstr "äå"
 
 #: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
@@ -8271,7 +8514,7 @@ msgstr "OR ããã"
 
 #: ../sheets/Logic.sheet.in.h:10
 msgid "Simple buffer"
-msgstr "ããããããããã"
+msgstr "ããããããããã"
 
 #: ../sheets/Logic.sheet.in.h:11
 msgid "XOR gate"
@@ -8279,11 +8522,11 @@ msgstr "XOR ããã"
 
 #: ../sheets/MSE.sheet.in.h:1
 msgid "Demultiplexer"
-msgstr "ãããããããã"
+msgstr "ããããããããã"
 
 #: ../sheets/MSE.sheet.in.h:2
 msgid "Large extension node"
-msgstr "ãããããããããããããããã"
+msgstr "ãããããããããããããã"
 
 #: ../sheets/MSE.sheet.in.h:3
 msgid "MSE"
@@ -8291,11 +8534,11 @@ msgstr "MSE"
 
 #: ../sheets/MSE.sheet.in.h:4
 msgid "Multiplexer"
-msgstr "ããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/MSE.sheet.in.h:5
 msgid "Node center"
-msgstr "ããããããã"
+msgstr "ããããããã"
 
 #: ../sheets/MSE.sheet.in.h:6
 msgid "Small extension node"
@@ -8311,15 +8554,17 @@ msgstr "U.S. Army çåäèåãããããããã"
 
 #: ../sheets/Misc.sheet.in.h:2
 msgid "Folder"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../sheets/Misc.sheet.in.h:3
 msgid "Measure distance"
 msgstr "æåèé"
 
 #: ../sheets/Misc.sheet.in.h:4
-msgid "Misc"
-msgstr "ããä"
+#, fuzzy
+#| msgid "Miscellaneous Shapes"
+msgid "Miscellaneous"
+msgstr "ããäããããã"
 
 #: ../sheets/Misc.sheet.in.h:5
 msgid "Miscellaneous Shapes"
@@ -8327,7 +8572,7 @@ msgstr "ããäããããã"
 
 #: ../sheets/Misc.sheet.in.h:6
 msgid "New-style group object, for testing"
-msgstr "æãããããããããããããããããã (ãããç)"
+msgstr "æããããããããããããããããã (ãããç)"
 
 #: ../sheets/Misc.sheet.in.h:7
 msgid "Resizable grid"
@@ -8342,11 +8587,11 @@ msgid "Tree"
 msgstr "ããã"
 
 #: ../sheets/Misc.sheet.in.h:10
-msgid "expended node"
+msgid "expanded node"
 msgstr "åéããããã"
 
 #: ../sheets/Misc.sheet.in.h:11
-msgid "expensible node"
+msgid "expansible node"
 msgstr "åéåèãããã"
 
 #: ../sheets/Pneumatic.sheet.in.h:1
@@ -8431,19 +8676,19 @@ msgstr "æåãæåå"
 
 #: ../sheets/Pneumatic.sheet.in.h:22
 msgid "Push-button command"
-msgstr "ããããããããåãããã"
+msgstr "ãããããããåãããã"
 
 #: ../sheets/SADT.sheet.in.h:1
 msgid "Activity/data box"
-msgstr "ãããããããã"
+msgstr "ããããããã"
 
 #: ../sheets/SADT.sheet.in.h:2
 msgid "Activity/data flow arrow"
-msgstr "ããããããããçå"
+msgstr "ãããããããçå"
 
 #: ../sheets/SADT.sheet.in.h:3
 msgid "Flow label"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/SADT.sheet.in.h:4
 msgid "Objects to design SADT diagrams"
@@ -8467,7 +8712,7 @@ msgstr "éæåããã"
 
 #: ../sheets/SDL.sheet.in.h:6
 msgid "Function header"
-msgstr "éæãããã"
+msgstr "éæããããã"
 
 #: ../sheets/SDL.sheet.in.h:7
 msgid "Generic text note"
@@ -8475,7 +8720,7 @@ msgstr "äèçããããã"
 
 #: ../sheets/SDL.sheet.in.h:8
 msgid "In/Out connector"
-msgstr "åååãããã"
+msgstr "åååããããã"
 
 #: ../sheets/SDL.sheet.in.h:10
 msgid "Procedure return"
@@ -8514,16 +8759,16 @@ msgid "State"
 msgstr "çæ"
 
 #: ../sheets/SISSI.sheet.in.h:1
-msgid "Air filter"
-msgstr "çæãããã"
+msgid "Air conditioner"
+msgstr "ãããã"
 
 #: ../sheets/SISSI.sheet.in.h:2
-msgid "Air quality detector"
-msgstr "Air quality detector"
+msgid "Air filter"
+msgstr "çæããããã"
 
 #: ../sheets/SISSI.sheet.in.h:3
-msgid "Airconditioner"
-msgstr "ãããã"
+msgid "Air quality detector"
+msgstr "Air quality detector"
 
 #: ../sheets/SISSI.sheet.in.h:4
 msgid "Alarm center"
@@ -8687,7 +8932,7 @@ msgstr "Pump"
 
 #: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
 msgid "Relational Database"
-msgstr "ãããããããããããããã"
+msgstr "ããããããããããããã"
 
 #: ../sheets/SISSI.sheet.in.h:46
 msgid "Revolving door"
@@ -8699,7 +8944,7 @@ msgstr "éå"
 
 #: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
 msgid "Router"
-msgstr "ããã"
+msgstr "ãããã"
 
 #: ../sheets/SISSI.sheet.in.h:49
 msgid "Safe"
@@ -8707,15 +8952,15 @@ msgstr "åå"
 
 #: ../sheets/SISSI.sheet.in.h:50
 msgid "Security area"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../sheets/SISSI.sheet.in.h:51
 msgid "Sensor beam"
-msgstr "ããããããã"
+msgstr "ããããããã"
 
 #: ../sheets/SISSI.sheet.in.h:52
 msgid "Server"
-msgstr "ããã"
+msgstr "ãããã"
 
 #: ../sheets/SISSI.sheet.in.h:53
 msgid "Smoke detector"
@@ -8743,7 +8988,7 @@ msgstr "Vibration sensor"
 
 #: ../sheets/SISSI.sheet.in.h:60
 msgid "Video camera"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/SISSI.sheet.in.h:61
 msgid "Video movement detector"
@@ -8771,7 +9016,7 @@ msgstr "ãããããããã"
 
 #: ../sheets/UML.sheet.in.h:7
 msgid "Class stereotype icon"
-msgstr "ãããããããããããããããã"
+msgstr "ããããããããããããããã"
 
 #: ../sheets/UML.sheet.in.h:8
 msgid "Component"
@@ -8783,10 +9028,12 @@ msgstr "åç"
 
 #: ../sheets/UML.sheet.in.h:11
 msgid "Editor for UML Static Structure Diagrams"
-msgstr "UML Static æéäããããããããããã"
+msgstr "UML Static æéäãããããããããããã"
 
 #: ../sheets/UML.sheet.in.h:15
-msgid "Fork/union"
+#, fuzzy
+#| msgid "Fork/union"
+msgid "Fork/Union"
 msgstr "Fork/ãããã"
 
 #: ../sheets/UML.sheet.in.h:16
@@ -8795,10 +9042,12 @@ msgstr "ãããæçãäèè"
 
 #: ../sheets/UML.sheet.in.h:17
 msgid "Implements, class implements a specific interface"
-msgstr "çåãããããããããåèãããããåè"
+msgstr "çåããããããããããåèãããããåè"
 
 #: ../sheets/UML.sheet.in.h:18
-msgid "Initial/end state"
+#, fuzzy
+#| msgid "Initial/end state"
+msgid "Initial/End state"
 msgstr "Initial/End çæ"
 
 #: ../sheets/UML.sheet.in.h:19
@@ -8827,7 +9076,7 @@ msgstr "ããããããå"
 
 #: ../sheets/UML.sheet.in.h:25
 msgid "Realizes, implements a specific interface"
-msgstr "çåãããããããããåçåãåè"
+msgstr "çåããããããããããåçåãåè"
 
 #: ../sheets/UML.sheet.in.h:27
 msgid "Small package"
@@ -8839,7 +9088,7 @@ msgstr "UML"
 
 #: ../sheets/UML.sheet.in.h:32
 msgid "Use case"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/chronogram.sheet.in.h:1
 msgid "Chronogram"
@@ -8847,7 +9096,7 @@ msgstr "ãããããã"
 
 #: ../sheets/chronogram.sheet.in.h:2
 msgid "Data line"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/chronogram.sheet.in.h:3
 msgid "Objects to design chronogram charts"
@@ -8864,13 +9113,13 @@ msgid "BBS"
 msgstr "BBS"
 
 #: ../sheets/ciscocomputer.sheet.in.h:2
-msgid "Cisco - Computer"
-msgstr "Cisco - ãããããã"
-
-#: ../sheets/ciscocomputer.sheet.in.h:3
 msgid "Cisco CA"
 msgstr "Cisco CA"
 
+#: ../sheets/ciscocomputer.sheet.in.h:3
+msgid "Cisco â Computer"
+msgstr "Cisco â ããããããã"
+
 #: ../sheets/ciscocomputer.sheet.in.h:4
 msgid "CiscoSecurity"
 msgstr "CiscoSecurity"
@@ -8881,11 +9130,11 @@ msgstr "CiscoWorks ããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:6
 msgid "Computer shapes by Cisco"
-msgstr "ãããããã (Cisco)"
+msgstr "ããããããã (Cisco)"
 
 #: ../sheets/ciscocomputer.sheet.in.h:7
 msgid "Disk subsystem"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:8
 msgid "Diskette"
@@ -8901,11 +9150,11 @@ msgstr "FC ããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:11
 msgid "File Server"
-msgstr "ãããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:12
 msgid "Front End Processor"
-msgstr "ãããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:13
 msgid "HP Mini"
@@ -8945,7 +9194,7 @@ msgstr "Macintosh"
 
 #: ../sheets/ciscocomputer.sheet.in.h:23
 msgid "MicroWebserver"
-msgstr "ãããããããããã"
+msgstr "ããããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:24
 msgid "Mini VAX"
@@ -8953,7 +9202,7 @@ msgstr "Mini VAX"
 
 #: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
 msgid "Monitor"
-msgstr "ããã"
+msgstr "ãããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:27
 msgid "Newton"
@@ -8965,7 +9214,7 @@ msgstr "PC"
 
 #: ../sheets/ciscocomputer.sheet.in.h:29
 msgid "PC Adapter Card"
-msgstr "PC ãããããããã"
+msgstr "PC ããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:30
 msgid "PC Card"
@@ -8973,7 +9222,7 @@ msgstr "PC ããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:31
 msgid "PC Router Card"
-msgstr "PC ããããããã"
+msgstr "PC ãããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:32
 msgid "PC Software"
@@ -8985,7 +9234,7 @@ msgstr "PC ããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:34
 msgid "PC with Router-Based Software"
-msgstr "ãããããããããããããããèãã PC"
+msgstr "ãããããããããããããããèãã PC"
 
 #: ../sheets/ciscocomputer.sheet.in.h:38
 msgid "SUN workstation"
@@ -8993,15 +9242,15 @@ msgstr "SUN ããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:40
 msgid "Server with PC Router"
-msgstr "ãããæèäãããã"
+msgstr "ããããæèäããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:41
 msgid "Software-Based Router on File Server"
-msgstr "ããããããããããããã (ãããããããã)"
+msgstr "ãããããããããããããã (ãããããããã)"
 
 #: ../sheets/ciscocomputer.sheet.in.h:43
 msgid "Supercomputer"
-msgstr "ãããããããããã"
+msgstr "ããããããããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:44
 msgid "Tablet"
@@ -9009,7 +9258,7 @@ msgstr "ããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:45
 msgid "Tape array"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:46
 msgid "Terminal"
@@ -9017,15 +9266,15 @@ msgstr "çæ"
 
 #: ../sheets/ciscocomputer.sheet.in.h:47
 msgid "WWW server"
-msgstr "WWW ããã"
+msgstr "WWW ãããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:48
 msgid "Web browser"
-msgstr "Web ãããã"
+msgstr "Web ããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:49
 msgid "Web cluster"
-msgstr "Web ãããã"
+msgstr "Web ããããã"
 
 #: ../sheets/ciscocomputer.sheet.in.h:50
 msgid "Wireless"
@@ -9033,7 +9282,7 @@ msgstr "çç"
 
 #: ../sheets/ciscocomputer.sheet.in.h:51
 msgid "Workgroup director"
-msgstr "ããããããããããããã"
+msgstr "ããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:1
 msgid "100BaseT Hub"
@@ -9041,15 +9290,15 @@ msgstr "100BaseT ããã"
 
 #: ../sheets/ciscohub.sheet.in.h:2
 msgid "7500ARS (7513) Router"
-msgstr "7500ARS (7513) ããã"
+msgstr "7500ARS (7513) ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:3
 msgid "7505 Router"
-msgstr "7505 ããã"
+msgstr "7505 ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:4
 msgid "7507 Router"
-msgstr "7507 ããã"
+msgstr "7507 ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:5
 msgid "ASIC Processor"
@@ -9061,7 +9310,7 @@ msgstr "ATM 3800"
 
 #: ../sheets/ciscohub.sheet.in.h:7
 msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM ééããããããããããããã"
+msgstr "ATM ééãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:8
 msgid "ATM Switch"
@@ -9069,11 +9318,11 @@ msgstr "ATM ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:9
 msgid "ATM Tag Switch Router"
-msgstr "ATM ããããããããããã"
+msgstr "ATM ãããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:10
 msgid "Access Gateway"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:11
 msgid "BBSM"
@@ -9081,7 +9330,7 @@ msgstr "BBSM"
 
 #: ../sheets/ciscohub.sheet.in.h:12
 msgid "Broadband router"
-msgstr "ããããããããããã"
+msgstr "ããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:13
 msgid "CSM-S"
@@ -9089,59 +9338,59 @@ msgstr "CSM-S"
 
 #: ../sheets/ciscohub.sheet.in.h:14
 msgid "Carrier Routing System"
-msgstr "ãããããããããããããããã"
+msgstr "ããããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco - Switch"
-msgstr "Cisco - ãããã"
-
-#: ../sheets/ciscohub.sheet.in.h:16
 msgid "Cisco 1000"
 msgstr "Cisco 1000"
 
-#: ../sheets/ciscohub.sheet.in.h:17
+#: ../sheets/ciscohub.sheet.in.h:16
 msgid "Cisco Hub"
 msgstr "Cisco ãã"
 
+#: ../sheets/ciscohub.sheet.in.h:17
+msgid "Cisco â Switch"
+msgstr "Cisco â ãããã"
+
 #: ../sheets/ciscohub.sheet.in.h:18
 msgid "Content Router"
-msgstr "ããããããããã"
+msgstr "ããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:19
 msgid "Content Service Module"
-msgstr "ãããããããããããããããã"
+msgstr "ãããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:20
 msgid "Content Service Switch 1100"
-msgstr "ããããããããããããããã 1100"
+msgstr "ããããããããããããã 1100"
 
 #: ../sheets/ciscohub.sheet.in.h:21
 msgid "Content Switch"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:22
 msgid "Data Center Switch"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:23
 msgid "Data Center Switch Reversed"
-msgstr "ããããããããããããã (éåã)"
+msgstr "ãããããããããããã (éåã)"
 
 #: ../sheets/ciscohub.sheet.in.h:24
 msgid "Data Switch Processor"
-msgstr "ãããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:25
 msgid "Director-class Fibre Channel intelligent switch"
-msgstr "ãããããããããã Fibre Channel ããããããããããããã"
+msgstr "ãããããããããã Fibre Channel ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:26
 msgid "Edge Label Switch Router"
-msgstr "ãããããããããããããããã"
+msgstr "ããããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:27
 msgid "Edge Label Switch Router with NetFlow"
-msgstr "ãããããããããããããããã (NetFlow äã)"
+msgstr "ããããããããããããããã (NetFlow äã)"
 
 #: ../sheets/ciscohub.sheet.in.h:28
 msgid "Generic Processor"
@@ -9161,11 +9410,11 @@ msgstr "LAN2LAN ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:33
 msgid "Label Switch Router"
-msgstr "ãããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:34
 msgid "Layer 2 Remote Switch"
-msgstr "ããã 2 ããããããããã"
+msgstr "ãããã 2 ãããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:35
 msgid "MGX 8220"
@@ -9181,7 +9430,7 @@ msgstr "MGX 8260"
 
 #: ../sheets/ciscohub.sheet.in.h:38
 msgid "Multi-Fabric Server Switch"
-msgstr "Malti-Fabric ãããããããã"
+msgstr "Multi-Fabric ãããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:39
 msgid "MultiSwitch Device"
@@ -9189,7 +9438,7 @@ msgstr "ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:40
 msgid "Multilayer Remote Switch"
-msgstr "ããããããããããããããããã"
+msgstr "ãããããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:41
 msgid "Multilayer Switch"
@@ -9201,11 +9450,11 @@ msgstr "ãããããããããããã (ãããã)"
 
 #: ../sheets/ciscohub.sheet.in.h:43
 msgid "Multilayer Switch with Silicon subdued"
-msgstr "ããããããããããããããããã (çè)"
+msgstr "ãããããããããããããããã (çè)"
 
 #: ../sheets/ciscohub.sheet.in.h:44
 msgid "NetFlow router"
-msgstr "NetFlow ããã"
+msgstr "NetFlow ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:45
 msgid "NetRanger"
@@ -9217,7 +9466,7 @@ msgstr "NetSonar"
 
 #: ../sheets/ciscohub.sheet.in.h:47
 msgid "Optical Services Router"
-msgstr "Optical Services ããã"
+msgstr "Optical Services ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:48
 msgid "PXF"
@@ -9233,11 +9482,11 @@ msgstr "RateMUX"
 
 #: ../sheets/ciscohub.sheet.in.h:51
 msgid "Route Switch Processor"
-msgstr "ãããããããããããããã"
+msgstr "ããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:52
 msgid "Route Switch Processor with Si"
-msgstr "ãããããããããããããã (Si)"
+msgstr "ããããããããããããã (Si)"
 
 #: ../sheets/ciscohub.sheet.in.h:54
 msgid "Router and switch shapes by Cisco"
@@ -9245,19 +9494,19 @@ msgstr "ããããããã (Cisco ãããã)"
 
 #: ../sheets/ciscohub.sheet.in.h:55
 msgid "Router subdued"
-msgstr "ããã (çè)"
+msgstr "ãããã (çè)"
 
 #: ../sheets/ciscohub.sheet.in.h:56
 msgid "Router with Firewall"
-msgstr "ããã (ãããããããããäã)"
+msgstr "ãããã (ããããããããäã)"
 
 #: ../sheets/ciscohub.sheet.in.h:57
 msgid "Router with Silicon Switch"
-msgstr "ããã (ãããããããããäã)"
+msgstr "ãããã (ããããããããäã)"
 
 #: ../sheets/ciscohub.sheet.in.h:58
 msgid "Server Switch"
-msgstr "ãããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:59
 msgid "Small Hub"
@@ -9265,15 +9514,15 @@ msgstr "åãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:60
 msgid "Storage Router"
-msgstr "ããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:61
 msgid "Switch Processor"
-msgstr "ãããããããããã"
+msgstr "ããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:62
 msgid "Universal Gateway"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:63
 msgid "Virtual Layer Switch"
@@ -9281,11 +9530,11 @@ msgstr "ãããããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:64
 msgid "Wavelength router"
-msgstr "Wavelength ããã"
+msgstr "Wavelength ãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:65
 msgid "Wireless router"
-msgstr "ççããã"
+msgstr "ççãããã"
 
 #: ../sheets/ciscohub.sheet.in.h:66
 msgid "Workgroup 5000"
@@ -9301,19 +9550,19 @@ msgstr "ããããããã 5500"
 
 #: ../sheets/ciscohub.sheet.in.h:69
 msgid "Workgroup Fibre Channel intelligent switch"
-msgstr "ããããããã Fibre Channel ããããããããããããã"
+msgstr "ããããããã Fibre Channel ãããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:70
 msgid "Workgroup Switch Voice-Enabled"
-msgstr "ãããããããããããã (éèåè)"
+msgstr "ããããããããããã (éèåè)"
 
 #: ../sheets/ciscohub.sheet.in.h:71
 msgid "Workgroup switch"
-msgstr "ãããããããããããã"
+msgstr "ããããããããããã"
 
 #: ../sheets/ciscohub.sheet.in.h:72
 msgid "Workgroup switch Subdued"
-msgstr "ãããããããããããã (çè)"
+msgstr "ããããããããããã (çè)"
 
 #: ../sheets/ciscohub.sheet.in.h:73
 msgid "iSCSI switch"
@@ -9329,23 +9578,23 @@ msgstr "ãããã"
 
 #: ../sheets/ciscomisc.sheet.in.h:3
 msgid "Branch office"
-msgstr "ããããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/ciscomisc.sheet.in.h:4
 msgid "Branch office blue"
-msgstr "ããããããããã (éè)"
+msgstr "ãããããããã (éè)"
 
 #: ../sheets/ciscomisc.sheet.in.h:5
 msgid "Branch office subdued"
-msgstr "ããããããããã (çè)"
+msgstr "ãããããããã (çè)"
 
 #: ../sheets/ciscomisc.sheet.in.h:6
 msgid "Car"
 msgstr "è"
 
 #: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco - Misc"
-msgstr "Cisco - ããä"
+msgid "Cisco â Miscellaneous"
+msgstr "Cisco â ããä"
 
 #: ../sheets/ciscomisc.sheet.in.h:8
 msgid "CiscoWorks Man"
@@ -9383,10 +9632,6 @@ msgstr "äèçãå"
 msgid "House blue"
 msgstr "äèçãå (éè)"
 
-#: ../sheets/ciscomisc.sheet.in.h:18
-msgid "Key"
-msgstr "ãã"
-
 #: ../sheets/ciscomisc.sheet.in.h:20
 msgid "Lock and Key"
 msgstr "ããããããã"
@@ -9501,11 +9746,11 @@ msgstr "åå"
 
 #: ../sheets/ciscomisc.sheet.in.h:50
 msgid "Video Camera"
-msgstr "ããããããã"
+msgstr "ãããããã"
 
 #: ../sheets/ciscomisc.sheet.in.h:51
 msgid "Video Camera right"
-msgstr "ããããããã (åå)"
+msgstr "ãããããã (åå)"
 
 #: ../sheets/ciscomisc.sheet.in.h:52
 msgid "Woman"
@@ -9537,15 +9782,15 @@ msgstr "15800"
 
 #: ../sheets/cisconetwork.sheet.in.h:4
 msgid "3174 (desktop) cluster controller"
-msgstr "3174 (ããããããå) ããããããããããã"
+msgstr "3174 (ããããããå) ãããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:5
 msgid "3X74 (floor) cluster controller"
-msgstr "3X74 (ãããå) ããããããããããã"
+msgstr "3X74 (ãããå) ãããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:6
 msgid "Access Server"
-msgstr "ãããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:7
 msgid "AccessPoint"
@@ -9565,7 +9810,7 @@ msgstr "BBFW ãããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:11
 msgid "Breakout box"
-msgstr "ãããããããããããã"
+msgstr "ããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:12
 msgid "Bridge"
@@ -9573,11 +9818,11 @@ msgstr "ãããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:13
 msgid "CDDI/FDDI Concentrator"
-msgstr "CDDI/FDDI ãããã"
+msgstr "CDDI/FDDI ããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:14
 msgid "CDM Content Distribution Manager"
-msgstr "CDM ãããããéäããããã"
+msgstr "CDM ãããããéäãããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:15
 msgid "CSU/DSU"
@@ -9585,23 +9830,23 @@ msgstr "CSU/DSU"
 
 #: ../sheets/cisconetwork.sheet.in.h:16
 msgid "Cable Modem"
-msgstr "ãããããããã"
+msgstr "ããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:17
 msgid "Catalyst Access Gateway"
-msgstr "Catalyst ããããããããããã"
+msgstr "Catalyst ãããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:18
 msgid "Centri Firewall"
-msgstr "Centri ããããããããã"
+msgstr "Centri ãããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:19
 msgid "Channelized Pipe"
-msgstr "ããããåããããã"
+msgstr "ãããããåããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco - Network"
-msgstr "Cisco - ãããããã"
+msgid "Cisco â Network"
+msgstr "Cisco â ãããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:21
 msgid "Cloud"
@@ -9625,7 +9870,7 @@ msgstr "éçããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:26
 msgid "Content Engine (Cache Director)"
-msgstr "ãããããããããã (Cache Director)"
+msgstr "ããããããããã (Cache Director)"
 
 #: ../sheets/cisconetwork.sheet.in.h:27
 msgid "Content Transformation Engine (CTE)"
@@ -9637,11 +9882,11 @@ msgstr "DSLAM"
 
 #: ../sheets/cisconetwork.sheet.in.h:29
 msgid "DWDM Filter"
-msgstr "DWDM ãããã"
+msgstr "DWDM ããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:30
 msgid "Detector"
-msgstr "ããããã"
+msgstr "ãããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:31
 msgid "Digital Cross-Connect"
@@ -9649,15 +9894,15 @@ msgstr "ããããäåæç"
 
 #: ../sheets/cisconetwork.sheet.in.h:32
 msgid "Directory Server"
-msgstr "ãããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:33
 msgid "Distributed Director"
-msgstr "åæããããã"
+msgstr "åæãããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:34
 msgid "Dual Mode AccessPoint"
-msgstr "ããããããããããããããããã"
+msgstr "ãããããããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:35
 msgid "FDDI Ring"
@@ -9665,23 +9910,23 @@ msgstr "FDDI ããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:36
 msgid "File Engine"
-msgstr "ããããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:37
 msgid "Firewall"
-msgstr "ããããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:38
 msgid "Firewall Service Module"
-msgstr "ãããããããããããããããããããã"
+msgstr "ãããããããããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:39
 msgid "Firewall horizontal"
-msgstr "ããããããããã (æåæå)"
+msgstr "ãããããããã (æåæå)"
 
 #: ../sheets/cisconetwork.sheet.in.h:40
 msgid "Firewall subdued"
-msgstr "ããããããããã (çè)"
+msgstr "ãããããããã (çè)"
 
 #: ../sheets/cisconetwork.sheet.in.h:41
 msgid "General Appliance"
@@ -9693,7 +9938,7 @@ msgstr "äèçããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:44
 msgid "IOS Firewall"
-msgstr "IOS ããããããããã"
+msgstr "IOS ãããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:45
 msgid "IOS SLB"
@@ -9713,15 +9958,15 @@ msgstr "IP (æå)"
 
 #: ../sheets/cisconetwork.sheet.in.h:49
 msgid "IP Transport Concentrator"
-msgstr "IP èéãããããããã"
+msgstr "IP èéããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:50
 msgid "IPTV broadcast server"
-msgstr "IPTV ãããããããããããã"
+msgstr "IPTV ãããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:51
 msgid "IPTV content manager"
-msgstr "IPTV ããããããããããã"
+msgstr "IPTV ããããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:52
 msgid "LAN to LAN"
@@ -9737,7 +9982,7 @@ msgstr "LocalDirector"
 
 #: ../sheets/cisconetwork.sheet.in.h:55
 msgid "Location server"
-msgstr "ãããããããããã"
+msgstr "ãããããããããã"
 
 #: ../sheets/cisconetwork.sheet.in.h:56
 msgid "LongReach CPE"
@@ -9799,131 +10044,133 @@ msgstr "ååããããã"
 msgid "Optical Transport"
 msgstr "ååèé"
 
-#: ../sheets/cisconetwork.sheet.in.h:71
+#. compatibility
+#. <alias name="Cisco - PAD"/>
+#: ../sheets/cisconetwork.sheet.in.h:73
 msgid "PAD"
 msgstr "PAD"
 
-#: ../sheets/cisconetwork.sheet.in.h:72
+#: ../sheets/cisconetwork.sheet.in.h:74
 msgid "PIX Firewall"
-msgstr "PIX ããããããããã"
+msgstr "PIX ãããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:73
+#: ../sheets/cisconetwork.sheet.in.h:75
 msgid "PIX Firewall Left"
-msgstr "PIX ããããããããã (ååã)"
+msgstr "PIX ãããããããã (ååã)"
 
-#: ../sheets/cisconetwork.sheet.in.h:74
+#: ../sheets/cisconetwork.sheet.in.h:76
 msgid "Protocol Translator"
 msgstr "ãããããèé"
 
-#: ../sheets/cisconetwork.sheet.in.h:75
+#: ../sheets/cisconetwork.sheet.in.h:77
 msgid "RPS"
 msgstr "RPS"
 
-#: ../sheets/cisconetwork.sheet.in.h:76
+#: ../sheets/cisconetwork.sheet.in.h:78
 msgid "Repeater"
-msgstr "ãããã"
+msgstr "ããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:77
+#: ../sheets/cisconetwork.sheet.in.h:79
 msgid "SSL Terminator"
 msgstr "SSL ãããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:78
+#: ../sheets/cisconetwork.sheet.in.h:80
 msgid "STB (set top box)"
 msgstr "ãããããããããã (STB)"
 
-#: ../sheets/cisconetwork.sheet.in.h:79
+#: ../sheets/cisconetwork.sheet.in.h:81
 msgid "Security appliance"
 msgstr "ããããããèç"
 
-#: ../sheets/cisconetwork.sheet.in.h:80
+#: ../sheets/cisconetwork.sheet.in.h:82
 msgid "Service Control"
-msgstr "ããããããããããã"
+msgstr "ãããããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:81
+#: ../sheets/cisconetwork.sheet.in.h:83
 msgid "Storage Solution Engine"
-msgstr "ãããããããããããããããããã"
+msgstr "ãããããããããããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:82
+#: ../sheets/cisconetwork.sheet.in.h:84
 msgid "System controller"
 msgstr "ããããããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:83
+#: ../sheets/cisconetwork.sheet.in.h:85
 msgid "TV"
 msgstr "TV"
 
-#: ../sheets/cisconetwork.sheet.in.h:84
+#: ../sheets/cisconetwork.sheet.in.h:86
 msgid "Terminal Server"
-msgstr "ããããããããã"
+msgstr "ããããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:85
+#: ../sheets/cisconetwork.sheet.in.h:87
 msgid "TokenRing"
 msgstr "ããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:86
+#: ../sheets/cisconetwork.sheet.in.h:88
 msgid "TransPath"
 msgstr "äéè"
 
-#: ../sheets/cisconetwork.sheet.in.h:87
+#: ../sheets/cisconetwork.sheet.in.h:89
 msgid "UPS"
 msgstr "UPS"
 
-#: ../sheets/cisconetwork.sheet.in.h:88
+#: ../sheets/cisconetwork.sheet.in.h:90
 msgid "VIP"
 msgstr "VIP"
 
-#: ../sheets/cisconetwork.sheet.in.h:89
+#: ../sheets/cisconetwork.sheet.in.h:91
 msgid "VN2900"
 msgstr "VN2900"
 
-#: ../sheets/cisconetwork.sheet.in.h:90
+#: ../sheets/cisconetwork.sheet.in.h:92
 msgid "VN5900"
 msgstr "VN5900"
 
-#: ../sheets/cisconetwork.sheet.in.h:91
+#: ../sheets/cisconetwork.sheet.in.h:93
 msgid "VN5902"
 msgstr "VN5902"
 
-#: ../sheets/cisconetwork.sheet.in.h:92
+#: ../sheets/cisconetwork.sheet.in.h:94
 msgid "VPN Concentrator"
-msgstr "VPN ãããã"
+msgstr "VPN ããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:93
+#: ../sheets/cisconetwork.sheet.in.h:95
 msgid "VPN Gateway"
 msgstr "VPN ãããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:94
+#: ../sheets/cisconetwork.sheet.in.h:96
 msgid "WAN"
 msgstr "WAN"
 
-#: ../sheets/cisconetwork.sheet.in.h:95
+#: ../sheets/cisconetwork.sheet.in.h:97
 msgid "WDM"
 msgstr "WDM"
 
-#: ../sheets/cisconetwork.sheet.in.h:96
+#: ../sheets/cisconetwork.sheet.in.h:98
 msgid "WLAN controller"
-msgstr "WLAN ãããããã"
+msgstr "WLAN ããããããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:97
+#: ../sheets/cisconetwork.sheet.in.h:99
 msgid "Wi-Fi Tag"
 msgstr "Wi-Fi ãã"
 
-#: ../sheets/cisconetwork.sheet.in.h:98
+#: ../sheets/cisconetwork.sheet.in.h:100
 msgid "Wireless Bridge"
 msgstr "ççãããã"
 
-#: ../sheets/cisconetwork.sheet.in.h:99
+#: ../sheets/cisconetwork.sheet.in.h:101
 msgid "Wireless Connectivity"
 msgstr "ççæç"
 
-#: ../sheets/cisconetwork.sheet.in.h:100
+#: ../sheets/cisconetwork.sheet.in.h:102
 msgid "Wireless Location Appliance"
 msgstr "ççããããããèç"
 
-#: ../sheets/cisconetwork.sheet.in.h:101
+#: ../sheets/cisconetwork.sheet.in.h:103
 msgid "Wireless Transport"
 msgstr "ççäé"
 
-#: ../sheets/cisconetwork.sheet.in.h:102
+#: ../sheets/cisconetwork.sheet.in.h:104
 msgid "uBR910 Cable DSU"
 msgstr "uBR910 Cable DSU"
 
@@ -9960,8 +10207,8 @@ msgid "Cellular Phone"
 msgstr "æåéè"
 
 #: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco - Telephony"
-msgstr "Cisco - éè"
+msgid "Cisco â Telephony"
+msgstr "Cisco â éè"
 
 #: ../sheets/ciscotelephony.sheet.in.h:10
 msgid "Class 4/5 switch"
@@ -9993,7 +10240,7 @@ msgstr "HootPhone"
 
 #: ../sheets/ciscotelephony.sheet.in.h:17
 msgid "IAD router"
-msgstr "IAD ããã"
+msgstr "IAD ãããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:18
 msgid "ICM"
@@ -10013,7 +10260,7 @@ msgstr "IP ããããããéè"
 
 #: ../sheets/ciscotelephony.sheet.in.h:22
 msgid "IP Telephony Router"
-msgstr "IP éèããã"
+msgstr "IP éèãããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:23
 msgid "ITP"
@@ -10033,15 +10280,15 @@ msgstr "MGX 8000 ãããããéåãããããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:27
 msgid "MoH server (Music on Hold)"
-msgstr "MoH ããã (Music on Hold)"
+msgstr "MoH ãããã (Music on Hold)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:28
 msgid "Mobile Access IP Phone"
-msgstr "ããããããããã IP éè"
+msgstr "ãããããããã IP éè"
 
 #: ../sheets/ciscotelephony.sheet.in.h:29
 msgid "Mobile Access Router"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:30
 msgid "Octel"
@@ -10057,7 +10304,7 @@ msgstr "PBX ãããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:33
 msgid "Pager"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:34
 msgid "Phone"
@@ -10089,7 +10336,7 @@ msgstr "éæå"
 
 #: ../sheets/ciscotelephony.sheet.in.h:41
 msgid "SC2200 (Signalling Controller)"
-msgstr "SC2200 (ããããççãããããã)"
+msgstr "SC2200 (ããããççããããããã)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:42
 msgid "SC2200/VSC3000 host"
@@ -10097,7 +10344,7 @@ msgstr "SC2200/VSC3000 ããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:43
 msgid "SIP Proxy Server"
-msgstr "SIP ãããããããã"
+msgstr "SIP ãããããããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:44
 msgid "SONET MUX"
@@ -10113,7 +10360,7 @@ msgstr "ããããããéè"
 
 #: ../sheets/ciscotelephony.sheet.in.h:47
 msgid "TDM router"
-msgstr "TDM ããã"
+msgstr "TDM ãããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:48
 msgid "Telephony shapes by Cisco"
@@ -10129,11 +10376,11 @@ msgstr "Unity Express"
 
 #: ../sheets/ciscotelephony.sheet.in.h:51
 msgid "Unity server"
-msgstr "Unity ããã"
+msgstr "Unity ãããã"
 
 #: ../sheets/ciscotelephony.sheet.in.h:52
 msgid "Virtual switch controller (VSC 3000)"
-msgstr "äæããããããããããã (VSC 3000)"
+msgstr "äæããããããããããã (VSC 3000)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:53
 msgid "Voice-Enabled ATM Switch"
@@ -10141,11 +10388,11 @@ msgstr "ATM ãããã (éèåè)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:54
 msgid "Voice-Enabled Access Server"
-msgstr "ãããããããã (éèåè)"
+msgstr "ãããããããã (éèåè)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:55
 msgid "Voice-Enabled Router"
-msgstr "ããã (éèåè)"
+msgstr "ãããã (éèåè)"
 
 #: ../sheets/ciscotelephony.sheet.in.h:56
 msgid "uMG series"
@@ -10177,7 +10424,7 @@ msgstr "åæååçãéå"
 
 #: ../sheets/civil.sheet.in.h:7
 msgid "Container"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../sheets/civil.sheet.in.h:8
 msgid "Final-settling basin"
@@ -10272,68 +10519,68 @@ msgid "Jigsaw"
 msgstr "ãããã"
 
 #: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_iiii"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_iiio"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_iioi"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_iioo"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_ioii"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_ioio"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_iooi"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw - part_iooo"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_iooo"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_oiii"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_oiio"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_oioi"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_oioo"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw - part_ooii"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_ooii"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_ooio"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_oooi"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
-msgstr "ãããã - åååå"
+msgid "Jigsaw â part_oooo"
+msgstr "ãããã â åååå"
 
 #: ../sheets/jigsaw.sheet.in.h:18
 msgid "Pieces of a jigsaw"
@@ -10341,11 +10588,11 @@ msgstr "ãããããããã"
 
 #: ../sheets/network.sheet.in.h:1
 msgid "24 Port Patch Panel"
-msgstr "24 ããããããããããã"
+msgstr "24 ããããããããã"
 
 #: ../sheets/network.sheet.in.h:2
 msgid "3 1/2 inch diskette"
-msgstr "3.5 ãããããããã"
+msgstr "3.5 ããããããã"
 
 #: ../sheets/network.sheet.in.h:3
 msgid "ATM switch symbol"
@@ -10361,7 +10608,7 @@ msgstr "PC (ããããã)"
 
 #: ../sheets/network.sheet.in.h:6
 msgid "Computer"
-msgstr "ãããããã"
+msgstr "ããããããã"
 
 #: ../sheets/network.sheet.in.h:7
 msgid "Desktop PC"
@@ -10373,7 +10620,7 @@ msgstr "ãããããã"
 
 #: ../sheets/network.sheet.in.h:9
 msgid "Ethernet bus"
-msgstr "ããããããããã"
+msgstr "ãããããããã"
 
 #: ../sheets/network.sheet.in.h:10
 msgid "External DAT drive"
@@ -10381,7 +10628,7 @@ msgstr "åé DAT ãããã"
 
 #: ../sheets/network.sheet.in.h:11
 msgid "Firewall router"
-msgstr "ããããããããããããã"
+msgstr "ããããããããããããã"
 
 #: ../sheets/network.sheet.in.h:12
 msgid "Laptop PC"
@@ -10401,7 +10648,7 @@ msgstr "æåéè"
 
 #: ../sheets/network.sheet.in.h:16
 msgid "Mobile telephony base station"
-msgstr "æåéèãããããããããã"
+msgstr "æåéèããããããããã"
 
 #: ../sheets/network.sheet.in.h:17
 msgid "Mobile telephony cell"
@@ -10409,7 +10656,7 @@ msgstr "æåéèãã"
 
 #: ../sheets/network.sheet.in.h:18
 msgid "Modular switching system"
-msgstr "ãããããåããããããããããã"
+msgstr "ãããããåãããããããããã"
 
 #: ../sheets/network.sheet.in.h:22
 msgid "Objects to design network diagrams with"
@@ -10417,7 +10664,7 @@ msgstr "ããããããææãããããããããããããããã
 
 #: ../sheets/network.sheet.in.h:23
 msgid "Plotter"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../sheets/network.sheet.in.h:24
 msgid "RJ45 wall-plug"
@@ -10425,7 +10672,7 @@ msgstr "RJ45 (ååãå)"
 
 #: ../sheets/network.sheet.in.h:25
 msgid "Router symbol"
-msgstr "ããããèå"
+msgstr "ãããããèå"
 
 #: ../sheets/network.sheet.in.h:26
 msgid "Simple modem"
@@ -10433,15 +10680,15 @@ msgstr "ããã"
 
 #: ../sheets/network.sheet.in.h:27
 msgid "Simple printer"
-msgstr "ãããã"
+msgstr "ããããã"
 
 #: ../sheets/network.sheet.in.h:28
 msgid "Speaker with integrated amplifier"
-msgstr "ãããäããããã"
+msgstr "ãããäãããããã"
 
 #: ../sheets/network.sheet.in.h:29
 msgid "Speaker without amplifier"
-msgstr "ãããçããããã"
+msgstr "ãããçãããããã"
 
 #: ../sheets/network.sheet.in.h:30
 msgid "Stackable hub or switch"
@@ -10469,11 +10716,11 @@ msgstr "WAN ããã"
 
 #: ../sheets/network.sheet.in.h:37
 msgid "Wall-plug for the scEAD cabling system"
-msgstr "ååãåã scEAD ããããããããã"
+msgstr "ååãåã scEAD ãããããããã"
 
 #: ../sheets/network.sheet.in.h:38
 msgid "Workstation monitor"
-msgstr "ããããããããããããã"
+msgstr "ãããããããããããããã"
 
 #: ../sheets/network.sheet.in.h:39
 msgid "ZIP disk"
@@ -10481,7 +10728,7 @@ msgstr "ZIP ãããã"
 
 #: ../sheets/sybase.sheet.in.h:1
 msgid "Log transfer manager or rep agent"
-msgstr "ããèéããããã/èèãããããã"
+msgstr "ããèéãããããã/èèãããããã"
 
 #: ../sheets/sybase.sheet.in.h:2
 msgid "Objects to design Sybase replication domain diagrams with"
@@ -10489,7 +10736,7 @@ msgstr "Sybase èèãããããããããããèèãããããã
 
 #: ../sheets/sybase.sheet.in.h:3
 msgid "Replication server manager"
-msgstr "èèããããããããã"
+msgstr "èèãããããããããã"
 
 #: ../sheets/sybase.sheet.in.h:4
 msgid "Stable storage device"
@@ -10501,12 +10748,205 @@ msgstr "Sybase"
 
 #: ../sheets/sybase.sheet.in.h:6
 msgid "Sybase client application"
-msgstr "Sybase ããããããããããããããã"
+msgstr "Sybase ãããããããããããããã"
 
 #: ../sheets/sybase.sheet.in.h:7
 msgid "Sybase dataserver"
-msgstr "Sybase ãããããã"
+msgstr "Sybase ããããããã"
 
 #: ../sheets/sybase.sheet.in.h:8
 msgid "Sybase replication server"
-msgstr "Sybase èèããã"
+msgstr "Sybase èèãããã"
+
+#~ msgid "'%s' not found!\n"
+#~ msgstr "'%s' ããããããããããããããï\n"
+
+#~ msgid "'%s' not found in '%s'!\n"
+#~ msgstr "'%s' ã '%s' ãããååããããããããããããï\n"
+
+#~ msgid "Could not initialize Bonobo!"
+#~ msgstr "Bonobo ãåæåãããããããã!"
+
+#~ msgid "X position"
+#~ msgstr "Xäç"
+
+#~ msgid "X position of child widget"
+#~ msgstr "åãããããããXäç"
+
+#~ msgid "Y position"
+#~ msgstr "Yäç"
+
+#~ msgid "Y position of child widget"
+#~ msgstr "åãããããããYäç"
+
+#~ msgid ""
+#~ "You cannot group objects that belong to different groups or have "
+#~ "different parents"
+#~ msgstr ""
+#~ "åããããããæåããããããããããããããèãçãããããããããã"
+#~ "ãããåãããããã"
+
+#~ msgid "/_Sort objects"
+#~ msgstr "/ãããããããäãæã(_S)"
+
+#~ msgid "/Sort objects/by _name"
+#~ msgstr "/ãããããããäãæã/ååé(_N)"
+
+#~ msgid "/Sort objects/by _type"
+#~ msgstr "/ãããããããäãæã/çéé(_T)"
+
+#~ msgid "/Sort objects/as _inserted"
+#~ msgstr "/ãããããããäãæã/æåé(_I)"
+
+#~ msgid "/Sort objects/All by name"
+#~ msgstr "/ãããããããäãæã/ååéãããã"
+
+#~ msgid "/Sort objects/All by type"
+#~ msgstr "/ãããããããäãæã/çééãããã"
+
+#~ msgid "/Sort objects/All as inserted"
+#~ msgstr "/ãããããããäãæã/æåéãããã"
+
+#~ msgid "/Sort objects/_Default"
+#~ msgstr "/ãããããããäãæã/ããããã(_D)"
+
+#~ msgid "/Sort objects/Default/by _name"
+#~ msgstr "/ãããããããäãæã/ããããã/ååé(_N)"
+
+#~ msgid "/Sort objects/Default/by _type"
+#~ msgstr "/ãããããããäãæã/ããããã/çéé(_T)"
+
+#~ msgid "/Sort objects/Default/as _inserted"
+#~ msgstr "/ãããããããäãæã/ããããã/æåé(_I)"
+
+#~ msgid "/Sort _diagrams"
+#~ msgstr "/ãããããããäãæã(_D)"
+
+#~ msgid "/Sort _diagrams/by _name"
+#~ msgstr "/ãããããããäãæã(_D)/ååé(_N)"
+
+#~ msgid "/Sort _diagrams/as _inserted"
+#~ msgstr "/ãããããããäãæã(_D)/æåé(_I)"
+
+#~ msgid "/Sort diagrams/_Default"
+#~ msgstr "/ãããããããäãæã/ããããã(_D)"
+
+#~ msgid "/Sort diagrams/Default/by _name"
+#~ msgstr "/ãããããããäãæã/ããããã/ååé(_N)"
+
+#~ msgid "/Sort diagrams/Default/as _inserted"
+#~ msgstr "ãããããããäãæã/ããããã/æåé(_I)"
+
+#~ msgid "/_Locate"
+#~ msgstr "/åæ(_L)"
+
+#~ msgid "/_Hide this type"
+#~ msgstr "/ããçéãéã(_H)"
+
+#~ msgid "Properties..."
+#~ msgstr "ããããã..."
+
+#~ msgid "active"
+#~ msgstr "æå"
+
+#~ msgid "Sheets and Objects..."
+#~ msgstr "ãããããããããã..."
+
+#~ msgid "Plugins..."
+#~ msgstr "ããããã..."
+
+#~ msgid "_Diagram tree..."
+#~ msgstr "ããããããããã(_D)..."
+
+#~ msgid "_Export ..."
+#~ msgstr "ãããããã(_E)..."
+
+#~ msgid "Page Set_up..."
+#~ msgstr "ãããèå(_U)..."
+
+#~ msgid "Add Layer..."
+#~ msgstr "ãããããèå..."
+
+#~ msgid "_Layers..."
+#~ msgstr "ãããã(_L)..."
+
+#~ msgid "Fullscr_een"
+#~ msgstr "ããããããã(_E)"
+
+#~ msgid "Diagram tree window:"
+#~ msgstr " ããããããããããããããã "
+
+#~ msgid "Save hidden object types"
+#~ msgstr "éãããããããããçéãäåãã"
+
+#~ msgid "Edit"
+#~ msgstr "çé"
+
+#~ msgid "New"
+#~ msgstr "æè"
+
+#~ msgid "Browse..."
+#~ msgstr "åç..."
+
+#~ msgid "SVG Shape:"
+#~ msgstr "SVG ãããã:"
+
+#~ msgid "description:"
+#~ msgstr "èæ:"
+
+#~ msgid "Sheet name:"
+#~ msgstr "ãããå:"
+
+#~ msgid "Edit Attributes"
+#~ msgstr "åæãçé"
+
+#~ msgid "DiaObject"
+#~ msgstr "DiaObject"
+
+#~ msgid "Description:"
+#~ msgstr "èæ:"
+
+#~ msgid "Sheet"
+#~ msgstr "ãããå"
+
+#~ msgid "DiaObject:"
+#~ msgstr "DiaObject:"
+
+#~ msgid "Sheet:"
+#~ msgstr "ããã:"
+
+#~ msgid "%s<illegal characters>..."
+#~ msgstr "%s<äæãæå>..."
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Open group"
+#~ msgstr "ãããããéã"
+
+#~ msgid "Tablename"
+#~ msgstr "ããããå"
+
+#~ msgid "Classname"
+#~ msgstr "ãããå"
+
+#~ msgid "Show Comments"
+#~ msgstr "ãããããèçãã"
+
+#~ msgid "Printing with Gtk+(cairo) requires at least version 2.10."
+#~ msgstr "Cairo ãäããååãã GTK+ ãããããã 2.10 ääãåèããã"
+
+#~ msgid "Couldn't read file %s"
+#~ msgstr "ãããã %s ãèãèããããããã"
+
+#~ msgid "Couldn't make object dir %s"
+#~ msgstr "ããããããããããããã %s ãäæãããããããã"
+
+#~ msgid "Windows Meta File"
+#~ msgstr "Windows ãããããã"
+
+#~ msgid "Enhanced Meta File"
+#~ msgstr "æåãããããã"
+
+#~ msgid "Misc"
+#~ msgstr "ããä"



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