[dia] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 29b0f172415d7c85117c7979582b37809b2840bb
Author: Walter Cheuk <wwycheuk gmail com>
Date:   Sun Jan 6 08:23:20 2013 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |12178 ++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po |12185 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 13281 insertions(+), 11082 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index a0aa301..03ab6be 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -3,242 +3,271 @@
 # Jing-Jong Shyue <shyue sonoma com tw>, 2000
 # Abel Cheung <maddog linux org hk>, 2001, 2003
 # Walter Cheuk <wwycheuk gmail com>, 2007.
-# 
+#
+#: ../objects/UML/class.c:193
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.96.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 20:57+0800\n"
-"PO-Revision-Date: 2007-07-09 20:58+0800\n"
+"POT-Creation-Date: 2013-01-06 08:18+0800\n"
+"PO-Revision-Date: 2013-01-06 08:21+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder liao msa hinet net>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:261
+#: ../app/app_procs.c:208
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
 msgstr "èåïååçå %lu - %lu çæ\n"
 
-#: ../app/app_procs.c:273
+#: ../app/app_procs.c:220
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr "èåïéèéåäåå %lu (%s)ã\n"
 
-#: ../app/app_procs.c:299
+#: ../app/app_procs.c:246
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr "èåïéèéåäåå %d (%s)ã\n"
 
-#: ../app/app_procs.c:308
+#: ../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:390
+#: ../app/app_procs.c:338
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s éèïäæåååååè %s\n"
 
-#: ../app/app_procs.c:399
+#: ../app/app_procs.c:347
 #, 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:407
+#. Translators: Menu item Verb/Channel/Import
+#. Translators: Menu item Verb/Channel/Import/Import
+#: ../app/app_procs.c:353 ../objects/FS/function.c:683
+#: ../objects/FS/function.c:685
+msgid "Import"
+msgstr "åå"
+
+#: ../app/app_procs.c:356
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s éèïéèææçèåæ %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:432
+#: ../app/app_procs.c:384
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s â %s\n"
 
-#: ../app/app_procs.c:593
+#: ../app/app_procs.c:556
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr "æäåèåæå/éæå %s\n"
 
+#: ../app/app_procs.c:626
+#, c-format
+msgid "Input directory '%s' must exist!\n"
+msgstr "åéæèåçé '%s'ï\n"
+
+#: ../app/app_procs.c:643
+#, 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:685
+#: ../app/app_procs.c:693
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "èæéåéæå/æåï %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:704 ../app/app_procs.c:731
+#: ../app/app_procs.c:711
 msgid "Export loaded file and exit"
 msgstr "åååèåçææäçæ"
 
-#: ../app/app_procs.c:704 ../app/app_procs.c:731 ../app/diaconv.c:88
+#: ../app/app_procs.c:711
 msgid "OUTPUT"
 msgstr "èå"
 
 #. &export_file_format
 #. &export_format_string
-#. &export_file_format
-#: ../app/app_procs.c:706 ../app/app_procs.c:733
+#: ../app/app_procs.c:713
 msgid "TYPE"
 msgstr "éå"
 
-#: ../app/app_procs.c:708 ../app/app_procs.c:736
+#: ../app/app_procs.c:715
 msgid "Export graphics size"
-msgstr "ååçåååå"
+msgstr "åååååå"
 
-#: ../app/app_procs.c:708 ../app/app_procs.c:736
+#: ../app/app_procs.c:715
 msgid "WxH"
 msgstr "åxé"
 
-#. 13.3.2004 sampo iki fi
-#: ../app/app_procs.c:710 ../app/app_procs.c:738
+#: ../app/app_procs.c:717
 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)"
 
-#: ../app/app_procs.c:711 ../app/app_procs.c:739
+#: ../app/app_procs.c:718
 msgid "LAYER,LAYER,..."
 msgstr "åå,åå,..."
 
-#: ../app/app_procs.c:713 ../app/app_procs.c:741
+#: ../app/app_procs.c:720
 msgid "Don't show the splash screen"
 msgstr "äéçååçé"
 
-#: ../app/app_procs.c:715 ../app/app_procs.c:743
-msgid "Don't create empty diagram"
+#: ../app/app_procs.c:722
+msgid "Don't create an empty diagram"
 msgstr "äåçææååçåè"
 
-#: ../app/app_procs.c:717 ../app/app_procs.c:745
+#: ../app/app_procs.c:724
+msgid "Start integrated user interface (diagrams in tabs)"
+msgstr "ååæååäçèäé (åèååéäå)"
+
+#: ../app/app_procs.c:726
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "åéèèæéèææèåèäéçåèçã"
 
-#: ../app/app_procs.c:719 ../app/app_procs.c:747
+#: ../app/app_procs.c:728
+msgid "Directory containing input files"
+msgstr "ååèåææççé"
+
+#: ../app/app_procs.c:728 ../app/app_procs.c:730
+msgid "DIRECTORY"
+msgstr "çé"
+
+#: ../app/app_procs.c:730
+msgid "Directory containing output files"
+msgstr "ååèåææççé"
+
+#: ../app/app_procs.c:732
 msgid "Display credits list and exit"
 msgstr "éçéèæååçæ"
 
-#: ../app/app_procs.c:721 ../app/app_procs.c:749
+#: ../app/app_procs.c:734
 msgid "Generate verbose output"
 msgstr "ççèççèå"
 
-#: ../app/app_procs.c:723 ../app/app_procs.c:751
+#: ../app/app_procs.c:736
 msgid "Display version and exit"
 msgstr "éççæåçæ"
 
-#: ../app/app_procs.c:752 ../app/diaconv.c:89
-msgid "Show this help message"
-msgstr "éçæèæèæ"
+#: ../app/app_procs.c:763
+msgid "[FILE...]"
+msgstr "[ææ...]"
+
+#: ../app/app_procs.c:777
+#, c-format
+msgid "Invalid option?"
+msgstr "ééæåçæï"
+
+#: ../app/app_procs.c:800
+#, c-format
+msgid "Filename conversion failed: %s\n"
+msgstr "ææåçèæåæï%s\n"
+
+#: ../app/app_procs.c:813
+#, c-format
+msgid "Missing input: %s\n"
+msgstr "çåèåï%s\n"
 
-#: ../app/app_procs.c:812
+#: ../app/app_procs.c:838
 msgid "Can't connect to session manager!\n"
 msgstr "çæéæäæéæççï\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:852
+#: ../app/app_procs.c:880
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
-msgstr "Dia %s çæïçèæ %s %s\n"
+msgstr "Dia %1$s çïçèæ %3$s %2$s\n"
 
-#: ../app/app_procs.c:854
+#: ../app/app_procs.c:882
 #, c-format
 msgid "Dia version %s\n"
-msgstr "Dia %s çæ\n"
+msgstr "Dia %s ç\n"
 
-#: ../app/app_procs.c:911 ../app/diaconv.c:195 ../app/diaconv.c:197
-#, c-format
+#: ../app/app_procs.c:920
+msgid "Object Defaults"
+msgstr "çäéèå"
+
+#: ../app/app_procs.c:927
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
 msgstr "æåçäåååææäåææçäïçæçå...\n"
 
-#: ../app/app_procs.c:913
+#: ../app/app_procs.c:929
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
 "exiting...\n"
 msgstr "æ '%s' æåçäåååææäåææçäïçæçå...\n"
 
-#: ../app/app_procs.c:971
+#: ../app/app_procs.c:993
 msgid "Diagram1.dia"
 msgstr "åè1.dia"
 
-#: ../app/app_procs.c:1014
+#: ../app/app_procs.c:1028
 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 ""
 "éäèççãèå bugzilla.gnome.org æåéèåå\n"
 "äæèäåääæèæåçã\n"
 
+#: ../app/app_procs.c:1043
+msgid "Exiting Dia"
+msgstr "æåçæ Dia"
+
 #. no standard buttons
-#: ../app/app_procs.c:1027
+#: ../app/app_procs.c:1107
 msgid "Quitting without saving modified diagrams"
 msgstr "åææåååèæåçææäéé"
 
-#: ../app/app_procs.c:1029
+#: ../app/app_procs.c:1109
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
 msgstr "åèææåãæåçåéé Dia èäååï"
 
-#: ../app/app_procs.c:1033
+#: ../app/app_procs.c:1113
 msgid "Quit Dia"
-msgstr "éé Dia"
-
-#. This printf seems to prevent a race condition with unrefs.
-#. Yuck.  -Lars
-#: ../app/app_procs.c:1084
-msgid "Thank you for using Dia.\n"
-msgstr "æèääç Diaã\n"
+msgstr "çæ Dia"
 
-#: ../app/app_procs.c:1101 ../app/app_procs.c:1108
-msgid "Could not create per-user Dia config directory"
+#: ../app/app_procs.c:1186 ../app/app_procs.c:1193
+msgid "Could not create per-user Dia configuration directory"
 msgstr "çæåç Dia åäçæçé"
 
-#: ../app/app_procs.c:1111
-msgid ""
-"Could not create per-user Dia config directory. Please make sure that the "
-"environment variable HOME points to an existing directory."
-msgstr "çæåç Dia åäçæçéãèçå HOME çåèææååæççéã"
-
-#: ../app/app_procs.c:1134 ../app/diaconv.c:245
-msgid "Objects and filters internal to dia"
-msgstr "dia åéçäåéæå"
-
-#: ../app/app_procs.c:1176 ../app/diaconv.c:115
-msgid "[OPTION...] [FILE...]"
-msgstr "[éé...] [ææ...]"
-
-#: ../app/app_procs.c:1179 ../app/diaconv.c:122
-#, c-format
+#: ../app/app_procs.c:1196
 msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"éé %s ççéèï%sã\n"
-"åèâ%s --helpâååååæçæäåééã\n"
+"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:1203
-msgid "[FILE...]"
-msgstr "[ææ...]"
+#: ../app/app_procs.c:1219
+msgid "Objects and filters internal to Dia"
+msgstr "Dia åéçäåéæå"
 
-#: ../app/app_procs.c:1226
+#: ../app/app_procs.c:1272
 #, c-format
-msgid "'%s' not found!\n"
-msgstr "æäåâ%sâï\n"
-
-#: ../app/app_procs.c:1307
 msgid ""
 "The original author of Dia was:\n"
 "\n"
 msgstr ""
-"Dia ååäèçï\n"
+"Dia åäèçï\n"
 "\n"
 
-#: ../app/app_procs.c:1312
+#: ../app/app_procs.c:1277
+#, c-format
 msgid ""
 "\n"
 "The current maintainers of Dia are:\n"
@@ -248,7 +277,8 @@ msgstr ""
 "Dia çåççèèçï\n"
 "\n"
 
-#: ../app/app_procs.c:1317
+#: ../app/app_procs.c:1282
+#, c-format
 msgid ""
 "\n"
 "Other authors are:\n"
@@ -258,7 +288,8 @@ msgstr ""
 "åääèçï\n"
 "\n"
 
-#: ../app/app_procs.c:1322
+#: ../app/app_procs.c:1287
+#, c-format
 msgid ""
 "\n"
 "Dia is documented by:\n"
@@ -268,40 +299,54 @@ msgstr ""
 "Dia æäçåï\n"
 "\n"
 
-#: ../app/autosave.c:90
-msgid "Recovering autosaved diagrams"
-msgstr "æåæååèåååçåè"
-
-#: ../app/autosave.c:98
-msgid ""
-"Autosaved files exist.\n"
-"Please select those you wish to recover."
-msgstr ""
-"ççèåååçææã\n"
-"èéååææååççææã"
-
-#: ../app/color_area.c:317 ../app/color_area.c:364
+#: ../app/color_area.c:333 ../app/color_area.c:343
 msgid "Select foreground color"
 msgstr "éååæèå"
 
-#: ../app/color_area.c:318 ../app/color_area.c:365
+#: ../app/color_area.c:334 ../app/color_area.c:344
 msgid "Select background color"
 msgstr "éåèæèå"
 
-#: ../app/commands.c:134
+#: ../app/commands.c:131
+msgid "No print plugin found!"
+msgstr "æäååååæçåï"
+
+#: ../app/commands.c:150
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "åè%d.dia"
 
-#: ../app/commands.c:207
+#: ../app/commands.c:249
+msgid "No image from Clipboard to paste."
+msgstr ""
+
+#: ../app/commands.c:299
+msgid "No selected object can take an image."
+msgstr ""
+
+#: ../app/commands.c:326
+msgid "Clipboard Paste"
+msgstr "åèçèä"
+
+#. might become more right some day ;)
+#: ../app/commands.c:334
+#, c-format
+msgid "No clipboard handler for '%s'"
+msgstr ""
+
+#: ../app/commands.c:426
+msgid "Clipboard Copy"
+msgstr "åèçèè"
+
+#: ../app/commands.c:625
 msgid "No existing object to paste.\n"
 msgstr "ææçåççäåäèäã\n"
 
-#: ../app/commands.c:583 ../app/commands.c:621
+#: ../app/commands.c:935 ../app/commands.c:973
 msgid "Could not find help directory"
 msgstr "æäåèææäçé"
 
-#: ../app/commands.c:590
+#: ../app/commands.c:942
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -310,17 +355,17 @@ msgstr ""
 "çæéåèææäçéï\n"
 "%s"
 
-#: ../app/commands.c:657
+#: ../app/commands.c:1011
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
-"i18n çåäæåèå\n"
-"http://i18n.linux.org.tw/\n";
+"èçèäçèèå\n"
+"http://groups.google.com.tw/group/chinese-l10n?hl=zh-TW\n";
 "\n"
-"Walter Cheuk <wwycheuk gmail com>, 2007\n"
-"Abel Cheung <maddog linux org hk>, 2001,2003\n"
+"Walter Cheuk <wwycheuk gmail com>, 2007, 2012\n"
+"Abel Cheung <maddog linux org hk>, 2001, 2003\n"
 "Jing-Jong Shyue <shyue sonoma com tw>, 2000"
 
-#: ../app/commands.c:659
+#: ../app/commands.c:1013
 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"
@@ -337,326 +382,279 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: ../app/commands.c:682
+#: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
 msgstr "çççæååèççåã"
 
-#: ../app/defaults.c:43 ../app/defaults.c:146
-msgid "Object defaults"
-msgstr "çäéèå"
-
-#: ../app/defaults.c:61
-msgid "This object has no defaults."
-msgstr "èçäææéèåã"
-
-#: ../app/defaults.c:111
-msgid "Defaults: "
-msgstr "éèåï"
-
-#: ../app/dia-props.c:85
-msgid "Diagram Properties"
-msgstr "åèåæ"
-
-#: ../app/dia-props.c:119
-msgid "Dynamic grid"
-msgstr "åææç"
-
-#: ../app/dia-props.c:127
-msgid "x"
-msgstr "æå"
-
-#: ../app/dia-props.c:131
-msgid "y"
-msgstr "åç"
-
-#: ../app/dia-props.c:136
-msgid "Spacing"
-msgstr "éé"
-
-#: ../app/dia-props.c:156
-msgid "Visible spacing"
-msgstr "åèéé"
-
-#. Hexes!
-#: ../app/dia-props.c:177 ../app/preferences.c:190
-msgid "Hex grid"
-msgstr "åèæç"
-
-#: ../app/dia-props.c:185
-msgid "Hex grid size"
-msgstr "åèæçåå"
-
-#: ../app/dia-props.c:198
-msgid "Grid"
-msgstr "æç"
-
-#: ../app/dia-props.c:209 ../lib/diagramdata.c:113
-msgid "Background"
-msgstr "èæ"
-
-#: ../app/dia-props.c:220 ../app/preferences.c:110
-msgid "Grid Lines"
-msgstr "æç"
-
-#: ../app/dia-props.c:231
-msgid "Page Breaks"
-msgstr "åéç"
-
-#: ../app/dia-props.c:242
-msgid "Colors"
-msgstr "èå"
-
-#. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:263
+#: ../app/confirm.c:65
 #, 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 äç"
-
-#. &export_file_format
-#: ../app/diaconv.c:86
-msgid "Export format to use"
-msgstr "ååçæææå"
-
-#: ../app/diaconv.c:86
-msgid "eps,png,wmf,cgm,dxf,fig"
-msgstr "eps,png,wmf,cgm,dxf,fig"
-
-#. &export_file_name
-#: ../app/diaconv.c:88
-msgid "Export file name to use"
-msgstr "ååææäççæå"
+msgid "You are about to print a diagram with %d pages."
+msgstr "èååæ %d éçåèã"
 
-#: ../app/diaconv.c:90
-msgid "Quiet operation"
-msgstr "äéçèæ"
+#: ../app/confirm.c:67
+#, c-format
+msgid "You are about to export a diagram with %d pages."
+msgstr "èååæ %d éçåèã"
 
-#: ../app/diaconv.c:143
+#: ../app/confirm.c:69
 #, c-format
 msgid ""
-"Error: No arguments found.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"You are about to export a diagram which may require %s of memory.(%d pages)."
+msgstr "èåååèïæéèæéç %sã(%d é)ã"
+
+#: ../app/confirm.c:77
+msgid ""
+"You can adjust the size of the diagram by changing the 'Scaling' in the "
+"'Page Setup' dialog.\n"
+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
+"the intended bounds."
 msgstr ""
-"éèïæäåääåæã\n"
-"åèâ%s --helpâååååæçæäåééã\n"
 
-#: ../app/diaconv.c:153
-#, c-format
-msgid "%s error: can specify only one of -t or -o."
-msgstr "%s éèï-t æ -o ééääååäçåääåã"
+#: ../app/confirm.c:81
+msgid "Confirm Diagram Size"
+msgstr "çèåèåå"
 
-#: ../app/diaconv.c:159
+#: ../app/create_object.c:74
 #, c-format
-msgid ""
-"%s error: must specify only one of -t or -o.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr "%s éèï-t æ -o ééääååäçåääåãåèâ%s --helpâååååæçæäåééã\n"
+msgid "'%s' creation failed"
+msgstr "æèåç '%s'"
 
-#: ../app/diaconv.c:168
-#, c-format
-msgid "%s error: no input file."
-msgstr "%s éèïææèåæã"
+#: ../app/defaults.c:44 ../app/defaults.c:147
+msgid "Object defaults"
+msgstr "çäéèå"
 
-#: ../app/diaconv.c:221
-#, c-format
-msgid "%s error: only one input file expected."
-msgstr "%s éèïåèæåäåèåæã"
+#: ../app/defaults.c:62
+msgid "This object has no defaults."
+msgstr "æçäææéèåã"
 
-#: ../app/diaconv.c:234
-#, c-format
-msgid "%s error: popt library not available on this system"
-msgstr "%s éèïæççäææ popt ååå"
+#: ../app/defaults.c:111
+msgid "Defaults: "
+msgstr "éèåï"
 
-#: ../app/diagram.c:221
+#: ../app/diagram.c:237
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "çæåææåçâ%sâèæè UTF-8ï%s\n"
 
-#: ../app/diagram.c:224 ../lib/message.c:89 ../lib/message.c:292
+#: ../app/diagram.c:240 ../lib/message.c:91 ../lib/message.c:296
 msgid "Error"
 msgstr "éè"
 
-#: ../app/diagram_tree_menu.c:46
-msgid "/_Sort objects"
-msgstr "/æåçä(_S)"
-
-#: ../app/diagram_tree_menu.c:47
-msgid "/Sort objects/by _name"
-msgstr "/æåçä(S)/ææåç(_N)"
-
-#: ../app/diagram_tree_menu.c:49
-msgid "/Sort objects/by _type"
-msgstr "/æåçä(S)/ææéå(_T)"
-
-#: ../app/diagram_tree_menu.c:51
-msgid "/Sort objects/as _inserted"
-msgstr "/æåçä(S)/ææååçæå(_I)"
-
-#: ../app/diagram_tree_menu.c:54
-msgid "/Sort objects/All by name"
-msgstr "/æåçä(S)/åéïææåç"
-
-#: ../app/diagram_tree_menu.c:56
-msgid "/Sort objects/All by type"
-msgstr "/æåçä(S)/åéïææéå"
-
-#: ../app/diagram_tree_menu.c:58
-msgid "/Sort objects/All as inserted"
-msgstr "/æåçä(S)/åéïææååçæå"
+#. ToDo: move context further up in the callstack and to sth useful with it's content
+#: ../app/diagram.c:272
+msgid "Load Into"
+msgstr "èåè"
 
-#: ../app/diagram_tree_menu.c:60
-msgid "/Sort objects/_Default"
-msgstr "/æåçä(S)/éèæå(_D)"
-
-#: ../app/diagram_tree_menu.c:61
-msgid "/Sort objects/Default/by _name"
-msgstr "/æåçä(S)/éèæå(D)/ææåç(_N)"
+#: ../app/diagram.c:1217
+msgid "Trying to group with no selected objects."
+msgstr ""
 
-#: ../app/diagram_tree_menu.c:63
-msgid "/Sort objects/Default/by _type"
-msgstr "/æåçä(S)/éèæå(D)/ææéå(_T)"
+#: ../app/diagram_tree_view.c:164
+msgid "Diagram"
+msgstr "åè"
 
-#: ../app/diagram_tree_menu.c:65
-msgid "/Sort objects/Default/as _inserted"
-msgstr "/æåçä(S)/éèæå(D)/ææååçæå(_I)"
+#: ../app/diagram_tree_view.c:171
+#: ../plug-ins/drs/dia-render-script-import.c:232
+msgid "Layer"
+msgstr "åå"
 
-#: ../app/diagram_tree_menu.c:67
-msgid "/Sort _diagrams"
-msgstr "/æååè(_D)"
+#: ../app/diagram_tree_view.c:177
+#, c-format
+msgid "%d Layer"
+msgid_plural "%d Layers"
+msgstr[0] "%d ååå"
+msgstr[1] "%d ååå"
 
-#: ../app/diagram_tree_menu.c:68
-msgid "/Sort _diagrams/by _name"
-msgstr "/æååè/ææåç(_N)"
+#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
+#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:143
+#: ../objects/Istar/actor.c:144 ../objects/Istar/other.c:147
+#: ../objects/Istar/other.c:148 ../objects/KAOS/other.c:150
+#: ../objects/KAOS/other.c:151 ../objects/UML/association.c:243
+#: ../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:70
-msgid "/Sort _diagrams/as _inserted"
-msgstr "/æååè/ææååçæå(_I)"
+#: ../app/diagram_tree_view.c:184
+msgid "object|Position"
+msgstr "çä|äç"
 
-#: ../app/diagram_tree_menu.c:72
-msgid "/Sort diagrams/_Default"
-msgstr "/æååè/éèæå(_D)"
+#: ../app/diagram_tree_view.c:187
+msgid "Children"
+msgstr "åçä"
 
-#: ../app/diagram_tree_menu.c:73
-msgid "/Sort diagrams/Default/by _name"
-msgstr "/æååè/éèæå(D)/ææåç(_N)"
+#: ../app/diagram_tree_view.c:191
+#, c-format
+msgid "%d Object"
+msgid_plural "%d Objects"
+msgstr[0] "%d åçä"
+msgstr[1] "%d åçä"
 
-#: ../app/diagram_tree_menu.c:75
-msgid "/Sort diagrams/Default/as _inserted"
-msgstr "/æååè/éèæå(D)/ææååçæå(_I)"
+#: ../app/diagram_tree_view.c:448
+msgid "Select"
+msgstr "éå"
 
-#: ../app/diagram_tree_menu.c:83 ../app/diagram_tree_menu.c:94
-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:809
+#: ../objects/FS/function.c:1051
+msgid "Locate"
+msgstr "æç"
 
-#: ../app/diagram_tree_menu.c:84
-msgid "/_Properties"
-msgstr "/åæ(_P)"
+#: ../app/diagram_tree_view.c:450
+msgid "Properties"
+msgstr "åæ"
 
-#: ../app/diagram_tree_menu.c:85
-msgid "/_Hide this type"
-msgstr "/éèæéå(_H)"
+#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:123
+#: ../app/plugin-manager.c:270 ../objects/Database/table.c:138
+#: ../objects/Database/table.c:181 ../objects/UML/association.c:237
+#: ../objects/UML/class.c:140 ../objects/UML/large_package.c:132
+#: ../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:111
+#: ../app/diagram_tree_view.c:565
 msgid "Diagram Tree"
 msgstr "åèçææ"
 
-#: ../app/dialogs.c:51
-msgid "Ok"
-msgstr "çå"
-
-#: ../app/dialogs.c:52 ../app/paginate_psprint.c:324
-msgid "Cancel"
-msgstr "åæ"
-
 #. paper size
-#: ../app/diapagelayout.c:117
+#: ../app/diapagelayout.c:155
 msgid "Paper Size"
 msgstr "çååå"
 
 #. orientation
-#: ../app/diapagelayout.c:150
+#: ../app/diapagelayout.c:184
 msgid "Orientation"
 msgstr "æå"
 
 #. margins
-#: ../app/diapagelayout.c:188
+#: ../app/diapagelayout.c:213
 msgid "Margins"
 msgstr "éç"
 
-#: ../app/diapagelayout.c:200
+#: ../app/diapagelayout.c:225
 msgid "Top:"
 msgstr "äï"
 
-#: ../app/diapagelayout.c:213
+#: ../app/diapagelayout.c:238
 msgid "Bottom:"
 msgstr "äï"
 
-#: ../app/diapagelayout.c:226
+#: ../app/diapagelayout.c:251
 msgid "Left:"
 msgstr "åï"
 
-#: ../app/diapagelayout.c:239
+#: ../app/diapagelayout.c:264
 msgid "Right:"
 msgstr "åï"
 
 #. Scaling
-#: ../app/diapagelayout.c:253
+#: ../app/diapagelayout.c:278
 msgid "Scaling"
 msgstr "çæ"
 
-#: ../app/diapagelayout.c:264
+#: ../app/diapagelayout.c:289
 msgid "Scale:"
 msgstr "æäï"
 
-#: ../app/diapagelayout.c:276
+#: ../app/diapagelayout.c:301
 msgid "Fit to:"
 msgstr "çåï"
 
-#: ../app/diapagelayout.c:288
+#: ../app/diapagelayout.c:313
 msgid "by"
 msgstr "æ"
 
-#: ../app/diapagelayout.c:699
+#: ../app/diapagelayout.c:732
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3gåç Ã %0.3gåç"
 
-#: ../app/diapagelayout.c:803 ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:836 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "ééèå"
 
-#: ../app/disp_callbacks.c:84 ../app/properties.c:152
+#: ../app/dia-props.c:86
+msgid "Diagram Properties"
+msgstr "åèåæ"
+
+#: ../app/dia-props.c:120
+msgid "Dynamic grid"
+msgstr "åææç"
+
+#: ../app/dia-props.c:128
+msgid "x"
+msgstr "æå"
+
+#: ../app/dia-props.c:132
+msgid "y"
+msgstr "åç"
+
+#: ../app/dia-props.c:137
+msgid "Spacing"
+msgstr "éé"
+
+#: ../app/dia-props.c:157
+msgid "Visible spacing"
+msgstr "åèéé"
+
+#. Hexes!
+#: ../app/dia-props.c:178 ../app/preferences.c:243
+msgid "Hex grid"
+msgstr "åèæç"
+
+#: ../app/dia-props.c:186
+msgid "Hex grid size"
+msgstr "åèæçåå"
+
+#: ../app/dia-props.c:199
+msgid "Grid"
+msgstr "æç"
+
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
+msgid "Background"
+msgstr "èæ"
+
+#: ../app/dia-props.c:221 ../app/preferences.c:122
+msgid "Grid Lines"
+msgstr "æç"
+
+#: ../app/dia-props.c:232
+msgid "Page Breaks"
+msgstr "åéç"
+
+#: ../app/dia-props.c:243
+msgid "Colors"
+msgstr "èå"
+
+#. Can we be sure that the filename is the 'proper title'?
+#: ../app/dia-props.c:264
+#, c-format
+msgid "Diagram Properties: %s"
+msgstr "åèåæï%s"
+
+#: ../app/disp_callbacks.c:91 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 msgstr ""
-"èçääææåå/åæååçåã\n"
-"æéæéååçèèã"
+"æçääææåå/åæååçåã\n"
+"ååéçæååçèèã"
 
-#: ../app/disp_callbacks.c:119
-msgid "Properties..."
+#: ../app/disp_callbacks.c:126
+msgid "Propertiesâ"
 msgstr "åæ..."
 
-#: ../app/disp_callbacks.c:921
+#: ../app/disp_callbacks.c:165
+msgid "Follow linkâ"
+msgstr "èééç..."
+
+#: ../app/disp_callbacks.c:287
+msgid "Selection"
+msgstr "éåå"
+
+#: ../app/disp_callbacks.c:1057
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -664,35 +662,36 @@ msgstr ""
 "äæææççäçææéåçççääã\n"
 "äåäåççäæåæææèçäææååèã"
 
-#: ../app/display.c:105
-msgid "Diagram modified!"
-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:132
+#: ../app/display.c:109
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "%d åçäçéåå"
 msgstr[1] "%d åçäçéåå"
 
-#: ../app/display.c:142
+#: ../app/display.c:119
 #, c-format
 msgid "Selected '%s'"
 msgstr "åéåâ%sâ"
 
-#: ../app/display.c:1160
+#. we really should not come here but instead disable the menu command earlier
+#: ../app/display.c:1177
+msgid "No antialiased renderer found"
+msgstr ""
+
+#: ../app/display.c:1327
 msgid "<unnamed>"
 msgstr "<æåå>"
 
 #. no standard buttons
-#: ../app/display.c:1166
+#: ../app/display.c:1333
 msgid "Closing diagram without saving"
 msgstr "äååäééåè"
 
-#: ../app/display.c:1169
+#: ../app/display.c:1335
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -701,88 +700,77 @@ msgstr ""
 "åèâ%sâ\n"
 "åæååãæåçåååï"
 
-#: ../app/display.c:1171
+#: ../app/display.c:1337
 msgid "Close Diagram"
 msgstr "ééåè"
 
-#: ../app/display.c:1176
+#: ../app/display.c:1342
 msgid "_Discard Changes"
 msgstr "ææææåå(_D)"
 
-#: ../app/export_png.c:138 ../app/load_save.c:950 ../app/render_eps.c:105
-#: ../plug-ins/cairo/diacairo.c:984 ../plug-ins/cgm/cgm.c:1153
-#: ../plug-ins/dxf/dxf-export.c:485 ../plug-ins/hpgl/hpgl.c:710
-#: ../plug-ins/metapost/render_metapost.c:1177
-#: ../plug-ins/pgf/render_pgf.c:1208
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:136 ../plug-ins/svg/render_svg.c:152
-#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1138 ../plug-ins/xslt/xslt.c:96
-#, c-format
-msgid "Can't open output file %s: %s\n"
-msgstr "çæéåèåæ %sï%s\n"
+#: ../app/exit_dialog.c:77
+msgid "Do Not Exit"
+msgstr "äçæ"
 
-#: ../app/export_png.c:146
-msgid "Could not create PNG write structure"
-msgstr "çæçç PNG ååçæ"
+#: ../app/exit_dialog.c:79
+msgid "Exit Without Save"
+msgstr "çæèäåå"
 
-#: ../app/export_png.c:155
-msgid "Could not create PNG header info structure"
-msgstr "çæçç PNG æéèèçæ"
+#: ../app/exit_dialog.c:81
+msgid "Save Selected"
+msgstr "åéååå"
 
-#: ../app/export_png.c:163
-msgid "Error occurred while writing PNG"
-msgstr "çåå PNG æççéè"
+#: ../app/exit_dialog.c:87
+msgid "The following are not saved:"
+msgstr "ääçäååï"
 
-#. Create a dialog
-#: ../app/export_png.c:303
-msgid "PNG Export Options"
-msgstr "PNG ååéé"
+#: ../app/exit_dialog.c:113
+msgid "Save"
+msgstr "åå"
 
-#. Translators: Menu item Verb/Channel/Export
-#. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/export_png.c:304 ../objects/FS/function.c:696
-#: ../objects/FS/function.c:698
-msgid "Export"
-msgstr "åå"
+#: ../app/exit_dialog.c:129
+msgid "Path"
+msgstr "èå"
 
-#: ../app/export_png.c:309
-msgid "Image width:"
-msgstr "ååéåï"
+#: ../app/exit_dialog.c:142
+msgid "Select All"
+msgstr "åééå"
 
-#: ../app/export_png.c:312
-msgid "Image height:"
-msgstr "ååéåï"
+#: ../app/exit_dialog.c:150
+msgid "Select None"
+msgstr "åéäé"
 
-#: ../app/export_png.c:358
-msgid "PNG (anti-aliased)"
-msgstr "PNG (åæå)"
+#: ../app/exit_dialog.c:236
+msgid "Nothing selected for saving.  Would you like to try again?"
+msgstr ""
 
-#: ../app/filedlg.c:132 ../app/filedlg.c:534
+#: ../app/filedlg.c:144 ../app/filedlg.c:152 ../app/filedlg.c:168
+#: ../app/filedlg.c:819 ../lib/widgets.c:406
+msgid "Supported Formats"
+msgstr "ææçæå"
+
+#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:662
+#: ../app/filedlg.c:664
 msgid "By extension"
 msgstr "ææåäæå"
 
-#: ../app/filedlg.c:219
+#: ../app/filedlg.c:293
 msgid "Open Diagram"
 msgstr "éååè"
 
-#: ../app/filedlg.c:248
+#: ../app/filedlg.c:326
 msgid "Open Options"
 msgstr "éåéé"
 
-#: ../app/filedlg.c:256 ../app/filedlg.c:656
+#: ../app/filedlg.c:334 ../app/filedlg.c:801
 msgid "Determine file type:"
 msgstr "æåææéåï"
 
-#: ../app/filedlg.c:272 ../app/filedlg.c:674
-msgid "Supported Formats"
-msgstr "ææçæå"
-
-#: ../app/filedlg.c:278 ../app/filedlg.c:669
+#: ../app/filedlg.c:354 ../app/filedlg.c:814 ../lib/widgets.c:414
 msgid "All Files"
 msgstr "ææææ"
 
-#: ../app/filedlg.c:312 ../app/paginate_psprint.c:410
+#: ../app/filedlg.c:393 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -792,11 +780,13 @@ msgstr ""
 "ääåæäçåäççççã\n"
 "åäåèæççéèã"
 
-#: ../app/filedlg.c:322 ../app/filedlg.c:581 ../app/paginate_psprint.c:425
+#: ../app/filedlg.c:403 ../app/filedlg.c:716
+#: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "åæèææ"
 
-#: ../app/filedlg.c:324 ../app/filedlg.c:583 ../app/paginate_psprint.c:417
+#: ../app/filedlg.c:405 ../app/filedlg.c:718
+#: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -805,237 +795,162 @@ msgstr ""
 "åæâ%sâææã\n"
 "æåèèåï"
 
-#: ../app/filedlg.c:377
+#: ../app/filedlg.c:489
 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:389
+#: ../app/filedlg.c:503
 msgid "Compress diagram files"
 msgstr "åçåèææ"
 
-#: ../app/filedlg.c:398
+#: ../app/filedlg.c:512
 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ïåææååèååååãäæäæåçèåçæèçåçææã"
 
-#: ../app/filedlg.c:607
+#: ../app/filedlg.c:747
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 msgstr ""
-"çææåäçååååéæå\n"
+"çææåäååååéæå\n"
 "äååâ%sâ"
 
-#: ../app/filedlg.c:631
+#: ../app/filedlg.c:774
 msgid "Export Diagram"
 msgstr "åååè"
 
-#: ../app/filedlg.c:648
+#: ../app/filedlg.c:793
 msgid "Export Options"
 msgstr "ååéé"
 
-#: ../app/interface.c:144
-msgid ""
-"Modify object(s)\n"
-"Use <Space> to toggle between this and other tools"
-msgstr ""
-"äæçä\n"
-"äçïçæïåææååååäåå"
+#: ../app/find-and-replace.c:480
+msgid "_Search for:"
+msgstr "æå(_S)ï"
 
-#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:150 ../app/menus.c:210 ../objects/FS/function.c:986
-msgid "Magnify"
-msgstr "æå"
+#: ../app/find-and-replace.c:493
+msgid "Replace _with:"
+msgstr "ææç(_W)ï"
 
-#: ../app/interface.c:156
-msgid "Scroll around the diagram"
-msgstr "ååèäæå"
+#: ../app/find-and-replace.c:503
+msgid "_Match case"
+msgstr "çåååå(_M)"
 
-#: ../app/interface.c:162 ../app/menus.c:212 ../lib/properties.c:79
-#: ../lib/properties.h:522 ../objects/AADL/aadlbox.c:144
-#: ../objects/Jackson/requirement.c:142 ../objects/UML/activity.c:127
-#: ../objects/UML/actor.c:122 ../objects/UML/classicon.c:144
-#: ../objects/UML/component.c:128 ../objects/UML/component_feature.c:155
-#: ../objects/UML/node.c:127 ../objects/UML/note.c:121
-#: ../objects/UML/object.c:148 ../objects/UML/small_package.c:128
-#: ../objects/UML/state.c:152 ../objects/UML/usecase.c:138
-#: ../objects/custom/custom_object.c:200 ../objects/network/basestation.c:133
-#: ../objects/network/radiocell.c:125
-msgid "Text"
-msgstr "æå"
+#: ../app/find-and-replace.c:507
+msgid "Match _entire word only"
+msgstr "çåæåå(_E)"
 
-#: ../app/interface.c:168 ../app/menus.c:213
-msgid "Box"
-msgstr "ææ"
+#: ../app/find-and-replace.c:511
+msgid "Match _all properties (not just object name)"
+msgstr "çåææåæ (äåçäåç)(_A)"
 
-#: ../app/interface.c:174 ../app/menus.c:214
-msgid "Ellipse"
-msgstr "æå"
-
-#: ../app/interface.c:180 ../app/menus.c:215
-msgid "Polygon"
-msgstr "åéå"
-
-#: ../app/interface.c:186 ../app/menus.c:216
-msgid "Beziergon"
-msgstr "èèåéæç"
-
-#: ../app/interface.c:192 ../app/menus.c:218 ../objects/standard/line.c:225
-msgid "Line"
-msgstr "è"
-
-#: ../app/interface.c:198 ../app/menus.c:219
-msgid "Arc"
-msgstr "åç"
-
-#: ../app/interface.c:204 ../app/menus.c:220
-msgid "Zigzagline"
-msgstr "Z åç"
+#: ../app/find-and-replace.c:537
+msgid "Find"
+msgstr "åæ"
 
-#: ../app/interface.c:210 ../app/menus.c:221
-msgid "Polyline"
-msgstr "èççæ"
+#: ../app/find-and-replace.c:567 ../app/menus.c:263
+msgid "Replace"
+msgstr "ææ"
 
-#: ../app/interface.c:216 ../app/menus.c:222
-msgid "Bezierline"
-msgstr "èèæç"
+#: ../app/find-and-replace.c:570
+msgid "Replace _All"
+msgstr "åéææ(_A)"
 
-#: ../app/interface.c:222 ../app/menus.c:224
-msgid "Image"
-msgstr "åå"
+#. 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:575
+msgid "_Replace"
+msgstr "ææ(_R)"
 
-#: ../app/interface.c:561 ../app/interface.c:795
+#: ../app/interface.c:517
 msgid "Pops up the Navigation window."
 msgstr "åååèèçã"
 
-#: ../app/interface.c:757
+#: ../app/interface.c:732
 msgid "Diagram menu."
 msgstr "åèéåã"
 
-#: ../app/interface.c:861
+#: ../app/interface.c:772
 msgid "Zoom"
 msgstr "çæ"
 
-#: ../app/interface.c:876
+#: ../app/interface.c:787
 msgid "Toggles snap-to-grid for this window."
 msgstr "åæèçåæçèçæçã"
 
-#: ../app/interface.c:887
+#: ../app/interface.c:798
 msgid "Toggles object snapping for this window."
 msgstr "åæçäåæçèçæçã"
 
-#: ../app/interface.c:950
-msgid "NULL tooldata in tool_select_update"
-msgstr "å tool_select_update ä tooldata çåç NULL"
-
-#: ../app/interface.c:1266
-#, c-format
-msgid "No sheet named %s"
-msgstr "ææåç %s çåäè"
-
-#: ../app/interface.c:1304
-msgid "Other sheets"
-msgstr "åååäè"
-
-#: ../app/interface.c:1363 ../sheets/Misc.sheet.in.h:3
-msgid "Misc"
-msgstr "åå"
-
-#: ../app/interface.c:1423
-msgid ""
-"Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double click to change "
-"colors."
-msgstr ""
-"æçäçåæåèæèåã\n"
-"éçåæååéèèåã\n"
-"åçéåäæèåã\n"
-"éæåäåææèåã"
-
-#: ../app/interface.c:1438
-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:1481
-msgid ""
-"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details..."
-msgstr "æçæééççéæåãééåäæéçéïææç èæ... èåçéåæ"
-
-#: ../app/interface.c:1486
-msgid ""
-"Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details..."
-msgstr "æçæççææåãééåäæéçææåïææç èæ... èåçæåæ"
-
-#: ../app/interface.c:1502
-msgid ""
-"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details..."
-msgstr "æçæçåççéæåãééåäæéçéïææç èæ... èåçéåæ"
-
-#: ../app/interface.c:1546 ../app/interface.c:1674
+#: ../app/interface.c:926 ../app/interface.c:1034 ../dia.desktop.in.in.h:2
 msgid "Diagram Editor"
-msgstr "åèçèå"
+msgstr "åèçè"
 
-#: ../app/layer_dialog.c:101
+#: ../app/layer_dialog.c:165
 msgid "New Layer"
 msgstr "æååå"
 
-#: ../app/layer_dialog.c:102
+#: ../app/layer_dialog.c:166
 msgid "Raise Layer"
 msgstr "ææåå"
 
-#: ../app/layer_dialog.c:103
+#: ../app/layer_dialog.c:167
 msgid "Lower Layer"
 msgstr "éäåå"
 
-#: ../app/layer_dialog.c:104
+#: ../app/layer_dialog.c:168
 msgid "Delete Layer"
 msgstr "åéåå"
 
-#: ../app/layer_dialog.c:225
+#: ../app/layer_dialog.c:311
+msgid "Layers:"
+msgstr "ååï"
+
+#: ../app/layer_dialog.c:390
 msgid "Layers"
 msgstr "åå"
 
-#: ../app/layer_dialog.c:239
+#: ../app/layer_dialog.c:404
 msgid "Diagram:"
 msgstr "åèï"
 
-#: ../app/layer_dialog.c:349
+#: ../app/layer_dialog.c:518 ../app/layer_dialog.c:1231
 #, c-format
 msgid "New layer %d"
 msgstr "æåå %d"
 
-#: ../app/layer_dialog.c:561
+#: ../app/layer_dialog.c:733
 msgid "none"
 msgstr "ç"
 
-#: ../app/layer_dialog.c:983
-msgid "Edit Layer Attributes"
-msgstr "çèåååæ"
+#: ../app/layer_dialog.c:1201
+msgid "Edit Layer"
+msgstr "çèåå"
+
+#: ../app/layer_dialog.c:1201
+msgid "Add Layer"
+msgstr "åååå"
 
-#: ../app/layer_dialog.c:1002
+#: ../app/layer_dialog.c:1220
 msgid "Layer name:"
 msgstr "åååçï"
 
-#: ../app/linewidth_area.c:246 ../lib/properties.h:483 ../lib/properties.h:486
+#: ../app/linewidth_area.c:247 ../lib/properties.h:622 ../lib/properties.h:625
 #: ../objects/chronogram/chronoline.c:181
 #: ../objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "çæéå"
 
-#: ../app/linewidth_area.c:258
+#: ../app/linewidth_area.c:259
 msgid "Line width:"
 msgstr "çæéåï"
 
-#: ../app/load_save.c:262
+#: ../app/load_save.c:266
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1043,49 +958,47 @@ msgstr ""
 "èååèæççéèã\n"
 "æäåæäåéççäã"
 
-#: ../app/load_save.c:265
+#: ../app/load_save.c:270
+#, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle does not exist."
+"Connection handle %d does not exist on '%s'."
 msgstr ""
 "èååèæççéèã\n"
-"ææéæåäã"
+"éæåä %d äå '%s'ã"
 
-#: ../app/load_save.c:282
+#: ../app/load_save.c:288
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection point %s does not exist."
+"Connection point %d does not exist on '%s'."
 msgstr ""
 "èååèæççéèã\n"
-"ææéæé %sã"
+"éæé %d äå '%s'ã"
 
-#: ../app/load_save.c:307
+#: ../app/load_save.c:328
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "æäå %2$s çäççéç %1$s\n"
 
-#: ../app/load_save.c:353 ../objects/SISSI/area.c:204
-#: ../objects/SISSI/faraday.c:204 ../objects/SISSI/room.c:204
-#: ../objects/SISSI/sissi_object.c:194 ../objects/SISSI/site.c:207
-msgid "You must specify a file, not a directory.\n"
-msgstr "äåéæåææèäæçéã\n"
+#: ../app/load_save.c:378
+msgid "You must specify a file, not a directory."
+msgstr "äåéæåææèäæçéã"
 
-#: ../app/load_save.c:360 ../objects/SISSI/area.c:210
-#: ../objects/SISSI/faraday.c:210 ../objects/SISSI/room.c:210
-#: ../objects/SISSI/sissi_object.c:201 ../objects/SISSI/site.c:213
-#: ../plug-ins/dxf/dxf-import.c:1304 ../plug-ins/wpg/wpg.c:1177
-#: ../plug-ins/xfig/xfig-import.c:1260 ../plug-ins/xslt/xslt.c:88
+#: ../app/load_save.c:385 ../plug-ins/dxf/dxf-import.c:1289
+#: ../plug-ins/wpg/wpg.c:1186 ../plug-ins/xfig/xfig-import.c:1288
+#: ../plug-ins/xslt/xslt.c:93
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "çæéåâ%sâäèåèæã\n"
 
-#: ../app/load_save.c:378 ../app/load_save.c:384 ../objects/SISSI/area.c:219
-#: ../objects/SISSI/area.c:225 ../objects/SISSI/faraday.c:219
-#: ../objects/SISSI/faraday.c:225 ../objects/SISSI/room.c:219
-#: ../objects/SISSI/room.c:225 ../objects/SISSI/sissi_object.c:211
-#: ../objects/SISSI/sissi_object.c:217 ../objects/SISSI/site.c:222
-#: ../objects/SISSI/site.c:228
+#. this was talking about unknown file type but it could as well be broken XML
+#: ../app/load_save.c:403
+#, c-format
+msgid "Error loading diagram %s."
+msgstr "èååè %s æççéèã"
+
+#: ../app/load_save.c:408
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1094,9 +1007,7 @@ msgstr ""
 "èååè %s æççéèã\n"
 "ææéåäæã"
 
-#: ../app/load_save.c:392 ../objects/SISSI/area.c:233
-#: ../objects/SISSI/faraday.c:233 ../objects/SISSI/room.c:233
-#: ../objects/SISSI/sissi_object.c:225 ../objects/SISSI/site.c:236
+#: ../app/load_save.c:416
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1105,7 +1016,7 @@ msgstr ""
 "èååè %s æççéèã\n"
 "äæ Dia ææã"
 
-#: ../app/load_save.c:598
+#: ../app/load_save.c:674
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1115,488 +1026,642 @@ msgstr ""
 "èååè %s æççéèã\n"
 "ææç Dia æææåæäåååã"
 
-#: ../app/load_save.c:906
+#: ../app/load_save.c:1017
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "äåèååèåæ %s\n"
 
-#: ../app/load_save.c:928
+#: ../app/load_save.c:1049
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "äåèåå %s äçèæææ\n"
 
+#: ../app/load_save.c:1072 ../plug-ins/cgm/cgm.c:1172
+#: ../plug-ins/dxf/dxf-export.c:599
+#: ../plug-ins/metapost/render_metapost.c:1179
+#: ../plug-ins/pgf/render_pgf.c:1204 ../plug-ins/postscript/render_eps.c:123
+#: ../plug-ins/pstricks/render_pstricks.c:920
+#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wmf/wmf.cpp:1374
+#: ../plug-ins/wpg/wpg.c:1078 ../plug-ins/xfig/xfig-export.c:1158
+#, c-format
+msgid "Can't open output file %s"
+msgstr "çæéåèåæ %s"
+
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:961
+#: ../app/load_save.c:1083
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "åé %d éèïçæååææ %s\n"
 
-#: ../app/load_save.c:975
+#: ../app/load_save.c:1094
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "çæå %s éæååèæåèåæ %sï%s\n"
 
-#: ../app/load_save.c:1063 ../app/load_save.c:1068
+#: ../app/load_save.c:1110
+msgid "Diagram Save"
+msgstr "åèåå"
+
+#: ../app/load_save.c:1240 ../app/load_save.c:1245
 msgid "Dia Diagram File"
 msgstr "Dia åèææ"
 
-#
-#: ../app/menus.c:70
+#: ../app/menus.c:63
+msgid "Fit"
+msgstr "éå"
+
+#: ../app/menus.c:80
 msgid "_File"
 msgstr "ææ(_F)"
 
-#
-#: ../app/menus.c:74
+#: ../app/menus.c:81
+msgid "Create a new diagram"
+msgstr "åçæåè"
+
+#: ../app/menus.c:82
+msgid "_Openâ"
+msgstr "éå(_O)..."
+
+#: ../app/menus.c:82
+msgid "Open a diagram file"
+msgstr "éååèææ"
+
+#: ../app/menus.c:84
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../app/menus.c:82
-msgid "Sheets and Objects..."
+#: ../app/menus.c:94
+msgid "Sheets and Objectsâ"
 msgstr "åäèèçä..."
 
-#: ../app/menus.c:84
-msgid "Plugins..."
+#: ../app/menus.c:96
+msgid "Pluginsâ"
 msgstr "åææç..."
 
-#: ../app/menus.c:90
-msgid "_Diagram tree..."
-msgstr "åèçææ(_D)..."
+#: ../app/menus.c:97
+msgid "_Diagram Tree"
+msgstr "åèçææ(_D)"
 
-#: ../app/menus.c:96
-#, fuzzy
+#: ../app/menus.c:102
 msgid "Show Toolbar"
-msgstr "éçæé"
+msgstr "éçååå"
 
-#: ../app/menus.c:97
-#, fuzzy
+#: ../app/menus.c:103
 msgid "Show Statusbar"
-msgstr "éçåæ"
+msgstr "éççæå"
 
-#
-#: ../app/menus.c:105
-msgid "_Export ..."
+#: ../app/menus.c:104
+msgid "Show Layers"
+msgstr "éçåå"
+
+#: ../app/menus.c:110
+msgid "Save the diagram"
+msgstr "åååè"
+
+#: ../app/menus.c:111
+msgid "Save _Asâ"
+msgstr "ååç(_A)..."
+
+#: ../app/menus.c:111
+msgid "Save the diagram with a new name"
+msgstr "äæåçåååè"
+
+#: ../app/menus.c:112
+msgid "_Exportâ"
 msgstr "åå(_E)..."
 
-#: ../app/menus.c:106
-msgid "Page Set_up..."
+#: ../app/menus.c:112
+msgid "Export the diagram"
+msgstr "åååè"
+
+#: ../app/menus.c:113
+msgid "_Diagram Properties"
+msgstr "åèåæ(_D)"
+
+#: ../app/menus.c:114
+msgid "Page Set_upâ"
 msgstr "ééèå(_U)..."
 
-#: ../app/menus.c:110 ../app/sheets_dialog.c:235
+#: ../app/menus.c:115
+msgid "_Printâ"
+msgstr "æå(_P)..."
+
+#: ../app/menus.c:115
+msgid "Print the diagram"
+msgstr "åååè"
+
+#: ../app/menus.c:118
 msgid "_Edit"
 msgstr "çè (_E)"
 
-#
-#: ../app/menus.c:117
+#: ../app/menus.c:119
+msgid "Undo"
+msgstr "åå"
+
+#: ../app/menus.c:120
+msgid "Redo"
+msgstr "éå"
+
+#: ../app/menus.c:122
+msgid "Copy selection"
+msgstr "èèéåå"
+
+#: ../app/menus.c:123
+msgid "Cut selection"
+msgstr "åäéåå"
+
+#: ../app/menus.c:124
+msgid "Paste selection"
+msgstr "èäéåå"
+
+#: ../app/menus.c:125
 msgid "_Duplicate"
-msgstr "éè(_D)"
+msgstr "èäèæ(_D)"
+
+#: ../app/menus.c:128
+msgid "_Findâ"
+msgstr "åæ(_F)..."
+
+#: ../app/menus.c:129
+msgid "_Replaceâ"
+msgstr "ææ(_R)..."
 
 #
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control>>alt> doesn't work either
-#: ../app/menus.c:122
+#. * <control><alt> doesn't work either
+#: ../app/menus.c:133
 msgid "Copy Text"
 msgstr "èèæå"
 
 #
-#: ../app/menus.c:123
+#: ../app/menus.c:134
 msgid "Cut Text"
 msgstr "åäæå"
 
 #
-#: ../app/menus.c:124
+#: ../app/menus.c:135
 msgid "Paste _Text"
 msgstr "èäæå(_T)"
 
 #
-#: ../app/menus.c:126
-msgid "_Diagram"
-msgstr "åè(_D)"
+#: ../app/menus.c:137
+msgid "Paste _Image"
+msgstr "èäåå(_I)"
 
-#: ../app/menus.c:128
-msgid "_Layers..."
+#: ../app/menus.c:139
+msgid "_Layers"
+msgstr "åå(_L)"
+
+#: ../app/menus.c:140
+msgid "Add Layerâ"
+msgstr "åååå..."
+
+#: ../app/menus.c:141
+msgid "Rename Layerâ"
+msgstr "éæåååå..."
+
+#: ../app/menus.c:142
+msgid "Move Selection to Layer above"
+msgstr "åéååçèäæåå"
+
+#: ../app/menus.c:143
+msgid "Move Selection to Layer below"
+msgstr "åéååçèäæåå"
+
+#: ../app/menus.c:144
+msgid "_Layersâ"
 msgstr "åå(_L)..."
 
-#
-#: ../app/menus.c:130
+#: ../app/menus.c:145
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../app/menus.c:133
+#: ../app/menus.c:146
+msgid "Zoom in"
+msgstr "æå"
+
+#: ../app/menus.c:147
+msgid "Zoom out"
+msgstr "çå"
+
+#: ../app/menus.c:148
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:149
 msgid "1600%"
-msgstr ""
+msgstr "1600%"
 
-#: ../app/menus.c:135
+#: ../app/menus.c:150 ../app/menus.c:578 ../app/menus.c:590
 msgid "800%"
-msgstr ""
+msgstr "800%"
 
-#: ../app/menus.c:136
+#: ../app/menus.c:151 ../app/menus.c:579 ../app/menus.c:591
 msgid "400%"
-msgstr ""
+msgstr "400%"
 
-#: ../app/menus.c:137
+#: ../app/menus.c:152
 msgid "283"
-msgstr ""
+msgstr "283"
 
-#: ../app/menus.c:138
+#: ../app/menus.c:153
 msgid "200"
-msgstr ""
+msgstr "200"
 
-#: ../app/menus.c:139
+#: ../app/menus.c:154
 msgid "141"
-msgstr ""
+msgstr "141"
 
-#: ../app/menus.c:141
+#: ../app/menus.c:156
 msgid "85"
-msgstr ""
+msgstr "85"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:157
 msgid "70.7"
-msgstr ""
+msgstr "70.7"
 
-#: ../app/menus.c:143
+#: ../app/menus.c:158
 msgid "50"
-msgstr ""
+msgstr "50"
 
-#: ../app/menus.c:144
+#: ../app/menus.c:159
 msgid "35.4"
-msgstr ""
+msgstr "35.4"
 
-#: ../app/menus.c:145
+#: ../app/menus.c:160
 msgid "25"
-msgstr ""
+msgstr "25"
+
+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
+#: ../app/menus.c:162
+msgid "Zoom fit"
+msgstr "çæèéå"
 
 #
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:151
+#: ../app/menus.c:166
 msgid "New _View"
 msgstr "æåæè(_V)"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:167
 msgid "C_lone View"
-msgstr "èèæè(_L)"
+msgstr "èäæèèæ(_L)"
 
-#
-#: ../app/menus.c:155
+#: ../app/menus.c:170
 msgid "_Objects"
 msgstr "çä(_O)"
 
-#
-#: ../app/menus.c:156
+#: ../app/menus.c:171
 msgid "Send to _Back"
 msgstr "éåæåå(_B)"
 
-#
-#: ../app/menus.c:157
+#: ../app/menus.c:172
 msgid "Bring to _Front"
 msgstr "éåæåå(_F)"
 
-#
-#: ../app/menus.c:158
+#: ../app/menus.c:173
 msgid "Send Backwards"
 msgstr "ååäå"
 
-#
-#: ../app/menus.c:159
+#: ../app/menus.c:174
 msgid "Bring Forwards"
 msgstr "ååäå"
 
-#: ../app/menus.c:161
+#: ../app/menus.c:176
 msgid "_Group"
 msgstr "çç(_G)"
 
-#
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:163
+#: ../app/menus.c:178
 msgid "_Ungroup"
 msgstr "èæçç(_U)"
 
-#: ../app/menus.c:165
+#: ../app/menus.c:180
 msgid "_Parent"
 msgstr "ççä(_P)"
 
-#
-#: ../app/menus.c:166
+#: ../app/menus.c:181
 msgid "_Unparent"
 msgstr "åæççä(_U)"
 
-#
-#: ../app/menus.c:167
+#: ../app/menus.c:182
 msgid "_Unparent Children"
 msgstr "åæççäåå(_U)"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:169 ../objects/FS/function.c:806
+#: ../app/menus.c:184 ../objects/FS/function.c:807
 msgid "Align"
 msgstr "åé"
 
-#: ../app/menus.c:174 ../objects/standard/textobj.c:132
+#: ../app/menus.c:189 ../objects/standard/textobj.c:110
 msgid "Top"
 msgstr "ä"
 
-#: ../app/menus.c:175
+#: ../app/menus.c:190
 msgid "Middle"
 msgstr "ä"
 
-#: ../app/menus.c:176 ../objects/standard/textobj.c:131
+#: ../app/menus.c:191 ../objects/standard/textobj.c:109
 msgid "Bottom"
 msgstr "ä"
 
-#
-#: ../app/menus.c:178
+#: ../app/menus.c:193
 msgid "Spread Out Horizontally"
 msgstr "æåæä"
 
-#
-#: ../app/menus.c:179
+#: ../app/menus.c:194
 msgid "Spread Out Vertically"
 msgstr "åçæä"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:195
 msgid "Adjacent"
 msgstr "çé"
 
-#: ../app/menus.c:181
+#: ../app/menus.c:196
 msgid "Stacked"
 msgstr "çè"
 
-#
-#: ../app/menus.c:185
+#: ../app/menus.c:197 ../app/menus.c:207
+msgid "Connected"
+msgstr "éæ"
+
+#: ../app/menus.c:201
 msgid "_Select"
 msgstr "éå(_S)"
 
-#: ../app/menus.c:186
+#: ../app/menus.c:202
 msgid "All"
 msgstr "åé"
 
-#: ../app/menus.c:187 ../lib/arrows.c:43 ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:1183
+#: ../app/menus.c:203 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:94
+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
 msgid "None"
 msgstr "ç"
 
-#: ../app/menus.c:188
+#: ../app/menus.c:204
 msgid "Invert"
 msgstr "éå"
 
-#: ../app/menus.c:190
+#: ../app/menus.c:206
 msgid "Transitive"
 msgstr "æç"
 
-#: ../app/menus.c:191
-msgid "Connected"
-msgstr "éæ"
-
-#
-#: ../app/menus.c:192
+#: ../app/menus.c:208
 msgid "Same Type"
 msgstr "çåéå"
 
-#
 #. display_select_radio_entries go here
-#: ../app/menus.c:196
+#: ../app/menus.c:212
 msgid "Select By"
 msgstr "éå"
 
-#
-#: ../app/menus.c:198
+#. For placment of the toplevel Layout menu and it's accelerator
+#: ../app/menus.c:215
+msgid "L_ayout"
+msgstr "éç(_A)"
+
+#: ../app/menus.c:217
 msgid "_Input Methods"
 msgstr "èåæ(_I)"
 
-#: ../app/menus.c:200
+#: ../app/menus.c:219
 msgid "D_ialogs"
 msgstr "åèç(_I)"
 
-#: ../app/menus.c:202
+#: ../app/menus.c:221
 msgid "D_ebug"
 msgstr "éé(_E)"
 
-#
-#: ../app/menus.c:208
+#: ../app/menus.c:227
 msgid "_Tools"
 msgstr "åå(_T)"
 
-#: ../app/menus.c:209
+#: ../app/menus.c:228
 msgid "Modify"
 msgstr "äæ"
 
-#: ../app/menus.c:211
+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
+#: ../app/menus.c:229 ../app/toolbox.c:86 ../objects/FS/function.c:987
+msgid "Magnify"
+msgstr "æå"
+
+#: ../app/menus.c:230
+msgid "Edit Text"
+msgstr "çèæå"
+
+#: ../app/menus.c:231
 msgid "Scroll"
 msgstr "æå"
 
-#
-#: ../app/menus.c:233
-msgid "Fullscr_een"
-msgstr "åèå(_E)"
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../app/menus.c:232 ../app/toolbox.c:98 ../lib/properties.c:101
+#: ../lib/properties.h:673 ../objects/AADL/aadlbox.c:153
+#: ../objects/custom/custom_object.c:228 ../objects/Jackson/requirement.c:133
+#: ../objects/network/basestation.c:132 ../objects/network/radiocell.c:125
+#: ../objects/UML/activity.c:127 ../objects/UML/actor.c:121
+#: ../objects/UML/classicon.c:146 ../objects/UML/component.c:128
+#: ../objects/UML/component_feature.c:158 ../objects/UML/node.c:128
+#: ../objects/UML/node.c:130 ../objects/UML/note.c:119
+#: ../objects/UML/object.c:166 ../objects/UML/small_package.c:130
+#: ../objects/UML/state.c:155 ../objects/UML/usecase.c:137
+msgid "Text"
+msgstr "æå"
+
+#: ../app/menus.c:233 ../app/toolbox.c:104
+msgid "Box"
+msgstr "ææ"
+
+#: ../app/menus.c:234 ../app/toolbox.c:110
+msgid "Ellipse"
+msgstr "æå"
+
+#: ../app/menus.c:235 ../app/toolbox.c:116
+msgid "Polygon"
+msgstr "åéå"
+
+#: ../app/menus.c:236 ../app/toolbox.c:122
+msgid "Beziergon"
+msgstr "èèåéæç"
+
+#: ../app/menus.c:238 ../app/toolbox.c:128 ../objects/standard/line.c:326
+msgid "Line"
+msgstr "è"
+
+#: ../app/menus.c:239 ../app/toolbox.c:134
+msgid "Arc"
+msgstr "åç"
+
+#: ../app/menus.c:240 ../app/toolbox.c:140
+msgid "Zigzagline"
+msgstr "Z åç"
+
+#: ../app/menus.c:241 ../app/toolbox.c:146
+msgid "Polyline"
+msgstr "èççæ"
+
+#: ../app/menus.c:242 ../app/toolbox.c:152
+msgid "Bezierline"
+msgstr "èèæç"
+
+#: ../app/menus.c:243 ../app/toolbox.c:165
+msgid "Outline"
+msgstr "åæ"
+
+#: ../app/menus.c:245 ../app/toolbox.c:158
+msgid "Image"
+msgstr "åå"
 
 #
-#. we must have all actions registered to avoid configuration specific ui-files and crashing in GTK+,
-#. * see: http://bugzilla.gnome.org/show_bug.cgi?id=396161
-#.
-#: ../app/menus.c:236 ../app/menus.c:241
-msgid "_AntiAliased"
+#: ../app/menus.c:252
+msgid "_Antialiased"
 msgstr "åæå(_A)"
 
 #
-#: ../app/menus.c:243
+#: ../app/menus.c:253
 msgid "Show _Grid"
 msgstr "éçæç(_G)"
 
 #
-#: ../app/menus.c:244
-msgid "_Snap To Grid"
+#: ../app/menus.c:254
+msgid "_Snap to Grid"
 msgstr "èéæç(_S)"
 
 #
-#: ../app/menus.c:245
-msgid "Snap To _Objects"
+#: ../app/menus.c:255
+msgid "Snap to _Objects"
 msgstr "èéçä(_O)"
 
 #
-#: ../app/menus.c:246
+#: ../app/menus.c:256
 msgid "Show _Rulers"
 msgstr "éçåè(_R)"
 
 #
-#: ../app/menus.c:247
+#: ../app/menus.c:257
 msgid "Show _Connection Points"
 msgstr "éçéæé(_C)"
 
-#: ../app/menus.c:253
-msgid "Replace"
-msgstr "ææ"
-
-#: ../app/menus.c:254
+#: ../app/menus.c:264
 msgid "Union"
 msgstr "èé"
 
 #
-#: ../app/menus.c:255
+#: ../app/menus.c:265
 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:256 ../app/sheets_dialog.c:784 ../objects/FS/function.c:706
-#: ../objects/FS/function.c:858 ../objects/FS/function.c:860
+#: ../app/menus.c:266 ../objects/FS/function.c:707
+#: ../objects/FS/function.c:859 ../objects/FS/function.c:861
 msgid "Remove"
 msgstr "çé"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:258
+#: ../app/menus.c:268
 msgid "Inverse"
 msgstr "çå"
 
-#: ../app/menus.c:322
+#: ../app/menus.c:331
 msgid "NULL tooldata in tool_menu_select"
 msgstr "å tool_menu_select ä tooldata çåç NULL"
 
-#: ../app/menus.c:480
-msgid "Toggles snap-to-grid."
-msgstr "åæçèçæçã"
+#: ../app/menus.c:580 ../app/menus.c:592
+msgid "300%"
+msgstr "300%"
 
-#: ../app/menus.c:496
-msgid "Toggles object snapping."
-msgstr "åæçèççäã"
+#: ../app/menus.c:581 ../app/menus.c:593
+msgid "200%"
+msgstr "200%"
 
-#: ../app/modify_tool.c:344
-msgid "Couldn't get GTK settings"
-msgstr "çæçå GTK èå"
+#: ../app/menus.c:582 ../app/menus.c:594
+msgid "150%"
+msgstr "150%"
 
-#: ../app/paginate_psprint.c:275
-msgid "Select Printer"
-msgstr "éåæåæ"
+#: ../app/menus.c:583 ../app/menus.c:595
+msgid "100%"
+msgstr "100%"
 
-#: ../app/paginate_psprint.c:287 ../sheets/ciscocomputer.sheet.in.h:36
-msgid "Printer"
-msgstr "æåæ"
+#: ../app/menus.c:584 ../app/menus.c:596
+msgid "75%"
+msgstr "75%"
 
-#: ../app/paginate_psprint.c:301 ../sheets/Misc.sheet.in.h:1
-msgid "File"
-msgstr "ææ"
+#: ../app/menus.c:585 ../app/menus.c:597
+msgid "50%"
+msgstr "50%"
 
-#: ../app/paginate_psprint.c:316
-msgid "OK"
-msgstr "çå"
+#: ../app/menus.c:586 ../app/menus.c:598
+msgid "25%"
+msgstr "25%"
 
-#: ../app/paginate_psprint.c:462
-#, c-format
-msgid "Could not run command '%s': %s"
-msgstr "çæåèæäâ%sâï%s"
+#: ../app/menus.c:587 ../app/menus.c:599
+msgid "10%"
+msgstr "10%"
 
-#: ../app/paginate_psprint.c:465
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "çæéåâ%sâäååèæï%s"
+#: ../app/menus.c:625
+msgid "Toggles snap-to-grid."
+msgstr "åæçèçæçã"
 
-#: ../app/paginate_psprint.c:487
-#, c-format
-msgid "Printing error: command '%s' returned %d\n"
-msgstr "æåéèïæäâ%sâåå %d\n"
+#: ../app/menus.c:636
+msgid "Toggles object snapping."
+msgstr "åæçèççäã"
 
-#: ../app/paginate_psprint.c:498
-#, c-format
-msgid "Printing error: command '%s' caused sigpipe."
-msgstr "æåéèïæäâ%sâéæ sigpipeã"
+#: ../app/modify_tool.c:390
+msgid "Couldn't get GTK+ settings"
+msgstr "çæçå GTK+ èå"
 
-#: ../app/plugin-manager.c:200
-msgid "Plug-ins"
+#: ../app/plugin-manager.c:208
+msgid "Plugins"
 msgstr "åææç"
 
-#: ../app/plugin-manager.c:255
+#: ../app/plugin-manager.c:263
 msgid "Loaded"
 msgstr "åèå"
 
-#. *** board of value **************
-#: ../app/plugin-manager.c:262 ../objects/SISSI/sissi_dialog.c:618
-#: ../objects/UML/class.c:139 ../objects/UML/large_package.c:131
-#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "åç"
-
-#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:614
-#: ../objects/SISSI/sissi_dialog.c:766
+#: ../app/plugin-manager.c:276
 msgid "Description"
 msgstr "èæ"
 
-#: ../app/plugin-manager.c:277
+#: ../app/plugin-manager.c:285
 msgid "Load at Startup"
 msgstr "çåååæèåèå"
 
-#: ../app/plugin-manager.c:284
-msgid "File Name"
+#: ../app/plugin-manager.c:292
+msgid "Filename"
 msgstr "ææåç"
 
-#: ../app/preferences.c:107
+#: ../app/preferences.c:100 ../app/preferences.c:143
+msgid "any"
+msgstr "ää"
+
+#: ../app/preferences.c:118
 msgid "User Interface"
 msgstr "äçèçé"
 
-#: ../app/preferences.c:108
+#: ../app/preferences.c:119
 msgid "Diagram Defaults"
 msgstr "åèéèå"
 
-#: ../app/preferences.c:109
+#: ../app/preferences.c:120
 msgid "View Defaults"
 msgstr "æèéèå"
 
-#: ../app/preferences.c:126
+#: ../app/preferences.c:121
+msgid "Favorites"
+msgstr "ææ"
+
+#: ../app/preferences.c:164
 msgid "Reset tools after create"
 msgstr "éèååæåç"
 
-#: ../app/preferences.c:129
-msgid "Compress saved files"
-msgstr "åçååçææ"
-
-#: ../app/preferences.c:132
+#: ../app/preferences.c:167
 msgid "Number of undo levels:"
 msgstr "åååææï"
 
-#: ../app/preferences.c:135
+#: ../app/preferences.c:170
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1604,161 +1669,190 @@ msgstr ""
 "ååæææéæ\n"
 "çäççä"
 
-#: ../app/preferences.c:138
+#: ../app/preferences.c:173
 msgid "Recent documents list size:"
 msgstr "æèäçæææåçåå:"
 
-#: ../app/preferences.c:141
+#: ../app/preferences.c:176
 msgid "Use menu bar"
 msgstr "äçéåå"
 
-#: ../app/preferences.c:144
+#: ../app/preferences.c:179
 msgid "Keep tool box on top of diagram windows"
 msgstr "äååçäæèääåèèçéè"
 
-#: ../app/preferences.c:147
-msgid "Unit for lengths:"
+#: ../app/preferences.c:182
+msgid "Length unit:"
 msgstr "éååäï"
 
-#: ../app/preferences.c:150
-msgid "Unit for font sizes:"
+#: ../app/preferences.c:185
+msgid "Font size unit:"
 msgstr "åååååäï"
 
-#: ../app/preferences.c:154
-msgid "Integrated UI"
-msgstr "æååçé"
-
-#: ../app/preferences.c:157
+#: ../app/preferences.c:188
 msgid "New diagram:"
 msgstr "æååèï"
 
-#: ../app/preferences.c:158
+#: ../app/preferences.c:189
 msgid "Portrait"
 msgstr "çå"
 
-#: ../app/preferences.c:160
+#: ../app/preferences.c:191
 msgid "Paper type:"
 msgstr "çåéåï"
 
-#: ../app/preferences.c:163
+#: ../app/preferences.c:193
 msgid "Background Color:"
 msgstr "èæéèï"
 
-#: ../app/preferences.c:166
+#: ../app/preferences.c:195
+msgid "Compress saved files"
+msgstr "åçååçææ"
+
+#: ../app/preferences.c:198
+msgid "Connection Points:"
+msgstr "éæéï"
+
+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
+msgid "Visible"
+msgstr "åè"
+
+#
+#: ../app/preferences.c:200
+msgid "Snap to object"
+msgstr "èéçä"
+
+#: ../app/preferences.c:203
 msgid "New window:"
 msgstr "æåèçï"
 
-#: ../app/preferences.c:167
+#: ../app/preferences.c:204
 msgid "Width:"
 msgstr "éåï"
 
-#: ../app/preferences.c:168
+#: ../app/preferences.c:205
 msgid "Height:"
 msgstr "éåï"
 
-#: ../app/preferences.c:169
+#: ../app/preferences.c:206
 msgid "Magnify:"
 msgstr "æåï"
 
-#: ../app/preferences.c:172
-msgid "Connection Points:"
-msgstr "éæéï"
-
-#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:173 ../app/preferences.c:177 ../app/preferences.c:183
-msgid "Visible"
-msgstr "åè"
-
-#: ../app/preferences.c:176
+#: ../app/preferences.c:209
 msgid "Page breaks:"
 msgstr "åéçï"
 
-#: ../app/preferences.c:178 ../app/preferences.c:188
+#: ../app/preferences.c:211 ../app/preferences.c:241
 msgid "Color:"
 msgstr "éèï"
 
-#: ../app/preferences.c:179
+#: ../app/preferences.c:212
 msgid "Solid lines"
 msgstr "åç"
 
-#: ../app/preferences.c:184
+#
+#: ../app/preferences.c:215
+msgid "Antialias:"
+msgstr "åæåï"
+
+#: ../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:220 ../objects/FS/function.c:697
+#: ../objects/FS/function.c:699 ../plug-ins/libart/export_png.c:329
+msgid "Export"
+msgstr "åå"
+
+#: ../app/preferences.c:222
+msgid "Portable Network Graphics"
+msgstr "PNG"
+
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:605
+#: ../plug-ins/svg/svg-import.c:1444
+msgid "Scalable Vector Graphics"
+msgstr "åçæåéå (SVG)"
+
+#: ../app/preferences.c:226
+msgid "PostScript"
+msgstr "PostScript"
+
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1476
+msgid "Windows Metafile"
+msgstr "Windows ååæ (WMF)"
+
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1485
+msgid "Enhanced Metafile"
+msgstr "åååååæ (EMF)"
+
+#: ../app/preferences.c:235
 msgid "Snap to"
 msgstr "èç"
 
-#: ../app/preferences.c:185
+#: ../app/preferences.c:236
 msgid "Dynamic grid resizing"
 msgstr "åææçéèåå"
 
-#: ../app/preferences.c:186
+#: ../app/preferences.c:237
 msgid "X Size:"
 msgstr "X èååï"
 
-#: ../app/preferences.c:187
+#: ../app/preferences.c:238
 msgid "Y Size:"
 msgstr "Y èååï"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:239
+msgid "Visual Spacing X:"
+msgstr "æååèééï"
+
+#: ../app/preferences.c:240
+msgid "Visual Spacing Y:"
+msgstr "åçåèééï"
+
+#: ../app/preferences.c:242
 msgid "Lines per major line"
 msgstr "äæçäéçèæ"
 
-#: ../app/preferences.c:191
+#: ../app/preferences.c:244
 msgid "Hex Size:"
-msgstr "åèæçåå:"
-
-#: ../app/preferences.c:207
-msgid "Diagram tree window:"
-msgstr "åèçææèçï"
-
-#: ../app/preferences.c:209
-msgid "Save hidden object types"
-msgstr "ååéèççäéå"
+msgstr "åèæçååï"
 
-#: ../app/preferences.c:417 ../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:417 ../app/preferences.c:428
-#: ../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:530
+#: ../app/preferences.c:595
 msgid "Preferences"
 msgstr "ååèå"
 
-#: ../app/preferences.c:714
-msgid "User Interface type settings change will take after restart"
-msgstr "äçèçééåèåææææéæåååçæ"
-
-#: ../app/properties.c:55
+#: ../app/properties-dialog.c:60
 msgid "Object properties"
 msgstr "çäåæ"
 
-#: ../app/properties.c:80
+#: ../app/properties-dialog.c:85
 msgid "This object has no properties."
 msgstr "æçäææääåæã"
 
-#: ../app/properties.c:217
+#: ../app/properties-dialog.c:248
 msgid "Properties: "
 msgstr "åæï"
 
-#: ../app/properties.c:221
+#: ../app/properties-dialog.c:252
 msgid "Object properties:"
 msgstr "çäåæï"
 
-#: ../app/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
-msgstr "åèå Postscriptïäç Pango ååï"
-
-#: ../app/render_eps.c:159
-msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr "åèå Postscript èéèïäç Pango ååï"
-
-#: ../app/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-msgstr "åèå Postscriptïäç PostScript Latin-1 ååï"
-
-#: ../app/sheets.c:156
+#: ../app/sheets.c:158
 #, c-format
 msgid ""
 "%s\n"
@@ -1767,7 +1861,7 @@ msgstr ""
 "%s\n"
 "ççåäè"
 
-#: ../app/sheets.c:158
+#: ../app/sheets.c:160
 #, c-format
 msgid ""
 "%s\n"
@@ -1776,153 +1870,68 @@ msgstr ""
 "%s\n"
 "äçèåäè"
 
-#: ../app/sheets.c:273
+#: ../app/sheets.c:278
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
 msgstr ""
 "çæåääæçäååâcustom_typeâçèã\n"
-"ååçååçççèã"
+"ååçåååççèã"
 
-#: ../app/sheets.c:381
+#: ../app/sheets.c:413
 #, c-format
 msgid "Widget not found: %s"
 msgstr "æäåèçåäï%s"
 
-#: ../app/sheets.c:456
+#: ../app/sheets.c:443
 msgid "SVG Shape"
 msgstr "SVG åå"
 
-#: ../app/sheets.c:458
+#: ../app/sheets.c:445
 msgid "Programmed DiaObject"
 msgstr "çåå DiaObject"
 
-#: ../app/sheets_dialog.c:83
-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_callbacks.c:168
+msgid "Move ->"
+msgstr "çå â"
+
+#: ../app/sheets_dialog_callbacks.c:170
+msgid "Move All ->"
+msgstr "åéçå â"
 
-#: ../app/sheets_dialog.c:109 ../app/sheets_dialog_callbacks.c:179
+#: ../app/sheets_dialog_callbacks.c:177
 msgid "<- Copy"
 msgstr "â èè"
 
-#: ../app/sheets_dialog.c:119 ../app/sheets_dialog_callbacks.c:181
+#: ../app/sheets_dialog_callbacks.c:179
 msgid "<- Copy All"
 msgstr "â åéèè"
 
-#: ../app/sheets_dialog.c:126 ../app/sheets_dialog_callbacks.c:183
+#: ../app/sheets_dialog_callbacks.c:181
 msgid "<- Move"
 msgstr "â çå"
 
-#: ../app/sheets_dialog.c:136 ../app/sheets_dialog_callbacks.c:185
+#: ../app/sheets_dialog_callbacks.c:183
 msgid "<- Move All"
 msgstr "â åéçå"
 
-#: ../app/sheets_dialog.c:233
-msgid "Edit"
-msgstr "çè"
-
-#: ../app/sheets_dialog.c:266
-msgid "Revert"
-msgstr "éå"
-
-#: ../app/sheets_dialog.c:354
-msgid "New"
-msgstr "æå"
-
-#: ../app/sheets_dialog.c:362 ../app/sheets_dialog.c:794
-#: ../objects/Istar/actor.c:144 ../objects/Istar/actor.c:145
-#: ../objects/Istar/other.c:148 ../objects/Istar/other.c:149
-#: ../objects/KAOS/other.c:151 ../objects/KAOS/other.c:152
-#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "éå"
-
-#: ../app/sheets_dialog.c:377
-msgid "Browse..."
-msgstr "çè..."
-
-#: ../app/sheets_dialog.c:386
-msgid "SVG Shape:"
-msgstr "SVG ååï"
-
-#: ../app/sheets_dialog.c:413 ../app/sheets_dialog.c:476
-msgid "description:"
-msgstr "èæï"
-
-#: ../app/sheets_dialog.c:425
-msgid "Sheet name:"
-msgstr "åäèåç:"
-
-#: ../app/sheets_dialog.c:446 ../app/sheets_dialog_callbacks.c:291
-#: ../app/sheets_dialog_callbacks.c:1108
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
 msgid "Line Break"
 msgstr "æè"
 
-#: ../app/sheets_dialog.c:568
-msgid "Edit Attributes"
-msgstr "çèåæ"
-
-#: ../app/sheets_dialog.c:583
-msgid "DiaObject"
-msgstr "Diaçä"
-
-#: ../app/sheets_dialog.c:599 ../app/sheets_dialog.c:692
-msgid "Description:"
-msgstr "èæï"
-
-#: ../app/sheets_dialog.c:618 ../objects/FS/flow-ortho.c:167
-#: ../objects/FS/flow.c:144 ../objects/Istar/link.c:164
-#: ../objects/Jackson/phenomenon.c:144 ../objects/KAOS/metaandorrel.c:164
-#: ../objects/KAOS/metabinrel.c:171 ../objects/UML/class_dialog.c:977
-#: ../objects/UML/class_dialog.c:1930 ../objects/UML/class_dialog.c:2168
-#: ../objects/UML/class_dialog.c:2694
-msgid "Type:"
-msgstr "éåï"
-
-#: ../app/sheets_dialog.c:656
-msgid "Sheet"
-msgstr "åäè"
-
-#: ../app/sheets_dialog.c:672 ../objects/ER/attribute.c:153
-#: ../objects/ER/entity.c:135 ../objects/ER/relationship.c:140
-#: ../objects/UML/association.c:238 ../objects/UML/association.c:1160
-#: ../objects/UML/class_dialog.c:966 ../objects/UML/class_dialog.c:1919
-#: ../objects/UML/class_dialog.c:2157 ../objects/UML/class_dialog.c:2683
-#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:131
-#: ../objects/UML/realizes.c:132
-msgid "Name:"
-msgstr "åçï"
-
-#: ../app/sheets_dialog.c:809
-msgid "DiaObject:"
-msgstr "Diaçäï"
-
-#: ../app/sheets_dialog.c:836
-msgid "Sheet:"
-msgstr "åäèï"
-
-#: ../app/sheets_dialog.c:920
-msgid "Select SVG Shape File"
-msgstr "éå SVG ååæ"
-
-#: ../app/sheets_dialog_callbacks.c:166
-msgid "Copy ->"
-msgstr "èè â"
-
-#: ../app/sheets_dialog_callbacks.c:168
-msgid "Copy All ->"
-msgstr "åéèè â"
-
-#: ../app/sheets_dialog_callbacks.c:170
-msgid "Move ->"
-msgstr "çå â"
-
-#: ../app/sheets_dialog_callbacks.c:172
-msgid "Move All ->"
-msgstr "åéçå â"
-
-#: ../app/sheets_dialog_callbacks.c:305
+#: ../app/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -1931,7 +1940,7 @@ msgstr ""
 "%s\n"
 "åå"
 
-#: ../app/sheets_dialog_callbacks.c:308
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -1940,7 +1949,7 @@ msgstr ""
 "%s\n"
 "çä"
 
-#: ../app/sheets_dialog_callbacks.c:311
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -1949,379 +1958,639 @@ msgstr ""
 "%s\n"
 "ææåéå"
 
-#: ../app/sheets_dialog_callbacks.c:802
+#: ../app/sheets_dialog_callbacks.c:771
+msgid "Please select a .shape file"
+msgstr "èéå .shape ææ"
+
+#: ../app/sheets_dialog_callbacks.c:778
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "ææåçæçåéæâ%sâïâ%sâ"
 
-#: ../app/sheets_dialog_callbacks.c:810
+#: ../app/sheets_dialog_callbacks.c:786
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "æé %s æççéèï%s"
 
-#: ../app/sheets_dialog_callbacks.c:841
+#: ../app/sheets_dialog_callbacks.c:817
 msgid "Please export the diagram as a shape."
-msgstr ""
+msgstr "èååèååçåå"
 
-#: ../app/sheets_dialog_callbacks.c:844
+#: ../app/sheets_dialog_callbacks.c:820
 #, c-format
 msgid "Could not interpret shape file: '%s'"
-msgstr "çæåæååæïâ%sâ"
+msgstr "çæèèååæïâ%sâ"
 
-#: ../app/sheets_dialog_callbacks.c:915
+#: ../app/sheets_dialog_callbacks.c:888
 msgid "Sheet must have a Name"
 msgstr "åäèéèæåç"
 
-#: ../app/sheets_dialog_callbacks.c:1612 ../app/sheets_dialog_callbacks.c:1619
+#: ../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:1671
+#: ../app/sheets_dialog_callbacks.c:1643
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "çæéåâ%sâäååèæ"
 
-#: ../app/sheets_dialog_callbacks.c:1681
+#: ../app/sheets_dialog_callbacks.c:1653
 msgid "a user"
 msgstr "äåäçè"
 
-#: ../app/sheets_dialog_callbacks.c:1694
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "File: %s"
 msgstr "ææï%s"
 
-#: ../app/sheets_dialog_callbacks.c:1697
+#: ../app/sheets_dialog_callbacks.c:1669
 #, c-format
 msgid "Date: %s"
 msgstr "ææï%s"
 
-#: ../app/sheets_dialog_callbacks.c:1701
+#: ../app/sheets_dialog_callbacks.c:1673
 #, c-format
 msgid "For: %s"
 msgstr "çï%s"
 
-#: ../app/sheets_dialog_callbacks.c:1718
+#: ../app/sheets_dialog_callbacks.c:1690
 msgid "add shapes here"
 msgstr "åéèåååå"
 
-#: ../app/splash.c:56
-msgid "Loading ..."
+#: ../app/splash.c:50
+msgid "Loading â"
 msgstr "èåä ..."
 
-#: ../app/splash.c:74
+#: ../app/splash.c:68
 #, c-format
 msgid "Dia v %s"
-msgstr "Dia %s çæ"
+msgstr "Dia %s ç"
+
+#: ../app/toolbox.c:74
+msgid ""
+"Modify object(s)\n"
+"Use <Space> to toggle between this and other tools"
+msgstr ""
+"äæçä\n"
+"äïçæïåææååååäåå"
+
+#: ../app/toolbox.c:80
+msgid ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+msgstr ""
+"æåçè\n"
+"äïEscïééæåå"
+
+#: ../app/toolbox.c:92
+msgid "Scroll around the diagram"
+msgstr "ååèäæå"
+
+#: ../app/toolbox.c:354
+#, c-format
+msgid "No sheet named %s"
+msgstr "ææåç %s çåäè"
+
+#: ../app/toolbox.c:392
+msgid "Other sheets"
+msgstr "åååäè"
+
+#: ../app/toolbox.c:452 ../sheets/Flowchart.sheet.in.h:1
+msgid "Flowchart"
+msgstr "æçå"
+
+#: ../app/toolbox.c:496
+msgid ""
+"Foreground & background colors for new objects.  The small black and white "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"colors."
+msgstr ""
+"æçäçåæåèæèåã\n"
+"éçåæååéèèåã\n"
+"åçéåäæèåã\n"
+"éæåäåææèåã"
+
+#: ../app/toolbox.c:510
+msgid ""
+"Line widths.  Click on a line to set the default line width for new "
+"objects.  Double-click to set the line width more precisely."
+msgstr "çæéåãééçæåäèåæçäçéèçæéåãéæåäååäæçççèåçæéåã"
+
+#: ../app/toolbox.c:553
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Detailsâ"
+msgstr "æçæééççéæåãééåäæéçéïææçãèæ...ãèåçéåæ"
+
+#: ../app/toolbox.c:558
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Detailsâ"
+msgstr "æçæççææåãééåäæéçææåïææçãèæ...ãèåçæåæ"
+
+#: ../app/toolbox.c:574
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Detailsâ"
+msgstr "æçæçåççéæåãééåäæéçéïææçãèæ...ãèåçéåæ"
 
 #: ../dia.desktop.in.in.h:1
+msgid "Dia"
+msgstr "Dia"
+
+#: ../dia.desktop.in.in.h:3
 msgid "Dia Diagram Editor"
 msgstr "Dia åèçèå"
 
-#: ../dia.desktop.in.in.h:2
+#: ../dia.desktop.in.in.h:4
 msgid "Edit your Diagrams"
 msgstr "çèäçåè"
 
-#: ../lib/arrows.c:44
+#. Installer message if no GTK+ was found
+#: ../installer/win32/gennsh.c:39
+msgid ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+msgstr "éææåè GTK+ãèäçåæçåèçåãåå http://dia-installer.de ååã"
+
+#. Installer message: Don't install over pre 0.95 versions
+#: ../installer/win32/gennsh.c:42
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+msgstr "èååèç Dia ååæéäæïæå Dia åèèäåçäçã"
+
+#. Installer message:  License Page
+#: ../installer/win32/gennsh.c:45
+msgid "Next >"
+msgstr "ääæ >"
+
+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
+#: ../installer/win32/gennsh.c:48
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:51
+msgid "Dia Diagram Editor (required)"
+msgstr "Dia åèçèå (åè)"
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:54
+msgid "Translations"
+msgstr "çè"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:57
+msgid "Optional translations of the Dia user interface"
+msgstr "Dia äçèäéçéåçè"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:60
+msgid "Core Dia files and dlls"
+msgstr "æå Dia ææåååå"
+
+#. Installer message: Component name
+#: ../installer/win32/gennsh.c:63
+msgid "Python plug-in"
+msgstr "Python åææç"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:66
+msgid ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+msgstr "Python Scripting èè 2.3 çææãåææåè Python åäèéã"
+
+#. Installer message: hyperlink text on finish page
+#: ../installer/win32/gennsh.c:69
+msgid "Visit the Dia for Windows Web Page"
+msgstr "å Windows çéæè Dia"
+
+#. Installer message: Dia uninstaller entry in Control Panel
+#: ../installer/win32/gennsh.c:72
+msgid "Dia (remove only)"
+msgstr "Dia (åçé)"
+
+#. Installer message: confirmation question. Keep $\r
+#: ../installer/win32/gennsh.c:75
+msgid ""
+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
+"$\rNote: Any non-standard plugins that you may have installed will be "
+"deleted.$\rDia user settings will not be affected."
+msgstr "ååçéèç Dia çéãæåççï$\r$\rææïääåèäçéææåææçéæèåéã$\rDia çäçèèååäååéã"
+
+#. Installer message: confirmatin question. Keep $\r
+#: ../installer/win32/gennsh.c:78
+msgid ""
+"The installation directory you specified already exists. Any contents$\rwill "
+"be deleted. Would you like to continue?"
+msgstr "åææåçåèçéãçäæææèé$\ræèåéãæåççï"
+
+#. Installer message: Uninstall Section Prompts. Keep $\r
+#: ../installer/win32/gennsh.c:81
+msgid ""
+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
+"another user installed this application."
+msgstr "åéçåæäå Dia çèåèéçã$\rææççååæåèæçåääçèåèçã"
+
+#. Installer message: Uninstall error message
+#: ../installer/win32/gennsh.c:84
+msgid "You do not have permission to uninstall this application."
+msgstr "çæéåéææççåã"
+
+#. Installer message: Uninstallation warning. Keep $INSTDIR
+#: ../installer/win32/gennsh.c:87
+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
+msgstr "æåååé $INSTDIR åååçéãæåççï"
+
+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
+#: ../installer/win32/gennsh.c:90
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+msgstr "æåååé $PROFILE\\.dia åååçéãæåççï"
+
+#: ../lib/arrows.c:1891
 msgid "Lines"
-msgstr "çæ"
+msgstr "çæ"
 
-#: ../lib/arrows.c:45
+#: ../lib/arrows.c:1892
 msgid "Hollow Triangle"
 msgstr "çåäèå"
 
-#: ../lib/arrows.c:46
+#: ../lib/arrows.c:1893
 msgid "Filled Triangle"
 msgstr "ååäèå"
 
-#: ../lib/arrows.c:47
+#: ../lib/arrows.c:1894
 msgid "Unfilled Triangle"
 msgstr "äåèäèå"
 
-#: ../lib/arrows.c:48
+#: ../lib/arrows.c:1895
 msgid "Hollow Diamond"
 msgstr "çåèå"
 
-#: ../lib/arrows.c:49
+#: ../lib/arrows.c:1896
 msgid "Filled Diamond"
 msgstr "ååèå"
 
-#: ../lib/arrows.c:50
+#: ../lib/arrows.c:1897
 msgid "Half Diamond"
 msgstr "åèå"
 
-#: ../lib/arrows.c:51
+#: ../lib/arrows.c:1898
 msgid "Half Head"
 msgstr "åéçé"
 
-#: ../lib/arrows.c:52
+#: ../lib/arrows.c:1899
 msgid "Slashed Cross"
 msgstr "ååäåæç"
 
-#: ../lib/arrows.c:53
+#: ../lib/arrows.c:1900
 msgid "Filled Ellipse"
 msgstr "ååæå"
 
-#: ../lib/arrows.c:54
+#: ../lib/arrows.c:1901
 msgid "Hollow Ellipse"
 msgstr "çåæå"
 
-#: ../lib/arrows.c:55
+#: ../lib/arrows.c:1902
 msgid "Filled Dot"
 msgstr "ååé"
 
-#: ../lib/arrows.c:56
+#: ../lib/arrows.c:1903
 msgid "Dimension Origin"
 msgstr "åååå"
 
-#: ../lib/arrows.c:57
+#: ../lib/arrows.c:1904
 msgid "Blanked Dot"
 msgstr "çåé"
 
-#: ../lib/arrows.c:58
+#: ../lib/arrows.c:1905
 msgid "Double Hollow Triangle"
 msgstr "éçåäèå"
 
-#: ../lib/arrows.c:59
+#: ../lib/arrows.c:1906
 msgid "Double Filled Triangle"
 msgstr "éååäèå"
 
-#: ../lib/arrows.c:60
+#: ../lib/arrows.c:1907
 msgid "Filled Dot and Triangle"
 msgstr "åéèäèå"
 
-#: ../lib/arrows.c:61
+#: ../lib/arrows.c:1908
 msgid "Filled Box"
 msgstr "ååæå"
 
-#: ../lib/arrows.c:62
+#: ../lib/arrows.c:1909
 msgid "Blanked Box"
 msgstr "çåæå"
 
-#: ../lib/arrows.c:63
+#: ../lib/arrows.c:1910
 msgid "Slashed"
 msgstr "æç"
 
-#: ../lib/arrows.c:64
+#: ../lib/arrows.c:1911
 msgid "Integral Symbol"
 msgstr "çåçè"
 
-#: ../lib/arrows.c:65
+#: ../lib/arrows.c:1912
 msgid "Crow Foot"
 msgstr "äå"
 
-#: ../lib/arrows.c:66
+#: ../lib/arrows.c:1913
 msgid "Cross"
 msgstr "åå"
 
-#: ../lib/arrows.c:67
+#: ../lib/arrows.c:1914
 msgid "1-or-many"
 msgstr "1-æ-åå"
 
-#: ../lib/arrows.c:68
+#: ../lib/arrows.c:1915
 msgid "0-or-many"
 msgstr "0-æ-åå"
 
-#: ../lib/arrows.c:69
+#: ../lib/arrows.c:1916
 msgid "1-or-0"
 msgstr "1-æ-0"
 
-#: ../lib/arrows.c:70
+#: ../lib/arrows.c:1917
 msgid "1 exactly"
 msgstr "åæ 1"
 
-#: ../lib/arrows.c:71
+#: ../lib/arrows.c:1918
 msgid "Filled Concave"
 msgstr "åååçé"
 
-#: ../lib/arrows.c:72
+#: ../lib/arrows.c:1919
 msgid "Blanked Concave"
 msgstr "çååçé"
 
-#: ../lib/arrows.c:73
+#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
+#: ../lib/properties.h:600 ../lib/properties.h:606
 msgid "Round"
 msgstr "åç"
 
-#: ../lib/arrows.c:74
+#: ../lib/arrows.c:1921
 msgid "Open Round"
 msgstr "éæçåå"
 
-#: ../lib/arrows.c:75
+#: ../lib/arrows.c:1922
 msgid "Backslash"
 msgstr "åæç"
 
-#: ../lib/arrows.c:76
+#: ../lib/arrows.c:1923
 msgid "Infinite Line"
 msgstr "çéçæ"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:2051
 msgid "Arrow head of unknown type"
 msgstr "äçåéåççé"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:2059
 #, c-format
-msgid "Arrow head of type %s has too small dimensions, removing.\n"
-msgstr "%s éåççéååååïæåçéã\n"
+msgid "Arrow head of type %s has too small dimensions; removing.\n"
+msgstr "%s éåççéååååïæåçéã\n"
 
-#: ../lib/arrows.c:2021
+#: ../lib/arrows.c:2192
 msgid "unknown arrow"
 msgstr "äçåçé"
 
-#: ../lib/bezier_conn.c:636
-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:335
-#: ../plug-ins/svg/svg-import.c:204 ../plug-ins/vdx/vdx-import.c:140
+#: ../lib/create.c:160 ../lib/create.c:196 ../lib/create.c:228
+#: ../lib/create.c:252 ../lib/create.c:284 ../lib/create.c:305
+#: ../lib/create.c:335 ../lib/create.c:378 ../plug-ins/svg/svg-import.c:398
+#: ../plug-ins/vdx/vdx-import.c:144
 msgid "Can't find standard object"
 msgstr "æäåææçä"
 
-#: ../lib/dia_dirs.c:237
-#, c-format
-msgid "%s<illegal characters>..."
-msgstr "%s<äèäççåç>..."
+#: ../lib/diaarrowchooser.c:367
+msgid "Arrow Properties"
+msgstr "çéåæ"
 
-#: ../lib/dia_dirs.c:268
-#, c-format
-msgid "Too many ..'s in filename %s\n"
-msgstr "ææåç %s äæåå ..\n"
+#: ../lib/diaarrowselector.c:123
+msgid "More arrows"
+msgstr "æåçé"
 
-#: ../lib/dia_xml.c:167
-#, c-format
-msgid ""
-"The file %s has no encoding specification;\n"
-"assuming it is encoded in %s"
-msgstr ""
-"ææ %s ææççèæï\n"
-"åèåçççæ %s"
+#: ../lib/diaarrowselector.c:140
+msgid "Size: "
+msgstr "ååï"
 
-#: ../lib/dia_xml.c:568
-msgid "Taking point value of non-point node."
-msgstr "ååçéåçéççéæåã"
+#: ../lib/diacolorselector.c:204
+msgid "Select color"
+msgstr "éåèå"
 
-#: ../lib/dia_xml.c:579
+#: ../lib/diacolorselector.c:292
+msgid "More colorsâ"
+msgstr "æåèå..."
+
+#: ../lib/dia_dirs.c:327
 #, c-format
-msgid "Incorrect x Point value \"%s\" %f; discarding it."
-msgstr "éèç x çéæåâ%sâ %f; ææåã"
+msgid "Too many \"..\"s in filename %s\n"
+msgstr "ææåç %s äæååã..ã\n"
 
-#: ../lib/dia_xml.c:586
-msgid "Error parsing point."
-msgstr "èæçéççéèã"
+#: ../lib/diadynamicmenu.c:396
+msgid "Reset menu"
+msgstr "éèéå"
 
-#. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:594
+#: ../lib/diafontselector.c:158
+msgid "Other fonts"
+msgstr "åååå"
+
+#: ../lib/diafontselector.c:233
 #, c-format
-msgid "Incorrect y Point value \"%s\" %f; discarding it."
-msgstr "éèç y çéæåâ%sâ %f; ææåã"
+msgid "Couldn't find font family for %s\n"
+msgstr "æäå %s æåçååé\n"
 
-#: ../lib/dia_xml.c:1066
+#. pathologic case - pixbuf not even supporting PNG?
+#: ../lib/dia_image.c:328
+#, c-format
 msgid ""
-"Your local character set is UTF-8. Because of issues with libxml1 and the "
-"support of files generated by previous versions of dia, you will encounter  "
-"problems. Please report to dia-list gnome org if you see this message."
-msgstr "äçåäç UTF-8 åçéççãåç libxml1 ççæïååæäåçæç dia ççåäçææææäèïäåæéååéãçäçåéåèææïèå dia-list gnome org ååã"
+"Unsupported file format for saving:\n"
+"%s\n"
+"%s"
+msgstr ""
+"äææååææææåï\n"
+"%s\n"
+"%s"
 
-#: ../lib/diaarrowchooser.c:351
-msgid "Arrow Properties"
-msgstr "çéåæ"
+#: ../lib/dia_image.c:331
+#, c-format
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s"
+msgstr ""
+"çæååææï\n"
+"%s\n"
+"%s"
+
+#: ../lib/dialinechooser.c:309
+msgid "Line Style Properties"
+msgstr "çææååæ"
+
+#: ../lib/dialinechooser.c:344
+msgid "Detailsâ"
+msgstr "èæ..."
+
+#: ../lib/dialinestyleselector.c:124
+msgid "line|Solid"
+msgstr "çæ|åç"
+
+#: ../lib/dialinestyleselector.c:130
+msgid "line|Dashed"
+msgstr "çæ|èç"
+
+#: ../lib/dialinestyleselector.c:136
+msgid "line|Dash-Dot"
+msgstr "çæ|èç-é"
+
+#: ../lib/dialinestyleselector.c:142
+msgid "line|Dash-Dot-Dot"
+msgstr "çæ|èç-é-é"
 
-#. This is the default text shown in the preview entry, though the user
-#. can set it. Remember that some fonts only have capital letters.
-#: ../lib/diagtkfontsel.c:74
-msgid "abcdefghijk ABCDEFGHIJK"
-msgstr "abc ABC äææè"
+#: ../lib/dialinestyleselector.c:148
+msgid "line|Dotted"
+msgstr "çæ|éç"
 
-#: ../lib/diagtkfontsel.c:209
-msgid "Font name"
-msgstr "åååç"
+#. fs->sizebox = GTK_HBOX(box);
+#: ../lib/dialinestyleselector.c:166
+msgid "Dash length: "
+msgstr "èçéåï"
+
+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "çå"
+
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
+msgid "Cancel"
+msgstr "åæ"
+
+#: ../lib/dia_xml.c:212
+#, c-format
+msgid ""
+"The file %s has no encoding specification;\n"
+"assuming it is encoded in %s"
+msgstr ""
+"ææ %s æææåççï\n"
+"åèåççæ %s"
+
+#: ../lib/dia_xml.c:506
+#, c-format
+msgid "Unknown type of DataNode '%s'"
+msgstr "äçåç DataNode éå '%s'"
+
+#: ../lib/dia_xml.c:525
+msgid "Taking int value of non-int node."
+msgstr "ååéææçéçææåã"
+
+#: ../lib/dia_xml.c:701
+msgid "Taking point value of non-point node."
+msgstr "ååçéåçéççéæåã"
 
-#: ../lib/diagtkfontsel.c:210
-msgid "The X string that represents this font."
-msgstr "äèæååç X ååæååä"
+#: ../lib/dia_xml.c:712
+#, c-format
+msgid "Incorrect x Point value \"%s\" %f; discarding it."
+msgstr "éèç x çéæåâ%sâ %f; ææåã"
 
-#: ../lib/diagtkfontsel.c:216
-msgid "Preview text"
-msgstr "éèæå"
+#: ../lib/dia_xml.c:719
+msgid "Error parsing point."
+msgstr "èæçéççéèã"
 
-#: ../lib/diagtkfontsel.c:217
-msgid "The text to display in order to demonstrate the selected font."
-msgstr "çéååååïéçæåçæåäçççã"
+#. don't bother with useless warnings (see above)
+#: ../lib/dia_xml.c:727
+#, c-format
+msgid "Incorrect y Point value \"%s\" %f; discarding it."
+msgstr "éèç y çéæåâ%sâ %f; ææåã"
 
-#: ../lib/diagtkfontsel.c:321
-msgid "_Family:"
-msgstr "åæ(_F)ï"
+#: ../lib/dia_xml.c:747
+msgid "Taking bezpoint value of non-point node."
+msgstr "ååçéåçéçãèèéãåã"
 
-#: ../lib/diagtkfontsel.c:327
-msgid "_Style:"
-msgstr "åæ(_S)ï"
+#: ../lib/dia_xml.c:765
+msgid "Error parsing bezpoint p1."
+msgstr "èæãèèéãp1 ççéèã"
 
-#: ../lib/diagtkfontsel.c:333
-msgid "Si_ze:"
-msgstr "åå(_Z)ï"
+#: ../lib/dia_xml.c:779
+msgid "Error parsing bezpoint p2."
+msgstr "èæãèèéãp2 ççéèã"
 
-#. create the text entry widget
-#: ../lib/diagtkfontsel.c:462
-msgid "_Preview:"
-msgstr "éè(_P)ï"
+#: ../lib/dia_xml.c:793
+msgid "Error parsing bezpoint p3."
+msgstr "èæãèèéãp3 ççéèã"
 
-#: ../lib/diagtkfontsel.c:1252
-msgid "Font Selection"
-msgstr "ååéæ"
+#: ../lib/dia_xml.c:820
+msgid "Taking rectangle value of non-rectangle node."
+msgstr "ååéçåçéççååã"
 
-#: ../lib/dialibartrenderer.c:295
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
-msgstr "gdk_rendererïæåääææçåææåï\n"
+#: ../lib/dia_xml.c:832 ../lib/dia_xml.c:843 ../lib/dia_xml.c:854
+msgid "Error parsing rectangle."
+msgstr "èæçåççéèã"
 
-#: ../lib/dialinechooser.c:297
-msgid "Line Style Properties"
-msgstr "çææååæ"
+#: ../lib/dia_xml.c:882
+msgid "Taking string value of non-string node."
+msgstr "ååéåäçéçåäåã"
 
-#: ../lib/dialinechooser.c:333
-msgid "Details..."
-msgstr "çç..."
+#: ../lib/dia_xml.c:908
+msgid "Error in string tag."
+msgstr "èæåäæèççéèã"
 
-#: ../lib/filter.c:126
+#: ../lib/dia_xml.c:926
+msgid "Error in file, string not starting with #"
+msgstr "æææèïåääéä # éé"
+
+#: ../lib/dia_xml.c:988
+msgid "Taking font value of non-font node."
+msgstr "ååéååçéçåååã"
+
+#: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr "ååäåç %s çåéååéæå"
 
-#: ../lib/font.c:102
+#: ../lib/filter.c:195
+#, c-format
+msgid "Multiple import filters with unique name %s"
+msgstr "ååäåç %s çåéååéæå"
+
+#: ../lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "çæèååå %sã\n"
 
-#: ../lib/message.c:91 ../lib/message.c:277
+#: ../lib/group.c:622
+msgid "Transformation"
+msgstr "èå"
+
+#: ../lib/message.c:93 ../lib/message.c:281
 msgid "Warning"
 msgstr "èå"
 
-#: ../lib/message.c:118
+#: ../lib/message.c:120
 msgid "There is one similar message."
 msgstr "æ 1 åéäçèæã"
 
-#: ../lib/message.c:123
+#: ../lib/message.c:125
 msgid "Show repeated messages"
 msgstr "éçéèçèæ"
 
-#: ../lib/message.c:144
+#: ../lib/message.c:146
 msgid "Don't show this message again"
 msgstr "äåéçæèæ"
 
-#: ../lib/message.c:202
+#: ../lib/message.c:203
 #, c-format
 msgid "There are %d similar messages."
 msgstr "æ %d åéäçèæã"
 
-#: ../lib/message.c:261
+#: ../lib/message.c:265
 msgid "Notice"
 msgstr "ææ"
 
-#: ../lib/newgroup.c:117
-msgid "Open group"
-msgstr "éæçç"
-
-#: ../lib/object_defaults.c:127
+#: ../lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2330,351 +2599,758 @@ msgstr ""
 "èåéèâ%sâæççéèã\n"
 "äæ Dia åèææã"
 
-#: ../lib/plug-ins.c:120
-msgid "???"
-msgstr ""
+#. base property stuff...
+#: ../lib/orth_conn.h:97
+msgid "Autoroute"
+msgstr "èåèç"
 
-#: ../lib/plug-ins.c:227
-#, c-format
-msgid "Could not deduce correct path for `%s'"
-msgstr "çæææâ%sâçæçèå"
+#: ../lib/orth_conn.h:108
+msgid "Autorouting"
+msgstr "èåèç"
 
-#: ../lib/plug-ins.c:233
-#, c-format
-msgid ""
-"Could not load plugin '%s'\n"
-"%s"
+#: ../lib/persistence.c:321
+msgid "Persistence"
+msgstr "çæ"
+
+#: ../lib/plug-ins.c:111
+msgid "???"
 msgstr ""
-"çæèååææçâ%sâ\n"
-"%s"
 
-#: ../lib/plug-ins.c:246
+#: ../lib/plug-ins.c:186
 #, c-format
-msgid "Could not find plugin init function in `%s'"
-msgstr "æäåâ%sâäçåææç init åæ"
+msgid "Missing dependencies for '%s'?"
+msgstr "æåçåä '%s' æææåçåäï"
 
-#: ../lib/plug-ins.c:248
+#: ../lib/plug-ins.c:197
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "çåäâdia_plugin_initâçè"
 
-#: ../lib/plug-ins.c:256 ../lib/plug-ins.c:264
+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
 msgid "dia_plugin_init() call failed"
 msgstr "èç dia_plugin_init() æççéè"
 
-#: ../lib/plug-ins.c:283
+#: ../lib/plug-ins.c:232
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "çæåè %s åææç"
 
-#: ../lib/plug-ins.c:371
-#, c-format
-msgid ""
-"Could not open `%s'\n"
-"`%s'"
+#: ../lib/plug-ins.c:441
+msgid "Plugin Configuration"
+msgstr "èååææç"
+
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:235
+#: ../objects/UML/object.c:146
+msgid "General"
+msgstr "äè"
+
+#: ../lib/propdialogs.c:325
+msgid "Meta"
 msgstr ""
-"çæéåâ%sâ\n"
-"â%sâ"
 
-#: ../lib/prop_text.c:466
-#, c-format
-msgid "Group with %d objects"
-msgstr "å %d åçäççç"
+#: ../lib/prop_dict.c:43
+msgid "Author"
+msgstr "äè"
+
+#: ../lib/prop_dict.c:44
+msgid "Identifier"
+msgstr "èåè"
+
+#: ../lib/prop_dict.c:45
+msgid "Creation date"
+msgstr "åçææ"
+
+#: ../lib/prop_dict.c:46
+msgid "Modification date"
+msgstr "äæææ"
+
+#: ../lib/prop_dict.c:47
+msgid "URL"
+msgstr ""
+
+#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
+msgid "Key"
+msgstr "åçå"
 
-#: ../lib/properties.c:64 ../lib/properties.h:469 ../lib/widgets.c:690
+#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "å"
+
+#: ../lib/properties.c:67 ../lib/properties.h:587 ../lib/widgets.c:273
 msgid "Left"
 msgstr "éå"
 
-#: ../lib/properties.c:65 ../lib/properties.h:470 ../lib/widgets.c:696
-#: ../objects/standard/textobj.c:133
+#: ../lib/properties.c:68 ../lib/properties.h:588 ../lib/widgets.c:274
+#: ../objects/standard/textobj.c:111
 msgid "Center"
 msgstr "çä"
 
-#: ../lib/properties.c:66 ../lib/properties.h:471 ../lib/widgets.c:702
+#: ../lib/properties.c:69 ../lib/properties.h:589 ../lib/widgets.c:275
 msgid "Right"
 msgstr "éå"
 
-#: ../lib/properties.c:73 ../lib/properties.h:489 ../lib/properties.h:492
+#: ../lib/properties.c:74 ../lib/properties.h:593
+msgid "Never"
+msgstr "äè"
+
+#: ../lib/properties.c:75 ../lib/properties.h:594
+msgid "When Needed"
+msgstr "åéè"
+
+#: ../lib/properties.c:76 ../lib/properties.h:595
+msgid "Always"
+msgstr "äå"
+
+#: ../lib/properties.c:80 ../lib/properties.h:599
+msgid "Miter"
+msgstr "åè(Miter)"
+
+#: ../lib/properties.c:82 ../lib/properties.h:601
+msgid "Bevel"
+msgstr "åè(Bevel)"
+
+#: ../lib/properties.c:86 ../lib/properties.h:605
+msgid "Butt"
+msgstr "çå(Butt)"
+
+#: ../lib/properties.c:88 ../lib/properties.h:607
+msgid "Projecting"
+msgstr "æå"
+
+#: ../lib/properties.c:95 ../lib/properties.h:628 ../lib/properties.h:631
 #: ../objects/chronogram/chronoline.c:179
 #: ../objects/chronogram/chronoref.c:158
 msgid "Line color"
 msgstr "çæéè"
 
-#: ../lib/properties.c:74 ../lib/properties.h:495 ../lib/properties.h:498
+#: ../lib/properties.c:96 ../lib/properties.h:634 ../lib/properties.h:637
 msgid "Line style"
 msgstr "çææå"
 
-#: ../lib/properties.c:75 ../lib/properties.h:502 ../lib/properties.h:505
+#: ../lib/properties.c:97 ../lib/properties.h:653 ../lib/properties.h:656
 msgid "Fill color"
 msgstr "ååéè"
 
-#: ../lib/properties.c:76 ../lib/properties.h:508 ../lib/properties.h:511
+#. just to simplify transfering properties between objects
+#: ../lib/properties.c:98 ../lib/properties.h:659 ../lib/properties.h:662
+#: ../lib/standard-path.c:138
 msgid "Draw background"
 msgstr "çèèæ"
 
-#: ../lib/properties.c:77 ../lib/properties.h:515
+#: ../lib/properties.c:99 ../lib/properties.h:666
 msgid "Start arrow"
 msgstr "éåçé"
 
-#: ../lib/properties.c:78 ../lib/properties.h:518
+#: ../lib/properties.c:100 ../lib/properties.h:669
 msgid "End arrow"
 msgstr "çæçé"
 
-#: ../lib/properties.c:80 ../lib/properties.h:528
+#: ../lib/properties.c:102 ../lib/properties.h:679
 msgid "Text alignment"
 msgstr "åéæå"
 
-#. all this just to make the defaults selectable ...
-#: ../lib/properties.c:81 ../lib/properties.h:533
-#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:165
-#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class.c:169
-#: ../objects/UML/class_dialog.c:394 ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:164
+#: ../lib/properties.c:103 ../lib/properties.h:684
+#: ../objects/chronogram/chronoline.c:183
+#: ../objects/chronogram/chronoref.c:164 ../objects/Database/reference.c:118
+#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:166
+#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class_dialog.c:455
 msgid "Font"
 msgstr "åå"
 
-#: ../lib/properties.c:82 ../lib/properties.h:541
-#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144 ../objects/chronogram/chronoline.c:185
-#: ../objects/chronogram/chronoref.c:166
+#: ../lib/properties.c:104 ../lib/properties.h:692
+#: ../objects/chronogram/chronoline.c:185
+#: ../objects/chronogram/chronoref.c:166 ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/step.c:168 ../objects/GRAFCET/transition.c:144
 msgid "Font size"
 msgstr "åååå"
 
-#: ../lib/properties.c:83 ../lib/properties.h:547
-#: ../objects/GRAFCET/step.c:169 ../objects/chronogram/chronoline.c:187
-#: ../objects/chronogram/chronoref.c:168
+#: ../lib/properties.c:105 ../lib/properties.h:698
+#: ../objects/chronogram/chronoline.c:187
+#: ../objects/chronogram/chronoref.c:168 ../objects/GRAFCET/step.c:170
 msgid "Text color"
 msgstr "æåéè"
 
-#: ../lib/proplist.c:163
+#: ../lib/properties.h:640 ../lib/properties.h:643
+msgid "Line join"
+msgstr "çæéæä"
+
+#: ../lib/properties.h:646 ../lib/properties.h:649
+msgid "Line caps"
+msgstr "çææç"
+
+#: ../lib/properties.h:707
+msgid "Text fitting"
+msgstr "æåéå"
+
+#: ../lib/prop_inttypes.c:567
+msgid "Property cast from int to enum out of range"
+msgstr ""
+
+#: ../lib/proplist.c:161
 #, c-format
-msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "åæåæäææâ%sâ(%p)åææææèæ(%p)"
 
-#: ../lib/widgets.c:408
-msgid "Other fonts"
-msgstr "åååå"
+#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
+#, c-format
+msgid ""
+"Failed to load image form diagram:\n"
+"%s"
+msgstr ""
 
-#: ../lib/widgets.c:480
+#: ../lib/prop_pixbuf.c:200
 #, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "æäå %s æåçåé\n"
+msgid ""
+"Saving inline pixbuf failed:\n"
+"%s"
+msgstr ""
 
-#. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:838 ../objects/FS/function.c:1074
-msgid "Solid"
-msgstr "åå"
+#: ../lib/prop_pixbuf.c:296
+msgid "Cant create image data from scratch!"
+msgstr ""
+
+#: ../lib/prop_text.c:481
+#, c-format
+msgid "Group with %d objects"
+msgstr "å %d åçäççç"
 
-#: ../lib/widgets.c:844
-msgid "Dashed"
-msgstr "èç"
+#: ../lib/sheet.c:71 ../lib/sheet.c:86
+#, c-format
+msgid ""
+"DiaObject '%s' needed in sheet '%s' was not found.\n"
+"It will not be available for use."
+msgstr ""
 
-#: ../lib/widgets.c:850
-msgid "Dash-Dot"
-msgstr "èç-é"
+#: ../lib/sheet.c:316
+#, c-format
+msgid ""
+"The system sheet '%s' appears to be more recent than your custom\n"
+"version and has been loaded as '%s' for this session.\n"
+"\n"
+"Move new objects (if any) from '%s' into your custom sheet\n"
+"or remove '%s', using the 'Sheets and Objects' dialog."
+msgstr ""
 
-#: ../lib/widgets.c:856
-msgid "Dash-Dot-Dot"
-msgstr "èç-é-é"
+#: ../lib/sheet.c:375
+#, c-format
+msgid "%s: you should use object tags rather than shape tags now"
+msgstr ""
 
-#: ../lib/widgets.c:862
-msgid "Dotted"
-msgstr "éç"
+#: ../lib/standard-path.c:122
+msgid "Stroke"
+msgstr "çå"
 
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:881
-msgid "Dash length: "
-msgstr "èçéåï"
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: ../lib/standard-path.c:123 ../objects/FS/function.c:935
+msgid "Fill"
+msgstr "åå"
 
-#: ../lib/widgets.c:1006
-msgid "Select color"
-msgstr "éåèå"
+#: ../lib/standard-path.c:124
+msgid "Fill & Stroke"
+msgstr "åå &  & çå"
 
-#: ../lib/widgets.c:1072
-msgid "More colors..."
-msgstr "æåèå..."
+#: ../lib/standard-path.c:129
+msgid "Bezier points"
+msgstr "èèæççé"
 
-#: ../lib/widgets.c:1220
-msgid "More arrows"
-msgstr "æåçé"
+#: ../lib/standard-path.c:130
+msgid "Drawing"
+msgstr "çå"
 
-#: ../lib/widgets.c:1237
-msgid "Size: "
-msgstr "ååï"
+#: ../lib/standard-path.c:139
+msgid "Draw Control Lines"
+msgstr "ççæåç"
 
-#: ../lib/widgets.c:1390
+#: ../lib/standard-path.c:466
+msgid "Convert to Bezier"
+msgstr "èæçèèæç"
+
+#: ../lib/standard-path.c:467
+msgid "Show Control Lines"
+msgstr "éçæåç"
+
+#: ../lib/widgets.c:394
 msgid "Select image file"
 msgstr "éåååæ"
 
-#: ../lib/widgets.c:1424
+#: ../lib/widgets.c:445
 msgid "Browse"
 msgstr "çè"
 
-#: ../lib/widgets.c:2063
-msgid "Reset menu"
-msgstr "éèéå"
-
-#: ../objects/AADL/aadl.c:52
-msgid "Architecture Analysis & Design Language diagram objects"
-msgstr "ãææåæåèèèèãåèçä"
-
-#: ../objects/AADL/aadlbox.c:138
+#: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
 msgstr "åå"
 
-#: ../objects/AADL/aadlbox.c:349
+#: ../objects/AADL/aadlbox.c:356
 msgid "Add Access Provider"
 msgstr "ååååæäè"
 
-#: ../objects/AADL/aadlbox.c:351
+#: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Requirer"
 msgstr "ååååèæè"
 
-#: ../objects/AADL/aadlbox.c:353
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:355
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:357
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:359
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:361
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:363
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:365
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:367
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:369
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:371
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr "ååéæåçç"
 
-#: ../objects/AADL/aadlbox.c:373
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr "ååéæé"
 
-#: ../objects/AADL/aadlbox.c:377
+#: ../objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr "åééæå"
 
-#: ../objects/AADL/aadlbox.c:378
+#: ../objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr "çèéæååå"
 
-#: ../objects/AADL/aadlbox.c:382
+#: ../objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr "åééæé"
 
-#: ../objects/ER/attribute.c:155
-msgid "Key:"
-msgstr "éåï"
+#: ../objects/AADL/aadl.c:52
+msgid "Architecture Analysis & Design Language diagram objects"
+msgstr "ãææåæåèèèèãåèçä"
 
-#: ../objects/ER/attribute.c:157
-msgid "Weak key:"
-msgstr ""
+#: ../objects/chronogram/chronogram.c:40
+msgid "Chronogram diagram objects"
+msgstr "ãåäèãåèçä"
 
-#: ../objects/ER/attribute.c:159
-msgid "Derived:"
-msgstr "èçï"
+#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:5
+msgid "Data"
+msgstr "èæ"
 
-#: ../objects/ER/attribute.c:161
-msgid "Multivalue:"
-msgstr "åéæåï"
+#: ../objects/chronogram/chronoline.c:150
+msgid "Data name"
+msgstr "èæåç"
 
-#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:1
-msgid "Attribute"
-msgstr "åæ"
+#: ../objects/chronogram/chronoline.c:152
+msgid "Events"
+msgstr "ää"
 
-#: ../objects/ER/entity.c:137
-msgid "Weak:"
+#: ../objects/chronogram/chronoline.c:155
+msgid "Event specification"
+msgstr "ääèæ"
+
+#: ../objects/chronogram/chronoline.c:156
+msgid ""
+"@ time    set the pointer to an absolute time.\n"
+"( duration  set the signal up, then wait 'duration'.\n"
+") duration  set the signal down, then wait 'duration'.\n"
+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
+"Example: @ 1.0 (2.0)1.0(2.0)\n"
 msgstr ""
+"@ æé      èåæææçåæéã\n"
+"( çéæé  èåäèååïäçåãçéæéãã\n"
+") çéæé  èåäèåæïäçåãçéæéãã\n"
+"u çéæé  èåäèçãæçãïäçåãçéæéãã\n"
+"äåï@ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/ER/entity.c:139
-msgid "Associative:"
-msgstr "ééï"
+#: ../objects/chronogram/chronoline.c:162 ../objects/UML/umloperation.c:79
+msgid "Parameters"
+msgstr "åæ"
 
-#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:129
-#: ../sheets/ER.sheet.in.h:4
-msgid "Entity"
-msgstr "åé"
+#: ../objects/chronogram/chronoline.c:164
+#: ../objects/chronogram/chronoref.c:146
+msgid "Start time"
+msgstr "éåæé"
 
-#: ../objects/ER/er.c:44
-msgid "Entity/Relationship diagram objects"
-msgstr "ãåé/éäãåèçä"
+#: ../objects/chronogram/chronoline.c:166
+#: ../objects/chronogram/chronoref.c:148
+msgid "End time"
+msgstr "çææé"
 
-#: ../objects/ER/participation.c:116
-msgid "Total:"
-msgstr "çèï"
+#: ../objects/chronogram/chronoline.c:168
+msgid "Rise time"
+msgstr "äåæé"
 
-#: ../objects/ER/participation.c:406 ../objects/FS/flow-ortho.c:622
-#: ../objects/GRAFCET/vector.c:312 ../objects/SADT/arrow.c:457
-#: ../objects/UML/association.c:769 ../objects/UML/component_feature.c:184
-#: ../objects/UML/dependency.c:374 ../objects/UML/generalization.c:370
-#: ../objects/UML/realizes.c:361 ../objects/UML/transition.c:161
-#: ../objects/standard/zigzagline.c:348
-msgid "Add segment"
-msgstr "åååæ"
+#: ../objects/chronogram/chronoline.c:170
+msgid "Fall time"
+msgstr "äéæé"
 
-#: ../objects/ER/participation.c:407 ../objects/FS/flow-ortho.c:623
-#: ../objects/GRAFCET/vector.c:313 ../objects/SADT/arrow.c:458
-#: ../objects/UML/association.c:770 ../objects/UML/component_feature.c:185
-#: ../objects/UML/dependency.c:375 ../objects/UML/generalization.c:371
-#: ../objects/UML/realizes.c:362 ../objects/UML/transition.c:162
-#: ../objects/standard/zigzagline.c:349
-msgid "Delete segment"
-msgstr "åéåæ"
+#: ../objects/chronogram/chronoline.c:171
+msgid "Multi-bit data"
+msgstr "åäåèæ"
 
-#: ../objects/ER/relationship.c:142
-msgid "Left Cardinality:"
-msgstr "åååæ:"
+#: ../objects/chronogram/chronoline.c:173
+#: ../objects/chronogram/chronoref.c:156
+msgid "Aspect"
+msgstr "åéæ"
 
-#: ../objects/ER/relationship.c:144
-msgid "Right Cardinality:"
-msgstr "åååæ:"
+#: ../objects/chronogram/chronoline.c:175
+msgid "Data color"
+msgstr "èæéè"
 
-#: ../objects/ER/relationship.c:146
-msgid "Rotate:"
-msgstr "æèï"
+#: ../objects/chronogram/chronoline.c:177
+msgid "Data line width"
+msgstr "èæèå"
+
+#: ../objects/chronogram/chronoref.c:144
+msgid "Time data"
+msgstr "æéèæ"
+
+#: ../objects/chronogram/chronoref.c:150
+msgid "Major time step"
+msgstr "äèååçæééå"
+
+#: ../objects/chronogram/chronoref.c:152
+msgid "Minor time step"
+msgstr "çååçæééå"
+
+#: ../objects/chronogram/chronoref.c:162
+msgid "Minor step line width"
+msgstr "çååççæéå"
+
+#: ../objects/custom/custom.c:140
+msgid "Custom"
+msgstr "èé"
+
+#: ../objects/custom/custom.c:140
+msgid "Custom XML shapes loader"
+msgstr "èé XML ååèåçå"
+
+#: ../objects/custom/custom_object.c:199 ../objects/custom/custom_object.c:232
+msgid "Flip horizontal"
+msgstr "äçæåéå"
+
+#: ../objects/custom/custom_object.c:201 ../objects/custom/custom_object.c:234
+msgid "Flip vertical"
+msgstr "äçåçéå"
+
+#: ../objects/custom/custom_object.c:204 ../objects/custom/custom_object.c:237
+msgid "Scale of the subshapes"
+msgstr "åååçæ"
+
+#: ../objects/custom/custom_object.c:218 ../objects/flowchart/box.c:153
+#: ../objects/flowchart/diamond.c:151 ../objects/flowchart/ellipse.c:150
+#: ../objects/flowchart/parallelogram.c:155 ../objects/SADT/box.c:136
+msgid "Text padding"
+msgstr "æååå"
+
+#: ../objects/custom/custom_object.c:1777
+msgid "Flip Horizontal"
+msgstr "äçæåéå"
+
+#: ../objects/custom/custom_object.c:1778
+msgid "Flip Vertical"
+msgstr "äçåçéå"
+
+#: ../objects/custom/custom_object.c:1815
+#, c-format
+msgid "Cannot open icon file %s for object type '%s'."
+msgstr "çæéåçäéåâ%2$sâæççåçæ %1$sã"
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "CustomLines"
+msgstr "èéçæ"
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "Custom XML lines loader"
+msgstr "èé XML çæèåçå"
+
+#: ../objects/custom_lines/custom_linetypes.c:259
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+msgstr ""
+
+#: ../objects/custom/shape_info.c:170
+#, c-format
+msgid ""
+"The file '%s' has invalid path data.\n"
+"svg:path data must start with moveto."
+msgstr ""
+"'%s' æææçæçèåèæã\n"
+"svgïèåèæåéä moveto ééã"
+
+#: ../objects/Database/compound.c:198
+msgid "Number of arms"
+msgstr "arm æ"
+
+#: ../objects/Database/compound.c:221
+msgid "Flip arms vertically"
+msgstr "arm åçéå"
+
+#: ../objects/Database/compound.c:223
+msgid "Flip arms horizontally"
+msgstr "arm æåéå"
+
+#: ../objects/Database/compound.c:225
+msgid "Center mount point vertically"
+msgstr "æèéåççä"
+
+#: ../objects/Database/compound.c:227
+msgid "Center mount point horizontally"
+msgstr "æèéæåçä"
+
+#: ../objects/Database/compound.c:229
+msgid "Center mount point"
+msgstr "æèéçä"
+
+#: ../objects/Database/compound.c:234
+msgid "Compound"
+msgstr "èåçä"
+
+#: ../objects/Database/database.c:39
+msgid "Entity/Relationship table diagram objects"
+msgstr "ãåé/éäãèæåèçä"
+
+#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:151
+#: ../objects/standard/box.c:138 ../objects/standard/polyline.c:107
+#: ../objects/standard/zigzagline.c:107
+msgid "Corner radius"
+msgstr "èèåå"
+
+#: ../objects/Database/reference.c:112
+msgid "Start description"
+msgstr "éåèæ"
+
+#: ../objects/Database/reference.c:114
+msgid "End description"
+msgstr "çæèæ"
+
+#: ../objects/Database/reference.c:121 ../objects/Database/table.c:214
+#: ../objects/Database/table.c:216 ../objects/Database/table.c:218
+#: ../objects/UML/association.c:248 ../objects/UML/association.c:259
+#: ../objects/UML/association.c:261 ../objects/UML/association.c:263
+#: ../objects/UML/association.c:265 ../objects/UML/association.c:267
+#: ../objects/UML/class.c:215 ../objects/UML/class.c:217
+#: ../objects/UML/class.c:219 ../objects/UML/class.c:221
+#: ../objects/UML/class.c:223 ../objects/UML/class.c:225
+msgid " "
+msgstr " "
+
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:405
+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:311
+#: ../objects/SADT/arrow.c:463 ../objects/standard/zigzagline.c:448
+#: ../objects/UML/association.c:867 ../objects/UML/component_feature.c:189
+#: ../objects/UML/dependency.c:381 ../objects/UML/generalization.c:378
+#: ../objects/UML/realizes.c:368 ../objects/UML/transition.c:172
+msgid "Add segment"
+msgstr "åååæ"
+
+#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:406
+#: ../objects/FS/flow-ortho.c:628 ../objects/GRAFCET/vector.c:312
+#: ../objects/SADT/arrow.c:464 ../objects/standard/zigzagline.c:449
+#: ../objects/UML/association.c:868 ../objects/UML/component_feature.c:190
+#: ../objects/UML/dependency.c:382 ../objects/UML/generalization.c:379
+#: ../objects/UML/realizes.c:369 ../objects/UML/transition.c:173
+msgid "Delete segment"
+msgstr "åéåæ"
+
+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
+msgid "Reference"
+msgstr "åè"
+
+#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
+#: ../objects/Database/table.c:211 ../objects/UML/class.c:144
+#: ../objects/UML/class.c:211 ../objects/UML/class_dialog.c:486
+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
+msgid "Comment"
+msgstr "åè"
+
+#: ../objects/Database/table.c:144
+msgid "Primary"
+msgstr "ä"
+
+#: ../objects/Database/table.c:144
+msgid "Primary key"
+msgstr "äé"
+
+#: ../objects/Database/table.c:146
+msgid "Nullable"
+msgstr "åççå(Null)"
+
+#: ../objects/Database/table.c:148
+msgid "Unique"
+msgstr "çä"
+
+#: ../objects/Database/table.c:150
+msgid "Default"
+msgstr "éè"
+
+#: ../objects/Database/table.c:150
+msgid "Default value"
+msgstr "éèå"
+
+#. init data
+#: ../objects/Database/table.c:179 ../objects/Database/table.c:269
+#: ../objects/Database/table.c:376 ../sheets/Database.sheet.in.h:3
+msgid "Table"
+msgstr "èæ"
+
+#: ../objects/Database/table.c:188
+msgid "Visible comments"
+msgstr "åèèè"
+
+#: ../objects/Database/table.c:190
+msgid "Underline primary keys"
+msgstr "äéååç"
+
+#: ../objects/Database/table.c:193 ../objects/UML/class.c:159
+msgid "Comment tagging"
+msgstr "èèæè"
+
+#: ../objects/Database/table.c:195
+msgid "Use bold font for primary keys"
+msgstr "äéäççé"
+
+#: ../objects/Database/table.c:198 ../objects/UML/class.c:181
+#: ../objects/UML/object.c:152
+msgid "Attributes"
+msgstr "åæ"
+
+#. umlformalparameters_extra
+#. all this just to make the defaults selectable ...
+#: ../objects/Database/table.c:202 ../objects/UML/association.c:270
+#: ../objects/UML/class.c:196 ../objects/UML/object.c:161
+msgid "Style"
+msgstr "åæ"
+
+#: ../objects/Database/table.c:203 ../objects/UML/class.c:197
+msgid "Fonts"
+msgstr "åå"
+
+#. property rows
+#: ../objects/Database/table.c:207 ../objects/SADT/arrow.c:136
+#: ../objects/UML/class.c:201 ../objects/UML/class_dialog.c:461
+msgid "Normal"
+msgstr "æå"
+
+#: ../objects/Database/table.c:209
+msgid "Table name"
+msgstr "èæåç"
+
+#: ../objects/Database/table.c:264 ../objects/UML/class.c:342
+msgid "Show comments"
+msgstr "éçåè"
+
+#: ../objects/ER/attribute.c:153 ../objects/ER/entity.c:135
+#: ../objects/ER/relationship.c:140
+#: ../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:133
+#: ../objects/UML/generalization.c:130 ../objects/UML/realizes.c:130
+msgid "Name:"
+msgstr "åçï"
+
+#: ../objects/ER/attribute.c:155
+msgid "Key:"
+msgstr "éåï"
+
+#: ../objects/ER/attribute.c:157
+msgid "Weak key:"
+msgstr "åéï"
+
+#: ../objects/ER/attribute.c:159
+msgid "Derived:"
+msgstr "èçï"
+
+#: ../objects/ER/attribute.c:161
+msgid "Multivalue:"
+msgstr "åéåï"
+
+#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:6
+msgid "Attribute"
+msgstr "åæ"
+
+#: ../objects/ER/entity.c:137
+msgid "Weak:"
+msgstr "åï"
+
+#: ../objects/ER/entity.c:139
+msgid "Associative:"
+msgstr "ééï"
+
+#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:130
+#: ../sheets/ER.sheet.in.h:3
+msgid "Entity"
+msgstr "åé"
+
+#: ../objects/ER/er.c:44
+msgid "Entity/Relationship diagram objects"
+msgstr "ãåé/éäãåèçä"
+
+#: ../objects/ER/participation.c:117
+msgid "Total:"
+msgstr "çèï"
+
+#: ../objects/ER/relationship.c:142
+msgid "Left Cardinality:"
+msgstr "åååæ:"
+
+#: ../objects/ER/relationship.c:144
+msgid "Right Cardinality:"
+msgstr "åååæ:"
+
+#: ../objects/ER/relationship.c:146
+msgid "Rotate:"
+msgstr "æèï"
 
 #: ../objects/ER/relationship.c:148
 msgid "Identifying:"
 msgstr "èåï"
 
-#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr "éä"
 
+#: ../objects/flowchart/flowchart.c:37
+msgid "Flowchart objects"
+msgstr "æçåçä"
+
+#: ../objects/flowchart/parallelogram.c:153
+msgid "Shear angle"
+msgstr "åèè"
+
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:619
-#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:571
-#: ../objects/FS/function.c:1096
+#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:626
+#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:624
+#: ../objects/FS/function.c:1097
 msgid "Energy"
 msgstr "èé"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:620
-#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:572
-#: ../objects/FS/function.c:1072
+#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:627
+#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:625
+#: ../objects/FS/function.c:1073
 msgid "Material"
 msgstr "ææ"
 
@@ -2682,13 +3358,23 @@ msgstr "ææ"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:621
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:573
-#: ../objects/FS/function.c:1034 ../objects/FS/function.c:1036
-#: ../objects/FS/function.c:1172 ../objects/FS/function.c:1174
+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:628
+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:626
+#: ../objects/FS/function.c:1035 ../objects/FS/function.c:1037
+#: ../objects/FS/function.c:1173 ../objects/FS/function.c:1175
 msgid "Signal"
 msgstr "äè"
 
+#: ../objects/FS/flow.c:144 ../objects/FS/flow-ortho.c:167
+#: ../objects/Istar/link.c:161 ../objects/Jackson/phenomenon.c:145
+#: ../objects/KAOS/metaandorrel.c:165 ../objects/KAOS/metabinrel.c:172
+#: ../objects/UML/class_attributes_dialog.c:528
+#: ../objects/UML/class_operations_dialog.c:788
+#: ../objects/UML/class_operations_dialog.c:988
+#: ../objects/UML/class_templates_dialog.c:447
+msgid "Type:"
+msgstr "éåï"
+
 #: ../objects/FS/fs.c:43
 msgid "Function structure diagram objects"
 msgstr "ãåèçæãåèçä"
@@ -2702,1030 +3388,1019 @@ msgid "User function"
 msgstr "äçèåè"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:676
+#: ../objects/FS/function.c:677
 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:678 ../objects/FS/function.c:680
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:679 ../objects/FS/function.c:681
+#: ../objects/FS/function.c:721
 msgid "Channel"
 msgstr "éé"
 
-#. Translators: Menu item Verb/Channel/Import
-#. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:682 ../objects/FS/function.c:684
-msgid "Import"
-msgstr "åå"
-
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:686 ../objects/KAOS/metabinrel.c:163
+#: ../objects/FS/function.c:687 ../objects/KAOS/metabinrel.c:164
 msgid "Input"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:688
+#: ../objects/FS/function.c:689
 msgid "Receive"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:690 ../objects/FS/function.c:962
+#: ../objects/FS/function.c:691 ../objects/FS/function.c:963
 msgid "Allow"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:692
+#: ../objects/FS/function.c:693
 msgid "Form Entrance"
 msgstr "èååå"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:694 ../objects/FS/function.c:928
+#: ../objects/FS/function.c:695 ../objects/FS/function.c:929
 msgid "Capture"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:700
+#: ../objects/FS/function.c:701
 msgid "Discharge"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:702
+#: ../objects/FS/function.c:703
 msgid "Eject"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:705
 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:708 ../objects/FS/function.c:710
-#: ../objects/FS/function.c:728
+#: ../objects/FS/function.c:709 ../objects/FS/function.c:711
+#: ../objects/FS/function.c:729
 msgid "Transfer"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:712 ../objects/FS/function.c:714
+#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
 msgid "Transport"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:716
+#: ../objects/FS/function.c:717
 msgid "Lift"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:718
+#: ../objects/FS/function.c:719
 msgid "Move"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:722 ../objects/FS/function.c:724
+#: ../objects/FS/function.c:723 ../objects/FS/function.c:725
 msgid "Transmit"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:726
+#: ../objects/FS/function.c:727
 msgid "Conduct"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:731
 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:732 ../objects/FS/function.c:734
-#: ../objects/FS/function.c:736
+#: ../objects/FS/function.c:733 ../objects/FS/function.c:735
+#: ../objects/FS/function.c:737
 msgid "Guide"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:738
+#: ../objects/FS/function.c:739
 msgid "Direct"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:741
 msgid "Straighten"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:743
 msgid "Steer"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:745
 msgid "Translate"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:746 ../objects/FS/function.c:748
+#: ../objects/FS/function.c:747 ../objects/FS/function.c:749
 msgid "Rotate"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:750
+#: ../objects/FS/function.c:751
 msgid "Turn"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:752
+#: ../objects/FS/function.c:753
 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:754 ../objects/FS/function.c:756
+#: ../objects/FS/function.c:755 ../objects/FS/function.c:757
 msgid "Allow DOF"
 msgstr "åè DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:758
+#: ../objects/FS/function.c:759
 msgid "Constrain"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:760
+#: ../objects/FS/function.c:761
 msgid "Unlock"
 msgstr "äéå"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:762 ../objects/FS/function.c:764
+#: ../objects/FS/function.c:763 ../objects/FS/function.c:765
 msgid "Support"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:766 ../objects/FS/function.c:768
-#: ../sheets/SDL.sheet.in.h:19
+#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
+#: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:770
+#: ../objects/FS/function.c:771
 msgid "Insulate"
 msgstr "éç"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:772
+#: ../objects/FS/function.c:773
 msgid "Protect"
 msgstr "äè"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:774 ../objects/FS/function.c:964
+#: ../objects/FS/function.c:775 ../objects/FS/function.c:965
 msgid "Prevent"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:776
+#: ../objects/FS/function.c:777
 msgid "Shield"
 msgstr "éè"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:778
+#: ../objects/FS/function.c:779
 msgid "Inhibit"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:780 ../objects/FS/function.c:782
+#: ../objects/FS/function.c:781 ../objects/FS/function.c:783
 msgid "Stabilize"
 msgstr "çåå"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:784
+#: ../objects/FS/function.c:785
 msgid "Steady"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:786 ../objects/FS/function.c:788
+#: ../objects/FS/function.c:787 ../objects/FS/function.c:789
 msgid "Secure"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:790 ../objects/FS/function.c:822
+#: ../objects/FS/function.c:791 ../objects/FS/function.c:823
 msgid "Attach"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:792
+#: ../objects/FS/function.c:793
 msgid "Mount"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:794 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:795 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:796
+#: ../objects/FS/function.c:797
 msgid "Fasten"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:798
+#: ../objects/FS/function.c:799
 msgid "Hold"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:800 ../objects/FS/function.c:802
-#: ../objects/Istar/actor.c:70
+#: ../objects/FS/function.c:801 ../objects/FS/function.c:803
+#: ../objects/Istar/actor.c:68
 msgid "Position"
 msgstr "äç"
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:804
+#: ../objects/FS/function.c:805
 msgid "Orient"
 msgstr "æå"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../objects/FS/function.c:808 ../objects/FS/function.c:1050
-msgid "Locate"
-msgstr "åæ"
-
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:810 ../objects/FS/function.c:812
+#: ../objects/FS/function.c:811 ../objects/FS/function.c:813
 msgid "Connect"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:814 ../objects/FS/function.c:816
+#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
 msgid "Couple"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:818
+#: ../objects/FS/function.c:819
 msgid "Join"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:820
+#: ../objects/FS/function.c:821
 msgid "Assemble"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:824 ../objects/FS/function.c:826
+#: ../objects/FS/function.c:825 ../objects/FS/function.c:827
 msgid "Mix"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:828
+#: ../objects/FS/function.c:829
 msgid "Combine"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:830
+#: ../objects/FS/function.c:831
 msgid "Blend"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:833
 msgid "Add"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:835
 msgid "Pack"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:837
 msgid "Coalesce"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:838 ../objects/FS/function.c:840
-#: ../sheets/UML.sheet.in.h:5
+#: ../objects/FS/function.c:839 ../objects/FS/function.c:841
+#: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:842 ../objects/FS/function.c:844
-#: ../objects/FS/function.c:846
+#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
+#: ../objects/FS/function.c:847
 msgid "Separate"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:848
+#: ../objects/FS/function.c:849
 msgid "Switch"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:851
 msgid "Divide"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:853
 msgid "Release"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:855
 msgid "Detach"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:857
 msgid "Disconnect"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:862
+#: ../objects/FS/function.c:863
 msgid "Cut"
 msgstr "åä"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:864
+#: ../objects/FS/function.c:865
 msgid "Polish"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:867
 msgid "Sand"
 msgstr "æ"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:869
 msgid "Drill"
 msgstr "é"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:871
 msgid "Lathe"
 msgstr "é"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:872 ../objects/FS/function.c:874
+#: ../objects/FS/function.c:873 ../objects/FS/function.c:875
 msgid "Refine"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:876
+#: ../objects/FS/function.c:877
 msgid "Purify"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:878
+#: ../objects/FS/function.c:879
 msgid "Strain"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:881
 msgid "Filter"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:883
 msgid "Percolate"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:885
 msgid "Clear"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:886 ../objects/FS/function.c:888
+#: ../objects/FS/function.c:887 ../objects/FS/function.c:889
 msgid "Distribute"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:890
+#: ../objects/FS/function.c:891
 msgid "Diverge"
-msgstr "åå"
+msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:892
+#: ../objects/FS/function.c:893
 msgid "Scatter"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:895
 msgid "Disperse"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:896 ../objects/FS/function.c:910
+#: ../objects/FS/function.c:897 ../objects/FS/function.c:911
 msgid "Diffuse"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:898
+#: ../objects/FS/function.c:899
 msgid "Empty"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:900 ../objects/FS/function.c:902
+#: ../objects/FS/function.c:901 ../objects/FS/function.c:903
 msgid "Dissipate"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:904
+#: ../objects/FS/function.c:905
 msgid "Absorb"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:906
+#: ../objects/FS/function.c:907
 msgid "Dampen"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:909
 msgid "Dispel"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:912
+#: ../objects/FS/function.c:913
 msgid "Resist"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:914 ../objects/FS/function.c:916
+#: ../objects/FS/function.c:915 ../objects/FS/function.c:917
 msgid "Provision"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:918 ../objects/FS/function.c:920
+#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
 msgid "Store"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:922
+#: ../objects/FS/function.c:923
 msgid "Contain"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:924
+#: ../objects/FS/function.c:925
 msgid "Collect"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:927
 msgid "Reserve"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:930 ../objects/FS/function.c:932
+#: ../objects/FS/function.c:931 ../objects/FS/function.c:933
 msgid "Supply"
 msgstr "äæ"
 
-#. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:934
-msgid "Fill"
-msgstr "åå"
-
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:936
+#: ../objects/FS/function.c:937
 msgid "Provide"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:938
+#: ../objects/FS/function.c:939
 msgid "Replenish"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:941
 msgid "Expose"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:942 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:943 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:944 ../objects/FS/function.c:946
+#: ../objects/FS/function.c:945 ../objects/FS/function.c:947
 msgid "Control Magnitude"
 msgstr "æåé"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:948 ../objects/FS/function.c:950
+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
 msgid "Actuate"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:952
+#: ../objects/FS/function.c:953
 msgid "Start"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:954
+#: ../objects/FS/function.c:955
 msgid "Initiate"
 msgstr "ååå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:956 ../objects/FS/function.c:958
+#: ../objects/FS/function.c:957 ../objects/FS/function.c:959
 msgid "Regulate"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:960 ../objects/FS/function.c:1178
-#: ../objects/UML/classicon.c:127
+#: ../objects/FS/function.c:961 ../objects/FS/function.c:1179
+#: ../objects/UML/classicon.c:128
 msgid "Control"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:966
+#: ../objects/FS/function.c:967
 msgid "Enable"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:968
+#: ../objects/FS/function.c:969
 msgid "Disable"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:971
 msgid "Limit"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:973
 msgid "Interrupt"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:974 ../objects/FS/function.c:976
+#: ../objects/FS/function.c:975 ../objects/FS/function.c:977
 msgid "Change"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:978
+#: ../objects/FS/function.c:979
 msgid "Increase"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:980
+#: ../objects/FS/function.c:981
 msgid "Decrease"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:983
 msgid "Amplify"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:985
 msgid "Reduce"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:988
+#: ../objects/FS/function.c:989
 msgid "Normalize"
 msgstr "æåå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:990
+#: ../objects/FS/function.c:991
 msgid "Multiply"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
-#: ../objects/FS/function.c:992
+#. FIXME: mark read-only
+#: ../objects/FS/function.c:993 ../objects/Misc/measure.c:186
 msgid "Scale"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:994
+#: ../objects/FS/function.c:995
 msgid "Rectify"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:996
+#: ../objects/FS/function.c:997
 msgid "Adjust"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:998 ../objects/FS/function.c:1000
+#: ../objects/FS/function.c:999 ../objects/FS/function.c:1001
 msgid "Form"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1002
+#: ../objects/FS/function.c:1003
 msgid "Compact"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:1005
 msgid "Crush"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:1007
 msgid "Shape"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:1009
 msgid "Compress"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1011
 msgid "Pierce"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1012 ../objects/FS/function.c:1014
+#: ../objects/FS/function.c:1013 ../objects/FS/function.c:1015
 msgid "Convert"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1016
+#: ../objects/FS/function.c:1017
 msgid "Transform"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1019
 msgid "Liquefy"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1021
 msgid "Solidify"
 msgstr "ååå"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1023
 msgid "Evaporate"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1025
 msgid "Sublimate"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1027
 msgid "Condense"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1029
 msgid "Integrate"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1031
 msgid "Differentiate"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1032 ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1033 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
-msgstr "çå"
+msgstr "èç"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1038 ../objects/FS/function.c:1040
+#: ../objects/FS/function.c:1039 ../objects/FS/function.c:1041
 msgid "Sense"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1042
+#: ../objects/FS/function.c:1043
 msgid "Perceive"
 msgstr "çè"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1045
 msgid "Recognize"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1047
 msgid "Discern"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1049
 msgid "Check"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1052
+#: ../objects/FS/function.c:1053
 msgid "Verify"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1054 ../objects/FS/function.c:1056
+#: ../objects/FS/function.c:1055 ../objects/FS/function.c:1057
 msgid "Indicate"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1058
+#: ../objects/FS/function.c:1059
 msgid "Mark"
 msgstr "èè"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1060 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1061 ../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:1062 ../objects/FS/function.c:1064
+#: ../objects/FS/function.c:1063 ../objects/FS/function.c:1065
 msgid "Measure"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1066
+#: ../objects/FS/function.c:1067
 msgid "Calculate"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1069
 msgid "Represent"
 msgstr "èç"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1071
 msgid "Noun"
 msgstr "åè"
 
+#. Translators: Menu item Noun/Material/Solid
+#: ../objects/FS/function.c:1075
+msgid "Solid"
+msgstr "åå"
+
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1076
+#: ../objects/FS/function.c:1077
 msgid "Liquid"
 msgstr "æé"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1079
 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:1080 ../objects/FS/function.c:1082
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1081 ../objects/FS/function.c:1083
+#: ../objects/FS/function.c:1167
 msgid "Human"
 msgstr "äé"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1084
+#: ../objects/FS/function.c:1085
 msgid "Hand"
 msgstr "æ"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1086
+#: ../objects/FS/function.c:1087
 msgid "Foot"
 msgstr "è"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1089
 msgid "Head"
 msgstr "é"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1091
 msgid "Finger"
 msgstr "ææ"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1093
 msgid "Toe"
 msgstr "èè"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1095
 msgid "Biological"
 msgstr "çç"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1098
+#: ../objects/FS/function.c:1099
 msgid "Mechanical"
 msgstr "ææ"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1100
+#: ../objects/FS/function.c:1101
 msgid "Mech. Energy"
-msgstr "ææèé"
+msgstr "ææè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1103
 msgid "Translation"
-msgstr "èå"
+msgstr "åç"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1105
 msgid "Force"
 msgstr "å"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1107 ../objects/standard/outline.c:104
 msgid "Rotation"
 msgstr "æè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1108
+#: ../objects/FS/function.c:1109
 msgid "Torque"
 msgstr "èç"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1110
+#: ../objects/FS/function.c:1111
 msgid "Random Motion"
 msgstr "éæéå"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1113
 msgid "Vibration"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1115
 msgid "Rotational Energy"
-msgstr "æèèé"
+msgstr "æèåè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1117
 msgid "Translational Energy"
-msgstr "èèèæ"
+msgstr "åçåè"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1119
 msgid "Electrical"
 msgstr "éæ"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1121
 msgid "Electricity"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1123
 msgid "Voltage"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1125
 msgid "Current"
 msgstr "éæ"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1127
 msgid "Hydraulic"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1129
 msgid "Pressure"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1131
 msgid "Volumetric Flow"
 msgstr "æé"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1133
 msgid "Thermal"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1135
 msgid "Heat"
 msgstr "ç"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1137
 msgid "Conduction"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1139
 msgid "Convection"
 msgstr "åæ"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1140 ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1141 ../objects/FS/function.c:1149
 msgid "Radiation"
 msgstr "èå"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1142
+#: ../objects/FS/function.c:1143
 msgid "Pneumatic"
-msgstr "æé"
+msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1144
+#: ../objects/FS/function.c:1145
 msgid "Chemical"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1147
 msgid "Radioactive"
-msgstr "æèåæ"
+msgstr "èåæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1151
 msgid "Microwaves"
 msgstr "åæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1153
 msgid "Radio waves"
 msgstr "ççéæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1155
 msgid "X-Rays"
 msgstr "X åç"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1157
 msgid "Gamma Rays"
 msgstr "äçåç"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1159
 msgid "Acoustic Energy"
-msgstr "ééèæ"
+msgstr "èè"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1161
 msgid "Optical Energy"
-msgstr "ååèé"
+msgstr "åè"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1163
 msgid "Solar Energy"
 msgstr "åéè"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1165
 msgid "Magnetic Energy"
-msgstr "éçèé"
+msgstr "çè"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1169
 msgid "Human Motion"
 msgstr "äééå"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1171
 msgid "Human Force"
 msgstr "äå"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1176
+#: ../objects/FS/function.c:1177
 msgid "Status"
 msgstr "çæ"
 
-#: ../objects/FS/function.c:1180
+#: ../objects/FS/function.c:1181
 msgid "User/Device Fn"
 msgstr "äçè/èç Få"
 
-#: ../objects/FS/function.c:1181
+#: ../objects/FS/function.c:1182
 msgid "Wish Fn"
 msgstr "ææ Få"
 
-#: ../objects/GRAFCET/action.c:135 ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:133 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr "åéåå"
 
-#: ../objects/GRAFCET/action.c:135
+#: ../objects/GRAFCET/action.c:133
 msgid "This action is a call to a macro-step"
 msgstr "éååäæåååé"
 
@@ -3757,51 +4432,51 @@ msgstr "æäæççéè"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET åèçä"
 
-#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr "æææé"
 
-#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "åååæé"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr "åééåæé"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr "åéééæé"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "åéååæé"
 
-#: ../objects/GRAFCET/step.c:151
+#: ../objects/GRAFCET/step.c:152
 msgid "Subprogram call step"
 msgstr "åçåååæé"
 
-#: ../objects/GRAFCET/step.c:158
+#: ../objects/GRAFCET/step.c:159
 msgid "Step name"
 msgstr "æéåç"
 
-#: ../objects/GRAFCET/step.c:158
+#: ../objects/GRAFCET/step.c:159
 msgid "The name of the step"
 msgstr "æéçåç"
 
-#: ../objects/GRAFCET/step.c:161
+#: ../objects/GRAFCET/step.c:162
 msgid "Step type"
 msgstr "æééå"
 
-#: ../objects/GRAFCET/step.c:161
+#: ../objects/GRAFCET/step.c:162
 msgid "The kind of step"
 msgstr "æéçéå"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:164
 msgid "Active"
 msgstr "åå"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:164
 msgid "Shows a red dot to figure the step's activity"
 msgstr "ääçééçææçéè"
 
@@ -3833,59 +4508,62 @@ msgstr "åé"
 msgid "South point"
 msgstr "åé"
 
-#: ../objects/GRAFCET/vector.c:129
+#: ../objects/GRAFCET/vector.c:128
 msgid "Draw arrow heads on upward arcs:"
 msgstr "ååäçåçäçèçéï"
 
-#: ../objects/GRAFCET/vergent.c:122
+#: ../objects/GRAFCET/vergent.c:121
 msgid "OR"
 msgstr "OR"
 
-#: ../objects/GRAFCET/vergent.c:123
+#: ../objects/GRAFCET/vergent.c:122
 msgid "AND"
 msgstr "AND"
 
-#: ../objects/GRAFCET/vergent.c:134
+#: ../objects/GRAFCET/vergent.c:133
 msgid "Vergent type:"
-msgstr "ååéåï"
+msgstr "åèéåï"
 
-#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:469
-#: ../objects/Jackson/domain.c:531 ../objects/KAOS/goal.c:572
-#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:447
-#: ../objects/standard/line.c:219
+#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c:466
+#: ../objects/Jackson/domain.c:528 ../objects/KAOS/goal.c:569
+#: ../objects/KAOS/other.c:520 ../objects/SADT/box.c:448
+#: ../objects/standard/line.c:319
 msgid "Add connection point"
 msgstr "ååéæé"
 
-#: ../objects/GRAFCET/vergent.c:406
-msgid "Delete  connection point"
+#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:467
+#: ../objects/Jackson/domain.c:529 ../objects/KAOS/goal.c:570
+#: ../objects/KAOS/other.c:521 ../objects/SADT/box.c:449
+#: ../objects/standard/line.c:320
+msgid "Delete connection point"
 msgstr "åééæé"
 
-#: ../objects/GRAFCET/vergent.c:410
+#: ../objects/GRAFCET/vergent.c:409
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET OR/AND åæ"
 
-#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:152
+#: ../objects/Istar/actor.c:66 ../objects/Istar/link.c:149
 msgid "Unspecified"
 msgstr "ææå"
 
-#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:67 ../objects/KAOS/other.c:73
 msgid "Agent"
 msgstr "äç"
 
-#: ../objects/Istar/actor.c:71
+#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:250
 msgid "Role"
 msgstr "èè"
 
-#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:74 ../objects/KAOS/goal.c:77
 msgid "Softgoal"
 msgstr ""
 
-#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:75 ../objects/KAOS/goal.c:78
 msgid "Goal"
 msgstr "çæ"
 
-#: ../objects/Istar/goal.c:154 ../objects/Istar/goal.c:155
-#: ../objects/KAOS/goal.c:157 ../objects/KAOS/goal.c:158
+#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
+#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
 msgid "Goal Type"
 msgstr "çæéå"
 
@@ -3893,81 +4571,76 @@ msgstr "çæéå"
 msgid "Istar diagram"
 msgstr "Istar åè"
 
-#: ../objects/Istar/link.c:153
-msgid "Positive Contrib"
-msgstr "æå Contrib"
+#: ../objects/Istar/link.c:150
+#, fuzzy
+msgid "Positive contrib"
+msgstr "æå contrib"
 
-#: ../objects/Istar/link.c:154
+#: ../objects/Istar/link.c:151
 msgid "Negative contrib"
 msgstr "è contrib"
 
-#: ../objects/Istar/link.c:155 ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:152 ../sheets/UML.sheet.in.h:6
 msgid "Dependency"
 msgstr "çæææ"
 
-#: ../objects/Istar/link.c:156
+#: ../objects/Istar/link.c:153
 msgid "Decomposition"
 msgstr "åç"
 
-#: ../objects/Istar/link.c:157
+#: ../objects/Istar/link.c:154
 msgid "Means-Ends"
 msgstr "Means-Ends"
 
-#: ../objects/Istar/other.c:73
+#: ../objects/Istar/other.c:71
 msgid "Resource"
 msgstr "èæ"
 
-#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:72 ../sheets/BPMN.sheet.in.h:33
 msgid "Task"
 msgstr "åä"
 
-#: ../objects/Istar/other.c:470 ../objects/Jackson/domain.c:532
-#: ../objects/KAOS/goal.c:573 ../objects/KAOS/other.c:526
-#: ../objects/SADT/box.c:448 ../objects/standard/line.c:220
-msgid "Delete connection point"
-msgstr "åééæé"
-
-#: ../objects/Istar/other.c:475
+#: ../objects/Istar/other.c:472
 msgid "i* other"
 msgstr "i* åä"
 
-#: ../objects/Jackson/domain.c:79
+#: ../objects/Jackson/domain.c:77
 msgid "Given Domain"
 msgstr "æåççå"
 
-#: ../objects/Jackson/domain.c:80
+#: ../objects/Jackson/domain.c:78
 msgid "Designed Domain"
 msgstr "èèççå"
 
-#: ../objects/Jackson/domain.c:81
+#: ../objects/Jackson/domain.c:79
 msgid "Machine Domain"
 msgstr "éèççå"
 
-#: ../objects/Jackson/domain.c:97
+#: ../objects/Jackson/domain.c:95
 msgid "Causal"
 msgstr "åå"
 
-#: ../objects/Jackson/domain.c:98
+#: ../objects/Jackson/domain.c:96
 msgid "Biddable"
 msgstr "éå"
 
-#: ../objects/Jackson/domain.c:99
+#: ../objects/Jackson/domain.c:97
 msgid "Lexical"
 msgstr "èå"
 
-#: ../objects/Jackson/domain.c:176 ../objects/Jackson/domain.c:177
+#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
 msgid "Domain Type"
 msgstr "çåéå"
 
-#: ../objects/Jackson/domain.c:181
+#: ../objects/Jackson/domain.c:180
 msgid "Domain Kind"
 msgstr "çåçé"
 
-#: ../objects/Jackson/domain.c:182
-msgid "Optional kind which appears in the lower right corner of the Domain"
+#: ../objects/Jackson/domain.c:181
+msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "åçååäèéççéææçé"
 
-#: ../objects/Jackson/domain.c:537
+#: ../objects/Jackson/domain.c:534
 msgid "Jackson domain"
 msgstr "Jackson çå"
 
@@ -3975,27 +4648,30 @@ msgstr "Jackson çå"
 msgid "Jackson diagram"
 msgstr "Jackson åè"
 
-#: ../objects/Jackson/phenomenon.c:134
+#: ../objects/Jackson/phenomenon.c:135
 msgid "Shared"
 msgstr "åä"
 
-#: ../objects/Jackson/phenomenon.c:135 ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:136 ../objects/KAOS/goal.c:79
 msgid "Requirement"
 msgstr "èä"
 
-#: ../objects/Jackson/phenomenon.c:142 ../objects/UML/message.c:151
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../objects/Jackson/phenomenon.c:143 ../objects/UML/message.c:149
+#: ../objects/UML/message.c:151
 msgid "Message:"
 msgstr "èæï"
 
-#: ../objects/KAOS/goal.c:82
+#: ../objects/KAOS/goal.c:80
 msgid "Assumption"
 msgstr "åè"
 
-#: ../objects/KAOS/goal.c:83
+#: ../objects/KAOS/goal.c:81
 msgid "Obstacle"
 msgstr "åå"
 
-#: ../objects/KAOS/goal.c:578
+#: ../objects/KAOS/goal.c:575
 msgid "KAOS goal"
 msgstr "KAOS çæ"
 
@@ -4003,63 +4679,63 @@ msgstr "KAOS çæ"
 msgid "KAOS diagram"
 msgstr "KAOS åè"
 
-#: ../objects/KAOS/metaandorrel.c:151
+#: ../objects/KAOS/metaandorrel.c:152
 msgid "AND Refinement"
 msgstr "AND Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:152
+#: ../objects/KAOS/metaandorrel.c:153
 msgid "Complete AND Refinement"
 msgstr "Complete AND Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: ../objects/KAOS/metaandorrel.c:154
 msgid "OR Refinement"
 msgstr "OR Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: ../objects/KAOS/metaandorrel.c:155
 msgid "Operationalization"
 msgstr "Operationalization"
 
-#: ../objects/KAOS/metaandorrel.c:161
+#: ../objects/KAOS/metaandorrel.c:162
 msgid "Text:"
 msgstr "æåï"
 
-#: ../objects/KAOS/metabinrel.c:155
+#: ../objects/KAOS/metabinrel.c:156
 msgid "Contributes"
 msgstr "èç"
 
-#: ../objects/KAOS/metabinrel.c:156
+#: ../objects/KAOS/metabinrel.c:157
 msgid "Obstructs"
 msgstr "éç"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: ../objects/KAOS/metabinrel.c:158
 msgid "Conflicts"
 msgstr "èç"
 
-#: ../objects/KAOS/metabinrel.c:158
+#: ../objects/KAOS/metabinrel.c:159
 msgid "Responsibility"
 msgstr "èä"
 
-#: ../objects/KAOS/metabinrel.c:159
+#: ../objects/KAOS/metabinrel.c:160
 msgid "Monitors"
 msgstr "çå"
 
-#: ../objects/KAOS/metabinrel.c:160
+#: ../objects/KAOS/metabinrel.c:161
 msgid "Controls"
 msgstr "æå"
 
-#: ../objects/KAOS/metabinrel.c:161
+#: ../objects/KAOS/metabinrel.c:162
 msgid "CapableOf"
 msgstr "è"
 
-#: ../objects/KAOS/metabinrel.c:162
+#: ../objects/KAOS/metabinrel.c:163
 msgid "Performs"
 msgstr "åè"
 
-#: ../objects/KAOS/metabinrel.c:164
+#: ../objects/KAOS/metabinrel.c:165
 msgid "Output"
 msgstr "èå"
 
-#: ../objects/KAOS/other.c:531
+#: ../objects/KAOS/other.c:526
 msgid "KAOS other"
 msgstr "KAOS åä"
 
@@ -4083,909 +4759,763 @@ msgstr "çéçæéå"
 msgid "Show hours"
 msgstr "éçæé"
 
+#: ../objects/Misc/diagram_as_object.c:112
+msgid "Diagram file"
+msgstr "åèææ"
+
+#: ../objects/Misc/grid_object.c:138
+msgid "Rows"
+msgstr "å"
+
+#: ../objects/Misc/grid_object.c:140
+msgid "Columns"
+msgstr "æ"
+
+#: ../objects/Misc/grid_object.c:142
+msgid "Grid line color"
+msgstr "æçéè"
+
+#: ../objects/Misc/grid_object.c:144
+msgid "Grid line width"
+msgstr "æçéå"
+
 #: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "ååçä"
 
-#. property rows
-#: ../objects/SADT/arrow.c:134 ../objects/UML/class.c:174
-#: ../objects/UML/class_dialog.c:400
-msgid "Normal"
-msgstr "æå"
+#: ../objects/Misc/measure.c:169
+msgid "cm"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:135
-msgid "Import resource (not shown upstairs)"
-msgstr "ååèæ ïäéçäåï"
+#: ../objects/Misc/measure.c:170
+msgid "dm"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:136
-msgid "Imply resource (not shown downstairs)"
-msgstr "ååèæ ïäéçäåï"
+#: ../objects/Misc/measure.c:171
+msgid "ft"
+msgstr "èå"
 
-#: ../objects/SADT/arrow.c:137
-msgid "Dotted arrow"
-msgstr "éççé"
+#: ../objects/Misc/measure.c:172
+msgid "in"
+msgstr "èå"
 
-#: ../objects/SADT/arrow.c:138
-msgid "disable arrow heads"
-msgstr "ééçé"
+#: ../objects/Misc/measure.c:173
+msgid "m"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:144
-msgid "Flow style:"
-msgstr "æçæåï"
+#: ../objects/Misc/measure.c:174
+msgid "mm"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:146
-msgid "Automatically gray vertical flows:"
-msgstr "èåååçæçèççéï"
+#: ../objects/Misc/measure.c:175
+msgid "pt"
+msgstr "é"
 
-#: ../objects/SADT/arrow.c:147
-msgid ""
-"To improve the ease of reading, flows which begin and end vertically can be "
-"rendered gray"
-msgstr "çæäéèïèéèçéåççæçåççèçç"
-
-#: ../objects/SADT/arrow.c:463
-msgid "SADT Arrow"
-msgstr "SADT çé"
-
-#: ../objects/SADT/box.c:137 ../objects/flowchart/box.c:152
-#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
-#: ../objects/flowchart/parallelogram.c:154
-msgid "Text padding"
-msgstr "æååå"
-
-#: ../objects/SADT/box.c:144
-msgid "Activity/Data identifier"
-msgstr "ãæå/èæãèå"
-
-#: ../objects/SADT/box.c:145
-msgid "The identifier which appears in the lower right corner of the Box"
-msgstr "åæååäèéççèåèæ"
-
-#: ../objects/SADT/box.c:453
-msgid "SADT box"
-msgstr "SADT æå"
-
-#: ../objects/SADT/sadt.c:41
-msgid "SADT diagram objects"
-msgstr "SADT åèçä"
-
-#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi.h:218
-msgid "No Protection"
-msgstr "ææäè"
-
-#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi.h:219
-msgid "Restricted Diffusion"
-msgstr "åéææ"
-
-#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi.h:220
-msgid "Special Country Confidential"
-msgstr "çåååæå"
-
-#: ../objects/SISSI/classification.h:41
-msgid "Confidential"
-msgstr "æå"
-
-#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi.h:221
-msgid "NATO Confidential"
-msgstr "åçæå"
-
-#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi.h:222
-msgid "Personal Confidential"
-msgstr "åäæå"
-
-#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi.h:223
-msgid "Medical Confidential"
-msgstr "éçæå"
-
-#: ../objects/SISSI/classification.h:45 ../objects/SISSI/sissi.h:224
-msgid "Industrie Confidential"
-msgstr "åææå"
-
-#: ../objects/SISSI/classification.h:46
-msgid "Defense Confidential"
-msgstr "åéæå"
-
-#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi.h:225
-msgid "Secret"
-msgstr "çå"
+#: ../objects/Misc/measure.c:176
+msgid "pi"
+msgstr "pi"
 
-#: ../objects/SISSI/classification.h:48
-msgid "Defense Secret"
-msgstr "åéçå"
-
-#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi.h:226
-msgid "Secret special country"
-msgstr "çåååçå"
-
-#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi.h:227
-msgid "NATO Secret"
-msgstr "åççå"
-
-#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi.h:228
-msgid "Very Secret"
-msgstr "éåçå"
-
-#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi.h:229
-msgid "NATO Very Secret"
-msgstr "åçéåçå"
-
-#: ../objects/SISSI/sissi.c:64
-msgid "SISSI diagram"
-msgstr "SISSI åè"
-
-#: ../objects/SISSI/sissi.h:234
-msgid "No integrity"
-msgstr "çåææ"
-
-#: ../objects/SISSI/sissi.h:235
-msgid "Low integrity"
-msgstr "äåææ"
-
-#: ../objects/SISSI/sissi.h:236
-msgid "Average software integrity"
-msgstr "æéèäåææ"
-
-#: ../objects/SISSI/sissi.h:237
-msgid "Hight software integrity"
-msgstr "éèäåææ"
-
-#: ../objects/SISSI/sissi.h:238
-msgid "Average hardware integrity"
-msgstr "æéçäåææ"
-
-#: ../objects/SISSI/sissi.h:239
-msgid "Hight hardware integrity"
-msgstr "éçäåææ"
-
-#: ../objects/SISSI/sissi.h:244
-msgid "Millisecond"
-msgstr "æç"
-
-#: ../objects/SISSI/sissi.h:245
-msgid "Second"
-msgstr "ç"
-
-#: ../objects/SISSI/sissi.h:246
-msgid "Minute"
-msgstr "åé"
-
-#: ../objects/SISSI/sissi.h:247
-msgid "Hour"
-msgstr "åæ"
+#. PROP_FLAG_VISIBLE|
+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
+msgid "Measurement"
+msgstr "åéè"
 
-#: ../objects/SISSI/sissi.h:248
-msgid "Day"
-msgstr "æ"
+#: ../objects/Misc/measure.c:187
+msgid "Unit"
+msgstr "åä"
 
-#: ../objects/SISSI/sissi.h:249
-msgid "Week"
-msgstr "é"
+#: ../objects/Misc/measure.c:188
+msgid "Precision"
+msgstr "çå"
 
-#: ../objects/SISSI/sissi.h:254
-msgid "SYSTEM"
-msgstr "çç"
+#: ../objects/Misc/tree.c:597 ../objects/network/bus.c:605
+msgid "Add Handle"
+msgstr "ååæåé"
 
-#: ../objects/SISSI/sissi.h:255
-msgid "Internet access device"
-msgstr "Internet ååèç"
+#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
+msgid "Delete Handle"
+msgstr "åéæåé"
 
-#: ../objects/SISSI/sissi.h:256
-msgid "Electronic messaging"
-msgstr "éååè"
+#: ../objects/network/basestation.c:134
+msgid "Sectors"
+msgstr ""
 
-#: ../objects/SISSI/sissi.h:257
-msgid "Intranet"
-msgstr "åèç"
+#: ../objects/network/basestation.c:395 ../objects/network/basestation.c:397
+msgid "Base Station"
+msgstr "ååå"
 
-#: ../objects/SISSI/sissi.h:258
-msgid "Company directory"
-msgstr "ååçé"
+#: ../objects/network/network.c:43
+msgid "Network diagram objects"
+msgstr "ççåèçä"
 
-#: ../objects/SISSI/sissi.h:259
-msgid "External portal"
-msgstr "åéååçç"
+#: ../objects/network/radiocell.c:119
+msgid "Radius"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:264
-msgid "ORGANISATION"
-msgstr "çç"
+#: ../objects/network/wanlink.c:119
+msgid "Width"
+msgstr "éå"
 
-#: ../objects/SISSI/sissi.h:265
-msgid "Higher-tier organisation"
-msgstr "éåæçç"
+#: ../objects/SADT/arrow.c:137
+msgid "Import resource (not shown upstairs)"
+msgstr "ååèæ ïäéçäåï"
 
-#: ../objects/SISSI/sissi.h:266
-msgid "Structure of the organisation"
-msgstr "çççæ"
+#: ../objects/SADT/arrow.c:138
+msgid "Imply resource (not shown downstairs)"
+msgstr "ååèæ ïäéçäåï"
 
-#: ../objects/SISSI/sissi.h:267
-msgid "Project or system organisation"
-msgstr "åææçççç"
+#: ../objects/SADT/arrow.c:139
+msgid "Dotted arrow"
+msgstr "éççé"
 
-#: ../objects/SISSI/sissi.h:268
-msgid "Subcontractors / Suppliers / Manufacturers"
-msgstr "ååå / äæå / ççå"
+#: ../objects/SADT/arrow.c:140
+msgid "disable arrow heads"
+msgstr "ééçé"
 
-#: ../objects/SISSI/sissi.h:273
-msgid "SITE"
-msgstr "çé"
+#: ../objects/SADT/arrow.c:147
+msgid "Flow style:"
+msgstr "æçæåï"
 
-#: ../objects/SISSI/sissi.h:274
-msgid "Places"
-msgstr "åæ"
+#: ../objects/SADT/arrow.c:149
+msgid "Automatically gray vertical flows:"
+msgstr "èåååçæçèççéï"
 
-#: ../objects/SISSI/sissi.h:275
-msgid "External environment"
-msgstr "åéçå"
+#: ../objects/SADT/arrow.c:150
+msgid ""
+"To improve the ease of reading, flows which begin and end vertically can be "
+"rendered gray"
+msgstr "çæäéèïèéèçéåççæçåççèçç"
 
-#: ../objects/SISSI/sissi.h:276
-msgid "Premises"
-msgstr "æè"
+#: ../objects/SADT/arrow.c:469
+msgid "SADT Arrow"
+msgstr "SADT çé"
 
-#: ../objects/SISSI/sissi.h:277
-msgid "Zone"
-msgstr "åå"
+#: ../objects/SADT/box.c:145
+msgid "Activity/Data identifier"
+msgstr "ãæå/èæãèå"
 
-#: ../objects/SISSI/sissi.h:278
-msgid "Service Essentiel"
-msgstr "åèæå"
+#: ../objects/SADT/box.c:146
+msgid "The identifier which appears in the lower-right corner of the Box"
+msgstr "åæååäèéççèåèæ"
 
-#: ../objects/SISSI/sissi.h:279
-msgid "Communication"
-msgstr "éè"
+#: ../objects/SADT/box.c:454
+msgid "SADT box"
+msgstr "SADT æå"
 
-#: ../objects/SISSI/sissi.h:280
-msgid "Power"
-msgstr "éæ"
+#: ../objects/SADT/sadt.c:41
+msgid "SADT diagram objects"
+msgstr "SADT åèçä"
 
-#: ../objects/SISSI/sissi.h:281
-msgid "Cooling / Pollution"
-msgstr "åå / ææ"
+#: ../objects/standard/arc.c:120
+msgid "Curve distance"
+msgstr "æçèé"
 
-#: ../objects/SISSI/sissi.h:285
-msgid "THERMIC DETECTION"
-msgstr "æååæ"
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:127
+#: ../objects/standard/polyline.c:108
+msgid "Line gaps"
+msgstr "ççé"
 
-#: ../objects/SISSI/sissi.h:289
-msgid "FIRE DETECTION"
-msgstr "çèåæ"
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:129
+#: ../objects/standard/polyline.c:110
+msgid "Absolute start gap"
+msgstr "çåéåçé"
 
-#: ../objects/SISSI/sissi.h:293
-msgid "WATER DETECTION"
-msgstr "ææåæ"
+#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:131
+#: ../objects/standard/polyline.c:112
+msgid "Absolute end gap"
+msgstr "çåçæçé"
 
-#: ../objects/SISSI/sissi.h:297
-msgid "AIR DETECTION"
-msgstr "çæåæ"
+#: ../objects/standard/bezier.c:776 ../objects/standard/beziergon.c:515
+msgid "Add Segment"
+msgstr "åååæ"
 
-#: ../objects/SISSI/sissi.h:301
-msgid "ENERGY DETECTION"
-msgstr "èéåæ"
+#: ../objects/standard/bezier.c:777 ../objects/standard/beziergon.c:516
+msgid "Delete Segment"
+msgstr "åéåæ"
 
-#: ../objects/SISSI/sissi.h:305
-msgid "INTRUSION DETECTION"
-msgstr "åäåæ"
+#: ../objects/standard/bezier.c:779 ../objects/standard/beziergon.c:518
+msgid "Symmetric control"
+msgstr "åçæå"
 
-#: ../objects/SISSI/sissi.h:309
-msgid "THERMIC ACTION"
-msgstr "æååä"
+#: ../objects/standard/bezier.c:781 ../objects/standard/beziergon.c:520
+msgid "Smooth control"
+msgstr "åææå"
 
-#: ../objects/SISSI/sissi.h:313
-msgid "FIRE ACTION"
-msgstr "çèåä"
+#: ../objects/standard/bezier.c:783 ../objects/standard/beziergon.c:522
+msgid "Cusp control"
+msgstr "çéæå"
 
-#: ../objects/SISSI/sissi.h:317
-msgid "WATER ACTION"
-msgstr "ææåä"
+#: ../objects/standard/bezier.c:785 ../objects/standard/beziergon.c:524
+#: ../objects/standard/box.c:749 ../objects/standard/textobj.c:450
+msgid "Convert to Path"
+msgstr "èæèèå"
 
-#: ../objects/SISSI/sissi.h:321
-msgid "AIR ACTION"
-msgstr "çæåä"
+#: ../objects/standard/box.c:125 ../objects/standard/ellipse.c:118
+msgid "Free"
+msgstr "èç"
 
-#: ../objects/SISSI/sissi.h:325
-msgid "ENERGY ACTION"
-msgstr "èéåä"
+#: ../objects/standard/box.c:126 ../objects/standard/ellipse.c:119
+msgid "Fixed"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:329
-msgid "INTRUSION ACTION"
-msgstr "åäåä"
+#: ../objects/standard/box.c:127 ../objects/standard/box.c:747
+msgid "Square"
+msgstr "æå"
 
-#: ../objects/SISSI/sissi.h:334
-msgid "PERSONAL"
-msgstr "åä"
+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:131
+msgid "Aspect ratio"
+msgstr "åéæ"
 
-#: ../objects/SISSI/sissi.h:335
-msgid "Decision maker"
-msgstr "æçè"
+#: ../objects/standard/box.c:743 ../objects/standard/ellipse.c:664
+msgid "Free aspect"
+msgstr "èçåéæ"
 
-#: ../objects/SISSI/sissi.h:336
-msgid "SSI Responsible"
-msgstr "SSI èäè"
+#: ../objects/standard/box.c:745 ../objects/standard/ellipse.c:666
+msgid "Fixed aspect"
+msgstr "åååéæ"
 
-#: ../objects/SISSI/sissi.h:337
-msgid "Users"
-msgstr "äçè"
+#: ../objects/standard/ellipse.c:120 ../objects/standard/ellipse.c:668
+msgid "Circle"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:338
-msgid "Fonctionnal administrator"
-msgstr "åèççè"
+#: ../objects/standard/image.c:119
+msgid "Image file"
+msgstr "ååæ"
 
-#: ../objects/SISSI/sissi.h:339
-msgid "Technician aministrator"
-msgstr "æèççè"
+#: ../objects/standard/image.c:121
+msgid "Inline data"
+msgstr "çåèæ"
 
-#: ../objects/SISSI/sissi.h:340
-msgid "SSI administrator"
-msgstr "SSI ççè"
+#: ../objects/standard/image.c:121
+msgid "Store image data in diagram"
+msgstr "ååèåååååèæ"
 
-#: ../objects/SISSI/sissi.h:341
-msgid "Developer"
-msgstr "éçè"
+#: ../objects/standard/image.c:123
+msgid "Pixbuf"
+msgstr ""
 
-#: ../objects/SISSI/sissi.h:342
-msgid "Operator / Maintenance"
-msgstr "æäè / çäéä"
+#: ../objects/standard/image.c:123
+msgid "The Pixbuf reference"
+msgstr "Pixbuf åè"
 
-#: ../objects/SISSI/sissi.h:347
-msgid "NETWORK"
-msgstr "çç"
+#: ../objects/standard/image.c:125
+msgid "Draw border"
+msgstr "çèéç"
 
-#: ../objects/SISSI/sissi.h:348
-msgid "Medium and supports"
-msgstr "åéèææ"
+#: ../objects/standard/image.c:127
+msgid "Keep aspect ratio"
+msgstr "äæåéæ"
 
-#: ../objects/SISSI/sissi.h:349
-msgid "Passive or active relay"
+#: ../objects/standard/image.c:676
+msgid "Inconsistent pixbuf during image save."
 msgstr ""
 
-#: ../objects/SISSI/sissi.h:350
-msgid "Communication interface"
-msgstr "éæçé"
-
-#: ../objects/SISSI/sissi.h:355
-msgid "LOGICIEL"
+#. Found file in same dir as diagram.
+#. Found file in current dir.
+#: ../objects/standard/image.c:773 ../objects/standard/image.c:784
+#, c-format
+msgid ""
+"The image file '%s' was not found in the specified directory.\n"
+"Using the file '%s' instead.\n"
 msgstr ""
+"åæåççéäæäåååæâ%sâã\n"
+"æçææâ%sâ\n"
 
-#: ../objects/SISSI/sissi.h:356
-msgid "Operating System"
-msgstr "æäçç"
-
-#: ../objects/SISSI/sissi.h:357
-msgid "Service - maintenance or administration software"
-msgstr "æå - çäæççèä"
-
-#: ../objects/SISSI/sissi.h:358
-msgid "Package software or standard software"
-msgstr "åäèäæææèä"
-
-#: ../objects/SISSI/sissi.h:359
-msgid "Business application"
-msgstr "åææççå"
-
-#: ../objects/SISSI/sissi.h:360
-msgid "Standard business application"
-msgstr "ææåææççå"
-
-#: ../objects/SISSI/sissi.h:361
-msgid "Specific business application"
-msgstr "çååææççå"
-
-#: ../objects/SISSI/sissi.h:366
-msgid "HARDWARE"
-msgstr "çä"
-
-#: ../objects/SISSI/sissi.h:367
-msgid "Data processing equipement (active)"
-msgstr "èæèçèåïéääï"
-
-#: ../objects/SISSI/sissi.h:368
-msgid "Transportable equipement"
-msgstr "æåèå"
-
-#: ../objects/SISSI/sissi.h:369
-msgid "Fixed equipement"
-msgstr "ååèå"
-
-#: ../objects/SISSI/sissi.h:370
-msgid "Peripheral processing"
-msgstr "ééèç"
-
-#: ../objects/SISSI/sissi.h:371
-msgid "Electronic medium"
-msgstr "éååé"
-
-#: ../objects/SISSI/sissi.h:372
-msgid "Other media"
-msgstr "åååé"
+#. Didn't find file in current dir.
+#: ../objects/standard/image.c:790 ../objects/standard/image.c:812
+#, c-format
+msgid "The image file '%s' was not found.\n"
+msgstr "æäåååæâ%sâã\n"
 
-#: ../objects/SISSI/sissi.h:373
-msgid "Data medium (passive)"
-msgstr "èæåéïèååï"
+#: ../objects/standard/line.c:118
+msgid "Arrows"
+msgstr "çé"
 
-#. Class page:
-#: ../objects/SISSI/sissi_dialog.c:185
-msgid "_Menace"
-msgstr "åè(_M)"
+#: ../objects/standard/line.c:123
+msgid "Start point"
+msgstr "èé"
 
-#. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:201 ../objects/SISSI/sissi_dialog.c:210
-msgid "Menace"
-msgstr "åè"
+#: ../objects/standard/line.c:125
+msgid "End point"
+msgstr "çé"
 
-#: ../objects/SISSI/sissi_dialog.c:203 ../objects/SISSI/sissi_dialog.c:212
-msgid "P Action"
-msgstr "P åä"
+#: ../objects/standard/line.c:321
+msgid "Upgrade to Polyline"
+msgstr "åçèèççæ"
 
-#: ../objects/SISSI/sissi_dialog.c:205 ../objects/SISSI/sissi_dialog.c:214
-msgid "P Detection"
-msgstr "P åæ"
+#: ../objects/standard/line.c:322
+msgid "Upgrade to Zigzagline"
+msgstr "åçè Z åç"
 
-#: ../objects/SISSI/sissi_dialog.c:207 ../objects/SISSI/sissi_dialog.c:216
-msgid "Vulnerability"
-msgstr "æææ"
+#: ../objects/standard/outline.c:102
+msgid "Text content"
+msgstr "æååå"
 
-#. Other properties of page:
-#: ../objects/SISSI/sissi_dialog.c:372
-msgid "Others properties"
-msgstr "åäåæ"
+#: ../objects/standard/outline.c:104
+msgid "Angle to rotate the outline"
+msgstr "åææèçèå"
 
-#. ********* selection menu of entity ********
-#. ********* Label of board *********
-#: ../objects/SISSI/sissi_dialog.c:610
-msgid "Libelle"
-msgstr ""
+#: ../objects/standard/polygon.c:459 ../objects/standard/polyline.c:623
+msgid "Add Corner"
+msgstr "ååèè"
 
-#: ../objects/SISSI/sissi_dialog.c:612
-msgid "value"
-msgstr "å"
+#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:624
+msgid "Delete Corner"
+msgstr "åéèè"
 
-#: ../objects/SISSI/sissi_dialog.c:623 ../objects/SISSI/sissi_dialog.c:755
-#: ../objects/UML/class_dialog.c:927 ../objects/UML/class_dialog.c:1877
-#: ../objects/UML/class_dialog.c:2114 ../objects/UML/class_dialog.c:2644
-msgid "_New"
-msgstr "æå(_N)"
+#: ../objects/standard/standard.c:58
+msgid "Standard objects"
+msgstr "ææçä"
 
-#. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:746
-msgid "Documents"
-msgstr "æä"
+#: ../objects/standard/textobj.c:112
+msgid "First Line"
+msgstr "çäæç"
 
-#: ../objects/SISSI/sissi_dialog.c:762
-msgid "Document title"
-msgstr "æäæé"
+#: ../objects/standard/textobj.c:119
+msgid "Vertical text alignment"
+msgstr "åçåéæå"
 
-#: ../objects/SISSI/sissi_dialog.c:764
-msgid "URL"
-msgstr ""
+#: ../objects/standard/zigzagline.c:450
+msgid "Upgrade to Bezierline"
+msgstr "åçèèèæç"
 
-#: ../objects/UML/actor.c:349 ../objects/UML/actor.c:351
-#: ../sheets/UML.sheet.in.h:2
+#: ../objects/UML/actor.c:352 ../objects/UML/actor.c:354
+#: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "åäè"
 
-#: ../objects/UML/association.c:1173 ../objects/UML/class_dialog.c:2210
-msgid "Direction:"
-msgstr "æåï"
-
-#: ../objects/UML/association.c:1190
+#: ../objects/UML/association.c:222
 msgid "From A to B"
 msgstr "å A å B"
 
-#: ../objects/UML/association.c:1197
+#: ../objects/UML/association.c:223
 msgid "From B to A"
 msgstr "å B å A"
 
-#: ../objects/UML/association.c:1221 ../objects/UML/association.c:1229
+#: ../objects/UML/association.c:228
+msgid "Aggregation"
+msgstr "èå"
+
+#: ../objects/UML/association.c:229
+msgid "Composition"
+msgstr "çæ"
+
+#: ../objects/UML/association.c:239
+msgid "Direction"
+msgstr "æå"
+
+#: ../objects/UML/association.c:241
+msgid "Show direction"
+msgstr "éçæå"
+
+#: ../objects/UML/association.c:241
+msgid "Show the small arrow denoting the reading direction"
+msgstr "éçäèéèæåçåçé"
+
+#: ../objects/UML/association.c:248
 msgid "Side A"
 msgstr "A é"
 
-#: ../objects/UML/association.c:1223 ../objects/UML/association.c:1231
+#: ../objects/UML/association.c:252
+msgid "Multiplicity"
+msgstr "éæ"
+
+#: ../objects/UML/association.c:254 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/umloperation.c:71
+msgid "Visibility"
+msgstr "åèå"
+
+#: ../objects/UML/association.c:256
+msgid "Show arrow"
+msgstr "éççé"
+
+#: ../objects/UML/association.c:259
 msgid "Side B"
 msgstr "B é"
 
-#: ../objects/UML/association.c:1237
-msgid "Role:"
-msgstr "èèï"
+#. Attributes page:
+#: ../objects/UML/class_attributes_dialog.c:455
+msgid "_Attributes"
+msgstr "åæ(_A)"
+
+#: ../objects/UML/class_attributes_dialog.c:507
+msgid "Attribute data"
+msgstr "åæèæ"
+
+#: ../objects/UML/class_attributes_dialog.c:539
+msgid "Value:"
+msgstr "æåï"
 
-#: ../objects/UML/association.c:1249
-msgid "Multiplicity:"
-msgstr "éæï"
+#: ../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/UML/association.c:1260 ../objects/UML/class_dialog.c:1021
-#: ../objects/UML/class_dialog.c:1954
+#: ../objects/UML/class_attributes_dialog.c:572
+#: ../objects/UML/class_operations_dialog.c:811
 msgid "Visibility:"
 msgstr "åèåï"
 
-#: ../objects/UML/association.c:1269 ../objects/UML/class_dialog.c:1030
-#: ../objects/UML/class_dialog.c:1963 ../objects/UML/uml.c:102
+#: ../objects/UML/class_attributes_dialog.c:577
+#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
 msgid "Public"
 msgstr "åé"
 
-#: ../objects/UML/association.c:1279 ../objects/UML/class_dialog.c:1038
-#: ../objects/UML/class_dialog.c:1971 ../objects/UML/uml.c:103
+#: ../objects/UML/class_attributes_dialog.c:578
+#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
 msgid "Private"
 msgstr "çç"
 
-#: ../objects/UML/association.c:1289 ../objects/UML/class_dialog.c:1046
-#: ../objects/UML/class_dialog.c:1979 ../objects/UML/uml.c:104
+#: ../objects/UML/class_attributes_dialog.c:579
+#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
 msgid "Protected"
 msgstr "äè"
 
-#: ../objects/UML/association.c:1299 ../objects/UML/class_dialog.c:1054
-#: ../objects/UML/class_dialog.c:1987 ../objects/UML/uml.c:105
+#: ../objects/UML/class_attributes_dialog.c:580
+#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
 msgid "Implementation"
 msgstr "åä"
 
-#. Show arrow:
-#: ../objects/UML/association.c:1318
-msgid "Show arrow"
-msgstr "éççé"
-
-#. Aggregate
-#: ../objects/UML/association.c:1324
-msgid "Aggregate"
-msgstr "èé"
-
-#. Composition
-#: ../objects/UML/association.c:1332
-msgid "Composition"
-msgstr "çæ"
+#. end: Inheritance type
+#: ../objects/UML/class_attributes_dialog.c:592
+#: ../objects/UML/class_operations_dialog.c:840
+msgid "Class scope"
+msgstr "éåçå"
 
-#: ../objects/UML/class.c:137 ../objects/UML/class.c:308
-#: ../objects/UML/class.c:1707 ../sheets/UML.sheet.in.h:6
+#: ../objects/UML/class.c:138 ../objects/UML/class.c:349
+#: ../objects/UML/class.c:1845 ../sheets/UML.sheet.in.h:3
 msgid "Class"
 msgstr "éå"
 
-#: ../objects/UML/class.c:141 ../objects/UML/classicon.c:138
-#: ../objects/UML/component.c:124 ../objects/UML/large_package.c:129
-#: ../objects/UML/object.c:150 ../objects/UML/small_package.c:124
-#: ../objects/UML/umloperation.c:68
+#. how it used to be before 0.96+SVN
+#. one name, one type: but breaks forward-compatibiliy so kind of reverted
+#: ../objects/UML/class.c:142 ../objects/UML/classicon.c:137
+#: ../objects/UML/classicon.c:139 ../objects/UML/component.c:124
+#: ../objects/UML/large_package.c:134 ../objects/UML/object.c:148
+#: ../objects/UML/small_package.c:126 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "æéå"
 
-#: ../objects/UML/class.c:143 ../objects/UML/class.c:184
-#: ../objects/UML/class_dialog.c:425 ../objects/UML/umlattribute.c:43
-#: ../objects/UML/umloperation.c:66 ../objects/UML/umlparameter.c:49
-#: ../sheets/SDL.sheet.in.h:3
-msgid "Comment"
-msgstr "åè"
-
-#: ../objects/UML/class.c:145 ../objects/UML/class.c:178
-#: ../objects/UML/class_dialog.c:324 ../objects/UML/class_dialog.c:410
-#: ../objects/UML/class_dialog.c:2018 ../objects/UML/uml.c:110
+#: ../objects/UML/class.c:149 ../objects/UML/class.c:205
+#: ../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:147 ../objects/UML/class.c:1704
-msgid "Template"
-msgstr "ææ"
-
-#: ../objects/UML/class.c:150 ../objects/UML/class_dialog.c:333
-msgid "Suppress Attributes"
-msgstr "æååæ"
-
-#: ../objects/UML/class.c:152
-msgid "Suppress Operations"
-msgstr "æååä"
-
-#: ../objects/UML/class.c:154
+#: ../objects/UML/class.c:151
 msgid "Visible Attributes"
 msgstr "åèåæ"
 
-#: ../objects/UML/class.c:156
+#: ../objects/UML/class.c:153
 msgid "Visible Operations"
 msgstr "åèéä"
 
-#: ../objects/UML/class.c:158
+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:384
+msgid "Wrap Operations"
+msgstr "æçæä"
+
+#: ../objects/UML/class.c:157
 msgid "Visible Comments"
 msgstr "åèèè"
 
-#: ../objects/UML/class.c:160 ../objects/UML/class_dialog.c:349
-msgid "Wrap Operations"
-msgstr "æçæä"
+#: ../objects/UML/class.c:161 ../objects/UML/class.c:344
+msgid "Allow resizing"
+msgstr "åèææåå"
+
+#: ../objects/UML/class.c:165 ../objects/UML/class.c:1842
+msgid "Template"
+msgstr "ææ"
 
-#: ../objects/UML/class.c:162
+#: ../objects/UML/class.c:167 ../objects/UML/class_dialog.c:368
+msgid "Suppress Attributes"
+msgstr "æååæ"
+
+#: ../objects/UML/class.c:169
+msgid "Suppress Operations"
+msgstr "æååä"
+
+#: ../objects/UML/class.c:171
 msgid "Wrap after char"
 msgstr "åæåçåæè"
 
-#: ../objects/UML/class.c:164
+#: ../objects/UML/class.c:173
 msgid "Comment line length"
 msgstr "èèéå"
 
-#: ../objects/UML/class.c:166
-msgid "Comment tagging"
-msgstr "èèæè"
+#. umlattribute_extra
+#: ../objects/UML/class.c:186
+msgid "Operations"
+msgstr "éä"
+
+#. umloperations_extra
+#: ../objects/UML/class.c:190
+msgid "Template Parameters"
+msgstr "ææåæ"
 
-#: ../objects/UML/class.c:176 ../objects/UML/class_dialog.c:405
+#: ../objects/UML/class.c:203 ../objects/UML/class_dialog.c:466
 msgid "Polymorphic"
 msgstr "åå"
 
-#: ../objects/UML/class.c:180
-msgid "Classname"
+#: ../objects/UML/class.c:207 ../objects/UML/class_dialog.c:476
+msgid "Class Name"
 msgstr "éååç"
 
-#: ../objects/UML/class.c:182
-msgid "Abstract Classname"
+#: ../objects/UML/class.c:209
+msgid "Abstract Class Name"
 msgstr "æèéååç"
 
-#: ../objects/UML/class.c:188 ../objects/UML/class.c:190
-#: ../objects/UML/class.c:192 ../objects/UML/class.c:194
-#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
-msgid " "
-msgstr " "
-
-#: ../objects/UML/class.c:204 ../objects/UML/object.c:154
-msgid "Attributes"
-msgstr "åæ"
-
-#: ../objects/UML/class.c:206
-msgid "Operations"
-msgstr "éä"
-
-#: ../objects/UML/class.c:209
-msgid "Template Parameters"
-msgstr "ææåæ"
-
-#: ../objects/UML/class.c:303
-msgid "Show Comments"
-msgstr "éçåè"
-
 #. Class page:
-#: ../objects/UML/class_dialog.c:285
+#: ../objects/UML/class_dialog.c:320
 msgid "_Class"
 msgstr "éå(_C)"
 
-#: ../objects/UML/class_dialog.c:293
+#: ../objects/UML/class_dialog.c:328
 msgid "Class name:"
 msgstr "éååçï"
 
-#: ../objects/UML/class_dialog.c:301 ../objects/UML/class_dialog.c:1941
-#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:134
+#: ../objects/UML/class_dialog.c:336
+#: ../objects/UML/class_operations_dialog.c:799
+#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:132
+#: ../objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr "æéåï"
 
-#: ../objects/UML/class_dialog.c:308 ../objects/UML/class_dialog.c:999
-#: ../objects/UML/class_dialog.c:2059 ../objects/UML/class_dialog.c:2190
-msgid "Comment:"
-msgstr "åèï"
-
-#: ../objects/UML/class_dialog.c:330
+#: ../objects/UML/class_dialog.c:365
 msgid "Attributes visible"
 msgstr "åèåæ"
 
-#: ../objects/UML/class_dialog.c:339
+#: ../objects/UML/class_dialog.c:374
 msgid "Operations visible"
 msgstr "åèåä"
 
-#: ../objects/UML/class_dialog.c:342
+#: ../objects/UML/class_dialog.c:377
 msgid "Suppress operations"
 msgstr "æååä"
 
-#: ../objects/UML/class_dialog.c:356
+#: ../objects/UML/class_dialog.c:391
 msgid "Wrap after this length: "
 msgstr "æéååæèï"
 
-#: ../objects/UML/class_dialog.c:364
+#: ../objects/UML/class_dialog.c:399
 msgid "Comments visible"
 msgstr "èèçåèç"
 
-#: ../objects/UML/class_dialog.c:371
+#: ../objects/UML/class_dialog.c:406
 msgid "Wrap comment after this length: "
 msgstr "æéååèèæèï"
 
-#: ../objects/UML/class_dialog.c:378
-msgid "Show documenation tag"
-msgstr "éçæäæè"
+#: ../objects/UML/class_dialog.c:413
+msgid "Show documentation tag"
+msgstr "éçèææäæè"
+
+#. * Fonts and Colors selection *
+#: ../objects/UML/class_dialog.c:442
+msgid "_Style"
+msgstr "åæ(_S)"
 
 #. head line
-#: ../objects/UML/class_dialog.c:391 ../objects/UML/umlparameter.c:51
+#: ../objects/UML/class_dialog.c:452 ../objects/UML/umlparameter.c:51
 msgid "Kind"
 msgstr "çé"
 
-#: ../objects/UML/class_dialog.c:396
+#: ../objects/UML/class_dialog.c:457
 msgid "Size"
 msgstr "åå"
 
-#: ../objects/UML/class_dialog.c:415
-msgid "Class Name"
-msgstr "éååç"
-
-#: ../objects/UML/class_dialog.c:420
+#: ../objects/UML/class_dialog.c:481
 msgid "Abstract Class"
 msgstr "æèéå"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:498
+msgid "Line Width"
+msgstr "çæéå"
+
+#: ../objects/UML/class_dialog.c:507
 msgid "Text Color"
 msgstr "æåèå"
 
-#: ../objects/UML/class_dialog.c:445
+#: ../objects/UML/class_dialog.c:516
 msgid "Foreground Color"
 msgstr "åæèå"
 
-#: ../objects/UML/class_dialog.c:453
+#: ../objects/UML/class_dialog.c:525
 msgid "Background Color"
 msgstr "èæèå"
 
-#. Attributes page:
-#: ../objects/UML/class_dialog.c:899
-msgid "_Attributes"
-msgstr "åæ(_A)"
-
-#: ../objects/UML/class_dialog.c:933 ../objects/UML/class_dialog.c:1883
-#: ../objects/UML/class_dialog.c:2121 ../objects/UML/class_dialog.c:2650
-msgid "_Delete"
-msgstr "åé(_D)"
-
-#: ../objects/UML/class_dialog.c:939 ../objects/UML/class_dialog.c:1889
-#: ../objects/UML/class_dialog.c:2128 ../objects/UML/class_dialog.c:2656
-msgid "Move up"
-msgstr "äç"
-
-#: ../objects/UML/class_dialog.c:945 ../objects/UML/class_dialog.c:1895
-#: ../objects/UML/class_dialog.c:2135 ../objects/UML/class_dialog.c:2662
-msgid "Move down"
-msgstr "äç"
-
-#: ../objects/UML/class_dialog.c:956
-msgid "Attribute data"
-msgstr "åæèæ"
-
-#: ../objects/UML/class_dialog.c:988
-msgid "Value:"
-msgstr "æåï"
-
-#: ../objects/UML/class_dialog.c:1075 ../objects/UML/class_dialog.c:2003
-msgid "Class scope"
-msgstr "éåçå"
-
-#. Operations page:
-#: ../objects/UML/class_dialog.c:1849
-msgid "_Operations"
-msgstr "éä(_O)"
+#: ../objects/UML/classicon.c:129
+msgid "Boundary"
+msgstr "éç"
 
-#: ../objects/UML/class_dialog.c:1907
-msgid "Operation data"
-msgstr "éäèæ"
+#: ../objects/UML/classicon.c:142
+msgid "Is object"
+msgstr "æçä"
 
-#: ../objects/UML/class_dialog.c:2009
+#. end: Visibility
+#: ../objects/UML/class_operations_dialog.c:827
 msgid "Inheritance type:"
 msgstr "çæéåï"
 
-#: ../objects/UML/class_dialog.c:2026 ../objects/UML/uml.c:111
+#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
 msgid "Polymorphic (virtual)"
 msgstr "åå(èæ)"
 
-#: ../objects/UML/class_dialog.c:2034 ../objects/UML/uml.c:112
+#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
 msgid "Leaf (final)"
 msgstr ""
 
-#: ../objects/UML/class_dialog.c:2052
+#: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/umloperation.c:75
 msgid "Query"
 msgstr "æè"
 
-#: ../objects/UML/class_dialog.c:2085
+#: ../objects/UML/class_operations_dialog.c:888
 msgid "Parameters:"
 msgstr "åæï"
 
-#: ../objects/UML/class_dialog.c:2147
+#: ../objects/UML/class_operations_dialog.c:966
 msgid "Parameter data"
 msgstr "åæèæ"
 
-#: ../objects/UML/class_dialog.c:2179
+#: ../objects/UML/class_operations_dialog.c:999
 msgid "Def. value:"
 msgstr "åçåï"
 
-#: ../objects/UML/class_dialog.c:2219 ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_operations_dialog.c:1030
+msgid "Direction:"
+msgstr "æåï"
+
+#: ../objects/UML/class_operations_dialog.c:1035
+#: ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "æåç"
 
-#: ../objects/UML/class_dialog.c:2227 ../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:2236 ../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:2245 ../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_operations_dialog.c:1069
+msgid "_Operations"
+msgstr "éä(_O)"
+
+#: ../objects/UML/class_operations_dialog.c:1124
+msgid "Operation data"
+msgstr "éäèæ"
+
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2610
+#: ../objects/UML/class_templates_dialog.c:368
 msgid "_Templates"
 msgstr "ææ(_T)"
 
-#: ../objects/UML/class_dialog.c:2616 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr "ææéå"
 
-#: ../objects/UML/class_dialog.c:2673
+#: ../objects/UML/class_templates_dialog.c:426
 msgid "Formal parameter data"
 msgstr "æååæèæ"
 
-#: ../objects/UML/classicon.c:128
-msgid "Boundary"
-msgstr "éç"
-
-#: ../objects/UML/classicon.c:140
-msgid "Is object"
-msgstr "æçä"
-
-#: ../objects/UML/component_feature.c:145 ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr "Facet"
 
-#: ../objects/UML/component_feature.c:146 ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr "Receptacle"
 
-#: ../objects/UML/component_feature.c:147 ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr "äääæ"
 
-#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr "ääæéæ"
 
-#: ../objects/UML/constraint.c:125
+#: ../objects/UML/constraint.c:126
 msgid "Constraint:"
 msgstr "éåï"
 
-#: ../objects/UML/dependency.c:139
+#: ../objects/UML/dependency.c:137
 msgid "Show arrow:"
 msgstr "éççéï"
 
-#: ../objects/UML/implements.c:129
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
+#: ../objects/UML/implements.c:127 ../objects/UML/implements.c:129
 msgid "Interface:"
 msgstr "çéï"
 
-#: ../objects/UML/lifeline.c:144
+#: ../objects/UML/lifeline.c:164
 msgid "Draw focus of control:"
 msgstr "éçæåçéï"
 
-#: ../objects/UML/lifeline.c:146
+#: ../objects/UML/lifeline.c:166
 msgid "Draw destruction mark:"
 msgstr "éççåçèï"
 
-#: ../objects/UML/lifeline.c:417
+#: ../objects/UML/lifeline.c:534
 msgid "Add connection points"
 msgstr "ååéæé"
 
-#: ../objects/UML/lifeline.c:418
+#: ../objects/UML/lifeline.c:535
 msgid "Remove connection points"
 msgstr "åééæé"
 
-#: ../objects/UML/lifeline.c:422
+#: ../objects/UML/lifeline.c:536
+msgid "Increase connection points distance"
+msgstr "ååéæéèé"
+
+#: ../objects/UML/lifeline.c:537
+msgid "Decrease connection points distance"
+msgstr "æåéæéèé"
+
+#: ../objects/UML/lifeline.c:538
+msgid "Set default connection points distance"
+msgstr "èåéèéæéèé"
+
+#: ../objects/UML/lifeline.c:542
 msgid "UML Lifeline"
 msgstr "UML çåç"
 
-#: ../objects/UML/message.c:135
+#: ../objects/UML/message.c:136
 msgid "Call"
 msgstr "åå"
 
-#: ../objects/UML/message.c:136
+#: ../objects/UML/message.c:137
 msgid "Create"
 msgstr "åç"
 
-#: ../objects/UML/message.c:137
+#: ../objects/UML/message.c:138
 msgid "Destroy"
 msgstr "ææ"
 
-#: ../objects/UML/message.c:138
+#: ../objects/UML/message.c:139
 msgid "Simple"
 msgstr "çå"
 
-#: ../objects/UML/message.c:139
+#: ../objects/UML/message.c:140
 msgid "Return"
 msgstr "èå"
 
-#: ../objects/UML/message.c:140
+#: ../objects/UML/message.c:141
 msgid "Send"
 msgstr "éå"
 
-#: ../objects/UML/message.c:141
+#: ../objects/UML/message.c:142
 msgid "Recursive"
 msgstr "åç"
 
@@ -4993,606 +5523,528 @@ msgstr "åç"
 msgid "Message type:"
 msgstr "èæçéï"
 
-#: ../objects/UML/object.c:152
+#: ../objects/UML/object.c:150
 msgid "Explicit state"
 msgstr "æçççæ"
 
-#: ../objects/UML/object.c:157
+#: ../objects/UML/object.c:155
 msgid "Active object"
 msgstr "éäçä"
 
-#: ../objects/UML/object.c:159
+#: ../objects/UML/object.c:157
 msgid "Show attributes"
 msgstr "éçåæ"
 
-#: ../objects/UML/object.c:161
+#: ../objects/UML/object.c:159
 msgid "Multiple instance"
 msgstr "åååé"
 
-#: ../objects/UML/state.c:153
+#: ../objects/UML/state.c:148
 msgid "Entry action"
 msgstr "éçåä"
 
-#: ../objects/UML/state.c:154
+#: ../objects/UML/state.c:149
 msgid "Do action"
 msgstr "éèåä"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:150
 msgid "Exit action"
 msgstr "çæåä"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:471
+#: ../objects/UML/state.c:487
 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 ""
 "éååèäççæ (State) çäèçåå/æççæã\n"
 "èééååæäççæäåæã\n"
 "èäçåå/æççæçääåäå\n"
 
-#: ../objects/UML/state_term.c:120
+#: ../objects/UML/state_term.c:126
 msgid "Is final"
 msgstr "ææçç"
 
-#: ../objects/UML/transition.c:132
+#: ../objects/UML/transition.c:141
 msgid "Trigger"
 msgstr "èç"
 
-#: ../objects/UML/transition.c:133
+#: ../objects/UML/transition.c:142
 msgid "The event that causes this transition to be taken"
 msgstr "éææèæçää"
 
-#: ../objects/UML/transition.c:134
+#: ../objects/UML/transition.c:143
 msgid "Action"
 msgstr "åä"
 
-#: ../objects/UML/transition.c:135
+#: ../objects/UML/transition.c:144
 msgid "Action to perform when this transition is taken"
 msgstr "çççæèææèéèçåä"
 
-#: ../objects/UML/transition.c:136 ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
 msgid "Guard"
 msgstr "åè"
 
-#: ../objects/UML/transition.c:137
+#: ../objects/UML/transition.c:146
 msgid "Condition for taking this transition when the event is fired"
 msgstr ""
 
-#: ../objects/UML/uml.c:66
-msgid "Unified Modelling Language diagram objects UML 1.3"
-msgstr "ãçäæåèèã(UML) åèçä 1.3"
-
-#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "å"
-
-#: ../objects/UML/umlattribute.c:45 ../objects/UML/umloperation.c:71
-msgid "Visibility"
-msgstr "åèå"
-
 #: ../objects/UML/umlattribute.c:47
 msgid "Abstract (?)"
 msgstr "æå  (?)"
 
-#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
+#: ../objects/UML/umlattribute.c:49
 msgid "Class scope (static)"
 msgstr "éåçåïéæï"
 
+#: ../objects/UML/uml.c:67
+msgid "Unified Modelling Language diagram objects UML 1.3"
+msgstr "ãçäæåèèã(UML) åèçä 1.3"
+
 #: ../objects/UML/umloperation.c:73
-msgid "Inheritance type"
-msgstr "çæéå"
+msgid "Inheritance"
+msgstr "çæ"
 
 #: ../objects/UML/umloperation.c:75
-msgid "Query (const)"
-msgstr "æè (const)"
+msgid "C++ const method"
+msgstr ""
 
-#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:162
-msgid "Parameters"
-msgstr "åæ"
+#: ../objects/UML/umloperation.c:77
+msgid "Scope"
+msgstr "çå"
 
-#: ../objects/UML/usecase.c:132
-msgid "Text outside"
-msgstr "åéçæå"
+#: ../objects/UML/umloperation.c:77
+msgid "Class scope (C++ static method)"
+msgstr "éåçåïC++ éæææï"
 
-#: ../objects/UML/usecase.c:134
+#: ../objects/UML/usecase.c:131
 msgid "Collaboration"
-msgstr "åä"
+msgstr "åä"
 
-#: ../objects/bondgraph/bondgraph.c:39
-msgid "Bond graph objects"
-msgstr "Bond graph çä"
+#: ../objects/UML/usecase.c:133
+msgid "Text outside"
+msgstr "åéçæå"
 
-#: ../objects/chronogram/chronogram.c:40
-msgid "Chronogram diagram objects"
-msgstr "ãåäèãåèçä"
+#: ../plug-ins/cairo/diacairo.c:125 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/hpgl/hpgl.c:710
+#, c-format
+msgid "Can't open output file %s."
+msgstr "çæéåèåæ %sã"
 
-#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:4
-msgid "Data"
-msgstr "èæ"
+#: ../plug-ins/cairo/diacairo.c:133
+#, c-format
+msgid ""
+"Can't convert output filename '%s' to locale encoding.\n"
+"Please choose a different name to save with Cairo.\n"
+msgstr ""
+"çæåèåææåç '%s' èæçååççã\n"
+"èæ Cairo éæåäåçååã\n"
 
-#: ../objects/chronogram/chronoline.c:150
-msgid "Data name"
-msgstr "èæåç"
+#: ../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"
 
-#: ../objects/chronogram/chronoline.c:152
-msgid "Events"
-msgstr "ää"
+#: ../plug-ins/cairo/diacairo.c:334
+msgid "Clipboard copy failed"
+msgstr "åèçèèåæ"
 
-#: ../objects/chronogram/chronoline.c:155
-msgid "Event specification"
-msgstr "ääèæ"
+#
+#: ../plug-ins/cairo/diacairo.c:361 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1503
+msgid "Nothing to print"
+msgstr "çæèåå"
 
-#: ../objects/chronogram/chronoline.c:156
-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"
+#: ../plug-ins/cairo/diacairo.c:378
+msgid "Cairo PostScript"
 msgstr ""
-"@ æé      èåæææçåæéã\n"
-"( çéæé  èåäèååïäçåãçéæéãã\n"
-") çéæé  èåäèåæïäçåãçéæéãã\n"
-"u çéæé  èåäèçãæçãïäçåãçéæéãã\n"
-"äåï@ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:164
-#: ../objects/chronogram/chronoref.c:146
-msgid "Start time"
-msgstr "éåæé"
+#: ../plug-ins/cairo/diacairo.c:389
+msgid "Cairo Portable Document Format"
+msgstr "Cairo åæåæäæå"
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
-msgid "End time"
-msgstr "çææé"
+#: ../plug-ins/cairo/diacairo.c:401
+msgid "Cairo Scalable Vector Graphics"
+msgstr "Cairo åçæåéå (SVG)"
 
-#: ../objects/chronogram/chronoline.c:168
-msgid "Rise time"
-msgstr "äåæé"
+#: ../plug-ins/cairo/diacairo.c:413
+msgid "CairoScript"
+msgstr ""
 
-#: ../objects/chronogram/chronoline.c:170
-msgid "Fall time"
-msgstr "äéæé"
+#: ../plug-ins/cairo/diacairo.c:424
+msgid "Cairo PNG"
+msgstr "Cairo PNG"
 
-#: ../objects/chronogram/chronoline.c:171
-msgid "Multi-bit data"
-msgstr "åäåèæ"
+#: ../plug-ins/cairo/diacairo.c:432
+msgid "Cairo PNG (with alpha)"
+msgstr "Cairo PNG (å alpha)"
 
-#: ../objects/chronogram/chronoline.c:173
-#: ../objects/chronogram/chronoref.c:156
-msgid "Aspect"
-msgstr "åéæ"
+#: ../plug-ins/cairo/diacairo.c:442
+msgid "Cairo EMF"
+msgstr "Cairo EMF"
 
-#: ../objects/chronogram/chronoline.c:175
-msgid "Data color"
-msgstr "èæéè"
+#: ../plug-ins/cairo/diacairo.c:452
+msgid "Cairo WMF"
+msgstr "Cairo WMF"
 
-#: ../objects/chronogram/chronoline.c:177
-msgid "Data line width"
-msgstr "èæèå"
+#: ../plug-ins/cairo/diacairo.c:466
+msgid "Cairo Clipboard Copy"
+msgstr "Cairo åèçèè"
 
-#: ../objects/chronogram/chronoref.c:144
-msgid "Time data"
-msgstr "æéèæ"
+#: ../plug-ins/cairo/diacairo.c:480
+msgid "Copy _Diagram"
+msgstr "èèåè(_D)"
 
-#: ../objects/chronogram/chronoref.c:150
-msgid "Major time step"
-msgstr "äèååçæééå"
+#: ../plug-ins/cairo/diacairo.c:489
+msgid "Print (GTK) â"
+msgstr "åå (GTK) â"
 
-#: ../objects/chronogram/chronoref.c:152
-msgid "Minor time step"
-msgstr "çååçæééå"
+#: ../plug-ins/cairo/diacairo.c:537
+msgid "Cairo-based Rendering"
+msgstr "åæ Cairo ççè"
 
-#: ../objects/chronogram/chronoref.c:162
-msgid "Minor step line width"
-msgstr "çååççæéå"
+#: ../plug-ins/cairo/diacairo-interactive.c:406
+#: ../plug-ins/cairo/diacairo-interactive.c:407
+msgid "Zoom pointer"
+msgstr "çææé"
+
+#: ../plug-ins/cairo/diacairo-interactive.c:413
+#: ../plug-ins/cairo/diacairo-interactive.c:414
+msgid "Visible rect pointer"
+msgstr "åèçåæé"
+
+#: ../plug-ins/cairo/diacairo-renderer.c:869
+#: ../plug-ins/cairo/diacairo-renderer.c:904 ../plug-ins/cgm/cgm.c:1126
+#: ../plug-ins/libart/dialibartrenderer.c:1325
+#: ../plug-ins/metapost/render_metapost.c:1108
+#: ../plug-ins/postscript/diapsrenderer.c:718
+#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:892
+msgid "Not enough memory for image drawing."
+msgstr "èæéäèåççååã"
+
+#: ../plug-ins/cgm/cgm.c:1119
+msgid ""
+"Image row length larger than maximum cell array.\n"
+"Image not exported to CGM."
+msgstr ""
+"ååéååææåååéåéåã\n"
+"ååäæååè CGMã"
 
-#: ../objects/custom/custom.c:117
-msgid "Custom"
-msgstr "èé"
+#: ../plug-ins/cgm/cgm.c:1383
+msgid "Computer Graphics Metafile"
+msgstr "éèååääæ (CGM)"
 
-#: ../objects/custom/custom.c:117
-msgid "Custom XML shapes loader"
-msgstr "èé XML ååèåçå"
+#: ../plug-ins/cgm/cgm.c:1408
+msgid "Computer Graphics Metafile export filter"
+msgstr "éèååääæ (CGM) ååéæå"
 
-#: ../objects/custom/custom_object.c:178 ../objects/custom/custom_object.c:203
-msgid "Flip horizontal"
-msgstr "äçæåéå"
+#: ../plug-ins/drs/dia-render-script.c:158
+#: ../plug-ins/drs/dia-render-script.c:163
+msgid "DiaRenderScript"
+msgstr "DiaRenderScript"
 
-#: ../objects/custom/custom_object.c:180 ../objects/custom/custom_object.c:205
-msgid "Flip vertical"
-msgstr "äçåçéå"
+#: ../plug-ins/drs/dia-render-script.c:187
+msgid "DiaRenderScript filter"
+msgstr "DiaRenderScript éæå"
 
-#: ../objects/custom/custom_object.c:1442
-msgid "Flip Horizontal"
-msgstr "äçæåéå"
+#: ../plug-ins/drs/dia-render-script-import.c:224
+msgid "Broken file?"
+msgstr "ææææäï"
 
-#: ../objects/custom/custom_object.c:1443
-msgid "Flip Vertical"
-msgstr "äçåçéå"
+#: ../plug-ins/dxf/dxf.c:50
+msgid "Drawing Interchange File import and export filters"
+msgstr "çåäææ (DIF) åå/ååéæå"
 
-#: ../objects/custom/custom_object.c:1480
-#, c-format
-msgid "Cannot open icon file %s for object type '%s'."
-msgstr "çæéåçäéåâ%2$sâæççåçæ %1$sã"
+#: ../plug-ins/dxf/dxf-export.c:655 ../plug-ins/dxf/dxf-import.c:1389
+msgid "Drawing Interchange File"
+msgstr "çåäææ (DIF)"
 
-#: ../objects/custom/shape_info.c:129
+#: ../plug-ins/dxf/dxf-import.c:1299
 #, c-format
-msgid ""
-"The file '%s' has invalid path data.\n"
-"svg:path data must start with moveto."
-msgstr ""
+msgid "read_dxf_codes failed on '%s'"
+msgstr "'%s' äç read_dxf_codes åæ"
 
-#: ../objects/flowchart/box.c:150 ../objects/standard/box.c:150
-#: ../objects/standard/polyline.c:134 ../objects/standard/zigzagline.c:130
-msgid "Corner radius"
-msgstr "èèåå"
+#: ../plug-ins/dxf/dxf-import.c:1306
+#, c-format
+msgid "Binary DXF from '%s' not supported"
+msgstr "äææäè '%s' çäéä DXF"
 
-#: ../objects/flowchart/flowchart.c:37
-msgid "Flowchart objects"
-msgstr "æçåçä"
+#: ../plug-ins/hpgl/hpgl.c:753
+msgid "HP Graphics Language"
+msgstr "HP ååèè (HP-GL)"
 
-#: ../objects/flowchart/parallelogram.c:152
-msgid "Shear angle"
-msgstr "åèè"
+#: ../plug-ins/hpgl/hpgl.c:778
+msgid "HP Graphics Language export filter"
+msgstr "HP ååèè (HP-GL) ååéæå"
 
-#: ../objects/network/basestation.c:135
-msgid "Sectors"
+#: ../plug-ins/layout/layout.cpp:228
+msgid "Please select edges and nodes to layout."
 msgstr ""
 
-#: ../objects/network/basestation.c:396 ../objects/network/basestation.c:398
-msgid "Base Station"
-msgstr "ååå"
+#: ../plug-ins/layout/layout.cpp:233
+msgid "Graph creation failed"
+msgstr "åèåçåæ"
 
-#: ../objects/network/bus.c:611
-msgid "Add Handle"
-msgstr "ååæåé"
+#: ../plug-ins/layout/layout.cpp:259
+msgid "No such module."
+msgstr "çææçã"
 
-#: ../objects/network/bus.c:612
-msgid "Delete Handle"
-msgstr "åéæåé"
+#: ../plug-ins/layout/layout.cpp:260
+msgid "Out of memory."
+msgstr "èæéäèã"
 
-#: ../objects/network/network.c:43
-msgid "Network diagram objects"
-msgstr "ççåèçä"
+#: ../plug-ins/layout/layout.cpp:261
+msgid "Not a tree."
+msgstr ""
 
-#: ../objects/network/radiocell.c:119
-msgid "Radius"
-msgstr "åå"
+#: ../plug-ins/layout/layout.cpp:262
+msgid "Not a forest."
+msgstr ""
 
-#: ../objects/network/wanlink.c:117
-msgid "Width"
-msgstr "éå"
+#: ../plug-ins/layout/layout.cpp:263
+msgid "Failed algorithm."
+msgstr "æçæåæã"
 
-#: ../objects/standard/arc.c:140
-msgid "Curve distance"
-msgstr "æçèé"
+#: ../plug-ins/layout/layout.cpp:264
+msgid "Failed precondition."
+msgstr "éèæäåæã"
 
-#: ../objects/standard/bezier.c:137 ../objects/standard/line.c:141
-#: ../objects/standard/polyline.c:135
-msgid "Line gaps"
-msgstr "ççé"
+#: ../plug-ins/layout/layout.cpp:265
+msgid "OGDF crashed."
+msgstr "OGCD çæã"
 
-#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
-#: ../objects/standard/polyline.c:137
-msgid "Absolute start gap"
-msgstr "çåéåçé"
+#: ../plug-ins/layout/layout.cpp:266
+msgid "Unknown reason"
+msgstr "äèçç"
 
-#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:139
-msgid "Absolute end gap"
-msgstr "çåçæçé"
+#: ../plug-ins/layout/layout.cpp:268
+#, c-format
+msgid ""
+"Layout '%s' failed.\n"
+"%s"
+msgstr ""
+"éç '%s' åæã\n"
+"%s"
 
-#: ../objects/standard/bezier.c:698 ../objects/standard/beziergon.c:482
-msgid "Add Segment"
-msgstr "åååæ"
+#: ../plug-ins/layout/layout.cpp:409
+msgid "OGDF Layout Algorithms"
+msgstr "OGDF éçæçæ"
 
-#: ../objects/standard/bezier.c:699 ../objects/standard/beziergon.c:483
-msgid "Delete Segment"
-msgstr "åéåæ"
+#: ../plug-ins/libart/dialibart.c:58
+msgid "Libart-based rendering"
+msgstr "åæ Libart ççè"
 
-#: ../objects/standard/bezier.c:701 ../objects/standard/beziergon.c:485
-msgid "Symmetric control"
-msgstr "åçæå"
+#: ../plug-ins/libart/dialibartrenderer.c:1476
+msgid "Renderer transformation"
+msgstr ""
 
-#: ../objects/standard/bezier.c:703 ../objects/standard/beziergon.c:487
-msgid "Smooth control"
-msgstr "åææå"
+#: ../plug-ins/libart/dialibartrenderer.c:1477
+msgid "Transform pointer"
+msgstr "èææé"
 
-#: ../objects/standard/bezier.c:705 ../objects/standard/beziergon.c:489
-msgid "Cusp control"
-msgstr "çéæå"
+#: ../plug-ins/libart/export_png.c:159 ../plug-ins/xslt/xslt.c:101
+#, c-format
+msgid "Can't open output file %s: %s\n"
+msgstr "çæéåèåæ %sï%s\n"
 
-#: ../objects/standard/box.c:137 ../objects/standard/ellipse.c:131
-msgid "Free"
-msgstr "èç"
+#: ../plug-ins/libart/export_png.c:167
+msgid "Could not create PNG write structure"
+msgstr "çæçç PNG ååçæ"
 
-#: ../objects/standard/box.c:138 ../objects/standard/ellipse.c:132
-msgid "Fixed"
-msgstr "åå"
+#: ../plug-ins/libart/export_png.c:176
+msgid "Could not create PNG header info structure"
+msgstr "çæçç PNG æéèèçæ"
 
-#: ../objects/standard/box.c:139 ../objects/standard/box.c:694
-msgid "Square"
-msgstr "æå"
+#: ../plug-ins/libart/export_png.c:184
+msgid "Error occurred while writing PNG"
+msgstr "çåå PNG æççéè"
 
-#: ../objects/standard/box.c:152 ../objects/standard/ellipse.c:144
-msgid "Aspect ratio"
-msgstr "åéæ"
+#. Create a dialog
+#: ../plug-ins/libart/export_png.c:328
+msgid "PNG Export Options"
+msgstr "PNG ååéé"
 
-#: ../objects/standard/box.c:690 ../objects/standard/ellipse.c:668
-msgid "Free aspect"
-msgstr "èçåéæ"
+#: ../plug-ins/libart/export_png.c:334
+msgid "Image width:"
+msgstr "ååéåï"
 
-#: ../objects/standard/box.c:692 ../objects/standard/ellipse.c:670
-msgid "Fixed aspect"
-msgstr "åååéæ"
+#: ../plug-ins/libart/export_png.c:337
+msgid "Image height:"
+msgstr "ååéåï"
 
-#: ../objects/standard/ellipse.c:133 ../objects/standard/ellipse.c:672
-msgid "Circle"
-msgstr "åå"
+#: ../plug-ins/libart/export_png.c:383
+msgid "PNG (antialiased)"
+msgstr "PNG (åæå)"
 
-#: ../objects/standard/image.c:132
-msgid "Image file"
-msgstr "ååæ"
+#: ../plug-ins/metapost/metapost.c:46
+msgid "TeX Metapost export filter"
+msgstr "TeX Metapost ååéæå"
 
-#: ../objects/standard/image.c:134
-msgid "Draw border"
-msgstr "çèéç"
+#: ../plug-ins/metapost/render_metapost.c:1267
+msgid "TeX Metapost macros"
+msgstr "TeX Metapost åé"
 
-#: ../objects/standard/image.c:136
-msgid "Keep aspect ratio"
-msgstr "äæåéæ"
+#: ../plug-ins/pdf/pdf.c:30
+#, fuzzy
+#| msgid "Cairo Portable Document Format"
+msgid "Portable Document File"
+msgstr "Cairo åæåæäæå"
 
-#. Found file in same dir as diagram.
-#. Found file in current dir.
-#: ../objects/standard/image.c:679 ../objects/standard/image.c:690
+#: ../plug-ins/pdf/pdf.c:44
+#, fuzzy
+#| msgid "WMF export filter"
+msgid "PDF import filter"
+msgstr "WMF ååéæå"
+
+#: ../plug-ins/pdf/pdf-import.cpp:311
+#, fuzzy, c-format
+#| msgid "Pager"
+msgid "Page %d"
+msgstr "ååæ"
+
+#: ../plug-ins/pdf/pdf-import.cpp:706
 #, c-format
 msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
+"PDF document not OK.\n"
+"%s"
 msgstr ""
-"åèçéäæäåååæâ%sâã\n"
-"æçææâ%sâ\n"
-
-#. Didn't find file in current dir.
-#: ../objects/standard/image.c:696 ../objects/standard/image.c:718
-#, c-format
-msgid "The image file '%s' was not found.\n"
-msgstr "æäåååæâ%sâã\n"
-
-#: ../objects/standard/line.c:132
-msgid "Arrows"
-msgstr "çé"
-
-#: ../objects/standard/line.c:137
-msgid "Start point"
-msgstr "èé"
-
-#: ../objects/standard/line.c:139
-msgid "End point"
-msgstr "çé"
-
-#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:577
-msgid "Add Corner"
-msgstr "ååèè"
 
-#: ../objects/standard/polygon.c:461 ../objects/standard/polyline.c:578
-msgid "Delete Corner"
-msgstr "åéèè"
+#: ../plug-ins/pgf/pgf.c:26
+msgid "LaTeX PGF export filter"
+msgstr "LaTeX PGF ååéæå"
 
-#: ../objects/standard/standard.c:45
-msgid "Standard objects"
-msgstr "ææçä"
+#: ../plug-ins/pgf/render_pgf.c:1112
+#: ../plug-ins/pstricks/render_pstricks.c:733
+msgid "Not valid UTF-8"
+msgstr "éææç UTF-8"
 
-#: ../objects/standard/textobj.c:134
-msgid "First Line"
-msgstr "çäæç"
+#: ../plug-ins/pgf/render_pgf.c:1268
+msgid "LaTeX PGF macros"
+msgstr "LaTeX PGF åé"
 
-#: ../objects/standard/textobj.c:141
-msgid "Vertical text alignment"
-msgstr "åçåéæå"
+#: ../plug-ins/pixbuf/pixbuf.c:86
+msgid "Failed to create pixbuf from drawable."
+msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:976
+#: ../plug-ins/pixbuf/pixbuf.c:91
 #, c-format
 msgid ""
-"Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with cairo.\n"
+"Could not save file:\n"
+"%s"
 msgstr ""
-"çæåèåææåç '%s' èæçååççã\n"
-"èæ cairo éæåäåçååã\n"
+"çæååææï\n"
+"%s"
 
-#: ../plug-ins/cairo/diacairo.c:1094
-msgid "Cairo PostScript"
+#: ../plug-ins/pixbuf/pixbuf.c:112
+msgid "Calling error, missing user_data."
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:1105
-msgid "Cairo Portable Document Format"
-msgstr "Cairo åæåæäæå"
-
-#: ../plug-ins/cairo/diacairo.c:1116
-msgid "Cairo Scalable Vector Graphics"
-msgstr "Cairo åçæåéå (SVG)"
-
-#: ../plug-ins/cairo/diacairo.c:1126
-msgid "Cairo PNG"
-msgstr "Cairo PNG"
-
-#: ../plug-ins/cairo/diacairo.c:1134
-msgid "Cairo PNG (with alpha)"
-msgstr "Cairo PNG (å alpha)"
-
-#: ../plug-ins/cairo/diacairo.c:1144
-msgid "Cairo WMF"
-msgstr "Cairo WMF"
-
-#: ../plug-ins/cairo/diacairo.c:1153
-msgid "Cairo old WMF"
-msgstr "Cairo èå WMF"
-
-#: ../plug-ins/cairo/diacairo.c:1162
-msgid "Cairo Clipboard"
-msgstr "Cairo åèç"
-
-#: ../plug-ins/cairo/diacairo.c:1211
-msgid "Cairo based Rendering"
-msgstr "åæ Cairo ççè"
-
-#: ../plug-ins/cgm/cgm.c:1105
+#: ../plug-ins/pixbuf/pixbuf.c:141
+#, c-format
 msgid ""
-"Image row length larger than maximum cell array.\n"
-"Image not exported to CGM."
+"Pixbuf[%s] can't load:\n"
+"%s"
 msgstr ""
-"ååéååææåååéåéåã\n"
-"ååäæååè CGMã"
+"Pixbuf[%s] çæèåï\n"
+"%s"
 
-#: ../plug-ins/cgm/cgm.c:1360
-msgid "Computer Graphics Metafile"
-msgstr "éèååääæ (CGM)"
+#: ../plug-ins/pixbuf/pixbuf.c:196
+msgid "gdk-pixbuf-based bitmap export/import"
+msgstr "ä gdk-pixbuf çåççééååå/ååéæå"
 
-#: ../plug-ins/cgm/cgm.c:1385
-msgid "Computer Graphics Metafile export filter"
-msgstr "éèååääæ (CGM) ååéæå"
+#: ../plug-ins/postscript/paginate_psprint.c:273
+msgid "Select Printer"
+msgstr "éåæåæ"
 
-#: ../plug-ins/dxf/dxf-export.c:528 ../plug-ins/dxf/dxf-import.c:1387
-msgid "Drawing Interchange File"
-msgstr "çåäææ (DIF)"
+#: ../plug-ins/postscript/paginate_psprint.c:285
+#: ../sheets/ciscocomputer.sheet.in.h:37
+msgid "Printer"
+msgstr "æåæ"
 
-#: ../plug-ins/dxf/dxf-import.c:482 ../plug-ins/dxf/dxf-import.c:499
-msgid "Bad vertex bulge\n"
-msgstr "ééåèçå\n"
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
+msgid "File"
+msgstr "ææ"
 
-#: ../plug-ins/dxf/dxf-import.c:1049
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
-msgid "Scale: %f\n"
-msgstr "æäï%f\n"
+msgid "Could not run command '%s': %s"
+msgstr "çæåèæäâ%sâï%s"
 
-#: ../plug-ins/dxf/dxf-import.c:1314
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
-msgid "read_dxf_codes failed on '%s'\n"
-msgstr "'%s' äç read_dxf_codes åæ\n"
+msgid "Could not open '%s' for writing: %s"
+msgstr "çæéåâ%sâäååèæï%s"
 
-#: ../plug-ins/dxf/dxf-import.c:1322
+#: ../plug-ins/postscript/paginate_psprint.c:489
 #, c-format
-msgid "Binary DXF from '%s' not supported\n"
-msgstr "äææäè '%s' çäéä DXF\n"
+msgid "Printing error: command '%s' returned %d\n"
+msgstr "ååéèïæäâ%sâåå %d\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1353
+#: ../plug-ins/postscript/paginate_psprint.c:500
 #, c-format
-msgid "Unknown dxf code %d\n"
-msgstr "äçåç dxf ç %d\n"
+msgid "Printing error: command '%s' caused sigpipe."
+msgstr "ååéèïæäâ%sâéæ sigpipeã"
 
-#: ../plug-ins/dxf/dxf.c:50
-msgid "Drawing Interchange File import and export filters"
-msgstr "çåäææ (DIF) åå/ååéæå"
+#: ../plug-ins/postscript/postscript.c:47
+msgid "Print (PS)"
+msgstr "åå (PS)"
 
-#: ../plug-ins/gprint/diagnomeprint.c:81
-#, c-format
-msgid ""
-"GNOME Print Backend\n"
-" '%s'\n"
-" not available"
+#: ../plug-ins/postscript/postscript.c:82
+msgid "PostScript Rendering"
 msgstr ""
-"GNOME æååççå\n"
-"â%sâ\n"
-"çæäç"
-
-#: ../plug-ins/gprint/diagnomeprint.c:112
-msgid "GNOME PostScript"
-msgstr "GNOME PostScript"
-
-#: ../plug-ins/gprint/diagnomeprint.c:121
-msgid "GNOME Portable Document Format"
-msgstr "GNOME åæåæäæå"
-
-#: ../plug-ins/gprint/diagnomeprint.c:131
-msgid "GNOME Scalable Vector Graphic"
-msgstr "GNOME åçæåéå"
-
-#: ../plug-ins/gprint/diagnomeprint.c:164
-msgid "GNOME Print based Rendering"
-msgstr "åæ GNOME æåççè"
-
-#: ../plug-ins/hpgl/hpgl.c:751
-msgid "HP Graphics Language"
-msgstr "HP ååèè (HP-GL)"
-
-#: ../plug-ins/hpgl/hpgl.c:776
-msgid "HP Graphics Language export filter"
-msgstr "HP ååèè (HP-GL) ååéæå"
-
-#: ../plug-ins/metapost/metapost.c:46
-msgid "TeX Metapost export filter"
-msgstr "TeX Metapost ååéæå"
-
-#: ../plug-ins/metapost/render_metapost.c:1262
-msgid "TeX Metapost macros"
-msgstr "TeX Metapost åé"
-
-#: ../plug-ins/pgf/pgf.c:26
-msgid "LaTeX PGF export filter"
-msgstr "LaTeX PGF ååéæå"
-
-#: ../plug-ins/pgf/render_pgf.c:1112
-#: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF8"
-msgstr "éææç UTF8"
 
-#: ../plug-ins/pgf/render_pgf.c:1277
-msgid "LaTeX PGF macros"
-msgstr "LaTeX PGF åé"
+#: ../plug-ins/postscript/render_eps.c:168
+msgid "Encapsulated PostScript (using Pango fonts)"
+msgstr "åèå PostScriptïäç Pango ååï"
 
-#: ../plug-ins/pixbuf/pixbuf.c:93
-#, c-format
-msgid ""
-"Could not save file:\n"
-"%s\n"
-"%s"
-msgstr ""
-"çæååææï\n"
-"%s\n"
-"%s"
+#: ../plug-ins/postscript/render_eps.c:177
+msgid "Encapsulated Postscript with preview (using Pango fonts)"
+msgstr "åèå Postscript èéèïäç Pango ååï"
 
-#: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf based bitmap export/import"
-msgstr "ä gdk-pixbuf çåççééååå/ååéæå"
+#: ../plug-ins/postscript/render_eps.c:187
+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+msgstr "åèå PostScriptïäç PostScript Latin-1 ååï"
 
 #: ../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:995
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks åé"
 
-#: ../plug-ins/python/pydia-render.c:719
+#: ../plug-ins/python/pydia-render.c:1118
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "çæéåâ%sâäååèæã\n"
 
-#: ../plug-ins/python/python.c:96
+#: ../plug-ins/python/python.c:95
 msgid "Python scripting support"
 msgstr "Python åäçææ"
 
-#: ../plug-ins/shape/shape-export.c:477
-msgid "Can't export png without libart!"
-msgstr "çæåææ libart çææäååæç pngï"
+#: ../plug-ins/shape/shape.c:36
+msgid "Dia shape export filter"
+msgstr "Dia ååååéæå"
+
+#: ../plug-ins/shape/shape-export.c:525
+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
+msgstr "ååæåéä .shape çåïåå Dia çæèå"
 
-#: ../plug-ins/shape/shape-export.c:502
-msgid "Dia Shape File"
-msgstr "Dia åçææ"
+#: ../plug-ins/shape/shape-export.c:539
+msgid "Can't export PNG icon without export plugin!"
+msgstr "çæåææåååææççææäååæç PNGï"
 
-#: ../plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
-msgstr "dia åçååéæå"
+#: ../plug-ins/shape/shape-export.c:565
+msgid "Dia Shape File"
+msgstr "Dia ååææ"
 
-#: ../plug-ins/svg/render_svg.c:294 ../plug-ins/svg/svg-import.c:676
-msgid "Scalable Vector Graphics"
-msgstr "åçæåéå (SVG)"
+#: ../plug-ins/svg/svg.c:50
+msgid "Scalable Vector Graphics import and export filters"
+msgstr "åçæåéå (SVG) åå/ååéæå"
 
-#: ../plug-ins/svg/svg-import.c:195
+#: ../plug-ins/svg/svg-import.c:387
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -5600,973 +6052,1021 @@ msgstr ""
 "èåèæçæã\n"
 "svg:èåèæéä moveto ééã"
 
-#: ../plug-ins/svg/svg-import.c:637
+#: ../plug-ins/svg/svg-import.c:1224
+msgid "'Shape Design' shapes missing."
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1258
+#, c-format
+msgid "Object '%s' creation failed"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1280
+#, c-format
+msgid ""
+"Parse error for memory block.\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1293 ../plug-ins/vdx/vdx-import.c:2888
+#, c-format
+msgid "Parse error for %s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1325
 msgid "Expected SVG Namespace not found in file"
 msgstr "ææäæäåéæç SVG ååçé"
 
-#: ../plug-ins/svg/svg-import.c:657
+#: ../plug-ins/svg/svg-import.c:1345
 #, 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) åå/ååéæå"
-
-#: ../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.c:54
+msgid "Visio XML Format import and export filter"
+msgstr "Visio XML æååå/ååéæå"
 
-#: ../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:219 ../plug-ins/xfig/xfig-import.c:1036
+#: ../plug-ins/vdx/vdx-import.c:222
 #, c-format
-msgid "Couldn't read color: %s\n"
-msgstr "çæèåéèï%s\n"
+msgid "Couldn't read color: %s"
+msgstr "çæèåéèï%s"
 
-#: ../plug-ins/vdx/vdx-import.c:513
+#: ../plug-ins/vdx/vdx-import.c:536
 #, c-format
-msgid "Couldn't find shape %d\n"
-msgstr "æäå %d åç\n"
+msgid "Couldn't find shape %d"
+msgstr "æäå %d åå"
 
-#: ../plug-ins/vdx/vdx-import.c:982
+#: ../plug-ins/vdx/vdx-import.c:1012
 #, c-format
-msgid "Unexpected Ellipse object: %s\n"
-msgstr "ééæçæåçäï%s\n"
+msgid "Unexpected Ellipse object: %s"
+msgstr "ééæçæåçäï%s"
 
-#: ../plug-ins/vdx/vdx-import.c:996
-msgid "Can't rotate ellipse\n"
-msgstr "çææèæå\n"
+#: ../plug-ins/vdx/vdx-import.c:1026
+msgid "Can't rotate ellipse"
+msgstr "çææèæå"
 
-#: ../plug-ins/vdx/vdx-import.c:1312
-msgid "MoveTo not at start of Bezier\n"
-msgstr ""
+#: ../plug-ins/vdx/vdx-import.c:1357
+msgid "MoveTo not at start of Bezier"
+msgstr "èèæçééäé MoveTo"
 
-#: ../plug-ins/vdx/vdx-import.c:1645
+#: ../plug-ins/vdx/vdx-import.c:1707
 msgid "Invalid NURBS formula"
 msgstr "NURBS æçåçæ"
 
-#: ../plug-ins/vdx/vdx-import.c:1881
-#, c-format
-msgid "Couldn't write file %s"
-msgstr "çæååææ %s"
-
-#: ../plug-ins/vdx/vdx-import.c:1966 ../plug-ins/vdx/vdx-import.c:1979
+#: ../plug-ins/vdx/vdx-import.c:1965
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "çæèçåäçäéå %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2007
+#: ../plug-ins/vdx/vdx-import.c:2899
+msgid "Nothing in document!"
+msgstr "æäçååï"
+
+#: ../plug-ins/vdx/vdx-import.c:2904
 #, c-format
-msgid "Couldn't make object dir %s"
-msgstr "çæèåèäçäçé %s"
+msgid "Expecting VisioDocument, got %s"
+msgstr "éæçæ VisioDocumentïååçæ %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2954
+#: ../plug-ins/vdx/vdx-import.c:2988
 msgid "Visio XML File Format"
 msgstr "Visio XML æææå"
 
-#: ../plug-ins/vdx/vdx-xml.c:3344
+#: ../plug-ins/vdx/vdx-xml.c:3343
 #, c-format
 msgid "Can't decode object %s"
 msgstr "çæççä %s èç"
 
-#: ../plug-ins/vdx/vdx-xml.c:5125
+#: ../plug-ins/wmf/wmf.cpp:316
 #, 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 æååå/ååéæå"
+msgid ""
+"Couldn't write file %s\n"
+"%s"
+msgstr ""
+"çæååææ %s\n"
+"%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1187
+#: ../plug-ins/wmf/wmf.cpp:566
 #, c-format
-msgid "Couldn't open: '%s' for writing.\n"
-msgstr "çæéåâ%sâäååèæã\n"
-
-#: ../plug-ins/wmf/wmf.cpp:1272
-msgid "Windows Meta File"
-msgstr "Windows ååæ (WMF)"
+msgid ""
+"Cannot render unknown font:\n"
+"%s"
+msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:1281
-msgid "Enhanced Meta File"
-msgstr "åååååæ (EMF)"
+#: ../plug-ins/wmf/wmf.cpp:1514
+msgid "Print (GDI) ..."
+msgstr "åå (GDI) ..."
 
-#: ../plug-ins/wmf/wmf.cpp:1297
+#: ../plug-ins/wmf/wmf.cpp:1530
 msgid "WMF export filter"
 msgstr "WMF ååéæå"
 
-#: ../plug-ins/wpg/wpg.c:1190
+#: ../plug-ins/wpg/wpg.c:1198
 #, 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:1328 ../plug-ins/wpg/wpg.c:1335
 msgid "WPG"
-msgstr ""
+msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1356
+#: ../plug-ins/wpg/wpg.c:1363
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect ååååéæå"
 
-#: ../plug-ins/xfig/xfig-export.c:461
+#: ../plug-ins/xfig/xfig.c:52
+msgid "Fig Format import and export filter"
+msgstr "Fig æååå/ååéæå"
+
+#: ../plug-ins/xfig/xfig-export.c:464
 #, c-format
-msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-msgstr "FIG æåäåçéæå %sïäçæéçéã\n"
+msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
+msgstr "Fig æåäåçéæå %sïäçæéçéã\n"
 
-#: ../plug-ins/xfig/xfig-export.c:483
+#: ../plug-ins/xfig/xfig-export.c:487
 msgid "No more user-definable colors - using black"
 msgstr "åçäçèååççèå â äçéè"
 
-#: ../plug-ins/xfig/xfig-export.c:1188
-#, fuzzy
-msgid "XFig format"
-msgstr "XFig æå"
+#: ../plug-ins/xfig/xfig-export.c:1214
+msgid "Xfig format"
+msgstr "Xfig æå"
 
-#: ../plug-ins/xfig/xfig-import.c:111
+#: ../plug-ins/xfig/xfig-import.c:109
 #, c-format
-msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-msgstr "èåçå %d åéïååè 512 èãæçäçéèã"
+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:140
 msgid "Patterns are not supported by Dia"
 msgstr "Dia äæææå (Pattern)"
 
-#: ../plug-ins/xfig/xfig-import.c:166
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-msgstr "Dia äææäéèçïèäçåéèç"
+#: ../plug-ins/xfig/xfig-import.c:168
+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:172
 #, c-format
-msgid "Line style %d should not appear\n"
-msgstr "äæåççææå %d\n"
+msgid "Line style %d should not appear"
+msgstr "äæåççææå %d"
 
-#: ../plug-ins/xfig/xfig-import.c:238
+#: ../plug-ins/xfig/xfig-import.c:244
 #, c-format
-msgid "Error while reading %dth of %d points: %s\n"
-msgstr "èå %2$d éäçç %1$d éæåçéèï%3$s\n"
+msgid "Error while reading %dth of %d points"
+msgstr "èå %2$d éäçç %1$d éæåçéè"
 
-#: ../plug-ins/xfig/xfig-import.c:266
-msgid "Error while reading arrowhead\n"
-msgstr "èåçéæççéè\n"
+#: ../plug-ins/xfig/xfig-import.c:272
+msgid "Error while reading arrowhead"
+msgstr "èåçéæççéè"
 
-#: ../plug-ins/xfig/xfig-import.c:288
+#: ../plug-ins/xfig/xfig-import.c:294
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "äæççééå %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:379
+#: ../plug-ins/xfig/xfig-import.c:386
 #, 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
-#, c-format
-msgid "Couldn't read ellipse info: %s\n"
-msgstr "çæèåæåèèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:434
+msgid "Couldn't read ellipse info."
+msgstr "çæèåæåèè"
 
-#: ../plug-ins/xfig/xfig-import.c:494
-#, c-format
-msgid "Couldn't read polyline info: %s\n"
-msgstr "çæèåèççæèèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:503
+msgid "Couldn't read polyline info.\n"
+msgstr "çæèåèççæèèã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:509
-#, c-format
-msgid "Couldn't read flipped bit: %s\n"
-msgstr ""
+#: ../plug-ins/xfig/xfig-import.c:518
+msgid "Couldn't read flipped bit."
+msgstr "çæèåçèçäåã"
 
-#: ../plug-ins/xfig/xfig-import.c:527
-msgid "Negative corner radius, negating"
-msgstr "èèååæèæïæçäçææ"
+#: ../plug-ins/xfig/xfig-import.c:536
+msgid "Negative corner radius; negating"
+msgstr "èèååæèæïæçäçææ"
 
-#: ../plug-ins/xfig/xfig-import.c:570 ../plug-ins/xfig/xfig-import.c:883
+#: ../plug-ins/xfig/xfig-import.c:579
 #, 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
-#, c-format
-msgid "Couldn't read spline info: %s\n"
-msgstr "çæèå spline èèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:730 ../plug-ins/xfig/xfig-import.c:762
+msgid "Couldn't read spline info."
+msgstr "çæèåææèèã"
 
 #. 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:749 ../plug-ins/xfig/xfig-import.c:766
 msgid "Cannot convert approximated spline yet."
-msgstr "éçæèæèäç splineã"
+msgstr "éçæèæèäçææã"
 
-#: ../plug-ins/xfig/xfig-import.c:795
+#: ../plug-ins/xfig/xfig-import.c:804
 #, c-format
 msgid "Unknown spline subtype: %d\n"
-msgstr "äçåç spline åéåï%d\n"
+msgstr "äçåçææåéåï%d\n"
+
+#: ../plug-ins/xfig/xfig-import.c:870
+msgid "Couldn't read arc info."
+msgstr "çæèååçèæã"
 
-#: ../plug-ins/xfig/xfig-import.c:858
+#. set new fill property on arc?
+#: ../plug-ins/xfig/xfig-import.c:899
+msgid "Filled arc treated as unfilled"
+msgstr "ååæçåçèçæåæ"
+
+#: ../plug-ins/xfig/xfig-import.c:903
 #, c-format
-msgid "Couldn't read arc info: %s\n"
-msgstr "çæèååçèæï%s\n"
+msgid "Unknown polyline arc: %d\n"
+msgstr "äçåçèççæåçï%d\n"
+
+#: ../plug-ins/xfig/xfig-import.c:968
+msgid "Couldn't read text info."
+msgstr "çæèåæåèæã"
 
-#: ../plug-ins/xfig/xfig-import.c:947
+#: ../plug-ins/xfig/xfig-import.c:996
 #, c-format
-msgid "Couldn't read text info: %s\n"
-msgstr "çæèåæåèæï%s\n"
+msgid "Can't find LaTeX font nr. %d, using sans"
+msgstr "æäå LaTeX åå nr. %dïæçç sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1009
+#: ../plug-ins/xfig/xfig-import.c:1004
 #, c-format
-msgid "Couldn't identify FIG object: %s\n"
-msgstr "çæèå FIG çäï%s\n"
+msgid "Can't find Postscript font nr. %d, using sans"
+msgstr "æäå PostScript åå nr. %dïæçç sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1017
+#: ../plug-ins/xfig/xfig-import.c:1032
+msgid "Couldn't identify Fig object."
+msgstr "çæèå Fig çäã"
+
+#: ../plug-ins/xfig/xfig-import.c:1040
 msgid "Compound end outside compound\n"
-msgstr "èåçæçèåèåç\n"
+msgstr "èåçäæçèåèåçä\n"
+
+#: ../plug-ins/xfig/xfig-import.c:1059
+#, c-format
+msgid "Couldn't read color: %s\n"
+msgstr "çæèåéèï%s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1041
+#: ../plug-ins/xfig/xfig-import.c:1064
 #, 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:1087
-#, c-format
-msgid "Couldn't read group extend: %s\n"
-msgstr "çæèåççæåï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1111
+msgid "Couldn't read group extend."
+msgstr "çæèåççæåã"
 
-#: ../plug-ins/xfig/xfig-import.c:1098
+#: ../plug-ins/xfig/xfig-import.c:1122
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "äçåççäéå %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1122
+#: ../plug-ins/xfig/xfig-import.c:1147
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "â%sâäæâ%sâæâ%sâåäää\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
-#, c-format
-msgid "Error reading paper size: %s\n"
-msgstr "èåçåååæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1157
+msgid "Error reading paper size."
+msgstr "èåçåååæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1143
+#: ../plug-ins/xfig/xfig-import.c:1168
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "äæççåååâ%sâïäçéèå\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1155
-#, c-format
-msgid "Error reading paper orientation: %s\n"
-msgstr "èåçåæåæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1181
+msgid "Error reading paper orientation."
+msgstr "èåçåæåæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
-#, c-format
-msgid "Error reading justification: %s\n"
-msgstr "èååéèææççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1191
+msgid "Error reading justification."
+msgstr "èååéèææççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
-#, c-format
-msgid "Error reading units: %s\n"
-msgstr "èåéååäæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1201
+msgid "Error reading units."
+msgstr "èåéååäæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1191
-#, c-format
-msgid "Error reading magnification: %s\n"
-msgstr "èåçæåçæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1217
+msgid "Error reading magnification."
+msgstr "èåçæåçæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1204
-#, c-format
-msgid "Error reading multipage indicator: %s\n"
-msgstr "èåéææçæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1230
+msgid "Error reading multipage indicator."
+msgstr "èåéææçæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1215
-#, c-format
-msgid "Error reading transparent color: %s\n"
-msgstr "èåéæéèæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1241
+msgid "Error reading transparent color."
+msgstr "èåéæéèæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1224 ../plug-ins/xfig/xfig-import.c:1280
-#: ../plug-ins/xfig/xfig-import.c:1298
-#, c-format
-msgid "Error reading FIG file: %s\n"
-msgstr "èå FIG æææççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1250 ../plug-ins/xfig/xfig-import.c:1311
+#: ../plug-ins/xfig/xfig-import.c:1329
+msgid "Error reading Fig file."
+msgstr "èå Fig æææççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1226 ../plug-ins/xfig/xfig-import.c:1282
-msgid "Premature end of FIG file\n"
-msgstr "FIG ææéæåç\n"
+#: ../plug-ins/xfig/xfig-import.c:1252
+msgid "Premature end of Fig file\n"
+msgstr "Fig ææéæåç\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1235
-#, c-format
-msgid "Error reading resolution: %s\n"
-msgstr "èåèååæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1261
+msgid "Error reading resolution."
+msgstr "èåèååæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1267
-#, c-format
-msgid "Doesn't look like a Fig file: %s\n"
-msgstr "äåæ Fig ææï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1297
+msgid "Doesn't look like a Fig file"
+msgstr "äåæ Fig ææ"
 
-#: ../plug-ins/xfig/xfig-import.c:1273
+#: ../plug-ins/xfig/xfig-import.c:1303
 #, c-format
-msgid "This is a FIG version %d.%d file, I may not understand it\n"
-msgstr "éæ FIG çæ %d.%d çææãåèçæèå\n"
+msgid ""
+"This is a Fig version %d.%d file.\n"
+" It may not be importable."
+msgstr ""
+"éæ Fig %d.%d ççææã\n"
+"åèçæååã"
 
-#: ../plug-ins/xfig/xfig-import.c:1321
-msgid "XFig File Format"
-msgstr "XFig æææå"
+#: ../plug-ins/xfig/xfig-import.c:1313
+msgid "Premature end of Fig file"
+msgstr "Fig ææéæåç"
 
-#: ../plug-ins/xfig/xfig.c:51
-msgid "Fig Format import and export filter"
-msgstr "Fig æååå/ååéæå"
+#: ../plug-ins/xfig/xfig-import.c:1352
+msgid "Xfig File Format"
+msgstr "Xfig æææå"
 
-#: ../plug-ins/xslt/xslt.c:105
+#: ../plug-ins/xslt/xslt.c:110
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "èæ %s æççéè\n"
 
-#: ../plug-ins/xslt/xslt.c:114
+#: ../plug-ins/xslt/xslt.c:119
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "èææåè %s æççéè\n"
 
-#: ../plug-ins/xslt/xslt.c:121
+#: ../plug-ins/xslt/xslt.c:126
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "åçæåè %s æççéè\n"
 
-#: ../plug-ins/xslt/xslt.c:130
+#: ../plug-ins/xslt/xslt.c:135
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "èææåèæççéèï%s\n"
 
-#: ../plug-ins/xslt/xslt.c:139
+#: ../plug-ins/xslt/xslt.c:144
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "åçæåèæççéèï%s\n"
 
-#: ../plug-ins/xslt/xslt.c:325
+#: ../plug-ins/xslt/xslt.c:152
+#, c-format
+msgid "Error while saving result: %s\n"
+msgstr "ååçææççéèï%s\n"
+
+#: ../plug-ins/xslt/xslt.c:336
 msgid "XSL Transformation filter"
 msgstr "XSL èæéæå"
 
-#: ../plug-ins/xslt/xslt.c:349
-msgid "No valid configuration files found for the XSLT plugin, not loading."
-msgstr "æäåçææ XSLT åæçåçææçææïääèåã"
+#: ../plug-ins/xslt/xslt.c:363
+msgid "No valid configuration files found for the XSLT plugin; not loading."
+msgstr "æäåçææ XSLT åæçåçææçææïääèåã"
 
-#: ../plug-ins/xslt/xsltdialog.c:96
+#: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
 msgstr "ç XSLT åå"
 
-#: ../plug-ins/xslt/xsltdialog.c:111
+#: ../plug-ins/xslt/xsltdialog.c:114
 msgid "From:"
 msgstr "åï"
 
-#: ../plug-ins/xslt/xsltdialog.c:146
+#: ../plug-ins/xslt/xsltdialog.c:149
 msgid "To:"
 msgstr "èï"
 
 #: ../sheets/AADL.sheet.in.h:1
 msgid "AADL"
-msgstr ""
+msgstr "AADL"
 
 #: ../sheets/AADL.sheet.in.h:2
 msgid "AADL Shapes"
-msgstr "AADL åç"
-
-#: ../sheets/AADL.sheet.in.h:3
-msgid "Bus"
-msgstr "åææ"
+msgstr "AADL åå"
 
-#: ../sheets/AADL.sheet.in.h:5
-msgid "Device"
-msgstr "èç"
+#: ../sheets/AADL.sheet.in.h:4
+msgid "Thread"
+msgstr "çç"
 
 #: ../sheets/AADL.sheet.in.h:6
+msgid "Processor"
+msgstr "èçå"
+
+#: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
 msgstr "èæé"
 
-#: ../sheets/AADL.sheet.in.h:7
-msgid "Package"
-msgstr "åä"
+#: ../sheets/AADL.sheet.in.h:8
+msgid "Bus"
+msgstr "åææ"
 
 #: ../sheets/AADL.sheet.in.h:9
-msgid "Processor"
-msgstr "èçå"
+msgid "System"
+msgstr "çç"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
 msgstr "åçå"
 
 #: ../sheets/AADL.sheet.in.h:11
-msgid "System"
-msgstr "çç"
+msgid "Thread Group"
+msgstr "çççç"
 
 #: ../sheets/AADL.sheet.in.h:12
-msgid "Thread"
-msgstr "çç"
+msgid "Device"
+msgstr "èç"
 
 #: ../sheets/AADL.sheet.in.h:13
-msgid "Thread Group"
-msgstr "çççç"
+msgid "Package"
+msgstr "åä"
+
+#. Please talk to me before making any changes to this sheet
+#: ../sheets/Assorted.sheet.in.h:2
+msgid "Assorted"
+msgstr "åæåå"
 
 #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
 #. Leave as is for now, renaming too much hassle.
 #. Will probably need to split into seperate sheets soon anyway.
-#: ../sheets/Assorted.sheet.in.h:4
+#: ../sheets/Assorted.sheet.in.h:6
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr "åéåãèèæçååäåååäååé"
 
-#. Please talk to me before making any changes to this sheet
-#: ../sheets/Assorted.sheet.in.h:6
-msgid "Assorted"
-msgstr "åæåå"
-
 #: ../sheets/Assorted.sheet.in.h:7
-msgid "Chevron"
-msgstr "èç"
+msgid "Right angle triangle"
+msgstr "çèäèå"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
-msgstr "æåèæ"
+msgid "Isosceles triangle"
+msgstr "çèäèå"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
-msgstr "æåèæ"
+msgid "Perfect square, height equals width"
+msgstr "ææå"
 
 #: ../sheets/Assorted.sheet.in.h:10
-msgid "Diamond"
-msgstr "èå"
+msgid "Perfect circle"
+msgstr "æåå"
 
 #: ../sheets/Assorted.sheet.in.h:11
-msgid "Down arrow"
-msgstr "çé(ä)"
+msgid "Quarter circle"
+msgstr "ååäååå"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
-msgstr "åèæ"
+msgid "Diamond"
+msgstr "èå"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
-msgstr "äèæ"
+msgid "Pentagon. Five-point shape"
+msgstr "äéå"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
-msgstr "åèæ"
+msgid "Hexagon. Six-point shape"
+msgstr "åéå"
 
 #: ../sheets/Assorted.sheet.in.h:15
-msgid "Heart"
-msgstr "åå"
+msgid "Heptagon. Seven-point shape"
+msgstr "äéå"
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven sided shape"
-msgstr "äéå"
+msgid "Octogon. Eight-point shape"
+msgstr "åéå"
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
-msgstr "åéå"
-
-#: ../sheets/Assorted.sheet.in.h:18
 msgid "Horizontal parallelogram"
 msgstr "æååèåéå"
 
+#: ../sheets/Assorted.sheet.in.h:18
+msgid "Vertical parallelogram"
+msgstr "åçåèåéå"
+
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isoceles triangle"
-msgstr "çèäèå"
+msgid "Trapezoid"
+msgstr "æå"
 
 #: ../sheets/Assorted.sheet.in.h:20
-msgid "Left arrow"
-msgstr "çé(å)"
+msgid "Four-point star"
+msgstr "åèæ"
 
 #: ../sheets/Assorted.sheet.in.h:21
-msgid "Left-right arrow"
-msgstr "çé(åãå)"
+msgid "Curved four-point star"
+msgstr "æåèæ"
 
 #: ../sheets/Assorted.sheet.in.h:22
-msgid "Left-right-up arrow"
-msgstr "çé(åãåãä)"
+msgid "Five-point star"
+msgstr "äèæ"
 
 #: ../sheets/Assorted.sheet.in.h:23
-msgid "Left-up arrow"
-msgstr "çé(åãä)"
+msgid "Six-point star"
+msgstr "åèæ"
 
 #: ../sheets/Assorted.sheet.in.h:24
-msgid "Maltese cross"
-msgstr "éçä(maltese)åå"
+msgid "Seven-point star"
+msgstr "äèæ"
 
 #: ../sheets/Assorted.sheet.in.h:25
-msgid "Notched left arrow"
-msgstr "åæåçé"
+msgid "Eight-point star"
+msgstr "åèæ"
 
 #: ../sheets/Assorted.sheet.in.h:26
-msgid "Notched right arrow"
-msgstr "åæåçé"
+msgid "Sharp eight-point star"
+msgstr "ååèæ"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
-msgstr "åéå"
+msgid "Curved eight-point star"
+msgstr "æåèæ"
 
 #: ../sheets/Assorted.sheet.in.h:28
-msgid "Pentagon block arrow"
-msgstr "äèçé"
+msgid "Swiss cross"
+msgstr "çååå"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
-msgstr "äéå"
+msgid "Maltese cross"
+msgstr "éçä(maltese)åå"
 
 #: ../sheets/Assorted.sheet.in.h:30
-msgid "Perfect circle"
-msgstr "æåå"
+msgid "Down arrow"
+msgstr "çé(ä)"
 
 #: ../sheets/Assorted.sheet.in.h:31
-msgid "Perfect square, height equals width"
-msgstr "ææå"
+msgid "Up arrow"
+msgstr "çé(ä)"
 
 #: ../sheets/Assorted.sheet.in.h:32
-msgid "Quad arrow"
-msgstr "çé(ääåå)"
+msgid "Left arrow"
+msgstr "çé(å)"
 
 #: ../sheets/Assorted.sheet.in.h:33
-msgid "Quarter circle"
-msgstr "ååäååå"
+msgid "Right arrow"
+msgstr "çé(å)"
 
 #: ../sheets/Assorted.sheet.in.h:34
-msgid "Quarter moon"
-msgstr "åæ"
+msgid "Notched left arrow"
+msgstr "åæåçé"
 
 #: ../sheets/Assorted.sheet.in.h:35
-msgid "Right angle triangle"
-msgstr "çèäèå"
+msgid "Notched right arrow"
+msgstr "åæåçé"
 
 #: ../sheets/Assorted.sheet.in.h:36
-msgid "Right arrow"
-msgstr "çé(å)"
+msgid "Left-up arrow"
+msgstr "çé(åãä)"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
-msgstr "äèæ"
+msgid "Turn-up arrow"
+msgstr "äåçé"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
-msgstr "ååèæ"
+msgid "Left-right arrow"
+msgstr "çé(åãå)"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
-msgstr "åèæ"
+msgid "Up-down arrow"
+msgstr "çé(äãä)"
 
 #: ../sheets/Assorted.sheet.in.h:40
-msgid "Sun"
-msgstr "åé"
+msgid "Quad arrow"
+msgstr "çé(ääåå)"
 
 #: ../sheets/Assorted.sheet.in.h:41
-msgid "Swiss cross"
-msgstr "çååå"
+msgid "Left-right-up arrow"
+msgstr "çé(åãåãä)"
 
 #: ../sheets/Assorted.sheet.in.h:42
-msgid "Trapezoid"
-msgstr "æå"
+msgid "Up-down-left arrow"
+msgstr "çé(äãäãå)"
 
 #: ../sheets/Assorted.sheet.in.h:43
-msgid "Turn-up arrow"
-msgstr "äåçé"
+msgid "Pentagon block arrow"
+msgstr "äèçé"
 
 #: ../sheets/Assorted.sheet.in.h:44
-msgid "Up arrow"
-msgstr "çé(ä)"
+msgid "Chevron"
+msgstr "èç"
 
 #: ../sheets/Assorted.sheet.in.h:45
-msgid "Up-down arrow"
-msgstr "çé(äãä)"
+msgid "Heart"
+msgstr "åå"
 
 #: ../sheets/Assorted.sheet.in.h:46
-msgid "Up-down-left arrow"
-msgstr "çé(äãäãå)"
+msgid "Sun"
+msgstr "åé"
 
 #: ../sheets/Assorted.sheet.in.h:47
-msgid "Vertical parallelogram"
-msgstr "åçåèåéå"
-
-#: ../sheets/BPMN.sheet.in.h:1
-msgid "Activity Looping"
-msgstr "æåèå"
-
-#: ../sheets/BPMN.sheet.in.h:2
-msgid "Ad-Hoc Collapsed Sub-Process"
-msgstr "èæ (Ad-Hoc) æçåéç"
+msgid "Quarter moon"
+msgstr "åæ"
 
 #. For: anthonym
-#: ../sheets/BPMN.sheet.in.h:4
+#: ../sheets/BPMN.sheet.in.h:2
 msgid "BPMN"
 msgstr ""
 
-#: ../sheets/BPMN.sheet.in.h:5
+#: ../sheets/BPMN.sheet.in.h:3
 msgid "Business Process Modeling Notation"
 msgstr "åæéçæåèçæ"
 
+#: ../sheets/BPMN.sheet.in.h:4
+msgid "Start Event"
+msgstr "èåää"
+
+#: ../sheets/BPMN.sheet.in.h:5
+msgid "Start Event â Message"
+msgstr "èåää â èæ"
+
 #: ../sheets/BPMN.sheet.in.h:6
-msgid "Collapsed Sub-Process"
-msgstr "æçåéç"
+msgid "Start Event â Timer"
+msgstr "èåää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Compensation Collapsed Sub-Process"
-msgstr "èåæçåéç"
+msgid "Start Event â Rule"
+msgstr "èåää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:8
-msgid "Compensation Task"
-msgstr "èååä"
+msgid "Start Event â Link"
+msgstr "èåää â éç"
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Complex"
-msgstr "èå"
+msgid "Start Event â Multiple"
+msgstr "èåää â åé"
 
 #: ../sheets/BPMN.sheet.in.h:10
-msgid "Data Object"
-msgstr "èæçä"
+msgid "Intermediate Event"
+msgstr "äéää"
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "End Event"
-msgstr "çæää"
+msgid "Intermediate Event â Message"
+msgstr "äéää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
-msgstr "çæää - åæ"
+msgid "Intermediate Event â Timer"
+msgstr "äéää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
-msgstr "çæää - èå"
+msgid "Intermediate Event â Error"
+msgstr "äéää â éè"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
-msgstr "çæää - éè"
+msgid "Intermediate Event â Cancel"
+msgstr "äéää â åæ"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
-msgstr "çæää - éç"
+msgid "Intermediate Event â Compensation"
+msgstr "äéää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
-msgstr "çæää - èæ"
+msgid "Intermediate Event â Rule"
+msgstr "äéää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
-msgstr "çæää - åé"
+msgid "Intermediate Event â Link"
+msgstr "äéää â éç"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
-msgstr "çæää - çç"
+msgid "Intermediate Event â Multiple"
+msgstr "äéää â åé"
 
 #: ../sheets/BPMN.sheet.in.h:19
-msgid "Exclusive (XOR) Data Based"
-msgstr ""
+msgid "End Event"
+msgstr "çæää"
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "Exclusive (XOR) Event Based"
-msgstr ""
+msgid "End Event â Message"
+msgstr "çæää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "Gateway"
-msgstr "éé"
+msgid "End Event â Error"
+msgstr "çæää â éè"
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "Group"
-msgstr "çç"
+msgid "End Event â Cancel"
+msgstr "çæää â åæ"
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "Inclusive (OR)"
-msgstr ""
+msgid "End Event â Compensation"
+msgstr "çæää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:24
-msgid "Intermediate Event"
-msgstr "äéää"
+msgid "End Event â Link"
+msgstr "çæää â éç"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
-msgstr "äéää - åæ"
+msgid "End Event â Multiple"
+msgstr "çæää â åé"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
-msgstr "äéää - èå"
+msgid "End Event â Terminate"
+msgstr "çæää â çç"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
-msgstr "äéää - éè"
+msgid "Gateway"
+msgstr "éé"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
-msgstr "äéää - éç"
+msgid "Exclusive (XOR) Data Based"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
-msgstr "äéää - èæ"
+msgid "Exclusive (XOR) Event Based"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
-msgstr "äéää - åé"
+msgid "Inclusive (OR)"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
-msgstr "äéää - èå"
+msgid "Complex"
+msgstr "èå"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
-msgstr "äéää - èæ"
-
-#: ../sheets/BPMN.sheet.in.h:33
-msgid "Looping Collapsed Sub-Process"
-msgstr "èåæçåéç"
+msgid "Parallel (AND)"
+msgstr "åè (AND)"
 
 #: ../sheets/BPMN.sheet.in.h:34
-msgid "Multiple Instance Collapsed Sub-Process"
-msgstr "åéåäæçåéç"
+msgid "Activity Looping"
+msgstr "æåèå"
 
 #: ../sheets/BPMN.sheet.in.h:35
 msgid "Multiple Instance Task"
 msgstr "åéåäåä"
 
 #: ../sheets/BPMN.sheet.in.h:36
-msgid "Parallel (AND)"
-msgstr "åè (AND)"
+msgid "Compensation Task"
+msgstr "èååä"
 
 #: ../sheets/BPMN.sheet.in.h:37
-msgid "Start Event"
-msgstr "èåää"
+msgid "Collapsed Sub-Process"
+msgstr "æçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
-msgstr "èåää - éç"
+msgid "Looping Collapsed Sub-Process"
+msgstr "èåæçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
-msgstr "èåää - èæ"
+msgid "Multiple Instance Collapsed Sub-Process"
+msgstr "åéåäæçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
-msgstr "èåää - åé"
+msgid "Ad-Hoc Collapsed Sub-Process"
+msgstr "èæ (Ad-Hoc) æçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
-msgstr "èåää - èå"
+msgid "Compensation Collapsed Sub-Process"
+msgstr "èåæçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
-msgstr "èåää - èæ"
-
-#: ../sheets/BPMN.sheet.in.h:44
-msgid "Text Annotation"
-msgstr "æåèè"
+msgid "Group"
+msgstr "çç"
 
-#: ../sheets/BPMN.sheet.in.h:45
+#: ../sheets/BPMN.sheet.in.h:43
 msgid "Transaction"
 msgstr "äæ"
 
-#: ../sheets/ChemEng.sheet.in.h:1
-msgid "AC Generator"
-msgstr "äæçéæ"
+#: ../sheets/BPMN.sheet.in.h:44
+msgid "Data Object"
+msgstr "èæçä"
 
+#: ../sheets/BPMN.sheet.in.h:45
+msgid "Text Annotation"
+msgstr "æåèè"
+
+#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:2
-msgid "Air Cooler"
-msgstr "æååååå"
+msgid "ChemEng"
+msgstr "åååç"
 
 #: ../sheets/ChemEng.sheet.in.h:3
-msgid "Autoclave"
-msgstr "èææè"
+msgid "Collection for chemical engineering"
+msgstr "åååçåé"
 
 #: ../sheets/ChemEng.sheet.in.h:4
-msgid "Axial Flow Fan"
-msgstr "èåæææ"
+msgid "Fan or Stirrer"
+msgstr "éææææå"
 
 #: ../sheets/ChemEng.sheet.in.h:5
-msgid "Basic Filter"
-msgstr "åæéæå"
+msgid "Spraying Device"
+msgstr "åéèç"
 
 #: ../sheets/ChemEng.sheet.in.h:6
-msgid "Centrifugal Pump or Fan"
-msgstr "éååææéæ"
+msgid "Pneumatic Line"
+msgstr "çæåååç"
 
 #: ../sheets/ChemEng.sheet.in.h:7
-msgid "Centrifuge"
-msgstr "éåæ"
+msgid "Pneumatic Line, vertical"
+msgstr "çæåååçïåç"
 
-#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:9
-msgid "ChemEng"
-msgstr "åååç"
+msgid "Simple Heat Exchanger"
+msgstr "çæçäæå"
 
 #: ../sheets/ChemEng.sheet.in.h:10
-msgid "Clarifier or Settling Tank"
-msgstr "æå/æææ"
+msgid "Simple Heat Exchanger, vertical"
+msgstr "çæçäæåïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:11
-msgid "Collection for chemical engineering"
-msgstr "åååçåé"
+msgid "Water Cooler"
+msgstr "æååæçå"
 
 #: ../sheets/ChemEng.sheet.in.h:12
-msgid "Compressor or Turbine"
-msgstr "éæååçæ/ææåæè"
+msgid "Water Cooler, vertical"
+msgstr "æååæçåïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:13
-msgid "Covered tank"
-msgstr "åèåææ"
+msgid "Fixed-Sheet Exchanger"
+msgstr "Fixed-Sheet äæå"
 
 #: ../sheets/ChemEng.sheet.in.h:14
-msgid "Cyclone and hydrocyclone"
-msgstr "Cyclone è hydrocyclone"
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Floating-Head æ U-Tube äæå"
 
 #: ../sheets/ChemEng.sheet.in.h:15
-msgid "Double-Pipe Exchanger"
-msgstr "åççäæå"
+msgid "Kettle Reboiler"
+msgstr "Kettle Reboiler"
 
 #: ../sheets/ChemEng.sheet.in.h:16
-msgid "Ejector or Injector"
-msgstr "åååææåå"
+msgid "Air Cooler"
+msgstr "æååååå"
 
 #: ../sheets/ChemEng.sheet.in.h:17
-msgid "Fan or Stirrer"
-msgstr "éææææå"
+msgid "Forced-Flow Air Cooler"
+msgstr "Forced-Flow Air Cooler"
 
 #: ../sheets/ChemEng.sheet.in.h:18
-msgid "Fixed-Sheet Exchanger"
-msgstr "Fixed-Sheet äæå"
+msgid "Induced-Flow Air Cooler"
+msgstr "Induced-Flow Air Cooler"
 
 #: ../sheets/ChemEng.sheet.in.h:19
-msgid "Floating-Head or U-Tube Exchanger"
-msgstr "Floating-Head æ U-Tube äæå"
+msgid "Plate Exchanger"
+msgstr "åæåäæå"
 
 #: ../sheets/ChemEng.sheet.in.h:20
-msgid "Fluid Contacting Vessel, simple"
-msgstr "Fluid Contacting Vessel, simple"
+msgid "Double-Pipe Exchanger"
+msgstr "åççäæå"
 
 #: ../sheets/ChemEng.sheet.in.h:21
-msgid "Forced-Flow Air Cooler"
-msgstr "Forced-Flow Air Cooler"
+msgid "Heating/Cooling Coil"
+msgstr "Heating/Cooling Coil"
 
 #: ../sheets/ChemEng.sheet.in.h:22
-msgid "Gas Holder, basic"
-msgstr "Gas Holder, basic"
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Heating/Cooling Coil, vertical"
 
 #: ../sheets/ChemEng.sheet.in.h:23
-msgid "Heating/Cooling Coil"
-msgstr "Heating/Cooling Coil"
+msgid "Simple Furnace"
+msgstr "çæç"
 
 #: ../sheets/ChemEng.sheet.in.h:24
-msgid "Heating/Cooling Coil, vertical"
-msgstr "Heating/Cooling Coil, vertical"
+msgid "Simple Vessel"
+msgstr "çæåå"
 
 #: ../sheets/ChemEng.sheet.in.h:25
-msgid "Induced-Flow Air Cooler"
-msgstr "Induced-Flow Air Cooler"
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Knock-out Drum (with demister pad)"
 
 #: ../sheets/ChemEng.sheet.in.h:26
-msgid "Kettle Reboiler"
-msgstr "Kettle Reboiler"
+msgid "Tray Column, simple"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:27
-msgid "Knock-out Drum (with demister pad)"
-msgstr "Knock-out Drum (with demister pad)"
+msgid "Tray Column, detailed"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:28
-msgid "Measurement"
-msgstr "åéè"
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Fluid Contacting Vessel, simple"
 
 #: ../sheets/ChemEng.sheet.in.h:29
-msgid "Mixer"
-msgstr "æåå"
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "Reactor or Absorption Vessel, simple"
 
 #: ../sheets/ChemEng.sheet.in.h:30
-msgid "Open Tank"
-msgstr "éæææ"
+msgid "Autoclave"
+msgstr "èææè"
 
 #: ../sheets/ChemEng.sheet.in.h:31
-msgid "Plate Exchanger"
-msgstr "åæåäæå"
+msgid "Open Tank"
+msgstr "éæææ"
 
 #: ../sheets/ChemEng.sheet.in.h:32
-msgid "Pneumatic Line"
-msgstr "çæåååç"
+msgid "Clarifier or Settling Tank"
+msgstr "æå/æææ"
 
 #: ../sheets/ChemEng.sheet.in.h:33
-msgid "Pneumatic Line, vertical"
-msgstr "çæåååçïåç"
+msgid "Sealed Tank"
+msgstr "ååææ"
 
 #: ../sheets/ChemEng.sheet.in.h:34
-msgid "Positive Displacement Rotary Pump or Compressor"
-msgstr "Positive Displacement Rotary Pump or Compressor"
+msgid "Covered tank"
+msgstr "åèåææ"
 
 #: ../sheets/ChemEng.sheet.in.h:35
-msgid "Reactor or Absorption Vessel, simple"
-msgstr "Reactor or Absorption Vessel, simple"
+msgid "Tank with Fixed Roof"
+msgstr "ååéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:36
-msgid "Reciprocating Compressor or Pump"
-msgstr "ååååçæææ"
+msgid "Tank with Floating Roof"
+msgstr "æåéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:37
-msgid "Regulable Valve"
-msgstr "åèæåé"
+msgid "Storage Sphere"
+msgstr "çååæ"
 
 #: ../sheets/ChemEng.sheet.in.h:38
-msgid "Regulable Valve, vertical"
-msgstr "åèæåéïåç"
+msgid "Gas Holder, basic"
+msgstr "Gas Holder, basic"
 
 #: ../sheets/ChemEng.sheet.in.h:39
-msgid "Sealed Tank"
-msgstr "ååææ"
+msgid "Centrifugal Pump or Fan"
+msgstr "éååææéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:40
-msgid "Simple Furnace"
-msgstr "çæç"
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "Positive Displacement Rotary Pump or Compressor"
 
 #: ../sheets/ChemEng.sheet.in.h:41
-msgid "Simple Heat Exchanger"
-msgstr "çæçäæå"
+msgid "Reciprocating Compressor or Pump"
+msgstr "ååååçæææ"
 
 #: ../sheets/ChemEng.sheet.in.h:42
-msgid "Simple Heat Exchanger, vertical"
-msgstr "çæçäæåïåç"
+msgid "Axial Flow Fan"
+msgstr "èåæææ"
 
 #: ../sheets/ChemEng.sheet.in.h:43
-msgid "Simple Vessel"
-msgstr "çæåå"
+msgid "Compressor or Turbine"
+msgstr "éæååçæ/ææåæè"
 
 #: ../sheets/ChemEng.sheet.in.h:44
-msgid "Spray Drier"
-msgstr "åéäçæ"
+msgid "Ejector or Injector"
+msgstr "åååææåå"
 
 #: ../sheets/ChemEng.sheet.in.h:45
-msgid "Spraying Device"
-msgstr "åéèç"
+msgid "AC Generator"
+msgstr "äæçéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:46
-msgid "Storage Sphere"
-msgstr "çååæ"
+msgid "Valve"
+msgstr "é"
 
 #: ../sheets/ChemEng.sheet.in.h:47
-msgid "Tank with Fixed Roof"
-msgstr "ååéæ"
+msgid "Valve, vertical"
+msgstr "éïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:48
-msgid "Tank with Floating Roof"
-msgstr "æåéæ"
+msgid "Regulable Valve"
+msgstr "åèæåé"
 
 #: ../sheets/ChemEng.sheet.in.h:49
-msgid "Tray Column, detailed"
-msgstr ""
+msgid "Regulable Valve, vertical"
+msgstr "åèæåéïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:50
-msgid "Tray Column, simple"
-msgstr ""
+msgid "Basic Filter"
+msgstr "åæéæå"
 
 #: ../sheets/ChemEng.sheet.in.h:51
-msgid "Valve"
-msgstr "é"
+msgid "Mixer"
+msgstr "æåå"
 
 #: ../sheets/ChemEng.sheet.in.h:52
-msgid "Valve, vertical"
-msgstr "éïåç"
+msgid "Cyclone and hydrocyclone"
+msgstr "Cyclone è hydrocyclone"
 
 #: ../sheets/ChemEng.sheet.in.h:53
-msgid "Water Cooler"
-msgstr "æååæçå"
+msgid "Spray Drier"
+msgstr "åéäçæ"
 
 #: ../sheets/ChemEng.sheet.in.h:54
-msgid "Water Cooler, vertical"
-msgstr "æååæçåïåç"
+msgid "Centrifuge"
+msgstr "éåæ"
+
+#: ../sheets/ChemEng.sheet.in.h:55
+msgid "Pressure Relief Valve"
+msgstr "æåé"
+
+#: ../sheets/chronogram.sheet.in.h:1
+msgid "Chronogram"
+msgstr "åäè"
+
+#: ../sheets/chronogram.sheet.in.h:2
+msgid "Objects to design chronogram charts"
+msgstr "èèåäèæçççä"
+
+#: ../sheets/chronogram.sheet.in.h:3
+msgid "Time scale"
+msgstr "æéç"
+
+#: ../sheets/chronogram.sheet.in.h:4
+msgid "Data line"
+msgstr "èæç"
 
 #: ../sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
@@ -6577,3186 +7077,3795 @@ msgid "Components for circuit diagrams"
 msgstr "éèåçåä"
 
 #: ../sheets/Circuit.sheet.in.h:3
-msgid "Ground point"
-msgstr "æåäç"
+msgid "Vertically aligned resistor"
+msgstr "åçæççéé"
 
 #: ../sheets/Circuit.sheet.in.h:4
-msgid "Horizontal jumper"
-msgstr "æåæççèæç"
+msgid "Horizontally aligned inductor"
+msgstr "æåæççåé"
 
 #: ../sheets/Circuit.sheet.in.h:5
-msgid "Horizontally aligned LED"
-msgstr "æåæçç LED"
+msgid "Vertically aligned inductor"
+msgstr "æåæççéæå"
 
 #: ../sheets/Circuit.sheet.in.h:6
-msgid "Horizontally aligned capacitor"
-msgstr "æåæççéå"
+msgid "Horizontally aligned resistor"
+msgstr "æåæççéé"
 
 #: ../sheets/Circuit.sheet.in.h:7
-msgid "Horizontally aligned diode"
-msgstr "æåæççäæç"
+msgid "Vertically aligned resistor (European)"
+msgstr "åçæççéé (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:8
-msgid "Horizontally aligned fuse"
-msgstr "æåæççäéç"
+msgid "Horizontally aligned inductor (European)"
+msgstr "æåæççåé (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:9
-msgid "Horizontally aligned inductor"
-msgstr "æåæççåé"
+msgid "Vertically aligned inductor (European)"
+msgstr "æåæççéæå (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:10
-msgid "Horizontally aligned inductor (European)"
-msgstr "æåæççåé (æå)"
+msgid "Horizontally aligned resistor (European)"
+msgstr "æåæççéé (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
-msgstr "æåæççéæ"
+msgid "Horizontally aligned capacitor"
+msgstr "æåæççéå"
 
 #: ../sheets/Circuit.sheet.in.h:12
-msgid "Horizontally aligned resistor"
-msgstr "æåæççéé"
-
-#: ../sheets/Circuit.sheet.in.h:13
-msgid "Horizontally aligned resistor (European)"
-msgstr "æåæççéé (æå)"
-
-#: ../sheets/Circuit.sheet.in.h:14
-msgid "Horizontally aligned zener diode"
-msgstr "æåæççéçäæç"
+msgid "Vertically aligned capacitor"
+msgstr "åçæççéå"
 
+#.
+#.
 #: ../sheets/Circuit.sheet.in.h:15
-msgid "Lamp"
-msgstr "ç"
-
-#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
-msgid "Microphone"
-msgstr "éåé"
-
-#: ../sheets/Circuit.sheet.in.h:17
-msgid "NMOS transistor"
-msgstr "NMOS éæé"
+msgid "NPN bipolar transistor"
+msgstr "NPN äæéæé"
 
 #.
 #.
+#: ../sheets/Circuit.sheet.in.h:18
+msgid "PNP bipolar transistor"
+msgstr "PNP äæéæé"
+
+#: ../sheets/Circuit.sheet.in.h:19
+msgid "Horizontally aligned diode"
+msgstr "æåæççäæç"
+
 #: ../sheets/Circuit.sheet.in.h:20
-msgid "NPN bipolar transistor"
-msgstr "NPN äæéæé"
+msgid "Vertically aligned diode"
+msgstr "åçæççäæç"
 
 #: ../sheets/Circuit.sheet.in.h:21
-msgid "Operational amplifier"
-msgstr "éçæåå"
+msgid "Horizontally aligned zener diode"
+msgstr "æåæççéçäæç"
 
 #: ../sheets/Circuit.sheet.in.h:22
-msgid "PMOS transistor"
-msgstr "PMOS éæé"
+msgid "Vertically aligned zener diode"
+msgstr "åçæççéçäæç"
+
+#: ../sheets/Circuit.sheet.in.h:23
+msgid "Ground point"
+msgstr "æåäç"
+
+#: ../sheets/Circuit.sheet.in.h:24
+msgid "Operational amplifier"
+msgstr "éçæåå"
 
-#.
-#.
 #: ../sheets/Circuit.sheet.in.h:25
-msgid "PNP bipolar transistor"
-msgstr "PNP äæéæé"
+msgid "Horizontally aligned fuse"
+msgstr "æåæççäéç"
 
-#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
-msgid "Speaker"
-msgstr "æèå"
+#: ../sheets/Circuit.sheet.in.h:26
+msgid "Vertically aligned fuse"
+msgstr "åçæççäéç"
 
 #: ../sheets/Circuit.sheet.in.h:27
-msgid "Vertically aligned LED"
-msgstr "åçæçç LED"
+msgid "Horizontally aligned power source"
+msgstr "æåæççéæ"
 
 #: ../sheets/Circuit.sheet.in.h:28
-msgid "Vertically aligned capacitor"
-msgstr "åçæççéå"
+msgid "Vertically aligned power source"
+msgstr "åçæççéæ"
 
 #: ../sheets/Circuit.sheet.in.h:29
-msgid "Vertically aligned diode"
-msgstr "åçæççäæç"
+msgid "Lamp"
+msgstr "ç"
 
-#: ../sheets/Circuit.sheet.in.h:30
-msgid "Vertically aligned fuse"
-msgstr "åçæççäéç"
+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
+msgid "Speaker"
+msgstr "æèå"
 
-#: ../sheets/Circuit.sheet.in.h:31
-msgid "Vertically aligned inductor"
-msgstr "æåæççéæå"
+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
+msgid "Microphone"
+msgstr "éåé"
 
 #: ../sheets/Circuit.sheet.in.h:32
-msgid "Vertically aligned inductor (European)"
-msgstr "æåæççéæå (æå)"
+msgid "Horizontally aligned LED"
+msgstr "æåæçç LED"
 
 #: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
-msgstr "åçæççéæ"
+msgid "Vertically aligned LED"
+msgstr "åçæçç LED"
 
 #: ../sheets/Circuit.sheet.in.h:34
-msgid "Vertically aligned resistor"
-msgstr "åçæççéé"
+msgid "NMOS transistor"
+msgstr "NMOS éæé"
 
 #: ../sheets/Circuit.sheet.in.h:35
-msgid "Vertically aligned resistor (European)"
-msgstr "åçæççéé (æå)"
+msgid "PMOS transistor"
+msgstr "PMOS éæé"
 
 #: ../sheets/Circuit.sheet.in.h:36
-msgid "Vertically aligned zener diode"
-msgstr "åçæççéçäæç"
-
-#: ../sheets/Contact.sheet.in.h:1
-msgid "'if not' (normally closed) ladder contact"
-msgstr "'if not' (éåçéé) éæ ladder æè"
+msgid "Horizontal jumper"
+msgstr "æåæççèæç"
 
-#: ../sheets/Contact.sheet.in.h:2
-msgid "'if' (normally open) ladder contact"
-msgstr "'if' (éåçéå) éæ ladder æè"
+#: ../sheets/Circuit.sheet.in.h:37
+msgid "Horizontal xtal"
+msgstr "æåæççæé"
 
-#: ../sheets/Contact.sheet.in.h:3
-msgid "'jump' output variable"
-msgstr "'jump' èåèæ"
+#: ../sheets/Circuit.sheet.in.h:38
+msgid "Vertical xtal"
+msgstr "åçæççæé"
 
-#: ../sheets/Contact.sheet.in.h:4
-msgid "'reset' output variable"
-msgstr "'reset' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:1
+msgid "Cisco â Computer"
+msgstr "Cisco â éè"
 
-#: ../sheets/Contact.sheet.in.h:5
-msgid "'set' output variable"
-msgstr "'set' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:2
+msgid "Computer shapes by Cisco"
+msgstr "Cisco éèåå"
 
-#: ../sheets/Contact.sheet.in.h:6
-msgid "Components for LADDER circuits"
-msgstr "LADDER éèçåä"
+#: ../sheets/ciscocomputer.sheet.in.h:3
+msgid "PC"
+msgstr "PC"
 
-#: ../sheets/Contact.sheet.in.h:7
-msgid "Ladder"
-msgstr "Ladder"
+#: ../sheets/ciscocomputer.sheet.in.h:4
+msgid "Macintosh"
+msgstr "ééå"
 
-#: ../sheets/Contact.sheet.in.h:8
-msgid "Negative output variable"
-msgstr "èåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:5
+msgid "Terminal"
+msgstr "ççæ"
 
-#: ../sheets/Contact.sheet.in.h:9
-msgid "Power-saved 'reset' output variable"
-msgstr "çè 'reset' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:6
+msgid "SUN workstation"
+msgstr "SUN åäç"
 
-#: ../sheets/Contact.sheet.in.h:10
-msgid "Power-saved 'set' output variable"
-msgstr "çè 'set' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:7
+msgid "CiscoWorks workstation"
+msgstr "CiscoWorks åäç"
 
-#: ../sheets/Contact.sheet.in.h:11
-msgid "Power-saved negative output variable"
-msgstr "çèèåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:8
+msgid "PC Router Card"
+msgstr "PC èçåå"
 
-#: ../sheets/Contact.sheet.in.h:12
-msgid "Power-saved simple output variable"
-msgstr "çèçåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:9
+msgid "PC Software"
+msgstr "PC èä"
 
-#: ../sheets/Contact.sheet.in.h:13
-msgid "Receptivity output variable"
-msgstr "Receptivity èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:10
+msgid "PC with Router-Based Software"
+msgstr "åèçèäç PC"
 
-#: ../sheets/Contact.sheet.in.h:14
-msgid "Simple output variable"
-msgstr "çåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:11
+msgid "Workgroup director"
+msgstr "åäçççç"
 
-#: ../sheets/Cybernetics.sheet.in.h:1
-msgid "Constant factor below -1"
-msgstr "ååçæåæ -1"
+#: ../sheets/ciscocomputer.sheet.in.h:12
+msgid "CiscoSecurity"
+msgstr "CiscoSecurity"
 
-#: ../sheets/Cybernetics.sheet.in.h:2
-msgid "Constant factor between 0 and -1"
-msgstr "ååçæäæ 0 å -1"
+#: ../sheets/ciscocomputer.sheet.in.h:13
+msgid "Cisco CA"
+msgstr "Cisco CA"
 
-#: ../sheets/Cybernetics.sheet.in.h:3
-msgid "Constant factor between 0 and 1"
-msgstr "ååçæäæ 0 å 1"
+#: ../sheets/ciscocomputer.sheet.in.h:14
+msgid "WWW server"
+msgstr "WWW äæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Constant factor greater 1"
-msgstr "ååçæåæ 1"
+#: ../sheets/ciscocomputer.sheet.in.h:15
+msgid "Web browser"
+msgstr "çéçèå"
 
-#: ../sheets/Cybernetics.sheet.in.h:5
-msgid "Constant negative shift on the y-axis"
-msgstr "y èçèååç"
+#: ../sheets/ciscocomputer.sheet.in.h:16
+msgid "File Server"
+msgstr "ææäæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Constant positive shift on the y-axis"
-msgstr "y èçæååç"
-
-#: ../sheets/Cybernetics.sheet.in.h:7
-msgid "Cybernetics"
-msgstr "æåè"
+#: ../sheets/ciscocomputer.sheet.in.h:17
+msgid "Software-Based Router on File Server"
+msgstr "ææäæåäçèäèçå"
 
-#: ../sheets/Cybernetics.sheet.in.h:8
-msgid "Elements of cybernetic circuits"
-msgstr "æåéèåçåä"
+#: ../sheets/ciscocomputer.sheet.in.h:18
+msgid "Server with PC Router"
+msgstr "å PC èççäæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:9
-msgid "Full wave rectifier (absolute value)"
-msgstr "åæææå(çåå)"
+#: ../sheets/ciscocomputer.sheet.in.h:19
+msgid "IBM Tower"
+msgstr "IBM Tower"
 
-#: ../sheets/Cybernetics.sheet.in.h:10
-msgid "Half wave rectifier or ramp input"
-msgstr "åæææåæ ramp èå"
+#: ../sheets/ciscocomputer.sheet.in.h:20
+msgid "IBM Mini (AS400)"
+msgstr "IBM Mini (AS400)"
 
-#: ../sheets/Cybernetics.sheet.in.h:11
-msgid "High pass filter"
-msgstr "ééææå"
+#: ../sheets/ciscocomputer.sheet.in.h:21
+msgid "Front End Processor"
+msgstr "åçèçå"
 
-#: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
-msgstr "çåå - èå(ä)"
+#: ../sheets/ciscocomputer.sheet.in.h:22
+msgid "IBM mainframe"
+msgstr "IBM mainframe"
 
-#: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator - input left"
-msgstr "çåå - èå(å)"
+#: ../sheets/ciscocomputer.sheet.in.h:23
+msgid "IBM mainframe with FEP"
+msgstr "IBM mainframe (å FEP)"
 
-#: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator - input right"
-msgstr "çåå - èå(å)"
+#: ../sheets/ciscocomputer.sheet.in.h:24
+msgid "HP Mini"
+msgstr "HP Mini"
 
-#: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator - input top"
-msgstr "çåå - èå(ä)"
+#: ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Supercomputer"
+msgstr "èçéè"
 
-#: ../sheets/Cybernetics.sheet.in.h:16
-msgid "Low pass filter"
-msgstr "äéææå"
+#: ../sheets/ciscocomputer.sheet.in.h:26
+msgid "Web cluster"
+msgstr "çéåé"
 
-#: ../sheets/Cybernetics.sheet.in.h:17
-msgid "Product"
-msgstr "ç"
+#: ../sheets/ciscocomputer.sheet.in.h:27
+msgid "Mini VAX"
+msgstr "Mini VAX"
 
-#: ../sheets/Cybernetics.sheet.in.h:18
-msgid "Relay characteristic (sigma)"
-msgstr "çéåçæ(Î)"
+#: ../sheets/ciscocomputer.sheet.in.h:28
+msgid "PC Card"
+msgstr "PC Card"
 
-#: ../sheets/Cybernetics.sheet.in.h:19
-msgid "Saturation characteristic"
-msgstr "éåçæ"
+#: ../sheets/ciscocomputer.sheet.in.h:29 ../sheets/Lights.sheet.in.h:14
+msgid "Scanner"
+msgstr "ææå"
 
-#: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
-msgstr "åæå - ä"
+#: ../sheets/ciscocomputer.sheet.in.h:30
+msgid "Tablet"
+msgstr "åæéè"
 
-#: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
-msgstr "åæå - å"
+#: ../sheets/ciscocomputer.sheet.in.h:31
+msgid "EtherClient"
+msgstr "äååæç"
 
-#: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
-msgstr "åæå - å"
+#: ../sheets/ciscocomputer.sheet.in.h:32
+msgid "Handheld"
+msgstr "ææåèç"
 
-#: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
-msgstr "åæå - ä"
+#: ../sheets/ciscocomputer.sheet.in.h:33
+msgid "Wireless"
+msgstr "çççç"
 
-#: ../sheets/Cybernetics.sheet.in.h:24
-msgid "Sigmoid characteristic"
-msgstr "éåæçæ"
+#: ../sheets/ciscocomputer.sheet.in.h:34
+msgid "PDA"
+msgstr "PDA"
 
-#: ../sheets/Cybernetics.sheet.in.h:25
-msgid "Sine characteristic or input"
-msgstr "æåçææèå"
+#: ../sheets/ciscocomputer.sheet.in.h:35
+msgid "Newton"
+msgstr "Newton"
 
-#: ../sheets/Cybernetics.sheet.in.h:26
-msgid "Sum"
-msgstr "å"
+#: ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Laptop"
+msgstr "ææéè"
 
-#: ../sheets/Cybernetics.sheet.in.h:27
-msgid "Sum, subtracting bottom input"
-msgstr "åïæåäæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+msgid "Monitor"
+msgstr "èå"
 
-#: ../sheets/Cybernetics.sheet.in.h:28
-msgid "Sum, subtracting left input"
-msgstr "åïæååæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:39
+msgid "PC Video"
+msgstr "PC èå"
 
-#: ../sheets/Cybernetics.sheet.in.h:29
-msgid "Sum, subtracting right input"
-msgstr "åïæååæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:40
+msgid "Modem"
+msgstr "æææ"
 
-#: ../sheets/Cybernetics.sheet.in.h:30
-msgid "Sum, subtracting top input"
-msgstr "åïæåäæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:41
+msgid "BBS"
+msgstr "BBS"
 
-#: ../sheets/Cybernetics.sheet.in.h:31
-msgid "Template for custom characteristics"
-msgstr "èéçæçææ"
+#: ../sheets/ciscocomputer.sheet.in.h:42
+msgid "MicroWebserver"
+msgstr "ååçéäæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:32
-msgid "Time delay"
-msgstr "æéåé"
+#: ../sheets/ciscocomputer.sheet.in.h:43
+msgid "Relational Database"
+msgstr "éèåèæå"
 
-#: ../sheets/ER.sheet.in.h:2
-msgid "ER"
-msgstr "ER"
+#: ../sheets/ciscocomputer.sheet.in.h:44
+msgid "Diskette"
+msgstr "èçç"
 
-#: ../sheets/ER.sheet.in.h:3
-msgid "Editor for Entity Relations Diagrams"
-msgstr "åééäåçèå"
+#: ../sheets/ciscocomputer.sheet.in.h:45
+msgid "Host"
+msgstr "äæ"
 
-#: ../sheets/ER.sheet.in.h:5
-msgid "Participation"
-msgstr "åè"
+#: ../sheets/ciscocomputer.sheet.in.h:46
+msgid "Tape array"
+msgstr "çåéå"
 
-#: ../sheets/ER.sheet.in.h:7
-msgid "Weak entity"
-msgstr "ååé"
+#: ../sheets/ciscocomputer.sheet.in.h:47
+msgid "Disk subsystem"
+msgstr "ççåçç"
 
-#: ../sheets/Electric.sheet.in.h:1
-msgid "Components for electric circuits"
-msgstr "éèåçåä"
+#: ../sheets/ciscocomputer.sheet.in.h:48
+msgid "JBOD"
+msgstr "JBOD"
 
-#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
-msgid "Connection point"
-msgstr "éæé"
+#: ../sheets/ciscocomputer.sheet.in.h:49
+msgid "Storage array"
+msgstr "ååéå"
 
-#: ../sheets/Electric.sheet.in.h:3
-msgid "Electric"
-msgstr "éå"
+#: ../sheets/ciscocomputer.sheet.in.h:50
+msgid "FC Storage"
+msgstr "FC ååèç"
 
-#: ../sheets/Electric.sheet.in.h:4
-msgid "Lamp or indicator light (horizontal)"
-msgstr "çææçåæ(æå)"
+#: ../sheets/ciscocomputer.sheet.in.h:51
+msgid "PC Adapter Card"
+msgstr "PC éæå"
 
-#: ../sheets/Electric.sheet.in.h:5
-msgid "Lamp or indicator light (vertical)"
-msgstr "çææçåæ(åç)"
+#: ../sheets/ciscohub.sheet.in.h:1
+msgid "Cisco â Switch"
+msgstr "Cisco â äæå"
 
-#: ../sheets/Electric.sheet.in.h:6
-msgid "Normally closed contact (horizontal)"
-msgstr "äèææäééçèé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:2
+msgid "Router and switch shapes by Cisco"
+msgstr "ç Cisco æäçèçåèäæååå"
 
-#: ../sheets/Electric.sheet.in.h:7
-msgid "Normally closed contact (vertical)"
-msgstr "äèææäééçèé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:3
+msgid "Router"
+msgstr "èçå"
 
-#: ../sheets/Electric.sheet.in.h:8
-msgid "Normally closed position switch (horizontal)"
-msgstr "äèææäééçäçéé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:4
+msgid "Router subdued"
+msgstr "æåçèçå"
 
-#: ../sheets/Electric.sheet.in.h:9
-msgid "Normally closed position switch (vertical)"
-msgstr "äèææäééçäçéé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:5
+msgid "Router with Silicon Switch"
+msgstr "èçå (å Silicon Switch)"
 
-#: ../sheets/Electric.sheet.in.h:10
-msgid "Normally open contact (horizontal)"
-msgstr "äèææäéåçèé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:6
+msgid "NetFlow router"
+msgstr "NetFlow èçå"
 
-#: ../sheets/Electric.sheet.in.h:11
-msgid "Normally open contact (vertical)"
-msgstr "äèææäéåçèé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:7
+msgid "Broadband router"
+msgstr "åéèçå"
 
-#: ../sheets/Electric.sheet.in.h:12
-msgid "Normally open position switch (horizontal)"
-msgstr "äèææäéåçäçéé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:8
+msgid "Wavelength router"
+msgstr "æéèçå"
 
-#: ../sheets/Electric.sheet.in.h:13
-msgid "Normally open position switch (vertical)"
-msgstr "äèææäéåçäçéé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:9
+msgid "Wireless router"
+msgstr "ççèçå"
 
-#: ../sheets/Electric.sheet.in.h:14
-msgid "Relay (horizontal)"
-msgstr "çéå(æå)"
+#: ../sheets/ciscohub.sheet.in.h:10
+msgid "7507 Router"
+msgstr "7507 èçå"
 
-#: ../sheets/Electric.sheet.in.h:15
-msgid "Relay (vertical)"
-msgstr "çéå(åç)"
+#: ../sheets/ciscohub.sheet.in.h:11
+msgid "7505 Router"
+msgstr "7505 èçå"
 
-#: ../sheets/Electric.sheet.in.h:16
-msgid "The command organ of a relay (horizontal)"
-msgstr "çéååäåå(æå)"
+#: ../sheets/ciscohub.sheet.in.h:12
+msgid "7500ARS (7513) Router"
+msgstr "7500ARS (7513) èçå"
 
-#: ../sheets/Electric.sheet.in.h:17
-msgid "The command organ of a relay (vertical)"
-msgstr "çéååäåå(åç)"
+#: ../sheets/ciscohub.sheet.in.h:13
+msgid "Edge Label Switch Router with NetFlow"
+msgstr ""
 
-#: ../sheets/FS.sheet.in.h:1
-msgid "Editor for Function Structure Diagrams."
-msgstr "åæçæåèçèåã"
+#: ../sheets/ciscohub.sheet.in.h:14
+msgid "Edge Label Switch Router"
+msgstr "Edge Label Switch Router"
+
+#: ../sheets/ciscohub.sheet.in.h:15
+msgid "Router with Firewall"
+msgstr "åéçççèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:16
+msgid "Optical Services Router"
+msgstr "ååæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:17
+msgid "Content Router"
+msgstr "ååèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:18
+msgid "Carrier Routing System"
+msgstr "Carrier Routing System"
+
+#: ../sheets/ciscohub.sheet.in.h:19
+msgid "Storage Router"
+msgstr "ååèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:20
+msgid "NetSonar"
+msgstr "NetSonar"
+
+#: ../sheets/ciscohub.sheet.in.h:21
+msgid "Hub"
+msgstr "éçå"
+
+#: ../sheets/ciscohub.sheet.in.h:22
+msgid "Hub subdued"
+msgstr "æååéçå"
+
+#: ../sheets/ciscohub.sheet.in.h:23
+msgid "Cisco Hub"
+msgstr "Cisco éçå"
+
+#: ../sheets/ciscohub.sheet.in.h:24
+msgid "Small Hub"
+msgstr "ååéçå"
+
+#: ../sheets/ciscohub.sheet.in.h:25
+msgid "100BaseT Hub"
+msgstr "100BaseT éçå"
+
+#: ../sheets/ciscohub.sheet.in.h:26
+msgid "Workgroup switch"
+msgstr "Workgroup äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:27
+msgid "Workgroup switch Subdued"
+msgstr "Workgroup æååäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:28
+msgid "Workgroup Switch Voice-Enabled"
+msgstr "Workgroup äæåïèéï"
+
+#: ../sheets/ciscohub.sheet.in.h:29
+msgid "BBSM"
+msgstr "BBSM"
+
+#: ../sheets/ciscohub.sheet.in.h:30
+msgid "ATM Tag Switch Router"
+msgstr "ATM æèäæèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:31
+msgid "Switch Processor"
+msgstr "äæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:32
+msgid "Route Switch Processor"
+msgstr "èçäæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:33
+msgid "Route Switch Processor with Si"
+msgstr "èçäæåèçåïå Siï"
+
+#: ../sheets/ciscohub.sheet.in.h:34
+msgid "PXF"
+msgstr "PXF"
+
+#: ../sheets/ciscohub.sheet.in.h:35
+msgid "ASIC Processor"
+msgstr "ASIC èçå"
+
+#: ../sheets/ciscohub.sheet.in.h:36
+msgid "Generic Processor"
+msgstr "äèèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:37
+msgid "Data Center Switch"
+msgstr "èæäåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:38
+msgid "Data Center Switch Reversed"
+msgstr "èæäåäæåïååï"
+
+#: ../sheets/ciscohub.sheet.in.h:39
+msgid "Data Switch Processor"
+msgstr "èæäæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:40
+msgid "Content Switch"
+msgstr "ååäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:41
+msgid "Content Service Module"
+msgstr "ååæåæç"
+
+#: ../sheets/ciscohub.sheet.in.h:42
+msgid "CSM-S"
+msgstr "CSM-S"
+
+#: ../sheets/ciscohub.sheet.in.h:43
+msgid "Access Gateway"
+msgstr "ååéèé"
+
+#: ../sheets/ciscohub.sheet.in.h:44
+msgid "ATM Switch"
+msgstr "ATM äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:45
+msgid "ATM 3800"
+msgstr "ATM 3800"
+
+#: ../sheets/ciscohub.sheet.in.h:46
+msgid "Cisco 1000"
+msgstr "Cisco 1000"
+
+#: ../sheets/ciscohub.sheet.in.h:47
+msgid "ISDN switch"
+msgstr "ISDN äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:48
+msgid "Label Switch Router"
+msgstr "æçäæåèïçå"
+
+#: ../sheets/ciscohub.sheet.in.h:49
+msgid "MultiSwitch Device"
+msgstr "MultiSwitch èç"
+
+#: ../sheets/ciscohub.sheet.in.h:50
+msgid "LAN2LAN Switch"
+msgstr "LAN2LAN äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:51
+msgid "Multilayer Switch"
+msgstr "Multilayer äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:52
+msgid "Multilayer Switch with Silicon"
+msgstr "Multilayer äæå (å Silicon)"
+
+#: ../sheets/ciscohub.sheet.in.h:53
+msgid "Multilayer Switch with Silicon subdued"
+msgstr "Multilayer äæå (å Siliconïæå)"
+
+#: ../sheets/ciscohub.sheet.in.h:54
+msgid "Programmable Switch"
+msgstr "åçååäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:55
+msgid "Content Service Switch 1100"
+msgstr "ååæåäæå 1100"
+
+#: ../sheets/ciscohub.sheet.in.h:56
+msgid "ATM Fast Gigabit Etherswitch"
+msgstr "ATM Fast Gigabit Etherswitch"
+
+#: ../sheets/ciscohub.sheet.in.h:57
+msgid "RateMUX"
+msgstr "RateMUX"
+
+#: ../sheets/ciscohub.sheet.in.h:58
+msgid "Workgroup 5500"
+msgstr "Workgroup 5500"
+
+#: ../sheets/ciscohub.sheet.in.h:59
+msgid "Workgroup 5000"
+msgstr "Workgroup 5000"
+
+#: ../sheets/ciscohub.sheet.in.h:60
+msgid "Workgroup 5002"
+msgstr "Workgroup 5002"
+
+#: ../sheets/ciscohub.sheet.in.h:61
+msgid "NetRanger"
+msgstr "NetRanger"
+
+#: ../sheets/ciscohub.sheet.in.h:62
+msgid "MGX 8220"
+msgstr "MGX 8220"
+
+#: ../sheets/ciscohub.sheet.in.h:63
+msgid "MGX 8240"
+msgstr "MGX 8240"
+
+#: ../sheets/ciscohub.sheet.in.h:64
+msgid "MGX 8260"
+msgstr "MGX 8260"
+
+#: ../sheets/ciscohub.sheet.in.h:65
+msgid "Universal Gateway"
+msgstr "éçéèé"
+
+#: ../sheets/ciscohub.sheet.in.h:66
+msgid "iSCSI switch"
+msgstr "iSCSI äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:67
+msgid "Workgroup Fibre Channel intelligent switch"
+msgstr "Workgroup åçééææåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:68
+msgid "Director-class Fibre Channel intelligent switch"
+msgstr ""
+
+#: ../sheets/ciscohub.sheet.in.h:69
+msgid "Multi-Fabric Server Switch"
+msgstr "Multi-Fabric äæåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:70
+msgid "Server Switch"
+msgstr "äæåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:71
+msgid "Multilayer Remote Switch"
+msgstr "Multilayer éçäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:72
+msgid "Layer 2 Remote Switch"
+msgstr "Layer 2 éçäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:73
+msgid "Virtual Layer Switch"
+msgstr "Virtual Layer äæå"
+
+#: ../sheets/ciscomisc.sheet.in.h:1
+msgid "Cisco â Miscellaneous"
+msgstr "Cisco â åä"
+
+#: ../sheets/ciscomisc.sheet.in.h:2
+msgid "Miscellaneous shapes by Cisco"
+msgstr "Cisco æäçåååå"
+
+#: ../sheets/ciscomisc.sheet.in.h:3
+msgid "Government Building"
+msgstr "æååç"
+
+#: ../sheets/ciscomisc.sheet.in.h:4
+msgid "University"
+msgstr "åå"
+
+#: ../sheets/ciscomisc.sheet.in.h:5
+msgid "Small Business"
+msgstr "ååå"
+
+#: ../sheets/ciscomisc.sheet.in.h:6
+msgid "Home office"
+msgstr "ååèåå"
+
+#: ../sheets/ciscomisc.sheet.in.h:7
+msgid "Branch office"
+msgstr "åæèåå"
+
+#: ../sheets/ciscomisc.sheet.in.h:8
+msgid "Branch office subdued"
+msgstr "æåçåæèåå"
+
+#: ../sheets/ciscomisc.sheet.in.h:9
+msgid "Branch office blue"
+msgstr "åæèååè"
+
+#: ../sheets/ciscomisc.sheet.in.h:10
+msgid "Generic Building"
+msgstr "äèåç"
+
+#: ../sheets/ciscomisc.sheet.in.h:11
+msgid "Generic Building subdued"
+msgstr "äèåçïæåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:12
+msgid "Generic Building blue"
+msgstr "äèåçïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:13
+msgid "Medium Building"
+msgstr "äååç"
+
+#: ../sheets/ciscomisc.sheet.in.h:14
+msgid "Medium Building subdued"
+msgstr "äååçïæåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:15
+msgid "Medium Building blue"
+msgstr "äååçïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:16
+msgid "House"
+msgstr "äå"
+
+#: ../sheets/ciscomisc.sheet.in.h:17
+msgid "House blue"
+msgstr "äåïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:18
+msgid "Telecommuter house"
+msgstr "éåéåæäå"
+
+#: ../sheets/ciscomisc.sheet.in.h:19
+msgid "Telecommuter house subdued"
+msgstr "æåçéåéåæäå"
+
+#: ../sheets/ciscomisc.sheet.in.h:20
+msgid "MDU"
+msgstr "MDU"
+
+#: ../sheets/ciscomisc.sheet.in.h:21
+msgid "Man"
+msgstr "çä"
+
+#: ../sheets/ciscomisc.sheet.in.h:22
+msgid "Man red"
+msgstr "çäïçèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:23
+msgid "Man gold"
+msgstr "çäïéèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:24
+msgid "Man blue"
+msgstr "çäïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:25
+msgid "Standing Man"
+msgstr "ççççä"
+
+#: ../sheets/ciscomisc.sheet.in.h:26
+msgid "Standing woman"
+msgstr "çççåä"
+
+#: ../sheets/ciscomisc.sheet.in.h:27
+msgid "Woman"
+msgstr "åä"
+
+#: ../sheets/ciscomisc.sheet.in.h:28
+msgid "Woman red"
+msgstr "åäïçèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:29
+msgid "Woman gold"
+msgstr "åäïéèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:30
+msgid "Woman blue"
+msgstr "åäïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:31
+msgid "Running man"
+msgstr "èæççä"
+
+#: ../sheets/ciscomisc.sheet.in.h:32
+msgid "Running man subdued"
+msgstr "èæççäïæåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:33
+msgid "Telecommuter"
+msgstr "éåéåæ"
+
+#: ../sheets/ciscomisc.sheet.in.h:34
+msgid "Running woman"
+msgstr "èæçåä"
+
+#: ../sheets/ciscomisc.sheet.in.h:35
+msgid "CiscoWorks Man"
+msgstr "CiscoWorks çä"
+
+#: ../sheets/ciscomisc.sheet.in.h:36
+msgid "PC Man left"
+msgstr "PC çäïåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:37
+msgid "PC Man"
+msgstr "PC çä"
+
+#: ../sheets/ciscomisc.sheet.in.h:38
+msgid "Sitting Woman"
+msgstr "åççåä"
+
+#: ../sheets/ciscomisc.sheet.in.h:39
+msgid "Sitting Woman right"
+msgstr "åççåäïåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:40
+msgid "Mac Woman"
+msgstr "Mac åä"
+
+#: ../sheets/ciscomisc.sheet.in.h:41
+msgid "Androgynous Person"
+msgstr "ééåéçä"
+
+#: ../sheets/ciscomisc.sheet.in.h:44
+msgid "Lock and Key"
+msgstr "éèåçå"
+
+#: ../sheets/ciscomisc.sheet.in.h:45
+msgid "Satellite dish"
+msgstr "èæåç"
+
+#: ../sheets/ciscomisc.sheet.in.h:46
+msgid "Satellite"
+msgstr "èæ"
+
+#: ../sheets/ciscomisc.sheet.in.h:47
+msgid "Antenna"
+msgstr "åç"
+
+#: ../sheets/ciscomisc.sheet.in.h:48
+msgid "File cabinet"
+msgstr "æææ"
+
+#: ../sheets/ciscomisc.sheet.in.h:49
+msgid "Car"
+msgstr "è"
+
+#: ../sheets/ciscomisc.sheet.in.h:50
+msgid "Truck"
+msgstr "åè"
+
+#: ../sheets/ciscomisc.sheet.in.h:51
+msgid "Video Camera"
+msgstr "èåæåæ"
+
+#: ../sheets/ciscomisc.sheet.in.h:52
+msgid "Video Camera right"
+msgstr "èåæåæïåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:54
+msgid "Headphones"
+msgstr "èæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:1
+msgid "Cisco â Network"
+msgstr "Cisco â çç"
+
+#: ../sheets/cisconetwork.sheet.in.h:2
+msgid "Network shapes by Cisco"
+msgstr "Cisco ççåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:3
+msgid "Network Management"
+msgstr "çççç"
+
+#: ../sheets/cisconetwork.sheet.in.h:4
+msgid "Detector"
+msgstr "åæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:5
+msgid "Protocol Translator"
+msgstr "ååèèå"
+
+#: ../sheets/cisconetwork.sheet.in.h:6
+msgid "IP"
+msgstr "IP"
+
+#: ../sheets/cisconetwork.sheet.in.h:7
+msgid "IP Old-style"
+msgstr "IP èå"
+
+#: ../sheets/cisconetwork.sheet.in.h:8
+msgid "NAT"
+msgstr "NAT"
+
+#: ../sheets/cisconetwork.sheet.in.h:9
+msgid "VIP"
+msgstr "VIP"
+
+#: ../sheets/cisconetwork.sheet.in.h:10
+msgid "Terminal Server"
+msgstr "ççäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:11
+msgid "Access Server"
+msgstr "ååäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:12
+msgid "System controller"
+msgstr "ççæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:13
+msgid "Directory Server"
+msgstr "çéäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:14
+msgid "Firewall"
+msgstr "éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:15
+msgid "Firewall subdued"
+msgstr "éççïæåï"
+
+#: ../sheets/cisconetwork.sheet.in.h:16
+msgid "Firewall horizontal"
+msgstr "éççïæåï"
+
+#: ../sheets/cisconetwork.sheet.in.h:17
+msgid "Firewall Service Module"
+msgstr "éççæåæç"
+
+#: ../sheets/cisconetwork.sheet.in.h:18
+msgid "IOS Firewall"
+msgstr "IOS éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:19
+msgid "PIX Firewall"
+msgstr "PIX éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:20
+msgid "PIX Firewall Left"
+msgstr "PIX éççïåï"
+
+#: ../sheets/cisconetwork.sheet.in.h:21
+msgid "Centri Firewall"
+msgstr "Centri éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:23
+msgid "Security appliance"
+msgstr "äååå"
+
+#: ../sheets/cisconetwork.sheet.in.h:24
+msgid "VPN Concentrator"
+msgstr "VPN Concentrator"
+
+#: ../sheets/cisconetwork.sheet.in.h:25
+msgid "VPN Gateway"
+msgstr "VPN éèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:26
+msgid "LAN to LAN"
+msgstr "LAN to LAN"
+
+#: ../sheets/cisconetwork.sheet.in.h:27
+msgid "SSL Terminator"
+msgstr "SSL ççæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:28
+msgid "IP DSL Switch"
+msgstr "IP DSL äæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:29
+msgid "DSLAM"
+msgstr "DSLAM"
+
+#: ../sheets/cisconetwork.sheet.in.h:30
+msgid "Cable Modem"
+msgstr "ççæææ"
+
+#: ../sheets/cisconetwork.sheet.in.h:31
+msgid "Wireless Connectivity"
+msgstr "ççççéç"
+
+#: ../sheets/cisconetwork.sheet.in.h:32
+msgid "Wireless Transport"
+msgstr "ççèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:33
+msgid "AccessPoint"
+msgstr "ååé"
+
+#: ../sheets/cisconetwork.sheet.in.h:34
+msgid "Wireless Bridge"
+msgstr "ççææå"
+
+#: ../sheets/cisconetwork.sheet.in.h:35
+msgid "Dual Mode AccessPoint"
+msgstr "éæåååé"
+
+#: ../sheets/cisconetwork.sheet.in.h:36
+msgid "Wi-Fi Tag"
+msgstr "Wi-Fi èè"
+
+#: ../sheets/cisconetwork.sheet.in.h:37
+msgid "Wireless Location Appliance"
+msgstr "ççäçåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:38
+msgid "Location server"
+msgstr "äçäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:39
+msgid "Lightweight AP"
+msgstr "èå AP"
 
-#: ../sheets/FS.sheet.in.h:2
-msgid "FS"
-msgstr "FS"
+#: ../sheets/cisconetwork.sheet.in.h:40
+msgid "WLAN controller"
+msgstr "ççççæåå"
 
-#: ../sheets/FS.sheet.in.h:3
-msgid "Flow"
-msgstr "æç"
+#: ../sheets/cisconetwork.sheet.in.h:41
+msgid "BBFW"
+msgstr "BBFW"
 
-#: ../sheets/FS.sheet.in.h:4
-msgid "Function"
-msgstr "åæ"
+#: ../sheets/cisconetwork.sheet.in.h:42
+msgid "BBFW media"
+msgstr "BBFW åé"
 
-#: ../sheets/FS.sheet.in.h:5
-msgid "Orthogonal polyline flow"
+#: ../sheets/cisconetwork.sheet.in.h:43
+msgid "Channelized Pipe"
+msgstr "ééåçé"
+
+#: ../sheets/cisconetwork.sheet.in.h:44
+msgid "Concatenated Payload"
 msgstr ""
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:2
-msgid "Collate"
-msgstr "æå"
+#: ../sheets/cisconetwork.sheet.in.h:45
+msgid "Optical Cross-Connect"
+msgstr "ååäåéæ"
 
-#: ../sheets/Flowchart.sheet.in.h:3
-msgid "Connector"
-msgstr "éæå"
+#: ../sheets/cisconetwork.sheet.in.h:46
+msgid "Optical Transport"
+msgstr "åååè"
 
-#: ../sheets/Flowchart.sheet.in.h:4
-msgid "Data source"
-msgstr "èæäæ"
+#: ../sheets/cisconetwork.sheet.in.h:47
+msgid "Optical Fiber"
+msgstr "åç"
 
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-msgid "Decision"
-msgstr "æç"
+#: ../sheets/cisconetwork.sheet.in.h:48
+msgid "Optical Amplifier"
+msgstr "ååæåå"
 
-#: ../sheets/Flowchart.sheet.in.h:6
-msgid "Delay"
-msgstr "åé"
+#: ../sheets/cisconetwork.sheet.in.h:49
+msgid "Digital Cross-Connect"
+msgstr "æçäåéç"
 
-#: ../sheets/Flowchart.sheet.in.h:8
-msgid "Document"
-msgstr "æä"
+#: ../sheets/cisconetwork.sheet.in.h:50
+msgid "IP Transport Concentrator"
+msgstr ""
 
-#: ../sheets/Flowchart.sheet.in.h:10
-msgid "Flowchart"
-msgstr "æçå"
+#: ../sheets/cisconetwork.sheet.in.h:51
+msgid "DWDM Filter"
+msgstr "DWDM éæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:52
+msgid "WDM"
+msgstr "WDM"
+
+#: ../sheets/cisconetwork.sheet.in.h:53
+msgid "15200"
+msgstr "15200"
+
+#: ../sheets/cisconetwork.sheet.in.h:54
+msgid "15800"
+msgstr "15800"
+
+#: ../sheets/cisconetwork.sheet.in.h:55
+msgid "ONS15104"
+msgstr "ONS15104"
+
+#: ../sheets/cisconetwork.sheet.in.h:56
+msgid "10700"
+msgstr "10700"
+
+#: ../sheets/cisconetwork.sheet.in.h:57
+msgid "Metro 1500"
+msgstr "Metro 1500"
+
+#: ../sheets/cisconetwork.sheet.in.h:58
+msgid "ONS15540"
+msgstr "ONS15540"
+
+#: ../sheets/cisconetwork.sheet.in.h:59
+msgid "Automatic Protection Switching"
+msgstr "èåäèäæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:60
+msgid "RPS"
+msgstr "RPS"
+
+#: ../sheets/cisconetwork.sheet.in.h:61
+msgid "UPS"
+msgstr "äæéçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:62
+msgid "LongReach CPE"
+msgstr "LongReach CPE"
+
+#: ../sheets/cisconetwork.sheet.in.h:63
+msgid "3X74 (floor) cluster controller"
+msgstr "3X74 (åé) åéæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:64
+msgid "3174 (desktop) cluster controller"
+msgstr "3174 (æé) åéæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:65
+msgid "CSU/DSU"
+msgstr "CSU/DSU"
+
+#: ../sheets/cisconetwork.sheet.in.h:66
+msgid "WAN"
+msgstr "WAN"
+
+#: ../sheets/cisconetwork.sheet.in.h:67
+msgid "Cloud"
+msgstr "é"
+
+#: ../sheets/cisconetwork.sheet.in.h:68
+msgid "Cloud Gold"
+msgstr "éïéèï"
+
+#: ../sheets/cisconetwork.sheet.in.h:69
+msgid "Cloud White"
+msgstr "éïçèï"
+
+#: ../sheets/cisconetwork.sheet.in.h:70
+msgid "Cloud Dark"
+msgstr "éïæï"
+
+#: ../sheets/cisconetwork.sheet.in.h:71
+msgid "Distributed Director"
+msgstr "æäååå"
+
+#: ../sheets/cisconetwork.sheet.in.h:72
+msgid "LocalDirector"
+msgstr "LocalDirector"
+
+#: ../sheets/cisconetwork.sheet.in.h:73
+msgid "IOS SLB"
+msgstr "IOS SLB"
+
+#: ../sheets/cisconetwork.sheet.in.h:74
+msgid "MUX"
+msgstr "MUX"
+
+#: ../sheets/cisconetwork.sheet.in.h:75
+msgid "General Appliance"
+msgstr "äèåå"
+
+#. compatibility
+#. <alias name="Cisco - PAD"/>
+#: ../sheets/cisconetwork.sheet.in.h:78
+msgid "PAD"
+msgstr "PAD"
+
+#: ../sheets/cisconetwork.sheet.in.h:79
+msgid "CDDI/FDDI Concentrator"
+msgstr "CDDI/FDDI Concentrator"
+
+#: ../sheets/cisconetwork.sheet.in.h:80
+msgid "FDDI Ring"
+msgstr "FDDI ç"
+
+#: ../sheets/cisconetwork.sheet.in.h:81
+msgid "TokenRing"
+msgstr "èèç"
+
+#: ../sheets/cisconetwork.sheet.in.h:82
+msgid "MAU"
+msgstr "MAU"
+
+#: ../sheets/cisconetwork.sheet.in.h:83
+msgid "Repeater"
+msgstr "äçå"
+
+#: ../sheets/cisconetwork.sheet.in.h:84
+msgid "Bridge"
+msgstr "ææå"
+
+#: ../sheets/cisconetwork.sheet.in.h:85
+msgid "Breakout box"
+msgstr "æäååæç(breakout box)"
+
+#: ../sheets/cisconetwork.sheet.in.h:86
+msgid "STB (set top box)"
+msgstr "STB (æéç)"
+
+#: ../sheets/cisconetwork.sheet.in.h:87
+msgid "TV"
+msgstr "éè"
+
+#: ../sheets/cisconetwork.sheet.in.h:88
+msgid "IPTV broadcast server"
+msgstr "IPTV åæäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:89
+msgid "IPTV content manager"
+msgstr "IPTV ååççå"
+
+#: ../sheets/cisconetwork.sheet.in.h:90
+msgid "VN2900"
+msgstr "VN2900"
+
+#: ../sheets/cisconetwork.sheet.in.h:91
+msgid "VN5902"
+msgstr "VN5902"
+
+#: ../sheets/cisconetwork.sheet.in.h:92
+msgid "VN5900"
+msgstr "VN5900"
+
+#: ../sheets/cisconetwork.sheet.in.h:93
+msgid "Catalyst Access Gateway"
+msgstr "Catalyst ååééå"
+
+#: ../sheets/cisconetwork.sheet.in.h:94
+msgid "Generic Gateway"
+msgstr "äèéèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:95
+msgid "TransPath"
+msgstr "TransPath"
+
+#: ../sheets/cisconetwork.sheet.in.h:96
+msgid "uBR910 Cable DSU"
+msgstr "uBR910 Cable DSU"
+
+#: ../sheets/cisconetwork.sheet.in.h:97
+msgid "Storage Solution Engine"
+msgstr "ååèååæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:98
+msgid "Content Engine (Cache Director)"
+msgstr "åååæ(ååååå)"
+
+#: ../sheets/cisconetwork.sheet.in.h:99
+msgid "CDM Content Distribution Manager"
+msgstr "CDM Content Distribution Manager"
+
+#: ../sheets/cisconetwork.sheet.in.h:100
+msgid "Content Transformation Engine (CTE)"
+msgstr "ååèæåæ (CTE)"
 
-#: ../sheets/Flowchart.sheet.in.h:11
-msgid "Input/Output"
-msgstr "èå/èå"
+#: ../sheets/cisconetwork.sheet.in.h:101
+msgid "ME 1100"
+msgstr "ME 1100"
 
-#: ../sheets/Flowchart.sheet.in.h:12
-msgid "Internal storage"
-msgstr "åéååå"
+#: ../sheets/cisconetwork.sheet.in.h:102
+msgid "MAS Gateway"
+msgstr "MAS éèé"
 
-#: ../sheets/Flowchart.sheet.in.h:13
-msgid "Magnetic disk"
-msgstr "çç"
+#: ../sheets/cisconetwork.sheet.in.h:103
+msgid "File Engine"
+msgstr "ææåæ"
 
-#: ../sheets/Flowchart.sheet.in.h:14
-msgid "Magnetic drum"
-msgstr "çé"
+#: ../sheets/cisconetwork.sheet.in.h:104
+msgid "Service Control"
+msgstr "æåæå"
 
-#: ../sheets/Flowchart.sheet.in.h:15
-msgid "Magnetic tape"
-msgstr "çå"
+#: ../sheets/ciscotelephony.sheet.in.h:1
+msgid "Cisco â Telephony"
+msgstr "Cisco â éèéè"
 
-#: ../sheets/Flowchart.sheet.in.h:16
-msgid "Manual input"
-msgstr "äæèå"
+#: ../sheets/ciscotelephony.sheet.in.h:2
+msgid "Telephony shapes by Cisco"
+msgstr "Cisco æäçéèéèåå"
 
-#: ../sheets/Flowchart.sheet.in.h:17
-msgid "Manual operation"
-msgstr "äææä"
+#: ../sheets/ciscotelephony.sheet.in.h:3
+msgid "Phone"
+msgstr "éè"
 
-#: ../sheets/Flowchart.sheet.in.h:18
-msgid "Merge"
-msgstr "åä"
+#: ../sheets/ciscotelephony.sheet.in.h:4
+msgid "Phone 2"
+msgstr "éè 2"
 
-#: ../sheets/Flowchart.sheet.in.h:19
-msgid "Objects to draw flowcharts"
-msgstr "ççæçåçççä"
+#: ../sheets/ciscotelephony.sheet.in.h:5
+msgid "Phone Ethernet"
+msgstr "éèäåçç"
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:21
-msgid "Off page connector"
-msgstr "ééåéæå"
+#: ../sheets/ciscotelephony.sheet.in.h:6
+msgid "Phone Appliance"
+msgstr "éèèç"
 
-#: ../sheets/Flowchart.sheet.in.h:22
-msgid "Offline storage"
-msgstr "éçåå"
+#: ../sheets/ciscotelephony.sheet.in.h:7
+msgid "Phone Feature"
+msgstr "éèåè"
 
-#: ../sheets/Flowchart.sheet.in.h:23
-msgid "Or"
-msgstr "æ"
+#: ../sheets/ciscotelephony.sheet.in.h:8
+msgid "Phone/Fax"
+msgstr "éè/åç"
 
-#: ../sheets/Flowchart.sheet.in.h:24
-msgid "Predefined process"
-msgstr "éååçççå"
+#: ../sheets/ciscotelephony.sheet.in.h:9
+msgid "HootPhone"
+msgstr "HootPhone"
 
-#: ../sheets/Flowchart.sheet.in.h:25
-msgid "Preparation"
-msgstr "æå"
+#: ../sheets/ciscotelephony.sheet.in.h:10
+msgid "IP Phone"
+msgstr "IP éè"
 
-#: ../sheets/Flowchart.sheet.in.h:26
-msgid "Process/Auxiliary Operation"
-msgstr "çå/èåæä"
+#: ../sheets/ciscotelephony.sheet.in.h:11
+msgid "IP Softphone"
+msgstr "IP èäéè"
 
-#: ../sheets/Flowchart.sheet.in.h:27
-msgid "Punched card"
-msgstr "çååç"
+#: ../sheets/ciscotelephony.sheet.in.h:12
+msgid "Softphone"
+msgstr "èäéè"
 
-#: ../sheets/Flowchart.sheet.in.h:28
-msgid "Punched tape"
-msgstr "çåçå"
+#: ../sheets/ciscotelephony.sheet.in.h:13
+msgid "Cellular Phone"
+msgstr "æåéè"
 
-#: ../sheets/Flowchart.sheet.in.h:29
-msgid "Sort"
-msgstr "æå"
+#: ../sheets/ciscotelephony.sheet.in.h:14
+msgid "Mobile Access IP Phone"
+msgstr "èååå IP éè"
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:31
-msgid "Summing junction"
-msgstr "éççé"
+#: ../sheets/ciscotelephony.sheet.in.h:15
+msgid "Pager"
+msgstr "ååæ"
 
-#: ../sheets/Flowchart.sheet.in.h:32
-msgid "Terminal Interrupt"
-msgstr "ççäæ"
+#: ../sheets/ciscotelephony.sheet.in.h:16
+msgid "Fax"
+msgstr "åç"
 
-#: ../sheets/Flowchart.sheet.in.h:33
-msgid "Transaction file"
-msgstr "èçææ"
+#: ../sheets/ciscotelephony.sheet.in.h:17
+msgid "Turret"
+msgstr "åæå(Turret)"
 
-#: ../sheets/Flowchart.sheet.in.h:34
-msgid "Transmittal tape"
-msgstr "åéå"
+#: ../sheets/ciscotelephony.sheet.in.h:18
+msgid "Octel"
+msgstr "Octel"
 
-#: ../sheets/GRAFCET.sheet.in.h:1
-msgid "AND vergent"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:19
+msgid "Radio Tower"
+msgstr "ççéå"
 
-#: ../sheets/GRAFCET.sheet.in.h:2
-msgid "Action to associate to a step"
-msgstr "èæéçåçåä"
+#: ../sheets/ciscotelephony.sheet.in.h:20
+msgid "PBX"
+msgstr "PBX"
 
-#: ../sheets/GRAFCET.sheet.in.h:3
-msgid "Arc (upward)"
-msgstr "åç (åä)"
+#: ../sheets/ciscotelephony.sheet.in.h:21
+msgid "PBX Switch"
+msgstr "PBX äæå"
 
-#: ../sheets/GRAFCET.sheet.in.h:4
-msgid "Condition (of an action)"
-msgstr "(æåäç)æä"
+#: ../sheets/ciscotelephony.sheet.in.h:22
+msgid "Class 4/5 switch"
+msgstr "Class 4/5 äæå"
 
-#: ../sheets/GRAFCET.sheet.in.h:5
-msgid "GRAFCET"
-msgstr "GRAFCET"
+#: ../sheets/ciscotelephony.sheet.in.h:23
+msgid "SONET MUX"
+msgstr "SONET MUX"
 
-#: ../sheets/GRAFCET.sheet.in.h:10
-msgid "Macro sub-program call step"
-msgstr "åéåçåååæé"
+#: ../sheets/ciscotelephony.sheet.in.h:24
+msgid "ADM"
+msgstr "ADM"
 
-#: ../sheets/GRAFCET.sheet.in.h:11
-msgid "OR vergent"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:25
+msgid "ITP"
+msgstr "ITP"
 
-#: ../sheets/GRAFCET.sheet.in.h:12
-msgid "Objects to design GRAFCET charts"
-msgstr "èè GRAFCET åèæéççä"
+#: ../sheets/ciscotelephony.sheet.in.h:26
+msgid "ATA"
+msgstr "ATA"
 
-#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-msgid "Transition"
-msgstr "æç"
+#: ../sheets/ciscotelephony.sheet.in.h:27
+msgid "SIP Proxy Server"
+msgstr "SIP äçäæå"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-msgid "Alternate external entity"
-msgstr "æäåéåé"
+#: ../sheets/ciscotelephony.sheet.in.h:28
+msgid "Gatekeeper"
+msgstr "Gatekeeper"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-msgid "Data store"
-msgstr "èæèå"
+#: ../sheets/ciscotelephony.sheet.in.h:29
+msgid "MGX 8000 Series Voice Gateway"
+msgstr "MGX 8000 çåèéééå"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-msgid "External entity"
-msgstr "åéåé"
+#: ../sheets/ciscotelephony.sheet.in.h:30
+msgid "End Office"
+msgstr "ççèåå"
 
-#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-msgid "Gane and Sarson"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:31
+msgid "Voice-Enabled Access Server"
+msgstr "åèéåèçååäæå"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-msgid "Gane and Sarson DFD"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:32
+msgid "Voice-Enabled Router"
+msgstr "åèéåèçèçå"
 
-#: ../sheets/IsometricMap.sheet.in.h:1
-msgid "Block 1, 2:4"
-msgstr "åå 1, 2:4"
+#: ../sheets/ciscotelephony.sheet.in.h:33
+msgid "Voice-Enabled ATM Switch"
+msgstr "åèéåèç ATM äæå"
 
-#: ../sheets/IsometricMap.sheet.in.h:2
-msgid "Block 2, 2:8"
-msgstr "åå 2, 2:8"
+#: ../sheets/ciscotelephony.sheet.in.h:34
+msgid "CallManager"
+msgstr "CallManager"
 
-#: ../sheets/IsometricMap.sheet.in.h:3
-msgid "Block 3, 4:4"
-msgstr "åå 3, 4:4"
+#: ../sheets/ciscotelephony.sheet.in.h:35
+msgid "IP Telephony Router"
+msgstr "IP éèéèèçå"
 
-#: ../sheets/IsometricMap.sheet.in.h:4
-msgid "Block 4, 4:8"
-msgstr "åå 4, 4:8"
+#: ../sheets/ciscotelephony.sheet.in.h:36
+msgid "Mobile Access Router"
+msgstr "èåååèçå"
 
-#: ../sheets/IsometricMap.sheet.in.h:5
-msgid "Block 5, 3:3"
-msgstr "åå 5, 3:3"
+#: ../sheets/ciscotelephony.sheet.in.h:37
+msgid "H.323"
+msgstr "H.323"
 
-#: ../sheets/IsometricMap.sheet.in.h:6
-msgid "Block 6, 4:6"
-msgstr "åå 6, 4:6"
+#: ../sheets/ciscotelephony.sheet.in.h:38
+msgid "STP"
+msgstr "STP"
 
-#: ../sheets/IsometricMap.sheet.in.h:7
-msgid "Block 7"
-msgstr "åå 7"
+#: ../sheets/ciscotelephony.sheet.in.h:39
+msgid "BTS 10200"
+msgstr "BTS 10200"
 
-#: ../sheets/IsometricMap.sheet.in.h:8
-msgid "Car 1, Front View"
-msgstr "è 1, åèå"
+#: ../sheets/ciscotelephony.sheet.in.h:40
+msgid "Generic softswitch"
+msgstr "äèèääæå"
 
-#: ../sheets/IsometricMap.sheet.in.h:9
-msgid "Car 2, Rear View"
-msgstr "è 2, åèå"
+#: ../sheets/ciscotelephony.sheet.in.h:41
+msgid "SC2200/VSC3000 host"
+msgstr "SC2200/VSC3000 äæ"
 
-#: ../sheets/IsometricMap.sheet.in.h:10
-msgid "Corner 1"
-msgstr "èè 1"
+#: ../sheets/ciscotelephony.sheet.in.h:42
+msgid "Virtual switch controller (VSC 3000)"
+msgstr "èæäæåæåå (VSC 3000)"
 
-#: ../sheets/IsometricMap.sheet.in.h:11
-msgid "Corner 2"
-msgstr "èè 2"
+#: ../sheets/ciscotelephony.sheet.in.h:43
+msgid "SC2200 (Signalling Controller)"
+msgstr "SC2200 (äèæåå)"
 
-#: ../sheets/IsometricMap.sheet.in.h:12
-msgid "Crossroads"
-msgstr "äåé"
+#: ../sheets/ciscotelephony.sheet.in.h:44
+msgid "MoH server (Music on Hold)"
+msgstr "MoH äæå (Music on Hold)"
 
-#: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Elevated Road"
-msgstr "éæéè"
+#: ../sheets/ciscotelephony.sheet.in.h:45
+msgid "TDM router"
+msgstr "TDM èçå"
 
-#: ../sheets/IsometricMap.sheet.in.h:14
-msgid "Factory"
-msgstr "åå"
+#: ../sheets/ciscotelephony.sheet.in.h:46
+msgid "6701"
+msgstr "6701"
 
-#: ../sheets/IsometricMap.sheet.in.h:15
-msgid "Footbridge, Pedestrian Bridge"
-msgstr "èäåæ"
+#: ../sheets/ciscotelephony.sheet.in.h:47
+msgid "6705"
+msgstr "6705"
 
-#. use dc:description instead?
-#: ../sheets/IsometricMap.sheet.in.h:17
-msgid "Isometric Directional Map Shapes"
-msgstr "Isometric Directional åååå"
+#: ../sheets/ciscotelephony.sheet.in.h:48
+msgid "6732"
+msgstr "6732"
 
-#: ../sheets/IsometricMap.sheet.in.h:18
-msgid "Long Straight Road Section"
-msgstr "éççéè"
+#: ../sheets/ciscotelephony.sheet.in.h:49
+msgid "IAD router"
+msgstr "IAD èçå"
 
-#. use dc:title instead?
-#: ../sheets/IsometricMap.sheet.in.h:20
-msgid "Map, Isometric"
-msgstr "åå, Isometric"
+#: ../sheets/ciscotelephony.sheet.in.h:50
+msgid "ICS"
+msgstr "ICS"
 
-#: ../sheets/IsometricMap.sheet.in.h:21
-msgid "One Way Road Sign"
-msgstr "åèéæè"
+#: ../sheets/ciscotelephony.sheet.in.h:51
+msgid "ICM"
+msgstr "ICM"
 
-#: ../sheets/IsometricMap.sheet.in.h:22
-msgid "River"
-msgstr "æå"
+#: ../sheets/ciscotelephony.sheet.in.h:52
+msgid "IntelliSwitch Stack"
+msgstr ""
 
-#: ../sheets/IsometricMap.sheet.in.h:23
-msgid "Road Section"
-msgstr "éè"
+#: ../sheets/ciscotelephony.sheet.in.h:53
+msgid "Unity server"
+msgstr "Unity äæå"
 
-#: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
-msgstr "åé1"
+#: ../sheets/ciscotelephony.sheet.in.h:54
+msgid "Unity Express"
+msgstr "Unity Express"
 
-#: ../sheets/IsometricMap.sheet.in.h:25
-msgid "T-Junction"
-msgstr "äåè"
+#: ../sheets/ciscotelephony.sheet.in.h:55
+msgid "MCU"
+msgstr "MCU"
 
-#: ../sheets/IsometricMap.sheet.in.h:26
-msgid "Train 1, angled downward"
-msgstr "çè, äè"
+#: ../sheets/ciscotelephony.sheet.in.h:56
+msgid "uMG series"
+msgstr "uMG çå"
 
-#: ../sheets/IsometricMap.sheet.in.h:27
-msgid "Train 2, angled upward"
-msgstr "çè 2, äè"
+#: ../sheets/civil.sheet.in.h:1
+msgid "Civil"
+msgstr "åæåç"
 
-#: ../sheets/IsometricMap.sheet.in.h:28
-msgid "Tree 1"
-msgstr "æ"
+#: ../sheets/civil.sheet.in.h:2
+msgid "Civil Engineering Components"
+msgstr "åæåçåä"
 
-#: ../sheets/Istar.sheet.in.h:1
-msgid "An i* agent"
-msgstr "An i* agent"
+#: ../sheets/civil.sheet.in.h:3
+msgid "Vertical rest"
+msgstr "åçæççææå"
 
-#: ../sheets/Istar.sheet.in.h:2
-msgid "An i* decomposition link"
-msgstr "An i* decomposition link"
+#: ../sheets/civil.sheet.in.h:4
+msgid "Horizontal rest"
+msgstr "æåæççææå"
 
-#: ../sheets/Istar.sheet.in.h:3
-msgid "An i* dependency link"
-msgstr "An i* dependency link"
+#: ../sheets/civil.sheet.in.h:5
+msgid "Bivalent vertical rest"
+msgstr "Bivalent åçææå"
 
-#: ../sheets/Istar.sheet.in.h:4
-msgid "An i* goal"
-msgstr "An i* goal"
+#: ../sheets/civil.sheet.in.h:6
+msgid "Reference line"
+msgstr "åèç"
 
-#: ../sheets/Istar.sheet.in.h:5
-msgid "An i* means-ends link"
-msgstr "An i* means-ends link"
+#: ../sheets/civil.sheet.in.h:7
+msgid "Water level"
+msgstr "æä"
 
-#: ../sheets/Istar.sheet.in.h:6
-msgid "An i* negative contribution"
-msgstr "An i* negative contribution"
+#: ../sheets/civil.sheet.in.h:8
+msgid "Soil"
+msgstr "æå"
 
-#: ../sheets/Istar.sheet.in.h:7
-msgid "An i* position"
-msgstr "An i* position"
+#: ../sheets/civil.sheet.in.h:9
+msgid "Horizontally aligned arrow"
+msgstr "æåæåççé"
 
-#: ../sheets/Istar.sheet.in.h:8
-msgid "An i* positive contribution"
-msgstr "An i* positive contribution"
+#: ../sheets/civil.sheet.in.h:10
+msgid "Vertically aligned arrow"
+msgstr "åçæåççé"
 
-#: ../sheets/Istar.sheet.in.h:9
-msgid "An i* resource"
-msgstr "An i* resource"
+#: ../sheets/civil.sheet.in.h:11
+msgid "Horizontal limiting line"
+msgstr "æåéåç"
 
-#: ../sheets/Istar.sheet.in.h:10
-msgid "An i* role"
-msgstr "An i* role"
+#: ../sheets/civil.sheet.in.h:12
+msgid "Vertical limiting line"
+msgstr "åçéåç"
 
-#: ../sheets/Istar.sheet.in.h:11
-msgid "An i* softgoal"
-msgstr "An i* softgoal"
+#: ../sheets/civil.sheet.in.h:13
+msgid "Horizontally aligned pump"
+msgstr "æåæççæ"
 
-#: ../sheets/Istar.sheet.in.h:12
-msgid "An i* task"
-msgstr "An i* task"
+#: ../sheets/civil.sheet.in.h:14
+msgid "Vertically aligned pump"
+msgstr "åçæççæ"
 
-#: ../sheets/Istar.sheet.in.h:13
-msgid "An i* unspecified actor"
-msgstr "An i* unspecified actor"
+#: ../sheets/civil.sheet.in.h:15
+msgid "Horizontally aligned compressor"
+msgstr "æåæççåçæ"
 
-#: ../sheets/Istar.sheet.in.h:14
-msgid "An i* unspecified link"
-msgstr "An i* unspecified link"
+#: ../sheets/civil.sheet.in.h:16
+msgid "Vertically aligned compressor"
+msgstr "åçæççåçæ"
 
-#: ../sheets/Istar.sheet.in.h:15
-msgid "Objects to design i* diagrams"
-msgstr "èè i* åèæçççä"
+#: ../sheets/civil.sheet.in.h:17
+msgid "Vertically aligned valve"
+msgstr "åçæççæå"
 
-#: ../sheets/Istar.sheet.in.h:16
-msgid "RE-i*"
-msgstr "RE-i*"
+#: ../sheets/civil.sheet.in.h:18
+msgid "Horizontally aligned valve"
+msgstr "æåæççæå"
 
-#: ../sheets/Jackson.sheet.in.h:1
-msgid "A Jackson designed domain"
-msgstr "Jackson èèççå"
+#: ../sheets/civil.sheet.in.h:19
+msgid "Backflow preventer"
+msgstr "éæéæèç"
 
-#: ../sheets/Jackson.sheet.in.h:2
-msgid "A Jackson given domain"
-msgstr "Jackson æåççå"
+#: ../sheets/civil.sheet.in.h:20
+msgid "Motor"
+msgstr "éé"
 
-#: ../sheets/Jackson.sheet.in.h:3
-msgid "A Jackson machine domain"
-msgstr "Jackson éèçå"
+#: ../sheets/civil.sheet.in.h:21
+msgid "Gas bottle"
+msgstr "æç"
 
-#: ../sheets/Jackson.sheet.in.h:4
-msgid "A Jackson requirement"
-msgstr "Jackson èä"
+#: ../sheets/civil.sheet.in.h:22
+msgid "Frequency converter"
+msgstr "èéå"
 
-#: ../sheets/Jackson.sheet.in.h:5
-msgid "A Jackson requirement phenomenon"
-msgstr "A Jackson requirement phenomenon"
+#: ../sheets/civil.sheet.in.h:23
+msgid "Vertically aligned propeller"
+msgstr "åçæççæéå"
 
-#: ../sheets/Jackson.sheet.in.h:6
-msgid "A Jackson shared phenomenon"
-msgstr "A Jackson shared phenomenon"
+#: ../sheets/civil.sheet.in.h:24
+msgid "Aerator with bubbles"
+msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:7
-msgid "Objects to design Jackson diagrams"
-msgstr "èè Jackson åèæçççä"
+#: ../sheets/civil.sheet.in.h:25
+msgid "Rotor"
+msgstr "èå"
 
-#: ../sheets/Jackson.sheet.in.h:8
-msgid "RE-Jackson"
-msgstr "RE-Jackson"
+#: ../sheets/civil.sheet.in.h:26
+msgid "Final-settling basin"
+msgstr "æçæææ"
 
-#: ../sheets/KAOS.sheet.in.h:1
-msgid "A KAOS AND refinement"
-msgstr "A KAOS AND refinement"
+#: ../sheets/civil.sheet.in.h:27
+msgid "Preliminary clarification tank"
+msgstr ""
 
-#: ../sheets/KAOS.sheet.in.h:2
-msgid "A KAOS OR refinement"
-msgstr "A KAOS OR refinement"
+#: ../sheets/civil.sheet.in.h:28
+msgid "Basin"
+msgstr "ææ"
 
-#: ../sheets/KAOS.sheet.in.h:3
-msgid "A KAOS agent"
-msgstr "KAOS äççå"
+#: ../sheets/civil.sheet.in.h:29
+msgid "Container"
+msgstr "åå"
 
-#: ../sheets/KAOS.sheet.in.h:4
-msgid "A KAOS assumption"
-msgstr "KAOS åè"
+#: ../sheets/Contact.sheet.in.h:1
+msgid "Ladder"
+msgstr "Ladder"
 
-#: ../sheets/KAOS.sheet.in.h:5
-msgid "A KAOS binary conflict"
-msgstr "KAOS äåæèç"
+#: ../sheets/Contact.sheet.in.h:2
+msgid "Components for LADDER circuits"
+msgstr "LADDER éèçåä"
 
-#: ../sheets/KAOS.sheet.in.h:6
-msgid "A KAOS capable-of"
-msgstr "A KAOS capable-of"
+#: ../sheets/Contact.sheet.in.h:3
+msgid "'if' (normally open) ladder contact"
+msgstr "'if' (éåçéå) éæ ladder æè"
 
-#: ../sheets/KAOS.sheet.in.h:7
-msgid "A KAOS complete AND refinement"
-msgstr "A KAOS complete AND refinement"
+#: ../sheets/Contact.sheet.in.h:4
+msgid "'if not' (normally closed) ladder contact"
+msgstr "'if not' (éåçéé) éæ ladder æè"
 
-#: ../sheets/KAOS.sheet.in.h:8
-msgid "A KAOS complete OR refinement"
-msgstr "A KAOS complete OR refinement"
+#: ../sheets/Contact.sheet.in.h:5
+msgid "Simple output variable"
+msgstr "çåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:9
-msgid "A KAOS contribution"
-msgstr "A KAOS contribution"
+#: ../sheets/Contact.sheet.in.h:6
+msgid "Negative output variable"
+msgstr "èåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:10
-msgid "A KAOS control link"
-msgstr "KAOS æåéç"
+#: ../sheets/Contact.sheet.in.h:7
+msgid "'set' output variable"
+msgstr "'set' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:11
-msgid "A KAOS goal"
-msgstr "KAOS çæ"
+#: ../sheets/Contact.sheet.in.h:8
+msgid "'reset' output variable"
+msgstr "'reset' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:12
-msgid "A KAOS input"
-msgstr "KAOS èå"
+#: ../sheets/Contact.sheet.in.h:9
+msgid "'jump' output variable"
+msgstr "'jump' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:13
-msgid "A KAOS monitor link"
-msgstr "KAOS éççæ"
+#: ../sheets/Contact.sheet.in.h:10
+msgid "Receptivity output variable"
+msgstr "Receptivity èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:14
-msgid "A KAOS obstacle"
-msgstr "KAOS åå"
+#: ../sheets/Contact.sheet.in.h:11
+msgid "Power-saved simple output variable"
+msgstr "çèçåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:15
-msgid "A KAOS obstruction"
-msgstr "KAOS éçç"
+#: ../sheets/Contact.sheet.in.h:12
+msgid "Power-saved negative output variable"
+msgstr "çèèåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:16
-msgid "A KAOS operation"
-msgstr "KAOS æä"
+#: ../sheets/Contact.sheet.in.h:13
+msgid "Power-saved 'set' output variable"
+msgstr "çè 'set' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:17
-msgid "A KAOS operationalization"
-msgstr "A KAOS operationalization"
+#: ../sheets/Contact.sheet.in.h:14
+msgid "Power-saved 'reset' output variable"
+msgstr "çè 'reset' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:18
-msgid "A KAOS output"
-msgstr "KAOS èå"
+#: ../sheets/Cybernetics.sheet.in.h:1
+msgid "Cybernetics"
+msgstr "æåè"
 
-#: ../sheets/KAOS.sheet.in.h:19
-msgid "A KAOS performs"
-msgstr "KAOS åè"
+#: ../sheets/Cybernetics.sheet.in.h:2
+msgid "Elements of cybernetic circuits"
+msgstr "æåéèåçåä"
 
-#: ../sheets/KAOS.sheet.in.h:20
-msgid "A KAOS requirement"
-msgstr "KAOS èä"
+#: ../sheets/Cybernetics.sheet.in.h:3
+msgid "Sensor â left"
+msgstr "åæå â å"
 
-#: ../sheets/KAOS.sheet.in.h:21
-msgid "A KAOS responsibility"
-msgstr "KAOS èä"
+#: ../sheets/Cybernetics.sheet.in.h:4
+msgid "Sensor â right"
+msgstr "åæå â å"
 
-#: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS softgoal"
-msgstr ""
+#: ../sheets/Cybernetics.sheet.in.h:5
+msgid "Sensor â bottom"
+msgstr "åæå â ä"
 
-#: ../sheets/KAOS.sheet.in.h:23
-msgid "Objects to design KAOS diagrams"
-msgstr "èè KAOS åèæçççä"
+#: ../sheets/Cybernetics.sheet.in.h:6
+msgid "Sensor â top"
+msgstr "åæå â ä"
 
-#: ../sheets/KAOS.sheet.in.h:24
-msgid "RE-KAOS"
-msgstr "RE-KAOS"
+#: ../sheets/Cybernetics.sheet.in.h:7
+msgid "Sum, subtracting left input"
+msgstr "åïæååæèå"
 
-#: ../sheets/Logic.sheet.in.h:1
-msgid "AND gate"
-msgstr "åé"
+#: ../sheets/Cybernetics.sheet.in.h:8
+msgid "Sum, subtracting right input"
+msgstr "åïæååæèå"
 
-#: ../sheets/Logic.sheet.in.h:2
-msgid "Boolean Logic"
-msgstr "éèéè"
+#: ../sheets/Cybernetics.sheet.in.h:9
+msgid "Sum, subtracting bottom input"
+msgstr "åïæåäæèå"
 
-#: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
-msgstr ""
+#: ../sheets/Cybernetics.sheet.in.h:10
+msgid "Sum, subtracting top input"
+msgstr "åïæåäæèå"
 
-#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
-msgid "Inverter"
-msgstr "ææå"
+#: ../sheets/Cybernetics.sheet.in.h:11
+msgid "Integrator â input left"
+msgstr "çåå â èå(å)"
 
-#: ../sheets/Logic.sheet.in.h:5
-msgid "Logic"
-msgstr "éè"
+#: ../sheets/Cybernetics.sheet.in.h:12
+msgid "Integrator â input right"
+msgstr "çåå â èå(å)"
 
-#: ../sheets/Logic.sheet.in.h:6
-msgid "NAND gate"
-msgstr "ååé"
+#: ../sheets/Cybernetics.sheet.in.h:13
+msgid "Integrator â input bottom"
+msgstr "çåå â èå(ä)"
 
-#: ../sheets/Logic.sheet.in.h:7
-msgid "NOR gate"
-msgstr "åæé"
+#: ../sheets/Cybernetics.sheet.in.h:14
+msgid "Integrator â input top"
+msgstr "çåå â èå(ä)"
 
-#: ../sheets/Logic.sheet.in.h:8
-msgid "NOT"
-msgstr "åé"
+#: ../sheets/Cybernetics.sheet.in.h:15
+msgid "Sum"
+msgstr "å"
 
-#: ../sheets/Logic.sheet.in.h:9
-msgid "OR gate"
-msgstr "æé"
+#: ../sheets/Cybernetics.sheet.in.h:16
+msgid "Product"
+msgstr "ç"
 
-#: ../sheets/Logic.sheet.in.h:10
-msgid "Simple buffer"
-msgstr "çåçè"
+#: ../sheets/Cybernetics.sheet.in.h:17
+msgid "High pass filter"
+msgstr "ééææå"
 
-#: ../sheets/Logic.sheet.in.h:11
-msgid "XOR gate"
-msgstr "äææé"
+#: ../sheets/Cybernetics.sheet.in.h:18
+msgid "Low pass filter"
+msgstr "äéææå"
 
-#: ../sheets/MSE.sheet.in.h:1
-msgid "Demultiplexer"
-msgstr "ååå"
+#: ../sheets/Cybernetics.sheet.in.h:19
+msgid "Sine characteristic or input"
+msgstr "æåçææèå"
 
-#: ../sheets/MSE.sheet.in.h:2
-msgid "Large extension node"
-msgstr "ååäçé"
+#: ../sheets/Cybernetics.sheet.in.h:20
+msgid "Sigmoid characteristic"
+msgstr "éåæçæ"
 
-#: ../sheets/MSE.sheet.in.h:3
-msgid "MSE"
-msgstr "MSE"
+#: ../sheets/Cybernetics.sheet.in.h:21
+msgid "Saturation characteristic"
+msgstr "éåçæ"
 
-#: ../sheets/MSE.sheet.in.h:4
-msgid "Multiplexer"
-msgstr "ååå"
+#: ../sheets/Cybernetics.sheet.in.h:22
+msgid "Relay characteristic (sigma)"
+msgstr "çéåçæ(Î)"
 
-#: ../sheets/MSE.sheet.in.h:5
-msgid "Node center"
-msgstr "çéäå"
+#: ../sheets/Cybernetics.sheet.in.h:23
+msgid "Half wave rectifier or ramp input"
+msgstr "åæææåæ ramp èå"
 
-#: ../sheets/MSE.sheet.in.h:6
-msgid "Small extension node"
-msgstr "ååäçé"
+#: ../sheets/Cybernetics.sheet.in.h:24
+msgid "Full wave rectifier (absolute value)"
+msgstr "åæææå(çåå)"
 
-#: ../sheets/MSE.sheet.in.h:7
-msgid "Tactical satellite communications terminal"
-msgstr "æçèæéèççæ"
+#: ../sheets/Cybernetics.sheet.in.h:25
+msgid "Constant positive shift on the y-axis"
+msgstr "y èçæååç"
 
-#: ../sheets/MSE.sheet.in.h:8
-msgid "U.S. Army Mobile Subscriber Equipment Components"
-msgstr "çèæèååéèçç (Mobile Subscriber Equipment) åä"
+#: ../sheets/Cybernetics.sheet.in.h:26
+msgid "Constant negative shift on the y-axis"
+msgstr "y èçèååç"
 
-#: ../sheets/Misc.sheet.in.h:2
-msgid "Folder"
-msgstr "èæå"
+#: ../sheets/Cybernetics.sheet.in.h:27
+msgid "Constant factor greater 1"
+msgstr "ååçæåæ 1"
 
-#: ../sheets/Misc.sheet.in.h:4
-msgid "Miscellaneous Shapes"
-msgstr "åååç"
+#: ../sheets/Cybernetics.sheet.in.h:28
+msgid "Constant factor between 0 and 1"
+msgstr "ååçæäæ 0 å 1"
 
-#: ../sheets/Misc.sheet.in.h:5
-msgid "New-style group object, for testing"
-msgstr ""
+#: ../sheets/Cybernetics.sheet.in.h:29
+msgid "Constant factor between 0 and -1"
+msgstr "ååçæäæ 0 å -1"
 
-#: ../sheets/Misc.sheet.in.h:6
-msgid "Traditional clock"
-msgstr "äèæé"
+#: ../sheets/Cybernetics.sheet.in.h:30
+msgid "Constant factor below -1"
+msgstr "ååçæåæ -1"
 
-#: ../sheets/Pneumatic.sheet.in.h:1
-msgid "2/2 distributor"
-msgstr "2/2 åéå"
+#: ../sheets/Cybernetics.sheet.in.h:31
+msgid "Template for custom characteristics"
+msgstr "èéçæçææ"
 
-#: ../sheets/Pneumatic.sheet.in.h:2
-msgid "3/2 distributor"
-msgstr "3/2 åéå"
+#: ../sheets/Cybernetics.sheet.in.h:32
+msgid "Time delay"
+msgstr "æéåé"
 
-#: ../sheets/Pneumatic.sheet.in.h:3
-msgid "4/2 distributor"
-msgstr "4/2 åéå"
+#: ../sheets/Database.sheet.in.h:1
+msgid "Database"
+msgstr "èæå"
 
-#: ../sheets/Pneumatic.sheet.in.h:4
-msgid "5/2 distributor"
-msgstr "5/2 åéå"
+#: ../sheets/Database.sheet.in.h:2
+msgid "Editor for Database Table Relation Diagrams"
+msgstr "èæåèæéäåçèå"
 
-#: ../sheets/Pneumatic.sheet.in.h:5
-msgid "Air exhaust orifice"
-msgstr "çææåå"
+#: ../sheets/Database.sheet.in.h:5
+msgid "Attribute compound"
+msgstr "åæèåçä"
 
-#: ../sheets/Pneumatic.sheet.in.h:6
-msgid "Components for pneumatic and hydraulic circuits"
-msgstr "æéååèæååéèåä"
+#: ../sheets/Electric.sheet.in.h:1
+msgid "Electric"
+msgstr "éå"
 
-#: ../sheets/Pneumatic.sheet.in.h:8
-msgid "Double-effect jack"
-msgstr "Double-effect jack"
+#: ../sheets/Electric.sheet.in.h:2
+msgid "Components for electric circuits"
+msgstr "éèåçåä"
 
-#: ../sheets/Pneumatic.sheet.in.h:9
-msgid "Electric command (double coil)"
-msgstr "Electric command (double coil)"
+#: ../sheets/Electric.sheet.in.h:3
+msgid "Normally open contact (horizontal)"
+msgstr "äèææäéåçèé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:10
-msgid "Electric command (single coil)"
-msgstr "Electric command (single coil)"
+#: ../sheets/Electric.sheet.in.h:4
+msgid "Normally closed contact (horizontal)"
+msgstr "äèææäééçèé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:11
-msgid "Generic pressure source"
-msgstr "äèååäæ"
+#: ../sheets/Electric.sheet.in.h:5
+msgid "Normally open position switch (horizontal)"
+msgstr "äèææäéåçäçéé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:12
-msgid "Hydraulic pressure source"
-msgstr "æåäæ"
+#: ../sheets/Electric.sheet.in.h:6
+msgid "Normally closed position switch (horizontal)"
+msgstr "äèææäééçäçéé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:13
-msgid "Indirect command by hydraulic driver"
-msgstr "Indirect command by hydraulic driver"
+#: ../sheets/Electric.sheet.in.h:7
+msgid "Normally open contact (vertical)"
+msgstr "äèææäéåçèé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:14
-msgid "Indirect command by pneumatic driver"
-msgstr "Indirect command by pneumatic driver"
+#: ../sheets/Electric.sheet.in.h:8
+msgid "Normally closed contact (vertical)"
+msgstr "äèææäééçèé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:15
-msgid "Mechanical command by spring"
-msgstr "Mechanical command by spring"
+#: ../sheets/Electric.sheet.in.h:9
+msgid "Normally open position switch (vertical)"
+msgstr "äèææäéåçäçéé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:16
-msgid "Mechanical command by tappet"
-msgstr "Mechanical command by tappet"
+#: ../sheets/Electric.sheet.in.h:10
+msgid "Normally closed position switch (vertical)"
+msgstr "äèææäééçäçéé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:17
-msgid "Muscular command"
-msgstr "Muscular command"
+#: ../sheets/Electric.sheet.in.h:11
+msgid "The command organ of a relay (horizontal)"
+msgstr "çéååäåå(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:18
-msgid "Normally-in simple-effect jack"
-msgstr "Normally-in simple-effect jack"
+#: ../sheets/Electric.sheet.in.h:12
+msgid "Relay (horizontal)"
+msgstr "çéå(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:19
-msgid "Normally-out simple-effect jack"
-msgstr "Normally-out simple-effect jack"
+#: ../sheets/Electric.sheet.in.h:13
+msgid "Lamp or indicator light (horizontal)"
+msgstr "çææçåæ(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:20
-msgid "Pneumatic pressure source"
-msgstr "æåäæ"
+#: ../sheets/Electric.sheet.in.h:14
+msgid "The command organ of a relay (vertical)"
+msgstr "çéååäåå(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:21
-msgid "Pneumatic/Hydraulic"
-msgstr "æå/æå"
+#: ../sheets/Electric.sheet.in.h:15
+msgid "Relay (vertical)"
+msgstr "çéå(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:22
-msgid "Push-button command"
-msgstr "Push-button command"
+#: ../sheets/Electric.sheet.in.h:16
+msgid "Lamp or indicator light (vertical)"
+msgstr "çææçåæ(åç)"
 
-#: ../sheets/SADT.sheet.in.h:1
-msgid "Activity/data box"
-msgstr "æå/èææå"
+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+msgid "Connection point"
+msgstr "éæé"
 
-#: ../sheets/SADT.sheet.in.h:2
-msgid "Activity/data flow arrow"
-msgstr "æå/èææççé"
+#: ../sheets/ER.sheet.in.h:1
+msgid "ER"
+msgstr "ER"
 
-#: ../sheets/SADT.sheet.in.h:3
-msgid "Flow label"
-msgstr "æçæç"
+#: ../sheets/ER.sheet.in.h:2
+msgid "Editor for Entity Relations Diagrams"
+msgstr "åééäåçèå"
 
-#: ../sheets/SADT.sheet.in.h:4
-msgid "Objects to design SADT diagrams"
-msgstr "èè SADT åèæçççä"
+#: ../sheets/ER.sheet.in.h:4
+msgid "Weak entity"
+msgstr "ååé"
 
-#: ../sheets/SADT.sheet.in.h:5
-msgid "SADT/IDEF0"
-msgstr "SADT/IDEF0"
+#: ../sheets/ER.sheet.in.h:7
+msgid "Participation"
+msgstr "åè"
 
-#: ../sheets/SDL.sheet.in.h:1
-msgid "Action being executed"
-msgstr "èåèçåä"
+#: ../sheets/Flowchart.sheet.in.h:2
+msgid "Objects to draw flowcharts"
+msgstr "ççæçåçççä"
 
-#: ../sheets/SDL.sheet.in.h:2
-msgid "Block type reference"
-msgstr "ååéååè"
+#: ../sheets/Flowchart.sheet.in.h:3
+msgid "Process/Auxiliary Operation"
+msgstr "çå/èåæä"
 
-#: ../sheets/SDL.sheet.in.h:5
-msgid "Function call"
-msgstr "åæåå"
+#: ../sheets/Flowchart.sheet.in.h:4
+msgid "Input/Output"
+msgstr "èå/èå"
 
-#: ../sheets/SDL.sheet.in.h:6
-msgid "Function header"
-msgstr "åçæé"
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
+msgid "Decision"
+msgstr "æç"
 
-#: ../sheets/SDL.sheet.in.h:7
-msgid "Generic text note"
-msgstr "æéæååè"
+#: ../sheets/Flowchart.sheet.in.h:6
+msgid "Connector"
+msgstr "éæå"
 
-#: ../sheets/SDL.sheet.in.h:8
-msgid "In/Out connector"
-msgstr "èå/åéæå"
+#: ../sheets/Flowchart.sheet.in.h:8
+msgid "Transaction file"
+msgstr "èçææ"
 
-#: ../sheets/SDL.sheet.in.h:10
-msgid "Procedure return"
-msgstr "éçèå"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:10
+msgid "Off page connector"
+msgstr "ééåéæå"
 
-#: ../sheets/SDL.sheet.in.h:11
-msgid "Process type reference"
-msgstr "çåéååè"
+#: ../sheets/Flowchart.sheet.in.h:11
+msgid "Document"
+msgstr "æä"
 
-#: ../sheets/SDL.sheet.in.h:12
-msgid "Receive message"
-msgstr "ææèæ"
+#: ../sheets/Flowchart.sheet.in.h:12
+msgid "Manual operation"
+msgstr "äææä"
 
-#: ../sheets/SDL.sheet.in.h:13
-msgid "SDL"
-msgstr "SDL"
+#: ../sheets/Flowchart.sheet.in.h:13
+msgid "Preparation"
+msgstr "æå"
 
-#: ../sheets/SDL.sheet.in.h:14
-msgid "Save state"
-msgstr "ååçæ"
+#: ../sheets/Flowchart.sheet.in.h:14
+msgid "Manual input"
+msgstr "äæèå"
 
-#: ../sheets/SDL.sheet.in.h:15
-msgid "Send message"
-msgstr "åéèæ"
+#: ../sheets/Flowchart.sheet.in.h:15
+msgid "Predefined process"
+msgstr "éååçççå"
 
-#: ../sheets/SDL.sheet.in.h:16
-msgid "Service type reference"
-msgstr "æåéååè"
+#: ../sheets/Flowchart.sheet.in.h:16
+msgid "Terminal Interrupt"
+msgstr "ççäæ"
 
-#: ../sheets/SDL.sheet.in.h:17
-msgid "Specification and Description Language."
-msgstr "èææèèè (Specification and Description Language)"
+#: ../sheets/Flowchart.sheet.in.h:17
+msgid "Magnetic disk"
+msgstr "çç"
 
-#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
-msgid "State"
-msgstr "çæ"
+#: ../sheets/Flowchart.sheet.in.h:18
+msgid "Magnetic drum"
+msgstr "çé"
 
-#: ../sheets/SISSI.sheet.in.h:1
-#, fuzzy
-msgid "Air condition"
-msgstr "æä"
+#: ../sheets/Flowchart.sheet.in.h:19
+msgid "Magnetic tape"
+msgstr "çå"
 
-#: ../sheets/SISSI.sheet.in.h:2
-#, fuzzy
-msgid "Air filter"
-msgstr "æååååå"
+#: ../sheets/Flowchart.sheet.in.h:20
+msgid "Internal storage"
+msgstr "åéååå"
 
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Air quality detector"
-msgstr ""
+#: ../sheets/Flowchart.sheet.in.h:21
+msgid "Merge"
+msgstr "åä"
+
+#: ../sheets/Flowchart.sheet.in.h:23
+msgid "Delay"
+msgstr "åé"
 
-#: ../sheets/SISSI.sheet.in.h:4
-msgid "Alarm center"
-msgstr "èåäå"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:25
+msgid "Summing junction"
+msgstr "éççé"
 
-#: ../sheets/SISSI.sheet.in.h:5
-msgid "Axial Ventilator"
-msgstr ""
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:27
+msgid "Collate"
+msgstr "æå"
 
-#: ../sheets/SISSI.sheet.in.h:6
-#, fuzzy
-msgid "Backup"
-msgstr "èæ"
+#: ../sheets/Flowchart.sheet.in.h:28
+msgid "Sort"
+msgstr "æå"
 
-#: ../sheets/SISSI.sheet.in.h:7
-#, fuzzy
-msgid "Badge reader"
-msgstr "åéç"
+#: ../sheets/Flowchart.sheet.in.h:29
+msgid "Or"
+msgstr "æ"
 
-#: ../sheets/SISSI.sheet.in.h:8
-msgid "Badge reader/keyboard"
-msgstr ""
+#: ../sheets/Flowchart.sheet.in.h:30
+msgid "Punched card"
+msgstr "çååç"
 
-#: ../sheets/SISSI.sheet.in.h:9
-msgid "Biometric reader"
-msgstr ""
+#: ../sheets/Flowchart.sheet.in.h:31
+msgid "Punched tape"
+msgstr "çåçå"
 
-#: ../sheets/SISSI.sheet.in.h:10
-msgid "Cellular phone"
-msgstr "æåéè"
+#: ../sheets/Flowchart.sheet.in.h:32
+msgid "Transmittal tape"
+msgstr "åéå"
+
+#: ../sheets/Flowchart.sheet.in.h:33
+msgid "Offline storage"
+msgstr "éçåå"
 
-#: ../sheets/SISSI.sheet.in.h:11
-#, fuzzy
-msgid "Centrifugal Ventilator"
-msgstr "éåæ"
+#: ../sheets/Flowchart.sheet.in.h:34
+msgid "Data source"
+msgstr "èæäæ"
 
-#: ../sheets/SISSI.sheet.in.h:12
-msgid "Cipher machine"
-msgstr ""
+#: ../sheets/FS.sheet.in.h:1
+msgid "FS"
+msgstr "FS"
 
-#: ../sheets/SISSI.sheet.in.h:13
-msgid "Circulation pump"
-msgstr ""
+#: ../sheets/FS.sheet.in.h:2
+msgid "Editor for Function Structure Diagrams."
+msgstr "åæçæåèçèåã"
 
-#: ../sheets/SISSI.sheet.in.h:14
-#, fuzzy
-msgid "Condensator"
-msgstr "åç"
+#: ../sheets/FS.sheet.in.h:3
+msgid "Flow"
+msgstr "æç"
 
-#: ../sheets/SISSI.sheet.in.h:15
-#, fuzzy
-msgid "Current transducer"
-msgstr "æçèé"
+#: ../sheets/FS.sheet.in.h:4
+msgid "Orthogonal polyline flow"
+msgstr "æäèççææç"
 
-#: ../sheets/SISSI.sheet.in.h:16
-#, fuzzy
-msgid "Digital code"
-msgstr "æçäåéç"
+#: ../sheets/FS.sheet.in.h:5
+msgid "Function"
+msgstr "åæ"
 
-#: ../sheets/SISSI.sheet.in.h:17
-msgid "Enthalpy transducer"
+#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
+#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+msgid "Gane and Sarson"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:18
-msgid "Extinguisher"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+msgid "Gane and Sarson DFD"
 msgstr ""
 
-#: ../sheets/SISSI.sheet.in.h:19
-msgid "Faraday cage"
-msgstr ""
+#: ../sheets/Gane_and_Sarson.sheet.in.h:4
+msgid "Alternate external entity"
+msgstr "æäåéåé"
 
-#: ../sheets/SISSI.sheet.in.h:20 ../sheets/ciscomisc.sheet.in.h:9
-msgid "File cabinet"
-msgstr "æææ"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:5
+msgid "Data store"
+msgstr "èæèå"
 
-#: ../sheets/SISSI.sheet.in.h:21
-msgid "Gate"
-msgstr "é"
+#: ../sheets/Gane_and_Sarson.sheet.in.h:6
+msgid "External entity"
+msgstr "åéåé"
 
-#: ../sheets/SISSI.sheet.in.h:22
-#, fuzzy
-msgid "Geographic site"
-msgstr "ååçåååå"
+#: ../sheets/GRAFCET.sheet.in.h:1
+msgid "GRAFCET"
+msgstr "GRAFCET"
 
-#: ../sheets/SISSI.sheet.in.h:23
-msgid "Glass-break sensor"
-msgstr ""
+#: ../sheets/GRAFCET.sheet.in.h:2
+msgid "Objects to design GRAFCET charts"
+msgstr "èè GRAFCET åèæéççä"
 
-#: ../sheets/SISSI.sheet.in.h:24 ../sheets/ciscohub.sheet.in.h:29
-msgid "Hub"
-msgstr "éçå"
+#: ../sheets/GRAFCET.sheet.in.h:8
+msgid "Macro sub-program call step"
+msgstr "åéåçåååæé"
 
-#: ../sheets/SISSI.sheet.in.h:25
-msgid "Information"
-msgstr "èè"
+#: ../sheets/GRAFCET.sheet.in.h:9
+msgid "Action to associate to a step"
+msgstr "èæéçåçåä"
 
-#: ../sheets/SISSI.sheet.in.h:26
-msgid "Information system"
-msgstr "èèçç"
+#: ../sheets/GRAFCET.sheet.in.h:10
+msgid "Condition (of an action)"
+msgstr "(æåäç)æä"
 
-#: ../sheets/SISSI.sheet.in.h:28 ../sheets/ciscocomputer.sheet.in.h:21
-msgid "Laptop"
-msgstr "ææéè"
+#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
+msgid "Transition"
+msgstr "æç"
 
-#: ../sheets/SISSI.sheet.in.h:29
-#, fuzzy
-msgid "Level detector"
-msgstr "åæå"
+#: ../sheets/GRAFCET.sheet.in.h:12
+msgid "OR vergent"
+msgstr "OR åè"
 
-#: ../sheets/SISSI.sheet.in.h:30
-#, fuzzy
-msgid "Light detector"
-msgstr "åæå"
+#: ../sheets/GRAFCET.sheet.in.h:13
+msgid "AND vergent"
+msgstr "AND åè"
 
-#: ../sheets/SISSI.sheet.in.h:31
-msgid "Log analysis"
-msgstr ""
+#: ../sheets/GRAFCET.sheet.in.h:14
+msgid "Arc (upward)"
+msgstr "åç (åä)"
 
-#: ../sheets/SISSI.sheet.in.h:32
-msgid "Magnetic support"
-msgstr "ççææ"
+#. use dc:title instead?
+#: ../sheets/IsometricMap.sheet.in.h:2
+msgid "Map, Isometric"
+msgstr "åå, Isometric"
 
-#: ../sheets/SISSI.sheet.in.h:33 ../sheets/ciscocomputer.sheet.in.h:25
-msgid "Modem"
-msgstr "æææ"
+#. use dc:description instead?
+#: ../sheets/IsometricMap.sheet.in.h:4
+msgid "Isometric Directional Map Shapes"
+msgstr "Isometric æååååå"
 
-#: ../sheets/SISSI.sheet.in.h:34
-msgid "Moisture extractor"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:5
+msgid "Road Section"
+msgstr "éè"
 
-#: ../sheets/SISSI.sheet.in.h:35
-msgid "Moisture sensor"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:6
+msgid "Long Straight Road Section"
+msgstr "éççéè"
 
-#: ../sheets/SISSI.sheet.in.h:36
-msgid "Movement detector"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:7
+msgid "Crossroads"
+msgstr "äåé"
 
-#: ../sheets/SISSI.sheet.in.h:37 ../sheets/network.sheet.in.h:21
-msgid "Network cloud"
-msgstr "äèçççéçåæ"
+#: ../sheets/IsometricMap.sheet.in.h:8
+msgid "T-Junction"
+msgstr "äåè"
 
-#: ../sheets/SISSI.sheet.in.h:38
-msgid "Objects to design sissi diagrams"
-msgstr "èè sissi åèæçççä"
+#: ../sheets/IsometricMap.sheet.in.h:9
+msgid "Elevated Road"
+msgstr "éæéè"
 
-#: ../sheets/SISSI.sheet.in.h:39 ../sheets/ciscocomputer.sheet.in.h:35
-msgid "PDA"
-msgstr "PDA"
+#: ../sheets/IsometricMap.sheet.in.h:10
+msgid "Corner 1"
+msgstr "èè 1"
 
-#: ../sheets/SISSI.sheet.in.h:40
-msgid "Paper support"
-msgstr "çåææ"
+#: ../sheets/IsometricMap.sheet.in.h:11
+msgid "Corner 2"
+msgstr "èè 2"
 
-#: ../sheets/SISSI.sheet.in.h:41
-msgid "Person"
-msgstr "ä"
+#: ../sheets/IsometricMap.sheet.in.h:12
+msgid "River"
+msgstr "æå"
 
-#: ../sheets/SISSI.sheet.in.h:42
-#, fuzzy
-msgid "Power transducer"
-msgstr "èååå"
+#: ../sheets/IsometricMap.sheet.in.h:13
+msgid "Roof 1"
+msgstr "åé 1"
 
-#: ../sheets/SISSI.sheet.in.h:43
-msgid "Pressure transducer"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:14
+msgid "Block 1, 2:4"
+msgstr "åå 1, 2:4"
 
-#: ../sheets/SISSI.sheet.in.h:44
-msgid "Pump"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:15
+msgid "Block 2, 2:8"
+msgstr "åå 2, 2:8"
 
-#: ../sheets/SISSI.sheet.in.h:45 ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Relational Database"
-msgstr "éèåèæå"
+#: ../sheets/IsometricMap.sheet.in.h:16
+msgid "Block 3, 4:4"
+msgstr "åå 3, 4:4"
 
-#: ../sheets/SISSI.sheet.in.h:46
-msgid "Revolving door"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:17
+msgid "Block 4, 4:8"
+msgstr "åå 4, 4:8"
 
-#: ../sheets/SISSI.sheet.in.h:47
-msgid "Room"
-msgstr "æé"
+#: ../sheets/IsometricMap.sheet.in.h:18
+msgid "Block 5, 3:3"
+msgstr "åå 5, 3:3"
 
-#: ../sheets/SISSI.sheet.in.h:48 ../sheets/ciscohub.sheet.in.h:53
-msgid "Router"
-msgstr "èçå"
+#: ../sheets/IsometricMap.sheet.in.h:19
+msgid "Block 6, 4:6"
+msgstr "åå 6, 4:6"
 
-#: ../sheets/SISSI.sheet.in.h:49
-msgid "Safe"
-msgstr "åè"
+#: ../sheets/IsometricMap.sheet.in.h:20
+msgid "Block 7"
+msgstr "åå 7"
 
-#: ../sheets/SISSI.sheet.in.h:50
-msgid "Security area"
-msgstr "äååå"
+#: ../sheets/IsometricMap.sheet.in.h:21
+msgid "Factory"
+msgstr "åå"
 
-#: ../sheets/SISSI.sheet.in.h:51
-#, fuzzy
-msgid "Sensor beam"
-msgstr "åæå - ä"
+#: ../sheets/IsometricMap.sheet.in.h:22
+msgid "Car 1, Front View"
+msgstr "è 1, åèå"
 
-#: ../sheets/SISSI.sheet.in.h:52
-#, fuzzy
-msgid "Server"
-msgstr "äæå"
+#: ../sheets/IsometricMap.sheet.in.h:23
+msgid "Car 2, Rear View"
+msgstr "è 2, åèå"
 
-#: ../sheets/SISSI.sheet.in.h:53
-#, fuzzy
-msgid "Smoke detector"
-msgstr "åæå"
+#: ../sheets/IsometricMap.sheet.in.h:24
+msgid "Train 1, angled downward"
+msgstr "çè, äè"
 
-#: ../sheets/SISSI.sheet.in.h:54
-msgid "Software"
-msgstr "èä"
+#: ../sheets/IsometricMap.sheet.in.h:25
+msgid "Train 2, angled upward"
+msgstr "çè 2, äè"
 
-#: ../sheets/SISSI.sheet.in.h:55 ../sheets/ciscocomputer.sheet.in.h:42
-msgid "Storage array"
-msgstr "ååéå"
+#: ../sheets/IsometricMap.sheet.in.h:26
+msgid "Tree 1"
+msgstr "æ 1"
 
-#: ../sheets/SISSI.sheet.in.h:56 ../sheets/network.sheet.in.h:33
-msgid "Telephone"
-msgstr "éè"
+#: ../sheets/IsometricMap.sheet.in.h:27
+msgid "Footbridge, Pedestrian Bridge"
+msgstr "èäåæ"
 
-#: ../sheets/SISSI.sheet.in.h:57
-msgid "Vehicle detector"
-msgstr ""
+#: ../sheets/IsometricMap.sheet.in.h:28
+msgid "One Way Road Sign"
+msgstr "åèéæè"
 
-#: ../sheets/SISSI.sheet.in.h:58
-#, fuzzy
-msgid "Ventilator"
-msgstr "VPN Concentrator"
+#: ../sheets/Istar.sheet.in.h:1
+msgid "RE-i*"
+msgstr "RE-i*"
 
-#: ../sheets/SISSI.sheet.in.h:59
-#, fuzzy
-msgid "Vibration sensor"
-msgstr "éå"
+#: ../sheets/Istar.sheet.in.h:2
+msgid "Objects to design i* diagrams"
+msgstr "èè i* åèæçççä"
 
-#: ../sheets/SISSI.sheet.in.h:60
-msgid "Video camera"
-msgstr "èåæåæ"
+#: ../sheets/Istar.sheet.in.h:3
+msgid "An i* softgoal"
+msgstr "i* èçç"
 
-#: ../sheets/SISSI.sheet.in.h:61
-msgid "Video movement detector"
-msgstr ""
+#: ../sheets/Istar.sheet.in.h:4
+msgid "An i* goal"
+msgstr "i* çç"
 
-#: ../sheets/SISSI.sheet.in.h:62
-#, fuzzy
-msgid "Voltage detector"
-msgstr "éå"
+#: ../sheets/Istar.sheet.in.h:5
+msgid "An i* resource"
+msgstr "i* èæ"
 
-#: ../sheets/SISSI.sheet.in.h:63
-msgid "Workstation"
-msgstr "åäç"
+#: ../sheets/Istar.sheet.in.h:6
+msgid "An i* task"
+msgstr "i* åä"
 
-#: ../sheets/UML.sheet.in.h:1
-msgid "Activity"
-msgstr "æå"
+#: ../sheets/Istar.sheet.in.h:7
+msgid "An i* unspecified actor"
+msgstr "i* ææå actor"
 
-#: ../sheets/UML.sheet.in.h:3
-msgid "Aggregation, one class is part of another"
-msgstr "éåïäåéåæåäéåçäéå"
+#: ../sheets/Istar.sheet.in.h:8
+msgid "An i* agent"
+msgstr "i* agent"
 
-#: ../sheets/UML.sheet.in.h:4
-msgid "Association, two classes are associated"
-msgstr "ééïååéååæçé"
+#: ../sheets/Istar.sheet.in.h:9
+msgid "An i* position"
+msgstr "i* äç"
 
-#: ../sheets/UML.sheet.in.h:7
-msgid "Class stereotype icon"
-msgstr "éååååç"
+#: ../sheets/Istar.sheet.in.h:10
+msgid "An i* role"
+msgstr "i* èè"
 
-#: ../sheets/UML.sheet.in.h:8
-msgid "Component"
-msgstr "åä"
+#: ../sheets/Istar.sheet.in.h:11
+msgid "An i* unspecified link"
+msgstr "i* ææåéç"
 
-#: ../sheets/UML.sheet.in.h:9
-msgid "Constraint, place a constraint on something"
-msgstr "åçïåæäåäåç"
+#: ../sheets/Istar.sheet.in.h:12
+msgid "An i* positive contribution"
+msgstr "i* æèç"
 
-#: ../sheets/UML.sheet.in.h:11
-msgid "Editor for UML Static Structure Diagrams"
-msgstr "UML éæçæåçèå"
+#: ../sheets/Istar.sheet.in.h:13
+msgid "An i* negative contribution"
+msgstr "i* èèç"
 
-#: ../sheets/UML.sheet.in.h:15
-msgid "Fork/union"
-msgstr "åå/èå"
+#: ../sheets/Istar.sheet.in.h:14
+msgid "An i* dependency link"
+msgstr "i* ææåæéç"
 
-#: ../sheets/UML.sheet.in.h:16
-msgid "Generalization, class inheritance"
-msgstr "æçïéåçæ"
+#: ../sheets/Istar.sheet.in.h:15
+msgid "An i* decomposition link"
+msgstr "i* decomposition éç"
 
-#: ../sheets/UML.sheet.in.h:17
-msgid "Implements, class implements a specific interface"
-msgstr "åäïéååääçåçäé"
+#: ../sheets/Istar.sheet.in.h:16
+msgid "An i* means-ends link"
+msgstr "i* means-ends éç"
 
-#: ../sheets/UML.sheet.in.h:18
-msgid "Initial/end state"
-msgstr "åå/çæçæ"
+#: ../sheets/Jackson.sheet.in.h:1
+msgid "RE-Jackson"
+msgstr "RE-Jackson"
 
-#: ../sheets/UML.sheet.in.h:19
-msgid "Large package"
-msgstr "åååä"
+#: ../sheets/Jackson.sheet.in.h:2
+msgid "Objects to design Jackson diagrams"
+msgstr "èè Jackson åèæçççä"
 
-#: ../sheets/UML.sheet.in.h:20
-msgid "Lifeline"
-msgstr "çåç"
+#: ../sheets/Jackson.sheet.in.h:3
+msgid "A Jackson given domain"
+msgstr "Jackson æåççå"
 
-#: ../sheets/UML.sheet.in.h:21
-msgid "Message"
-msgstr "èæ"
+#: ../sheets/Jackson.sheet.in.h:4
+msgid "A Jackson designed domain"
+msgstr "Jackson èèççå"
 
-#: ../sheets/UML.sheet.in.h:22
-msgid "Node"
-msgstr "çé"
+#: ../sheets/Jackson.sheet.in.h:5
+msgid "A Jackson machine domain"
+msgstr "Jackson éèçå"
 
-#: ../sheets/UML.sheet.in.h:23
-msgid "Note"
-msgstr "åè"
+#: ../sheets/Jackson.sheet.in.h:6
+msgid "A Jackson requirement"
+msgstr "Jackson èä"
 
-#: ../sheets/UML.sheet.in.h:24
-msgid "Object"
-msgstr "çä"
+#: ../sheets/Jackson.sheet.in.h:7
+msgid "A Jackson shared phenomenon"
+msgstr "A Jackson shared phenomenon"
 
-#: ../sheets/UML.sheet.in.h:25
-msgid "Realizes, implements a specific interface"
-msgstr "åçïåäçåçäé"
+#: ../sheets/Jackson.sheet.in.h:8
+msgid "A Jackson requirement phenomenon"
+msgstr "A Jackson requirement phenomenon"
 
-#: ../sheets/UML.sheet.in.h:27
-msgid "Small package"
-msgstr "åååä"
+#: ../sheets/jigsaw.sheet.in.h:1
+msgid "Jigsaw"
+msgstr "æå"
 
-#: ../sheets/UML.sheet.in.h:31
-msgid "UML"
-msgstr "UML"
+#: ../sheets/jigsaw.sheet.in.h:2
+msgid "Pieces of a jigsaw"
+msgstr "æåççæéä"
 
-#: ../sheets/UML.sheet.in.h:32
-msgid "Use case"
-msgstr "äçæä"
+#: ../sheets/jigsaw.sheet.in.h:3
+msgid "Jigsaw â part_oioi"
+msgstr "æå â åååå"
 
-#: ../sheets/chronogram.sheet.in.h:1
-msgid "Chronogram"
-msgstr "åäè"
+#: ../sheets/jigsaw.sheet.in.h:4
+msgid "Jigsaw â part_ioio"
+msgstr "æå â åååå"
 
-#: ../sheets/chronogram.sheet.in.h:2
-msgid "Data line"
-msgstr "èæç"
+#: ../sheets/jigsaw.sheet.in.h:5
+msgid "Jigsaw â part_iiii"
+msgstr "æå â åååå"
 
-#: ../sheets/chronogram.sheet.in.h:3
-msgid "Objects to design chronogram charts"
-msgstr "èèåäèæçççä"
+#: ../sheets/jigsaw.sheet.in.h:6
+msgid "Jigsaw â part_oooo"
+msgstr "æå â åååå"
 
-#: ../sheets/chronogram.sheet.in.h:4
-msgid "Time scale"
-msgstr "æéç"
+#: ../sheets/jigsaw.sheet.in.h:7
+msgid "Jigsaw â part_oooi"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:1
-msgid "BBS"
-msgstr "BBS"
+#: ../sheets/jigsaw.sheet.in.h:8
+msgid "Jigsaw â part_iooo"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:2
-msgid "Cisco - Computer"
-msgstr "Cisco - éè"
+#: ../sheets/jigsaw.sheet.in.h:9
+msgid "Jigsaw â part_oioo"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:3
-msgid "Cisco CA"
-msgstr "Cisco CA"
+#: ../sheets/jigsaw.sheet.in.h:10
+msgid "Jigsaw â part_ooio"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:4
-msgid "CiscoSecurity"
-msgstr "CiscoSecurity"
+#: ../sheets/jigsaw.sheet.in.h:11
+msgid "Jigsaw â part_iioo"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:5
-msgid "CiscoWorks workstation"
-msgstr "CiscoWorks åäç"
+#: ../sheets/jigsaw.sheet.in.h:12
+msgid "Jigsaw â part_oiio"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:6
-msgid "Computer shapes by Cisco"
-msgstr "Cisco éèåå"
+#: ../sheets/jigsaw.sheet.in.h:13
+msgid "Jigsaw â part_ooii"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:7
-msgid "Disk subsystem"
-msgstr "ççåçç"
+#: ../sheets/jigsaw.sheet.in.h:14
+msgid "Jigsaw â part_iooi"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:8
-msgid "Diskette"
-msgstr "èçç"
+#: ../sheets/jigsaw.sheet.in.h:15
+msgid "Jigsaw â part_oiii"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:9
-msgid "EtherClient"
-msgstr "äååæç"
+#: ../sheets/jigsaw.sheet.in.h:16
+msgid "Jigsaw â part_ioii"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:10
-msgid "FC Storage"
-msgstr "FC ååèç"
+#: ../sheets/jigsaw.sheet.in.h:17
+msgid "Jigsaw â part_iioi"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:11
-msgid "File Server"
-msgstr "ææäæå"
+#: ../sheets/jigsaw.sheet.in.h:18
+msgid "Jigsaw â part_iiio"
+msgstr "æå â åååå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:12
-msgid "Front End Processor"
-msgstr "åçèçå"
+#: ../sheets/KAOS.sheet.in.h:1
+msgid "RE-KAOS"
+msgstr "RE-KAOS"
 
-#: ../sheets/ciscocomputer.sheet.in.h:13
-msgid "HP Mini"
-msgstr "HP Mini"
+#: ../sheets/KAOS.sheet.in.h:2
+msgid "Objects to design KAOS diagrams"
+msgstr "èè KAOS åèæçççä"
 
-#: ../sheets/ciscocomputer.sheet.in.h:14
-msgid "Handheld"
-msgstr "ææåèç"
+#: ../sheets/KAOS.sheet.in.h:3
+msgid "A KAOS softgoal"
+msgstr "KAOS èçç"
 
-#: ../sheets/ciscocomputer.sheet.in.h:15
-msgid "Host"
-msgstr "äæ"
+#: ../sheets/KAOS.sheet.in.h:4
+msgid "A KAOS goal"
+msgstr "KAOS çç"
 
-#: ../sheets/ciscocomputer.sheet.in.h:16
-msgid "IBM Mini (AS400)"
-msgstr "IBM Mini (AS400)"
+#: ../sheets/KAOS.sheet.in.h:5
+msgid "A KAOS requirement"
+msgstr "KAOS èä"
 
-#: ../sheets/ciscocomputer.sheet.in.h:17
-msgid "IBM Tower"
-msgstr "IBM Tower"
+#: ../sheets/KAOS.sheet.in.h:6
+msgid "A KAOS assumption"
+msgstr "KAOS åè"
 
-#: ../sheets/ciscocomputer.sheet.in.h:18
-msgid "IBM mainframe"
-msgstr "IBM mainframe"
+#: ../sheets/KAOS.sheet.in.h:7
+msgid "A KAOS obstacle"
+msgstr "KAOS åå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:19
-msgid "IBM mainframe with FEP"
-msgstr "IBM mainframe (å FEP)"
+#: ../sheets/KAOS.sheet.in.h:8
+msgid "A KAOS AND refinement"
+msgstr "A KAOS AND refinement"
 
-#: ../sheets/ciscocomputer.sheet.in.h:20
-msgid "JBOD"
-msgstr "JBOD"
+#: ../sheets/KAOS.sheet.in.h:9
+msgid "A KAOS complete AND refinement"
+msgstr "A KAOS complete AND refinement"
 
-#: ../sheets/ciscocomputer.sheet.in.h:22
-msgid "Macintosh"
-msgstr "ééå"
+#: ../sheets/KAOS.sheet.in.h:10
+msgid "A KAOS OR refinement"
+msgstr "A KAOS OR refinement"
 
-#: ../sheets/ciscocomputer.sheet.in.h:23
-msgid "MicroWebserver"
-msgstr "ååçéäæå"
+#: ../sheets/KAOS.sheet.in.h:11
+msgid "A KAOS complete OR refinement"
+msgstr "A KAOS complete OR refinement"
 
-#: ../sheets/ciscocomputer.sheet.in.h:24
-msgid "Mini VAX"
-msgstr "Mini VAX"
+#: ../sheets/KAOS.sheet.in.h:12
+msgid "A KAOS operationalization"
+msgstr "A KAOS operationalization"
 
-#: ../sheets/ciscocomputer.sheet.in.h:26 ../sheets/network.sheet.in.h:19
-msgid "Monitor"
-msgstr "èå"
+#: ../sheets/KAOS.sheet.in.h:13
+msgid "A KAOS contribution"
+msgstr "A KAOS contribution"
 
-#: ../sheets/ciscocomputer.sheet.in.h:27
-msgid "Newton"
-msgstr "Newton"
+#: ../sheets/KAOS.sheet.in.h:14
+msgid "A KAOS obstruction"
+msgstr "KAOS éçç"
 
-#: ../sheets/ciscocomputer.sheet.in.h:28
-msgid "PC"
-msgstr "PC"
+#: ../sheets/KAOS.sheet.in.h:15
+msgid "A KAOS binary conflict"
+msgstr "KAOS äåæèç"
 
-#: ../sheets/ciscocomputer.sheet.in.h:29
-msgid "PC Adapter Card"
-msgstr "PC éæå"
+#: ../sheets/KAOS.sheet.in.h:16
+msgid "A KAOS agent"
+msgstr "KAOS äççå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:30
-msgid "PC Card"
-msgstr "PC Card"
+#: ../sheets/KAOS.sheet.in.h:17
+msgid "A KAOS responsibility"
+msgstr "KAOS èä"
 
-#: ../sheets/ciscocomputer.sheet.in.h:31
-msgid "PC Router Card"
-msgstr "PC èçåå"
+#: ../sheets/KAOS.sheet.in.h:18
+msgid "A KAOS monitor link"
+msgstr "KAOS éççæ"
 
-#: ../sheets/ciscocomputer.sheet.in.h:32
-msgid "PC Software"
-msgstr "PC èä"
+#: ../sheets/KAOS.sheet.in.h:19
+msgid "A KAOS control link"
+msgstr "KAOS æåéç"
 
-#: ../sheets/ciscocomputer.sheet.in.h:33
-msgid "PC Video"
-msgstr "PC èå"
+#: ../sheets/KAOS.sheet.in.h:20
+msgid "A KAOS capable-of"
+msgstr "A KAOS capable-of"
 
-#: ../sheets/ciscocomputer.sheet.in.h:34
-msgid "PC with Router-Based Software"
-msgstr "åèçèäç PC"
+#: ../sheets/KAOS.sheet.in.h:21
+msgid "A KAOS performs"
+msgstr "KAOS åè"
 
-#: ../sheets/ciscocomputer.sheet.in.h:38
-msgid "SUN workstation"
-msgstr "SUN åäç"
+#: ../sheets/KAOS.sheet.in.h:22
+msgid "A KAOS operation"
+msgstr "KAOS æä"
 
-#: ../sheets/ciscocomputer.sheet.in.h:39
-msgid "Scanner"
-msgstr "ææå"
+#: ../sheets/KAOS.sheet.in.h:23
+msgid "A KAOS input"
+msgstr "KAOS èå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:40
-msgid "Server with PC Router"
-msgstr "å PC èççäæå"
+#: ../sheets/KAOS.sheet.in.h:24
+msgid "A KAOS output"
+msgstr "KAOS èå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:41
-msgid "Software-Based Router on File Server"
-msgstr "ææäæåäçèäèçå"
+#: ../sheets/Lights.sheet.in.h:1
+msgid "Lights"
+msgstr "çå"
 
-#: ../sheets/ciscocomputer.sheet.in.h:43
-msgid "Supercomputer"
-msgstr "èçéè"
+#: ../sheets/Lights.sheet.in.h:2
+msgid "Objects to design simple lighting plots"
+msgstr "èèçåçååæçççä"
 
-#: ../sheets/ciscocomputer.sheet.in.h:44
-msgid "Tablet"
-msgstr "åæéè"
+#: ../sheets/Lights.sheet.in.h:3
+msgid "PAR"
+msgstr "PAR"
 
-#: ../sheets/ciscocomputer.sheet.in.h:45
-msgid "Tape array"
-msgstr "çåéå"
+#: ../sheets/Lights.sheet.in.h:4
+msgid "PAR on the floor"
+msgstr "åä PAR"
 
-#: ../sheets/ciscocomputer.sheet.in.h:46
-msgid "Terminal"
-msgstr "ççæ"
+#: ../sheets/Lights.sheet.in.h:5
+msgid "ACL"
+msgstr "ACL"
 
-#: ../sheets/ciscocomputer.sheet.in.h:47
-msgid "WWW server"
-msgstr "WWW äæå"
+#: ../sheets/Lights.sheet.in.h:6
+msgid "Pebble Convex lantern"
+msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:48
-msgid "Web browser"
-msgstr "çéçèå"
+#: ../sheets/Lights.sheet.in.h:7
+msgid "Fresnel lantern"
+msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:49
-msgid "Web cluster"
-msgstr "çéåé"
+#: ../sheets/Lights.sheet.in.h:8
+msgid "Striplight"
+msgstr "æç"
 
-#: ../sheets/ciscocomputer.sheet.in.h:50
-msgid "Wireless"
-msgstr "çççç"
+#: ../sheets/Lights.sheet.in.h:9
+msgid "Ellipsoidal Reflector Spotlight"
+msgstr ""
 
-#: ../sheets/ciscocomputer.sheet.in.h:51
-msgid "Workgroup director"
-msgstr "åäçççç"
+#: ../sheets/Lights.sheet.in.h:10
+msgid "Blinders"
+msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:1
-msgid "100BaseT Hub"
-msgstr "100BaseT éçå"
+#: ../sheets/Lights.sheet.in.h:11
+msgid "Black light"
+msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:2
-msgid "7500ARS (7513) Router"
-msgstr "7500ARS (7513) èçå"
+#: ../sheets/Lights.sheet.in.h:12
+msgid "Stroboscope light"
+msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:3
-msgid "7505 Router"
-msgstr "7505 èçå"
+#: ../sheets/Lights.sheet.in.h:13
+msgid "Moving head"
+msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:4
-msgid "7507 Router"
-msgstr "7507 èçå"
+#: ../sheets/Lights.sheet.in.h:15
+msgid "Structure"
+msgstr "çæ"
 
-#: ../sheets/ciscohub.sheet.in.h:5
-msgid "ASIC Processor"
-msgstr "ASIC èçå"
+#: ../sheets/Logic.sheet.in.h:1
+msgid "Logic"
+msgstr "éè"
 
-#: ../sheets/ciscohub.sheet.in.h:6
-msgid "ATM 3800"
-msgstr "ATM 3800"
+#: ../sheets/Logic.sheet.in.h:2
+msgid "Boolean Logic"
+msgstr "éèéè"
 
-#: ../sheets/ciscohub.sheet.in.h:7
-msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM Fast Gigabit Etherswitch"
+#: ../sheets/Logic.sheet.in.h:3
+msgid "OR gate"
+msgstr "æé"
 
-#: ../sheets/ciscohub.sheet.in.h:8
-msgid "ATM Switch"
-msgstr "ATM äæå"
+#: ../sheets/Logic.sheet.in.h:4
+msgid "AND gate"
+msgstr "åé"
 
-#: ../sheets/ciscohub.sheet.in.h:9
-msgid "ATM Tag Switch Router"
-msgstr "ATM æèäæèçå"
+#: ../sheets/Logic.sheet.in.h:5
+msgid "XOR gate"
+msgstr "äææé"
 
-#: ../sheets/ciscohub.sheet.in.h:10
-msgid "Access Gateway"
-msgstr "ååéèé"
+#: ../sheets/Logic.sheet.in.h:6
+msgid "Simple buffer"
+msgstr "çåçè"
 
-#: ../sheets/ciscohub.sheet.in.h:11
-msgid "BBSM"
-msgstr "BBSM"
+#: ../sheets/Logic.sheet.in.h:7
+msgid "Inverter"
+msgstr "ææå"
 
-#: ../sheets/ciscohub.sheet.in.h:12
-msgid "Broadband router"
-msgstr "åéèçå"
+#: ../sheets/Logic.sheet.in.h:8
+msgid "NAND gate"
+msgstr "ååé"
 
-#: ../sheets/ciscohub.sheet.in.h:13
-msgid "CSM-S"
-msgstr "CSM-S"
+#: ../sheets/Logic.sheet.in.h:9
+msgid "NOR gate"
+msgstr "åæé"
 
-#: ../sheets/ciscohub.sheet.in.h:14
-msgid "Carrier Routing System"
-msgstr "Carrier Routing System"
+#: ../sheets/Logic.sheet.in.h:10
+msgid "NOT"
+msgstr "åé"
 
-#: ../sheets/ciscohub.sheet.in.h:15
-msgid "Cisco - Switch"
-msgstr "Cisco - äæå"
+#: ../sheets/Logic.sheet.in.h:11
+msgid "Cross-connector"
+msgstr "çäéæå"
 
-#: ../sheets/ciscohub.sheet.in.h:16
-msgid "Cisco 1000"
-msgstr "Cisco 1000"
+#: ../sheets/Misc.sheet.in.h:1
+msgid "Miscellaneous"
+msgstr "åå"
 
-#: ../sheets/ciscohub.sheet.in.h:17
-msgid "Cisco Hub"
-msgstr "Cisco éçå"
+#: ../sheets/Misc.sheet.in.h:2
+msgid "Miscellaneous Shapes"
+msgstr "åååå"
 
-#: ../sheets/ciscohub.sheet.in.h:18
-msgid "Content Router"
-msgstr "ååèçå"
+#: ../sheets/Misc.sheet.in.h:3
+msgid "Tree"
+msgstr "æ"
 
-#: ../sheets/ciscohub.sheet.in.h:19
-msgid "Content Service Module"
-msgstr "ååæåæç"
+#: ../sheets/Misc.sheet.in.h:4
+msgid "Folder"
+msgstr "èæå"
 
-#: ../sheets/ciscohub.sheet.in.h:20
-msgid "Content Service Switch 1100"
-msgstr "ååæåäæå 1100"
+#: ../sheets/Misc.sheet.in.h:6
+msgid "expansible node"
+msgstr "åæåçé"
 
-#: ../sheets/ciscohub.sheet.in.h:21
-msgid "Content Switch"
-msgstr "ååäæå"
+#: ../sheets/Misc.sheet.in.h:7
+msgid "expanded node"
+msgstr "æåçé"
 
-#: ../sheets/ciscohub.sheet.in.h:22
-msgid "Data Center Switch"
-msgstr "èæäåäæå"
+#: ../sheets/Misc.sheet.in.h:8
+msgid "Traditional clock"
+msgstr "äèæé"
 
-#: ../sheets/ciscohub.sheet.in.h:23
-msgid "Data Center Switch Reversed"
-msgstr "èæäåäæåïååï"
+#: ../sheets/Misc.sheet.in.h:9
+msgid "Measure distance"
+msgstr "éåèé"
 
-#: ../sheets/ciscohub.sheet.in.h:24
-msgid "Data Switch Processor"
-msgstr "èæäæåèçå"
+#: ../sheets/Misc.sheet.in.h:10
+msgid "Resizable grid"
+msgstr "åéèååæç"
 
-#: ../sheets/ciscohub.sheet.in.h:25
-msgid "Director-class Fibre Channel intelligent switch"
+#: ../sheets/Misc.sheet.in.h:11
+msgid "New-style group object, for testing"
 msgstr ""
 
-#: ../sheets/ciscohub.sheet.in.h:26
-msgid "Edge Label Switch Router"
-msgstr "Edge Label Switch Router"
+#: ../sheets/MSE.sheet.in.h:1
+msgid "MSE"
+msgstr "MSE"
 
-#: ../sheets/ciscohub.sheet.in.h:27
-msgid "Edge Label Switch Router with NetFlow"
-msgstr ""
+#: ../sheets/MSE.sheet.in.h:2
+msgid "U.S. Army Mobile Subscriber Equipment Components"
+msgstr "çèæèååéèçç (Mobile Subscriber Equipment) åä"
 
-#: ../sheets/ciscohub.sheet.in.h:28
-msgid "Generic Processor"
-msgstr "äèèçå"
+#: ../sheets/MSE.sheet.in.h:3
+msgid "Node center"
+msgstr "çéäå"
 
-#: ../sheets/ciscohub.sheet.in.h:30
-msgid "Hub subdued"
-msgstr "æååéçå"
+#: ../sheets/MSE.sheet.in.h:4
+msgid "Large extension node"
+msgstr "ååäçé"
 
-#: ../sheets/ciscohub.sheet.in.h:31
-msgid "ISDN switch"
-msgstr "ISDN äæå"
+#: ../sheets/MSE.sheet.in.h:5
+msgid "Small extension node"
+msgstr "ååäçé"
 
-#: ../sheets/ciscohub.sheet.in.h:32
-msgid "LAN2LAN Switch"
-msgstr "LAN2LAN äæå"
+#: ../sheets/MSE.sheet.in.h:6
+msgid "Tactical satellite communications terminal"
+msgstr "æçèæéèççæ"
 
-#: ../sheets/ciscohub.sheet.in.h:33
-msgid "Label Switch Router"
-msgstr "æçäæåèïçå"
+#: ../sheets/MSE.sheet.in.h:7
+msgid "Multiplexer"
+msgstr "ååå"
 
-#: ../sheets/ciscohub.sheet.in.h:34
-msgid "Layer 2 Remote Switch"
-msgstr "Layer 2 éçäæå"
+#: ../sheets/MSE.sheet.in.h:8
+msgid "Demultiplexer"
+msgstr "ååå"
 
-#: ../sheets/ciscohub.sheet.in.h:35
-msgid "MGX 8220"
-msgstr "MGX 8220"
+#: ../sheets/network.sheet.in.h:1
+msgid "Network"
+msgstr "çç"
 
-#: ../sheets/ciscohub.sheet.in.h:36
-msgid "MGX 8240"
-msgstr "MGX 8240"
+#: ../sheets/network.sheet.in.h:2
+msgid "Objects to design network diagrams with"
+msgstr "èèççåèçççä"
 
-#: ../sheets/ciscohub.sheet.in.h:37
-msgid "MGX 8260"
-msgstr "MGX 8260"
+#: ../sheets/network.sheet.in.h:3
+msgid "Computer"
+msgstr "éè"
 
-#: ../sheets/ciscohub.sheet.in.h:38
-msgid "Multi-Fabric Server Switch"
-msgstr "Multi-Fabric äæåäæå"
+#: ../sheets/network.sheet.in.h:5
+msgid "Storage"
+msgstr "ååèç"
 
-#: ../sheets/ciscohub.sheet.in.h:39
-msgid "MultiSwitch Device"
-msgstr "MultiSwitch èç"
+#: ../sheets/network.sheet.in.h:6
+msgid "Ethernet bus"
+msgstr "Ethernet åææ"
 
-#: ../sheets/ciscohub.sheet.in.h:40
-msgid "Multilayer Remote Switch"
-msgstr "Multilayer éçäæå"
+#: ../sheets/network.sheet.in.h:7
+msgid "Simple printer"
+msgstr "æéæåæ"
 
-#: ../sheets/ciscohub.sheet.in.h:41
-msgid "Multilayer Switch"
-msgstr "Multilayer äæå"
+#: ../sheets/network.sheet.in.h:8
+msgid "WAN connection"
+msgstr "WAN éç"
+
+#: ../sheets/network.sheet.in.h:9
+msgid "WAN link"
+msgstr "WAN éç"
+
+#: ../sheets/network.sheet.in.h:10
+msgid "Stackable hub or switch"
+msgstr "åçæåéçåæäæå"
+
+#: ../sheets/network.sheet.in.h:11
+msgid "Modular switching system"
+msgstr "æçåäæçç"
 
-#: ../sheets/ciscohub.sheet.in.h:42
-msgid "Multilayer Switch with Silicon"
-msgstr "Multilayer äæå (å Silicon)"
+#: ../sheets/network.sheet.in.h:12
+msgid "24 Port Patch Panel"
+msgstr "24 åéçéæ"
 
-#: ../sheets/ciscohub.sheet.in.h:43
-msgid "Multilayer Switch with Silicon subdued"
-msgstr "Multilayer äæå (å Siliconïæå)"
+#: ../sheets/network.sheet.in.h:13
+msgid "RJ45 wall-plug"
+msgstr "RJ45 æé"
 
-#: ../sheets/ciscohub.sheet.in.h:44
-msgid "NetFlow router"
-msgstr "NetFlow èçå"
+#: ../sheets/network.sheet.in.h:14
+msgid "Wall-plug for the scEAD cabling system"
+msgstr "scEAD ççççåææé"
 
-#: ../sheets/ciscohub.sheet.in.h:45
-msgid "NetRanger"
-msgstr "NetRanger"
+#: ../sheets/network.sheet.in.h:15
+msgid "Simple modem"
+msgstr "æéæææ"
 
-#: ../sheets/ciscohub.sheet.in.h:46
-msgid "NetSonar"
-msgstr "NetSonar"
+#: ../sheets/network.sheet.in.h:16
+msgid "Antenna for wireless transmission"
+msgstr "ççççåç"
 
-#: ../sheets/ciscohub.sheet.in.h:47
-msgid "Optical Services Router"
-msgstr "ååæåèçå"
+#: ../sheets/network.sheet.in.h:17
+msgid "Mobile telephony base station"
+msgstr "æåéèååå"
 
-#: ../sheets/ciscohub.sheet.in.h:48
-msgid "PXF"
-msgstr "PXF"
+#: ../sheets/network.sheet.in.h:18
+msgid "Network cloud"
+msgstr "äèçççéçåæ"
 
-#: ../sheets/ciscohub.sheet.in.h:49
-msgid "Programmable Switch"
-msgstr "åçååäæå"
+#: ../sheets/network.sheet.in.h:19
+msgid "Mobile telephony cell"
+msgstr "æåéèçæ"
 
-#: ../sheets/ciscohub.sheet.in.h:50
-msgid "RateMUX"
-msgstr "RateMUX"
+#: ../sheets/network.sheet.in.h:20
+msgid "Router symbol"
+msgstr "èçåçè"
 
-#: ../sheets/ciscohub.sheet.in.h:51
-msgid "Route Switch Processor"
-msgstr "èçäæåèçå"
+#: ../sheets/network.sheet.in.h:21
+msgid "Switch symbol"
+msgstr "äæåçè"
 
-#: ../sheets/ciscohub.sheet.in.h:52
-msgid "Route Switch Processor with Si"
-msgstr "èçäæåèçåïå Siï"
+#: ../sheets/network.sheet.in.h:22
+msgid "ATM switch symbol"
+msgstr "ATM äæå(switch)"
 
-#: ../sheets/ciscohub.sheet.in.h:54
-msgid "Router and switch shapes by Cisco"
-msgstr "ç Cisco æäçèçåèäæååå"
+#: ../sheets/network.sheet.in.h:23
+msgid "Firewall router"
+msgstr "éççèçå"
 
-#: ../sheets/ciscohub.sheet.in.h:55
-msgid "Router subdued"
-msgstr "æåçèçå"
+#: ../sheets/network.sheet.in.h:24
+msgid "Workstation monitor"
+msgstr "åäçèå"
 
-#: ../sheets/ciscohub.sheet.in.h:56
-msgid "Router with Firewall"
-msgstr "åéçççèçå"
+#: ../sheets/network.sheet.in.h:25
+msgid "UNIX workstation"
+msgstr "UNIX åäç"
 
-#: ../sheets/ciscohub.sheet.in.h:57
-msgid "Router with Silicon Switch"
-msgstr "èçå (å Silicon Switch)"
+#: ../sheets/network.sheet.in.h:26
+msgid "Desktop PC"
+msgstr "æééè"
 
-#: ../sheets/ciscohub.sheet.in.h:58
-msgid "Server Switch"
-msgstr "äæåäæå"
+#: ../sheets/network.sheet.in.h:27
+msgid "Laptop PC"
+msgstr "ææéè"
 
-#: ../sheets/ciscohub.sheet.in.h:59
-msgid "Small Hub"
-msgstr "ååéçå"
+#: ../sheets/network.sheet.in.h:28
+msgid "Bigtower PC"
+msgstr "Bigtower PC"
 
-#: ../sheets/ciscohub.sheet.in.h:60
-msgid "Storage Router"
-msgstr "ååèçå"
+#: ../sheets/network.sheet.in.h:29
+msgid "Miditower PC"
+msgstr "Midtower PC"
 
-#: ../sheets/ciscohub.sheet.in.h:61
-msgid "Switch Processor"
-msgstr "äæåèçå"
+#: ../sheets/network.sheet.in.h:30
+msgid "Minitower PC"
+msgstr "Minitower PC"
 
-#: ../sheets/ciscohub.sheet.in.h:62
-msgid "Universal Gateway"
-msgstr "éçéèé"
+#: ../sheets/network.sheet.in.h:31
+msgid "Speaker with integrated amplifier"
+msgstr "åçåååçæèå"
 
-#: ../sheets/ciscohub.sheet.in.h:63
-msgid "Virtual Layer Switch"
-msgstr "Virtual Layer äæå"
+#: ../sheets/network.sheet.in.h:32
+msgid "Speaker without amplifier"
+msgstr "ææåååçæèå"
 
-#: ../sheets/ciscohub.sheet.in.h:64
-msgid "Wavelength router"
-msgstr "æéèçå"
+#: ../sheets/network.sheet.in.h:33
+msgid "3 1/2 inch diskette"
+msgstr "3.5 åèçç"
 
-#: ../sheets/ciscohub.sheet.in.h:65
-msgid "Wireless router"
-msgstr "ççèçå"
+#: ../sheets/network.sheet.in.h:34
+msgid "ZIP disk"
+msgstr "ZIP ç"
 
-#: ../sheets/ciscohub.sheet.in.h:66
-msgid "Workgroup 5000"
-msgstr "Workgroup 5000"
+#: ../sheets/network.sheet.in.h:35
+msgid "External DAT drive"
+msgstr "åç DAT çåæ"
 
-#: ../sheets/ciscohub.sheet.in.h:67
-msgid "Workgroup 5002"
-msgstr "Workgroup 5002"
+#: ../sheets/network.sheet.in.h:36
+msgid "Mobile phone"
+msgstr "æåéè"
 
-#: ../sheets/ciscohub.sheet.in.h:68
-msgid "Workgroup 5500"
-msgstr "Workgroup 5500"
+#: ../sheets/network.sheet.in.h:37
+msgid "Telephone"
+msgstr "éè"
 
-#: ../sheets/ciscohub.sheet.in.h:69
-msgid "Workgroup Fibre Channel intelligent switch"
-msgstr "Workgroup åçééææåäæå"
+#: ../sheets/network.sheet.in.h:38
+msgid "Plotter"
+msgstr "çåæ"
 
-#: ../sheets/ciscohub.sheet.in.h:70
-msgid "Workgroup Switch Voice-Enabled"
-msgstr "Workgroup äæåïèéï"
+#: ../sheets/network.sheet.in.h:39
+msgid "Digitizing board"
+msgstr "èåå"
 
-#: ../sheets/ciscohub.sheet.in.h:71
-msgid "Workgroup switch"
-msgstr "Workgroup äæå"
+#: ../sheets/Pneumatic.sheet.in.h:1
+msgid "Pneumatic/Hydraulic"
+msgstr "æå/æå"
 
-#: ../sheets/ciscohub.sheet.in.h:72
-msgid "Workgroup switch Subdued"
-msgstr "Workgroup æååäæå"
+#: ../sheets/Pneumatic.sheet.in.h:2
+msgid "Components for pneumatic and hydraulic circuits"
+msgstr "æååèæååéèåä"
 
-#: ../sheets/ciscohub.sheet.in.h:73
-msgid "iSCSI switch"
-msgstr "iSCSI äæå"
+#: ../sheets/Pneumatic.sheet.in.h:3
+msgid "Double-effect jack"
+msgstr "Double-effect jack"
 
-#: ../sheets/ciscomisc.sheet.in.h:1
-msgid "Androgynous Person"
-msgstr "ééåéçä"
+#: ../sheets/Pneumatic.sheet.in.h:4
+msgid "Normally-in simple-effect jack"
+msgstr "Normally-in simple-effect jack"
 
-#: ../sheets/ciscomisc.sheet.in.h:2
-msgid "Antenna"
-msgstr "åç"
+#: ../sheets/Pneumatic.sheet.in.h:5
+msgid "Normally-out simple-effect jack"
+msgstr "Normally-out simple-effect jack"
 
-#: ../sheets/ciscomisc.sheet.in.h:3
-msgid "Branch office"
-msgstr "åæèåå"
+#: ../sheets/Pneumatic.sheet.in.h:6
+msgid "Generic pressure source"
+msgstr "äèååäæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:4
-msgid "Branch office blue"
-msgstr "åæèååè"
+#: ../sheets/Pneumatic.sheet.in.h:7
+msgid "Hydraulic pressure source"
+msgstr "æåäæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:5
-msgid "Branch office subdued"
-msgstr "æåçåæèåå"
+#: ../sheets/Pneumatic.sheet.in.h:8
+msgid "Pneumatic pressure source"
+msgstr "æåäæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:6
-msgid "Car"
-msgstr "è"
+#: ../sheets/Pneumatic.sheet.in.h:9
+msgid "Air exhaust orifice"
+msgstr "çææåå"
 
-#: ../sheets/ciscomisc.sheet.in.h:7
-msgid "Cisco - Misc"
-msgstr "Cisco - åä"
+#: ../sheets/Pneumatic.sheet.in.h:10
+msgid "2/2 distributor"
+msgstr "2/2 åéå"
 
-#: ../sheets/ciscomisc.sheet.in.h:8
-msgid "CiscoWorks Man"
-msgstr "CiscoWorks çä"
+#: ../sheets/Pneumatic.sheet.in.h:11
+msgid "3/2 distributor"
+msgstr "3/2 åéå"
 
-#: ../sheets/ciscomisc.sheet.in.h:10
-msgid "Generic Building"
-msgstr "äèåç"
+#: ../sheets/Pneumatic.sheet.in.h:12
+msgid "4/2 distributor"
+msgstr "4/2 åéå"
 
-#: ../sheets/ciscomisc.sheet.in.h:11
-msgid "Generic Building blue"
-msgstr "äèåçïèèï"
+#: ../sheets/Pneumatic.sheet.in.h:13
+msgid "5/2 distributor"
+msgstr "5/2 åéå"
 
-#: ../sheets/ciscomisc.sheet.in.h:12
-msgid "Generic Building subdued"
-msgstr "äèåçïæåï"
+#: ../sheets/Pneumatic.sheet.in.h:14
+msgid "Muscular command"
+msgstr "Muscular command"
 
-#: ../sheets/ciscomisc.sheet.in.h:13
-msgid "Government Building"
-msgstr "æååç"
+#: ../sheets/Pneumatic.sheet.in.h:15
+msgid "Push-button command"
+msgstr "Push-button command"
 
-#: ../sheets/ciscomisc.sheet.in.h:14
-msgid "Headphones"
-msgstr "èæ"
+#: ../sheets/Pneumatic.sheet.in.h:16
+msgid "Mechanical command by tappet"
+msgstr "Mechanical command by tappet"
 
-#: ../sheets/ciscomisc.sheet.in.h:15
-msgid "Home office"
-msgstr "ååèåå"
+#: ../sheets/Pneumatic.sheet.in.h:17
+msgid "Mechanical command by spring"
+msgstr "Mechanical command by spring"
 
-#: ../sheets/ciscomisc.sheet.in.h:16
-msgid "House"
-msgstr "äå"
+#: ../sheets/Pneumatic.sheet.in.h:18
+msgid "Electric command (single coil)"
+msgstr "Electric command (single coil)"
 
-#: ../sheets/ciscomisc.sheet.in.h:17
-msgid "House blue"
-msgstr "äåïèèï"
+#: ../sheets/Pneumatic.sheet.in.h:19
+msgid "Electric command (double coil)"
+msgstr "Electric command (double coil)"
 
-#: ../sheets/ciscomisc.sheet.in.h:18
-msgid "Key"
-msgstr "åçå"
+#: ../sheets/Pneumatic.sheet.in.h:20
+msgid "Indirect command by hydraulic driver"
+msgstr "Indirect command by hydraulic driver"
 
-#: ../sheets/ciscomisc.sheet.in.h:20
-msgid "Lock and Key"
-msgstr "éèåçå"
+#: ../sheets/Pneumatic.sheet.in.h:21
+msgid "Indirect command by pneumatic driver"
+msgstr "Indirect command by pneumatic driver"
 
-#: ../sheets/ciscomisc.sheet.in.h:21
-msgid "MDU"
-msgstr "MDU"
+#: ../sheets/SADT.sheet.in.h:1
+msgid "SADT/IDEF0"
+msgstr "SADT/IDEF0"
 
-#: ../sheets/ciscomisc.sheet.in.h:22
-msgid "Mac Woman"
-msgstr "Mac åä"
+#: ../sheets/SADT.sheet.in.h:2
+msgid "Objects to design SADT diagrams"
+msgstr "èè SADT åèæçççä"
 
-#: ../sheets/ciscomisc.sheet.in.h:23
-msgid "Man"
-msgstr "çä"
+#: ../sheets/SADT.sheet.in.h:3
+msgid "Activity/data flow arrow"
+msgstr "æå/èææççé"
 
-#: ../sheets/ciscomisc.sheet.in.h:24
-msgid "Man blue"
-msgstr "çäïèèï"
+#: ../sheets/SADT.sheet.in.h:4
+msgid "Activity/data box"
+msgstr "æå/èææå"
 
-#: ../sheets/ciscomisc.sheet.in.h:25
-msgid "Man gold"
-msgstr "çäïéèï"
+#: ../sheets/SADT.sheet.in.h:5
+msgid "Flow label"
+msgstr "æçæç"
 
-#: ../sheets/ciscomisc.sheet.in.h:26
-msgid "Man red"
-msgstr "çäïçèï"
+#: ../sheets/SDL.sheet.in.h:1
+msgid "SDL"
+msgstr "SDL"
 
-#: ../sheets/ciscomisc.sheet.in.h:27
-msgid "Medium Building"
-msgstr "äååç"
+#: ../sheets/SDL.sheet.in.h:2
+msgid "Specification and Description Language."
+msgstr "èææèèè (SDL)"
 
-#: ../sheets/ciscomisc.sheet.in.h:28
-msgid "Medium Building blue"
-msgstr "äååçïèèï"
+#: ../sheets/SDL.sheet.in.h:3
+msgid "Block type reference"
+msgstr "ååéååè"
 
-#: ../sheets/ciscomisc.sheet.in.h:29
-msgid "Medium Building subdued"
-msgstr "äååçïæåï"
+#: ../sheets/SDL.sheet.in.h:4
+msgid "Service type reference"
+msgstr "æåéååè"
 
-#: ../sheets/ciscomisc.sheet.in.h:31
-msgid "Miscellaneous shapes by Cisco"
-msgstr "Cisco æäçåååç"
+#: ../sheets/SDL.sheet.in.h:5
+msgid "Process type reference"
+msgstr "çåéååè"
 
-#: ../sheets/ciscomisc.sheet.in.h:32
-msgid "PC Man"
-msgstr "PC çä"
+#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
+msgid "State"
+msgstr "çæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:33
-msgid "PC Man left"
-msgstr "PC çäïåï"
+#: ../sheets/SDL.sheet.in.h:7
+msgid "Function header"
+msgstr "åçæé"
 
-#: ../sheets/ciscomisc.sheet.in.h:34
-msgid "Running man"
-msgstr "èæççä"
+#: ../sheets/SDL.sheet.in.h:8
+msgid "Send message"
+msgstr "åéèæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:35
-msgid "Running man subdued"
-msgstr "èæççäïæåï"
+#: ../sheets/SDL.sheet.in.h:9
+msgid "Receive message"
+msgstr "ææèæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:36
-msgid "Running woman"
-msgstr "èæçåä"
+#: ../sheets/SDL.sheet.in.h:10
+msgid "Function call"
+msgstr "åæåå"
 
-#: ../sheets/ciscomisc.sheet.in.h:37
-msgid "Satellite"
-msgstr "èæ"
+#: ../sheets/SDL.sheet.in.h:12
+msgid "Action being executed"
+msgstr "èåèçåä"
 
-#: ../sheets/ciscomisc.sheet.in.h:38
-msgid "Satellite dish"
-msgstr "èæåç"
+#: ../sheets/SDL.sheet.in.h:13
+msgid "Save state"
+msgstr "ååçæ"
 
-#: ../sheets/ciscomisc.sheet.in.h:39
-msgid "Sitting Woman"
-msgstr "åççåä"
+#: ../sheets/SDL.sheet.in.h:15
+msgid "In/Out connector"
+msgstr "èå/åéæå"
 
-#: ../sheets/ciscomisc.sheet.in.h:40
-msgid "Sitting Woman right"
-msgstr "åççåäïåï"
+#: ../sheets/SDL.sheet.in.h:17
+msgid "Procedure return"
+msgstr "éçèå"
 
-#: ../sheets/ciscomisc.sheet.in.h:41
-msgid "Small Business"
-msgstr "ååå"
+#: ../sheets/SDL.sheet.in.h:19
+msgid "Generic text note"
+msgstr "æéæååè"
 
-#: ../sheets/ciscomisc.sheet.in.h:43
-msgid "Standing Man"
-msgstr "ççççä"
+#: ../sheets/Shape_Design.sheet.in.h:1
+msgid "Shape Design"
+msgstr "ååèè"
 
-#: ../sheets/ciscomisc.sheet.in.h:44
-msgid "Standing woman"
-msgstr "çççåä"
+#: ../sheets/Shape_Design.sheet.in.h:2
+msgid "Design Dia objects with individual connection points"
+msgstr "èèæççéæéç Dia çä"
 
-#: ../sheets/ciscomisc.sheet.in.h:45
-msgid "Telecommuter"
-msgstr "éåéåæ"
+#: ../sheets/Shape_Design.sheet.in.h:3
+msgid "Connection Point"
+msgstr "éæé"
 
-#: ../sheets/ciscomisc.sheet.in.h:46
-msgid "Telecommuter house"
-msgstr "éåéåæäå"
+#: ../sheets/Shape_Design.sheet.in.h:4
+msgid "Main Connection Point"
+msgstr "äèéæé"
 
-#: ../sheets/ciscomisc.sheet.in.h:47
-msgid "Telecommuter house subdued"
-msgstr "æåçéåéåæäå"
+#: ../sheets/sybase.sheet.in.h:1
+msgid "Sybase"
+msgstr "Sybase"
 
-#: ../sheets/ciscomisc.sheet.in.h:48
-msgid "Truck"
-msgstr "åè"
+#: ../sheets/sybase.sheet.in.h:2
+msgid "Objects to design Sybase replication domain diagrams with"
+msgstr "èè Sybase èåçååèççä"
 
-#: ../sheets/ciscomisc.sheet.in.h:49
-msgid "University"
-msgstr "åå"
+#: ../sheets/sybase.sheet.in.h:3
+msgid "Sybase dataserver"
+msgstr "Sybase ææå"
 
-#: ../sheets/ciscomisc.sheet.in.h:50
-msgid "Video Camera"
-msgstr "èåæåæ"
+#: ../sheets/sybase.sheet.in.h:4
+msgid "Sybase replication server"
+msgstr "Sybase èåäæå"
 
-#: ../sheets/ciscomisc.sheet.in.h:51
-msgid "Video Camera right"
-msgstr "èåæåæïåï"
+#: ../sheets/sybase.sheet.in.h:5
+msgid "Log transfer manager or rep agent"
+msgstr "çéæåèçççåæèåäççå"
 
-#: ../sheets/ciscomisc.sheet.in.h:52
-msgid "Woman"
-msgstr "åä"
+#: ../sheets/sybase.sheet.in.h:6
+msgid "Stable storage device"
+msgstr "çåçååèç"
 
-#: ../sheets/ciscomisc.sheet.in.h:53
-msgid "Woman blue"
-msgstr "åäïèèï"
+#: ../sheets/sybase.sheet.in.h:7
+msgid "Sybase client application"
+msgstr "Sybase åæççå"
 
-#: ../sheets/ciscomisc.sheet.in.h:54
-msgid "Woman gold"
-msgstr "åäïéèï"
+#: ../sheets/sybase.sheet.in.h:8
+msgid "Replication server manager"
+msgstr "åæäæåçç"
 
-#: ../sheets/ciscomisc.sheet.in.h:55
-msgid "Woman red"
-msgstr "åäïçèï"
+#: ../sheets/UML.sheet.in.h:1
+msgid "UML"
+msgstr "UML"
 
-#: ../sheets/cisconetwork.sheet.in.h:1
-msgid "10700"
-msgstr "10700"
+#: ../sheets/UML.sheet.in.h:2
+msgid "Editor for UML Static Structure Diagrams"
+msgstr "UML éæçæåçèå"
 
-#: ../sheets/cisconetwork.sheet.in.h:2
-msgid "15200"
-msgstr "15200"
+#: ../sheets/UML.sheet.in.h:5
+msgid "Note"
+msgstr "åè"
 
-#: ../sheets/cisconetwork.sheet.in.h:3
-msgid "15800"
-msgstr "15800"
+#: ../sheets/UML.sheet.in.h:7
+msgid "Realizes, implements a specific interface"
+msgstr "åçïåäçåçäé"
 
-#: ../sheets/cisconetwork.sheet.in.h:4
-msgid "3174 (desktop) cluster controller"
-msgstr "3174 (æé) åéæåå"
+#: ../sheets/UML.sheet.in.h:8
+msgid "Generalization, class inheritance"
+msgstr "æçïéåçæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:5
-msgid "3X74 (floor) cluster controller"
-msgstr "3X74 (åé) åéæåå"
+#: ../sheets/UML.sheet.in.h:9
+msgid "Association, two classes are associated"
+msgstr "ééïååéååæçé"
 
-#: ../sheets/cisconetwork.sheet.in.h:6
-msgid "Access Server"
-msgstr "ååäæå"
+#: ../sheets/UML.sheet.in.h:10
+msgid "Aggregation, one class is part of another"
+msgstr "éåïäåéåæåäéåçäéå"
 
-#: ../sheets/cisconetwork.sheet.in.h:7
-msgid "AccessPoint"
-msgstr "ååé"
+#: ../sheets/UML.sheet.in.h:11
+msgid "Implements, class implements a specific interface"
+msgstr "åäïéååääçåçäé"
 
-#: ../sheets/cisconetwork.sheet.in.h:8
-msgid "Automatic Protection Switching"
-msgstr "èåäèäæ"
+#: ../sheets/UML.sheet.in.h:12
+msgid "Constraint, place a constraint on something"
+msgstr "åçïåæäåäåç"
 
-#: ../sheets/cisconetwork.sheet.in.h:9
-msgid "BBFW"
-msgstr "BBFW"
+#: ../sheets/UML.sheet.in.h:13
+msgid "Small package"
+msgstr "åååä"
 
-#: ../sheets/cisconetwork.sheet.in.h:10
-msgid "BBFW media"
-msgstr "BBFW åé"
+#: ../sheets/UML.sheet.in.h:14
+msgid "Large package"
+msgstr "åååä"
 
-#: ../sheets/cisconetwork.sheet.in.h:11
-msgid "Breakout box"
-msgstr "æäååæç(breakout box)"
+#: ../sheets/UML.sheet.in.h:16
+msgid "Use case"
+msgstr "äçæä"
 
-#: ../sheets/cisconetwork.sheet.in.h:12
-msgid "Bridge"
-msgstr "ææå"
+#: ../sheets/UML.sheet.in.h:17
+msgid "Lifeline"
+msgstr "çåç"
 
-#: ../sheets/cisconetwork.sheet.in.h:13
-msgid "CDDI/FDDI Concentrator"
-msgstr "CDDI/FDDI Concentrator"
+#: ../sheets/UML.sheet.in.h:18
+msgid "Object"
+msgstr "çä"
 
-#: ../sheets/cisconetwork.sheet.in.h:14
-msgid "CDM Content Distribution Manager"
-msgstr "CDM Content Distribution Manager"
+#: ../sheets/UML.sheet.in.h:19
+msgid "Message"
+msgstr "èæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:15
-msgid "CSU/DSU"
-msgstr "CSU/DSU"
+#: ../sheets/UML.sheet.in.h:20
+msgid "Component"
+msgstr "åä"
 
-#: ../sheets/cisconetwork.sheet.in.h:16
-msgid "Cable Modem"
-msgstr "ççæææ"
+#: ../sheets/UML.sheet.in.h:25
+msgid "Node"
+msgstr "çé"
 
-#: ../sheets/cisconetwork.sheet.in.h:17
-msgid "Catalyst Access Gateway"
-msgstr "Catalyst ååééå"
+#: ../sheets/UML.sheet.in.h:26
+msgid "Class stereotype icon"
+msgstr "éååååç"
 
-#: ../sheets/cisconetwork.sheet.in.h:18
-msgid "Centri Firewall"
-msgstr "Centri éçç"
+#: ../sheets/UML.sheet.in.h:27
+msgid "Initial/End state"
+msgstr "åå/çæçæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:19
-msgid "Channelized Pipe"
-msgstr "ééåçé"
+#: ../sheets/UML.sheet.in.h:29
+msgid "Activity"
+msgstr "æå"
 
-#: ../sheets/cisconetwork.sheet.in.h:20
-msgid "Cisco - Network"
-msgstr "Cisco - çç"
+#: ../sheets/UML.sheet.in.h:31
+msgid "Fork/Union"
+msgstr "åå/èå"
 
-#: ../sheets/cisconetwork.sheet.in.h:21
-msgid "Cloud"
-msgstr "é"
+#~ msgid "Show this help message"
+#~ msgstr "éçæèæèæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:22
-msgid "Cloud Dark"
-msgstr "éïæï"
+#~ msgid "Thank you for using Dia.\n"
+#~ msgstr "æèæäç Diaã\n"
 
-#: ../sheets/cisconetwork.sheet.in.h:23
-msgid "Cloud Gold"
-msgstr "éïéèï"
+#~ msgid "[OPTION...] [FILE...]"
+#~ msgstr "[éé...] [ææ...]"
 
-#: ../sheets/cisconetwork.sheet.in.h:24
-msgid "Cloud White"
-msgstr "éïçèï"
+#~ msgid ""
+#~ "Error on option %s: %s.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "éé %s ççéèï%sã\n"
+#~ "åèâ%s --helpâååååæçæäåééã\n"
 
-#: ../sheets/cisconetwork.sheet.in.h:25
-msgid "Concatenated Payload"
-msgstr ""
+#~ msgid "'%s' not found!\n"
+#~ msgstr "æäåâ%sâï\n"
 
-#: ../sheets/cisconetwork.sheet.in.h:26
-msgid "Content Engine (Cache Director)"
-msgstr "åååæ(ååååå)"
+#~ msgid "Recovering autosaved diagrams"
+#~ msgstr "æåæååèåååçåè"
 
-#: ../sheets/cisconetwork.sheet.in.h:27
-msgid "Content Transformation Engine (CTE)"
-msgstr "ååèæåæ (CTE)"
+#~ msgid ""
+#~ "Autosaved files exist.\n"
+#~ "Please select those you wish to recover."
+#~ msgstr ""
+#~ "ççèåååçææã\n"
+#~ "èéååææååççææã"
 
-#: ../sheets/cisconetwork.sheet.in.h:28
-msgid "DSLAM"
-msgstr "DSLAM"
+#~ msgid "Could not initialize Bonobo!"
+#~ msgstr "çæååå Bonoboï"
 
-#: ../sheets/cisconetwork.sheet.in.h:29
-msgid "DWDM Filter"
-msgstr "DWDM éæå"
+#~ msgid "X position"
+#~ msgstr "X äç"
 
-#: ../sheets/cisconetwork.sheet.in.h:30
-msgid "Detector"
-msgstr "åæå"
+#~ msgid "X position of child widget"
+#~ msgstr "åäéååç X äç"
 
-#: ../sheets/cisconetwork.sheet.in.h:31
-msgid "Digital Cross-Connect"
-msgstr "æçäåéç"
+#~ msgid "Y position"
+#~ msgstr "Y äç"
 
-#: ../sheets/cisconetwork.sheet.in.h:32
-msgid "Directory Server"
-msgstr "çéäæå"
+#~ msgid "Y position of child widget"
+#~ msgstr "åäéååç Y äç"
 
-#: ../sheets/cisconetwork.sheet.in.h:33
-msgid "Distributed Director"
-msgstr "æäååå"
+#~ msgid "Export format to use"
+#~ msgstr "ååçæææå"
 
-#: ../sheets/cisconetwork.sheet.in.h:34
-msgid "Dual Mode AccessPoint"
-msgstr "éæåååé"
+#~ msgid "eps,png,wmf,cgm,dxf,fig"
+#~ msgstr "eps,png,wmf,cgm,dxf,fig"
 
-#: ../sheets/cisconetwork.sheet.in.h:35
-msgid "FDDI Ring"
-msgstr "FDDI ç"
+#~ msgid "Export file name to use"
+#~ msgstr "ååææäççæå"
 
-#: ../sheets/cisconetwork.sheet.in.h:36
-msgid "File Engine"
-msgstr "ææåæ"
+#~ msgid "Quiet operation"
+#~ msgstr "äéçèæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:37
-msgid "Firewall"
-msgstr "éçç"
+#~ msgid ""
+#~ "Error: No arguments found.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "éèïæäåääåæã\n"
+#~ "åèâ%s --helpâååååæçæäåééã\n"
 
-#: ../sheets/cisconetwork.sheet.in.h:38
-msgid "Firewall Service Module"
-msgstr "éççæåæç"
+#~ msgid "%s error: can specify only one of -t or -o."
+#~ msgstr "%s éèï-t æ -o ééääååäçåääåã"
 
-#: ../sheets/cisconetwork.sheet.in.h:39
-msgid "Firewall horizontal"
-msgstr "éççïæåï"
+#~ msgid ""
+#~ "%s error: must specify only one of -t or -o.\n"
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "%s éèï-t æ -o ééääååäçåääåãåèâ%s --helpâååååæçæ"
+#~ "äåééã\n"
 
-#: ../sheets/cisconetwork.sheet.in.h:40
-msgid "Firewall subdued"
-msgstr "éççïæåï"
+#~ msgid "%s error: no input file."
+#~ msgstr "%s éèïææèåæã"
 
-#: ../sheets/cisconetwork.sheet.in.h:41
-msgid "General Appliance"
-msgstr "äèåå"
+#~ msgid "%s error: only one input file expected."
+#~ msgstr "%s éèïåèæåäåèåæã"
 
-#: ../sheets/cisconetwork.sheet.in.h:42
-msgid "Generic Gateway"
-msgstr "äèéèé"
+#~ msgid "%s error: popt library not available on this system"
+#~ msgstr "%s éèïæççäææ popt ååå"
 
-#: ../sheets/cisconetwork.sheet.in.h:44
-msgid "IOS Firewall"
-msgstr "IOS éçç"
+#~ msgid "/_Sort objects"
+#~ msgstr "/æåçä(_S)"
 
-#: ../sheets/cisconetwork.sheet.in.h:45
-msgid "IOS SLB"
-msgstr "IOS SLB"
+#~ msgid "/Sort objects/by _name"
+#~ msgstr "/æåçä(S)/ææåç(_N)"
 
-#: ../sheets/cisconetwork.sheet.in.h:46
-msgid "IP"
-msgstr "IP"
+#~ msgid "/Sort objects/by _type"
+#~ msgstr "/æåçä(S)/ææéå(_T)"
 
-#: ../sheets/cisconetwork.sheet.in.h:47
-msgid "IP DSL Switch"
-msgstr "IP DSL äæå"
+#~ msgid "/Sort objects/as _inserted"
+#~ msgstr "/æåçä(S)/ææååçæå(_I)"
 
-#: ../sheets/cisconetwork.sheet.in.h:48
-msgid "IP Old-style"
-msgstr "IP èå"
+#~ msgid "/Sort objects/All by name"
+#~ msgstr "/æåçä(S)/åéïææåç"
 
-#: ../sheets/cisconetwork.sheet.in.h:49
-msgid "IP Transport Concentrator"
-msgstr ""
+#~ msgid "/Sort objects/All by type"
+#~ msgstr "/æåçä(S)/åéïææéå"
 
-#: ../sheets/cisconetwork.sheet.in.h:50
-msgid "IPTV broadcast server"
-msgstr "IPTV åæäæå"
+#~ msgid "/Sort objects/All as inserted"
+#~ msgstr "/æåçä(S)/åéïææååçæå"
 
-#: ../sheets/cisconetwork.sheet.in.h:51
-msgid "IPTV content manager"
-msgstr "IPTV ååççå"
+#~ msgid "/Sort objects/_Default"
+#~ msgstr "/æåçä(S)/éèæå(_D)"
 
-#: ../sheets/cisconetwork.sheet.in.h:52
-msgid "LAN to LAN"
-msgstr "LAN to LAN"
+#~ msgid "/Sort objects/Default/by _name"
+#~ msgstr "/æåçä(S)/éèæå(D)/ææåç(_N)"
 
-#: ../sheets/cisconetwork.sheet.in.h:53
-msgid "Lightweight AP"
-msgstr ""
+#~ msgid "/Sort objects/Default/by _type"
+#~ msgstr "/æåçä(S)/éèæå(D)/ææéå(_T)"
 
-#: ../sheets/cisconetwork.sheet.in.h:54
-msgid "LocalDirector"
-msgstr "LocalDirector"
+#~ msgid "/Sort objects/Default/as _inserted"
+#~ msgstr "/æåçä(S)/éèæå(D)/ææååçæå(_I)"
 
-#: ../sheets/cisconetwork.sheet.in.h:55
-msgid "Location server"
-msgstr "äçäæå"
+#~ msgid "/Sort _diagrams"
+#~ msgstr "/æååè(_D)"
 
-#: ../sheets/cisconetwork.sheet.in.h:56
-msgid "LongReach CPE"
-msgstr "LongReach CPE"
+#~ msgid "/Sort _diagrams/by _name"
+#~ msgstr "/æååè/ææåç(_N)"
 
-#: ../sheets/cisconetwork.sheet.in.h:57
-msgid "MAS Gateway"
-msgstr "MAS éèé"
+#~ msgid "/Sort _diagrams/as _inserted"
+#~ msgstr "/æååè/ææååçæå(_I)"
 
-#: ../sheets/cisconetwork.sheet.in.h:58
-msgid "MAU"
-msgstr "MAU"
+#~ msgid "/Sort diagrams/_Default"
+#~ msgstr "/æååè/éèæå(_D)"
 
-#: ../sheets/cisconetwork.sheet.in.h:59
-msgid "ME 1100"
-msgstr "ME 1100"
+#~ msgid "/Sort diagrams/Default/by _name"
+#~ msgstr "/æååè/éèæå(D)/ææåç(_N)"
 
-#: ../sheets/cisconetwork.sheet.in.h:60
-msgid "MUX"
-msgstr "MUX"
+#~ msgid "/Sort diagrams/Default/as _inserted"
+#~ msgstr "/æååè/éèæå(D)/ææååçæå(_I)"
 
-#: ../sheets/cisconetwork.sheet.in.h:61
-msgid "Metro 1500"
-msgstr "Metro 1500"
+#~ msgid "/_Locate"
+#~ msgstr "/æç(_L)"
 
-#: ../sheets/cisconetwork.sheet.in.h:62
-msgid "NAT"
-msgstr "NAT"
+#~ msgid "/_Hide this type"
+#~ msgstr "/éèæéå(_H)"
 
-#: ../sheets/cisconetwork.sheet.in.h:63
-msgid "Network Management"
-msgstr "çççç"
+#~ msgid "Ok"
+#~ msgstr "çå"
 
-#: ../sheets/cisconetwork.sheet.in.h:64
-msgid "Network shapes by Cisco"
-msgstr "Cisco ççåå"
+#~ msgid "Properties..."
+#~ msgstr "åæ..."
 
-#: ../sheets/cisconetwork.sheet.in.h:65
-msgid "ONS15104"
-msgstr "ONS15104"
+#~ msgid "Diagram modified!"
+#~ msgstr "åææåèï"
 
-#: ../sheets/cisconetwork.sheet.in.h:66
-msgid "ONS15540"
-msgstr "ONS15540"
+#~ msgid "NULL tooldata in tool_select_update"
+#~ msgstr "å tool_select_update ä tooldata çåç NULL"
 
-#: ../sheets/cisconetwork.sheet.in.h:67
-msgid "Optical Amplifier"
-msgstr "ååæåå"
+#~ msgid "Misc"
+#~ msgstr "åå"
 
-#: ../sheets/cisconetwork.sheet.in.h:68
-msgid "Optical Cross-Connect"
-msgstr "ååäåéæ"
+#~ msgid "Edit Layer Attributes"
+#~ msgstr "çèåååæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:69
-msgid "Optical Fiber"
-msgstr "åç"
+#~ msgid "Sheets and Objects..."
+#~ msgstr "åäèèçä..."
 
-#: ../sheets/cisconetwork.sheet.in.h:70
-msgid "Optical Transport"
-msgstr "åååè"
+#~ msgid "Plugins..."
+#~ msgstr "åææç..."
 
-#: ../sheets/cisconetwork.sheet.in.h:71
-msgid "PAD"
-msgstr "PAD"
+#~ msgid "_Diagram tree..."
+#~ msgstr "åèçææ(_D)..."
 
-#: ../sheets/cisconetwork.sheet.in.h:72
-msgid "PIX Firewall"
-msgstr "PIX éçç"
+#
+#~ msgid "_Export ..."
+#~ msgstr "åå(_E)..."
 
-#: ../sheets/cisconetwork.sheet.in.h:73
-msgid "PIX Firewall Left"
-msgstr "PIX éççïåï"
+#~ msgid "Page Set_up..."
+#~ msgstr "ééèå(_U)..."
 
-#: ../sheets/cisconetwork.sheet.in.h:74
-msgid "Protocol Translator"
-msgstr "ååèèå"
+#
+#~ msgid "_Diagram"
+#~ msgstr "åè(_D)"
 
-#: ../sheets/cisconetwork.sheet.in.h:75
-msgid "RPS"
-msgstr "RPS"
+#~ msgid "_Layers..."
+#~ msgstr "åå(_L)..."
 
-#: ../sheets/cisconetwork.sheet.in.h:76
-msgid "Repeater"
-msgstr "äçå"
+#
+#~ msgid "Fullscr_een"
+#~ msgstr "åèå(_E)"
 
-#: ../sheets/cisconetwork.sheet.in.h:77
-msgid "SSL Terminator"
-msgstr "SSL ççæ"
+#~ msgid "Unit for lengths:"
+#~ msgstr "éååäï"
 
-#: ../sheets/cisconetwork.sheet.in.h:78
-msgid "STB (set top box)"
-msgstr "STB (æéç)"
+#~ msgid "Unit for font sizes:"
+#~ msgstr "åååååäï"
 
-#: ../sheets/cisconetwork.sheet.in.h:79
-msgid "Security appliance"
-msgstr "äååå"
+#~ msgid "Integrated UI"
+#~ msgstr "æååçé"
 
-#: ../sheets/cisconetwork.sheet.in.h:80
-msgid "Service Control"
-msgstr "æåæå"
+#~ msgid "Diagram tree window:"
+#~ msgstr "åèçææèçï"
 
-#: ../sheets/cisconetwork.sheet.in.h:81
-msgid "Storage Solution Engine"
-msgstr "ååææåæ"
+#~ msgid "Save hidden object types"
+#~ msgstr "ååéèççäéå"
 
-#: ../sheets/cisconetwork.sheet.in.h:82
-msgid "System controller"
-msgstr "ççæåå"
+#~ msgid "User Interface type settings change will take after restart"
+#~ msgstr "äçèçééåèåèæææéæåååçæ"
+
+#~ msgid "Edit"
+#~ msgstr "çè"
 
-#: ../sheets/cisconetwork.sheet.in.h:83
-msgid "TV"
-msgstr "éè"
+#~ msgid "New"
+#~ msgstr "æå"
 
-#: ../sheets/cisconetwork.sheet.in.h:84
-msgid "Terminal Server"
-msgstr "ççäæå"
+#~ msgid "Browse..."
+#~ msgstr "çè..."
 
-#: ../sheets/cisconetwork.sheet.in.h:85
-msgid "TokenRing"
-msgstr "èèç"
+#~ msgid "SVG Shape:"
+#~ msgstr "SVG ååï"
 
-#: ../sheets/cisconetwork.sheet.in.h:86
-msgid "TransPath"
-msgstr "TransPath"
+#~ msgid "Sheet name:"
+#~ msgstr "åäèåç:"
 
-#: ../sheets/cisconetwork.sheet.in.h:87
-msgid "UPS"
-msgstr "äæéçç"
+#~ msgid "Edit Attributes"
+#~ msgstr "çèåæ"
 
-#: ../sheets/cisconetwork.sheet.in.h:88
-msgid "VIP"
-msgstr "VIP"
+#~ msgid "DiaObject"
+#~ msgstr "Diaçä"
 
-#: ../sheets/cisconetwork.sheet.in.h:89
-msgid "VN2900"
-msgstr "VN2900"
+#~ msgid "Description:"
+#~ msgstr "èæï"
 
-#: ../sheets/cisconetwork.sheet.in.h:90
-msgid "VN5900"
-msgstr "VN5900"
+#~ msgid "Sheet"
+#~ msgstr "åäè"
 
-#: ../sheets/cisconetwork.sheet.in.h:91
-msgid "VN5902"
-msgstr "VN5902"
+#~ msgid "DiaObject:"
+#~ msgstr "Diaçäï"
 
-#: ../sheets/cisconetwork.sheet.in.h:92
-msgid "VPN Concentrator"
-msgstr "VPN Concentrator"
+#~ msgid "Sheet:"
+#~ msgstr "åäèï"
 
-#: ../sheets/cisconetwork.sheet.in.h:93
-msgid "VPN Gateway"
-msgstr "VPN éèé"
+#~ msgid "Internal error: Setting corner type of endpoint of bezier"
+#~ msgstr "åééèïèåèèæççéçèèçéå"
 
-#: ../sheets/cisconetwork.sheet.in.h:94
-msgid "WAN"
-msgstr "WAN"
+#~ msgid "%s<illegal characters>..."
+#~ msgstr "%s<äèäççåå>..."
 
-#: ../sheets/cisconetwork.sheet.in.h:95
-msgid "WDM"
-msgstr "WDM"
+#~ msgid ""
+#~ "Your local character set is UTF-8. Because of issues with libxml1 and the "
+#~ "support of files generated by previous versions of dia, you will "
+#~ "encounter  problems. Please report to dia-list gnome org if you see this "
+#~ "message."
+#~ msgstr ""
+#~ "æçåäç UTF-8 ååéççãåç libxml1 ççæïååæäåçæç dia ç"
+#~ "çåäçææææäèïæåæéååéãçæçåéåèææïèå dia-"
+#~ "list gnome org ååã"
 
-#: ../sheets/cisconetwork.sheet.in.h:96
-msgid "WLAN controller"
-msgstr "ççççæåå"
+#~ msgid "abcdefghijk ABCDEFGHIJK"
+#~ msgstr "abc ABC äææè"
 
-#: ../sheets/cisconetwork.sheet.in.h:97
-msgid "Wi-Fi Tag"
-msgstr "Wi-Fi èè"
+#~ msgid "Font name"
+#~ msgstr "åååç"
 
-#: ../sheets/cisconetwork.sheet.in.h:98
-msgid "Wireless Bridge"
-msgstr "ççææå"
+#~ msgid "The X string that represents this font."
+#~ msgstr "äèæååç X ååæååä"
 
-#: ../sheets/cisconetwork.sheet.in.h:99
-msgid "Wireless Connectivity"
-msgstr "ççççéç"
+#~ msgid "Preview text"
+#~ msgstr "éèæå"
 
-#: ../sheets/cisconetwork.sheet.in.h:100
-msgid "Wireless Location Appliance"
-msgstr "ççäçåå"
+#~ msgid "The text to display in order to demonstrate the selected font."
+#~ msgstr "çéååååïéçæåçæåäçççã"
 
-#: ../sheets/cisconetwork.sheet.in.h:101
-msgid "Wireless Transport"
-msgstr "ççèé"
+#~ msgid "_Family:"
+#~ msgstr "åæ(_F)ï"
 
-#: ../sheets/cisconetwork.sheet.in.h:102
-msgid "uBR910 Cable DSU"
-msgstr "uBR910 Cable DSU"
+#~ msgid "Si_ze:"
+#~ msgstr "åå(_Z)ï"
 
-#: ../sheets/ciscotelephony.sheet.in.h:1
-msgid "6701"
-msgstr "6701"
+#~ msgid "_Preview:"
+#~ msgstr "éè(_P)ï"
 
-#: ../sheets/ciscotelephony.sheet.in.h:2
-msgid "6705"
-msgstr "6705"
+#~ msgid "gdk_renderer: Unsupported fill mode specified!\n"
+#~ msgstr "gdk_rendererïæåääææçåææåï\n"
 
-#: ../sheets/ciscotelephony.sheet.in.h:3
-msgid "6732"
-msgstr "6732"
+#~ msgid "Open group"
+#~ msgstr "éæçç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:4
-msgid "ADM"
-msgstr "ADM"
+#~ msgid "Could not deduce correct path for `%s'"
+#~ msgstr "çæææâ%sâçæçèå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:5
-msgid "ATA"
-msgstr "ATA"
+#~ msgid ""
+#~ "Could not load plugin '%s'\n"
+#~ "%s"
+#~ msgstr ""
+#~ "çæèååææçâ%sâ\n"
+#~ "%s"
 
-#: ../sheets/ciscotelephony.sheet.in.h:6
-msgid "BTS 10200"
-msgstr "BTS 10200"
+#~ msgid "Could not find plugin init function in `%s'"
+#~ msgstr "æäåâ%sâäçåææç init åå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:7
-msgid "CallManager"
-msgstr "CallManager"
+#~ msgid ""
+#~ "Could not open `%s'\n"
+#~ "`%s'"
+#~ msgstr ""
+#~ "çæéåâ%sâ\n"
+#~ "â%sâ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:8
-msgid "Cellular Phone"
-msgstr "æåéè"
+#~ msgid "Delete  connection point"
+#~ msgstr "åééæé"
 
-#: ../sheets/ciscotelephony.sheet.in.h:9
-msgid "Cisco - Telephony"
-msgstr "Cisco - éèéè"
+#~ msgid "Restricted Diffusion"
+#~ msgstr "åéææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:10
-msgid "Class 4/5 switch"
-msgstr "Class 4/5 äæå"
+#~ msgid "Special Country Confidential"
+#~ msgstr "çåååæå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:11
-msgid "End Office"
-msgstr "ççèåå"
+#~ msgid "Confidential"
+#~ msgstr "æå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:12
-msgid "Fax"
-msgstr "åç"
+#~ msgid "NATO Confidential"
+#~ msgstr "åçæå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:13
-msgid "Gatekeeper"
-msgstr "Gatekeeper"
+#~ msgid "Personal Confidential"
+#~ msgstr "åäæå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:14
-msgid "Generic softswitch"
-msgstr "äèèääæå"
+#~ msgid "Medical Confidential"
+#~ msgstr "éçæå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:15
-msgid "H.323"
-msgstr "H.323"
+#~ msgid "Industrie Confidential"
+#~ msgstr "åææå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:16
-msgid "HootPhone"
-msgstr "HootPhone"
+#~ msgid "Defense Confidential"
+#~ msgstr "åéæå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:17
-msgid "IAD router"
-msgstr "IAD èçå"
+#~ msgid "Secret"
+#~ msgstr "çå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:18
-msgid "ICM"
-msgstr "ICM"
+#~ msgid "Defense Secret"
+#~ msgstr "åéçå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:19
-msgid "ICS"
-msgstr "ICS"
+#~ msgid "Secret special country"
+#~ msgstr "çåååçå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:20
-msgid "IP Phone"
-msgstr "IP éè"
+#~ msgid "NATO Secret"
+#~ msgstr "åççå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:21
-msgid "IP Softphone"
-msgstr "IP èäéè"
+#~ msgid "Very Secret"
+#~ msgstr "éåçå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:22
-msgid "IP Telephony Router"
-msgstr "IP éèéèèçå"
+#~ msgid "NATO Very Secret"
+#~ msgstr "åçéåçå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:23
-msgid "ITP"
-msgstr "ITP"
+#~ msgid "SISSI diagram"
+#~ msgstr "SISSI åè"
 
-#: ../sheets/ciscotelephony.sheet.in.h:24
-msgid "IntelliSwitch Stack"
-msgstr ""
+#~ msgid "No integrity"
+#~ msgstr "çåææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:25
-msgid "MCU"
-msgstr "MCU"
+#~ msgid "Low integrity"
+#~ msgstr "äåææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:26
-msgid "MGX 8000 Series Voice Gateway"
-msgstr "MGX 8000 çåèéééå"
+#~ msgid "Average software integrity"
+#~ msgstr "æéèéåææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:27
-msgid "MoH server (Music on Hold)"
-msgstr "MoH äæå (Music on Hold)"
+#~ msgid "Hight software integrity"
+#~ msgstr "éèéåææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:28
-msgid "Mobile Access IP Phone"
-msgstr "èååå IP éè"
+#~ msgid "Average hardware integrity"
+#~ msgstr "æéçéåææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:29
-msgid "Mobile Access Router"
-msgstr "èåååèçå"
+#~ msgid "Hight hardware integrity"
+#~ msgstr "éçéåææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:30
-msgid "Octel"
-msgstr "Octel"
+#~ msgid "Millisecond"
+#~ msgstr "æç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:31
-msgid "PBX"
-msgstr "PBX"
+#~ msgid "Second"
+#~ msgstr "ç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:32
-msgid "PBX Switch"
-msgstr "PBX äæå"
+#~ msgid "Minute"
+#~ msgstr "åé"
 
-#: ../sheets/ciscotelephony.sheet.in.h:33
-msgid "Pager"
-msgstr "ååæ"
+#~ msgid "Hour"
+#~ msgstr "åæ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:34
-msgid "Phone"
-msgstr "éè"
+#~ msgid "Week"
+#~ msgstr "é"
 
-#: ../sheets/ciscotelephony.sheet.in.h:35
-msgid "Phone 2"
-msgstr "éè 2"
+#~ msgid "SYSTEM"
+#~ msgstr "çç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:36
-msgid "Phone Appliance"
-msgstr "éèèç"
+#~ msgid "Internet access device"
+#~ msgstr "Internet ååèç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:37
-msgid "Phone Ethernet"
-msgstr "éèäåçç"
+#~ msgid "Electronic messaging"
+#~ msgstr "éååè"
 
-#: ../sheets/ciscotelephony.sheet.in.h:38
-msgid "Phone Feature"
-msgstr "éèåè"
+#~ msgid "Intranet"
+#~ msgstr "åèç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:39
-msgid "Phone/Fax"
-msgstr "éè/åç"
+#~ msgid "Company directory"
+#~ msgstr "ååçé"
 
-#: ../sheets/ciscotelephony.sheet.in.h:40
-msgid "Radio Tower"
-msgstr "ççéå"
+#~ msgid "External portal"
+#~ msgstr "åéååçç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:41
-msgid "SC2200 (Signalling Controller)"
-msgstr "SC2200 (äèæåå)"
+#~ msgid "ORGANISATION"
+#~ msgstr "çç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:42
-msgid "SC2200/VSC3000 host"
-msgstr "SC2200/VSC3000 äæ"
+#~ msgid "Higher-tier organisation"
+#~ msgstr "éåæçç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:43
-msgid "SIP Proxy Server"
-msgstr "SIP äçäæå"
+#~ msgid "Structure of the organisation"
+#~ msgstr "çççæ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:44
-msgid "SONET MUX"
-msgstr "SONET MUX"
+#~ msgid "Project or system organisation"
+#~ msgstr "åææçççç"
 
-#: ../sheets/ciscotelephony.sheet.in.h:45
-msgid "STP"
-msgstr "STP"
+#~ msgid "Subcontractors / Suppliers / Manufacturers"
+#~ msgstr "ååå / äæå / ççå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:46
-msgid "Softphone"
-msgstr "èäéè"
+#~ msgid "SITE"
+#~ msgstr "çé"
 
-#: ../sheets/ciscotelephony.sheet.in.h:47
-msgid "TDM router"
-msgstr "TDM èçå"
+#~ msgid "Places"
+#~ msgstr "åæ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:48
-msgid "Telephony shapes by Cisco"
-msgstr "Cisco æäçéèéèåå"
+#~ msgid "External environment"
+#~ msgstr "åéçå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:49
-msgid "Turret"
-msgstr "åæå(Turret)"
+#~ msgid "Premises"
+#~ msgstr "æè"
 
-#: ../sheets/ciscotelephony.sheet.in.h:50
-msgid "Unity Express"
-msgstr "Unity Express"
+#~ msgid "Zone"
+#~ msgstr "åå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:51
-msgid "Unity server"
-msgstr "Unity äæå"
+#~ msgid "Service Essentiel"
+#~ msgstr "åèæå"
 
-#: ../sheets/ciscotelephony.sheet.in.h:52
-msgid "Virtual switch controller (VSC 3000)"
-msgstr "èæäæåæåå (VSC 3000)"
+#~ msgid "Communication"
+#~ msgstr "éè"
 
-#: ../sheets/ciscotelephony.sheet.in.h:53
-msgid "Voice-Enabled ATM Switch"
-msgstr "åèéåèç ATM äæå"
+#~ msgid "Power"
+#~ msgstr "éæ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:54
-msgid "Voice-Enabled Access Server"
-msgstr "åèéåèçååäæå"
+#~ msgid "Cooling / Pollution"
+#~ msgstr "åå / ææ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:55
-msgid "Voice-Enabled Router"
-msgstr "åèéåèçèçå"
+#~ msgid "THERMIC DETECTION"
+#~ msgstr "æååæ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:56
-msgid "uMG series"
-msgstr "uMG çå"
+#~ msgid "FIRE DETECTION"
+#~ msgstr "çèåæ"
 
-#: ../sheets/civil.sheet.in.h:1
-msgid "Aerator with bubbles"
-msgstr ""
+#~ msgid "WATER DETECTION"
+#~ msgstr "ææåæ"
 
-#: ../sheets/civil.sheet.in.h:2
-msgid "Backflow preventer"
-msgstr "éæéæèç"
+#~ msgid "AIR DETECTION"
+#~ msgstr "çæåæ"
 
-#: ../sheets/civil.sheet.in.h:3
-msgid "Basin"
-msgstr "ææ"
+#~ msgid "ENERGY DETECTION"
+#~ msgstr "èéåæ"
 
-#: ../sheets/civil.sheet.in.h:4
-msgid "Bivalent vertical rest"
-msgstr "Bivalent vertical rest"
+#~ msgid "INTRUSION DETECTION"
+#~ msgstr "åäåæ"
 
-#: ../sheets/civil.sheet.in.h:5
-msgid "Civil"
-msgstr "åæåç"
+#~ msgid "THERMIC ACTION"
+#~ msgstr "æååä"
 
-#: ../sheets/civil.sheet.in.h:6
-msgid "Civil Engineering Components"
-msgstr "åæåçåä"
+#~ msgid "FIRE ACTION"
+#~ msgstr "çèåä"
 
-#: ../sheets/civil.sheet.in.h:7
-msgid "Container"
-msgstr "åå"
+#~ msgid "WATER ACTION"
+#~ msgstr "ææåä"
 
-#: ../sheets/civil.sheet.in.h:8
-msgid "Final-settling basin"
-msgstr "æçæææ"
+#~ msgid "AIR ACTION"
+#~ msgstr "çæåä"
+
+#~ msgid "ENERGY ACTION"
+#~ msgstr "èéåä"
 
-#: ../sheets/civil.sheet.in.h:9
-msgid "Frequency converter"
-msgstr "èéå"
+#~ msgid "INTRUSION ACTION"
+#~ msgstr "åäåä"
 
-#: ../sheets/civil.sheet.in.h:10
-msgid "Gas bottle"
-msgstr "æç"
+#~ msgid "PERSONAL"
+#~ msgstr "åä"
 
-#: ../sheets/civil.sheet.in.h:11
-msgid "Horizontal limiting line"
-msgstr "æåéåç"
+#~ msgid "Decision maker"
+#~ msgstr "æçè"
 
-#: ../sheets/civil.sheet.in.h:12
-msgid "Horizontal rest"
-msgstr "æåæççææå"
+#~ msgid "SSI Responsible"
+#~ msgstr "SSI èäè"
 
-#: ../sheets/civil.sheet.in.h:13
-msgid "Horizontally aligned arrow"
-msgstr "æåæåççé"
+#~ msgid "Users"
+#~ msgstr "äçè"
 
-#: ../sheets/civil.sheet.in.h:14
-msgid "Horizontally aligned compressor"
-msgstr "æåæççåçæ"
+#~ msgid "Fonctionnal administrator"
+#~ msgstr "åèççè"
 
-#: ../sheets/civil.sheet.in.h:15
-msgid "Horizontally aligned pump"
-msgstr "æåæççæ"
+#~ msgid "Technician aministrator"
+#~ msgstr "æèççè"
 
-#: ../sheets/civil.sheet.in.h:16
-msgid "Horizontally aligned valve"
-msgstr "æåæççæå"
+#~ msgid "SSI administrator"
+#~ msgstr "SSI ççè"
 
-#: ../sheets/civil.sheet.in.h:17
-msgid "Motor"
-msgstr "éé"
+#~ msgid "Developer"
+#~ msgstr "éçè"
 
-#: ../sheets/civil.sheet.in.h:18
-msgid "Preliminary clarification tank"
-msgstr ""
+#~ msgid "Operator / Maintenance"
+#~ msgstr "æäè / çäéä"
 
-#: ../sheets/civil.sheet.in.h:19
-msgid "Reference line"
-msgstr "åèç"
+#~ msgid "NETWORK"
+#~ msgstr "çè"
 
-#: ../sheets/civil.sheet.in.h:20
-msgid "Rotor"
-msgstr "èå"
+#~ msgid "Medium and supports"
+#~ msgstr "åéèææ"
 
-#: ../sheets/civil.sheet.in.h:21
-msgid "Soil"
-msgstr "æå"
+#~ msgid "Communication interface"
+#~ msgstr "éæçé"
 
-#: ../sheets/civil.sheet.in.h:22
-msgid "Vertical limiting line"
-msgstr "åçéåç"
+#~ msgid "Operating System"
+#~ msgstr "æäçç"
 
-#: ../sheets/civil.sheet.in.h:23
-msgid "Vertical rest"
-msgstr "åçæççææå"
+#~ msgid "Service - maintenance or administration software"
+#~ msgstr "æå - çäæççèé"
 
-#: ../sheets/civil.sheet.in.h:24
-msgid "Vertically aligned arrow"
-msgstr "åçæåççé"
+#~ msgid "Package software or standard software"
+#~ msgstr "åäèéæææèé"
 
-#: ../sheets/civil.sheet.in.h:25
-msgid "Vertically aligned compressor"
-msgstr "åçæççåçæ"
+#~ msgid "Business application"
+#~ msgstr "åææççå"
 
-#: ../sheets/civil.sheet.in.h:26
-msgid "Vertically aligned propeller"
-msgstr "åçæççæéå"
+#~ msgid "Standard business application"
+#~ msgstr "ææåææççå"
 
-#: ../sheets/civil.sheet.in.h:27
-msgid "Vertically aligned pump"
-msgstr "åçæççæ"
+#~ msgid "Specific business application"
+#~ msgstr "çååææççå"
 
-#: ../sheets/civil.sheet.in.h:28
-msgid "Vertically aligned valve"
-msgstr "åçæççæå"
+#~ msgid "HARDWARE"
+#~ msgstr "çé"
 
-#: ../sheets/civil.sheet.in.h:29
-msgid "Water level"
-msgstr "æä"
+#~ msgid "Data processing equipement (active)"
+#~ msgstr "èæèçèåïéääï"
 
-#: ../sheets/jigsaw.sheet.in.h:1
-msgid "Jigsaw"
-msgstr "æå"
+#~ msgid "Transportable equipement"
+#~ msgstr "æåèå"
 
-#: ../sheets/jigsaw.sheet.in.h:2
-msgid "Jigsaw - part_iiii"
-msgstr "æå â åååå"
+#~ msgid "Fixed equipement"
+#~ msgstr "ååèå"
 
-#: ../sheets/jigsaw.sheet.in.h:3
-msgid "Jigsaw - part_iiio"
-msgstr "æå â åååå"
+#~ msgid "Peripheral processing"
+#~ msgstr "ééèç"
 
-#: ../sheets/jigsaw.sheet.in.h:4
-msgid "Jigsaw - part_iioi"
-msgstr "æå â åååå"
+#~ msgid "Electronic medium"
+#~ msgstr "éååé"
 
-#: ../sheets/jigsaw.sheet.in.h:5
-msgid "Jigsaw - part_iioo"
-msgstr "æå â åååå"
+#~ msgid "Other media"
+#~ msgstr "åååé"
 
-#: ../sheets/jigsaw.sheet.in.h:6
-msgid "Jigsaw - part_ioii"
-msgstr "æå â åååå"
+#~ msgid "Data medium (passive)"
+#~ msgstr "èæåéïèååï"
 
-#: ../sheets/jigsaw.sheet.in.h:7
-msgid "Jigsaw - part_ioio"
-msgstr "æå â åååå"
+#~ msgid "_Menace"
+#~ msgstr "åè(_M)"
 
-#: ../sheets/jigsaw.sheet.in.h:8
-msgid "Jigsaw - part_iooi"
-msgstr "æå â åååå"
+#~ msgid "Menace"
+#~ msgstr "åè"
 
-#: ../sheets/jigsaw.sheet.in.h:9
-msgid "Jigsaw - part_iooo"
-msgstr "æå â åååå"
+#~ msgid "P Action"
+#~ msgstr "P åä"
 
-#: ../sheets/jigsaw.sheet.in.h:10
-msgid "Jigsaw - part_oiii"
-msgstr "æå â åååå"
+#~ msgid "Vulnerability"
+#~ msgstr "æææ"
 
-#: ../sheets/jigsaw.sheet.in.h:11
-msgid "Jigsaw - part_oiio"
-msgstr "æå â åååå"
+#~ msgid "Others properties"
+#~ msgstr "åäåæ"
 
-#: ../sheets/jigsaw.sheet.in.h:12
-msgid "Jigsaw - part_oioi"
-msgstr "æå â åååå"
+#~ msgid "value"
+#~ msgstr "å"
 
-#: ../sheets/jigsaw.sheet.in.h:13
-msgid "Jigsaw - part_oioo"
-msgstr "æå â åååå"
+#~ msgid "_New"
+#~ msgstr "æå(_N)"
 
-#: ../sheets/jigsaw.sheet.in.h:14
-msgid "Jigsaw - part_ooii"
-msgstr "æå â åååå"
+#~ msgid "Documents"
+#~ msgstr "æä"
 
-#: ../sheets/jigsaw.sheet.in.h:15
-msgid "Jigsaw - part_ooio"
-msgstr "æå â åååå"
+#~ msgid "Document title"
+#~ msgstr "æäæé"
 
-#: ../sheets/jigsaw.sheet.in.h:16
-msgid "Jigsaw - part_oooi"
-msgstr "æå â åååå"
+#~ msgid "Role:"
+#~ msgstr "èèï"
 
-#: ../sheets/jigsaw.sheet.in.h:17
-msgid "Jigsaw - part_oooo"
-msgstr "æå â åååå"
+#~ msgid "Classname"
+#~ msgstr "éååç"
 
-#: ../sheets/jigsaw.sheet.in.h:18
-msgid "Pieces of a jigsaw"
-msgstr "æåççæéä"
+#~ msgid "_Delete"
+#~ msgstr "åé(_D)"
 
-#: ../sheets/network.sheet.in.h:1
-msgid "24 Port Patch Panel"
-msgstr "24 åéçéæ"
+#~ msgid "Move up"
+#~ msgstr "äç"
 
-#: ../sheets/network.sheet.in.h:2
-msgid "3 1/2 inch diskette"
-msgstr "3.5 åèçç"
+#~ msgid "Move down"
+#~ msgstr "äç"
 
-#: ../sheets/network.sheet.in.h:3
-msgid "ATM switch symbol"
-msgstr "ATM äæå(switch)"
+#~ msgid "Query (const)"
+#~ msgstr "æè (const)"
 
-#: ../sheets/network.sheet.in.h:4
-msgid "Antenna for wireless transmission"
-msgstr "ççççåç"
+#~ msgid "Bond graph objects"
+#~ msgstr "Bond graph çä"
 
-#: ../sheets/network.sheet.in.h:5
-msgid "Bigtower PC"
-msgstr "Bigtower PC"
+#~ msgid "Cairo old WMF"
+#~ msgstr "Cairo èå WMF"
 
-#: ../sheets/network.sheet.in.h:6
-msgid "Computer"
-msgstr "éè"
+#~ msgid "Bad vertex bulge\n"
+#~ msgstr "ééåèçå\n"
 
-#: ../sheets/network.sheet.in.h:7
-msgid "Desktop PC"
-msgstr "æééè"
+#~ msgid "Scale: %f\n"
+#~ msgstr "æäï%f\n"
 
-#: ../sheets/network.sheet.in.h:8
-msgid "Digitizing board"
-msgstr "èåå"
+#~ msgid ""
+#~ "GNOME Print Backend\n"
+#~ " '%s'\n"
+#~ " not available"
+#~ msgstr ""
+#~ "GNOME åååççå\n"
+#~ "â%sâ\n"
+#~ "çæäç"
 
-#: ../sheets/network.sheet.in.h:9
-msgid "Ethernet bus"
-msgstr "Ethernet åææ"
+#~ msgid "GNOME Portable Document Format"
+#~ msgstr "GNOME åæåæäæå"
 
-#: ../sheets/network.sheet.in.h:10
-msgid "External DAT drive"
-msgstr "åç DAT çåæ"
+#~ msgid "GNOME Scalable Vector Graphic"
+#~ msgstr "GNOME åçæåéå"
 
-#: ../sheets/network.sheet.in.h:11
-msgid "Firewall router"
-msgstr "éççèçå"
+#~ msgid "GNOME Print based Rendering"
+#~ msgstr "åæ GNOME ååçèè"
 
-#: ../sheets/network.sheet.in.h:12
-msgid "Laptop PC"
-msgstr "ææéè"
+#~ msgid "Couldn't make object dir %s"
+#~ msgstr "çæèåèäçäçé %s"
 
-#: ../sheets/network.sheet.in.h:13
-msgid "Miditower PC"
-msgstr "Midtower PC"
+#~ msgid "Couldn't open: '%s' for writing.\n"
+#~ msgstr "çæéåâ%sâäååèæã\n"
 
-#: ../sheets/network.sheet.in.h:14
-msgid "Minitower PC"
-msgstr "Minitower PC"
+#, fuzzy
+#~ msgid "Air filter"
+#~ msgstr "æååååå"
 
-#: ../sheets/network.sheet.in.h:15
-msgid "Mobile phone"
-msgstr "æåéè"
+#~ msgid "Alarm center"
+#~ msgstr "èåäå"
 
-#: ../sheets/network.sheet.in.h:16
-msgid "Mobile telephony base station"
-msgstr "æåéèååå"
+#, fuzzy
+#~ msgid "Backup"
+#~ msgstr "èæ"
 
-#: ../sheets/network.sheet.in.h:17
-msgid "Mobile telephony cell"
-msgstr "æåéèçæ"
+#, fuzzy
+#~ msgid "Badge reader"
+#~ msgstr "åéç"
 
-#: ../sheets/network.sheet.in.h:18
-msgid "Modular switching system"
-msgstr "æçåäæçç"
+#~ msgid "Cellular phone"
+#~ msgstr "èåéè"
 
-#: ../sheets/network.sheet.in.h:20
-msgid "Network"
-msgstr "çç"
+#, fuzzy
+#~ msgid "Centrifugal Ventilator"
+#~ msgstr "éåæ"
 
-#: ../sheets/network.sheet.in.h:22
-msgid "Objects to design network diagrams with"
-msgstr "èèççåèçççä"
+#, fuzzy
+#~ msgid "Condensator"
+#~ msgstr "åç"
 
-#: ../sheets/network.sheet.in.h:23
-msgid "Plotter"
-msgstr "çåæ"
+#, fuzzy
+#~ msgid "Current transducer"
+#~ msgstr "æçèé"
 
-#: ../sheets/network.sheet.in.h:24
-msgid "RJ45 wall-plug"
-msgstr "RJ45 æé"
+#, fuzzy
+#~ msgid "Digital code"
+#~ msgstr "æääåéç"
 
-#: ../sheets/network.sheet.in.h:25
-msgid "Router symbol"
-msgstr "èçåçè"
+#~ msgid "Gate"
+#~ msgstr "é"
 
-#: ../sheets/network.sheet.in.h:26
-msgid "Simple modem"
-msgstr "æéæææ"
+#, fuzzy
+#~ msgid "Geographic site"
+#~ msgstr "ååçåååå"
 
-#: ../sheets/network.sheet.in.h:27
-msgid "Simple printer"
-msgstr "æéæåæ"
+#~ msgid "Information system"
+#~ msgstr "èèçç"
 
-#: ../sheets/network.sheet.in.h:28
-msgid "Speaker with integrated amplifier"
-msgstr "åçåååçæèå"
+#, fuzzy
+#~ msgid "Level detector"
+#~ msgstr "åæå"
 
-#: ../sheets/network.sheet.in.h:29
-msgid "Speaker without amplifier"
-msgstr "ææåååçæèå"
+#, fuzzy
+#~ msgid "Light detector"
+#~ msgstr "åæå"
 
-#: ../sheets/network.sheet.in.h:30
-msgid "Stackable hub or switch"
-msgstr "åçæåéçåæäæå"
+#~ msgid "Magnetic support"
+#~ msgstr "ççææ"
 
-#: ../sheets/network.sheet.in.h:31
-msgid "Storage"
-msgstr "ååèç"
+#~ msgid "Objects to design sissi diagrams"
+#~ msgstr "èè sissi åèæçççä"
 
-#: ../sheets/network.sheet.in.h:32
-msgid "Switch symbol"
-msgstr "äæåçè"
+#~ msgid "Paper support"
+#~ msgstr "çåææ"
 
-#: ../sheets/network.sheet.in.h:34
-msgid "UNIX workstation"
-msgstr "UNIX åäç"
+#~ msgid "Person"
+#~ msgstr "ä"
 
-#: ../sheets/network.sheet.in.h:35
-msgid "WAN connection"
-msgstr "WAN éç"
+#, fuzzy
+#~ msgid "Power transducer"
+#~ msgstr "èååå"
 
-#: ../sheets/network.sheet.in.h:36
-msgid "WAN link"
-msgstr "WAN éç"
+#~ msgid "Room"
+#~ msgstr "æé"
 
-#: ../sheets/network.sheet.in.h:37
-msgid "Wall-plug for the scEAD cabling system"
-msgstr "scEAD ççççåææé"
+#~ msgid "Safe"
+#~ msgstr "åè"
 
-#: ../sheets/network.sheet.in.h:38
-msgid "Workstation monitor"
-msgstr "åäçèå"
+#~ msgid "Security area"
+#~ msgstr "äååå"
 
-#: ../sheets/network.sheet.in.h:39
-msgid "ZIP disk"
-msgstr "ZIP ç"
+#, fuzzy
+#~ msgid "Sensor beam"
+#~ msgstr "åæå - ä"
 
-#: ../sheets/sybase.sheet.in.h:1
-msgid "Log transfer manager or rep agent"
-msgstr "çéæåèçççåæèåäççå"
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "äæå"
 
-#: ../sheets/sybase.sheet.in.h:2
-msgid "Objects to design Sybase replication domain diagrams with"
-msgstr "èè Sybase èåçååèççä"
+#, fuzzy
+#~ msgid "Smoke detector"
+#~ msgstr "åæå"
 
-#: ../sheets/sybase.sheet.in.h:3
-msgid "Replication server manager"
-msgstr "åæäæåçç"
+#~ msgid "Software"
+#~ msgstr "èé"
 
-#: ../sheets/sybase.sheet.in.h:4
-msgid "Stable storage device"
-msgstr "çåçååèç"
+#, fuzzy
+#~ msgid "Ventilator"
+#~ msgstr "VPN Concentrator"
 
-#: ../sheets/sybase.sheet.in.h:5
-msgid "Sybase"
-msgstr "Sybase"
+#, fuzzy
+#~ msgid "Vibration sensor"
+#~ msgstr "éå"
 
-#: ../sheets/sybase.sheet.in.h:6
-msgid "Sybase client application"
-msgstr "Sybase åæççå"
+#~ msgid "Video camera"
+#~ msgstr "èèæåæ"
 
-#: ../sheets/sybase.sheet.in.h:7
-msgid "Sybase dataserver"
-msgstr "Sybase ææå"
+#, fuzzy
+#~ msgid "Voltage detector"
+#~ msgstr "éå"
 
-#: ../sheets/sybase.sheet.in.h:8
-msgid "Sybase replication server"
-msgstr "Sybase èåäæå"
+#~ msgid "Workstation"
+#~ msgstr "åäç"
 
 #~ msgid "BacMultiSwitch kup"
 #~ msgstr "åä"
 
-#~ msgid "Portable Network Graphics"
-#~ msgstr "PNG"
-
 #, fuzzy
 #~ msgid "Unexpected polyline object: %s\n"
 #~ msgstr "çæèåèççæèèï%s\n"
 
-#~ msgid "Dia"
-#~ msgstr "Dia"
-
 #, fuzzy
 #~ msgid "Copyright (C) 1998-2005 The Free Software Foundation and the authors"
 #~ msgstr "çæææ Â1998-2002 èçèéåéæåèééçè"
@@ -9963,12 +11072,6 @@ msgstr "Sybase èåäæå"
 #~ msgid "/Objects/_Properties..."
 #~ msgstr "/çä/åæ(_P)..."
 
-#~ msgid "/Select/All"
-#~ msgstr "/éå(S)/åé"
-
-#~ msgid "/Select/None"
-#~ msgstr "/éå(S)/ç"
-
 #~ msgid "/Select/Invert"
 #~ msgstr "/éå(S)/çååå"
 
@@ -9984,9 +11087,6 @@ msgstr "Sybase èåäæå"
 #~ msgid "/Select/Replace"
 #~ msgstr "/éå(S)/åä"
 
-#~ msgid "/Select/Union"
-#~ msgstr "/éå(S)/åä"
-
 #~ msgid "/Select/Remove"
 #~ msgstr "/éå(S)/çé"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fbebfc4..90896fa 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,243 +3,272 @@
 # Jing-Jong Shyue <shyue sonoma com tw>, 2000
 # Abel Cheung <maddog linux org hk>, 2001, 2003
 # Walter Cheuk <wwycheuk gmail com>, 2007.
-# 
+#
+#: ../objects/UML/class.c:193
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.96.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 20:57+0800\n"
+"POT-Creation-Date: 2013-01-06 08:18+0800\n"
 "PO-Revision-Date: 2007-06-10 09:31+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder liao msa hinet net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n linux org tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:261
+#: ../app/app_procs.c:208
 #, c-format
 msgid "Warning: invalid layer range %lu - %lu\n"
 msgstr "èåïååçå %lu - %lu çæ\n"
 
-#: ../app/app_procs.c:273
+#: ../app/app_procs.c:220
 #, c-format
 msgid "Warning: Layer %lu (%s) selected more than once.\n"
 msgstr "èåïéèéåäåå %lu (%s)ã\n"
 
-#: ../app/app_procs.c:299
+#: ../app/app_procs.c:246
 #, c-format
 msgid "Warning: Layer %d (%s) selected more than once.\n"
 msgstr "èåïéèéåäåå %d (%s)ã\n"
 
-#: ../app/app_procs.c:308
+#: ../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:390
+#: ../app/app_procs.c:338
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s éèïäæåååååè %s\n"
 
-#: ../app/app_procs.c:399
+#: ../app/app_procs.c:347
 #, 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:407
+#. Translators: Menu item Verb/Channel/Import
+#. Translators: Menu item Verb/Channel/Import/Import
+#: ../app/app_procs.c:353 ../objects/FS/function.c:683
+#: ../objects/FS/function.c:685
+msgid "Import"
+msgstr "åå"
+
+#: ../app/app_procs.c:356
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s éèïéèææçèåæ %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:432
+#: ../app/app_procs.c:384
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s â %s\n"
 
-#: ../app/app_procs.c:593
+#: ../app/app_procs.c:556
 #, c-format
 msgid "Can't find output format/filter %s\n"
 msgstr "æäåèåæå/éæå %s\n"
 
+#: ../app/app_procs.c:626
+#, c-format
+msgid "Input directory '%s' must exist!\n"
+msgstr "åéæèåçé '%s'ï\n"
+
+#: ../app/app_procs.c:643
+#, 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:685
+#: ../app/app_procs.c:693
 #, c-format
 msgid "Select the filter/format out of: %s"
 msgstr "èæéåéæå/æåï %s"
 
 #. &export_file_name
-#: ../app/app_procs.c:704 ../app/app_procs.c:731
+#: ../app/app_procs.c:711
 msgid "Export loaded file and exit"
 msgstr "åååèåçææäçæ"
 
-#: ../app/app_procs.c:704 ../app/app_procs.c:731 ../app/diaconv.c:88
+#: ../app/app_procs.c:711
 msgid "OUTPUT"
 msgstr "èå"
 
 #. &export_file_format
 #. &export_format_string
-#. &export_file_format
-#: ../app/app_procs.c:706 ../app/app_procs.c:733
+#: ../app/app_procs.c:713
 msgid "TYPE"
 msgstr "éå"
 
-#: ../app/app_procs.c:708 ../app/app_procs.c:736
+#: ../app/app_procs.c:715
 msgid "Export graphics size"
-msgstr "ååçåååå"
+msgstr "åååååå"
 
-#: ../app/app_procs.c:708 ../app/app_procs.c:736
+#: ../app/app_procs.c:715
 msgid "WxH"
 msgstr "åxé"
 
-#. 13.3.2004 sampo iki fi
-#: ../app/app_procs.c:710 ../app/app_procs.c:738
+#: ../app/app_procs.c:717
 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)"
 
-#: ../app/app_procs.c:711 ../app/app_procs.c:739
+#: ../app/app_procs.c:718
 msgid "LAYER,LAYER,..."
 msgstr "åå,åå,..."
 
-#: ../app/app_procs.c:713 ../app/app_procs.c:741
+#: ../app/app_procs.c:720
 msgid "Don't show the splash screen"
 msgstr "äéçååçé"
 
-#: ../app/app_procs.c:715 ../app/app_procs.c:743
-msgid "Don't create empty diagram"
+#: ../app/app_procs.c:722
+msgid "Don't create an empty diagram"
 msgstr "äåçææååçåè"
 
-#: ../app/app_procs.c:717 ../app/app_procs.c:745
+#: ../app/app_procs.c:724
+msgid "Start integrated user interface (diagrams in tabs)"
+msgstr "ååæååäçèäé (åèååéäå)"
+
+#: ../app/app_procs.c:726
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "åéèèæéèææèåèäéçåèçã"
 
-#: ../app/app_procs.c:719 ../app/app_procs.c:747
+#: ../app/app_procs.c:728
+msgid "Directory containing input files"
+msgstr "ååèåææççé"
+
+#: ../app/app_procs.c:728 ../app/app_procs.c:730
+msgid "DIRECTORY"
+msgstr "çé"
+
+#: ../app/app_procs.c:730
+msgid "Directory containing output files"
+msgstr "ååèåææççé"
+
+#: ../app/app_procs.c:732
 msgid "Display credits list and exit"
 msgstr "éçéèæååçæ"
 
-#: ../app/app_procs.c:721 ../app/app_procs.c:749
+#: ../app/app_procs.c:734
 msgid "Generate verbose output"
 msgstr "ççèççèå"
 
-#: ../app/app_procs.c:723 ../app/app_procs.c:751
+#: ../app/app_procs.c:736
 msgid "Display version and exit"
 msgstr "éççæåçæ"
 
-#: ../app/app_procs.c:752 ../app/diaconv.c:89
-msgid "Show this help message"
-msgstr "éçæèæèæ"
+#: ../app/app_procs.c:763
+msgid "[FILE...]"
+msgstr "[ææ...]"
+
+#: ../app/app_procs.c:777
+#, c-format
+msgid "Invalid option?"
+msgstr "ééæåçæï"
+
+#: ../app/app_procs.c:800
+#, c-format
+msgid "Filename conversion failed: %s\n"
+msgstr "ææåçèæåæï%s\n"
+
+#: ../app/app_procs.c:813
+#, c-format
+msgid "Missing input: %s\n"
+msgstr "çåèåï%s\n"
 
-#: ../app/app_procs.c:812
+#: ../app/app_procs.c:838
 msgid "Can't connect to session manager!\n"
 msgstr "çæéæäæéæççï\n"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:852
+#: ../app/app_procs.c:880
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
-msgstr "Dia %s çæïçèæ %s %s\n"
+msgstr "Dia %1$s çïçèæ %3$s %2$s\n"
 
-#: ../app/app_procs.c:854
+#: ../app/app_procs.c:882
 #, c-format
 msgid "Dia version %s\n"
-msgstr "Dia %s çæ\n"
+msgstr "Dia %s ç\n"
 
-#: ../app/app_procs.c:911 ../app/diaconv.c:195 ../app/diaconv.c:197
-#, c-format
+#: ../app/app_procs.c:920
+msgid "Object Defaults"
+msgstr "çäéèå"
+
+#: ../app/app_procs.c:927
 msgid ""
 "Couldn't find standard objects when looking for object-libs; exiting...\n"
 msgstr "æåçäåååææäåææçäïçæçå...\n"
 
-#: ../app/app_procs.c:913
+#: ../app/app_procs.c:929
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
 "exiting...\n"
 msgstr "æ '%s' æåçäåååææäåææçäïçæçå...\n"
 
-#: ../app/app_procs.c:971
+#: ../app/app_procs.c:993
 msgid "Diagram1.dia"
 msgstr "åè1.dia"
 
-#: ../app/app_procs.c:1014
+#: ../app/app_procs.c:1028
 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 ""
 "éäèççãèå bugzilla.gnome.org æåéèåå\n"
 "äæèæåääæèæåçã\n"
 
+#: ../app/app_procs.c:1043
+msgid "Exiting Dia"
+msgstr "æåçæ Dia"
+
 #. no standard buttons
-#: ../app/app_procs.c:1027
+#: ../app/app_procs.c:1107
 msgid "Quitting without saving modified diagrams"
 msgstr "åææåååèæåçææäéé"
 
-#: ../app/app_procs.c:1029
+#: ../app/app_procs.c:1109
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
 msgstr "åèææåãæåçåéé Dia èäååï"
 
-#: ../app/app_procs.c:1033
+#: ../app/app_procs.c:1113
 msgid "Quit Dia"
-msgstr "éé Dia"
-
-#. This printf seems to prevent a race condition with unrefs.
-#. Yuck.  -Lars
-#: ../app/app_procs.c:1084
-msgid "Thank you for using Dia.\n"
-msgstr "æèæäç Diaã\n"
+msgstr "çæ Dia"
 
-#: ../app/app_procs.c:1101 ../app/app_procs.c:1108
-msgid "Could not create per-user Dia config directory"
+#: ../app/app_procs.c:1186 ../app/app_procs.c:1193
+msgid "Could not create per-user Dia configuration directory"
 msgstr "çæåç Dia åäçæçé"
 
-#: ../app/app_procs.c:1111
-msgid ""
-"Could not create per-user Dia config directory. Please make sure that the "
-"environment variable HOME points to an existing directory."
-msgstr "çæåç Dia åäçæçéãèçå HOME çåèææååæççéã"
-
-#: ../app/app_procs.c:1134 ../app/diaconv.c:245
-msgid "Objects and filters internal to dia"
-msgstr "dia åéçäåéæå"
-
-#: ../app/app_procs.c:1176 ../app/diaconv.c:115
-msgid "[OPTION...] [FILE...]"
-msgstr "[éé...] [ææ...]"
-
-#: ../app/app_procs.c:1179 ../app/diaconv.c:122
-#, c-format
+#: ../app/app_procs.c:1196
 msgid ""
-"Error on option %s: %s.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"éé %s ççéèï%sã\n"
-"åèâ%s --helpâååååæçæäåééã\n"
+"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:1203
-msgid "[FILE...]"
-msgstr "[ææ...]"
+#: ../app/app_procs.c:1219
+msgid "Objects and filters internal to Dia"
+msgstr "Dia åéçäåéæå"
 
-#: ../app/app_procs.c:1226
+#: ../app/app_procs.c:1272
 #, c-format
-msgid "'%s' not found!\n"
-msgstr "æäåâ%sâï\n"
-
-#: ../app/app_procs.c:1307
 msgid ""
 "The original author of Dia was:\n"
 "\n"
 msgstr ""
-"Dia ååäèçï\n"
+"Dia åäèçï\n"
 "\n"
 
-#: ../app/app_procs.c:1312
+#: ../app/app_procs.c:1277
+#, c-format
 msgid ""
 "\n"
 "The current maintainers of Dia are:\n"
@@ -249,7 +278,8 @@ msgstr ""
 "Dia çåççèèçï\n"
 "\n"
 
-#: ../app/app_procs.c:1317
+#: ../app/app_procs.c:1282
+#, c-format
 msgid ""
 "\n"
 "Other authors are:\n"
@@ -259,7 +289,8 @@ msgstr ""
 "åääèçï\n"
 "\n"
 
-#: ../app/app_procs.c:1322
+#: ../app/app_procs.c:1287
+#, c-format
 msgid ""
 "\n"
 "Dia is documented by:\n"
@@ -269,40 +300,54 @@ msgstr ""
 "Dia æäçåï\n"
 "\n"
 
-#: ../app/autosave.c:90
-msgid "Recovering autosaved diagrams"
-msgstr "æåæååèåååçåè"
-
-#: ../app/autosave.c:98
-msgid ""
-"Autosaved files exist.\n"
-"Please select those you wish to recover."
-msgstr ""
-"ççèåååçææã\n"
-"èéååææååççææã"
-
-#: ../app/color_area.c:317 ../app/color_area.c:364
+#: ../app/color_area.c:333 ../app/color_area.c:343
 msgid "Select foreground color"
 msgstr "éååæèå"
 
-#: ../app/color_area.c:318 ../app/color_area.c:365
+#: ../app/color_area.c:334 ../app/color_area.c:344
 msgid "Select background color"
 msgstr "éåèæèå"
 
-#: ../app/commands.c:134
+#: ../app/commands.c:131
+msgid "No print plugin found!"
+msgstr "æäååååæçåï"
+
+#: ../app/commands.c:150
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "åè%d.dia"
 
-#: ../app/commands.c:207
+#: ../app/commands.c:249
+msgid "No image from Clipboard to paste."
+msgstr ""
+
+#: ../app/commands.c:299
+msgid "No selected object can take an image."
+msgstr ""
+
+#: ../app/commands.c:326
+msgid "Clipboard Paste"
+msgstr "åèçèä"
+
+#. might become more right some day ;)
+#: ../app/commands.c:334
+#, c-format
+msgid "No clipboard handler for '%s'"
+msgstr ""
+
+#: ../app/commands.c:426
+msgid "Clipboard Copy"
+msgstr "åèçèè"
+
+#: ../app/commands.c:625
 msgid "No existing object to paste.\n"
 msgstr "ææçåççäåäèäã\n"
 
-#: ../app/commands.c:583 ../app/commands.c:621
+#: ../app/commands.c:935 ../app/commands.c:973
 msgid "Could not find help directory"
 msgstr "æäåèææäçé"
 
-#: ../app/commands.c:590
+#: ../app/commands.c:942
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -311,17 +356,17 @@ msgstr ""
 "çæéåèææäçéï\n"
 "%s"
 
-#: ../app/commands.c:657
+#: ../app/commands.c:1011
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
-"i18n çåäæåèå\n"
-"http://i18n.linux.org.tw/\n";
+"èçèéçèèå\n"
+"http://groups.google.com.tw/group/chinese-l10n?hl=zh-TW\n";
 "\n"
-"Walter Cheuk <wwycheuk gmail com>, 2007\n"
-"Abel Cheung <maddog linux org hk>, 2001,2003\n"
+"Walter Cheuk <wwycheuk gmail com>, 2007, 2012\n"
+"Abel Cheung <maddog linux org hk>, 2001, 2003\n"
 "Jing-Jong Shyue <shyue sonoma com tw>, 2000"
 
-#: ../app/commands.c:659
+#: ../app/commands.c:1013
 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"
@@ -338,328 +383,279 @@ msgid ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: ../app/commands.c:682
+#: ../app/commands.c:1040
 msgid "A program for drawing structured diagrams."
 msgstr "çççæååèççåã"
 
-#: ../app/defaults.c:43 ../app/defaults.c:146
-msgid "Object defaults"
-msgstr "çäéèå"
-
-#: ../app/defaults.c:61
-msgid "This object has no defaults."
-msgstr "èçäææéèåã"
-
-#: ../app/defaults.c:111
-msgid "Defaults: "
-msgstr "éèåï"
-
-#: ../app/dia-props.c:85
-msgid "Diagram Properties"
-msgstr "åèåæ"
-
-#: ../app/dia-props.c:119
-msgid "Dynamic grid"
-msgstr "åææç"
-
-#: ../app/dia-props.c:127
-msgid "x"
-msgstr "æå"
-
-#: ../app/dia-props.c:131
-msgid "y"
-msgstr "åç"
-
-#: ../app/dia-props.c:136
-msgid "Spacing"
-msgstr "éé"
-
-#: ../app/dia-props.c:156
-msgid "Visible spacing"
-msgstr "åèéé"
-
-#. Hexes!
-#: ../app/dia-props.c:177 ../app/preferences.c:190
-msgid "Hex grid"
-msgstr "åèæç"
-
-#: ../app/dia-props.c:185
-msgid "Hex grid size"
-msgstr "åèæçåå"
-
-#: ../app/dia-props.c:198
-msgid "Grid"
-msgstr "æç"
-
-#: ../app/dia-props.c:209 ../lib/diagramdata.c:113
-msgid "Background"
-msgstr "èæ"
-
-#: ../app/dia-props.c:220 ../app/preferences.c:110
-msgid "Grid Lines"
-msgstr "æç"
-
-#: ../app/dia-props.c:231
-msgid "Page Breaks"
-msgstr "åéç"
-
-#: ../app/dia-props.c:242
-msgid "Colors"
-msgstr "èå"
-
-#. Can we be sure that the filename is the 'proper title'?
-#: ../app/dia-props.c:263
+#: ../app/confirm.c:65
 #, 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 äç"
-
-#. &export_file_format
-#: ../app/diaconv.c:86
-msgid "Export format to use"
-msgstr "ååçæææå"
-
-#: ../app/diaconv.c:86
-msgid "eps,png,wmf,cgm,dxf,fig"
-msgstr "eps,png,wmf,cgm,dxf,fig"
-
-#. &export_file_name
-#: ../app/diaconv.c:88
-msgid "Export file name to use"
-msgstr "ååææäççæå"
+msgid "You are about to print a diagram with %d pages."
+msgstr "èååæ %d éçåèã"
 
-#: ../app/diaconv.c:90
-msgid "Quiet operation"
-msgstr "äéçèæ"
-
-#: ../app/diaconv.c:143
+#: ../app/confirm.c:67
 #, c-format
-msgid ""
-"Error: No arguments found.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"éèïæäåääåæã\n"
-"åèâ%s --helpâååååæçæäåééã\n"
+msgid "You are about to export a diagram with %d pages."
+msgstr "èååæ %d éçåèã"
 
-#: ../app/diaconv.c:153
+#: ../app/confirm.c:69
 #, c-format
-msgid "%s error: can specify only one of -t or -o."
-msgstr "%s éèï-t æ -o ééääååäçåääåã"
+msgid ""
+"You are about to export a diagram which may require %s of memory.(%d pages)."
+msgstr "èåååèïæéèæéç %sã(%d é)ã"
 
-#: ../app/diaconv.c:159
-#, c-format
+#: ../app/confirm.c:77
 msgid ""
-"%s error: must specify only one of -t or -o.\n"
-"Run '%s --help' to see a full list of available command line options.\n"
+"You can adjust the size of the diagram by changing the 'Scaling' in the "
+"'Page Setup' dialog.\n"
+"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
+"the intended bounds."
 msgstr ""
-"%s éèï-t æ -o ééääååäçåääåãåèâ%s --helpâååååæçæäå"
-"ééã\n"
 
-#: ../app/diaconv.c:168
-#, c-format
-msgid "%s error: no input file."
-msgstr "%s éèïææèåæã"
+#: ../app/confirm.c:81
+msgid "Confirm Diagram Size"
+msgstr "çèåèåå"
 
-#: ../app/diaconv.c:221
+#: ../app/create_object.c:74
 #, c-format
-msgid "%s error: only one input file expected."
-msgstr "%s éèïåèæåäåèåæã"
+msgid "'%s' creation failed"
+msgstr "æèåç '%s'"
 
-#: ../app/diaconv.c:234
-#, c-format
-msgid "%s error: popt library not available on this system"
-msgstr "%s éèïæççäææ popt ååå"
+#: ../app/defaults.c:44 ../app/defaults.c:147
+msgid "Object defaults"
+msgstr "çäéèå"
+
+#: ../app/defaults.c:62
+msgid "This object has no defaults."
+msgstr "æçäææéèåã"
+
+#: ../app/defaults.c:111
+msgid "Defaults: "
+msgstr "éèåï"
 
-#: ../app/diagram.c:221
+#: ../app/diagram.c:237
 #, c-format
 msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
 msgstr "çæåææåçâ%sâèæè UTF-8ï%s\n"
 
-#: ../app/diagram.c:224 ../lib/message.c:89 ../lib/message.c:292
+#: ../app/diagram.c:240 ../lib/message.c:91 ../lib/message.c:296
 msgid "Error"
 msgstr "éè"
 
-#: ../app/diagram_tree_menu.c:46
-msgid "/_Sort objects"
-msgstr "/æåçä(_S)"
-
-#: ../app/diagram_tree_menu.c:47
-msgid "/Sort objects/by _name"
-msgstr "/æåçä(S)/ææåç(_N)"
-
-#: ../app/diagram_tree_menu.c:49
-msgid "/Sort objects/by _type"
-msgstr "/æåçä(S)/ææéå(_T)"
-
-#: ../app/diagram_tree_menu.c:51
-msgid "/Sort objects/as _inserted"
-msgstr "/æåçä(S)/ææååçæå(_I)"
-
-#: ../app/diagram_tree_menu.c:54
-msgid "/Sort objects/All by name"
-msgstr "/æåçä(S)/åéïææåç"
-
-#: ../app/diagram_tree_menu.c:56
-msgid "/Sort objects/All by type"
-msgstr "/æåçä(S)/åéïææéå"
+#. ToDo: move context further up in the callstack and to sth useful with it's content
+#: ../app/diagram.c:272
+msgid "Load Into"
+msgstr "èåè"
 
-#: ../app/diagram_tree_menu.c:58
-msgid "/Sort objects/All as inserted"
-msgstr "/æåçä(S)/åéïææååçæå"
-
-#: ../app/diagram_tree_menu.c:60
-msgid "/Sort objects/_Default"
-msgstr "/æåçä(S)/éèæå(_D)"
-
-#: ../app/diagram_tree_menu.c:61
-msgid "/Sort objects/Default/by _name"
-msgstr "/æåçä(S)/éèæå(D)/ææåç(_N)"
+#: ../app/diagram.c:1217
+msgid "Trying to group with no selected objects."
+msgstr ""
 
-#: ../app/diagram_tree_menu.c:63
-msgid "/Sort objects/Default/by _type"
-msgstr "/æåçä(S)/éèæå(D)/ææéå(_T)"
+#: ../app/diagram_tree_view.c:164
+msgid "Diagram"
+msgstr "åè"
 
-#: ../app/diagram_tree_menu.c:65
-msgid "/Sort objects/Default/as _inserted"
-msgstr "/æåçä(S)/éèæå(D)/ææååçæå(_I)"
+#: ../app/diagram_tree_view.c:171
+#: ../plug-ins/drs/dia-render-script-import.c:232
+msgid "Layer"
+msgstr "åå"
 
-#: ../app/diagram_tree_menu.c:67
-msgid "/Sort _diagrams"
-msgstr "/æååè(_D)"
+#: ../app/diagram_tree_view.c:177
+#, c-format
+msgid "%d Layer"
+msgid_plural "%d Layers"
+msgstr[0] "%d ååå"
+msgstr[1] "%d ååå"
 
-#: ../app/diagram_tree_menu.c:68
-msgid "/Sort _diagrams/by _name"
-msgstr "/æååè/ææåç(_N)"
+#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
+#: ../objects/Database/table.c:140 ../objects/Istar/actor.c:143
+#: ../objects/Istar/actor.c:144 ../objects/Istar/other.c:147
+#: ../objects/Istar/other.c:148 ../objects/KAOS/other.c:150
+#: ../objects/KAOS/other.c:151 ../objects/UML/association.c:243
+#: ../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:70
-msgid "/Sort _diagrams/as _inserted"
-msgstr "/æååè/ææååçæå(_I)"
+#: ../app/diagram_tree_view.c:184
+msgid "object|Position"
+msgstr "çä|äç"
 
-#: ../app/diagram_tree_menu.c:72
-msgid "/Sort diagrams/_Default"
-msgstr "/æååè/éèæå(_D)"
+#: ../app/diagram_tree_view.c:187
+msgid "Children"
+msgstr "åçä"
 
-#: ../app/diagram_tree_menu.c:73
-msgid "/Sort diagrams/Default/by _name"
-msgstr "/æååè/éèæå(D)/ææåç(_N)"
+#: ../app/diagram_tree_view.c:191
+#, c-format
+msgid "%d Object"
+msgid_plural "%d Objects"
+msgstr[0] "%d åçä"
+msgstr[1] "%d åçä"
 
-#: ../app/diagram_tree_menu.c:75
-msgid "/Sort diagrams/Default/as _inserted"
-msgstr "/æååè/éèæå(D)/ææååçæå(_I)"
+#: ../app/diagram_tree_view.c:448
+msgid "Select"
+msgstr "éå"
 
-#: ../app/diagram_tree_menu.c:83 ../app/diagram_tree_menu.c:94
-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:809
+#: ../objects/FS/function.c:1051
+msgid "Locate"
+msgstr "æç"
 
-#: ../app/diagram_tree_menu.c:84
-msgid "/_Properties"
-msgstr "/åæ(_P)"
+#: ../app/diagram_tree_view.c:450
+msgid "Properties"
+msgstr "åæ"
 
-#: ../app/diagram_tree_menu.c:85
-msgid "/_Hide this type"
-msgstr "/éèæéå(_H)"
+#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:123
+#: ../app/plugin-manager.c:270 ../objects/Database/table.c:138
+#: ../objects/Database/table.c:181 ../objects/UML/association.c:237
+#: ../objects/UML/class.c:140 ../objects/UML/large_package.c:132
+#: ../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:111
+#: ../app/diagram_tree_view.c:565
 msgid "Diagram Tree"
 msgstr "åèçææ"
 
-#: ../app/dialogs.c:51
-msgid "Ok"
-msgstr "çå"
-
-#: ../app/dialogs.c:52 ../app/paginate_psprint.c:324
-msgid "Cancel"
-msgstr "åæ"
-
 #. paper size
-#: ../app/diapagelayout.c:117
+#: ../app/diapagelayout.c:155
 msgid "Paper Size"
 msgstr "çååå"
 
 #. orientation
-#: ../app/diapagelayout.c:150
+#: ../app/diapagelayout.c:184
 msgid "Orientation"
 msgstr "æå"
 
 #. margins
-#: ../app/diapagelayout.c:188
+#: ../app/diapagelayout.c:213
 msgid "Margins"
 msgstr "éç"
 
-#: ../app/diapagelayout.c:200
+#: ../app/diapagelayout.c:225
 msgid "Top:"
 msgstr "äï"
 
-#: ../app/diapagelayout.c:213
+#: ../app/diapagelayout.c:238
 msgid "Bottom:"
 msgstr "äï"
 
-#: ../app/diapagelayout.c:226
+#: ../app/diapagelayout.c:251
 msgid "Left:"
 msgstr "åï"
 
-#: ../app/diapagelayout.c:239
+#: ../app/diapagelayout.c:264
 msgid "Right:"
 msgstr "åï"
 
 #. Scaling
-#: ../app/diapagelayout.c:253
+#: ../app/diapagelayout.c:278
 msgid "Scaling"
 msgstr "çæ"
 
-#: ../app/diapagelayout.c:264
+#: ../app/diapagelayout.c:289
 msgid "Scale:"
 msgstr "æäï"
 
-#: ../app/diapagelayout.c:276
+#: ../app/diapagelayout.c:301
 msgid "Fit to:"
 msgstr "çåï"
 
-#: ../app/diapagelayout.c:288
+#: ../app/diapagelayout.c:313
 msgid "by"
 msgstr "æ"
 
-#: ../app/diapagelayout.c:699
+#: ../app/diapagelayout.c:732
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3gåç Ã %0.3gåç"
 
-#: ../app/diapagelayout.c:803 ../app/pagesetup.c:76
+#: ../app/diapagelayout.c:836 ../app/pagesetup.c:77
 msgid "Page Setup"
 msgstr "ééèå"
 
-#: ../app/disp_callbacks.c:84 ../app/properties.c:152
+#: ../app/dia-props.c:86
+msgid "Diagram Properties"
+msgstr "åèåæ"
+
+#: ../app/dia-props.c:120
+msgid "Dynamic grid"
+msgstr "åææç"
+
+#: ../app/dia-props.c:128
+msgid "x"
+msgstr "æå"
+
+#: ../app/dia-props.c:132
+msgid "y"
+msgstr "åç"
+
+#: ../app/dia-props.c:137
+msgid "Spacing"
+msgstr "éé"
+
+#: ../app/dia-props.c:157
+msgid "Visible spacing"
+msgstr "åèéé"
+
+#. Hexes!
+#: ../app/dia-props.c:178 ../app/preferences.c:243
+msgid "Hex grid"
+msgstr "åèæç"
+
+#: ../app/dia-props.c:186
+msgid "Hex grid size"
+msgstr "åèæçåå"
+
+#: ../app/dia-props.c:199
+msgid "Grid"
+msgstr "æç"
+
+#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
+msgid "Background"
+msgstr "èæ"
+
+#: ../app/dia-props.c:221 ../app/preferences.c:122
+msgid "Grid Lines"
+msgstr "æç"
+
+#: ../app/dia-props.c:232
+msgid "Page Breaks"
+msgstr "åéç"
+
+#: ../app/dia-props.c:243
+msgid "Colors"
+msgstr "èå"
+
+#. Can we be sure that the filename is the 'proper title'?
+#: ../app/dia-props.c:264
+#, c-format
+msgid "Diagram Properties: %s"
+msgstr "åèåæï%s"
+
+#: ../app/disp_callbacks.c:91 ../app/properties-dialog.c:156
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
 msgstr ""
-"èçääææåå/åæååçåã\n"
-"æéæéååçèèã"
+"æçääææåå/åæååçåã\n"
+"ååéçæååçèèã"
 
-#: ../app/disp_callbacks.c:119
-msgid "Properties..."
+#: ../app/disp_callbacks.c:126
+msgid "Propertiesâ"
 msgstr "åæ..."
 
-#: ../app/disp_callbacks.c:921
+#: ../app/disp_callbacks.c:165
+msgid "Follow linkâ"
+msgstr "èééç..."
+
+#: ../app/disp_callbacks.c:287
+msgid "Selection"
+msgstr "éåå"
+
+#: ../app/disp_callbacks.c:1057
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -667,35 +663,36 @@ msgstr ""
 "ææææççäçææéåçççääã\n"
 "æåäåççäæåæææèçäææååèã"
 
-#: ../app/display.c:105
-msgid "Diagram modified!"
-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:132
+#: ../app/display.c:109
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "%d åçäçéåå"
 msgstr[1] "%d åçäçéåå"
 
-#: ../app/display.c:142
+#: ../app/display.c:119
 #, c-format
 msgid "Selected '%s'"
 msgstr "åéåâ%sâ"
 
-#: ../app/display.c:1160
+#. we really should not come here but instead disable the menu command earlier
+#: ../app/display.c:1177
+msgid "No antialiased renderer found"
+msgstr ""
+
+#: ../app/display.c:1327
 msgid "<unnamed>"
 msgstr "<æåå>"
 
 #. no standard buttons
-#: ../app/display.c:1166
+#: ../app/display.c:1333
 msgid "Closing diagram without saving"
 msgstr "äååäééåè"
 
-#: ../app/display.c:1169
+#: ../app/display.c:1335
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -704,88 +701,77 @@ msgstr ""
 "åèâ%sâ\n"
 "åæååãæåçåååï"
 
-#: ../app/display.c:1171
+#: ../app/display.c:1337
 msgid "Close Diagram"
 msgstr "ééåè"
 
-#: ../app/display.c:1176
+#: ../app/display.c:1342
 msgid "_Discard Changes"
 msgstr "ææææåå(_D)"
 
-#: ../app/export_png.c:138 ../app/load_save.c:950 ../app/render_eps.c:105
-#: ../plug-ins/cairo/diacairo.c:984 ../plug-ins/cgm/cgm.c:1153
-#: ../plug-ins/dxf/dxf-export.c:485 ../plug-ins/hpgl/hpgl.c:710
-#: ../plug-ins/metapost/render_metapost.c:1177
-#: ../plug-ins/pgf/render_pgf.c:1208
-#: ../plug-ins/pstricks/render_pstricks.c:916
-#: ../plug-ins/shape/shape-export.c:136 ../plug-ins/svg/render_svg.c:152
-#: ../plug-ins/vdx/vdx-export.c:1849 ../plug-ins/wpg/wpg.c:1072
-#: ../plug-ins/xfig/xfig-export.c:1138 ../plug-ins/xslt/xslt.c:96
-#, c-format
-msgid "Can't open output file %s: %s\n"
-msgstr "çæéåèåæ %sï%s\n"
+#: ../app/exit_dialog.c:77
+msgid "Do Not Exit"
+msgstr "äçæ"
 
-#: ../app/export_png.c:146
-msgid "Could not create PNG write structure"
-msgstr "çæçç PNG ååçæ"
+#: ../app/exit_dialog.c:79
+msgid "Exit Without Save"
+msgstr "çæèäåå"
 
-#: ../app/export_png.c:155
-msgid "Could not create PNG header info structure"
-msgstr "çæçç PNG æéèèçæ"
+#: ../app/exit_dialog.c:81
+msgid "Save Selected"
+msgstr "åéååå"
 
-#: ../app/export_png.c:163
-msgid "Error occurred while writing PNG"
-msgstr "çåå PNG æççéè"
+#: ../app/exit_dialog.c:87
+msgid "The following are not saved:"
+msgstr "ääçäååï"
 
-#. Create a dialog
-#: ../app/export_png.c:303
-msgid "PNG Export Options"
-msgstr "PNG ååéé"
+#: ../app/exit_dialog.c:113
+msgid "Save"
+msgstr "åå"
 
-#. Translators: Menu item Verb/Channel/Export
-#. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/export_png.c:304 ../objects/FS/function.c:696
-#: ../objects/FS/function.c:698
-msgid "Export"
-msgstr "åå"
+#: ../app/exit_dialog.c:129
+msgid "Path"
+msgstr "èå"
 
-#: ../app/export_png.c:309
-msgid "Image width:"
-msgstr "ååååï"
+#: ../app/exit_dialog.c:142
+msgid "Select All"
+msgstr "åééå"
 
-#: ../app/export_png.c:312
-msgid "Image height:"
-msgstr "ååéåï"
+#: ../app/exit_dialog.c:150
+msgid "Select None"
+msgstr "åéäé"
 
-#: ../app/export_png.c:358
-msgid "PNG (anti-aliased)"
-msgstr "PNG (åæå)"
+#: ../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:819 ../lib/widgets.c:406
+msgid "Supported Formats"
+msgstr "ææçæå"
 
-#: ../app/filedlg.c:132 ../app/filedlg.c:534
+#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:662
+#: ../app/filedlg.c:664
 msgid "By extension"
 msgstr "ææåäæå"
 
-#: ../app/filedlg.c:219
+#: ../app/filedlg.c:293
 msgid "Open Diagram"
 msgstr "éååè"
 
-#: ../app/filedlg.c:248
+#: ../app/filedlg.c:326
 msgid "Open Options"
 msgstr "éåéé"
 
-#: ../app/filedlg.c:256 ../app/filedlg.c:656
+#: ../app/filedlg.c:334 ../app/filedlg.c:801
 msgid "Determine file type:"
 msgstr "æåææéåï"
 
-#: ../app/filedlg.c:272 ../app/filedlg.c:674
-msgid "Supported Formats"
-msgstr "ææçæå"
-
-#: ../app/filedlg.c:278 ../app/filedlg.c:669
+#: ../app/filedlg.c:354 ../app/filedlg.c:814 ../lib/widgets.c:414
 msgid "All Files"
 msgstr "ææææ"
 
-#: ../app/filedlg.c:312 ../app/paginate_psprint.c:410
+#: ../app/filedlg.c:393 ../plug-ins/postscript/paginate_psprint.c:416
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -795,11 +781,13 @@ msgstr ""
 "ääåææçåäççççã\n"
 "åäåèæççéèã"
 
-#: ../app/filedlg.c:322 ../app/filedlg.c:581 ../app/paginate_psprint.c:425
+#: ../app/filedlg.c:403 ../app/filedlg.c:716
+#: ../plug-ins/postscript/paginate_psprint.c:430
 msgid "File already exists"
 msgstr "åæèææ"
 
-#: ../app/filedlg.c:324 ../app/filedlg.c:583 ../app/paginate_psprint.c:417
+#: ../app/filedlg.c:405 ../app/filedlg.c:718
+#: ../plug-ins/postscript/paginate_psprint.c:426
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -808,17 +796,17 @@ msgstr ""
 "åæâ%sâææã\n"
 "æåèèåï"
 
-#: ../app/filedlg.c:377
+#: ../app/filedlg.c:489
 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:389
+#: ../app/filedlg.c:503
 msgid "Compress diagram files"
 msgstr "åçåèææ"
 
-#: ../app/filedlg.c:398
+#: ../app/filedlg.c:512
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -826,223 +814,146 @@ msgstr ""
 "åçæäææåæåäç 1/10ïåææååèååååãäæäæåçèåçæèçå"
 "çææã"
 
-#: ../app/filedlg.c:607
+#: ../app/filedlg.c:747
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
 "to use to save '%s'"
 msgstr ""
-"çææåäçååååéæå\n"
+"çææåäååååéæå\n"
 "äååâ%sâ"
 
-#: ../app/filedlg.c:631
+#: ../app/filedlg.c:774
 msgid "Export Diagram"
 msgstr "åååè"
 
-#: ../app/filedlg.c:648
+#: ../app/filedlg.c:793
 msgid "Export Options"
 msgstr "ååéé"
 
-#: ../app/interface.c:144
-msgid ""
-"Modify object(s)\n"
-"Use <Space> to toggle between this and other tools"
-msgstr ""
-"äæçä\n"
-"äçïçæïåææååååäåå"
+#: ../app/find-and-replace.c:480
+msgid "_Search for:"
+msgstr "æå(_S)ï"
 
-#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/interface.c:150 ../app/menus.c:210 ../objects/FS/function.c:986
-msgid "Magnify"
-msgstr "æå"
+#: ../app/find-and-replace.c:493
+msgid "Replace _with:"
+msgstr "ææç(_W)ï"
 
-#: ../app/interface.c:156
-msgid "Scroll around the diagram"
-msgstr "ååèäæå"
+#: ../app/find-and-replace.c:503
+msgid "_Match case"
+msgstr "çåååå(_M)"
 
-#: ../app/interface.c:162 ../app/menus.c:212 ../lib/properties.c:79
-#: ../lib/properties.h:522 ../objects/AADL/aadlbox.c:144
-#: ../objects/Jackson/requirement.c:142 ../objects/UML/activity.c:127
-#: ../objects/UML/actor.c:122 ../objects/UML/classicon.c:144
-#: ../objects/UML/component.c:128 ../objects/UML/component_feature.c:155
-#: ../objects/UML/node.c:127 ../objects/UML/note.c:121
-#: ../objects/UML/object.c:148 ../objects/UML/small_package.c:128
-#: ../objects/UML/state.c:152 ../objects/UML/usecase.c:138
-#: ../objects/custom/custom_object.c:200 ../objects/network/basestation.c:133
-#: ../objects/network/radiocell.c:125
-msgid "Text"
-msgstr "æå"
+#: ../app/find-and-replace.c:507
+msgid "Match _entire word only"
+msgstr "çåæåå(_E)"
 
-#: ../app/interface.c:168 ../app/menus.c:213
-msgid "Box"
-msgstr "ææ"
-
-#: ../app/interface.c:174 ../app/menus.c:214
-msgid "Ellipse"
-msgstr "æå"
-
-#: ../app/interface.c:180 ../app/menus.c:215
-msgid "Polygon"
-msgstr "åéå"
-
-#: ../app/interface.c:186 ../app/menus.c:216
-msgid "Beziergon"
-msgstr "èèåéæç"
-
-#: ../app/interface.c:192 ../app/menus.c:218 ../objects/standard/line.c:225
-msgid "Line"
-msgstr "è"
-
-#: ../app/interface.c:198 ../app/menus.c:219
-msgid "Arc"
-msgstr "åç"
+#: ../app/find-and-replace.c:511
+msgid "Match _all properties (not just object name)"
+msgstr "çåææåæ (äåçäåç)(_A)"
 
-#: ../app/interface.c:204 ../app/menus.c:220
-msgid "Zigzagline"
-msgstr "Z åç"
+#: ../app/find-and-replace.c:537
+msgid "Find"
+msgstr "åæ"
 
-#: ../app/interface.c:210 ../app/menus.c:221
-msgid "Polyline"
-msgstr "èççæ"
+#: ../app/find-and-replace.c:567 ../app/menus.c:263
+msgid "Replace"
+msgstr "ææ"
 
-#: ../app/interface.c:216 ../app/menus.c:222
-msgid "Bezierline"
-msgstr "èèæç"
+#: ../app/find-and-replace.c:570
+msgid "Replace _All"
+msgstr "åéææ(_A)"
 
-#: ../app/interface.c:222 ../app/menus.c:224
-msgid "Image"
-msgstr "åå"
+#. 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:575
+msgid "_Replace"
+msgstr "ææ(_R)"
 
-#: ../app/interface.c:561 ../app/interface.c:795
+#: ../app/interface.c:517
 msgid "Pops up the Navigation window."
 msgstr "åååèèçã"
 
-#: ../app/interface.c:757
+#: ../app/interface.c:732
 msgid "Diagram menu."
 msgstr "åèéåã"
 
-#: ../app/interface.c:861
+#: ../app/interface.c:772
 msgid "Zoom"
 msgstr "çæ"
 
-#: ../app/interface.c:876
+#: ../app/interface.c:787
 msgid "Toggles snap-to-grid for this window."
 msgstr "åæèçåæçèçæçã"
 
-#: ../app/interface.c:887
+#: ../app/interface.c:798
 msgid "Toggles object snapping for this window."
 msgstr "åæçäåæçèçæçã"
 
-#: ../app/interface.c:950
-msgid "NULL tooldata in tool_select_update"
-msgstr "å tool_select_update ä tooldata çåç NULL"
-
-#: ../app/interface.c:1266
-#, c-format
-msgid "No sheet named %s"
-msgstr "ææåç %s çåäè"
-
-#: ../app/interface.c:1304
-msgid "Other sheets"
-msgstr "åååäè"
-
-#: ../app/interface.c:1363 ../sheets/Misc.sheet.in.h:3
-msgid "Misc"
-msgstr "åå"
-
-#: ../app/interface.c:1423
-msgid ""
-"Foreground & background colors for new objects.  The small black and white "
-"squares reset colors.  The small arrows swap colors.  Double click to change "
-"colors."
-msgstr ""
-"æçäçåæåèæèåã\n"
-"éçåæååéèèåã\n"
-"åçéåäæèåã\n"
-"éæåææèåã"
-
-#: ../app/interface.c:1438
-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:1481
-msgid ""
-"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
-"arrow parameters with Details..."
-msgstr "æçæééççéæåãåæåäæéçéïææç èæ... èåçéåæ"
-
-#: ../app/interface.c:1486
-msgid ""
-"Line style for new lines.  Click to pick a line style, or set line style "
-"parameters with Details..."
-msgstr "æçæççææåãåæåäæéçææåïææç èæ... èåçæåæ"
-
-#: ../app/interface.c:1502
-msgid ""
-"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
-"parameters with Details..."
-msgstr "æçæçåççéæåãåæåäæéçéïææç èæ... èåçéåæ"
-
-#: ../app/interface.c:1546 ../app/interface.c:1674
+#: ../app/interface.c:926 ../app/interface.c:1034 ../dia.desktop.in.in.h:2
 msgid "Diagram Editor"
-msgstr "åèçèå"
+msgstr "åèçè"
 
-#: ../app/layer_dialog.c:101
+#: ../app/layer_dialog.c:165
 msgid "New Layer"
 msgstr "æååå"
 
-#: ../app/layer_dialog.c:102
+#: ../app/layer_dialog.c:166
 msgid "Raise Layer"
 msgstr "ææåå"
 
-#: ../app/layer_dialog.c:103
+#: ../app/layer_dialog.c:167
 msgid "Lower Layer"
 msgstr "éäåå"
 
-#: ../app/layer_dialog.c:104
+#: ../app/layer_dialog.c:168
 msgid "Delete Layer"
 msgstr "åéåå"
 
-#: ../app/layer_dialog.c:225
+#: ../app/layer_dialog.c:311
+msgid "Layers:"
+msgstr "ååï"
+
+#: ../app/layer_dialog.c:390
 msgid "Layers"
 msgstr "åå"
 
-#: ../app/layer_dialog.c:239
+#: ../app/layer_dialog.c:404
 msgid "Diagram:"
 msgstr "åèï"
 
-#: ../app/layer_dialog.c:349
+#: ../app/layer_dialog.c:518 ../app/layer_dialog.c:1231
 #, c-format
 msgid "New layer %d"
 msgstr "æåå %d"
 
-#: ../app/layer_dialog.c:561
+#: ../app/layer_dialog.c:733
 msgid "none"
 msgstr "ç"
 
-#: ../app/layer_dialog.c:983
-msgid "Edit Layer Attributes"
-msgstr "çèåååæ"
+#: ../app/layer_dialog.c:1201
+msgid "Edit Layer"
+msgstr "çèåå"
 
-#: ../app/layer_dialog.c:1002
+#: ../app/layer_dialog.c:1201
+msgid "Add Layer"
+msgstr "åååå"
+
+#: ../app/layer_dialog.c:1220
 msgid "Layer name:"
 msgstr "åååçï"
 
-#: ../app/linewidth_area.c:246 ../lib/properties.h:483 ../lib/properties.h:486
+#: ../app/linewidth_area.c:247 ../lib/properties.h:622 ../lib/properties.h:625
 #: ../objects/chronogram/chronoline.c:181
 #: ../objects/chronogram/chronoref.c:160
 msgid "Line width"
 msgstr "çæåå"
 
-#: ../app/linewidth_area.c:258
+#: ../app/linewidth_area.c:259
 msgid "Line width:"
 msgstr "çæååï"
 
-#: ../app/load_save.c:262
+#: ../app/load_save.c:266
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -1050,49 +961,47 @@ msgstr ""
 "èååèæççéèã\n"
 "æäåæäåéççäã"
 
-#: ../app/load_save.c:265
+#: ../app/load_save.c:270
+#, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection handle does not exist."
+"Connection handle %d does not exist on '%s'."
 msgstr ""
 "èååèæççéèã\n"
-"ææéæåäã"
+"éæåä %d äå '%s'ã"
 
-#: ../app/load_save.c:282
+#: ../app/load_save.c:288
 #, c-format
 msgid ""
 "Error loading diagram.\n"
-"connection point %s does not exist."
+"Connection point %d does not exist on '%s'."
 msgstr ""
 "èååèæççéèã\n"
-"ææéæé %sã"
+"éæé %d äå '%s'ã"
 
-#: ../app/load_save.c:307
+#: ../app/load_save.c:328
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "æäå %2$s çäççéç %1$s\n"
 
-#: ../app/load_save.c:353 ../objects/SISSI/area.c:204
-#: ../objects/SISSI/faraday.c:204 ../objects/SISSI/room.c:204
-#: ../objects/SISSI/sissi_object.c:194 ../objects/SISSI/site.c:207
-msgid "You must specify a file, not a directory.\n"
-msgstr "æåéæåææèäæçéã\n"
+#: ../app/load_save.c:378
+msgid "You must specify a file, not a directory."
+msgstr "æåéæåææèäæçéã"
 
-#: ../app/load_save.c:360 ../objects/SISSI/area.c:210
-#: ../objects/SISSI/faraday.c:210 ../objects/SISSI/room.c:210
-#: ../objects/SISSI/sissi_object.c:201 ../objects/SISSI/site.c:213
-#: ../plug-ins/dxf/dxf-import.c:1304 ../plug-ins/wpg/wpg.c:1177
-#: ../plug-ins/xfig/xfig-import.c:1260 ../plug-ins/xslt/xslt.c:88
+#: ../app/load_save.c:385 ../plug-ins/dxf/dxf-import.c:1289
+#: ../plug-ins/wpg/wpg.c:1186 ../plug-ins/xfig/xfig-import.c:1288
+#: ../plug-ins/xslt/xslt.c:93
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "çæéåâ%sâäèåèæã\n"
 
-#: ../app/load_save.c:378 ../app/load_save.c:384 ../objects/SISSI/area.c:219
-#: ../objects/SISSI/area.c:225 ../objects/SISSI/faraday.c:219
-#: ../objects/SISSI/faraday.c:225 ../objects/SISSI/room.c:219
-#: ../objects/SISSI/room.c:225 ../objects/SISSI/sissi_object.c:211
-#: ../objects/SISSI/sissi_object.c:217 ../objects/SISSI/site.c:222
-#: ../objects/SISSI/site.c:228
+#. this was talking about unknown file type but it could as well be broken XML
+#: ../app/load_save.c:403
+#, c-format
+msgid "Error loading diagram %s."
+msgstr "èååè %s æççéèã"
+
+#: ../app/load_save.c:408
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1101,9 +1010,7 @@ msgstr ""
 "èååè %s æççéèã\n"
 "ææéåäæã"
 
-#: ../app/load_save.c:392 ../objects/SISSI/area.c:233
-#: ../objects/SISSI/faraday.c:233 ../objects/SISSI/room.c:233
-#: ../objects/SISSI/sissi_object.c:225 ../objects/SISSI/site.c:236
+#: ../app/load_save.c:416
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1112,7 +1019,7 @@ msgstr ""
 "èååè %s æççéèã\n"
 "äæ Dia ææã"
 
-#: ../app/load_save.c:598
+#: ../app/load_save.c:674
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1122,488 +1029,642 @@ msgstr ""
 "èååè %s æççéèã\n"
 "ææç Dia æææåæäåååã"
 
-#: ../app/load_save.c:906
+#: ../app/load_save.c:1017
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "äåèååèåæ %s\n"
 
-#: ../app/load_save.c:928
+#: ../app/load_save.c:1049
 #, c-format
 msgid "Not allowed to write temporary files in %s\n"
 msgstr "äåèåå %s äçèæææ\n"
 
+#: ../app/load_save.c:1072 ../plug-ins/cgm/cgm.c:1172
+#: ../plug-ins/dxf/dxf-export.c:599
+#: ../plug-ins/metapost/render_metapost.c:1179
+#: ../plug-ins/pgf/render_pgf.c:1204 ../plug-ins/postscript/render_eps.c:123
+#: ../plug-ins/pstricks/render_pstricks.c:920
+#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wmf/wmf.cpp:1374
+#: ../plug-ins/wpg/wpg.c:1078 ../plug-ins/xfig/xfig-export.c:1158
+#, c-format
+msgid "Can't open output file %s"
+msgstr "çæéåèåæ %s"
+
 #. Save failed; we clean our stuff up, without touching the file named
 #. "filename" if it existed.
-#: ../app/load_save.c:961
+#: ../app/load_save.c:1083
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "åé %d éèïçæååææ %s\n"
 
-#: ../app/load_save.c:975
+#: ../app/load_save.c:1094
 #, c-format
 msgid "Can't rename %s to final output file %s: %s\n"
 msgstr "çæå %s éæååèæåèåæ %sï%s\n"
 
-#: ../app/load_save.c:1063 ../app/load_save.c:1068
+#: ../app/load_save.c:1110
+msgid "Diagram Save"
+msgstr "åèåå"
+
+#: ../app/load_save.c:1240 ../app/load_save.c:1245
 msgid "Dia Diagram File"
 msgstr "Dia åèææ"
 
-#
-#: ../app/menus.c:70
+#: ../app/menus.c:63
+msgid "Fit"
+msgstr "éå"
+
+#: ../app/menus.c:80
 msgid "_File"
 msgstr "ææ(_F)"
 
-#
-#: ../app/menus.c:74
+#: ../app/menus.c:81
+msgid "Create a new diagram"
+msgstr "åçæåè"
+
+#: ../app/menus.c:82
+msgid "_Openâ"
+msgstr "éå(_O)..."
+
+#: ../app/menus.c:82
+msgid "Open a diagram file"
+msgstr "éååèææ"
+
+#: ../app/menus.c:84
 msgid "_Help"
 msgstr "æå(_H)"
 
-#: ../app/menus.c:82
-msgid "Sheets and Objects..."
+#: ../app/menus.c:94
+msgid "Sheets and Objectsâ"
 msgstr "åäèèçä..."
 
-#: ../app/menus.c:84
-msgid "Plugins..."
+#: ../app/menus.c:96
+msgid "Pluginsâ"
 msgstr "åææç..."
 
-#: ../app/menus.c:90
-msgid "_Diagram tree..."
-msgstr "åèçææ(_D)..."
+#: ../app/menus.c:97
+msgid "_Diagram Tree"
+msgstr "åèçææ(_D)"
 
-#: ../app/menus.c:96
-#, fuzzy
+#: ../app/menus.c:102
 msgid "Show Toolbar"
-msgstr "éçæé"
+msgstr "éçååå"
 
-#: ../app/menus.c:97
-#, fuzzy
+#: ../app/menus.c:103
 msgid "Show Statusbar"
-msgstr "éçåæ"
+msgstr "éççæå"
 
-#
-#: ../app/menus.c:105
-msgid "_Export ..."
+#: ../app/menus.c:104
+msgid "Show Layers"
+msgstr "éçåå"
+
+#: ../app/menus.c:110
+msgid "Save the diagram"
+msgstr "åååè"
+
+#: ../app/menus.c:111
+msgid "Save _Asâ"
+msgstr "ååç(_A)..."
+
+#: ../app/menus.c:111
+msgid "Save the diagram with a new name"
+msgstr "äæåçåååè"
+
+#: ../app/menus.c:112
+msgid "_Exportâ"
 msgstr "åå(_E)..."
 
-#: ../app/menus.c:106
-msgid "Page Set_up..."
+#: ../app/menus.c:112
+msgid "Export the diagram"
+msgstr "åååè"
+
+#: ../app/menus.c:113
+msgid "_Diagram Properties"
+msgstr "åèåæ(_D)"
+
+#: ../app/menus.c:114
+msgid "Page Set_upâ"
 msgstr "ééèå(_U)..."
 
-#: ../app/menus.c:110 ../app/sheets_dialog.c:235
+#: ../app/menus.c:115
+msgid "_Printâ"
+msgstr "åå(_P)..."
+
+#: ../app/menus.c:115
+msgid "Print the diagram"
+msgstr "åååè"
+
+#: ../app/menus.c:118
 msgid "_Edit"
 msgstr "çè (_E)"
 
-#
-#: ../app/menus.c:117
+#: ../app/menus.c:119
+msgid "Undo"
+msgstr "åå"
+
+#: ../app/menus.c:120
+msgid "Redo"
+msgstr "éå"
+
+#: ../app/menus.c:122
+msgid "Copy selection"
+msgstr "èèéåå"
+
+#: ../app/menus.c:123
+msgid "Cut selection"
+msgstr "åäéåå"
+
+#: ../app/menus.c:124
+msgid "Paste selection"
+msgstr "èäéåå"
+
+#: ../app/menus.c:125
 msgid "_Duplicate"
-msgstr "éè(_D)"
+msgstr "èäèæ(_D)"
+
+#: ../app/menus.c:128
+msgid "_Findâ"
+msgstr "åæ(_F)..."
+
+#: ../app/menus.c:129
+msgid "_Replaceâ"
+msgstr "ææ(_R)..."
 
 #
 #. the following used to bind to <control><shift>C which collides with Unicode input.
-#. * <control>>alt> doesn't work either
-#: ../app/menus.c:122
+#. * <control><alt> doesn't work either
+#: ../app/menus.c:133
 msgid "Copy Text"
 msgstr "èèæå"
 
 #
-#: ../app/menus.c:123
+#: ../app/menus.c:134
 msgid "Cut Text"
 msgstr "åäæå"
 
 #
-#: ../app/menus.c:124
+#: ../app/menus.c:135
 msgid "Paste _Text"
 msgstr "èäæå(_T)"
 
 #
-#: ../app/menus.c:126
-msgid "_Diagram"
-msgstr "åè(_D)"
+#: ../app/menus.c:137
+msgid "Paste _Image"
+msgstr "èäåå(_I)"
 
-#: ../app/menus.c:128
-msgid "_Layers..."
+#: ../app/menus.c:139
+msgid "_Layers"
+msgstr "åå(_L)"
+
+#: ../app/menus.c:140
+msgid "Add Layerâ"
+msgstr "åååå..."
+
+#: ../app/menus.c:141
+msgid "Rename Layerâ"
+msgstr "éæåååå..."
+
+#: ../app/menus.c:142
+msgid "Move Selection to Layer above"
+msgstr "åéååçèäæåå"
+
+#: ../app/menus.c:143
+msgid "Move Selection to Layer below"
+msgstr "åéååçèäæåå"
+
+#: ../app/menus.c:144
+msgid "_Layersâ"
 msgstr "åå(_L)..."
 
-#
-#: ../app/menus.c:130
+#: ../app/menus.c:145
 msgid "_View"
 msgstr "æè(_V)"
 
-#: ../app/menus.c:133
+#: ../app/menus.c:146
+msgid "Zoom in"
+msgstr "æå"
+
+#: ../app/menus.c:147
+msgid "Zoom out"
+msgstr "çå"
+
+#: ../app/menus.c:148
 msgid "_Zoom"
 msgstr "çæ(_Z)"
 
-#: ../app/menus.c:134
+#: ../app/menus.c:149
 msgid "1600%"
-msgstr ""
+msgstr "1600%"
 
-#: ../app/menus.c:135
+#: ../app/menus.c:150 ../app/menus.c:578 ../app/menus.c:590
 msgid "800%"
-msgstr ""
+msgstr "800%"
 
-#: ../app/menus.c:136
+#: ../app/menus.c:151 ../app/menus.c:579 ../app/menus.c:591
 msgid "400%"
-msgstr ""
+msgstr "400%"
 
-#: ../app/menus.c:137
+#: ../app/menus.c:152
 msgid "283"
-msgstr ""
+msgstr "283"
 
-#: ../app/menus.c:138
+#: ../app/menus.c:153
 msgid "200"
-msgstr ""
+msgstr "200"
 
-#: ../app/menus.c:139
+#: ../app/menus.c:154
 msgid "141"
-msgstr ""
+msgstr "141"
 
-#: ../app/menus.c:141
+#: ../app/menus.c:156
 msgid "85"
-msgstr ""
+msgstr "85"
 
-#: ../app/menus.c:142
+#: ../app/menus.c:157
 msgid "70.7"
-msgstr ""
+msgstr "70.7"
 
-#: ../app/menus.c:143
+#: ../app/menus.c:158
 msgid "50"
-msgstr ""
+msgstr "50"
 
-#: ../app/menus.c:144
+#: ../app/menus.c:159
 msgid "35.4"
-msgstr ""
+msgstr "35.4"
 
-#: ../app/menus.c:145
+#: ../app/menus.c:160
 msgid "25"
-msgstr ""
+msgstr "25"
+
+#. Show All, Best Fit.  Same as the Gimp, Ctrl+E
+#: ../app/menus.c:162
+msgid "Zoom fit"
+msgstr "çæèéå"
 
 #
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:151
+#: ../app/menus.c:166
 msgid "New _View"
 msgstr "æåæè(_V)"
 
-#: ../app/menus.c:152
+#: ../app/menus.c:167
 msgid "C_lone View"
-msgstr "èèæè(_L)"
+msgstr "èäæèèæ(_L)"
 
-#
-#: ../app/menus.c:155
+#: ../app/menus.c:170
 msgid "_Objects"
 msgstr "çä(_O)"
 
-#
-#: ../app/menus.c:156
+#: ../app/menus.c:171
 msgid "Send to _Back"
 msgstr "éåæåå(_B)"
 
-#
-#: ../app/menus.c:157
+#: ../app/menus.c:172
 msgid "Bring to _Front"
 msgstr "éåæåå(_F)"
 
-#
-#: ../app/menus.c:158
+#: ../app/menus.c:173
 msgid "Send Backwards"
 msgstr "ååäå"
 
-#
-#: ../app/menus.c:159
+#: ../app/menus.c:174
 msgid "Bring Forwards"
 msgstr "ååäå"
 
-#: ../app/menus.c:161
+#: ../app/menus.c:176
 msgid "_Group"
 msgstr "çç(_G)"
 
-#
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:163
+#: ../app/menus.c:178
 msgid "_Ungroup"
 msgstr "èæçç(_U)"
 
-#: ../app/menus.c:165
+#: ../app/menus.c:180
 msgid "_Parent"
 msgstr "ççä(_P)"
 
-#
-#: ../app/menus.c:166
+#: ../app/menus.c:181
 msgid "_Unparent"
 msgstr "åæççä(_U)"
 
-#
-#: ../app/menus.c:167
+#: ../app/menus.c:182
 msgid "_Unparent Children"
 msgstr "åæççäåå(_U)"
 
 #. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:169 ../objects/FS/function.c:806
+#: ../app/menus.c:184 ../objects/FS/function.c:807
 msgid "Align"
 msgstr "åé"
 
-#: ../app/menus.c:174 ../objects/standard/textobj.c:132
+#: ../app/menus.c:189 ../objects/standard/textobj.c:110
 msgid "Top"
 msgstr "ä"
 
-#: ../app/menus.c:175
+#: ../app/menus.c:190
 msgid "Middle"
 msgstr "ä"
 
-#: ../app/menus.c:176 ../objects/standard/textobj.c:131
+#: ../app/menus.c:191 ../objects/standard/textobj.c:109
 msgid "Bottom"
 msgstr "ä"
 
-#
-#: ../app/menus.c:178
+#: ../app/menus.c:193
 msgid "Spread Out Horizontally"
 msgstr "æåæä"
 
-#
-#: ../app/menus.c:179
+#: ../app/menus.c:194
 msgid "Spread Out Vertically"
 msgstr "åçæä"
 
-#: ../app/menus.c:180
+#: ../app/menus.c:195
 msgid "Adjacent"
 msgstr "çé"
 
-#: ../app/menus.c:181
+#: ../app/menus.c:196
 msgid "Stacked"
 msgstr "çè"
 
-#
-#: ../app/menus.c:185
+#: ../app/menus.c:197 ../app/menus.c:207
+msgid "Connected"
+msgstr "éæ"
+
+#: ../app/menus.c:201
 msgid "_Select"
 msgstr "éå(_S)"
 
-#: ../app/menus.c:186
+#: ../app/menus.c:202
 msgid "All"
 msgstr "åé"
 
-#: ../app/menus.c:187 ../lib/arrows.c:43 ../objects/Jackson/domain.c:96
-#: ../objects/UML/association.c:1183
+#: ../app/menus.c:203 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:94
+#: ../objects/UML/association.c:221 ../objects/UML/association.c:227
 msgid "None"
 msgstr "ç"
 
-#: ../app/menus.c:188
+#: ../app/menus.c:204
 msgid "Invert"
 msgstr "éå"
 
-#: ../app/menus.c:190
+#: ../app/menus.c:206
 msgid "Transitive"
 msgstr "æç"
 
-#: ../app/menus.c:191
-msgid "Connected"
-msgstr "éæ"
-
-#
-#: ../app/menus.c:192
+#: ../app/menus.c:208
 msgid "Same Type"
 msgstr "çåéå"
 
-#
 #. display_select_radio_entries go here
-#: ../app/menus.c:196
+#: ../app/menus.c:212
 msgid "Select By"
 msgstr "éå"
 
-#
-#: ../app/menus.c:198
+#. For placment of the toplevel Layout menu and it's accelerator
+#: ../app/menus.c:215
+msgid "L_ayout"
+msgstr "éç(_A)"
+
+#: ../app/menus.c:217
 msgid "_Input Methods"
 msgstr "èåæ(_I)"
 
-#: ../app/menus.c:200
+#: ../app/menus.c:219
 msgid "D_ialogs"
 msgstr "åèç(_I)"
 
-#: ../app/menus.c:202
+#: ../app/menus.c:221
 msgid "D_ebug"
 msgstr "éé(_E)"
 
-#
-#: ../app/menus.c:208
+#: ../app/menus.c:227
 msgid "_Tools"
 msgstr "åå(_T)"
 
-#: ../app/menus.c:209
+#: ../app/menus.c:228
 msgid "Modify"
 msgstr "äæ"
 
-#: ../app/menus.c:211
+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
+#: ../app/menus.c:229 ../app/toolbox.c:86 ../objects/FS/function.c:987
+msgid "Magnify"
+msgstr "æå"
+
+#: ../app/menus.c:230
+msgid "Edit Text"
+msgstr "çèæå"
+
+#: ../app/menus.c:231
 msgid "Scroll"
 msgstr "æå"
 
-#
-#: ../app/menus.c:233
-msgid "Fullscr_een"
-msgstr "åèå(_E)"
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../app/menus.c:232 ../app/toolbox.c:98 ../lib/properties.c:101
+#: ../lib/properties.h:673 ../objects/AADL/aadlbox.c:153
+#: ../objects/custom/custom_object.c:228 ../objects/Jackson/requirement.c:133
+#: ../objects/network/basestation.c:132 ../objects/network/radiocell.c:125
+#: ../objects/UML/activity.c:127 ../objects/UML/actor.c:121
+#: ../objects/UML/classicon.c:146 ../objects/UML/component.c:128
+#: ../objects/UML/component_feature.c:158 ../objects/UML/node.c:128
+#: ../objects/UML/node.c:130 ../objects/UML/note.c:119
+#: ../objects/UML/object.c:166 ../objects/UML/small_package.c:130
+#: ../objects/UML/state.c:155 ../objects/UML/usecase.c:137
+msgid "Text"
+msgstr "æå"
+
+#: ../app/menus.c:233 ../app/toolbox.c:104
+msgid "Box"
+msgstr "ææ"
+
+#: ../app/menus.c:234 ../app/toolbox.c:110
+msgid "Ellipse"
+msgstr "æå"
+
+#: ../app/menus.c:235 ../app/toolbox.c:116
+msgid "Polygon"
+msgstr "åéå"
+
+#: ../app/menus.c:236 ../app/toolbox.c:122
+msgid "Beziergon"
+msgstr "èèåéæç"
+
+#: ../app/menus.c:238 ../app/toolbox.c:128 ../objects/standard/line.c:326
+msgid "Line"
+msgstr "è"
+
+#: ../app/menus.c:239 ../app/toolbox.c:134
+msgid "Arc"
+msgstr "åç"
+
+#: ../app/menus.c:240 ../app/toolbox.c:140
+msgid "Zigzagline"
+msgstr "Z åç"
+
+#: ../app/menus.c:241 ../app/toolbox.c:146
+msgid "Polyline"
+msgstr "èççæ"
+
+#: ../app/menus.c:242 ../app/toolbox.c:152
+msgid "Bezierline"
+msgstr "èèæç"
+
+#: ../app/menus.c:243 ../app/toolbox.c:165
+msgid "Outline"
+msgstr "åæ"
+
+#: ../app/menus.c:245 ../app/toolbox.c:158
+msgid "Image"
+msgstr "åå"
 
 #
-#. we must have all actions registered to avoid configuration specific ui-files and crashing in GTK+,
-#. * see: http://bugzilla.gnome.org/show_bug.cgi?id=396161
-#.
-#: ../app/menus.c:236 ../app/menus.c:241
-msgid "_AntiAliased"
+#: ../app/menus.c:252
+msgid "_Antialiased"
 msgstr "åæå(_A)"
 
 #
-#: ../app/menus.c:243
+#: ../app/menus.c:253
 msgid "Show _Grid"
 msgstr "éçæç(_G)"
 
 #
-#: ../app/menus.c:244
-msgid "_Snap To Grid"
+#: ../app/menus.c:254
+msgid "_Snap to Grid"
 msgstr "èéæç(_S)"
 
 #
-#: ../app/menus.c:245
-msgid "Snap To _Objects"
+#: ../app/menus.c:255
+msgid "Snap to _Objects"
 msgstr "èéçä(_O)"
 
 #
-#: ../app/menus.c:246
+#: ../app/menus.c:256
 msgid "Show _Rulers"
 msgstr "éçåè(_R)"
 
 #
-#: ../app/menus.c:247
+#: ../app/menus.c:257
 msgid "Show _Connection Points"
 msgstr "éçéæé(_C)"
 
-#: ../app/menus.c:253
-msgid "Replace"
-msgstr "ææ"
-
-#: ../app/menus.c:254
+#: ../app/menus.c:264
 msgid "Union"
 msgstr "èé"
 
 #
-#: ../app/menus.c:255
+#: ../app/menus.c:265
 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:256 ../app/sheets_dialog.c:784 ../objects/FS/function.c:706
-#: ../objects/FS/function.c:858 ../objects/FS/function.c:860
+#: ../app/menus.c:266 ../objects/FS/function.c:707
+#: ../objects/FS/function.c:859 ../objects/FS/function.c:861
 msgid "Remove"
 msgstr "çé"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:258
+#: ../app/menus.c:268
 msgid "Inverse"
 msgstr "çå"
 
-#: ../app/menus.c:322
+#: ../app/menus.c:331
 msgid "NULL tooldata in tool_menu_select"
 msgstr "å tool_menu_select ä tooldata çåç NULL"
 
-#: ../app/menus.c:480
-msgid "Toggles snap-to-grid."
-msgstr "åæçèçæçã"
+#: ../app/menus.c:580 ../app/menus.c:592
+msgid "300%"
+msgstr "300%"
 
-#: ../app/menus.c:496
-msgid "Toggles object snapping."
-msgstr "åæçèççäã"
+#: ../app/menus.c:581 ../app/menus.c:593
+msgid "200%"
+msgstr "200%"
 
-#: ../app/modify_tool.c:344
-msgid "Couldn't get GTK settings"
-msgstr "çæçå GTK èå"
+#: ../app/menus.c:582 ../app/menus.c:594
+msgid "150%"
+msgstr "150%"
 
-#: ../app/paginate_psprint.c:275
-msgid "Select Printer"
-msgstr "éååèæ"
+#: ../app/menus.c:583 ../app/menus.c:595
+msgid "100%"
+msgstr "100%"
 
-#: ../app/paginate_psprint.c:287 ../sheets/ciscocomputer.sheet.in.h:36
-msgid "Printer"
-msgstr "åèæ"
+#: ../app/menus.c:584 ../app/menus.c:596
+msgid "75%"
+msgstr "75%"
 
-#: ../app/paginate_psprint.c:301 ../sheets/Misc.sheet.in.h:1
-msgid "File"
-msgstr "ææ"
+#: ../app/menus.c:585 ../app/menus.c:597
+msgid "50%"
+msgstr "50%"
 
-#: ../app/paginate_psprint.c:316
-msgid "OK"
-msgstr "çå"
+#: ../app/menus.c:586 ../app/menus.c:598
+msgid "25%"
+msgstr "25%"
 
-#: ../app/paginate_psprint.c:462
-#, c-format
-msgid "Could not run command '%s': %s"
-msgstr "çæåèæäâ%sâï%s"
+#: ../app/menus.c:587 ../app/menus.c:599
+msgid "10%"
+msgstr "10%"
 
-#: ../app/paginate_psprint.c:465
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "çæéåâ%sâäååèæï%s"
+#: ../app/menus.c:625
+msgid "Toggles snap-to-grid."
+msgstr "åæçèçæçã"
 
-#: ../app/paginate_psprint.c:487
-#, c-format
-msgid "Printing error: command '%s' returned %d\n"
-msgstr "ååéèïæäâ%sâåå %d\n"
+#: ../app/menus.c:636
+msgid "Toggles object snapping."
+msgstr "åæçèççäã"
 
-#: ../app/paginate_psprint.c:498
-#, c-format
-msgid "Printing error: command '%s' caused sigpipe."
-msgstr "ååéèïæäâ%sâéæ sigpipeã"
+#: ../app/modify_tool.c:390
+msgid "Couldn't get GTK+ settings"
+msgstr "çæçå GTK+ èå"
 
-#: ../app/plugin-manager.c:200
-msgid "Plug-ins"
+#: ../app/plugin-manager.c:208
+msgid "Plugins"
 msgstr "åææç"
 
-#: ../app/plugin-manager.c:255
+#: ../app/plugin-manager.c:263
 msgid "Loaded"
 msgstr "åèå"
 
-#. *** board of value **************
-#: ../app/plugin-manager.c:262 ../objects/SISSI/sissi_dialog.c:618
-#: ../objects/UML/class.c:139 ../objects/UML/large_package.c:131
-#: ../objects/UML/umlattribute.c:37 ../objects/UML/umlformalparameter.c:35
-#: ../objects/UML/umloperation.c:62 ../objects/UML/umlparameter.c:43
-msgid "Name"
-msgstr "åç"
-
-#: ../app/plugin-manager.c:268 ../objects/SISSI/sissi_dialog.c:614
-#: ../objects/SISSI/sissi_dialog.c:766
+#: ../app/plugin-manager.c:276
 msgid "Description"
 msgstr "èæ"
 
-#: ../app/plugin-manager.c:277
+#: ../app/plugin-manager.c:285
 msgid "Load at Startup"
 msgstr "çåååæèåèå"
 
-#: ../app/plugin-manager.c:284
-msgid "File Name"
+#: ../app/plugin-manager.c:292
+msgid "Filename"
 msgstr "ææåç"
 
-#: ../app/preferences.c:107
+#: ../app/preferences.c:100 ../app/preferences.c:143
+msgid "any"
+msgstr "ää"
+
+#: ../app/preferences.c:118
 msgid "User Interface"
 msgstr "äçèçé"
 
-#: ../app/preferences.c:108
+#: ../app/preferences.c:119
 msgid "Diagram Defaults"
 msgstr "åèéèå"
 
-#: ../app/preferences.c:109
+#: ../app/preferences.c:120
 msgid "View Defaults"
 msgstr "æèéèå"
 
-#: ../app/preferences.c:126
+#: ../app/preferences.c:121
+msgid "Favorites"
+msgstr "ææ"
+
+#: ../app/preferences.c:164
 msgid "Reset tools after create"
 msgstr "éèååæåç"
 
-#: ../app/preferences.c:129
-msgid "Compress saved files"
-msgstr "åçååçææ"
-
-#: ../app/preferences.c:132
+#: ../app/preferences.c:167
 msgid "Number of undo levels:"
 msgstr "åååææï"
 
-#: ../app/preferences.c:135
+#: ../app/preferences.c:170
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1611,161 +1672,190 @@ msgstr ""
 "ååæææéæ\n"
 "çäççä"
 
-#: ../app/preferences.c:138
+#: ../app/preferences.c:173
 msgid "Recent documents list size:"
 msgstr "æèäçæææåçåå:"
 
-#: ../app/preferences.c:141
+#: ../app/preferences.c:176
 msgid "Use menu bar"
 msgstr "äçéåå"
 
-#: ../app/preferences.c:144
+#: ../app/preferences.c:179
 msgid "Keep tool box on top of diagram windows"
 msgstr "äååçäæèääåèèçéè"
 
-#: ../app/preferences.c:147
-msgid "Unit for lengths:"
+#: ../app/preferences.c:182
+msgid "Length unit:"
 msgstr "éååäï"
 
-#: ../app/preferences.c:150
-msgid "Unit for font sizes:"
+#: ../app/preferences.c:185
+msgid "Font size unit:"
 msgstr "åååååäï"
 
-#: ../app/preferences.c:154
-msgid "Integrated UI"
-msgstr "æååçé"
-
-#: ../app/preferences.c:157
+#: ../app/preferences.c:188
 msgid "New diagram:"
 msgstr "æååèï"
 
-#: ../app/preferences.c:158
+#: ../app/preferences.c:189
 msgid "Portrait"
 msgstr "çå"
 
-#: ../app/preferences.c:160
+#: ../app/preferences.c:191
 msgid "Paper type:"
 msgstr "çåéåï"
 
-#: ../app/preferences.c:163
+#: ../app/preferences.c:193
 msgid "Background Color:"
 msgstr "èæéèï"
 
-#: ../app/preferences.c:166
+#: ../app/preferences.c:195
+msgid "Compress saved files"
+msgstr "åçååçææ"
+
+#: ../app/preferences.c:198
+msgid "Connection Points:"
+msgstr "éæéï"
+
+#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
+#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
+msgid "Visible"
+msgstr "åè"
+
+#
+#: ../app/preferences.c:200
+msgid "Snap to object"
+msgstr "èéçä"
+
+#: ../app/preferences.c:203
 msgid "New window:"
 msgstr "æåèçï"
 
-#: ../app/preferences.c:167
+#: ../app/preferences.c:204
 msgid "Width:"
 msgstr "ååï"
 
-#: ../app/preferences.c:168
+#: ../app/preferences.c:205
 msgid "Height:"
 msgstr "éåï"
 
-#: ../app/preferences.c:169
+#: ../app/preferences.c:206
 msgid "Magnify:"
 msgstr "æåï"
 
-#: ../app/preferences.c:172
-msgid "Connection Points:"
-msgstr "éæéï"
-
-#. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:173 ../app/preferences.c:177 ../app/preferences.c:183
-msgid "Visible"
-msgstr "åè"
-
-#: ../app/preferences.c:176
+#: ../app/preferences.c:209
 msgid "Page breaks:"
 msgstr "åéçï"
 
-#: ../app/preferences.c:178 ../app/preferences.c:188
+#: ../app/preferences.c:211 ../app/preferences.c:241
 msgid "Color:"
 msgstr "éèï"
 
-#: ../app/preferences.c:179
+#: ../app/preferences.c:212
 msgid "Solid lines"
 msgstr "åç"
 
-#: ../app/preferences.c:184
+#
+#: ../app/preferences.c:215
+msgid "Antialias:"
+msgstr "åæåï"
+
+#: ../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:220 ../objects/FS/function.c:697
+#: ../objects/FS/function.c:699 ../plug-ins/libart/export_png.c:329
+msgid "Export"
+msgstr "åå"
+
+#: ../app/preferences.c:222
+msgid "Portable Network Graphics"
+msgstr "PNG"
+
+#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:605
+#: ../plug-ins/svg/svg-import.c:1444
+msgid "Scalable Vector Graphics"
+msgstr "åçæåéå (SVG)"
+
+#: ../app/preferences.c:226
+msgid "PostScript"
+msgstr "PostScript"
+
+#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1476
+msgid "Windows Metafile"
+msgstr "Windows ååæ (WMF)"
+
+#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1485
+msgid "Enhanced Metafile"
+msgstr "åååååæ (EMF)"
+
+#: ../app/preferences.c:235
 msgid "Snap to"
 msgstr "èç"
 
-#: ../app/preferences.c:185
+#: ../app/preferences.c:236
 msgid "Dynamic grid resizing"
 msgstr "åææçéèåå"
 
-#: ../app/preferences.c:186
+#: ../app/preferences.c:237
 msgid "X Size:"
 msgstr "X èååï"
 
-#: ../app/preferences.c:187
+#: ../app/preferences.c:238
 msgid "Y Size:"
 msgstr "Y èååï"
 
-#: ../app/preferences.c:189
+#: ../app/preferences.c:239
+msgid "Visual Spacing X:"
+msgstr "æååèééï"
+
+#: ../app/preferences.c:240
+msgid "Visual Spacing Y:"
+msgstr "åçåèééï"
+
+#: ../app/preferences.c:242
 msgid "Lines per major line"
 msgstr "äæçäéçèæ"
 
-#: ../app/preferences.c:191
+#: ../app/preferences.c:244
 msgid "Hex Size:"
-msgstr "åèæçåå:"
-
-#: ../app/preferences.c:207
-msgid "Diagram tree window:"
-msgstr "åèçææèçï"
+msgstr "åèæçååï"
 
-#: ../app/preferences.c:209
-msgid "Save hidden object types"
-msgstr "ååéèççäéå"
-
-#: ../app/preferences.c:417 ../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:417 ../app/preferences.c:428
-#: ../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:530
+#: ../app/preferences.c:595
 msgid "Preferences"
 msgstr "ååèå"
 
-#: ../app/preferences.c:714
-msgid "User Interface type settings change will take after restart"
-msgstr "äçèçééåèåèæææéæåååçæ"
-
-#: ../app/properties.c:55
+#: ../app/properties-dialog.c:60
 msgid "Object properties"
 msgstr "çäåæ"
 
-#: ../app/properties.c:80
+#: ../app/properties-dialog.c:85
 msgid "This object has no properties."
 msgstr "æçäææääåæã"
 
-#: ../app/properties.c:217
+#: ../app/properties-dialog.c:248
 msgid "Properties: "
 msgstr "åæï"
 
-#: ../app/properties.c:221
+#: ../app/properties-dialog.c:252
 msgid "Object properties:"
 msgstr "çäåæï"
 
-#: ../app/render_eps.c:150
-msgid "Encapsulated Postscript (using Pango fonts)"
-msgstr "åèå Postscriptïäç Pango ååï"
-
-#: ../app/render_eps.c:159
-msgid "Encapsulated Postscript with preview (using Pango fonts)"
-msgstr "åèå Postscript èéèïäç Pango ååï"
-
-#: ../app/render_eps.c:169
-msgid "Encapsulated Postscript (using PostScript Latin-1 fonts)"
-msgstr "åèå Postscriptïäç PostScript Latin-1 ååï"
-
-#: ../app/sheets.c:156
+#: ../app/sheets.c:158
 #, c-format
 msgid ""
 "%s\n"
@@ -1774,7 +1864,7 @@ msgstr ""
 "%s\n"
 "ççåäè"
 
-#: ../app/sheets.c:158
+#: ../app/sheets.c:160
 #, c-format
 msgid ""
 "%s\n"
@@ -1783,153 +1873,68 @@ msgstr ""
 "%s\n"
 "äçèåäè"
 
-#: ../app/sheets.c:273
+#: ../app/sheets.c:278
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
 msgstr ""
 "çæåääæçäååâcustom_typeâçèã\n"
-"ååçååçççèã"
+"ååçåååççèã"
 
-#: ../app/sheets.c:381
+#: ../app/sheets.c:413
 #, c-format
 msgid "Widget not found: %s"
 msgstr "æäåèçåäï%s"
 
-#: ../app/sheets.c:456
+#: ../app/sheets.c:443
 msgid "SVG Shape"
 msgstr "SVG åå"
 
-#: ../app/sheets.c:458
+#: ../app/sheets.c:445
 msgid "Programmed DiaObject"
 msgstr "çåå DiaObject"
 
-#: ../app/sheets_dialog.c:83
-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_callbacks.c:168
+msgid "Move ->"
+msgstr "çå â"
+
+#: ../app/sheets_dialog_callbacks.c:170
+msgid "Move All ->"
+msgstr "åéçå â"
 
-#: ../app/sheets_dialog.c:109 ../app/sheets_dialog_callbacks.c:179
+#: ../app/sheets_dialog_callbacks.c:177
 msgid "<- Copy"
 msgstr "â èè"
 
-#: ../app/sheets_dialog.c:119 ../app/sheets_dialog_callbacks.c:181
+#: ../app/sheets_dialog_callbacks.c:179
 msgid "<- Copy All"
 msgstr "â åéèè"
 
-#: ../app/sheets_dialog.c:126 ../app/sheets_dialog_callbacks.c:183
+#: ../app/sheets_dialog_callbacks.c:181
 msgid "<- Move"
 msgstr "â çå"
 
-#: ../app/sheets_dialog.c:136 ../app/sheets_dialog_callbacks.c:185
+#: ../app/sheets_dialog_callbacks.c:183
 msgid "<- Move All"
 msgstr "â åéçå"
 
-#: ../app/sheets_dialog.c:233
-msgid "Edit"
-msgstr "çè"
-
-#: ../app/sheets_dialog.c:266
-msgid "Revert"
-msgstr "éå"
-
-#: ../app/sheets_dialog.c:354
-msgid "New"
-msgstr "æå"
-
-#: ../app/sheets_dialog.c:362 ../app/sheets_dialog.c:794
-#: ../objects/Istar/actor.c:144 ../objects/Istar/actor.c:145
-#: ../objects/Istar/other.c:148 ../objects/Istar/other.c:149
-#: ../objects/KAOS/other.c:151 ../objects/KAOS/other.c:152
-#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
-msgid "Type"
-msgstr "éå"
-
-#: ../app/sheets_dialog.c:377
-msgid "Browse..."
-msgstr "çè..."
-
-#: ../app/sheets_dialog.c:386
-msgid "SVG Shape:"
-msgstr "SVG ååï"
-
-#: ../app/sheets_dialog.c:413 ../app/sheets_dialog.c:476
-msgid "description:"
-msgstr "èæï"
-
-#: ../app/sheets_dialog.c:425
-msgid "Sheet name:"
-msgstr "åäèåç:"
-
-#: ../app/sheets_dialog.c:446 ../app/sheets_dialog_callbacks.c:291
-#: ../app/sheets_dialog_callbacks.c:1108
+#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1072
 msgid "Line Break"
 msgstr "æè"
 
-#: ../app/sheets_dialog.c:568
-msgid "Edit Attributes"
-msgstr "çèåæ"
-
-#: ../app/sheets_dialog.c:583
-msgid "DiaObject"
-msgstr "Diaçä"
-
-#: ../app/sheets_dialog.c:599 ../app/sheets_dialog.c:692
-msgid "Description:"
-msgstr "èæï"
-
-#: ../app/sheets_dialog.c:618 ../objects/FS/flow-ortho.c:167
-#: ../objects/FS/flow.c:144 ../objects/Istar/link.c:164
-#: ../objects/Jackson/phenomenon.c:144 ../objects/KAOS/metaandorrel.c:164
-#: ../objects/KAOS/metabinrel.c:171 ../objects/UML/class_dialog.c:977
-#: ../objects/UML/class_dialog.c:1930 ../objects/UML/class_dialog.c:2168
-#: ../objects/UML/class_dialog.c:2694
-msgid "Type:"
-msgstr "éåï"
-
-#: ../app/sheets_dialog.c:656
-msgid "Sheet"
-msgstr "åäè"
-
-#: ../app/sheets_dialog.c:672 ../objects/ER/attribute.c:153
-#: ../objects/ER/entity.c:135 ../objects/ER/relationship.c:140
-#: ../objects/UML/association.c:238 ../objects/UML/association.c:1160
-#: ../objects/UML/class_dialog.c:966 ../objects/UML/class_dialog.c:1919
-#: ../objects/UML/class_dialog.c:2157 ../objects/UML/class_dialog.c:2683
-#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:131
-#: ../objects/UML/realizes.c:132
-msgid "Name:"
-msgstr "åçï"
-
-#: ../app/sheets_dialog.c:809
-msgid "DiaObject:"
-msgstr "Diaçäï"
-
-#: ../app/sheets_dialog.c:836
-msgid "Sheet:"
-msgstr "åäèï"
-
-#: ../app/sheets_dialog.c:920
-msgid "Select SVG Shape File"
-msgstr "éå SVG ååæ"
-
-#: ../app/sheets_dialog_callbacks.c:166
-msgid "Copy ->"
-msgstr "èè â"
-
-#: ../app/sheets_dialog_callbacks.c:168
-msgid "Copy All ->"
-msgstr "åéèè â"
-
-#: ../app/sheets_dialog_callbacks.c:170
-msgid "Move ->"
-msgstr "çå â"
-
-#: ../app/sheets_dialog_callbacks.c:172
-msgid "Move All ->"
-msgstr "åéçå â"
-
-#: ../app/sheets_dialog_callbacks.c:305
+#: ../app/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -1938,7 +1943,7 @@ msgstr ""
 "%s\n"
 "åå"
 
-#: ../app/sheets_dialog_callbacks.c:308
+#: ../app/sheets_dialog_callbacks.c:306
 #, c-format
 msgid ""
 "%s\n"
@@ -1947,7 +1952,7 @@ msgstr ""
 "%s\n"
 "çä"
 
-#: ../app/sheets_dialog_callbacks.c:311
+#: ../app/sheets_dialog_callbacks.c:309
 #, c-format
 msgid ""
 "%s\n"
@@ -1956,382 +1961,645 @@ msgstr ""
 "%s\n"
 "ææåéå"
 
-#: ../app/sheets_dialog_callbacks.c:802
+#: ../app/sheets_dialog_callbacks.c:771
+msgid "Please select a .shape file"
+msgstr "èéå .shape ææ"
+
+#: ../app/sheets_dialog_callbacks.c:778
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "ææåçæçåéæâ%sâïâ%sâ"
 
-#: ../app/sheets_dialog_callbacks.c:810
+#: ../app/sheets_dialog_callbacks.c:786
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "æé %s æççéèï%s"
 
-#: ../app/sheets_dialog_callbacks.c:841
+#: ../app/sheets_dialog_callbacks.c:817
 msgid "Please export the diagram as a shape."
-msgstr ""
+msgstr "èååèååçåå"
 
-#: ../app/sheets_dialog_callbacks.c:844
+#: ../app/sheets_dialog_callbacks.c:820
 #, c-format
 msgid "Could not interpret shape file: '%s'"
-msgstr "çæåæååæïâ%sâ"
+msgstr "çæèèååæïâ%sâ"
 
-#: ../app/sheets_dialog_callbacks.c:915
+#: ../app/sheets_dialog_callbacks.c:888
 msgid "Sheet must have a Name"
 msgstr "åäèéèæåç"
 
-#: ../app/sheets_dialog_callbacks.c:1612 ../app/sheets_dialog_callbacks.c:1619
+#: ../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:1671
+#: ../app/sheets_dialog_callbacks.c:1643
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "çæéåâ%sâäååèæ"
 
-#: ../app/sheets_dialog_callbacks.c:1681
+#: ../app/sheets_dialog_callbacks.c:1653
 msgid "a user"
 msgstr "äåäçè"
 
-#: ../app/sheets_dialog_callbacks.c:1694
+#: ../app/sheets_dialog_callbacks.c:1666
 #, c-format
 msgid "File: %s"
 msgstr "ææï%s"
 
-#: ../app/sheets_dialog_callbacks.c:1697
+#: ../app/sheets_dialog_callbacks.c:1669
 #, c-format
 msgid "Date: %s"
 msgstr "ææï%s"
 
-#: ../app/sheets_dialog_callbacks.c:1701
+#: ../app/sheets_dialog_callbacks.c:1673
 #, c-format
 msgid "For: %s"
 msgstr "çï%s"
 
-#: ../app/sheets_dialog_callbacks.c:1718
+#: ../app/sheets_dialog_callbacks.c:1690
 msgid "add shapes here"
 msgstr "åéèåååå"
 
-#: ../app/splash.c:56
-msgid "Loading ..."
+#: ../app/splash.c:50
+msgid "Loading â"
 msgstr "èåä ..."
 
-#: ../app/splash.c:74
+#: ../app/splash.c:68
 #, c-format
 msgid "Dia v %s"
-msgstr "Dia %s çæ"
+msgstr "Dia %s ç"
+
+#: ../app/toolbox.c:74
+msgid ""
+"Modify object(s)\n"
+"Use <Space> to toggle between this and other tools"
+msgstr ""
+"äæçä\n"
+"äïçæïåææååååäåå"
+
+#: ../app/toolbox.c:80
+msgid ""
+"Text edit(s)\n"
+"Use <Esc> to leave this tool"
+msgstr ""
+"æåçè\n"
+"äïEscïééæåå"
+
+#: ../app/toolbox.c:92
+msgid "Scroll around the diagram"
+msgstr "ååèäæå"
+
+#: ../app/toolbox.c:354
+#, c-format
+msgid "No sheet named %s"
+msgstr "ææåç %s çåäè"
+
+#: ../app/toolbox.c:392
+msgid "Other sheets"
+msgstr "åååäè"
+
+#: ../app/toolbox.c:452 ../sheets/Flowchart.sheet.in.h:1
+msgid "Flowchart"
+msgstr "æçå"
+
+#: ../app/toolbox.c:496
+msgid ""
+"Foreground & background colors for new objects.  The small black and white "
+"squares reset colors.  The small arrows swap colors.  Double-click to change "
+"colors."
+msgstr ""
+"æçäçåæåèæèåã\n"
+"éçåæååéèèåã\n"
+"åçéåäæèåã\n"
+"éæåææèåã"
+
+#: ../app/toolbox.c:510
+msgid ""
+"Line widths.  Click on a line to set the default line width for new "
+"objects.  Double-click to set the line width more precisely."
+msgstr ""
+"çæååãåæçæåäèåæçäçéèçæååãéæååäæçççèåçæå"
+"åã"
+
+#: ../app/toolbox.c:553
+msgid ""
+"Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
+"arrow parameters with Detailsâ"
+msgstr "æçæééççéæåãåæåäæéçéïææçãèæ...ãèåçéåæ"
+
+#: ../app/toolbox.c:558
+msgid ""
+"Line style for new lines.  Click to pick a line style, or set line style "
+"parameters with Detailsâ"
+msgstr "æçæççææåãåæåäæéçææåïææçãèæ...ãèåçæåæ"
+
+#: ../app/toolbox.c:574
+msgid ""
+"Arrow style at the end of new lines.  Click to pick an arrow, or set arrow "
+"parameters with Detailsâ"
+msgstr "æçæçåççéæåãåæåäæéçéïææçãèæ...ãèåçéåæ"
 
 #: ../dia.desktop.in.in.h:1
+msgid "Dia"
+msgstr "Dia"
+
+#: ../dia.desktop.in.in.h:3
 msgid "Dia Diagram Editor"
 msgstr "Dia åèçèå"
 
-#: ../dia.desktop.in.in.h:2
+#: ../dia.desktop.in.in.h:4
 msgid "Edit your Diagrams"
 msgstr "çèæçåè"
 
-#: ../lib/arrows.c:44
+#. Installer message if no GTK+ was found
+#: ../installer/win32/gennsh.c:39
+msgid ""
+"GTK+ is not installed. Please use the full installer. It is available from "
+"http://dia-installer.de.";
+msgstr ""
+"éææåè GTK+ãèäçåæçåèçåãåå http://dia-installer.de ååã"
+
+#. Installer message: Don't install over pre 0.95 versions
+#: ../installer/win32/gennsh.c:42
+msgid ""
+"Please remove old Dia installations completely or install Dia to a different "
+"location."
+msgstr "èååèç Dia ååæéäæïæå Dia åèèäåçäçã"
+
+#. Installer message:  License Page
+#: ../installer/win32/gennsh.c:45
+msgid "Next >"
+msgstr "ääæ >"
+
+#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
+#: ../installer/win32/gennsh.c:48
+msgid ""
+"$(^Name) is released under the GPL license. The license is provided here for "
+"information purposes only. $_CLICK"
+msgstr ""
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:51
+msgid "Dia Diagram Editor (required)"
+msgstr "Dia åèçèå (åè)"
+
+#. Installer message: Components page
+#: ../installer/win32/gennsh.c:54
+msgid "Translations"
+msgstr "çè"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:57
+msgid "Optional translations of the Dia user interface"
+msgstr "Dia äçèäéçéåçè"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:60
+msgid "Core Dia files and dlls"
+msgstr "æå Dia ææåååå"
+
+#. Installer message: Component name
+#: ../installer/win32/gennsh.c:63
+msgid "Python plug-in"
+msgstr "Python åææç"
+
+#. Installer message: Component description
+#: ../installer/win32/gennsh.c:66
+msgid ""
+"Support for the Python Scripting Language 2.3. Do not select this if Python "
+"is not installed."
+msgstr "Python Scripting èè 2.3 çææãåææåè Python åäèéã"
+
+#. Installer message: hyperlink text on finish page
+#: ../installer/win32/gennsh.c:69
+msgid "Visit the Dia for Windows Web Page"
+msgstr "å Windows çéæè Dia"
+
+#. Installer message: Dia uninstaller entry in Control Panel
+#: ../installer/win32/gennsh.c:72
+msgid "Dia (remove only)"
+msgstr "Dia (åçé)"
+
+#. Installer message: confirmation question. Keep $\r
+#: ../installer/win32/gennsh.c:75
+msgid ""
+"Your old Dia directory is about to be deleted. Would you like to continue?$\r"
+"$\rNote: Any non-standard plugins that you may have installed will be "
+"deleted.$\rDia user settings will not be affected."
+msgstr ""
+"ååçéèç Dia çéãæåççï$\r$\rææïääåèäçéææåææçéæè"
+"åéã$\rDia çäçèèååäååéã"
+
+#. Installer message: confirmatin question. Keep $\r
+#: ../installer/win32/gennsh.c:78
+msgid ""
+"The installation directory you specified already exists. Any contents$\rwill "
+"be deleted. Would you like to continue?"
+msgstr "åææåçåèçéãçäæææèé$\ræèåéãæåççï"
+
+#. Installer message: Uninstall Section Prompts. Keep $\r
+#: ../installer/win32/gennsh.c:81
+msgid ""
+"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
+"another user installed this application."
+msgstr ""
+"åéçåæäå Dia çèåèéçã$\rææççååæåèæçåääçèåèçã"
+
+#. Installer message: Uninstall error message
+#: ../installer/win32/gennsh.c:84
+msgid "You do not have permission to uninstall this application."
+msgstr "çæéåéææççåã"
+
+#. Installer message: Uninstallation warning. Keep $INSTDIR
+#: ../installer/win32/gennsh.c:87
+msgid "This will completely delete $INSTDIR and all subdirectories. Continue?"
+msgstr "æåååé $INSTDIR åååçéãæåççï"
+
+#. Installer message: Uninstallation warning. Keep $\PROFILE\.dia
+#: ../installer/win32/gennsh.c:90
+msgid ""
+"This will completely delete $PROFILE\\.dia and all subdirectories. Continue?"
+msgstr "æåååé $PROFILE\\.dia åååçéãæåççï"
+
+#: ../lib/arrows.c:1891
 msgid "Lines"
-msgstr "çæ"
+msgstr "çæ"
 
-#: ../lib/arrows.c:45
+#: ../lib/arrows.c:1892
 msgid "Hollow Triangle"
 msgstr "çåäèå"
 
-#: ../lib/arrows.c:46
+#: ../lib/arrows.c:1893
 msgid "Filled Triangle"
 msgstr "ååäèå"
 
-#: ../lib/arrows.c:47
+#: ../lib/arrows.c:1894
 msgid "Unfilled Triangle"
 msgstr "äåèäèå"
 
-#: ../lib/arrows.c:48
+#: ../lib/arrows.c:1895
 msgid "Hollow Diamond"
 msgstr "çåèå"
 
-#: ../lib/arrows.c:49
+#: ../lib/arrows.c:1896
 msgid "Filled Diamond"
 msgstr "ååèå"
 
-#: ../lib/arrows.c:50
+#: ../lib/arrows.c:1897
 msgid "Half Diamond"
 msgstr "åèå"
 
-#: ../lib/arrows.c:51
+#: ../lib/arrows.c:1898
 msgid "Half Head"
 msgstr "åéçé"
 
-#: ../lib/arrows.c:52
+#: ../lib/arrows.c:1899
 msgid "Slashed Cross"
 msgstr "ååäåæç"
 
-#: ../lib/arrows.c:53
+#: ../lib/arrows.c:1900
 msgid "Filled Ellipse"
 msgstr "ååæå"
 
-#: ../lib/arrows.c:54
+#: ../lib/arrows.c:1901
 msgid "Hollow Ellipse"
 msgstr "çåæå"
 
-#: ../lib/arrows.c:55
+#: ../lib/arrows.c:1902
 msgid "Filled Dot"
 msgstr "ååé"
 
-#: ../lib/arrows.c:56
+#: ../lib/arrows.c:1903
 msgid "Dimension Origin"
 msgstr "åååå"
 
-#: ../lib/arrows.c:57
+#: ../lib/arrows.c:1904
 msgid "Blanked Dot"
 msgstr "çåé"
 
-#: ../lib/arrows.c:58
+#: ../lib/arrows.c:1905
 msgid "Double Hollow Triangle"
 msgstr "éçåäèå"
 
-#: ../lib/arrows.c:59
+#: ../lib/arrows.c:1906
 msgid "Double Filled Triangle"
 msgstr "éååäèå"
 
-#: ../lib/arrows.c:60
+#: ../lib/arrows.c:1907
 msgid "Filled Dot and Triangle"
 msgstr "åéèäèå"
 
-#: ../lib/arrows.c:61
+#: ../lib/arrows.c:1908
 msgid "Filled Box"
 msgstr "ååæå"
 
-#: ../lib/arrows.c:62
+#: ../lib/arrows.c:1909
 msgid "Blanked Box"
 msgstr "çåæå"
 
-#: ../lib/arrows.c:63
+#: ../lib/arrows.c:1910
 msgid "Slashed"
 msgstr "æç"
 
-#: ../lib/arrows.c:64
+#: ../lib/arrows.c:1911
 msgid "Integral Symbol"
 msgstr "çåçè"
 
-#: ../lib/arrows.c:65
+#: ../lib/arrows.c:1912
 msgid "Crow Foot"
 msgstr "äå"
 
-#: ../lib/arrows.c:66
+#: ../lib/arrows.c:1913
 msgid "Cross"
 msgstr "åå"
 
-#: ../lib/arrows.c:67
+#: ../lib/arrows.c:1914
 msgid "1-or-many"
 msgstr "1-æ-åå"
 
-#: ../lib/arrows.c:68
+#: ../lib/arrows.c:1915
 msgid "0-or-many"
 msgstr "0-æ-åå"
 
-#: ../lib/arrows.c:69
+#: ../lib/arrows.c:1916
 msgid "1-or-0"
 msgstr "1-æ-0"
 
-#: ../lib/arrows.c:70
+#: ../lib/arrows.c:1917
 msgid "1 exactly"
 msgstr "åæ 1"
 
-#: ../lib/arrows.c:71
+#: ../lib/arrows.c:1918
 msgid "Filled Concave"
 msgstr "åååçé"
 
-#: ../lib/arrows.c:72
+#: ../lib/arrows.c:1919
 msgid "Blanked Concave"
 msgstr "çååçé"
 
-#: ../lib/arrows.c:73
+#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
+#: ../lib/properties.h:600 ../lib/properties.h:606
 msgid "Round"
 msgstr "åç"
 
-#: ../lib/arrows.c:74
+#: ../lib/arrows.c:1921
 msgid "Open Round"
 msgstr "éæçåå"
 
-#: ../lib/arrows.c:75
+#: ../lib/arrows.c:1922
 msgid "Backslash"
 msgstr "åæç"
 
-#: ../lib/arrows.c:76
+#: ../lib/arrows.c:1923
 msgid "Infinite Line"
 msgstr "çéçæ"
 
-#: ../lib/arrows.c:1892
+#: ../lib/arrows.c:2051
 msgid "Arrow head of unknown type"
 msgstr "äçåéåççé"
 
-#: ../lib/arrows.c:1900
+#: ../lib/arrows.c:2059
 #, c-format
-msgid "Arrow head of type %s has too small dimensions, removing.\n"
-msgstr "%s éåççéååååïæåçéã\n"
+msgid "Arrow head of type %s has too small dimensions; removing.\n"
+msgstr "%s éåççéååååïæåçéã\n"
 
-#: ../lib/arrows.c:2021
+#: ../lib/arrows.c:2192
 msgid "unknown arrow"
 msgstr "äçåçé"
 
-#: ../lib/bezier_conn.c:636
-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:335
-#: ../plug-ins/svg/svg-import.c:204 ../plug-ins/vdx/vdx-import.c:140
+#: ../lib/create.c:160 ../lib/create.c:196 ../lib/create.c:228
+#: ../lib/create.c:252 ../lib/create.c:284 ../lib/create.c:305
+#: ../lib/create.c:335 ../lib/create.c:378 ../plug-ins/svg/svg-import.c:398
+#: ../plug-ins/vdx/vdx-import.c:144
 msgid "Can't find standard object"
 msgstr "æäåææçä"
 
-#: ../lib/dia_dirs.c:237
-#, c-format
-msgid "%s<illegal characters>..."
-msgstr "%s<äèäççåå>..."
-
-#: ../lib/dia_dirs.c:268
-#, c-format
-msgid "Too many ..'s in filename %s\n"
-msgstr "ææåç %s äæåå ..\n"
+#: ../lib/diaarrowchooser.c:367
+msgid "Arrow Properties"
+msgstr "çéåæ"
 
-#: ../lib/dia_xml.c:167
-#, c-format
-msgid ""
-"The file %s has no encoding specification;\n"
-"assuming it is encoded in %s"
-msgstr ""
-"ææ %s ææççèæï\n"
-"åèåçççæ %s"
+#: ../lib/diaarrowselector.c:123
+msgid "More arrows"
+msgstr "æåçé"
 
-#: ../lib/dia_xml.c:568
+#: ../lib/diaarrowselector.c:140
+msgid "Size: "
+msgstr "ååï"
+
+#: ../lib/diacolorselector.c:204
+msgid "Select color"
+msgstr "éåèå"
+
+#: ../lib/diacolorselector.c:292
+msgid "More colorsâ"
+msgstr "æåèå..."
+
+#: ../lib/dia_dirs.c:327
+#, c-format
+msgid "Too many \"..\"s in filename %s\n"
+msgstr "ææåç %s äæååã..ã\n"
+
+#: ../lib/diadynamicmenu.c:396
+msgid "Reset menu"
+msgstr "éèéå"
+
+#: ../lib/diafontselector.c:158
+msgid "Other fonts"
+msgstr "åååå"
+
+#: ../lib/diafontselector.c:233
+#, c-format
+msgid "Couldn't find font family for %s\n"
+msgstr "æäå %s æåçååé\n"
+
+#. pathologic case - pixbuf not even supporting PNG?
+#: ../lib/dia_image.c:328
+#, c-format
+msgid ""
+"Unsupported file format for saving:\n"
+"%s\n"
+"%s"
+msgstr ""
+"äææååææææåï\n"
+"%s\n"
+"%s"
+
+#: ../lib/dia_image.c:331
+#, c-format
+msgid ""
+"Could not save file:\n"
+"%s\n"
+"%s"
+msgstr ""
+"çæååææï\n"
+"%s\n"
+"%s"
+
+#: ../lib/dialinechooser.c:309
+msgid "Line Style Properties"
+msgstr "çææååæ"
+
+#: ../lib/dialinechooser.c:344
+msgid "Detailsâ"
+msgstr "èæ..."
+
+#: ../lib/dialinestyleselector.c:124
+msgid "line|Solid"
+msgstr "çæ|åç"
+
+#: ../lib/dialinestyleselector.c:130
+msgid "line|Dashed"
+msgstr "çæ|èç"
+
+#: ../lib/dialinestyleselector.c:136
+msgid "line|Dash-Dot"
+msgstr "çæ|èç-é"
+
+#: ../lib/dialinestyleselector.c:142
+msgid "line|Dash-Dot-Dot"
+msgstr "çæ|èç-é-é"
+
+#: ../lib/dialinestyleselector.c:148
+msgid "line|Dotted"
+msgstr "çæ|éç"
+
+#. fs->sizebox = GTK_HBOX(box);
+#: ../lib/dialinestyleselector.c:166
+msgid "Dash length: "
+msgstr "èçéåï"
+
+#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
+msgid "OK"
+msgstr "çå"
+
+#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
+msgid "Cancel"
+msgstr "åæ"
+
+#: ../lib/dia_xml.c:212
+#, c-format
+msgid ""
+"The file %s has no encoding specification;\n"
+"assuming it is encoded in %s"
+msgstr ""
+"ææ %s æææåççï\n"
+"åèåççæ %s"
+
+#: ../lib/dia_xml.c:506
+#, c-format
+msgid "Unknown type of DataNode '%s'"
+msgstr "äçåç DataNode éå '%s'"
+
+#: ../lib/dia_xml.c:525
+msgid "Taking int value of non-int node."
+msgstr "ååéææçéçææåã"
+
+#: ../lib/dia_xml.c:701
 msgid "Taking point value of non-point node."
 msgstr "ååçéåçéççéæåã"
 
-#: ../lib/dia_xml.c:579
+#: ../lib/dia_xml.c:712
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "éèç x çéæåâ%sâ %f; ææåã"
 
-#: ../lib/dia_xml.c:586
+#: ../lib/dia_xml.c:719
 msgid "Error parsing point."
 msgstr "èæçéççéèã"
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:594
+#: ../lib/dia_xml.c:727
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "éèç y çéæåâ%sâ %f; ææåã"
 
-#: ../lib/dia_xml.c:1066
-msgid ""
-"Your local character set is UTF-8. Because of issues with libxml1 and the "
-"support of files generated by previous versions of dia, you will encounter  "
-"problems. Please report to dia-list gnome org if you see this message."
-msgstr ""
-"æçåäç UTF-8 ååéççãåç libxml1 ççæïååæäåçæç dia ççå"
-"äçææææäèïæåæéååéãçæçåéåèææïèå dia-list gnome "
-"org ååã"
-
-#: ../lib/diaarrowchooser.c:351
-msgid "Arrow Properties"
-msgstr "çéåæ"
-
-#. This is the default text shown in the preview entry, though the user
-#. can set it. Remember that some fonts only have capital letters.
-#: ../lib/diagtkfontsel.c:74
-msgid "abcdefghijk ABCDEFGHIJK"
-msgstr "abc ABC äææè"
-
-#: ../lib/diagtkfontsel.c:209
-msgid "Font name"
-msgstr "åååç"
+#: ../lib/dia_xml.c:747
+msgid "Taking bezpoint value of non-point node."
+msgstr "ååçéåçéçãèèéãåã"
 
-#: ../lib/diagtkfontsel.c:210
-msgid "The X string that represents this font."
-msgstr "äèæååç X ååæååä"
+#: ../lib/dia_xml.c:765
+msgid "Error parsing bezpoint p1."
+msgstr "èæãèèéãp1 ççéèã"
 
-#: ../lib/diagtkfontsel.c:216
-msgid "Preview text"
-msgstr "éèæå"
+#: ../lib/dia_xml.c:779
+msgid "Error parsing bezpoint p2."
+msgstr "èæãèèéãp2 ççéèã"
 
-#: ../lib/diagtkfontsel.c:217
-msgid "The text to display in order to demonstrate the selected font."
-msgstr "çéååååïéçæåçæåäçççã"
+#: ../lib/dia_xml.c:793
+msgid "Error parsing bezpoint p3."
+msgstr "èæãèèéãp3 ççéèã"
 
-#: ../lib/diagtkfontsel.c:321
-msgid "_Family:"
-msgstr "åæ(_F)ï"
+#: ../lib/dia_xml.c:820
+msgid "Taking rectangle value of non-rectangle node."
+msgstr "ååéçåçéççååã"
 
-#: ../lib/diagtkfontsel.c:327
-msgid "_Style:"
-msgstr "åæ(_S)ï"
+#: ../lib/dia_xml.c:832 ../lib/dia_xml.c:843 ../lib/dia_xml.c:854
+msgid "Error parsing rectangle."
+msgstr "èæçåççéèã"
 
-#: ../lib/diagtkfontsel.c:333
-msgid "Si_ze:"
-msgstr "åå(_Z)ï"
+#: ../lib/dia_xml.c:882
+msgid "Taking string value of non-string node."
+msgstr "ååéåäçéçåäåã"
 
-#. create the text entry widget
-#: ../lib/diagtkfontsel.c:462
-msgid "_Preview:"
-msgstr "éè(_P)ï"
+#: ../lib/dia_xml.c:908
+msgid "Error in string tag."
+msgstr "èæåäæèççéèã"
 
-#: ../lib/diagtkfontsel.c:1252
-msgid "Font Selection"
-msgstr "ååéæ"
+#: ../lib/dia_xml.c:926
+msgid "Error in file, string not starting with #"
+msgstr "æææèïåääéä # éé"
 
-#: ../lib/dialibartrenderer.c:295
-msgid "gdk_renderer: Unsupported fill mode specified!\n"
-msgstr "gdk_rendererïæåääææçåææåï\n"
+#: ../lib/dia_xml.c:988
+msgid "Taking font value of non-font node."
+msgstr "ååéååçéçåååã"
 
-#: ../lib/dialinechooser.c:297
-msgid "Line Style Properties"
-msgstr "çææååæ"
-
-#: ../lib/dialinechooser.c:333
-msgid "Details..."
-msgstr "çç..."
-
-#: ../lib/filter.c:126
+#: ../lib/filter.c:177
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr "ååäåç %s çåéååéæå"
 
-#: ../lib/font.c:102
+#: ../lib/filter.c:195
+#, c-format
+msgid "Multiple import filters with unique name %s"
+msgstr "ååäåç %s çåéååéæå"
+
+#: ../lib/font.c:89
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "çæèååå %sã\n"
 
-#: ../lib/message.c:91 ../lib/message.c:277
+#: ../lib/group.c:622
+msgid "Transformation"
+msgstr "èå"
+
+#: ../lib/message.c:93 ../lib/message.c:281
 msgid "Warning"
 msgstr "èå"
 
-#: ../lib/message.c:118
+#: ../lib/message.c:120
 msgid "There is one similar message."
 msgstr "æ 1 åéäçèæã"
 
-#: ../lib/message.c:123
+#: ../lib/message.c:125
 msgid "Show repeated messages"
 msgstr "éçéèçèæ"
 
-#: ../lib/message.c:144
+#: ../lib/message.c:146
 msgid "Don't show this message again"
 msgstr "äåéçæèæ"
 
-#: ../lib/message.c:202
+#: ../lib/message.c:203
 #, c-format
 msgid "There are %d similar messages."
 msgstr "æ %d åéäçèæã"
 
-#: ../lib/message.c:261
+#: ../lib/message.c:265
 msgid "Notice"
 msgstr "ææ"
 
-#: ../lib/newgroup.c:117
-msgid "Open group"
-msgstr "éæçç"
-
-#: ../lib/object_defaults.c:127
+#: ../lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2340,326 +2608,725 @@ msgstr ""
 "èåéèâ%sâæççéèã\n"
 "äæ Dia åèææã"
 
-#: ../lib/plug-ins.c:120
-msgid "???"
-msgstr ""
+#. base property stuff...
+#: ../lib/orth_conn.h:97
+msgid "Autoroute"
+msgstr "èåèç"
 
-#: ../lib/plug-ins.c:227
-#, c-format
-msgid "Could not deduce correct path for `%s'"
-msgstr "çæææâ%sâçæçèå"
+#: ../lib/orth_conn.h:108
+msgid "Autorouting"
+msgstr "èåèç"
 
-#: ../lib/plug-ins.c:233
-#, c-format
-msgid ""
-"Could not load plugin '%s'\n"
-"%s"
+#: ../lib/persistence.c:321
+msgid "Persistence"
+msgstr "çæ"
+
+#: ../lib/plug-ins.c:111
+msgid "???"
 msgstr ""
-"çæèååææçâ%sâ\n"
-"%s"
 
-#: ../lib/plug-ins.c:246
+#: ../lib/plug-ins.c:186
 #, c-format
-msgid "Could not find plugin init function in `%s'"
-msgstr "æäåâ%sâäçåææç init åå"
+msgid "Missing dependencies for '%s'?"
+msgstr "æåçåä '%s' æäåçåäï"
 
-#: ../lib/plug-ins.c:248
+#: ../lib/plug-ins.c:197
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "çåäâdia_plugin_initâçè"
 
-#: ../lib/plug-ins.c:256 ../lib/plug-ins.c:264
+#: ../lib/plug-ins.c:205 ../lib/plug-ins.c:213
 msgid "dia_plugin_init() call failed"
 msgstr "èç dia_plugin_init() æççéè"
 
-#: ../lib/plug-ins.c:283
+#: ../lib/plug-ins.c:232
 #, c-format
 msgid "%s Plugin could not be unloaded"
 msgstr "çæåè %s åææç"
 
-#: ../lib/plug-ins.c:371
-#, c-format
-msgid ""
-"Could not open `%s'\n"
-"`%s'"
+#: ../lib/plug-ins.c:441
+msgid "Plugin Configuration"
+msgstr "èååææç"
+
+#: ../lib/propdialogs.c:324 ../objects/UML/association.c:235
+#: ../objects/UML/object.c:146
+msgid "General"
+msgstr "äè"
+
+#: ../lib/propdialogs.c:325
+msgid "Meta"
 msgstr ""
-"çæéåâ%sâ\n"
-"â%sâ"
 
-#: ../lib/prop_text.c:466
-#, c-format
-msgid "Group with %d objects"
-msgstr "å %d åçäççç"
+#: ../lib/prop_dict.c:43
+msgid "Author"
+msgstr "äè"
+
+#: ../lib/prop_dict.c:44
+msgid "Identifier"
+msgstr "èåè"
+
+#: ../lib/prop_dict.c:45
+msgid "Creation date"
+msgstr "åçææ"
+
+#: ../lib/prop_dict.c:46
+msgid "Modification date"
+msgstr "äæææ"
+
+#: ../lib/prop_dict.c:47
+msgid "URL"
+msgstr ""
+
+#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
+msgid "Key"
+msgstr "éå"
+
+#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
+#: ../objects/UML/umlparameter.c:47
+msgid "Value"
+msgstr "å"
 
-#: ../lib/properties.c:64 ../lib/properties.h:469 ../lib/widgets.c:690
+#: ../lib/properties.c:67 ../lib/properties.h:587 ../lib/widgets.c:273
 msgid "Left"
 msgstr "éå"
 
-#: ../lib/properties.c:65 ../lib/properties.h:470 ../lib/widgets.c:696
-#: ../objects/standard/textobj.c:133
+#: ../lib/properties.c:68 ../lib/properties.h:588 ../lib/widgets.c:274
+#: ../objects/standard/textobj.c:111
 msgid "Center"
 msgstr "çä"
 
-#: ../lib/properties.c:66 ../lib/properties.h:471 ../lib/widgets.c:702
+#: ../lib/properties.c:69 ../lib/properties.h:589 ../lib/widgets.c:275
 msgid "Right"
 msgstr "éå"
 
-#: ../lib/properties.c:73 ../lib/properties.h:489 ../lib/properties.h:492
+#: ../lib/properties.c:74 ../lib/properties.h:593
+msgid "Never"
+msgstr "äè"
+
+#: ../lib/properties.c:75 ../lib/properties.h:594
+msgid "When Needed"
+msgstr "åéè"
+
+#: ../lib/properties.c:76 ../lib/properties.h:595
+msgid "Always"
+msgstr "äå"
+
+#: ../lib/properties.c:80 ../lib/properties.h:599
+msgid "Miter"
+msgstr "åè(Miter)"
+
+#: ../lib/properties.c:82 ../lib/properties.h:601
+msgid "Bevel"
+msgstr "åè(Bevel)"
+
+#: ../lib/properties.c:86 ../lib/properties.h:605
+msgid "Butt"
+msgstr "çå(Butt)"
+
+#: ../lib/properties.c:88 ../lib/properties.h:607
+msgid "Projecting"
+msgstr "æå"
+
+#: ../lib/properties.c:95 ../lib/properties.h:628 ../lib/properties.h:631
 #: ../objects/chronogram/chronoline.c:179
 #: ../objects/chronogram/chronoref.c:158
 msgid "Line color"
 msgstr "çæéè"
 
-#: ../lib/properties.c:74 ../lib/properties.h:495 ../lib/properties.h:498
+#: ../lib/properties.c:96 ../lib/properties.h:634 ../lib/properties.h:637
 msgid "Line style"
 msgstr "çææå"
 
-#: ../lib/properties.c:75 ../lib/properties.h:502 ../lib/properties.h:505
+#: ../lib/properties.c:97 ../lib/properties.h:653 ../lib/properties.h:656
 msgid "Fill color"
 msgstr "ååéè"
 
-#: ../lib/properties.c:76 ../lib/properties.h:508 ../lib/properties.h:511
+#. just to simplify transfering properties between objects
+#: ../lib/properties.c:98 ../lib/properties.h:659 ../lib/properties.h:662
+#: ../lib/standard-path.c:138
 msgid "Draw background"
 msgstr "çèèæ"
 
-#: ../lib/properties.c:77 ../lib/properties.h:515
+#: ../lib/properties.c:99 ../lib/properties.h:666
 msgid "Start arrow"
 msgstr "éåçé"
 
-#: ../lib/properties.c:78 ../lib/properties.h:518
+#: ../lib/properties.c:100 ../lib/properties.h:669
 msgid "End arrow"
 msgstr "çæçé"
 
-#: ../lib/properties.c:80 ../lib/properties.h:528
+#: ../lib/properties.c:102 ../lib/properties.h:679
 msgid "Text alignment"
 msgstr "åéæå"
 
-#. all this just to make the defaults selectable ...
-#: ../lib/properties.c:81 ../lib/properties.h:533
-#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:165
-#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class.c:169
-#: ../objects/UML/class_dialog.c:394 ../objects/chronogram/chronoline.c:183
-#: ../objects/chronogram/chronoref.c:164
+#: ../lib/properties.c:103 ../lib/properties.h:684
+#: ../objects/chronogram/chronoline.c:183
+#: ../objects/chronogram/chronoref.c:164 ../objects/Database/reference.c:118
+#: ../objects/GRAFCET/condition.c:132 ../objects/GRAFCET/step.c:166
+#: ../objects/GRAFCET/transition.c:142 ../objects/UML/class_dialog.c:455
 msgid "Font"
 msgstr "åå"
 
-#: ../lib/properties.c:82 ../lib/properties.h:541
-#: ../objects/GRAFCET/condition.c:134 ../objects/GRAFCET/step.c:167
-#: ../objects/GRAFCET/transition.c:144 ../objects/chronogram/chronoline.c:185
-#: ../objects/chronogram/chronoref.c:166
+#: ../lib/properties.c:104 ../lib/properties.h:692
+#: ../objects/chronogram/chronoline.c:185
+#: ../objects/chronogram/chronoref.c:166 ../objects/GRAFCET/condition.c:134
+#: ../objects/GRAFCET/step.c:168 ../objects/GRAFCET/transition.c:144
 msgid "Font size"
 msgstr "åååå"
 
-#: ../lib/properties.c:83 ../lib/properties.h:547
-#: ../objects/GRAFCET/step.c:169 ../objects/chronogram/chronoline.c:187
-#: ../objects/chronogram/chronoref.c:168
+#: ../lib/properties.c:105 ../lib/properties.h:698
+#: ../objects/chronogram/chronoline.c:187
+#: ../objects/chronogram/chronoref.c:168 ../objects/GRAFCET/step.c:170
 msgid "Text color"
 msgstr "æåéè"
 
-#: ../lib/proplist.c:163
+#: ../lib/properties.h:640 ../lib/properties.h:643
+msgid "Line join"
+msgstr "çæéæä"
+
+#: ../lib/properties.h:646 ../lib/properties.h:649
+msgid "Line caps"
+msgstr "çææç"
+
+#: ../lib/properties.h:707
+msgid "Text fitting"
+msgstr "æåéå"
+
+#: ../lib/prop_inttypes.c:567
+msgid "Property cast from int to enum out of range"
+msgstr ""
+
+#: ../lib/proplist.c:161
 #, c-format
-msgid "No attribute '%s' (%p) or no data(%p) in this attribute"
+msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "åæåæäææâ%sâ(%p)åææææèæ(%p)"
 
-#: ../lib/widgets.c:408
-msgid "Other fonts"
-msgstr "åååå"
+#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
+#, c-format
+msgid ""
+"Failed to load image form diagram:\n"
+"%s"
+msgstr ""
 
-#: ../lib/widgets.c:480
+#: ../lib/prop_pixbuf.c:200
 #, c-format
-msgid "Couldn't find font family for %s\n"
-msgstr "æäå %s æåçåé\n"
+msgid ""
+"Saving inline pixbuf failed:\n"
+"%s"
+msgstr ""
 
-#. Translators: Menu item Noun/Material/Solid
-#: ../lib/widgets.c:838 ../objects/FS/function.c:1074
-msgid "Solid"
-msgstr "åå"
+#: ../lib/prop_pixbuf.c:296
+msgid "Cant create image data from scratch!"
+msgstr ""
 
-#: ../lib/widgets.c:844
-msgid "Dashed"
-msgstr "èç"
+#: ../lib/prop_text.c:481
+#, c-format
+msgid "Group with %d objects"
+msgstr "å %d åçäççç"
 
-#: ../lib/widgets.c:850
-msgid "Dash-Dot"
-msgstr "èç-é"
+#: ../lib/sheet.c:71 ../lib/sheet.c:86
+#, c-format
+msgid ""
+"DiaObject '%s' needed in sheet '%s' was not found.\n"
+"It will not be available for use."
+msgstr ""
 
-#: ../lib/widgets.c:856
-msgid "Dash-Dot-Dot"
-msgstr "èç-é-é"
+#: ../lib/sheet.c:316
+#, c-format
+msgid ""
+"The system sheet '%s' appears to be more recent than your custom\n"
+"version and has been loaded as '%s' for this session.\n"
+"\n"
+"Move new objects (if any) from '%s' into your custom sheet\n"
+"or remove '%s', using the 'Sheets and Objects' dialog."
+msgstr ""
 
-#: ../lib/widgets.c:862
-msgid "Dotted"
-msgstr "éç"
+#: ../lib/sheet.c:375
+#, c-format
+msgid "%s: you should use object tags rather than shape tags now"
+msgstr ""
 
-#. fs->sizebox = GTK_HBOX(box);
-#: ../lib/widgets.c:881
-msgid "Dash length: "
-msgstr "èçéåï"
+#: ../lib/standard-path.c:122
+msgid "Stroke"
+msgstr "çå"
 
-#: ../lib/widgets.c:1006
-msgid "Select color"
-msgstr "éåèå"
+#. Translators: Menu item Verb/Provision/Supply/Fill
+#: ../lib/standard-path.c:123 ../objects/FS/function.c:935
+msgid "Fill"
+msgstr "åå"
 
-#: ../lib/widgets.c:1072
-msgid "More colors..."
-msgstr "æåèå..."
+#: ../lib/standard-path.c:124
+msgid "Fill & Stroke"
+msgstr "åå &  & çå"
 
-#: ../lib/widgets.c:1220
-msgid "More arrows"
-msgstr "æåçé"
+#: ../lib/standard-path.c:129
+msgid "Bezier points"
+msgstr "èèæççé"
 
-#: ../lib/widgets.c:1237
-msgid "Size: "
-msgstr "ååï"
+#: ../lib/standard-path.c:130
+msgid "Drawing"
+msgstr "çå"
+
+#: ../lib/standard-path.c:139
+msgid "Draw Control Lines"
+msgstr "ççæåç"
+
+#: ../lib/standard-path.c:466
+msgid "Convert to Bezier"
+msgstr "èæçèèæç"
+
+#: ../lib/standard-path.c:467
+msgid "Show Control Lines"
+msgstr "éçæåç"
 
-#: ../lib/widgets.c:1390
+#: ../lib/widgets.c:394
 msgid "Select image file"
 msgstr "éåååæ"
 
-#: ../lib/widgets.c:1424
+#: ../lib/widgets.c:445
 msgid "Browse"
 msgstr "çè"
 
-#: ../lib/widgets.c:2063
-msgid "Reset menu"
-msgstr "éèéå"
-
-#: ../objects/AADL/aadl.c:52
-msgid "Architecture Analysis & Design Language diagram objects"
-msgstr "ãææåæåèèèèãåèçä"
-
-#: ../objects/AADL/aadlbox.c:138
+#: ../objects/AADL/aadlbox.c:147
 msgid "Declaration"
 msgstr "åå"
 
-#: ../objects/AADL/aadlbox.c:349
+#: ../objects/AADL/aadlbox.c:356
 msgid "Add Access Provider"
 msgstr "ååååæäè"
 
-#: ../objects/AADL/aadlbox.c:351
+#: ../objects/AADL/aadlbox.c:358
 msgid "Add Access Requirer"
 msgstr "ååååèæè"
 
-#: ../objects/AADL/aadlbox.c:353
+#: ../objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:355
+#: ../objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:357
+#: ../objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:359
+#: ../objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:361
+#: ../objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:363
+#: ../objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:365
+#: ../objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:367
+#: ../objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:369
+#: ../objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr ""
 
-#: ../objects/AADL/aadlbox.c:371
+#: ../objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr "ååéæåçç"
 
-#: ../objects/AADL/aadlbox.c:373
+#: ../objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr "ååéæé"
 
-#: ../objects/AADL/aadlbox.c:377
+#: ../objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr "åééæå"
 
-#: ../objects/AADL/aadlbox.c:378
+#: ../objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr "çèéæååå"
 
-#: ../objects/AADL/aadlbox.c:382
+#: ../objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr "åééæé"
 
-#: ../objects/ER/attribute.c:155
-msgid "Key:"
-msgstr "éåï"
+#: ../objects/AADL/aadl.c:52
+msgid "Architecture Analysis & Design Language diagram objects"
+msgstr "ãææåæåèèèèãåèçä"
 
-#: ../objects/ER/attribute.c:157
-msgid "Weak key:"
-msgstr ""
+#: ../objects/chronogram/chronogram.c:40
+msgid "Chronogram diagram objects"
+msgstr "ãåäèãåèçä"
 
-#: ../objects/ER/attribute.c:159
-msgid "Derived:"
-msgstr "èçï"
+#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:5
+msgid "Data"
+msgstr "èæ"
 
-#: ../objects/ER/attribute.c:161
-msgid "Multivalue:"
-msgstr "åéæåï"
+#: ../objects/chronogram/chronoline.c:150
+msgid "Data name"
+msgstr "èæåç"
 
-#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:1
-msgid "Attribute"
-msgstr "åæ"
+#: ../objects/chronogram/chronoline.c:152
+msgid "Events"
+msgstr "ää"
 
-#: ../objects/ER/entity.c:137
-msgid "Weak:"
+#: ../objects/chronogram/chronoline.c:155
+msgid "Event specification"
+msgstr "ääèæ"
+
+#: ../objects/chronogram/chronoline.c:156
+msgid ""
+"@ time    set the pointer to an absolute time.\n"
+"( duration  set the signal up, then wait 'duration'.\n"
+") duration  set the signal down, then wait 'duration'.\n"
+"u duration  set the signal to \"unknown\" state, then wait 'duration'.\n"
+"Example: @ 1.0 (2.0)1.0(2.0)\n"
 msgstr ""
+"@ æé      èåæææçåæéã\n"
+"( çéæé  èåäèååïäçåãçéæéãã\n"
+") çéæé  èåäèåæïäçåãçéæéãã\n"
+"u çéæé  èåäèçãæçãïäçåãçéæéãã\n"
+"äåï@ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/ER/entity.c:139
-msgid "Associative:"
-msgstr "ééï"
+#: ../objects/chronogram/chronoline.c:162 ../objects/UML/umloperation.c:79
+msgid "Parameters"
+msgstr "åæ"
 
-#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:129
-#: ../sheets/ER.sheet.in.h:4
-msgid "Entity"
-msgstr "åé"
+#: ../objects/chronogram/chronoline.c:164
+#: ../objects/chronogram/chronoref.c:146
+msgid "Start time"
+msgstr "éåæé"
 
-#: ../objects/ER/er.c:44
-msgid "Entity/Relationship diagram objects"
-msgstr "ãåé/éäãåèçä"
+#: ../objects/chronogram/chronoline.c:166
+#: ../objects/chronogram/chronoref.c:148
+msgid "End time"
+msgstr "çææé"
 
-#: ../objects/ER/participation.c:116
-msgid "Total:"
-msgstr "çèï"
+#: ../objects/chronogram/chronoline.c:168
+msgid "Rise time"
+msgstr "äåæé"
 
-#: ../objects/ER/participation.c:406 ../objects/FS/flow-ortho.c:622
-#: ../objects/GRAFCET/vector.c:312 ../objects/SADT/arrow.c:457
-#: ../objects/UML/association.c:769 ../objects/UML/component_feature.c:184
-#: ../objects/UML/dependency.c:374 ../objects/UML/generalization.c:370
-#: ../objects/UML/realizes.c:361 ../objects/UML/transition.c:161
-#: ../objects/standard/zigzagline.c:348
-msgid "Add segment"
-msgstr "åååæ"
+#: ../objects/chronogram/chronoline.c:170
+msgid "Fall time"
+msgstr "äéæé"
 
-#: ../objects/ER/participation.c:407 ../objects/FS/flow-ortho.c:623
-#: ../objects/GRAFCET/vector.c:313 ../objects/SADT/arrow.c:458
-#: ../objects/UML/association.c:770 ../objects/UML/component_feature.c:185
-#: ../objects/UML/dependency.c:375 ../objects/UML/generalization.c:371
-#: ../objects/UML/realizes.c:362 ../objects/UML/transition.c:162
-#: ../objects/standard/zigzagline.c:349
-msgid "Delete segment"
-msgstr "åéåæ"
+#: ../objects/chronogram/chronoline.c:171
+msgid "Multi-bit data"
+msgstr "åäåèæ"
 
-#: ../objects/ER/relationship.c:142
-msgid "Left Cardinality:"
-msgstr "åååæ:"
+#: ../objects/chronogram/chronoline.c:173
+#: ../objects/chronogram/chronoref.c:156
+msgid "Aspect"
+msgstr "åéæ"
 
-#: ../objects/ER/relationship.c:144
-msgid "Right Cardinality:"
+#: ../objects/chronogram/chronoline.c:175
+msgid "Data color"
+msgstr "èæéè"
+
+#: ../objects/chronogram/chronoline.c:177
+msgid "Data line width"
+msgstr "èæèå"
+
+#: ../objects/chronogram/chronoref.c:144
+msgid "Time data"
+msgstr "æéèæ"
+
+#: ../objects/chronogram/chronoref.c:150
+msgid "Major time step"
+msgstr "äèååçæééå"
+
+#: ../objects/chronogram/chronoref.c:152
+msgid "Minor time step"
+msgstr "çååçæééå"
+
+#: ../objects/chronogram/chronoref.c:162
+msgid "Minor step line width"
+msgstr "çååççæåå"
+
+#: ../objects/custom/custom.c:140
+msgid "Custom"
+msgstr "èé"
+
+#: ../objects/custom/custom.c:140
+msgid "Custom XML shapes loader"
+msgstr "èé XML ååèåçå"
+
+#: ../objects/custom/custom_object.c:199 ../objects/custom/custom_object.c:232
+msgid "Flip horizontal"
+msgstr "äçæåéå"
+
+#: ../objects/custom/custom_object.c:201 ../objects/custom/custom_object.c:234
+msgid "Flip vertical"
+msgstr "äçåçéå"
+
+#: ../objects/custom/custom_object.c:204 ../objects/custom/custom_object.c:237
+msgid "Scale of the subshapes"
+msgstr "åååçæ"
+
+#: ../objects/custom/custom_object.c:218 ../objects/flowchart/box.c:153
+#: ../objects/flowchart/diamond.c:151 ../objects/flowchart/ellipse.c:150
+#: ../objects/flowchart/parallelogram.c:155 ../objects/SADT/box.c:136
+msgid "Text padding"
+msgstr "æååå"
+
+#: ../objects/custom/custom_object.c:1777
+msgid "Flip Horizontal"
+msgstr "äçæåéå"
+
+#: ../objects/custom/custom_object.c:1778
+msgid "Flip Vertical"
+msgstr "äçåçéå"
+
+#: ../objects/custom/custom_object.c:1815
+#, c-format
+msgid "Cannot open icon file %s for object type '%s'."
+msgstr "çæéåçäéåâ%2$sâæççåçæ %1$sã"
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "CustomLines"
+msgstr "èéçæ"
+
+#: ../objects/custom_lines/custom_lines.c:160
+msgid "Custom XML lines loader"
+msgstr "èé XML çæèåçå"
+
+#: ../objects/custom_lines/custom_linetypes.c:259
+msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
+msgstr ""
+
+#: ../objects/custom/shape_info.c:170
+#, c-format
+msgid ""
+"The file '%s' has invalid path data.\n"
+"svg:path data must start with moveto."
+msgstr ""
+"'%s' æææçæçèåèæã\n"
+"svgïèåèæåéä moveto ééã"
+
+#: ../objects/Database/compound.c:198
+msgid "Number of arms"
+msgstr "arm æ"
+
+#: ../objects/Database/compound.c:221
+msgid "Flip arms vertically"
+msgstr "arm åçéå"
+
+#: ../objects/Database/compound.c:223
+msgid "Flip arms horizontally"
+msgstr "arm æåéå"
+
+#: ../objects/Database/compound.c:225
+msgid "Center mount point vertically"
+msgstr "æèéåççä"
+
+#: ../objects/Database/compound.c:227
+msgid "Center mount point horizontally"
+msgstr "æèéæåçä"
+
+#: ../objects/Database/compound.c:229
+msgid "Center mount point"
+msgstr "æèéçä"
+
+#: ../objects/Database/compound.c:234
+msgid "Compound"
+msgstr "èåçä"
+
+#: ../objects/Database/database.c:39
+msgid "Entity/Relationship table diagram objects"
+msgstr "ãåé/éäãèæåèçä"
+
+#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:151
+#: ../objects/standard/box.c:138 ../objects/standard/polyline.c:107
+#: ../objects/standard/zigzagline.c:107
+msgid "Corner radius"
+msgstr "èèåå"
+
+#: ../objects/Database/reference.c:112
+msgid "Start description"
+msgstr "éåèæ"
+
+#: ../objects/Database/reference.c:114
+msgid "End description"
+msgstr "çæèæ"
+
+#: ../objects/Database/reference.c:121 ../objects/Database/table.c:214
+#: ../objects/Database/table.c:216 ../objects/Database/table.c:218
+#: ../objects/UML/association.c:248 ../objects/UML/association.c:259
+#: ../objects/UML/association.c:261 ../objects/UML/association.c:263
+#: ../objects/UML/association.c:265 ../objects/UML/association.c:267
+#: ../objects/UML/class.c:215 ../objects/UML/class.c:217
+#: ../objects/UML/class.c:219 ../objects/UML/class.c:221
+#: ../objects/UML/class.c:223 ../objects/UML/class.c:225
+msgid " "
+msgstr " "
+
+#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:405
+#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:311
+#: ../objects/SADT/arrow.c:463 ../objects/standard/zigzagline.c:448
+#: ../objects/UML/association.c:867 ../objects/UML/component_feature.c:189
+#: ../objects/UML/dependency.c:381 ../objects/UML/generalization.c:378
+#: ../objects/UML/realizes.c:368 ../objects/UML/transition.c:172
+msgid "Add segment"
+msgstr "åååæ"
+
+#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:406
+#: ../objects/FS/flow-ortho.c:628 ../objects/GRAFCET/vector.c:312
+#: ../objects/SADT/arrow.c:464 ../objects/standard/zigzagline.c:449
+#: ../objects/UML/association.c:868 ../objects/UML/component_feature.c:190
+#: ../objects/UML/dependency.c:382 ../objects/UML/generalization.c:379
+#: ../objects/UML/realizes.c:369 ../objects/UML/transition.c:173
+msgid "Delete segment"
+msgstr "åéåæ"
+
+#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
+msgid "Reference"
+msgstr "åè"
+
+#: ../objects/Database/table.c:142 ../objects/Database/table.c:183
+#: ../objects/Database/table.c:211 ../objects/UML/class.c:144
+#: ../objects/UML/class.c:211 ../objects/UML/class_dialog.c:486
+#: ../objects/UML/umlattribute.c:43 ../objects/UML/umloperation.c:66
+#: ../objects/UML/umlparameter.c:49 ../sheets/SDL.sheet.in.h:18
+msgid "Comment"
+msgstr "åè"
+
+#: ../objects/Database/table.c:144
+msgid "Primary"
+msgstr "ä"
+
+#: ../objects/Database/table.c:144
+msgid "Primary key"
+msgstr "äé"
+
+#: ../objects/Database/table.c:146
+msgid "Nullable"
+msgstr "åççå(Null)"
+
+#: ../objects/Database/table.c:148
+msgid "Unique"
+msgstr "çä"
+
+#: ../objects/Database/table.c:150
+msgid "Default"
+msgstr "éè"
+
+#: ../objects/Database/table.c:150
+msgid "Default value"
+msgstr "éèå"
+
+#. init data
+#: ../objects/Database/table.c:179 ../objects/Database/table.c:269
+#: ../objects/Database/table.c:376 ../sheets/Database.sheet.in.h:3
+msgid "Table"
+msgstr "èæ"
+
+#: ../objects/Database/table.c:188
+msgid "Visible comments"
+msgstr "åèèè"
+
+#: ../objects/Database/table.c:190
+msgid "Underline primary keys"
+msgstr "äéååç"
+
+#: ../objects/Database/table.c:193 ../objects/UML/class.c:159
+msgid "Comment tagging"
+msgstr "èèæè"
+
+#: ../objects/Database/table.c:195
+msgid "Use bold font for primary keys"
+msgstr "äéäççé"
+
+#: ../objects/Database/table.c:198 ../objects/UML/class.c:181
+#: ../objects/UML/object.c:152
+msgid "Attributes"
+msgstr "åæ"
+
+#. umlformalparameters_extra
+#. all this just to make the defaults selectable ...
+#: ../objects/Database/table.c:202 ../objects/UML/association.c:270
+#: ../objects/UML/class.c:196 ../objects/UML/object.c:161
+msgid "Style"
+msgstr "åæ"
+
+#: ../objects/Database/table.c:203 ../objects/UML/class.c:197
+msgid "Fonts"
+msgstr "åå"
+
+#. property rows
+#: ../objects/Database/table.c:207 ../objects/SADT/arrow.c:136
+#: ../objects/UML/class.c:201 ../objects/UML/class_dialog.c:461
+msgid "Normal"
+msgstr "æå"
+
+#: ../objects/Database/table.c:209
+msgid "Table name"
+msgstr "èæåç"
+
+#: ../objects/Database/table.c:264 ../objects/UML/class.c:342
+msgid "Show comments"
+msgstr "éçåè"
+
+#: ../objects/ER/attribute.c:153 ../objects/ER/entity.c:135
+#: ../objects/ER/relationship.c:140
+#: ../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:133
+#: ../objects/UML/generalization.c:130 ../objects/UML/realizes.c:130
+msgid "Name:"
+msgstr "åçï"
+
+#: ../objects/ER/attribute.c:155
+msgid "Key:"
+msgstr "éåï"
+
+#: ../objects/ER/attribute.c:157
+msgid "Weak key:"
+msgstr "åéï"
+
+#: ../objects/ER/attribute.c:159
+msgid "Derived:"
+msgstr "èçï"
+
+#: ../objects/ER/attribute.c:161
+msgid "Multivalue:"
+msgstr "åéåï"
+
+#: ../objects/ER/attribute.c:434 ../sheets/ER.sheet.in.h:6
+msgid "Attribute"
+msgstr "åæ"
+
+#: ../objects/ER/entity.c:137
+msgid "Weak:"
+msgstr "åï"
+
+#: ../objects/ER/entity.c:139
+msgid "Associative:"
+msgstr "ééï"
+
+#: ../objects/ER/entity.c:413 ../objects/UML/classicon.c:130
+#: ../sheets/ER.sheet.in.h:3
+msgid "Entity"
+msgstr "åé"
+
+#: ../objects/ER/er.c:44
+msgid "Entity/Relationship diagram objects"
+msgstr "ãåé/éäãåèçä"
+
+#: ../objects/ER/participation.c:117
+msgid "Total:"
+msgstr "çèï"
+
+#: ../objects/ER/relationship.c:142
+msgid "Left Cardinality:"
+msgstr "åååæ:"
+
+#: ../objects/ER/relationship.c:144
+msgid "Right Cardinality:"
 msgstr "åååæ:"
 
 #: ../objects/ER/relationship.c:146
@@ -2670,21 +3337,29 @@ msgstr "æèï"
 msgid "Identifying:"
 msgstr "èåï"
 
-#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:6
+#: ../objects/ER/relationship.c:457 ../sheets/ER.sheet.in.h:5
 msgid "Relationship"
 msgstr "éä"
 
+#: ../objects/flowchart/flowchart.c:37
+msgid "Flowchart objects"
+msgstr "æçåçä"
+
+#: ../objects/flowchart/parallelogram.c:153
+msgid "Shear angle"
+msgstr "åèè"
+
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:619
-#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:571
-#: ../objects/FS/function.c:1096
+#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:626
+#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:624
+#: ../objects/FS/function.c:1097
 msgid "Energy"
 msgstr "èé"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:620
-#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:572
-#: ../objects/FS/function.c:1072
+#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:627
+#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:625
+#: ../objects/FS/function.c:1073
 msgid "Material"
 msgstr "ææ"
 
@@ -2692,13 +3367,23 @@ msgstr "ææ"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:621
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:573
-#: ../objects/FS/function.c:1034 ../objects/FS/function.c:1036
-#: ../objects/FS/function.c:1172 ../objects/FS/function.c:1174
+#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:628
+#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:626
+#: ../objects/FS/function.c:1035 ../objects/FS/function.c:1037
+#: ../objects/FS/function.c:1173 ../objects/FS/function.c:1175
 msgid "Signal"
 msgstr "äè"
 
+#: ../objects/FS/flow.c:144 ../objects/FS/flow-ortho.c:167
+#: ../objects/Istar/link.c:161 ../objects/Jackson/phenomenon.c:145
+#: ../objects/KAOS/metaandorrel.c:165 ../objects/KAOS/metabinrel.c:172
+#: ../objects/UML/class_attributes_dialog.c:528
+#: ../objects/UML/class_operations_dialog.c:788
+#: ../objects/UML/class_operations_dialog.c:988
+#: ../objects/UML/class_templates_dialog.c:447
+msgid "Type:"
+msgstr "éåï"
+
 #: ../objects/FS/fs.c:43
 msgid "Function structure diagram objects"
 msgstr "ãåèçæãåèçä"
@@ -2712,1030 +3397,1019 @@ msgid "User function"
 msgstr "äçèåè"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:676
+#: ../objects/FS/function.c:677
 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:678 ../objects/FS/function.c:680
-#: ../objects/FS/function.c:720
+#: ../objects/FS/function.c:679 ../objects/FS/function.c:681
+#: ../objects/FS/function.c:721
 msgid "Channel"
 msgstr "éé"
 
-#. Translators: Menu item Verb/Channel/Import
-#. Translators: Menu item Verb/Channel/Import/Import
-#: ../objects/FS/function.c:682 ../objects/FS/function.c:684
-msgid "Import"
-msgstr "åå"
-
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:686 ../objects/KAOS/metabinrel.c:163
+#: ../objects/FS/function.c:687 ../objects/KAOS/metabinrel.c:164
 msgid "Input"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:688
+#: ../objects/FS/function.c:689
 msgid "Receive"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:690 ../objects/FS/function.c:962
+#: ../objects/FS/function.c:691 ../objects/FS/function.c:963
 msgid "Allow"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:692
+#: ../objects/FS/function.c:693
 msgid "Form Entrance"
 msgstr "èååå"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:694 ../objects/FS/function.c:928
+#: ../objects/FS/function.c:695 ../objects/FS/function.c:929
 msgid "Capture"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:700
+#: ../objects/FS/function.c:701
 msgid "Discharge"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:702
+#: ../objects/FS/function.c:703
 msgid "Eject"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:704
+#: ../objects/FS/function.c:705
 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:708 ../objects/FS/function.c:710
-#: ../objects/FS/function.c:728
+#: ../objects/FS/function.c:709 ../objects/FS/function.c:711
+#: ../objects/FS/function.c:729
 msgid "Transfer"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:712 ../objects/FS/function.c:714
+#: ../objects/FS/function.c:713 ../objects/FS/function.c:715
 msgid "Transport"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:716
+#: ../objects/FS/function.c:717
 msgid "Lift"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:718
+#: ../objects/FS/function.c:719
 msgid "Move"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:722 ../objects/FS/function.c:724
+#: ../objects/FS/function.c:723 ../objects/FS/function.c:725
 msgid "Transmit"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:726
+#: ../objects/FS/function.c:727
 msgid "Conduct"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:730
+#: ../objects/FS/function.c:731
 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:732 ../objects/FS/function.c:734
-#: ../objects/FS/function.c:736
+#: ../objects/FS/function.c:733 ../objects/FS/function.c:735
+#: ../objects/FS/function.c:737
 msgid "Guide"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:738
+#: ../objects/FS/function.c:739
 msgid "Direct"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:740
+#: ../objects/FS/function.c:741
 msgid "Straighten"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:742
+#: ../objects/FS/function.c:743
 msgid "Steer"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:744
+#: ../objects/FS/function.c:745
 msgid "Translate"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:746 ../objects/FS/function.c:748
+#: ../objects/FS/function.c:747 ../objects/FS/function.c:749
 msgid "Rotate"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:750
+#: ../objects/FS/function.c:751
 msgid "Turn"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:752
+#: ../objects/FS/function.c:753
 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:754 ../objects/FS/function.c:756
+#: ../objects/FS/function.c:755 ../objects/FS/function.c:757
 msgid "Allow DOF"
 msgstr "åè DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:758
+#: ../objects/FS/function.c:759
 msgid "Constrain"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:760
+#: ../objects/FS/function.c:761
 msgid "Unlock"
 msgstr "äéå"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:762 ../objects/FS/function.c:764
+#: ../objects/FS/function.c:763 ../objects/FS/function.c:765
 msgid "Support"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:766 ../objects/FS/function.c:768
-#: ../sheets/SDL.sheet.in.h:19
+#: ../objects/FS/function.c:767 ../objects/FS/function.c:769
+#: ../sheets/SDL.sheet.in.h:16
 msgid "Stop"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:770
+#: ../objects/FS/function.c:771
 msgid "Insulate"
 msgstr "éç"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:772
+#: ../objects/FS/function.c:773
 msgid "Protect"
 msgstr "äè"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:774 ../objects/FS/function.c:964
+#: ../objects/FS/function.c:775 ../objects/FS/function.c:965
 msgid "Prevent"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:776
+#: ../objects/FS/function.c:777
 msgid "Shield"
 msgstr "éè"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:778
+#: ../objects/FS/function.c:779
 msgid "Inhibit"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:780 ../objects/FS/function.c:782
+#: ../objects/FS/function.c:781 ../objects/FS/function.c:783
 msgid "Stabilize"
 msgstr "çåå"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:784
+#: ../objects/FS/function.c:785
 msgid "Steady"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:786 ../objects/FS/function.c:788
+#: ../objects/FS/function.c:787 ../objects/FS/function.c:789
 msgid "Secure"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:790 ../objects/FS/function.c:822
+#: ../objects/FS/function.c:791 ../objects/FS/function.c:823
 msgid "Attach"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:792
+#: ../objects/FS/function.c:793
 msgid "Mount"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:794 ../sheets/ciscomisc.sheet.in.h:19
+#: ../objects/FS/function.c:795 ../sheets/ciscomisc.sheet.in.h:42
 msgid "Lock"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:796
+#: ../objects/FS/function.c:797
 msgid "Fasten"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:798
+#: ../objects/FS/function.c:799
 msgid "Hold"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Support/Position
 #. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:800 ../objects/FS/function.c:802
-#: ../objects/Istar/actor.c:70
+#: ../objects/FS/function.c:801 ../objects/FS/function.c:803
+#: ../objects/Istar/actor.c:68
 msgid "Position"
 msgstr "äç"
 
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:804
+#: ../objects/FS/function.c:805
 msgid "Orient"
 msgstr "æå"
 
-#. Translators: Menu item Verb/Support/Position/Locate
-#. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../objects/FS/function.c:808 ../objects/FS/function.c:1050
-msgid "Locate"
-msgstr "åæ"
-
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:810 ../objects/FS/function.c:812
+#: ../objects/FS/function.c:811 ../objects/FS/function.c:813
 msgid "Connect"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:814 ../objects/FS/function.c:816
+#: ../objects/FS/function.c:815 ../objects/FS/function.c:817
 msgid "Couple"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:818
+#: ../objects/FS/function.c:819
 msgid "Join"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:820
+#: ../objects/FS/function.c:821
 msgid "Assemble"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:824 ../objects/FS/function.c:826
+#: ../objects/FS/function.c:825 ../objects/FS/function.c:827
 msgid "Mix"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:828
+#: ../objects/FS/function.c:829
 msgid "Combine"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:830
+#: ../objects/FS/function.c:831
 msgid "Blend"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:832
+#: ../objects/FS/function.c:833
 msgid "Add"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:834
+#: ../objects/FS/function.c:835
 msgid "Pack"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:836
+#: ../objects/FS/function.c:837
 msgid "Coalesce"
 msgstr "çå"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:838 ../objects/FS/function.c:840
-#: ../sheets/UML.sheet.in.h:5
+#: ../objects/FS/function.c:839 ../objects/FS/function.c:841
+#: ../sheets/UML.sheet.in.h:30
 msgid "Branch"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate
 #. Translators: Menu item Verb/Branch/Separate/Separate/Separate
-#: ../objects/FS/function.c:842 ../objects/FS/function.c:844
-#: ../objects/FS/function.c:846
+#: ../objects/FS/function.c:843 ../objects/FS/function.c:845
+#: ../objects/FS/function.c:847
 msgid "Separate"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:848
+#: ../objects/FS/function.c:849
 msgid "Switch"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:850
+#: ../objects/FS/function.c:851
 msgid "Divide"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:852
+#: ../objects/FS/function.c:853
 msgid "Release"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:854
+#: ../objects/FS/function.c:855
 msgid "Detach"
 msgstr "åé"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:856
+#: ../objects/FS/function.c:857
 msgid "Disconnect"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:862
+#: ../objects/FS/function.c:863
 msgid "Cut"
 msgstr "åä"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:864
+#: ../objects/FS/function.c:865
 msgid "Polish"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:866
+#: ../objects/FS/function.c:867
 msgid "Sand"
 msgstr "æ"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:868
+#: ../objects/FS/function.c:869
 msgid "Drill"
 msgstr "é"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:870
+#: ../objects/FS/function.c:871
 msgid "Lathe"
 msgstr "é"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:872 ../objects/FS/function.c:874
+#: ../objects/FS/function.c:873 ../objects/FS/function.c:875
 msgid "Refine"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:876
+#: ../objects/FS/function.c:877
 msgid "Purify"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:878
+#: ../objects/FS/function.c:879
 msgid "Strain"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:880
+#: ../objects/FS/function.c:881
 msgid "Filter"
 msgstr "éæ"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:882
+#: ../objects/FS/function.c:883
 msgid "Percolate"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:884
+#: ../objects/FS/function.c:885
 msgid "Clear"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:886 ../objects/FS/function.c:888
+#: ../objects/FS/function.c:887 ../objects/FS/function.c:889
 msgid "Distribute"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:890
+#: ../objects/FS/function.c:891
 msgid "Diverge"
-msgstr "åå"
+msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:892
+#: ../objects/FS/function.c:893
 msgid "Scatter"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:894
+#: ../objects/FS/function.c:895
 msgid "Disperse"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:896 ../objects/FS/function.c:910
+#: ../objects/FS/function.c:897 ../objects/FS/function.c:911
 msgid "Diffuse"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:898
+#: ../objects/FS/function.c:899
 msgid "Empty"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:900 ../objects/FS/function.c:902
+#: ../objects/FS/function.c:901 ../objects/FS/function.c:903
 msgid "Dissipate"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:904
+#: ../objects/FS/function.c:905
 msgid "Absorb"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:906
+#: ../objects/FS/function.c:907
 msgid "Dampen"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:908
+#: ../objects/FS/function.c:909
 msgid "Dispel"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:912
+#: ../objects/FS/function.c:913
 msgid "Resist"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:914 ../objects/FS/function.c:916
+#: ../objects/FS/function.c:915 ../objects/FS/function.c:917
 msgid "Provision"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:918 ../objects/FS/function.c:920
+#: ../objects/FS/function.c:919 ../objects/FS/function.c:921
 msgid "Store"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:922
+#: ../objects/FS/function.c:923
 msgid "Contain"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:924
+#: ../objects/FS/function.c:925
 msgid "Collect"
 msgstr "æé"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:926
+#: ../objects/FS/function.c:927
 msgid "Reserve"
 msgstr "åè"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:930 ../objects/FS/function.c:932
+#: ../objects/FS/function.c:931 ../objects/FS/function.c:933
 msgid "Supply"
 msgstr "äæ"
 
-#. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../objects/FS/function.c:934
-msgid "Fill"
-msgstr "åå"
-
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:936
+#: ../objects/FS/function.c:937
 msgid "Provide"
 msgstr "æä"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:938
+#: ../objects/FS/function.c:939
 msgid "Replenish"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:940
+#: ../objects/FS/function.c:941
 msgid "Expose"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:942 ../sheets/Flowchart.sheet.in.h:9
+#: ../objects/FS/function.c:943 ../sheets/Flowchart.sheet.in.h:22
 msgid "Extract"
 msgstr "èé"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:944 ../objects/FS/function.c:946
+#: ../objects/FS/function.c:945 ../objects/FS/function.c:947
 msgid "Control Magnitude"
 msgstr "æåé"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:948 ../objects/FS/function.c:950
+#: ../objects/FS/function.c:949 ../objects/FS/function.c:951
 msgid "Actuate"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:952
+#: ../objects/FS/function.c:953
 msgid "Start"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:954
+#: ../objects/FS/function.c:955
 msgid "Initiate"
 msgstr "ååå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:956 ../objects/FS/function.c:958
+#: ../objects/FS/function.c:957 ../objects/FS/function.c:959
 msgid "Regulate"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:960 ../objects/FS/function.c:1178
-#: ../objects/UML/classicon.c:127
+#: ../objects/FS/function.c:961 ../objects/FS/function.c:1179
+#: ../objects/UML/classicon.c:128
 msgid "Control"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:966
+#: ../objects/FS/function.c:967
 msgid "Enable"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:968
+#: ../objects/FS/function.c:969
 msgid "Disable"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:970
+#: ../objects/FS/function.c:971
 msgid "Limit"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:972
+#: ../objects/FS/function.c:973
 msgid "Interrupt"
 msgstr "äæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:974 ../objects/FS/function.c:976
+#: ../objects/FS/function.c:975 ../objects/FS/function.c:977
 msgid "Change"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:978
+#: ../objects/FS/function.c:979
 msgid "Increase"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:980
+#: ../objects/FS/function.c:981
 msgid "Decrease"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:982
+#: ../objects/FS/function.c:983
 msgid "Amplify"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:984
+#: ../objects/FS/function.c:985
 msgid "Reduce"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:988
+#: ../objects/FS/function.c:989
 msgid "Normalize"
 msgstr "æåå"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:990
+#: ../objects/FS/function.c:991
 msgid "Multiply"
 msgstr "åæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
-#: ../objects/FS/function.c:992
+#. FIXME: mark read-only
+#: ../objects/FS/function.c:993 ../objects/Misc/measure.c:186
 msgid "Scale"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:994
+#: ../objects/FS/function.c:995
 msgid "Rectify"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:996
+#: ../objects/FS/function.c:997
 msgid "Adjust"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:998 ../objects/FS/function.c:1000
+#: ../objects/FS/function.c:999 ../objects/FS/function.c:1001
 msgid "Form"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1002
+#: ../objects/FS/function.c:1003
 msgid "Compact"
 msgstr "çæ"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1004
+#: ../objects/FS/function.c:1005
 msgid "Crush"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1006
+#: ../objects/FS/function.c:1007
 msgid "Shape"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1008
+#: ../objects/FS/function.c:1009
 msgid "Compress"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1010
+#: ../objects/FS/function.c:1011
 msgid "Pierce"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1012 ../objects/FS/function.c:1014
+#: ../objects/FS/function.c:1013 ../objects/FS/function.c:1015
 msgid "Convert"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1016
+#: ../objects/FS/function.c:1017
 msgid "Transform"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1018
+#: ../objects/FS/function.c:1019
 msgid "Liquefy"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1020
+#: ../objects/FS/function.c:1021
 msgid "Solidify"
 msgstr "ååå"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1022
+#: ../objects/FS/function.c:1023
 msgid "Evaporate"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1024
+#: ../objects/FS/function.c:1025
 msgid "Sublimate"
 msgstr "æè"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1026
+#: ../objects/FS/function.c:1027
 msgid "Condense"
 msgstr "åç"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1028
+#: ../objects/FS/function.c:1029
 msgid "Integrate"
 msgstr "æå"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1030
+#: ../objects/FS/function.c:1031
 msgid "Differentiate"
 msgstr "åå"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1032 ../sheets/AADL.sheet.in.h:8
+#: ../objects/FS/function.c:1033 ../sheets/AADL.sheet.in.h:3
 #: ../sheets/Gane_and_Sarson.sheet.in.h:7
 msgid "Process"
-msgstr "çå"
+msgstr "èç"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1038 ../objects/FS/function.c:1040
+#: ../objects/FS/function.c:1039 ../objects/FS/function.c:1041
 msgid "Sense"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1042
+#: ../objects/FS/function.c:1043
 msgid "Perceive"
 msgstr "çè"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1044
+#: ../objects/FS/function.c:1045
 msgid "Recognize"
 msgstr "èæ"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1046
+#: ../objects/FS/function.c:1047
 msgid "Discern"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1048
+#: ../objects/FS/function.c:1049
 msgid "Check"
 msgstr "ææ"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1052
+#: ../objects/FS/function.c:1053
 msgid "Verify"
 msgstr "èå"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1054 ../objects/FS/function.c:1056
+#: ../objects/FS/function.c:1055 ../objects/FS/function.c:1057
 msgid "Indicate"
 msgstr "æç"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1058
+#: ../objects/FS/function.c:1059
 msgid "Mark"
 msgstr "èè"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1060 ../sheets/Flowchart.sheet.in.h:7
+#: ../objects/FS/function.c:1061 ../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:1062 ../objects/FS/function.c:1064
+#: ../objects/FS/function.c:1063 ../objects/FS/function.c:1065
 msgid "Measure"
 msgstr "éå"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1066
+#: ../objects/FS/function.c:1067
 msgid "Calculate"
 msgstr "èç"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1068
+#: ../objects/FS/function.c:1069
 msgid "Represent"
 msgstr "èç"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1070
+#: ../objects/FS/function.c:1071
 msgid "Noun"
 msgstr "åè"
 
+#. Translators: Menu item Noun/Material/Solid
+#: ../objects/FS/function.c:1075
+msgid "Solid"
+msgstr "åå"
+
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1076
+#: ../objects/FS/function.c:1077
 msgid "Liquid"
 msgstr "æé"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1078
+#: ../objects/FS/function.c:1079
 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:1080 ../objects/FS/function.c:1082
-#: ../objects/FS/function.c:1166
+#: ../objects/FS/function.c:1081 ../objects/FS/function.c:1083
+#: ../objects/FS/function.c:1167
 msgid "Human"
 msgstr "äé"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1084
+#: ../objects/FS/function.c:1085
 msgid "Hand"
 msgstr "æ"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1086
+#: ../objects/FS/function.c:1087
 msgid "Foot"
 msgstr "è"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1088
+#: ../objects/FS/function.c:1089
 msgid "Head"
 msgstr "é"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1090
+#: ../objects/FS/function.c:1091
 msgid "Finger"
 msgstr "ææ"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1092
+#: ../objects/FS/function.c:1093
 msgid "Toe"
 msgstr "èè"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1094
+#: ../objects/FS/function.c:1095
 msgid "Biological"
 msgstr "çç"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1098
+#: ../objects/FS/function.c:1099
 msgid "Mechanical"
 msgstr "ææ"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1100
+#: ../objects/FS/function.c:1101
 msgid "Mech. Energy"
-msgstr "ææèé"
+msgstr "ææè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1102
+#: ../objects/FS/function.c:1103
 msgid "Translation"
-msgstr "èå"
+msgstr "åç"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1104
+#: ../objects/FS/function.c:1105
 msgid "Force"
 msgstr "å"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1106
+#: ../objects/FS/function.c:1107 ../objects/standard/outline.c:104
 msgid "Rotation"
 msgstr "æè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1108
+#: ../objects/FS/function.c:1109
 msgid "Torque"
 msgstr "èç"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1110
+#: ../objects/FS/function.c:1111
 msgid "Random Motion"
 msgstr "éæéå"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1112
+#: ../objects/FS/function.c:1113
 msgid "Vibration"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1114
+#: ../objects/FS/function.c:1115
 msgid "Rotational Energy"
-msgstr "æèèé"
+msgstr "æèåè"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1116
+#: ../objects/FS/function.c:1117
 msgid "Translational Energy"
-msgstr "èèèæ"
+msgstr "åçåè"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1118
+#: ../objects/FS/function.c:1119
 msgid "Electrical"
 msgstr "éæ"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1120
+#: ../objects/FS/function.c:1121
 msgid "Electricity"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1122
+#: ../objects/FS/function.c:1123
 msgid "Voltage"
 msgstr "éå"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1124
+#: ../objects/FS/function.c:1125
 msgid "Current"
 msgstr "éæ"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1126
+#: ../objects/FS/function.c:1127
 msgid "Hydraulic"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1128
+#: ../objects/FS/function.c:1129
 msgid "Pressure"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1130
+#: ../objects/FS/function.c:1131
 msgid "Volumetric Flow"
 msgstr "æé"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1132
+#: ../objects/FS/function.c:1133
 msgid "Thermal"
 msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1134
+#: ../objects/FS/function.c:1135
 msgid "Heat"
 msgstr "ç"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1136
+#: ../objects/FS/function.c:1137
 msgid "Conduction"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1138
+#: ../objects/FS/function.c:1139
 msgid "Convection"
 msgstr "åæ"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1140 ../objects/FS/function.c:1148
+#: ../objects/FS/function.c:1141 ../objects/FS/function.c:1149
 msgid "Radiation"
 msgstr "èå"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1142
+#: ../objects/FS/function.c:1143
 msgid "Pneumatic"
-msgstr "æé"
+msgstr "æå"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1144
+#: ../objects/FS/function.c:1145
 msgid "Chemical"
 msgstr "åå"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1146
+#: ../objects/FS/function.c:1147
 msgid "Radioactive"
-msgstr "æèåæ"
+msgstr "èåæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1150
+#: ../objects/FS/function.c:1151
 msgid "Microwaves"
 msgstr "åæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1152
+#: ../objects/FS/function.c:1153
 msgid "Radio waves"
 msgstr "ççéæ"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1154
+#: ../objects/FS/function.c:1155
 msgid "X-Rays"
 msgstr "X åç"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1156
+#: ../objects/FS/function.c:1157
 msgid "Gamma Rays"
 msgstr "äçåç"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1158
+#: ../objects/FS/function.c:1159
 msgid "Acoustic Energy"
-msgstr "ééèæ"
+msgstr "èè"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1160
+#: ../objects/FS/function.c:1161
 msgid "Optical Energy"
-msgstr "ååèé"
+msgstr "åè"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1162
+#: ../objects/FS/function.c:1163
 msgid "Solar Energy"
 msgstr "åéè"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1164
+#: ../objects/FS/function.c:1165
 msgid "Magnetic Energy"
-msgstr "éçèé"
+msgstr "çè"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1168
+#: ../objects/FS/function.c:1169
 msgid "Human Motion"
 msgstr "äééå"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1170
+#: ../objects/FS/function.c:1171
 msgid "Human Force"
 msgstr "äå"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1176
+#: ../objects/FS/function.c:1177
 msgid "Status"
 msgstr "çæ"
 
-#: ../objects/FS/function.c:1180
+#: ../objects/FS/function.c:1181
 msgid "User/Device Fn"
 msgstr "äçè/èç Få"
 
-#: ../objects/FS/function.c:1181
+#: ../objects/FS/function.c:1182
 msgid "Wish Fn"
 msgstr "ææ Få"
 
-#: ../objects/GRAFCET/action.c:135 ../sheets/SDL.sheet.in.h:9
+#: ../objects/GRAFCET/action.c:133 ../sheets/SDL.sheet.in.h:11
 msgid "Macro call"
 msgstr "åéåå"
 
-#: ../objects/GRAFCET/action.c:135
+#: ../objects/GRAFCET/action.c:133
 msgid "This action is a call to a macro-step"
 msgstr "éååäæåååé"
 
@@ -3767,51 +4441,51 @@ msgstr "æäæççéè"
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET åèçä"
 
-#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:13
+#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:3
 msgid "Regular step"
 msgstr "æææé"
 
-#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:6
+#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:4
 msgid "Initial step"
 msgstr "åååæé"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:8
+#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:5
 msgid "Macro entry step"
 msgstr "åééåæé"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:9
+#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:6
 msgid "Macro exit step"
 msgstr "åéééæé"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
+#: ../objects/GRAFCET/step.c:151 ../sheets/GRAFCET.sheet.in.h:7
 msgid "Macro call step"
 msgstr "åéååæé"
 
-#: ../objects/GRAFCET/step.c:151
+#: ../objects/GRAFCET/step.c:152
 msgid "Subprogram call step"
 msgstr "åçåååæé"
 
-#: ../objects/GRAFCET/step.c:158
+#: ../objects/GRAFCET/step.c:159
 msgid "Step name"
 msgstr "æéåç"
 
-#: ../objects/GRAFCET/step.c:158
+#: ../objects/GRAFCET/step.c:159
 msgid "The name of the step"
 msgstr "æéçåç"
 
-#: ../objects/GRAFCET/step.c:161
+#: ../objects/GRAFCET/step.c:162
 msgid "Step type"
 msgstr "æééå"
 
-#: ../objects/GRAFCET/step.c:161
+#: ../objects/GRAFCET/step.c:162
 msgid "The kind of step"
 msgstr "æéçéå"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:164
 msgid "Active"
 msgstr "åå"
 
-#: ../objects/GRAFCET/step.c:163
+#: ../objects/GRAFCET/step.c:164
 msgid "Shows a red dot to figure the step's activity"
 msgstr "ääçééçææçéè"
 
@@ -3843,59 +4517,62 @@ msgstr "åé"
 msgid "South point"
 msgstr "åé"
 
-#: ../objects/GRAFCET/vector.c:129
+#: ../objects/GRAFCET/vector.c:128
 msgid "Draw arrow heads on upward arcs:"
 msgstr "ååäçåçäçèçéï"
 
-#: ../objects/GRAFCET/vergent.c:122
+#: ../objects/GRAFCET/vergent.c:121
 msgid "OR"
 msgstr "OR"
 
-#: ../objects/GRAFCET/vergent.c:123
+#: ../objects/GRAFCET/vergent.c:122
 msgid "AND"
 msgstr "AND"
 
-#: ../objects/GRAFCET/vergent.c:134
+#: ../objects/GRAFCET/vergent.c:133
 msgid "Vergent type:"
-msgstr "ååéåï"
+msgstr "åèéåï"
 
-#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:469
-#: ../objects/Jackson/domain.c:531 ../objects/KAOS/goal.c:572
-#: ../objects/KAOS/other.c:525 ../objects/SADT/box.c:447
-#: ../objects/standard/line.c:219
+#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c:466
+#: ../objects/Jackson/domain.c:528 ../objects/KAOS/goal.c:569
+#: ../objects/KAOS/other.c:520 ../objects/SADT/box.c:448
+#: ../objects/standard/line.c:319
 msgid "Add connection point"
 msgstr "ååéæé"
 
-#: ../objects/GRAFCET/vergent.c:406
-msgid "Delete  connection point"
+#: ../objects/GRAFCET/vergent.c:405 ../objects/Istar/other.c:467
+#: ../objects/Jackson/domain.c:529 ../objects/KAOS/goal.c:570
+#: ../objects/KAOS/other.c:521 ../objects/SADT/box.c:449
+#: ../objects/standard/line.c:320
+msgid "Delete connection point"
 msgstr "åééæé"
 
-#: ../objects/GRAFCET/vergent.c:410
+#: ../objects/GRAFCET/vergent.c:409
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET OR/AND åæ"
 
-#: ../objects/Istar/actor.c:68 ../objects/Istar/link.c:152
+#: ../objects/Istar/actor.c:66 ../objects/Istar/link.c:149
 msgid "Unspecified"
 msgstr "ææå"
 
-#: ../objects/Istar/actor.c:69 ../objects/KAOS/other.c:75
+#: ../objects/Istar/actor.c:67 ../objects/KAOS/other.c:73
 msgid "Agent"
 msgstr "äç"
 
-#: ../objects/Istar/actor.c:71
+#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:250
 msgid "Role"
 msgstr "èè"
 
-#: ../objects/Istar/goal.c:76 ../objects/KAOS/goal.c:79
+#: ../objects/Istar/goal.c:74 ../objects/KAOS/goal.c:77
 msgid "Softgoal"
 msgstr ""
 
-#: ../objects/Istar/goal.c:77 ../objects/KAOS/goal.c:80
+#: ../objects/Istar/goal.c:75 ../objects/KAOS/goal.c:78
 msgid "Goal"
 msgstr "çæ"
 
-#: ../objects/Istar/goal.c:154 ../objects/Istar/goal.c:155
-#: ../objects/KAOS/goal.c:157 ../objects/KAOS/goal.c:158
+#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
+#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
 msgid "Goal Type"
 msgstr "çæéå"
 
@@ -3903,81 +4580,76 @@ msgstr "çæéå"
 msgid "Istar diagram"
 msgstr "Istar åè"
 
-#: ../objects/Istar/link.c:153
-msgid "Positive Contrib"
-msgstr "æå Contrib"
+#: ../objects/Istar/link.c:150
+#, fuzzy
+msgid "Positive contrib"
+msgstr "æå contrib"
 
-#: ../objects/Istar/link.c:154
+#: ../objects/Istar/link.c:151
 msgid "Negative contrib"
 msgstr "è contrib"
 
-#: ../objects/Istar/link.c:155 ../sheets/UML.sheet.in.h:10
+#: ../objects/Istar/link.c:152 ../sheets/UML.sheet.in.h:6
 msgid "Dependency"
 msgstr "çäæ"
 
-#: ../objects/Istar/link.c:156
+#: ../objects/Istar/link.c:153
 msgid "Decomposition"
 msgstr "åç"
 
-#: ../objects/Istar/link.c:157
+#: ../objects/Istar/link.c:154
 msgid "Means-Ends"
 msgstr "Means-Ends"
 
-#: ../objects/Istar/other.c:73
+#: ../objects/Istar/other.c:71
 msgid "Resource"
 msgstr "èæ"
 
-#: ../objects/Istar/other.c:74 ../sheets/BPMN.sheet.in.h:43
+#: ../objects/Istar/other.c:72 ../sheets/BPMN.sheet.in.h:33
 msgid "Task"
 msgstr "åä"
 
-#: ../objects/Istar/other.c:470 ../objects/Jackson/domain.c:532
-#: ../objects/KAOS/goal.c:573 ../objects/KAOS/other.c:526
-#: ../objects/SADT/box.c:448 ../objects/standard/line.c:220
-msgid "Delete connection point"
-msgstr "åééæé"
-
-#: ../objects/Istar/other.c:475
+#: ../objects/Istar/other.c:472
 msgid "i* other"
 msgstr "i* åä"
 
-#: ../objects/Jackson/domain.c:79
+#: ../objects/Jackson/domain.c:77
 msgid "Given Domain"
 msgstr "æåççå"
 
-#: ../objects/Jackson/domain.c:80
+#: ../objects/Jackson/domain.c:78
 msgid "Designed Domain"
 msgstr "èèççå"
 
-#: ../objects/Jackson/domain.c:81
+#: ../objects/Jackson/domain.c:79
 msgid "Machine Domain"
 msgstr "éèççå"
 
-#: ../objects/Jackson/domain.c:97
+#: ../objects/Jackson/domain.c:95
 msgid "Causal"
 msgstr "åå"
 
-#: ../objects/Jackson/domain.c:98
+#: ../objects/Jackson/domain.c:96
 msgid "Biddable"
 msgstr "éå"
 
-#: ../objects/Jackson/domain.c:99
+#: ../objects/Jackson/domain.c:97
 msgid "Lexical"
 msgstr "èå"
 
-#: ../objects/Jackson/domain.c:176 ../objects/Jackson/domain.c:177
+#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
 msgid "Domain Type"
 msgstr "çåéå"
 
-#: ../objects/Jackson/domain.c:181
+#: ../objects/Jackson/domain.c:180
 msgid "Domain Kind"
 msgstr "çåçé"
 
-#: ../objects/Jackson/domain.c:182
-msgid "Optional kind which appears in the lower right corner of the Domain"
+#: ../objects/Jackson/domain.c:181
+msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "åçååäèéççéææçé"
 
-#: ../objects/Jackson/domain.c:537
+#: ../objects/Jackson/domain.c:534
 msgid "Jackson domain"
 msgstr "Jackson çå"
 
@@ -3985,27 +4657,30 @@ msgstr "Jackson çå"
 msgid "Jackson diagram"
 msgstr "Jackson åè"
 
-#: ../objects/Jackson/phenomenon.c:134
+#: ../objects/Jackson/phenomenon.c:135
 msgid "Shared"
 msgstr "åä"
 
-#: ../objects/Jackson/phenomenon.c:135 ../objects/KAOS/goal.c:81
+#: ../objects/Jackson/phenomenon.c:136 ../objects/KAOS/goal.c:79
 msgid "Requirement"
 msgstr "èä"
 
-#: ../objects/Jackson/phenomenon.c:142 ../objects/UML/message.c:151
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: ../objects/Jackson/phenomenon.c:143 ../objects/UML/message.c:149
+#: ../objects/UML/message.c:151
 msgid "Message:"
 msgstr "èæï"
 
-#: ../objects/KAOS/goal.c:82
+#: ../objects/KAOS/goal.c:80
 msgid "Assumption"
 msgstr "åè"
 
-#: ../objects/KAOS/goal.c:83
+#: ../objects/KAOS/goal.c:81
 msgid "Obstacle"
 msgstr "åå"
 
-#: ../objects/KAOS/goal.c:578
+#: ../objects/KAOS/goal.c:575
 msgid "KAOS goal"
 msgstr "KAOS çæ"
 
@@ -4013,63 +4688,63 @@ msgstr "KAOS çæ"
 msgid "KAOS diagram"
 msgstr "KAOS åè"
 
-#: ../objects/KAOS/metaandorrel.c:151
+#: ../objects/KAOS/metaandorrel.c:152
 msgid "AND Refinement"
 msgstr "AND Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:152
+#: ../objects/KAOS/metaandorrel.c:153
 msgid "Complete AND Refinement"
 msgstr "Complete AND Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: ../objects/KAOS/metaandorrel.c:154
 msgid "OR Refinement"
 msgstr "OR Refinement"
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: ../objects/KAOS/metaandorrel.c:155
 msgid "Operationalization"
 msgstr "Operationalization"
 
-#: ../objects/KAOS/metaandorrel.c:161
+#: ../objects/KAOS/metaandorrel.c:162
 msgid "Text:"
 msgstr "æåï"
 
-#: ../objects/KAOS/metabinrel.c:155
+#: ../objects/KAOS/metabinrel.c:156
 msgid "Contributes"
 msgstr "èç"
 
-#: ../objects/KAOS/metabinrel.c:156
+#: ../objects/KAOS/metabinrel.c:157
 msgid "Obstructs"
 msgstr "éç"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: ../objects/KAOS/metabinrel.c:158
 msgid "Conflicts"
 msgstr "èç"
 
-#: ../objects/KAOS/metabinrel.c:158
+#: ../objects/KAOS/metabinrel.c:159
 msgid "Responsibility"
 msgstr "èä"
 
-#: ../objects/KAOS/metabinrel.c:159
+#: ../objects/KAOS/metabinrel.c:160
 msgid "Monitors"
 msgstr "çå"
 
-#: ../objects/KAOS/metabinrel.c:160
+#: ../objects/KAOS/metabinrel.c:161
 msgid "Controls"
 msgstr "æå"
 
-#: ../objects/KAOS/metabinrel.c:161
+#: ../objects/KAOS/metabinrel.c:162
 msgid "CapableOf"
 msgstr "è"
 
-#: ../objects/KAOS/metabinrel.c:162
+#: ../objects/KAOS/metabinrel.c:163
 msgid "Performs"
 msgstr "åè"
 
-#: ../objects/KAOS/metabinrel.c:164
+#: ../objects/KAOS/metabinrel.c:165
 msgid "Output"
 msgstr "èå"
 
-#: ../objects/KAOS/other.c:531
+#: ../objects/KAOS/other.c:526
 msgid "KAOS other"
 msgstr "KAOS åä"
 
@@ -4093,909 +4768,763 @@ msgstr "çéçæåå"
 msgid "Show hours"
 msgstr "éçæé"
 
+#: ../objects/Misc/diagram_as_object.c:112
+msgid "Diagram file"
+msgstr "åèææ"
+
+#: ../objects/Misc/grid_object.c:138
+msgid "Rows"
+msgstr "å"
+
+#: ../objects/Misc/grid_object.c:140
+msgid "Columns"
+msgstr "æ"
+
+#: ../objects/Misc/grid_object.c:142
+msgid "Grid line color"
+msgstr "æçéè"
+
+#: ../objects/Misc/grid_object.c:144
+msgid "Grid line width"
+msgstr "æçåå"
+
 #: ../objects/Misc/libmisc.c:42
 msgid "Miscellaneous objects"
 msgstr "ååçä"
 
-#. property rows
-#: ../objects/SADT/arrow.c:134 ../objects/UML/class.c:174
-#: ../objects/UML/class_dialog.c:400
-msgid "Normal"
-msgstr "æå"
+#: ../objects/Misc/measure.c:169
+msgid "cm"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:135
-msgid "Import resource (not shown upstairs)"
-msgstr "ååèæ ïäéçäåï"
+#: ../objects/Misc/measure.c:170
+msgid "dm"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:136
-msgid "Imply resource (not shown downstairs)"
-msgstr "ååèæ ïäéçäåï"
+#: ../objects/Misc/measure.c:171
+msgid "ft"
+msgstr "èå"
 
-#: ../objects/SADT/arrow.c:137
-msgid "Dotted arrow"
-msgstr "éççé"
+#: ../objects/Misc/measure.c:172
+msgid "in"
+msgstr "èå"
 
-#: ../objects/SADT/arrow.c:138
-msgid "disable arrow heads"
-msgstr "ééçé"
+#: ../objects/Misc/measure.c:173
+msgid "m"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:144
-msgid "Flow style:"
-msgstr "æçæåï"
+#: ../objects/Misc/measure.c:174
+msgid "mm"
+msgstr ""
 
-#: ../objects/SADT/arrow.c:146
-msgid "Automatically gray vertical flows:"
-msgstr "èåååçæçèççéï"
+#: ../objects/Misc/measure.c:175
+msgid "pt"
+msgstr "é"
 
-#: ../objects/SADT/arrow.c:147
-msgid ""
-"To improve the ease of reading, flows which begin and end vertically can be "
-"rendered gray"
-msgstr "çæäéèïèéèçéåççæçåççèçç"
-
-#: ../objects/SADT/arrow.c:463
-msgid "SADT Arrow"
-msgstr "SADT çé"
-
-#: ../objects/SADT/box.c:137 ../objects/flowchart/box.c:152
-#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
-#: ../objects/flowchart/parallelogram.c:154
-msgid "Text padding"
-msgstr "æååå"
-
-#: ../objects/SADT/box.c:144
-msgid "Activity/Data identifier"
-msgstr "ãæå/èæãèå"
-
-#: ../objects/SADT/box.c:145
-msgid "The identifier which appears in the lower right corner of the Box"
-msgstr "åæååäèéççèåèæ"
-
-#: ../objects/SADT/box.c:453
-msgid "SADT box"
-msgstr "SADT æå"
-
-#: ../objects/SADT/sadt.c:41
-msgid "SADT diagram objects"
-msgstr "SADT åèçä"
-
-#: ../objects/SISSI/classification.h:38 ../objects/SISSI/sissi.h:218
-msgid "No Protection"
-msgstr "ææäè"
-
-#: ../objects/SISSI/classification.h:39 ../objects/SISSI/sissi.h:219
-msgid "Restricted Diffusion"
-msgstr "åéææ"
-
-#: ../objects/SISSI/classification.h:40 ../objects/SISSI/sissi.h:220
-msgid "Special Country Confidential"
-msgstr "çåååæå"
-
-#: ../objects/SISSI/classification.h:41
-msgid "Confidential"
-msgstr "æå"
-
-#: ../objects/SISSI/classification.h:42 ../objects/SISSI/sissi.h:221
-msgid "NATO Confidential"
-msgstr "åçæå"
-
-#: ../objects/SISSI/classification.h:43 ../objects/SISSI/sissi.h:222
-msgid "Personal Confidential"
-msgstr "åäæå"
-
-#: ../objects/SISSI/classification.h:44 ../objects/SISSI/sissi.h:223
-msgid "Medical Confidential"
-msgstr "éçæå"
-
-#: ../objects/SISSI/classification.h:45 ../objects/SISSI/sissi.h:224
-msgid "Industrie Confidential"
-msgstr "åææå"
+#: ../objects/Misc/measure.c:176
+msgid "pi"
+msgstr "pi"
 
-#: ../objects/SISSI/classification.h:46
-msgid "Defense Confidential"
-msgstr "åéæå"
-
-#: ../objects/SISSI/classification.h:47 ../objects/SISSI/sissi.h:225
-msgid "Secret"
-msgstr "çå"
-
-#: ../objects/SISSI/classification.h:48
-msgid "Defense Secret"
-msgstr "åéçå"
-
-#: ../objects/SISSI/classification.h:49 ../objects/SISSI/sissi.h:226
-msgid "Secret special country"
-msgstr "çåååçå"
-
-#: ../objects/SISSI/classification.h:50 ../objects/SISSI/sissi.h:227
-msgid "NATO Secret"
-msgstr "åççå"
-
-#: ../objects/SISSI/classification.h:51 ../objects/SISSI/sissi.h:228
-msgid "Very Secret"
-msgstr "éåçå"
-
-#: ../objects/SISSI/classification.h:52 ../objects/SISSI/sissi.h:229
-msgid "NATO Very Secret"
-msgstr "åçéåçå"
-
-#: ../objects/SISSI/sissi.c:64
-msgid "SISSI diagram"
-msgstr "SISSI åè"
-
-#: ../objects/SISSI/sissi.h:234
-msgid "No integrity"
-msgstr "çåææ"
-
-#: ../objects/SISSI/sissi.h:235
-msgid "Low integrity"
-msgstr "äåææ"
-
-#: ../objects/SISSI/sissi.h:236
-msgid "Average software integrity"
-msgstr "æéèéåææ"
-
-#: ../objects/SISSI/sissi.h:237
-msgid "Hight software integrity"
-msgstr "éèéåææ"
-
-#: ../objects/SISSI/sissi.h:238
-msgid "Average hardware integrity"
-msgstr "æéçéåææ"
-
-#: ../objects/SISSI/sissi.h:239
-msgid "Hight hardware integrity"
-msgstr "éçéåææ"
-
-#: ../objects/SISSI/sissi.h:244
-msgid "Millisecond"
-msgstr "æç"
-
-#: ../objects/SISSI/sissi.h:245
-msgid "Second"
-msgstr "ç"
-
-#: ../objects/SISSI/sissi.h:246
-msgid "Minute"
-msgstr "åé"
-
-#: ../objects/SISSI/sissi.h:247
-msgid "Hour"
-msgstr "åæ"
+#. PROP_FLAG_VISIBLE|
+#: ../objects/Misc/measure.c:185 ../sheets/ChemEng.sheet.in.h:8
+msgid "Measurement"
+msgstr "åéè"
 
-#: ../objects/SISSI/sissi.h:248
-msgid "Day"
-msgstr "æ"
+#: ../objects/Misc/measure.c:187
+msgid "Unit"
+msgstr "åä"
 
-#: ../objects/SISSI/sissi.h:249
-msgid "Week"
-msgstr "é"
+#: ../objects/Misc/measure.c:188
+msgid "Precision"
+msgstr "çå"
 
-#: ../objects/SISSI/sissi.h:254
-msgid "SYSTEM"
-msgstr "çç"
+#: ../objects/Misc/tree.c:597 ../objects/network/bus.c:605
+msgid "Add Handle"
+msgstr "ååæåé"
 
-#: ../objects/SISSI/sissi.h:255
-msgid "Internet access device"
-msgstr "Internet ååèç"
+#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
+msgid "Delete Handle"
+msgstr "åéæåé"
 
-#: ../objects/SISSI/sissi.h:256
-msgid "Electronic messaging"
-msgstr "éååè"
+#: ../objects/network/basestation.c:134
+msgid "Sectors"
+msgstr ""
 
-#: ../objects/SISSI/sissi.h:257
-msgid "Intranet"
-msgstr "åèç"
+#: ../objects/network/basestation.c:395 ../objects/network/basestation.c:397
+msgid "Base Station"
+msgstr "ååå"
 
-#: ../objects/SISSI/sissi.h:258
-msgid "Company directory"
-msgstr "ååçé"
+#: ../objects/network/network.c:43
+msgid "Network diagram objects"
+msgstr "çèåèçä"
 
-#: ../objects/SISSI/sissi.h:259
-msgid "External portal"
-msgstr "åéååçç"
+#: ../objects/network/radiocell.c:119
+msgid "Radius"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:264
-msgid "ORGANISATION"
-msgstr "çç"
+#: ../objects/network/wanlink.c:119
+msgid "Width"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:265
-msgid "Higher-tier organisation"
-msgstr "éåæçç"
+#: ../objects/SADT/arrow.c:137
+msgid "Import resource (not shown upstairs)"
+msgstr "ååèæ ïäéçäåï"
 
-#: ../objects/SISSI/sissi.h:266
-msgid "Structure of the organisation"
-msgstr "çççæ"
+#: ../objects/SADT/arrow.c:138
+msgid "Imply resource (not shown downstairs)"
+msgstr "ååèæ ïäéçäåï"
 
-#: ../objects/SISSI/sissi.h:267
-msgid "Project or system organisation"
-msgstr "åææçççç"
+#: ../objects/SADT/arrow.c:139
+msgid "Dotted arrow"
+msgstr "éççé"
 
-#: ../objects/SISSI/sissi.h:268
-msgid "Subcontractors / Suppliers / Manufacturers"
-msgstr "ååå / äæå / ççå"
+#: ../objects/SADT/arrow.c:140
+msgid "disable arrow heads"
+msgstr "ééçé"
 
-#: ../objects/SISSI/sissi.h:273
-msgid "SITE"
-msgstr "çé"
+#: ../objects/SADT/arrow.c:147
+msgid "Flow style:"
+msgstr "æçæåï"
 
-#: ../objects/SISSI/sissi.h:274
-msgid "Places"
-msgstr "åæ"
+#: ../objects/SADT/arrow.c:149
+msgid "Automatically gray vertical flows:"
+msgstr "èåååçæçèççéï"
 
-#: ../objects/SISSI/sissi.h:275
-msgid "External environment"
-msgstr "åéçå"
+#: ../objects/SADT/arrow.c:150
+msgid ""
+"To improve the ease of reading, flows which begin and end vertically can be "
+"rendered gray"
+msgstr "çæäéèïèéèçéåççæçåççèçç"
 
-#: ../objects/SISSI/sissi.h:276
-msgid "Premises"
-msgstr "æè"
+#: ../objects/SADT/arrow.c:469
+msgid "SADT Arrow"
+msgstr "SADT çé"
 
-#: ../objects/SISSI/sissi.h:277
-msgid "Zone"
-msgstr "åå"
+#: ../objects/SADT/box.c:145
+msgid "Activity/Data identifier"
+msgstr "ãæå/èæãèå"
 
-#: ../objects/SISSI/sissi.h:278
-msgid "Service Essentiel"
-msgstr "åèæå"
+#: ../objects/SADT/box.c:146
+msgid "The identifier which appears in the lower-right corner of the Box"
+msgstr "åæååäèéççèåèæ"
 
-#: ../objects/SISSI/sissi.h:279
-msgid "Communication"
-msgstr "éè"
+#: ../objects/SADT/box.c:454
+msgid "SADT box"
+msgstr "SADT æå"
 
-#: ../objects/SISSI/sissi.h:280
-msgid "Power"
-msgstr "éæ"
+#: ../objects/SADT/sadt.c:41
+msgid "SADT diagram objects"
+msgstr "SADT åèçä"
 
-#: ../objects/SISSI/sissi.h:281
-msgid "Cooling / Pollution"
-msgstr "åå / ææ"
+#: ../objects/standard/arc.c:120
+msgid "Curve distance"
+msgstr "æçèé"
 
-#: ../objects/SISSI/sissi.h:285
-msgid "THERMIC DETECTION"
-msgstr "æååæ"
+#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:127
+#: ../objects/standard/polyline.c:108
+msgid "Line gaps"
+msgstr "ççé"
 
-#: ../objects/SISSI/sissi.h:289
-msgid "FIRE DETECTION"
-msgstr "çèåæ"
+#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:129
+#: ../objects/standard/polyline.c:110
+msgid "Absolute start gap"
+msgstr "çåéåçé"
 
-#: ../objects/SISSI/sissi.h:293
-msgid "WATER DETECTION"
-msgstr "ææåæ"
+#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:131
+#: ../objects/standard/polyline.c:112
+msgid "Absolute end gap"
+msgstr "çåçæçé"
 
-#: ../objects/SISSI/sissi.h:297
-msgid "AIR DETECTION"
-msgstr "çæåæ"
+#: ../objects/standard/bezier.c:776 ../objects/standard/beziergon.c:515
+msgid "Add Segment"
+msgstr "åååæ"
 
-#: ../objects/SISSI/sissi.h:301
-msgid "ENERGY DETECTION"
-msgstr "èéåæ"
+#: ../objects/standard/bezier.c:777 ../objects/standard/beziergon.c:516
+msgid "Delete Segment"
+msgstr "åéåæ"
 
-#: ../objects/SISSI/sissi.h:305
-msgid "INTRUSION DETECTION"
-msgstr "åäåæ"
+#: ../objects/standard/bezier.c:779 ../objects/standard/beziergon.c:518
+msgid "Symmetric control"
+msgstr "åçæå"
 
-#: ../objects/SISSI/sissi.h:309
-msgid "THERMIC ACTION"
-msgstr "æååä"
+#: ../objects/standard/bezier.c:781 ../objects/standard/beziergon.c:520
+msgid "Smooth control"
+msgstr "åææå"
 
-#: ../objects/SISSI/sissi.h:313
-msgid "FIRE ACTION"
-msgstr "çèåä"
+#: ../objects/standard/bezier.c:783 ../objects/standard/beziergon.c:522
+msgid "Cusp control"
+msgstr "çéæå"
 
-#: ../objects/SISSI/sissi.h:317
-msgid "WATER ACTION"
-msgstr "ææåä"
+#: ../objects/standard/bezier.c:785 ../objects/standard/beziergon.c:524
+#: ../objects/standard/box.c:749 ../objects/standard/textobj.c:450
+msgid "Convert to Path"
+msgstr "èæèèå"
 
-#: ../objects/SISSI/sissi.h:321
-msgid "AIR ACTION"
-msgstr "çæåä"
+#: ../objects/standard/box.c:125 ../objects/standard/ellipse.c:118
+msgid "Free"
+msgstr "èç"
 
-#: ../objects/SISSI/sissi.h:325
-msgid "ENERGY ACTION"
-msgstr "èéåä"
+#: ../objects/standard/box.c:126 ../objects/standard/ellipse.c:119
+msgid "Fixed"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:329
-msgid "INTRUSION ACTION"
-msgstr "åäåä"
+#: ../objects/standard/box.c:127 ../objects/standard/box.c:747
+msgid "Square"
+msgstr "æå"
 
-#: ../objects/SISSI/sissi.h:334
-msgid "PERSONAL"
-msgstr "åä"
+#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:131
+msgid "Aspect ratio"
+msgstr "åéæ"
 
-#: ../objects/SISSI/sissi.h:335
-msgid "Decision maker"
-msgstr "æçè"
+#: ../objects/standard/box.c:743 ../objects/standard/ellipse.c:664
+msgid "Free aspect"
+msgstr "èçåéæ"
 
-#: ../objects/SISSI/sissi.h:336
-msgid "SSI Responsible"
-msgstr "SSI èäè"
+#: ../objects/standard/box.c:745 ../objects/standard/ellipse.c:666
+msgid "Fixed aspect"
+msgstr "åååéæ"
 
-#: ../objects/SISSI/sissi.h:337
-msgid "Users"
-msgstr "äçè"
+#: ../objects/standard/ellipse.c:120 ../objects/standard/ellipse.c:668
+msgid "Circle"
+msgstr "åå"
 
-#: ../objects/SISSI/sissi.h:338
-msgid "Fonctionnal administrator"
-msgstr "åèççè"
+#: ../objects/standard/image.c:119
+msgid "Image file"
+msgstr "ååæ"
 
-#: ../objects/SISSI/sissi.h:339
-msgid "Technician aministrator"
-msgstr "æèççè"
+#: ../objects/standard/image.c:121
+msgid "Inline data"
+msgstr "çåèæ"
 
-#: ../objects/SISSI/sissi.h:340
-msgid "SSI administrator"
-msgstr "SSI ççè"
+#: ../objects/standard/image.c:121
+msgid "Store image data in diagram"
+msgstr "ååèåååååèæ"
 
-#: ../objects/SISSI/sissi.h:341
-msgid "Developer"
-msgstr "éçè"
+#: ../objects/standard/image.c:123
+msgid "Pixbuf"
+msgstr ""
 
-#: ../objects/SISSI/sissi.h:342
-msgid "Operator / Maintenance"
-msgstr "æäè / çäéä"
+#: ../objects/standard/image.c:123
+msgid "The Pixbuf reference"
+msgstr "Pixbuf åè"
 
-#: ../objects/SISSI/sissi.h:347
-msgid "NETWORK"
-msgstr "çè"
+#: ../objects/standard/image.c:125
+msgid "Draw border"
+msgstr "çèéç"
 
-#: ../objects/SISSI/sissi.h:348
-msgid "Medium and supports"
-msgstr "åéèææ"
+#: ../objects/standard/image.c:127
+msgid "Keep aspect ratio"
+msgstr "äæåéæ"
 
-#: ../objects/SISSI/sissi.h:349
-msgid "Passive or active relay"
+#: ../objects/standard/image.c:676
+msgid "Inconsistent pixbuf during image save."
 msgstr ""
 
-#: ../objects/SISSI/sissi.h:350
-msgid "Communication interface"
-msgstr "éæçé"
-
-#: ../objects/SISSI/sissi.h:355
-msgid "LOGICIEL"
+#. Found file in same dir as diagram.
+#. Found file in current dir.
+#: ../objects/standard/image.c:773 ../objects/standard/image.c:784
+#, c-format
+msgid ""
+"The image file '%s' was not found in the specified directory.\n"
+"Using the file '%s' instead.\n"
 msgstr ""
+"åæåççéäæäåååæâ%sâã\n"
+"æçææâ%sâ\n"
 
-#: ../objects/SISSI/sissi.h:356
-msgid "Operating System"
-msgstr "æäçç"
-
-#: ../objects/SISSI/sissi.h:357
-msgid "Service - maintenance or administration software"
-msgstr "æå - çäæççèé"
-
-#: ../objects/SISSI/sissi.h:358
-msgid "Package software or standard software"
-msgstr "åäèéæææèé"
-
-#: ../objects/SISSI/sissi.h:359
-msgid "Business application"
-msgstr "åææççå"
-
-#: ../objects/SISSI/sissi.h:360
-msgid "Standard business application"
-msgstr "ææåææççå"
-
-#: ../objects/SISSI/sissi.h:361
-msgid "Specific business application"
-msgstr "çååææççå"
-
-#: ../objects/SISSI/sissi.h:366
-msgid "HARDWARE"
-msgstr "çé"
-
-#: ../objects/SISSI/sissi.h:367
-msgid "Data processing equipement (active)"
-msgstr "èæèçèåïéääï"
-
-#: ../objects/SISSI/sissi.h:368
-msgid "Transportable equipement"
-msgstr "æåèå"
-
-#: ../objects/SISSI/sissi.h:369
-msgid "Fixed equipement"
-msgstr "ååèå"
-
-#: ../objects/SISSI/sissi.h:370
-msgid "Peripheral processing"
-msgstr "ééèç"
-
-#: ../objects/SISSI/sissi.h:371
-msgid "Electronic medium"
-msgstr "éååé"
-
-#: ../objects/SISSI/sissi.h:372
-msgid "Other media"
-msgstr "åååé"
+#. Didn't find file in current dir.
+#: ../objects/standard/image.c:790 ../objects/standard/image.c:812
+#, c-format
+msgid "The image file '%s' was not found.\n"
+msgstr "æäåååæâ%sâã\n"
 
-#: ../objects/SISSI/sissi.h:373
-msgid "Data medium (passive)"
-msgstr "èæåéïèååï"
+#: ../objects/standard/line.c:118
+msgid "Arrows"
+msgstr "çé"
 
-#. Class page:
-#: ../objects/SISSI/sissi_dialog.c:185
-msgid "_Menace"
-msgstr "åè(_M)"
+#: ../objects/standard/line.c:123
+msgid "Start point"
+msgstr "èé"
 
-#. ********* label of board *********
-#: ../objects/SISSI/sissi_dialog.c:201 ../objects/SISSI/sissi_dialog.c:210
-msgid "Menace"
-msgstr "åè"
+#: ../objects/standard/line.c:125
+msgid "End point"
+msgstr "çé"
 
-#: ../objects/SISSI/sissi_dialog.c:203 ../objects/SISSI/sissi_dialog.c:212
-msgid "P Action"
-msgstr "P åä"
+#: ../objects/standard/line.c:321
+msgid "Upgrade to Polyline"
+msgstr "åçèèççæ"
 
-#: ../objects/SISSI/sissi_dialog.c:205 ../objects/SISSI/sissi_dialog.c:214
-msgid "P Detection"
-msgstr "P åæ"
+#: ../objects/standard/line.c:322
+msgid "Upgrade to Zigzagline"
+msgstr "åçè Z åç"
 
-#: ../objects/SISSI/sissi_dialog.c:207 ../objects/SISSI/sissi_dialog.c:216
-msgid "Vulnerability"
-msgstr "æææ"
+#: ../objects/standard/outline.c:102
+msgid "Text content"
+msgstr "æååå"
 
-#. Other properties of page:
-#: ../objects/SISSI/sissi_dialog.c:372
-msgid "Others properties"
-msgstr "åäåæ"
+#: ../objects/standard/outline.c:104
+msgid "Angle to rotate the outline"
+msgstr "åææèçèå"
 
-#. ********* selection menu of entity ********
-#. ********* Label of board *********
-#: ../objects/SISSI/sissi_dialog.c:610
-msgid "Libelle"
-msgstr ""
+#: ../objects/standard/polygon.c:459 ../objects/standard/polyline.c:623
+msgid "Add Corner"
+msgstr "ååèè"
 
-#: ../objects/SISSI/sissi_dialog.c:612
-msgid "value"
-msgstr "å"
+#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:624
+msgid "Delete Corner"
+msgstr "åéèè"
 
-#: ../objects/SISSI/sissi_dialog.c:623 ../objects/SISSI/sissi_dialog.c:755
-#: ../objects/UML/class_dialog.c:927 ../objects/UML/class_dialog.c:1877
-#: ../objects/UML/class_dialog.c:2114 ../objects/UML/class_dialog.c:2644
-msgid "_New"
-msgstr "æå(_N)"
+#: ../objects/standard/standard.c:58
+msgid "Standard objects"
+msgstr "ææçä"
 
-#. Other properties of page
-#: ../objects/SISSI/sissi_dialog.c:746
-msgid "Documents"
-msgstr "æä"
+#: ../objects/standard/textobj.c:112
+msgid "First Line"
+msgstr "çäæç"
 
-#: ../objects/SISSI/sissi_dialog.c:762
-msgid "Document title"
-msgstr "æäæé"
+#: ../objects/standard/textobj.c:119
+msgid "Vertical text alignment"
+msgstr "åçåéæå"
 
-#: ../objects/SISSI/sissi_dialog.c:764
-msgid "URL"
-msgstr ""
+#: ../objects/standard/zigzagline.c:450
+msgid "Upgrade to Bezierline"
+msgstr "åçèèèæç"
 
-#: ../objects/UML/actor.c:349 ../objects/UML/actor.c:351
-#: ../sheets/UML.sheet.in.h:2
+#: ../objects/UML/actor.c:352 ../objects/UML/actor.c:354
+#: ../sheets/UML.sheet.in.h:15
 msgid "Actor"
 msgstr "åäè"
 
-#: ../objects/UML/association.c:1173 ../objects/UML/class_dialog.c:2210
-msgid "Direction:"
-msgstr "æåï"
-
-#: ../objects/UML/association.c:1190
+#: ../objects/UML/association.c:222
 msgid "From A to B"
 msgstr "å A å B"
 
-#: ../objects/UML/association.c:1197
+#: ../objects/UML/association.c:223
 msgid "From B to A"
 msgstr "å B å A"
 
-#: ../objects/UML/association.c:1221 ../objects/UML/association.c:1229
+#: ../objects/UML/association.c:228
+msgid "Aggregation"
+msgstr "èå"
+
+#: ../objects/UML/association.c:229
+msgid "Composition"
+msgstr "çæ"
+
+#: ../objects/UML/association.c:239
+msgid "Direction"
+msgstr "æå"
+
+#: ../objects/UML/association.c:241
+msgid "Show direction"
+msgstr "éçæå"
+
+#: ../objects/UML/association.c:241
+msgid "Show the small arrow denoting the reading direction"
+msgstr "éçäèéèæåçåçé"
+
+#: ../objects/UML/association.c:248
 msgid "Side A"
 msgstr "A é"
 
-#: ../objects/UML/association.c:1223 ../objects/UML/association.c:1231
+#: ../objects/UML/association.c:252
+msgid "Multiplicity"
+msgstr "éæ"
+
+#: ../objects/UML/association.c:254 ../objects/UML/umlattribute.c:45
+#: ../objects/UML/umloperation.c:71
+msgid "Visibility"
+msgstr "åèå"
+
+#: ../objects/UML/association.c:256
+msgid "Show arrow"
+msgstr "éççé"
+
+#: ../objects/UML/association.c:259
 msgid "Side B"
 msgstr "B é"
 
-#: ../objects/UML/association.c:1237
-msgid "Role:"
-msgstr "èèï"
+#. Attributes page:
+#: ../objects/UML/class_attributes_dialog.c:455
+msgid "_Attributes"
+msgstr "åæ(_A)"
+
+#: ../objects/UML/class_attributes_dialog.c:507
+msgid "Attribute data"
+msgstr "åæèæ"
+
+#: ../objects/UML/class_attributes_dialog.c:539
+msgid "Value:"
+msgstr "æåï"
 
-#: ../objects/UML/association.c:1249
-msgid "Multiplicity:"
-msgstr "éæï"
+#: ../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/UML/association.c:1260 ../objects/UML/class_dialog.c:1021
-#: ../objects/UML/class_dialog.c:1954
+#: ../objects/UML/class_attributes_dialog.c:572
+#: ../objects/UML/class_operations_dialog.c:811
 msgid "Visibility:"
 msgstr "åèåï"
 
-#: ../objects/UML/association.c:1269 ../objects/UML/class_dialog.c:1030
-#: ../objects/UML/class_dialog.c:1963 ../objects/UML/uml.c:102
+#: ../objects/UML/class_attributes_dialog.c:577
+#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
 msgid "Public"
 msgstr "åé"
 
-#: ../objects/UML/association.c:1279 ../objects/UML/class_dialog.c:1038
-#: ../objects/UML/class_dialog.c:1971 ../objects/UML/uml.c:103
+#: ../objects/UML/class_attributes_dialog.c:578
+#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
 msgid "Private"
 msgstr "çç"
 
-#: ../objects/UML/association.c:1289 ../objects/UML/class_dialog.c:1046
-#: ../objects/UML/class_dialog.c:1979 ../objects/UML/uml.c:104
+#: ../objects/UML/class_attributes_dialog.c:579
+#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
 msgid "Protected"
 msgstr "äè"
 
-#: ../objects/UML/association.c:1299 ../objects/UML/class_dialog.c:1054
-#: ../objects/UML/class_dialog.c:1987 ../objects/UML/uml.c:105
+#: ../objects/UML/class_attributes_dialog.c:580
+#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
 msgid "Implementation"
 msgstr "åä"
 
-#. Show arrow:
-#: ../objects/UML/association.c:1318
-msgid "Show arrow"
-msgstr "éççé"
-
-#. Aggregate
-#: ../objects/UML/association.c:1324
-msgid "Aggregate"
-msgstr "èé"
-
-#. Composition
-#: ../objects/UML/association.c:1332
-msgid "Composition"
-msgstr "çæ"
+#. end: Inheritance type
+#: ../objects/UML/class_attributes_dialog.c:592
+#: ../objects/UML/class_operations_dialog.c:840
+msgid "Class scope"
+msgstr "éåçå"
 
-#: ../objects/UML/class.c:137 ../objects/UML/class.c:308
-#: ../objects/UML/class.c:1707 ../sheets/UML.sheet.in.h:6
+#: ../objects/UML/class.c:138 ../objects/UML/class.c:349
+#: ../objects/UML/class.c:1845 ../sheets/UML.sheet.in.h:3
 msgid "Class"
 msgstr "éå"
 
-#: ../objects/UML/class.c:141 ../objects/UML/classicon.c:138
-#: ../objects/UML/component.c:124 ../objects/UML/large_package.c:129
-#: ../objects/UML/object.c:150 ../objects/UML/small_package.c:124
-#: ../objects/UML/umloperation.c:68
+#. how it used to be before 0.96+SVN
+#. one name, one type: but breaks forward-compatibiliy so kind of reverted
+#: ../objects/UML/class.c:142 ../objects/UML/classicon.c:137
+#: ../objects/UML/classicon.c:139 ../objects/UML/component.c:124
+#: ../objects/UML/large_package.c:134 ../objects/UML/object.c:148
+#: ../objects/UML/small_package.c:126 ../objects/UML/umloperation.c:68
 msgid "Stereotype"
 msgstr "æéå"
 
-#: ../objects/UML/class.c:143 ../objects/UML/class.c:184
-#: ../objects/UML/class_dialog.c:425 ../objects/UML/umlattribute.c:43
-#: ../objects/UML/umloperation.c:66 ../objects/UML/umlparameter.c:49
-#: ../sheets/SDL.sheet.in.h:3
-msgid "Comment"
-msgstr "åè"
-
-#: ../objects/UML/class.c:145 ../objects/UML/class.c:178
-#: ../objects/UML/class_dialog.c:324 ../objects/UML/class_dialog.c:410
-#: ../objects/UML/class_dialog.c:2018 ../objects/UML/uml.c:110
+#: ../objects/UML/class.c:149 ../objects/UML/class.c:205
+#: ../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:147 ../objects/UML/class.c:1704
-msgid "Template"
-msgstr "ææ"
-
-#: ../objects/UML/class.c:150 ../objects/UML/class_dialog.c:333
-msgid "Suppress Attributes"
-msgstr "æååæ"
-
-#: ../objects/UML/class.c:152
-msgid "Suppress Operations"
-msgstr "æååä"
-
-#: ../objects/UML/class.c:154
+#: ../objects/UML/class.c:151
 msgid "Visible Attributes"
 msgstr "åèåæ"
 
-#: ../objects/UML/class.c:156
+#: ../objects/UML/class.c:153
 msgid "Visible Operations"
 msgstr "åèéä"
 
-#: ../objects/UML/class.c:158
+#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:384
+msgid "Wrap Operations"
+msgstr "æçæä"
+
+#: ../objects/UML/class.c:157
 msgid "Visible Comments"
 msgstr "åèèè"
 
-#: ../objects/UML/class.c:160 ../objects/UML/class_dialog.c:349
-msgid "Wrap Operations"
-msgstr "æçæä"
+#: ../objects/UML/class.c:161 ../objects/UML/class.c:344
+msgid "Allow resizing"
+msgstr "åèèæåå"
+
+#: ../objects/UML/class.c:165 ../objects/UML/class.c:1842
+msgid "Template"
+msgstr "ææ"
+
+#: ../objects/UML/class.c:167 ../objects/UML/class_dialog.c:368
+msgid "Suppress Attributes"
+msgstr "æååæ"
+
+#: ../objects/UML/class.c:169
+msgid "Suppress Operations"
+msgstr "æååä"
 
-#: ../objects/UML/class.c:162
+#: ../objects/UML/class.c:171
 msgid "Wrap after char"
 msgstr "åæåååæè"
 
-#: ../objects/UML/class.c:164
+#: ../objects/UML/class.c:173
 msgid "Comment line length"
 msgstr "èèéå"
 
-#: ../objects/UML/class.c:166
-msgid "Comment tagging"
-msgstr "èèæè"
+#. umlattribute_extra
+#: ../objects/UML/class.c:186
+msgid "Operations"
+msgstr "éä"
 
-#: ../objects/UML/class.c:176 ../objects/UML/class_dialog.c:405
+#. umloperations_extra
+#: ../objects/UML/class.c:190
+msgid "Template Parameters"
+msgstr "ææåæ"
+
+#: ../objects/UML/class.c:203 ../objects/UML/class_dialog.c:466
 msgid "Polymorphic"
 msgstr "åå"
 
-#: ../objects/UML/class.c:180
-msgid "Classname"
+#: ../objects/UML/class.c:207 ../objects/UML/class_dialog.c:476
+msgid "Class Name"
 msgstr "éååç"
 
-#: ../objects/UML/class.c:182
-msgid "Abstract Classname"
-msgstr "æèéååç"
-
-#: ../objects/UML/class.c:188 ../objects/UML/class.c:190
-#: ../objects/UML/class.c:192 ../objects/UML/class.c:194
-#: ../objects/UML/class.c:196 ../objects/UML/class.c:198
-msgid " "
-msgstr " "
-
-#: ../objects/UML/class.c:204 ../objects/UML/object.c:154
-msgid "Attributes"
-msgstr "åæ"
-
-#: ../objects/UML/class.c:206
-msgid "Operations"
-msgstr "éä"
-
 #: ../objects/UML/class.c:209
-msgid "Template Parameters"
-msgstr "ææåæ"
-
-#: ../objects/UML/class.c:303
-msgid "Show Comments"
-msgstr "éçåè"
+msgid "Abstract Class Name"
+msgstr "æèéååç"
 
 #. Class page:
-#: ../objects/UML/class_dialog.c:285
+#: ../objects/UML/class_dialog.c:320
 msgid "_Class"
 msgstr "éå(_C)"
 
-#: ../objects/UML/class_dialog.c:293
+#: ../objects/UML/class_dialog.c:328
 msgid "Class name:"
 msgstr "éååçï"
 
-#: ../objects/UML/class_dialog.c:301 ../objects/UML/class_dialog.c:1941
-#: ../objects/UML/dependency.c:137 ../objects/UML/generalization.c:133
-#: ../objects/UML/realizes.c:134
+#: ../objects/UML/class_dialog.c:336
+#: ../objects/UML/class_operations_dialog.c:799
+#: ../objects/UML/dependency.c:135 ../objects/UML/generalization.c:132
+#: ../objects/UML/realizes.c:132
 msgid "Stereotype:"
 msgstr "æéåï"
 
-#: ../objects/UML/class_dialog.c:308 ../objects/UML/class_dialog.c:999
-#: ../objects/UML/class_dialog.c:2059 ../objects/UML/class_dialog.c:2190
-msgid "Comment:"
-msgstr "åèï"
-
-#: ../objects/UML/class_dialog.c:330
+#: ../objects/UML/class_dialog.c:365
 msgid "Attributes visible"
 msgstr "åèåæ"
 
-#: ../objects/UML/class_dialog.c:339
+#: ../objects/UML/class_dialog.c:374
 msgid "Operations visible"
 msgstr "åèåä"
 
-#: ../objects/UML/class_dialog.c:342
+#: ../objects/UML/class_dialog.c:377
 msgid "Suppress operations"
 msgstr "æååä"
 
-#: ../objects/UML/class_dialog.c:356
+#: ../objects/UML/class_dialog.c:391
 msgid "Wrap after this length: "
 msgstr "æéååæèï"
 
-#: ../objects/UML/class_dialog.c:364
+#: ../objects/UML/class_dialog.c:399
 msgid "Comments visible"
 msgstr "èèçåèç"
 
-#: ../objects/UML/class_dialog.c:371
+#: ../objects/UML/class_dialog.c:406
 msgid "Wrap comment after this length: "
 msgstr "æéååèèæèï"
 
-#: ../objects/UML/class_dialog.c:378
-msgid "Show documenation tag"
-msgstr "éçæäæè"
+#: ../objects/UML/class_dialog.c:413
+msgid "Show documentation tag"
+msgstr "éçèææäæè"
+
+#. * Fonts and Colors selection *
+#: ../objects/UML/class_dialog.c:442
+msgid "_Style"
+msgstr "åæ(_S)"
 
 #. head line
-#: ../objects/UML/class_dialog.c:391 ../objects/UML/umlparameter.c:51
+#: ../objects/UML/class_dialog.c:452 ../objects/UML/umlparameter.c:51
 msgid "Kind"
 msgstr "çé"
 
-#: ../objects/UML/class_dialog.c:396
+#: ../objects/UML/class_dialog.c:457
 msgid "Size"
 msgstr "åå"
 
-#: ../objects/UML/class_dialog.c:415
-msgid "Class Name"
-msgstr "éååç"
-
-#: ../objects/UML/class_dialog.c:420
+#: ../objects/UML/class_dialog.c:481
 msgid "Abstract Class"
 msgstr "æèéå"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:437
+#: ../objects/UML/class_dialog.c:498
+msgid "Line Width"
+msgstr "çæåå"
+
+#: ../objects/UML/class_dialog.c:507
 msgid "Text Color"
 msgstr "æåèå"
 
-#: ../objects/UML/class_dialog.c:445
+#: ../objects/UML/class_dialog.c:516
 msgid "Foreground Color"
 msgstr "åæèå"
 
-#: ../objects/UML/class_dialog.c:453
+#: ../objects/UML/class_dialog.c:525
 msgid "Background Color"
 msgstr "èæèå"
 
-#. Attributes page:
-#: ../objects/UML/class_dialog.c:899
-msgid "_Attributes"
-msgstr "åæ(_A)"
-
-#: ../objects/UML/class_dialog.c:933 ../objects/UML/class_dialog.c:1883
-#: ../objects/UML/class_dialog.c:2121 ../objects/UML/class_dialog.c:2650
-msgid "_Delete"
-msgstr "åé(_D)"
-
-#: ../objects/UML/class_dialog.c:939 ../objects/UML/class_dialog.c:1889
-#: ../objects/UML/class_dialog.c:2128 ../objects/UML/class_dialog.c:2656
-msgid "Move up"
-msgstr "äç"
-
-#: ../objects/UML/class_dialog.c:945 ../objects/UML/class_dialog.c:1895
-#: ../objects/UML/class_dialog.c:2135 ../objects/UML/class_dialog.c:2662
-msgid "Move down"
-msgstr "äç"
-
-#: ../objects/UML/class_dialog.c:956
-msgid "Attribute data"
-msgstr "åæèæ"
-
-#: ../objects/UML/class_dialog.c:988
-msgid "Value:"
-msgstr "æåï"
-
-#: ../objects/UML/class_dialog.c:1075 ../objects/UML/class_dialog.c:2003
-msgid "Class scope"
-msgstr "éåçå"
-
-#. Operations page:
-#: ../objects/UML/class_dialog.c:1849
-msgid "_Operations"
-msgstr "éä(_O)"
+#: ../objects/UML/classicon.c:129
+msgid "Boundary"
+msgstr "éç"
 
-#: ../objects/UML/class_dialog.c:1907
-msgid "Operation data"
-msgstr "éäèæ"
+#: ../objects/UML/classicon.c:142
+msgid "Is object"
+msgstr "æçä"
 
-#: ../objects/UML/class_dialog.c:2009
+#. end: Visibility
+#: ../objects/UML/class_operations_dialog.c:827
 msgid "Inheritance type:"
 msgstr "çæéåï"
 
-#: ../objects/UML/class_dialog.c:2026 ../objects/UML/uml.c:111
+#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
 msgid "Polymorphic (virtual)"
 msgstr "åå(èæ)"
 
-#: ../objects/UML/class_dialog.c:2034 ../objects/UML/uml.c:112
+#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
 msgid "Leaf (final)"
 msgstr ""
 
-#: ../objects/UML/class_dialog.c:2052
+#: ../objects/UML/class_operations_dialog.c:844
+#: ../objects/UML/umloperation.c:75
 msgid "Query"
 msgstr "æè"
 
-#: ../objects/UML/class_dialog.c:2085
+#: ../objects/UML/class_operations_dialog.c:888
 msgid "Parameters:"
 msgstr "åæï"
 
-#: ../objects/UML/class_dialog.c:2147
+#: ../objects/UML/class_operations_dialog.c:966
 msgid "Parameter data"
 msgstr "åæèæ"
 
-#: ../objects/UML/class_dialog.c:2179
+#: ../objects/UML/class_operations_dialog.c:999
 msgid "Def. value:"
 msgstr "åçåï"
 
-#: ../objects/UML/class_dialog.c:2219 ../objects/UML/umlparameter.c:34
+#: ../objects/UML/class_operations_dialog.c:1030
+msgid "Direction:"
+msgstr "æåï"
+
+#: ../objects/UML/class_operations_dialog.c:1035
+#: ../objects/UML/umlparameter.c:34
 msgid "Undefined"
 msgstr "æåç"
 
-#: ../objects/UML/class_dialog.c:2227 ../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:2236 ../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:2245 ../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_operations_dialog.c:1069
+msgid "_Operations"
+msgstr "éä(_O)"
+
+#: ../objects/UML/class_operations_dialog.c:1124
+msgid "Operation data"
+msgstr "éäèæ"
+
 #. Templates page:
-#: ../objects/UML/class_dialog.c:2610
+#: ../objects/UML/class_templates_dialog.c:368
 msgid "_Templates"
 msgstr "ææ(_T)"
 
-#: ../objects/UML/class_dialog.c:2616 ../sheets/UML.sheet.in.h:29
+#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
 msgid "Template class"
 msgstr "ææéå"
 
-#: ../objects/UML/class_dialog.c:2673
+#: ../objects/UML/class_templates_dialog.c:426
 msgid "Formal parameter data"
 msgstr "æååæèæ"
 
-#: ../objects/UML/classicon.c:128
-msgid "Boundary"
-msgstr "éç"
-
-#: ../objects/UML/classicon.c:140
-msgid "Is object"
-msgstr "æçä"
-
-#: ../objects/UML/component_feature.c:145 ../sheets/UML.sheet.in.h:14
+#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
 msgid "Facet"
 msgstr "Facet"
 
-#: ../objects/UML/component_feature.c:146 ../sheets/UML.sheet.in.h:26
+#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
 msgid "Receptacle"
 msgstr "Receptacle"
 
-#: ../objects/UML/component_feature.c:147 ../sheets/UML.sheet.in.h:13
+#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
 msgid "Event Source"
 msgstr "äääæ"
 
-#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:12
+#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
 msgid "Event Sink"
 msgstr "ääæéæ"
 
-#: ../objects/UML/constraint.c:125
+#: ../objects/UML/constraint.c:126
 msgid "Constraint:"
 msgstr "éåï"
 
-#: ../objects/UML/dependency.c:139
+#: ../objects/UML/dependency.c:137
 msgid "Show arrow:"
 msgstr "éççéï"
 
-#: ../objects/UML/implements.c:129
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
+#: ../objects/UML/implements.c:127 ../objects/UML/implements.c:129
 msgid "Interface:"
 msgstr "çéï"
 
-#: ../objects/UML/lifeline.c:144
+#: ../objects/UML/lifeline.c:164
 msgid "Draw focus of control:"
 msgstr "éçæåçéï"
 
-#: ../objects/UML/lifeline.c:146
+#: ../objects/UML/lifeline.c:166
 msgid "Draw destruction mark:"
 msgstr "éççåçèï"
 
-#: ../objects/UML/lifeline.c:417
+#: ../objects/UML/lifeline.c:534
 msgid "Add connection points"
 msgstr "ååéæé"
 
-#: ../objects/UML/lifeline.c:418
+#: ../objects/UML/lifeline.c:535
 msgid "Remove connection points"
 msgstr "åééæé"
 
-#: ../objects/UML/lifeline.c:422
+#: ../objects/UML/lifeline.c:536
+msgid "Increase connection points distance"
+msgstr "ååéæéèé"
+
+#: ../objects/UML/lifeline.c:537
+msgid "Decrease connection points distance"
+msgstr "æåéæéèé"
+
+#: ../objects/UML/lifeline.c:538
+msgid "Set default connection points distance"
+msgstr "èåéèéæéèé"
+
+#: ../objects/UML/lifeline.c:542
 msgid "UML Lifeline"
 msgstr "UML çåç"
 
-#: ../objects/UML/message.c:135
+#: ../objects/UML/message.c:136
 msgid "Call"
 msgstr "åå"
 
-#: ../objects/UML/message.c:136
+#: ../objects/UML/message.c:137
 msgid "Create"
 msgstr "åç"
 
-#: ../objects/UML/message.c:137
+#: ../objects/UML/message.c:138
 msgid "Destroy"
 msgstr "ææ"
 
-#: ../objects/UML/message.c:138
+#: ../objects/UML/message.c:139
 msgid "Simple"
 msgstr "çå"
 
-#: ../objects/UML/message.c:139
+#: ../objects/UML/message.c:140
 msgid "Return"
 msgstr "èå"
 
-#: ../objects/UML/message.c:140
+#: ../objects/UML/message.c:141
 msgid "Send"
 msgstr "éå"
 
-#: ../objects/UML/message.c:141
+#: ../objects/UML/message.c:142
 msgid "Recursive"
 msgstr "åç"
 
@@ -5003,606 +5532,528 @@ msgstr "åç"
 msgid "Message type:"
 msgstr "èæçéï"
 
-#: ../objects/UML/object.c:152
+#: ../objects/UML/object.c:150
 msgid "Explicit state"
 msgstr "æçççæ"
 
-#: ../objects/UML/object.c:157
+#: ../objects/UML/object.c:155
 msgid "Active object"
 msgstr "éäçä"
 
-#: ../objects/UML/object.c:159
+#: ../objects/UML/object.c:157
 msgid "Show attributes"
 msgstr "éçåæ"
 
-#: ../objects/UML/object.c:161
+#: ../objects/UML/object.c:159
 msgid "Multiple instance"
 msgstr "åååé"
 
-#: ../objects/UML/state.c:153
+#: ../objects/UML/state.c:148
 msgid "Entry action"
 msgstr "éçåä"
 
-#: ../objects/UML/state.c:154
+#: ../objects/UML/state.c:149
 msgid "Do action"
 msgstr "éèåä"
 
-#: ../objects/UML/state.c:155
+#: ../objects/UML/state.c:150
 msgid "Exit action"
 msgstr "çæåä"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:471
+#: ../objects/UML/state.c:487
 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 ""
 "éååèäççæ (State) çäèçåå/æççæã\n"
 "èééååæäççæäåæã\n"
 "èäçåå/æççæçääåäå\n"
 
-#: ../objects/UML/state_term.c:120
+#: ../objects/UML/state_term.c:126
 msgid "Is final"
 msgstr "ææçç"
 
-#: ../objects/UML/transition.c:132
+#: ../objects/UML/transition.c:141
 msgid "Trigger"
 msgstr "èç"
 
-#: ../objects/UML/transition.c:133
+#: ../objects/UML/transition.c:142
 msgid "The event that causes this transition to be taken"
 msgstr "éææèæçää"
 
-#: ../objects/UML/transition.c:134
+#: ../objects/UML/transition.c:143
 msgid "Action"
 msgstr "åä"
 
-#: ../objects/UML/transition.c:135
+#: ../objects/UML/transition.c:144
 msgid "Action to perform when this transition is taken"
 msgstr "çççæèææèéèçåä"
 
-#: ../objects/UML/transition.c:136 ../sheets/cisconetwork.sheet.in.h:43
+#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
 msgid "Guard"
 msgstr "åè"
 
-#: ../objects/UML/transition.c:137
+#: ../objects/UML/transition.c:146
 msgid "Condition for taking this transition when the event is fired"
 msgstr ""
 
-#: ../objects/UML/uml.c:66
-msgid "Unified Modelling Language diagram objects UML 1.3"
-msgstr "ãçäæåèèã(UML) åèçä 1.3"
-
-#: ../objects/UML/umlattribute.c:41 ../objects/UML/umlparameter.c:47
-msgid "Value"
-msgstr "å"
-
-#: ../objects/UML/umlattribute.c:45 ../objects/UML/umloperation.c:71
-msgid "Visibility"
-msgstr "åèå"
-
 #: ../objects/UML/umlattribute.c:47
 msgid "Abstract (?)"
 msgstr "æå  (?)"
 
-#: ../objects/UML/umlattribute.c:49 ../objects/UML/umloperation.c:77
+#: ../objects/UML/umlattribute.c:49
 msgid "Class scope (static)"
 msgstr "éåçåïéæï"
 
+#: ../objects/UML/uml.c:67
+msgid "Unified Modelling Language diagram objects UML 1.3"
+msgstr "ãçäæåèèã(UML) åèçä 1.3"
+
 #: ../objects/UML/umloperation.c:73
-msgid "Inheritance type"
-msgstr "çæéå"
+msgid "Inheritance"
+msgstr "çæ"
 
 #: ../objects/UML/umloperation.c:75
-msgid "Query (const)"
-msgstr "æè (const)"
+msgid "C++ const method"
+msgstr ""
 
-#: ../objects/UML/umloperation.c:79 ../objects/chronogram/chronoline.c:162
-msgid "Parameters"
-msgstr "åæ"
+#: ../objects/UML/umloperation.c:77
+msgid "Scope"
+msgstr "çå"
 
-#: ../objects/UML/usecase.c:132
-msgid "Text outside"
-msgstr "åéçæå"
+#: ../objects/UML/umloperation.c:77
+msgid "Class scope (C++ static method)"
+msgstr "éåçåïC++ éæææï"
 
-#: ../objects/UML/usecase.c:134
+#: ../objects/UML/usecase.c:131
 msgid "Collaboration"
-msgstr "åä"
+msgstr "åä"
 
-#: ../objects/bondgraph/bondgraph.c:39
-msgid "Bond graph objects"
-msgstr "Bond graph çä"
+#: ../objects/UML/usecase.c:133
+msgid "Text outside"
+msgstr "åéçæå"
 
-#: ../objects/chronogram/chronogram.c:40
-msgid "Chronogram diagram objects"
-msgstr "ãåäèãåèçä"
+#: ../plug-ins/cairo/diacairo.c:125 ../plug-ins/drs/dia-render-script.c:124
+#: ../plug-ins/hpgl/hpgl.c:710
+#, c-format
+msgid "Can't open output file %s."
+msgstr "çæéåèåæ %sã"
 
-#: ../objects/chronogram/chronoline.c:148 ../sheets/AADL.sheet.in.h:4
-msgid "Data"
-msgstr "èæ"
+#: ../plug-ins/cairo/diacairo.c:133
+#, c-format
+msgid ""
+"Can't convert output filename '%s' to locale encoding.\n"
+"Please choose a different name to save with Cairo.\n"
+msgstr ""
+"çæåèåææåç '%s' èæçååççã\n"
+"èæ Cairo éæåäåçååã\n"
 
-#: ../objects/chronogram/chronoline.c:150
-msgid "Data name"
-msgstr "èæåç"
+#: ../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"
 
-#: ../objects/chronogram/chronoline.c:152
-msgid "Events"
-msgstr "ää"
+#: ../plug-ins/cairo/diacairo.c:334
+msgid "Clipboard copy failed"
+msgstr "åèçèèåæ"
 
-#: ../objects/chronogram/chronoline.c:155
-msgid "Event specification"
-msgstr "ääèæ"
+#
+#: ../plug-ins/cairo/diacairo.c:361 ../plug-ins/postscript/postscript.c:39
+#: ../plug-ins/wmf/wmf.cpp:1503
+msgid "Nothing to print"
+msgstr "çæèåå"
 
-#: ../objects/chronogram/chronoline.c:156
-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"
+#: ../plug-ins/cairo/diacairo.c:378
+msgid "Cairo PostScript"
 msgstr ""
-"@ æé      èåæææçåæéã\n"
-"( çéæé  èåäèååïäçåãçéæéãã\n"
-") çéæé  èåäèåæïäçåãçéæéãã\n"
-"u çéæé  èåäèçãæçãïäçåãçéæéãã\n"
-"äåï@ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:164
-#: ../objects/chronogram/chronoref.c:146
-msgid "Start time"
-msgstr "éåæé"
+#: ../plug-ins/cairo/diacairo.c:389
+msgid "Cairo Portable Document Format"
+msgstr "Cairo åæåæäæå"
 
-#: ../objects/chronogram/chronoline.c:166
-#: ../objects/chronogram/chronoref.c:148
-msgid "End time"
-msgstr "çææé"
+#: ../plug-ins/cairo/diacairo.c:401
+msgid "Cairo Scalable Vector Graphics"
+msgstr "Cairo åçæåéå (SVG)"
 
-#: ../objects/chronogram/chronoline.c:168
-msgid "Rise time"
-msgstr "äåæé"
+#: ../plug-ins/cairo/diacairo.c:413
+msgid "CairoScript"
+msgstr ""
 
-#: ../objects/chronogram/chronoline.c:170
-msgid "Fall time"
-msgstr "äéæé"
+#: ../plug-ins/cairo/diacairo.c:424
+msgid "Cairo PNG"
+msgstr "Cairo PNG"
 
-#: ../objects/chronogram/chronoline.c:171
-msgid "Multi-bit data"
-msgstr "åäåèæ"
+#: ../plug-ins/cairo/diacairo.c:432
+msgid "Cairo PNG (with alpha)"
+msgstr "Cairo PNG (å alpha)"
 
-#: ../objects/chronogram/chronoline.c:173
-#: ../objects/chronogram/chronoref.c:156
-msgid "Aspect"
-msgstr "åéæ"
+#: ../plug-ins/cairo/diacairo.c:442
+msgid "Cairo EMF"
+msgstr "Cairo EMF"
 
-#: ../objects/chronogram/chronoline.c:175
-msgid "Data color"
-msgstr "èæéè"
+#: ../plug-ins/cairo/diacairo.c:452
+msgid "Cairo WMF"
+msgstr "Cairo WMF"
 
-#: ../objects/chronogram/chronoline.c:177
-msgid "Data line width"
-msgstr "èæèå"
+#: ../plug-ins/cairo/diacairo.c:466
+msgid "Cairo Clipboard Copy"
+msgstr "Cairo åèçèè"
 
-#: ../objects/chronogram/chronoref.c:144
-msgid "Time data"
-msgstr "æéèæ"
+#: ../plug-ins/cairo/diacairo.c:480
+msgid "Copy _Diagram"
+msgstr "èèåè(_D)"
 
-#: ../objects/chronogram/chronoref.c:150
-msgid "Major time step"
-msgstr "äèååçæééå"
+#: ../plug-ins/cairo/diacairo.c:489
+msgid "Print (GTK) â"
+msgstr "åå (GTK) â"
 
-#: ../objects/chronogram/chronoref.c:152
-msgid "Minor time step"
-msgstr "çååçæééå"
+#: ../plug-ins/cairo/diacairo.c:537
+msgid "Cairo-based Rendering"
+msgstr "åæ Cairo çèè"
 
-#: ../objects/chronogram/chronoref.c:162
-msgid "Minor step line width"
-msgstr "çååççæåå"
+#: ../plug-ins/cairo/diacairo-interactive.c:406
+#: ../plug-ins/cairo/diacairo-interactive.c:407
+msgid "Zoom pointer"
+msgstr "çææé"
+
+#: ../plug-ins/cairo/diacairo-interactive.c:413
+#: ../plug-ins/cairo/diacairo-interactive.c:414
+msgid "Visible rect pointer"
+msgstr "åèçåæé"
+
+#: ../plug-ins/cairo/diacairo-renderer.c:869
+#: ../plug-ins/cairo/diacairo-renderer.c:904 ../plug-ins/cgm/cgm.c:1126
+#: ../plug-ins/libart/dialibartrenderer.c:1325
+#: ../plug-ins/metapost/render_metapost.c:1108
+#: ../plug-ins/postscript/diapsrenderer.c:718
+#: ../plug-ins/pstricks/render_pstricks.c:826 ../plug-ins/wpg/wpg.c:892
+msgid "Not enough memory for image drawing."
+msgstr "èæéäèåççååã"
+
+#: ../plug-ins/cgm/cgm.c:1119
+msgid ""
+"Image row length larger than maximum cell array.\n"
+"Image not exported to CGM."
+msgstr ""
+"ååéååææåååéåéåã\n"
+"ååäæååè CGMã"
 
-#: ../objects/custom/custom.c:117
-msgid "Custom"
-msgstr "èé"
+#: ../plug-ins/cgm/cgm.c:1383
+msgid "Computer Graphics Metafile"
+msgstr "éèååääæ (CGM)"
 
-#: ../objects/custom/custom.c:117
-msgid "Custom XML shapes loader"
-msgstr "èé XML ååèåçå"
+#: ../plug-ins/cgm/cgm.c:1408
+msgid "Computer Graphics Metafile export filter"
+msgstr "éèååääæ (CGM) ååéæå"
 
-#: ../objects/custom/custom_object.c:178 ../objects/custom/custom_object.c:203
-msgid "Flip horizontal"
-msgstr "äçæåéå"
+#: ../plug-ins/drs/dia-render-script.c:158
+#: ../plug-ins/drs/dia-render-script.c:163
+msgid "DiaRenderScript"
+msgstr "DiaRenderScript"
 
-#: ../objects/custom/custom_object.c:180 ../objects/custom/custom_object.c:205
-msgid "Flip vertical"
-msgstr "äçåçéå"
+#: ../plug-ins/drs/dia-render-script.c:187
+msgid "DiaRenderScript filter"
+msgstr "DiaRenderScript éæå"
 
-#: ../objects/custom/custom_object.c:1442
-msgid "Flip Horizontal"
-msgstr "äçæåéå"
+#: ../plug-ins/drs/dia-render-script-import.c:224
+msgid "Broken file?"
+msgstr "ææææäï"
 
-#: ../objects/custom/custom_object.c:1443
-msgid "Flip Vertical"
-msgstr "äçåçéå"
+#: ../plug-ins/dxf/dxf.c:50
+msgid "Drawing Interchange File import and export filters"
+msgstr "çåäææ (DIF) åå/ååéæå"
 
-#: ../objects/custom/custom_object.c:1480
-#, c-format
-msgid "Cannot open icon file %s for object type '%s'."
-msgstr "çæéåçäéåâ%2$sâæççåçæ %1$sã"
+#: ../plug-ins/dxf/dxf-export.c:655 ../plug-ins/dxf/dxf-import.c:1389
+msgid "Drawing Interchange File"
+msgstr "çåäææ (DIF)"
 
-#: ../objects/custom/shape_info.c:129
+#: ../plug-ins/dxf/dxf-import.c:1299
 #, c-format
-msgid ""
-"The file '%s' has invalid path data.\n"
-"svg:path data must start with moveto."
-msgstr ""
+msgid "read_dxf_codes failed on '%s'"
+msgstr "'%s' äç read_dxf_codes åæ"
 
-#: ../objects/flowchart/box.c:150 ../objects/standard/box.c:150
-#: ../objects/standard/polyline.c:134 ../objects/standard/zigzagline.c:130
-msgid "Corner radius"
-msgstr "èèåå"
+#: ../plug-ins/dxf/dxf-import.c:1306
+#, c-format
+msgid "Binary DXF from '%s' not supported"
+msgstr "äææäè '%s' çäéä DXF"
 
-#: ../objects/flowchart/flowchart.c:37
-msgid "Flowchart objects"
-msgstr "æçåçä"
+#: ../plug-ins/hpgl/hpgl.c:753
+msgid "HP Graphics Language"
+msgstr "HP ååèè (HP-GL)"
 
-#: ../objects/flowchart/parallelogram.c:152
-msgid "Shear angle"
-msgstr "åèè"
+#: ../plug-ins/hpgl/hpgl.c:778
+msgid "HP Graphics Language export filter"
+msgstr "HP ååèè (HP-GL) ååéæå"
 
-#: ../objects/network/basestation.c:135
-msgid "Sectors"
+#: ../plug-ins/layout/layout.cpp:228
+msgid "Please select edges and nodes to layout."
 msgstr ""
 
-#: ../objects/network/basestation.c:396 ../objects/network/basestation.c:398
-msgid "Base Station"
-msgstr "ååå"
+#: ../plug-ins/layout/layout.cpp:233
+msgid "Graph creation failed"
+msgstr "åèåçåæ"
 
-#: ../objects/network/bus.c:611
-msgid "Add Handle"
-msgstr "ååæåé"
+#: ../plug-ins/layout/layout.cpp:259
+msgid "No such module."
+msgstr "çææçã"
 
-#: ../objects/network/bus.c:612
-msgid "Delete Handle"
-msgstr "åéæåé"
+#: ../plug-ins/layout/layout.cpp:260
+msgid "Out of memory."
+msgstr "èæéäèã"
 
-#: ../objects/network/network.c:43
-msgid "Network diagram objects"
-msgstr "çèåèçä"
+#: ../plug-ins/layout/layout.cpp:261
+msgid "Not a tree."
+msgstr ""
 
-#: ../objects/network/radiocell.c:119
-msgid "Radius"
-msgstr "åå"
+#: ../plug-ins/layout/layout.cpp:262
+msgid "Not a forest."
+msgstr ""
 
-#: ../objects/network/wanlink.c:117
-msgid "Width"
-msgstr "åå"
+#: ../plug-ins/layout/layout.cpp:263
+msgid "Failed algorithm."
+msgstr "æçæåæã"
 
-#: ../objects/standard/arc.c:140
-msgid "Curve distance"
-msgstr "æçèé"
+#: ../plug-ins/layout/layout.cpp:264
+msgid "Failed precondition."
+msgstr "éèæäåæã"
 
-#: ../objects/standard/bezier.c:137 ../objects/standard/line.c:141
-#: ../objects/standard/polyline.c:135
-msgid "Line gaps"
-msgstr "ççé"
+#: ../plug-ins/layout/layout.cpp:265
+msgid "OGDF crashed."
+msgstr "OGCD çæã"
 
-#: ../objects/standard/bezier.c:139 ../objects/standard/line.c:143
-#: ../objects/standard/polyline.c:137
-msgid "Absolute start gap"
-msgstr "çåéåçé"
+#: ../plug-ins/layout/layout.cpp:266
+msgid "Unknown reason"
+msgstr "äèçç"
 
-#: ../objects/standard/bezier.c:141 ../objects/standard/line.c:145
-#: ../objects/standard/polyline.c:139
-msgid "Absolute end gap"
-msgstr "çåçæçé"
+#: ../plug-ins/layout/layout.cpp:268
+#, c-format
+msgid ""
+"Layout '%s' failed.\n"
+"%s"
+msgstr ""
+"éç '%s' åæã\n"
+"%s"
 
-#: ../objects/standard/bezier.c:698 ../objects/standard/beziergon.c:482
-msgid "Add Segment"
-msgstr "åååæ"
+#: ../plug-ins/layout/layout.cpp:409
+msgid "OGDF Layout Algorithms"
+msgstr "OGDF éçæçæ"
 
-#: ../objects/standard/bezier.c:699 ../objects/standard/beziergon.c:483
-msgid "Delete Segment"
-msgstr "åéåæ"
+#: ../plug-ins/libart/dialibart.c:58
+msgid "Libart-based rendering"
+msgstr "åæ Libart çèè"
 
-#: ../objects/standard/bezier.c:701 ../objects/standard/beziergon.c:485
-msgid "Symmetric control"
-msgstr "åçæå"
+#: ../plug-ins/libart/dialibartrenderer.c:1476
+msgid "Renderer transformation"
+msgstr ""
 
-#: ../objects/standard/bezier.c:703 ../objects/standard/beziergon.c:487
-msgid "Smooth control"
-msgstr "åææå"
+#: ../plug-ins/libart/dialibartrenderer.c:1477
+msgid "Transform pointer"
+msgstr "èææé"
 
-#: ../objects/standard/bezier.c:705 ../objects/standard/beziergon.c:489
-msgid "Cusp control"
-msgstr "çéæå"
+#: ../plug-ins/libart/export_png.c:159 ../plug-ins/xslt/xslt.c:101
+#, c-format
+msgid "Can't open output file %s: %s\n"
+msgstr "çæéåèåæ %sï%s\n"
 
-#: ../objects/standard/box.c:137 ../objects/standard/ellipse.c:131
-msgid "Free"
-msgstr "èç"
+#: ../plug-ins/libart/export_png.c:167
+msgid "Could not create PNG write structure"
+msgstr "çæçç PNG ååçæ"
 
-#: ../objects/standard/box.c:138 ../objects/standard/ellipse.c:132
-msgid "Fixed"
-msgstr "åå"
+#: ../plug-ins/libart/export_png.c:176
+msgid "Could not create PNG header info structure"
+msgstr "çæçç PNG æéèèçæ"
 
-#: ../objects/standard/box.c:139 ../objects/standard/box.c:694
-msgid "Square"
-msgstr "æå"
+#: ../plug-ins/libart/export_png.c:184
+msgid "Error occurred while writing PNG"
+msgstr "çåå PNG æççéè"
 
-#: ../objects/standard/box.c:152 ../objects/standard/ellipse.c:144
-msgid "Aspect ratio"
-msgstr "åéæ"
+#. Create a dialog
+#: ../plug-ins/libart/export_png.c:328
+msgid "PNG Export Options"
+msgstr "PNG ååéé"
 
-#: ../objects/standard/box.c:690 ../objects/standard/ellipse.c:668
-msgid "Free aspect"
-msgstr "èçåéæ"
+#: ../plug-ins/libart/export_png.c:334
+msgid "Image width:"
+msgstr "ååååï"
 
-#: ../objects/standard/box.c:692 ../objects/standard/ellipse.c:670
-msgid "Fixed aspect"
-msgstr "åååéæ"
+#: ../plug-ins/libart/export_png.c:337
+msgid "Image height:"
+msgstr "ååéåï"
 
-#: ../objects/standard/ellipse.c:133 ../objects/standard/ellipse.c:672
-msgid "Circle"
-msgstr "åå"
+#: ../plug-ins/libart/export_png.c:383
+msgid "PNG (antialiased)"
+msgstr "PNG (åæå)"
 
-#: ../objects/standard/image.c:132
-msgid "Image file"
-msgstr "ååæ"
+#: ../plug-ins/metapost/metapost.c:46
+msgid "TeX Metapost export filter"
+msgstr "TeX Metapost ååéæå"
 
-#: ../objects/standard/image.c:134
-msgid "Draw border"
-msgstr "çèéç"
+#: ../plug-ins/metapost/render_metapost.c:1267
+msgid "TeX Metapost macros"
+msgstr "TeX Metapost åé"
 
-#: ../objects/standard/image.c:136
-msgid "Keep aspect ratio"
-msgstr "äæåéæ"
+#: ../plug-ins/pdf/pdf.c:30
+#, fuzzy
+#| msgid "Cairo Portable Document Format"
+msgid "Portable Document File"
+msgstr "Cairo åæåæäæå"
 
-#. Found file in same dir as diagram.
-#. Found file in current dir.
-#: ../objects/standard/image.c:679 ../objects/standard/image.c:690
+#: ../plug-ins/pdf/pdf.c:44
+#, fuzzy
+#| msgid "WMF export filter"
+msgid "PDF import filter"
+msgstr "WMF ååéæå"
+
+#: ../plug-ins/pdf/pdf-import.cpp:311
+#, fuzzy, c-format
+#| msgid "Pager"
+msgid "Page %d"
+msgstr "ååå"
+
+#: ../plug-ins/pdf/pdf-import.cpp:706
 #, c-format
 msgid ""
-"The image file '%s' was not found in that directory.\n"
-"Using the file '%s' instead\n"
+"PDF document not OK.\n"
+"%s"
 msgstr ""
-"åèçéäæäåååæâ%sâã\n"
-"æçææâ%sâ\n"
-
-#. Didn't find file in current dir.
-#: ../objects/standard/image.c:696 ../objects/standard/image.c:718
-#, c-format
-msgid "The image file '%s' was not found.\n"
-msgstr "æäåååæâ%sâã\n"
-
-#: ../objects/standard/line.c:132
-msgid "Arrows"
-msgstr "çé"
-
-#: ../objects/standard/line.c:137
-msgid "Start point"
-msgstr "èé"
-
-#: ../objects/standard/line.c:139
-msgid "End point"
-msgstr "çé"
-
-#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:577
-msgid "Add Corner"
-msgstr "ååèè"
 
-#: ../objects/standard/polygon.c:461 ../objects/standard/polyline.c:578
-msgid "Delete Corner"
-msgstr "åéèè"
+#: ../plug-ins/pgf/pgf.c:26
+msgid "LaTeX PGF export filter"
+msgstr "LaTeX PGF ååéæå"
 
-#: ../objects/standard/standard.c:45
-msgid "Standard objects"
-msgstr "ææçä"
+#: ../plug-ins/pgf/render_pgf.c:1112
+#: ../plug-ins/pstricks/render_pstricks.c:733
+msgid "Not valid UTF-8"
+msgstr "éææç UTF-8"
 
-#: ../objects/standard/textobj.c:134
-msgid "First Line"
-msgstr "çäæç"
+#: ../plug-ins/pgf/render_pgf.c:1268
+msgid "LaTeX PGF macros"
+msgstr "LaTeX PGF åé"
 
-#: ../objects/standard/textobj.c:141
-msgid "Vertical text alignment"
-msgstr "åçåéæå"
+#: ../plug-ins/pixbuf/pixbuf.c:86
+msgid "Failed to create pixbuf from drawable."
+msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:976
+#: ../plug-ins/pixbuf/pixbuf.c:91
 #, c-format
 msgid ""
-"Can't convert output filename '%s' to locale encoding.\n"
-"Please choose a different name to save with cairo.\n"
+"Could not save file:\n"
+"%s"
 msgstr ""
-"çæåèåææåç '%s' èæçååççã\n"
-"èæ cairo éæåäåçååã\n"
+"çæååææï\n"
+"%s"
 
-#: ../plug-ins/cairo/diacairo.c:1094
-msgid "Cairo PostScript"
+#: ../plug-ins/pixbuf/pixbuf.c:112
+msgid "Calling error, missing user_data."
 msgstr ""
 
-#: ../plug-ins/cairo/diacairo.c:1105
-msgid "Cairo Portable Document Format"
-msgstr "Cairo åæåæäæå"
-
-#: ../plug-ins/cairo/diacairo.c:1116
-msgid "Cairo Scalable Vector Graphics"
-msgstr "Cairo åçæåéå (SVG)"
-
-#: ../plug-ins/cairo/diacairo.c:1126
-msgid "Cairo PNG"
-msgstr "Cairo PNG"
-
-#: ../plug-ins/cairo/diacairo.c:1134
-msgid "Cairo PNG (with alpha)"
-msgstr "Cairo PNG (å alpha)"
-
-#: ../plug-ins/cairo/diacairo.c:1144
-msgid "Cairo WMF"
-msgstr "Cairo WMF"
-
-#: ../plug-ins/cairo/diacairo.c:1153
-msgid "Cairo old WMF"
-msgstr "Cairo èå WMF"
-
-#: ../plug-ins/cairo/diacairo.c:1162
-msgid "Cairo Clipboard"
-msgstr "Cairo åèç"
-
-#: ../plug-ins/cairo/diacairo.c:1211
-msgid "Cairo based Rendering"
-msgstr "åæ Cairo çèè"
-
-#: ../plug-ins/cgm/cgm.c:1105
+#: ../plug-ins/pixbuf/pixbuf.c:141
+#, c-format
 msgid ""
-"Image row length larger than maximum cell array.\n"
-"Image not exported to CGM."
+"Pixbuf[%s] can't load:\n"
+"%s"
 msgstr ""
-"ååéååææåååéåéåã\n"
-"ååäæååè CGMã"
+"Pixbuf[%s] çæèåï\n"
+"%s"
 
-#: ../plug-ins/cgm/cgm.c:1360
-msgid "Computer Graphics Metafile"
-msgstr "éèååääæ (CGM)"
+#: ../plug-ins/pixbuf/pixbuf.c:196
+msgid "gdk-pixbuf-based bitmap export/import"
+msgstr "ä gdk-pixbuf çåççééååå/ååéæå"
 
-#: ../plug-ins/cgm/cgm.c:1385
-msgid "Computer Graphics Metafile export filter"
-msgstr "éèååääæ (CGM) ååéæå"
+#: ../plug-ins/postscript/paginate_psprint.c:273
+msgid "Select Printer"
+msgstr "éååèæ"
 
-#: ../plug-ins/dxf/dxf-export.c:528 ../plug-ins/dxf/dxf-import.c:1387
-msgid "Drawing Interchange File"
-msgstr "çåäææ (DIF)"
+#: ../plug-ins/postscript/paginate_psprint.c:285
+#: ../sheets/ciscocomputer.sheet.in.h:37
+msgid "Printer"
+msgstr "åèæ"
 
-#: ../plug-ins/dxf/dxf-import.c:482 ../plug-ins/dxf/dxf-import.c:499
-msgid "Bad vertex bulge\n"
-msgstr "ééåèçå\n"
+#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
+msgid "File"
+msgstr "ææ"
 
-#: ../plug-ins/dxf/dxf-import.c:1049
+#: ../plug-ins/postscript/paginate_psprint.c:464
 #, c-format
-msgid "Scale: %f\n"
-msgstr "æäï%f\n"
+msgid "Could not run command '%s': %s"
+msgstr "çæåèæäâ%sâï%s"
 
-#: ../plug-ins/dxf/dxf-import.c:1314
+#: ../plug-ins/postscript/paginate_psprint.c:467
 #, c-format
-msgid "read_dxf_codes failed on '%s'\n"
-msgstr "'%s' äç read_dxf_codes åæ\n"
+msgid "Could not open '%s' for writing: %s"
+msgstr "çæéåâ%sâäååèæï%s"
 
-#: ../plug-ins/dxf/dxf-import.c:1322
+#: ../plug-ins/postscript/paginate_psprint.c:489
 #, c-format
-msgid "Binary DXF from '%s' not supported\n"
-msgstr "äææäè '%s' çäéä DXF\n"
+msgid "Printing error: command '%s' returned %d\n"
+msgstr "ååéèïæäâ%sâåå %d\n"
 
-#: ../plug-ins/dxf/dxf-import.c:1353
+#: ../plug-ins/postscript/paginate_psprint.c:500
 #, c-format
-msgid "Unknown dxf code %d\n"
-msgstr "äçåç dxf ç %d\n"
+msgid "Printing error: command '%s' caused sigpipe."
+msgstr "ååéèïæäâ%sâéæ sigpipeã"
 
-#: ../plug-ins/dxf/dxf.c:50
-msgid "Drawing Interchange File import and export filters"
-msgstr "çåäææ (DIF) åå/ååéæå"
+#: ../plug-ins/postscript/postscript.c:47
+msgid "Print (PS)"
+msgstr "åå (PS)"
 
-#: ../plug-ins/gprint/diagnomeprint.c:81
-#, c-format
-msgid ""
-"GNOME Print Backend\n"
-" '%s'\n"
-" not available"
+#: ../plug-ins/postscript/postscript.c:82
+msgid "PostScript Rendering"
 msgstr ""
-"GNOME åååççå\n"
-"â%sâ\n"
-"çæäç"
-
-#: ../plug-ins/gprint/diagnomeprint.c:112
-msgid "GNOME PostScript"
-msgstr "GNOME PostScript"
-
-#: ../plug-ins/gprint/diagnomeprint.c:121
-msgid "GNOME Portable Document Format"
-msgstr "GNOME åæåæäæå"
-
-#: ../plug-ins/gprint/diagnomeprint.c:131
-msgid "GNOME Scalable Vector Graphic"
-msgstr "GNOME åçæåéå"
-
-#: ../plug-ins/gprint/diagnomeprint.c:164
-msgid "GNOME Print based Rendering"
-msgstr "åæ GNOME ååçèè"
-
-#: ../plug-ins/hpgl/hpgl.c:751
-msgid "HP Graphics Language"
-msgstr "HP ååèè (HP-GL)"
-
-#: ../plug-ins/hpgl/hpgl.c:776
-msgid "HP Graphics Language export filter"
-msgstr "HP ååèè (HP-GL) ååéæå"
-
-#: ../plug-ins/metapost/metapost.c:46
-msgid "TeX Metapost export filter"
-msgstr "TeX Metapost ååéæå"
-
-#: ../plug-ins/metapost/render_metapost.c:1262
-msgid "TeX Metapost macros"
-msgstr "TeX Metapost åé"
-
-#: ../plug-ins/pgf/pgf.c:26
-msgid "LaTeX PGF export filter"
-msgstr "LaTeX PGF ååéæå"
-
-#: ../plug-ins/pgf/render_pgf.c:1112
-#: ../plug-ins/pstricks/render_pstricks.c:733
-msgid "Not valid UTF8"
-msgstr "éææç UTF8"
 
-#: ../plug-ins/pgf/render_pgf.c:1277
-msgid "LaTeX PGF macros"
-msgstr "LaTeX PGF åé"
+#: ../plug-ins/postscript/render_eps.c:168
+msgid "Encapsulated PostScript (using Pango fonts)"
+msgstr "åèå PostScriptïäç Pango ååï"
 
-#: ../plug-ins/pixbuf/pixbuf.c:93
-#, c-format
-msgid ""
-"Could not save file:\n"
-"%s\n"
-"%s"
-msgstr ""
-"çæååææï\n"
-"%s\n"
-"%s"
+#: ../plug-ins/postscript/render_eps.c:177
+msgid "Encapsulated Postscript with preview (using Pango fonts)"
+msgstr "åèå Postscript èéèïäç Pango ååï"
 
-#: ../plug-ins/pixbuf/pixbuf.c:199
-msgid "gdk-pixbuf based bitmap export/import"
-msgstr "ä gdk-pixbuf çåççééååå/ååéæå"
+#: ../plug-ins/postscript/render_eps.c:187
+msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
+msgstr "åèå PostScriptïäç PostScript Latin-1 ååï"
 
 #: ../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:995
 msgid "TeX PSTricks macros"
 msgstr "TeX PSTricks åé"
 
-#: ../plug-ins/python/pydia-render.c:719
+#: ../plug-ins/python/pydia-render.c:1118
 #, c-format
 msgid "Couldn't open '%s' for writing.\n"
 msgstr "çæéåâ%sâäååèæã\n"
 
-#: ../plug-ins/python/python.c:96
+#: ../plug-ins/python/python.c:95
 msgid "Python scripting support"
 msgstr "Python åäçææ"
 
-#: ../plug-ins/shape/shape-export.c:477
-msgid "Can't export png without libart!"
-msgstr "çæåææ libart çææäååæç pngï"
+#: ../plug-ins/shape/shape.c:36
+msgid "Dia shape export filter"
+msgstr "Dia ååååéæå"
 
-#: ../plug-ins/shape/shape-export.c:502
-msgid "Dia Shape File"
-msgstr "Dia åçææ"
+#: ../plug-ins/shape/shape-export.c:525
+msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
+msgstr "ååæåéä .shape çåïåå Dia çæèå"
 
-#: ../plug-ins/shape/shape.c:36
-msgid "dia shape export filter"
-msgstr "dia åçååéæå"
+#: ../plug-ins/shape/shape-export.c:539
+msgid "Can't export PNG icon without export plugin!"
+msgstr "çæåææåååææççææäååæç PNGï"
 
-#: ../plug-ins/svg/render_svg.c:294 ../plug-ins/svg/svg-import.c:676
-msgid "Scalable Vector Graphics"
-msgstr "åçæåéå (SVG)"
+#: ../plug-ins/shape/shape-export.c:565
+msgid "Dia Shape File"
+msgstr "Dia ååææ"
+
+#: ../plug-ins/svg/svg.c:50
+msgid "Scalable Vector Graphics import and export filters"
+msgstr "åçæåéå (SVG) åå/ååéæå"
 
-#: ../plug-ins/svg/svg-import.c:195
+#: ../plug-ins/svg/svg-import.c:387
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -5610,973 +6061,1021 @@ msgstr ""
 "èåèæçæã\n"
 "svg:èåèæéä moveto ééã"
 
-#: ../plug-ins/svg/svg-import.c:637
+#: ../plug-ins/svg/svg-import.c:1224
+msgid "'Shape Design' shapes missing."
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1258
+#, c-format
+msgid "Object '%s' creation failed"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1280
+#, c-format
+msgid ""
+"Parse error for memory block.\n"
+"%s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1293 ../plug-ins/vdx/vdx-import.c:2888
+#, c-format
+msgid "Parse error for %s"
+msgstr ""
+
+#: ../plug-ins/svg/svg-import.c:1325
 msgid "Expected SVG Namespace not found in file"
 msgstr "ææäæäåéæç SVG ååçé"
 
-#: ../plug-ins/svg/svg-import.c:657
+#: ../plug-ins/svg/svg-import.c:1345
 #, 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) åå/ååéæå"
-
-#: ../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.c:54
+msgid "Visio XML Format import and export filter"
+msgstr "Visio XML æååå/ååéæå"
 
-#: ../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:219 ../plug-ins/xfig/xfig-import.c:1036
+#: ../plug-ins/vdx/vdx-import.c:222
 #, c-format
-msgid "Couldn't read color: %s\n"
-msgstr "çæèåéèï%s\n"
+msgid "Couldn't read color: %s"
+msgstr "çæèåéèï%s"
 
-#: ../plug-ins/vdx/vdx-import.c:513
+#: ../plug-ins/vdx/vdx-import.c:536
 #, c-format
-msgid "Couldn't find shape %d\n"
-msgstr "æäå %d åç\n"
+msgid "Couldn't find shape %d"
+msgstr "æäå %d åå"
 
-#: ../plug-ins/vdx/vdx-import.c:982
+#: ../plug-ins/vdx/vdx-import.c:1012
 #, c-format
-msgid "Unexpected Ellipse object: %s\n"
-msgstr "ééæçæåçäï%s\n"
+msgid "Unexpected Ellipse object: %s"
+msgstr "ééæçæåçäï%s"
 
-#: ../plug-ins/vdx/vdx-import.c:996
-msgid "Can't rotate ellipse\n"
-msgstr "çææèæå\n"
+#: ../plug-ins/vdx/vdx-import.c:1026
+msgid "Can't rotate ellipse"
+msgstr "çææèæå"
 
-#: ../plug-ins/vdx/vdx-import.c:1312
-msgid "MoveTo not at start of Bezier\n"
-msgstr ""
+#: ../plug-ins/vdx/vdx-import.c:1357
+msgid "MoveTo not at start of Bezier"
+msgstr "èèæçééäé MoveTo"
 
-#: ../plug-ins/vdx/vdx-import.c:1645
+#: ../plug-ins/vdx/vdx-import.c:1707
 msgid "Invalid NURBS formula"
 msgstr "NURBS æçåçæ"
 
-#: ../plug-ins/vdx/vdx-import.c:1881
-#, c-format
-msgid "Couldn't write file %s"
-msgstr "çæååææ %s"
-
-#: ../plug-ins/vdx/vdx-import.c:1966 ../plug-ins/vdx/vdx-import.c:1979
+#: ../plug-ins/vdx/vdx-import.c:1965
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "çæèçåäçäéå %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2007
+#: ../plug-ins/vdx/vdx-import.c:2899
+msgid "Nothing in document!"
+msgstr "æäçååï"
+
+#: ../plug-ins/vdx/vdx-import.c:2904
 #, c-format
-msgid "Couldn't make object dir %s"
-msgstr "çæèåèäçäçé %s"
+msgid "Expecting VisioDocument, got %s"
+msgstr "éæçæ VisioDocumentïååçæ %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2954
+#: ../plug-ins/vdx/vdx-import.c:2988
 msgid "Visio XML File Format"
 msgstr "Visio XML æææå"
 
-#: ../plug-ins/vdx/vdx-xml.c:3344
+#: ../plug-ins/vdx/vdx-xml.c:3343
 #, c-format
 msgid "Can't decode object %s"
 msgstr "çæççä %s èç"
 
-#: ../plug-ins/vdx/vdx-xml.c:5125
+#: ../plug-ins/wmf/wmf.cpp:316
 #, 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 æååå/ååéæå"
+msgid ""
+"Couldn't write file %s\n"
+"%s"
+msgstr ""
+"çæååææ %s\n"
+"%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1187
+#: ../plug-ins/wmf/wmf.cpp:566
 #, c-format
-msgid "Couldn't open: '%s' for writing.\n"
-msgstr "çæéåâ%sâäååèæã\n"
-
-#: ../plug-ins/wmf/wmf.cpp:1272
-msgid "Windows Meta File"
-msgstr "Windows ååæ (WMF)"
+msgid ""
+"Cannot render unknown font:\n"
+"%s"
+msgstr ""
 
-#: ../plug-ins/wmf/wmf.cpp:1281
-msgid "Enhanced Meta File"
-msgstr "åååååæ (EMF)"
+#: ../plug-ins/wmf/wmf.cpp:1514
+msgid "Print (GDI) ..."
+msgstr "åå (GDI) ..."
 
-#: ../plug-ins/wmf/wmf.cpp:1297
+#: ../plug-ins/wmf/wmf.cpp:1530
 msgid "WMF export filter"
 msgstr "WMF ååéæå"
 
-#: ../plug-ins/wpg/wpg.c:1190
+#: ../plug-ins/wpg/wpg.c:1198
 #, 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:1328 ../plug-ins/wpg/wpg.c:1335
 msgid "WPG"
-msgstr ""
+msgstr "WPG"
 
-#: ../plug-ins/wpg/wpg.c:1356
+#: ../plug-ins/wpg/wpg.c:1363
 msgid "WordPerfect Graphics export filter"
 msgstr "WordPerfect ååååéæå"
 
-#: ../plug-ins/xfig/xfig-export.c:461
-#, c-format
-msgid "FIG format has no equivalent of arrow style %s, using simple arrow.\n"
-msgstr "FIG æåäåçéæå %sïäçæéçéã\n"
-
-#: ../plug-ins/xfig/xfig-export.c:483
+#: ../plug-ins/xfig/xfig.c:52
+msgid "Fig Format import and export filter"
+msgstr "Fig æååå/ååéæå"
+
+#: ../plug-ins/xfig/xfig-export.c:464
+#, c-format
+msgid "Fig format has no equivalent of arrow style %s; using simple arrow.\n"
+msgstr "Fig æåäåçéæå %sïäçæéçéã\n"
+
+#: ../plug-ins/xfig/xfig-export.c:487
 msgid "No more user-definable colors - using black"
 msgstr "åçäçèååççèå â äçéè"
 
-#: ../plug-ins/xfig/xfig-export.c:1188
-#, fuzzy
-msgid "XFig format"
-msgstr "XFig æå"
+#: ../plug-ins/xfig/xfig-export.c:1214
+msgid "Xfig format"
+msgstr "Xfig æå"
 
-#: ../plug-ins/xfig/xfig-import.c:111
+#: ../plug-ins/xfig/xfig-import.c:109
 #, c-format
-msgid "Color index %d too high, only 512 colors allowed. Using black instead."
-msgstr "èåçå %d åéïååè 512 èãæçäçéèã"
+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:140
 msgid "Patterns are not supported by Dia"
 msgstr "Dia äæææå (Pattern)"
 
-#: ../plug-ins/xfig/xfig-import.c:166
-msgid "Triple-dotted lines are not supported by Dia, using double-dotted"
-msgstr "Dia äææäéèçïèäçåéèç"
+#: ../plug-ins/xfig/xfig-import.c:168
+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:172
 #, c-format
-msgid "Line style %d should not appear\n"
-msgstr "äæåççææå %d\n"
+msgid "Line style %d should not appear"
+msgstr "äæåççææå %d"
 
-#: ../plug-ins/xfig/xfig-import.c:238
+#: ../plug-ins/xfig/xfig-import.c:244
 #, c-format
-msgid "Error while reading %dth of %d points: %s\n"
-msgstr "èå %2$d éäçç %1$d éæåçéèï%3$s\n"
+msgid "Error while reading %dth of %d points"
+msgstr "èå %2$d éäçç %1$d éæåçéè"
 
-#: ../plug-ins/xfig/xfig-import.c:266
-msgid "Error while reading arrowhead\n"
-msgstr "èåçéæççéè\n"
+#: ../plug-ins/xfig/xfig-import.c:272
+msgid "Error while reading arrowhead"
+msgstr "èåçéæççéè"
 
-#: ../plug-ins/xfig/xfig-import.c:288
+#: ../plug-ins/xfig/xfig-import.c:294
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "äæççééå %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:379
+#: ../plug-ins/xfig/xfig-import.c:386
 #, 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
-#, c-format
-msgid "Couldn't read ellipse info: %s\n"
-msgstr "çæèåæåèèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:434
+msgid "Couldn't read ellipse info."
+msgstr "çæèåæåèè"
 
-#: ../plug-ins/xfig/xfig-import.c:494
-#, c-format
-msgid "Couldn't read polyline info: %s\n"
-msgstr "çæèåèççæèèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:503
+msgid "Couldn't read polyline info.\n"
+msgstr "çæèåèççæèèã\n"
 
-#: ../plug-ins/xfig/xfig-import.c:509
-#, c-format
-msgid "Couldn't read flipped bit: %s\n"
-msgstr ""
+#: ../plug-ins/xfig/xfig-import.c:518
+msgid "Couldn't read flipped bit."
+msgstr "çæèåçèçäåã"
 
-#: ../plug-ins/xfig/xfig-import.c:527
-msgid "Negative corner radius, negating"
-msgstr "èèååæèæïæçäçææ"
+#: ../plug-ins/xfig/xfig-import.c:536
+msgid "Negative corner radius; negating"
+msgstr "èèååæèæïæçäçææ"
 
-#: ../plug-ins/xfig/xfig-import.c:570 ../plug-ins/xfig/xfig-import.c:883
+#: ../plug-ins/xfig/xfig-import.c:579
 #, 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
-#, c-format
-msgid "Couldn't read spline info: %s\n"
-msgstr "çæèå spline èèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:730 ../plug-ins/xfig/xfig-import.c:762
+msgid "Couldn't read spline info."
+msgstr "çæèåææèèã"
 
 #. 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:749 ../plug-ins/xfig/xfig-import.c:766
 msgid "Cannot convert approximated spline yet."
-msgstr "éçæèæèäç splineã"
+msgstr "éçæèæèäçææã"
 
-#: ../plug-ins/xfig/xfig-import.c:795
+#: ../plug-ins/xfig/xfig-import.c:804
 #, c-format
 msgid "Unknown spline subtype: %d\n"
-msgstr "äçåç spline åéåï%d\n"
+msgstr "äçåçææåéåï%d\n"
+
+#: ../plug-ins/xfig/xfig-import.c:870
+msgid "Couldn't read arc info."
+msgstr "çæèååçèæã"
 
-#: ../plug-ins/xfig/xfig-import.c:858
+#. set new fill property on arc?
+#: ../plug-ins/xfig/xfig-import.c:899
+msgid "Filled arc treated as unfilled"
+msgstr "ååæçåçèçæåæ"
+
+#: ../plug-ins/xfig/xfig-import.c:903
 #, c-format
-msgid "Couldn't read arc info: %s\n"
-msgstr "çæèååçèæï%s\n"
+msgid "Unknown polyline arc: %d\n"
+msgstr "äçåçèççæåçï%d\n"
+
+#: ../plug-ins/xfig/xfig-import.c:968
+msgid "Couldn't read text info."
+msgstr "çæèåæåèæã"
 
-#: ../plug-ins/xfig/xfig-import.c:947
+#: ../plug-ins/xfig/xfig-import.c:996
 #, c-format
-msgid "Couldn't read text info: %s\n"
-msgstr "çæèåæåèæï%s\n"
+msgid "Can't find LaTeX font nr. %d, using sans"
+msgstr "æäå LaTeX åå nr. %dïæçç sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1009
+#: ../plug-ins/xfig/xfig-import.c:1004
 #, c-format
-msgid "Couldn't identify FIG object: %s\n"
-msgstr "çæèå FIG çäï%s\n"
+msgid "Can't find Postscript font nr. %d, using sans"
+msgstr "æäå PostScript åå nr. %dïæçç sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1017
+#: ../plug-ins/xfig/xfig-import.c:1032
+msgid "Couldn't identify Fig object."
+msgstr "çæèå Fig çäã"
+
+#: ../plug-ins/xfig/xfig-import.c:1040
 msgid "Compound end outside compound\n"
-msgstr "èåçæçèåèåç\n"
+msgstr "èåçäæçèåèåçä\n"
+
+#: ../plug-ins/xfig/xfig-import.c:1059
+#, c-format
+msgid "Couldn't read color: %s\n"
+msgstr "çæèåéèï%s\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1041
+#: ../plug-ins/xfig/xfig-import.c:1064
 #, 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:1087
-#, c-format
-msgid "Couldn't read group extend: %s\n"
-msgstr "çæèåççæåï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1111
+msgid "Couldn't read group extend."
+msgstr "çæèåççæåã"
 
-#: ../plug-ins/xfig/xfig-import.c:1098
+#: ../plug-ins/xfig/xfig-import.c:1122
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "äçåççäéå %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1122
+#: ../plug-ins/xfig/xfig-import.c:1147
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "â%sâäæâ%sâæâ%sâåäää\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1132
-#, c-format
-msgid "Error reading paper size: %s\n"
-msgstr "èåçåååæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1157
+msgid "Error reading paper size."
+msgstr "èåçåååæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1143
+#: ../plug-ins/xfig/xfig-import.c:1168
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "äæççåååâ%sâïäçéèå\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1155
-#, c-format
-msgid "Error reading paper orientation: %s\n"
-msgstr "èåçåæåæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1181
+msgid "Error reading paper orientation."
+msgstr "èåçåæåæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1165
-#, c-format
-msgid "Error reading justification: %s\n"
-msgstr "èååéèææççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1191
+msgid "Error reading justification."
+msgstr "èååéèææççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1175
-#, c-format
-msgid "Error reading units: %s\n"
-msgstr "èåéååäæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1201
+msgid "Error reading units."
+msgstr "èåéååäæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1191
-#, c-format
-msgid "Error reading magnification: %s\n"
-msgstr "èåçæåçæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1217
+msgid "Error reading magnification."
+msgstr "èåçæåçæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1204
-#, c-format
-msgid "Error reading multipage indicator: %s\n"
-msgstr "èåéææçæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1230
+msgid "Error reading multipage indicator."
+msgstr "èåéææçæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1215
-#, c-format
-msgid "Error reading transparent color: %s\n"
-msgstr "èåéæéèæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1241
+msgid "Error reading transparent color."
+msgstr "èåéæéèæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1224 ../plug-ins/xfig/xfig-import.c:1280
-#: ../plug-ins/xfig/xfig-import.c:1298
-#, c-format
-msgid "Error reading FIG file: %s\n"
-msgstr "èå FIG æææççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1250 ../plug-ins/xfig/xfig-import.c:1311
+#: ../plug-ins/xfig/xfig-import.c:1329
+msgid "Error reading Fig file."
+msgstr "èå Fig æææççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1226 ../plug-ins/xfig/xfig-import.c:1282
-msgid "Premature end of FIG file\n"
-msgstr "FIG ææéæåç\n"
+#: ../plug-ins/xfig/xfig-import.c:1252
+msgid "Premature end of Fig file\n"
+msgstr "Fig ææéæåç\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1235
-#, c-format
-msgid "Error reading resolution: %s\n"
-msgstr "èåèæåæççéèï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1261
+msgid "Error reading resolution."
+msgstr "èåèæåæççéèã"
 
-#: ../plug-ins/xfig/xfig-import.c:1267
-#, c-format
-msgid "Doesn't look like a Fig file: %s\n"
-msgstr "äåæ Fig ææï%s\n"
+#: ../plug-ins/xfig/xfig-import.c:1297
+msgid "Doesn't look like a Fig file"
+msgstr "äåæ Fig ææ"
 
-#: ../plug-ins/xfig/xfig-import.c:1273
+#: ../plug-ins/xfig/xfig-import.c:1303
 #, c-format
-msgid "This is a FIG version %d.%d file, I may not understand it\n"
-msgstr "éæ FIG çæ %d.%d çææãåèçæèå\n"
+msgid ""
+"This is a Fig version %d.%d file.\n"
+" It may not be importable."
+msgstr ""
+"éæ Fig %d.%d ççææã\n"
+"åèçæååã"
 
-#: ../plug-ins/xfig/xfig-import.c:1321
-msgid "XFig File Format"
-msgstr "XFig æææå"
+#: ../plug-ins/xfig/xfig-import.c:1313
+msgid "Premature end of Fig file"
+msgstr "Fig ææéæåç"
 
-#: ../plug-ins/xfig/xfig.c:51
-msgid "Fig Format import and export filter"
-msgstr "Fig æååå/ååéæå"
+#: ../plug-ins/xfig/xfig-import.c:1352
+msgid "Xfig File Format"
+msgstr "Xfig æææå"
 
-#: ../plug-ins/xslt/xslt.c:105
+#: ../plug-ins/xslt/xslt.c:110
 #, c-format
 msgid "Error while parsing %s\n"
 msgstr "èæ %s æççéè\n"
 
-#: ../plug-ins/xslt/xslt.c:114
+#: ../plug-ins/xslt/xslt.c:119
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "èææåè %s æççéè\n"
 
-#: ../plug-ins/xslt/xslt.c:121
+#: ../plug-ins/xslt/xslt.c:126
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "åçæåè %s æççéè\n"
 
-#: ../plug-ins/xslt/xslt.c:130
+#: ../plug-ins/xslt/xslt.c:135
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "èææåèæççéèï%s\n"
 
-#: ../plug-ins/xslt/xslt.c:139
+#: ../plug-ins/xslt/xslt.c:144
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "åçæåèæççéèï%s\n"
 
-#: ../plug-ins/xslt/xslt.c:325
+#: ../plug-ins/xslt/xslt.c:152
+#, c-format
+msgid "Error while saving result: %s\n"
+msgstr "ååçææççéèï%s\n"
+
+#: ../plug-ins/xslt/xslt.c:336
 msgid "XSL Transformation filter"
 msgstr "XSL èæéæå"
 
-#: ../plug-ins/xslt/xslt.c:349
-msgid "No valid configuration files found for the XSLT plugin, not loading."
-msgstr "æäåçææ XSLT åæçåçææçææïääèåã"
+#: ../plug-ins/xslt/xslt.c:363
+msgid "No valid configuration files found for the XSLT plugin; not loading."
+msgstr "æäåçææ XSLT åæçåçææçææïääèåã"
 
-#: ../plug-ins/xslt/xsltdialog.c:96
+#: ../plug-ins/xslt/xsltdialog.c:99
 msgid "Export through XSLT"
 msgstr "ç XSLT åå"
 
-#: ../plug-ins/xslt/xsltdialog.c:111
+#: ../plug-ins/xslt/xsltdialog.c:114
 msgid "From:"
 msgstr "åï"
 
-#: ../plug-ins/xslt/xsltdialog.c:146
+#: ../plug-ins/xslt/xsltdialog.c:149
 msgid "To:"
 msgstr "èï"
 
 #: ../sheets/AADL.sheet.in.h:1
 msgid "AADL"
-msgstr ""
+msgstr "AADL"
 
 #: ../sheets/AADL.sheet.in.h:2
 msgid "AADL Shapes"
-msgstr "AADL åç"
-
-#: ../sheets/AADL.sheet.in.h:3
-msgid "Bus"
-msgstr "åææ"
+msgstr "AADL åå"
 
-#: ../sheets/AADL.sheet.in.h:5
-msgid "Device"
-msgstr "èç"
+#: ../sheets/AADL.sheet.in.h:4
+msgid "Thread"
+msgstr "çç"
 
 #: ../sheets/AADL.sheet.in.h:6
+msgid "Processor"
+msgstr "èçå"
+
+#: ../sheets/AADL.sheet.in.h:7
 msgid "Memory"
 msgstr "èæé"
 
-#: ../sheets/AADL.sheet.in.h:7
-msgid "Package"
-msgstr "åä"
+#: ../sheets/AADL.sheet.in.h:8
+msgid "Bus"
+msgstr "åææ"
 
 #: ../sheets/AADL.sheet.in.h:9
-msgid "Processor"
-msgstr "èçå"
+msgid "System"
+msgstr "çç"
 
 #: ../sheets/AADL.sheet.in.h:10
 msgid "Subprogram"
 msgstr "åçå"
 
 #: ../sheets/AADL.sheet.in.h:11
-msgid "System"
-msgstr "çç"
+msgid "Thread Group"
+msgstr "çççç"
 
 #: ../sheets/AADL.sheet.in.h:12
-msgid "Thread"
-msgstr "çç"
+msgid "Device"
+msgstr "èç"
 
 #: ../sheets/AADL.sheet.in.h:13
-msgid "Thread Group"
-msgstr "çççç"
+msgid "Package"
+msgstr "åä"
+
+#. Please talk to me before making any changes to this sheet
+#: ../sheets/Assorted.sheet.in.h:2
+msgid "Assorted"
+msgstr "åæåå"
 
 #. Sheet Name: Assorted, was Geometric, maybe Basic Shapes instead?
 #. Leave as is for now, renaming too much hassle.
 #. Will probably need to split into seperate sheets soon anyway.
-#: ../sheets/Assorted.sheet.in.h:4
+#: ../sheets/Assorted.sheet.in.h:6
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr "åéåãèèæçååäåååäååé"
 
-#. Please talk to me before making any changes to this sheet
-#: ../sheets/Assorted.sheet.in.h:6
-msgid "Assorted"
-msgstr "åæåå"
-
 #: ../sheets/Assorted.sheet.in.h:7
-msgid "Chevron"
-msgstr "èç"
+msgid "Right angle triangle"
+msgstr "çèäèå"
 
 #: ../sheets/Assorted.sheet.in.h:8
-msgid "Curved eight point star"
-msgstr "æåèæ"
+msgid "Isosceles triangle"
+msgstr "çèäèå"
 
 #: ../sheets/Assorted.sheet.in.h:9
-msgid "Curved four point star"
-msgstr "æåèæ"
+msgid "Perfect square, height equals width"
+msgstr "ææå"
 
 #: ../sheets/Assorted.sheet.in.h:10
-msgid "Diamond"
-msgstr "èå"
+msgid "Perfect circle"
+msgstr "æåå"
 
 #: ../sheets/Assorted.sheet.in.h:11
-msgid "Down arrow"
-msgstr "çé(ä)"
+msgid "Quarter circle"
+msgstr "ååäååå"
 
 #: ../sheets/Assorted.sheet.in.h:12
-msgid "Eight point star"
-msgstr "åèæ"
+msgid "Diamond"
+msgstr "èå"
 
 #: ../sheets/Assorted.sheet.in.h:13
-msgid "Five point star"
-msgstr "äèæ"
+msgid "Pentagon. Five-point shape"
+msgstr "äéå"
 
 #: ../sheets/Assorted.sheet.in.h:14
-msgid "Four point star"
-msgstr "åèæ"
+msgid "Hexagon. Six-point shape"
+msgstr "åéå"
 
 #: ../sheets/Assorted.sheet.in.h:15
-msgid "Heart"
-msgstr "åå"
+msgid "Heptagon. Seven-point shape"
+msgstr "äéå"
 
 #: ../sheets/Assorted.sheet.in.h:16
-msgid "Heptagon. Seven sided shape"
-msgstr "äéå"
+msgid "Octogon. Eight-point shape"
+msgstr "åéå"
 
 #: ../sheets/Assorted.sheet.in.h:17
-msgid "Hexagon. Six sided shape"
-msgstr "åéå"
-
-#: ../sheets/Assorted.sheet.in.h:18
 msgid "Horizontal parallelogram"
 msgstr "æååèåéå"
 
+#: ../sheets/Assorted.sheet.in.h:18
+msgid "Vertical parallelogram"
+msgstr "åçåèåéå"
+
 #: ../sheets/Assorted.sheet.in.h:19
-msgid "Isoceles triangle"
-msgstr "çèäèå"
+msgid "Trapezoid"
+msgstr "æå"
 
 #: ../sheets/Assorted.sheet.in.h:20
-msgid "Left arrow"
-msgstr "çé(å)"
+msgid "Four-point star"
+msgstr "åèæ"
 
 #: ../sheets/Assorted.sheet.in.h:21
-msgid "Left-right arrow"
-msgstr "çé(åãå)"
+msgid "Curved four-point star"
+msgstr "æåèæ"
 
 #: ../sheets/Assorted.sheet.in.h:22
-msgid "Left-right-up arrow"
-msgstr "çé(åãåãä)"
+msgid "Five-point star"
+msgstr "äèæ"
 
 #: ../sheets/Assorted.sheet.in.h:23
-msgid "Left-up arrow"
-msgstr "çé(åãä)"
+msgid "Six-point star"
+msgstr "åèæ"
 
 #: ../sheets/Assorted.sheet.in.h:24
-msgid "Maltese cross"
-msgstr "éçä(maltese)åå"
+msgid "Seven-point star"
+msgstr "äèæ"
 
 #: ../sheets/Assorted.sheet.in.h:25
-msgid "Notched left arrow"
-msgstr "åæåçé"
+msgid "Eight-point star"
+msgstr "åèæ"
 
 #: ../sheets/Assorted.sheet.in.h:26
-msgid "Notched right arrow"
-msgstr "åæåçé"
+msgid "Sharp eight-point star"
+msgstr "ååèæ"
 
 #: ../sheets/Assorted.sheet.in.h:27
-msgid "Octogon. Eight sided shape"
-msgstr "åéå"
+msgid "Curved eight-point star"
+msgstr "æåèæ"
 
 #: ../sheets/Assorted.sheet.in.h:28
-msgid "Pentagon block arrow"
-msgstr "äèçé"
+msgid "Swiss cross"
+msgstr "çååå"
 
 #: ../sheets/Assorted.sheet.in.h:29
-msgid "Pentagon. Five sided shape"
-msgstr "äéå"
+msgid "Maltese cross"
+msgstr "éçä(maltese)åå"
 
 #: ../sheets/Assorted.sheet.in.h:30
-msgid "Perfect circle"
-msgstr "æåå"
+msgid "Down arrow"
+msgstr "çé(ä)"
 
 #: ../sheets/Assorted.sheet.in.h:31
-msgid "Perfect square, height equals width"
-msgstr "ææå"
+msgid "Up arrow"
+msgstr "çé(ä)"
 
 #: ../sheets/Assorted.sheet.in.h:32
-msgid "Quad arrow"
-msgstr "çé(ääåå)"
+msgid "Left arrow"
+msgstr "çé(å)"
 
 #: ../sheets/Assorted.sheet.in.h:33
-msgid "Quarter circle"
-msgstr "ååäååå"
+msgid "Right arrow"
+msgstr "çé(å)"
 
 #: ../sheets/Assorted.sheet.in.h:34
-msgid "Quarter moon"
-msgstr "åæ"
+msgid "Notched left arrow"
+msgstr "åæåçé"
 
 #: ../sheets/Assorted.sheet.in.h:35
-msgid "Right angle triangle"
-msgstr "çèäèå"
+msgid "Notched right arrow"
+msgstr "åæåçé"
 
 #: ../sheets/Assorted.sheet.in.h:36
-msgid "Right arrow"
-msgstr "çé(å)"
+msgid "Left-up arrow"
+msgstr "çé(åãä)"
 
 #: ../sheets/Assorted.sheet.in.h:37
-msgid "Seven point star"
-msgstr "äèæ"
+msgid "Turn-up arrow"
+msgstr "äåçé"
 
 #: ../sheets/Assorted.sheet.in.h:38
-msgid "Sharp eight point star"
-msgstr "ååèæ"
+msgid "Left-right arrow"
+msgstr "çé(åãå)"
 
 #: ../sheets/Assorted.sheet.in.h:39
-msgid "Six point star"
-msgstr "åèæ"
+msgid "Up-down arrow"
+msgstr "çé(äãä)"
 
 #: ../sheets/Assorted.sheet.in.h:40
-msgid "Sun"
-msgstr "åé"
+msgid "Quad arrow"
+msgstr "çé(ääåå)"
 
 #: ../sheets/Assorted.sheet.in.h:41
-msgid "Swiss cross"
-msgstr "çååå"
+msgid "Left-right-up arrow"
+msgstr "çé(åãåãä)"
 
 #: ../sheets/Assorted.sheet.in.h:42
-msgid "Trapezoid"
-msgstr "æå"
+msgid "Up-down-left arrow"
+msgstr "çé(äãäãå)"
 
 #: ../sheets/Assorted.sheet.in.h:43
-msgid "Turn-up arrow"
-msgstr "äåçé"
+msgid "Pentagon block arrow"
+msgstr "äèçé"
 
 #: ../sheets/Assorted.sheet.in.h:44
-msgid "Up arrow"
-msgstr "çé(ä)"
+msgid "Chevron"
+msgstr "èç"
 
 #: ../sheets/Assorted.sheet.in.h:45
-msgid "Up-down arrow"
-msgstr "çé(äãä)"
+msgid "Heart"
+msgstr "åå"
 
 #: ../sheets/Assorted.sheet.in.h:46
-msgid "Up-down-left arrow"
-msgstr "çé(äãäãå)"
+msgid "Sun"
+msgstr "åé"
 
 #: ../sheets/Assorted.sheet.in.h:47
-msgid "Vertical parallelogram"
-msgstr "åçåèåéå"
-
-#: ../sheets/BPMN.sheet.in.h:1
-msgid "Activity Looping"
-msgstr "æåèå"
-
-#: ../sheets/BPMN.sheet.in.h:2
-msgid "Ad-Hoc Collapsed Sub-Process"
-msgstr "èæ (Ad-Hoc) æçåéç"
+msgid "Quarter moon"
+msgstr "åæ"
 
 #. For: anthonym
-#: ../sheets/BPMN.sheet.in.h:4
+#: ../sheets/BPMN.sheet.in.h:2
 msgid "BPMN"
 msgstr ""
 
-#: ../sheets/BPMN.sheet.in.h:5
+#: ../sheets/BPMN.sheet.in.h:3
 msgid "Business Process Modeling Notation"
 msgstr "åæéçæåèçæ"
 
+#: ../sheets/BPMN.sheet.in.h:4
+msgid "Start Event"
+msgstr "èåää"
+
+#: ../sheets/BPMN.sheet.in.h:5
+msgid "Start Event â Message"
+msgstr "èåää â èæ"
+
 #: ../sheets/BPMN.sheet.in.h:6
-msgid "Collapsed Sub-Process"
-msgstr "æçåéç"
+msgid "Start Event â Timer"
+msgstr "èåää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:7
-msgid "Compensation Collapsed Sub-Process"
-msgstr "èåæçåéç"
+msgid "Start Event â Rule"
+msgstr "èåää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:8
-msgid "Compensation Task"
-msgstr "èååä"
+msgid "Start Event â Link"
+msgstr "èåää â éç"
 
 #: ../sheets/BPMN.sheet.in.h:9
-msgid "Complex"
-msgstr "èå"
+msgid "Start Event â Multiple"
+msgstr "èåää â åé"
 
 #: ../sheets/BPMN.sheet.in.h:10
-msgid "Data Object"
-msgstr "èæçä"
+msgid "Intermediate Event"
+msgstr "äéää"
 
 #: ../sheets/BPMN.sheet.in.h:11
-msgid "End Event"
-msgstr "çæää"
+msgid "Intermediate Event â Message"
+msgstr "äéää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:12
-msgid "End Event - Cancel"
-msgstr "çæää - åæ"
+msgid "Intermediate Event â Timer"
+msgstr "äéää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:13
-msgid "End Event - Compensation"
-msgstr "çæää - èå"
+msgid "Intermediate Event â Error"
+msgstr "äéää â éè"
 
 #: ../sheets/BPMN.sheet.in.h:14
-msgid "End Event - Error"
-msgstr "çæää - éè"
+msgid "Intermediate Event â Cancel"
+msgstr "äéää â åæ"
 
 #: ../sheets/BPMN.sheet.in.h:15
-msgid "End Event - Link"
-msgstr "çæää - éç"
+msgid "Intermediate Event â Compensation"
+msgstr "äéää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:16
-msgid "End Event - Message"
-msgstr "çæää - èæ"
+msgid "Intermediate Event â Rule"
+msgstr "äéää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:17
-msgid "End Event - Multiple"
-msgstr "çæää - åé"
+msgid "Intermediate Event â Link"
+msgstr "äéää â éç"
 
 #: ../sheets/BPMN.sheet.in.h:18
-msgid "End Event - Terminate"
-msgstr "çæää - çç"
+msgid "Intermediate Event â Multiple"
+msgstr "äéää â åé"
 
 #: ../sheets/BPMN.sheet.in.h:19
-msgid "Exclusive (XOR) Data Based"
-msgstr ""
+msgid "End Event"
+msgstr "çæää"
 
 #: ../sheets/BPMN.sheet.in.h:20
-msgid "Exclusive (XOR) Event Based"
-msgstr ""
+msgid "End Event â Message"
+msgstr "çæää â èæ"
 
 #: ../sheets/BPMN.sheet.in.h:21
-msgid "Gateway"
-msgstr "éé"
+msgid "End Event â Error"
+msgstr "çæää â éè"
 
 #: ../sheets/BPMN.sheet.in.h:22
-msgid "Group"
-msgstr "çç"
+msgid "End Event â Cancel"
+msgstr "çæää â åæ"
 
 #: ../sheets/BPMN.sheet.in.h:23
-msgid "Inclusive (OR)"
-msgstr ""
+msgid "End Event â Compensation"
+msgstr "çæää â èå"
 
 #: ../sheets/BPMN.sheet.in.h:24
-msgid "Intermediate Event"
-msgstr "äéää"
+msgid "End Event â Link"
+msgstr "çæää â éç"
 
 #: ../sheets/BPMN.sheet.in.h:25
-msgid "Intermediate Event - Cancel"
-msgstr "äéää - åæ"
+msgid "End Event â Multiple"
+msgstr "çæää â åé"
 
 #: ../sheets/BPMN.sheet.in.h:26
-msgid "Intermediate Event - Compensation"
-msgstr "äéää - èå"
+msgid "End Event â Terminate"
+msgstr "çæää â çç"
 
 #: ../sheets/BPMN.sheet.in.h:27
-msgid "Intermediate Event - Error"
-msgstr "äéää - éè"
+msgid "Gateway"
+msgstr "éé"
 
 #: ../sheets/BPMN.sheet.in.h:28
-msgid "Intermediate Event - Link"
-msgstr "äéää - éç"
+msgid "Exclusive (XOR) Data Based"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:29
-msgid "Intermediate Event - Message"
-msgstr "äéää - èæ"
+msgid "Exclusive (XOR) Event Based"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:30
-msgid "Intermediate Event - Multiple"
-msgstr "äéää - åé"
+msgid "Inclusive (OR)"
+msgstr ""
 
 #: ../sheets/BPMN.sheet.in.h:31
-msgid "Intermediate Event - Rule"
-msgstr "äéää - èå"
+msgid "Complex"
+msgstr "èå"
 
 #: ../sheets/BPMN.sheet.in.h:32
-msgid "Intermediate Event - Timer"
-msgstr "äéää - èæ"
-
-#: ../sheets/BPMN.sheet.in.h:33
-msgid "Looping Collapsed Sub-Process"
-msgstr "èåæçåéç"
+msgid "Parallel (AND)"
+msgstr "åè (AND)"
 
 #: ../sheets/BPMN.sheet.in.h:34
-msgid "Multiple Instance Collapsed Sub-Process"
-msgstr "åéåäæçåéç"
+msgid "Activity Looping"
+msgstr "æåèå"
 
 #: ../sheets/BPMN.sheet.in.h:35
 msgid "Multiple Instance Task"
 msgstr "åéåäåä"
 
 #: ../sheets/BPMN.sheet.in.h:36
-msgid "Parallel (AND)"
-msgstr "åè (AND)"
+msgid "Compensation Task"
+msgstr "èååä"
 
 #: ../sheets/BPMN.sheet.in.h:37
-msgid "Start Event"
-msgstr "èåää"
+msgid "Collapsed Sub-Process"
+msgstr "æçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:38
-msgid "Start Event - Link"
-msgstr "èåää - éç"
+msgid "Looping Collapsed Sub-Process"
+msgstr "èåæçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:39
-msgid "Start Event - Message"
-msgstr "èåää - èæ"
+msgid "Multiple Instance Collapsed Sub-Process"
+msgstr "åéåäæçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:40
-msgid "Start Event - Multiple"
-msgstr "èåää - åé"
+msgid "Ad-Hoc Collapsed Sub-Process"
+msgstr "èæ (Ad-Hoc) æçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:41
-msgid "Start Event - Rule"
-msgstr "èåää - èå"
+msgid "Compensation Collapsed Sub-Process"
+msgstr "èåæçåéç"
 
 #: ../sheets/BPMN.sheet.in.h:42
-msgid "Start Event - Timer"
-msgstr "èåää - èæ"
-
-#: ../sheets/BPMN.sheet.in.h:44
-msgid "Text Annotation"
-msgstr "æåèè"
+msgid "Group"
+msgstr "çç"
 
-#: ../sheets/BPMN.sheet.in.h:45
+#: ../sheets/BPMN.sheet.in.h:43
 msgid "Transaction"
 msgstr "äæ"
 
-#: ../sheets/ChemEng.sheet.in.h:1
-msgid "AC Generator"
-msgstr "äæçéæ"
+#: ../sheets/BPMN.sheet.in.h:44
+msgid "Data Object"
+msgstr "èæçä"
 
+#: ../sheets/BPMN.sheet.in.h:45
+msgid "Text Annotation"
+msgstr "æåèè"
+
+#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:2
-msgid "Air Cooler"
-msgstr "æååååå"
+msgid "ChemEng"
+msgstr "åååç"
 
 #: ../sheets/ChemEng.sheet.in.h:3
-msgid "Autoclave"
-msgstr "èææè"
+msgid "Collection for chemical engineering"
+msgstr "åååçåé"
 
 #: ../sheets/ChemEng.sheet.in.h:4
-msgid "Axial Flow Fan"
-msgstr "èåæææ"
+msgid "Fan or Stirrer"
+msgstr "éææææå"
 
 #: ../sheets/ChemEng.sheet.in.h:5
-msgid "Basic Filter"
-msgstr "åæéæå"
+msgid "Spraying Device"
+msgstr "åéèç"
 
 #: ../sheets/ChemEng.sheet.in.h:6
-msgid "Centrifugal Pump or Fan"
-msgstr "éååææéæ"
+msgid "Pneumatic Line"
+msgstr "çæåååç"
 
 #: ../sheets/ChemEng.sheet.in.h:7
-msgid "Centrifuge"
-msgstr "éåæ"
+msgid "Pneumatic Line, vertical"
+msgstr "çæåååçïåç"
 
-#. For: zenith
 #: ../sheets/ChemEng.sheet.in.h:9
-msgid "ChemEng"
-msgstr "åååç"
+msgid "Simple Heat Exchanger"
+msgstr "çæçäæå"
 
 #: ../sheets/ChemEng.sheet.in.h:10
-msgid "Clarifier or Settling Tank"
-msgstr "æå/æææ"
+msgid "Simple Heat Exchanger, vertical"
+msgstr "çæçäæåïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:11
-msgid "Collection for chemical engineering"
-msgstr "åååçåé"
+msgid "Water Cooler"
+msgstr "æååæçå"
 
 #: ../sheets/ChemEng.sheet.in.h:12
-msgid "Compressor or Turbine"
-msgstr "éæååçæ/ææåæè"
+msgid "Water Cooler, vertical"
+msgstr "æååæçåïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:13
-msgid "Covered tank"
-msgstr "åèåææ"
+msgid "Fixed-Sheet Exchanger"
+msgstr "Fixed-Sheet äæå"
 
 #: ../sheets/ChemEng.sheet.in.h:14
-msgid "Cyclone and hydrocyclone"
-msgstr "Cyclone è hydrocyclone"
+msgid "Floating-Head or U-Tube Exchanger"
+msgstr "Floating-Head æ U-Tube äæå"
 
 #: ../sheets/ChemEng.sheet.in.h:15
-msgid "Double-Pipe Exchanger"
-msgstr "åççäæå"
+msgid "Kettle Reboiler"
+msgstr "Kettle Reboiler"
 
 #: ../sheets/ChemEng.sheet.in.h:16
-msgid "Ejector or Injector"
-msgstr "åååææåå"
+msgid "Air Cooler"
+msgstr "æååååå"
 
 #: ../sheets/ChemEng.sheet.in.h:17
-msgid "Fan or Stirrer"
-msgstr "éææææå"
+msgid "Forced-Flow Air Cooler"
+msgstr "Forced-Flow Air Cooler"
 
 #: ../sheets/ChemEng.sheet.in.h:18
-msgid "Fixed-Sheet Exchanger"
-msgstr "Fixed-Sheet äæå"
+msgid "Induced-Flow Air Cooler"
+msgstr "Induced-Flow Air Cooler"
 
 #: ../sheets/ChemEng.sheet.in.h:19
-msgid "Floating-Head or U-Tube Exchanger"
-msgstr "Floating-Head æ U-Tube äæå"
+msgid "Plate Exchanger"
+msgstr "åæåäæå"
 
 #: ../sheets/ChemEng.sheet.in.h:20
-msgid "Fluid Contacting Vessel, simple"
-msgstr "Fluid Contacting Vessel, simple"
+msgid "Double-Pipe Exchanger"
+msgstr "åççäæå"
 
 #: ../sheets/ChemEng.sheet.in.h:21
-msgid "Forced-Flow Air Cooler"
-msgstr "Forced-Flow Air Cooler"
+msgid "Heating/Cooling Coil"
+msgstr "Heating/Cooling Coil"
 
 #: ../sheets/ChemEng.sheet.in.h:22
-msgid "Gas Holder, basic"
-msgstr "Gas Holder, basic"
+msgid "Heating/Cooling Coil, vertical"
+msgstr "Heating/Cooling Coil, vertical"
 
 #: ../sheets/ChemEng.sheet.in.h:23
-msgid "Heating/Cooling Coil"
-msgstr "Heating/Cooling Coil"
+msgid "Simple Furnace"
+msgstr "çæç"
 
 #: ../sheets/ChemEng.sheet.in.h:24
-msgid "Heating/Cooling Coil, vertical"
-msgstr "Heating/Cooling Coil, vertical"
+msgid "Simple Vessel"
+msgstr "çæåå"
 
 #: ../sheets/ChemEng.sheet.in.h:25
-msgid "Induced-Flow Air Cooler"
-msgstr "Induced-Flow Air Cooler"
+msgid "Knock-out Drum (with demister pad)"
+msgstr "Knock-out Drum (with demister pad)"
 
 #: ../sheets/ChemEng.sheet.in.h:26
-msgid "Kettle Reboiler"
-msgstr "Kettle Reboiler"
+msgid "Tray Column, simple"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:27
-msgid "Knock-out Drum (with demister pad)"
-msgstr "Knock-out Drum (with demister pad)"
+msgid "Tray Column, detailed"
+msgstr ""
 
 #: ../sheets/ChemEng.sheet.in.h:28
-msgid "Measurement"
-msgstr "åéè"
+msgid "Fluid Contacting Vessel, simple"
+msgstr "Fluid Contacting Vessel, simple"
 
 #: ../sheets/ChemEng.sheet.in.h:29
-msgid "Mixer"
-msgstr "æåå"
+msgid "Reactor or Absorption Vessel, simple"
+msgstr "Reactor or Absorption Vessel, simple"
 
 #: ../sheets/ChemEng.sheet.in.h:30
-msgid "Open Tank"
-msgstr "éæææ"
+msgid "Autoclave"
+msgstr "èææè"
 
 #: ../sheets/ChemEng.sheet.in.h:31
-msgid "Plate Exchanger"
-msgstr "åæåäæå"
+msgid "Open Tank"
+msgstr "éæææ"
 
 #: ../sheets/ChemEng.sheet.in.h:32
-msgid "Pneumatic Line"
-msgstr "çæåååç"
+msgid "Clarifier or Settling Tank"
+msgstr "æå/æææ"
 
 #: ../sheets/ChemEng.sheet.in.h:33
-msgid "Pneumatic Line, vertical"
-msgstr "çæåååçïåç"
+msgid "Sealed Tank"
+msgstr "ååææ"
 
 #: ../sheets/ChemEng.sheet.in.h:34
-msgid "Positive Displacement Rotary Pump or Compressor"
-msgstr "Positive Displacement Rotary Pump or Compressor"
+msgid "Covered tank"
+msgstr "åèåææ"
 
 #: ../sheets/ChemEng.sheet.in.h:35
-msgid "Reactor or Absorption Vessel, simple"
-msgstr "Reactor or Absorption Vessel, simple"
+msgid "Tank with Fixed Roof"
+msgstr "ååéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:36
-msgid "Reciprocating Compressor or Pump"
-msgstr "ååååçæææ"
+msgid "Tank with Floating Roof"
+msgstr "æåéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:37
-msgid "Regulable Valve"
-msgstr "åèæåé"
+msgid "Storage Sphere"
+msgstr "çååæ"
 
 #: ../sheets/ChemEng.sheet.in.h:38
-msgid "Regulable Valve, vertical"
-msgstr "åèæåéïåç"
+msgid "Gas Holder, basic"
+msgstr "Gas Holder, basic"
 
 #: ../sheets/ChemEng.sheet.in.h:39
-msgid "Sealed Tank"
-msgstr "ååææ"
+msgid "Centrifugal Pump or Fan"
+msgstr "éååææéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:40
-msgid "Simple Furnace"
-msgstr "çæç"
+msgid "Positive Displacement Rotary Pump or Compressor"
+msgstr "Positive Displacement Rotary Pump or Compressor"
 
 #: ../sheets/ChemEng.sheet.in.h:41
-msgid "Simple Heat Exchanger"
-msgstr "çæçäæå"
+msgid "Reciprocating Compressor or Pump"
+msgstr "ååååçæææ"
 
 #: ../sheets/ChemEng.sheet.in.h:42
-msgid "Simple Heat Exchanger, vertical"
-msgstr "çæçäæåïåç"
+msgid "Axial Flow Fan"
+msgstr "èåæææ"
 
 #: ../sheets/ChemEng.sheet.in.h:43
-msgid "Simple Vessel"
-msgstr "çæåå"
+msgid "Compressor or Turbine"
+msgstr "éæååçæ/ææåæè"
 
 #: ../sheets/ChemEng.sheet.in.h:44
-msgid "Spray Drier"
-msgstr "åéäçæ"
+msgid "Ejector or Injector"
+msgstr "åååææåå"
 
 #: ../sheets/ChemEng.sheet.in.h:45
-msgid "Spraying Device"
-msgstr "åéèç"
+msgid "AC Generator"
+msgstr "äæçéæ"
 
 #: ../sheets/ChemEng.sheet.in.h:46
-msgid "Storage Sphere"
-msgstr "çååæ"
+msgid "Valve"
+msgstr "é"
 
 #: ../sheets/ChemEng.sheet.in.h:47
-msgid "Tank with Fixed Roof"
-msgstr "ååéæ"
+msgid "Valve, vertical"
+msgstr "éïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:48
-msgid "Tank with Floating Roof"
-msgstr "æåéæ"
+msgid "Regulable Valve"
+msgstr "åèæåé"
 
 #: ../sheets/ChemEng.sheet.in.h:49
-msgid "Tray Column, detailed"
-msgstr ""
+msgid "Regulable Valve, vertical"
+msgstr "åèæåéïåç"
 
 #: ../sheets/ChemEng.sheet.in.h:50
-msgid "Tray Column, simple"
-msgstr ""
+msgid "Basic Filter"
+msgstr "åæéæå"
 
 #: ../sheets/ChemEng.sheet.in.h:51
-msgid "Valve"
-msgstr "é"
+msgid "Mixer"
+msgstr "æåå"
 
 #: ../sheets/ChemEng.sheet.in.h:52
-msgid "Valve, vertical"
-msgstr "éïåç"
+msgid "Cyclone and hydrocyclone"
+msgstr "Cyclone è hydrocyclone"
 
 #: ../sheets/ChemEng.sheet.in.h:53
-msgid "Water Cooler"
-msgstr "æååæçå"
+msgid "Spray Drier"
+msgstr "åéäçæ"
 
 #: ../sheets/ChemEng.sheet.in.h:54
-msgid "Water Cooler, vertical"
-msgstr "æååæçåïåç"
+msgid "Centrifuge"
+msgstr "éåæ"
+
+#: ../sheets/ChemEng.sheet.in.h:55
+msgid "Pressure Relief Valve"
+msgstr "æåé"
+
+#: ../sheets/chronogram.sheet.in.h:1
+msgid "Chronogram"
+msgstr "åäè"
+
+#: ../sheets/chronogram.sheet.in.h:2
+msgid "Objects to design chronogram charts"
+msgstr "èèåäèæçççä"
+
+#: ../sheets/chronogram.sheet.in.h:3
+msgid "Time scale"
+msgstr "æéç"
+
+#: ../sheets/chronogram.sheet.in.h:4
+msgid "Data line"
+msgstr "èæç"
 
 #: ../sheets/Circuit.sheet.in.h:1
 msgid "Circuit"
@@ -6587,3186 +7086,3795 @@ msgid "Components for circuit diagrams"
 msgstr "éèåçåä"
 
 #: ../sheets/Circuit.sheet.in.h:3
-msgid "Ground point"
-msgstr "æåäç"
+msgid "Vertically aligned resistor"
+msgstr "åçæççéé"
 
 #: ../sheets/Circuit.sheet.in.h:4
-msgid "Horizontal jumper"
-msgstr "æåæççèæç"
+msgid "Horizontally aligned inductor"
+msgstr "æåæççåé"
 
 #: ../sheets/Circuit.sheet.in.h:5
-msgid "Horizontally aligned LED"
-msgstr "æåæçç LED"
+msgid "Vertically aligned inductor"
+msgstr "æåæççéæå"
 
 #: ../sheets/Circuit.sheet.in.h:6
-msgid "Horizontally aligned capacitor"
-msgstr "æåæççéå"
+msgid "Horizontally aligned resistor"
+msgstr "æåæççéé"
 
 #: ../sheets/Circuit.sheet.in.h:7
-msgid "Horizontally aligned diode"
-msgstr "æåæççäæç"
+msgid "Vertically aligned resistor (European)"
+msgstr "åçæççéé (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:8
-msgid "Horizontally aligned fuse"
-msgstr "æåæççäéç"
+msgid "Horizontally aligned inductor (European)"
+msgstr "æåæççåé (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:9
-msgid "Horizontally aligned inductor"
-msgstr "æåæççåé"
+msgid "Vertically aligned inductor (European)"
+msgstr "æåæççéæå (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:10
-msgid "Horizontally aligned inductor (European)"
-msgstr "æåæççåé (æå)"
+msgid "Horizontally aligned resistor (European)"
+msgstr "æåæççéé (æå)"
 
 #: ../sheets/Circuit.sheet.in.h:11
-msgid "Horizontally aligned powersource"
-msgstr "æåæççéæ"
+msgid "Horizontally aligned capacitor"
+msgstr "æåæççéå"
 
 #: ../sheets/Circuit.sheet.in.h:12
-msgid "Horizontally aligned resistor"
-msgstr "æåæççéé"
-
-#: ../sheets/Circuit.sheet.in.h:13
-msgid "Horizontally aligned resistor (European)"
-msgstr "æåæççéé (æå)"
-
-#: ../sheets/Circuit.sheet.in.h:14
-msgid "Horizontally aligned zener diode"
-msgstr "æåæççéçäæç"
+msgid "Vertically aligned capacitor"
+msgstr "åçæççéå"
 
+#.
+#.
 #: ../sheets/Circuit.sheet.in.h:15
-msgid "Lamp"
-msgstr "ç"
-
-#: ../sheets/Circuit.sheet.in.h:16 ../sheets/ciscomisc.sheet.in.h:30
-msgid "Microphone"
-msgstr "éåé"
-
-#: ../sheets/Circuit.sheet.in.h:17
-msgid "NMOS transistor"
-msgstr "NMOS éæé"
+msgid "NPN bipolar transistor"
+msgstr "NPN äæéæé"
 
 #.
 #.
+#: ../sheets/Circuit.sheet.in.h:18
+msgid "PNP bipolar transistor"
+msgstr "PNP äæéæé"
+
+#: ../sheets/Circuit.sheet.in.h:19
+msgid "Horizontally aligned diode"
+msgstr "æåæççäæç"
+
 #: ../sheets/Circuit.sheet.in.h:20
-msgid "NPN bipolar transistor"
-msgstr "NPN äæéæé"
+msgid "Vertically aligned diode"
+msgstr "åçæççäæç"
 
 #: ../sheets/Circuit.sheet.in.h:21
-msgid "Operational amplifier"
-msgstr "éçæåå"
+msgid "Horizontally aligned zener diode"
+msgstr "æåæççéçäæç"
 
 #: ../sheets/Circuit.sheet.in.h:22
-msgid "PMOS transistor"
-msgstr "PMOS éæé"
+msgid "Vertically aligned zener diode"
+msgstr "åçæççéçäæç"
+
+#: ../sheets/Circuit.sheet.in.h:23
+msgid "Ground point"
+msgstr "æåäç"
+
+#: ../sheets/Circuit.sheet.in.h:24
+msgid "Operational amplifier"
+msgstr "éçæåå"
 
-#.
-#.
 #: ../sheets/Circuit.sheet.in.h:25
-msgid "PNP bipolar transistor"
-msgstr "PNP äæéæé"
+msgid "Horizontally aligned fuse"
+msgstr "æåæççäéç"
 
-#: ../sheets/Circuit.sheet.in.h:26 ../sheets/ciscomisc.sheet.in.h:42
-msgid "Speaker"
-msgstr "æèå"
+#: ../sheets/Circuit.sheet.in.h:26
+msgid "Vertically aligned fuse"
+msgstr "åçæççäéç"
 
 #: ../sheets/Circuit.sheet.in.h:27
-msgid "Vertically aligned LED"
-msgstr "åçæçç LED"
+msgid "Horizontally aligned power source"
+msgstr "æåæççéæ"
 
 #: ../sheets/Circuit.sheet.in.h:28
-msgid "Vertically aligned capacitor"
-msgstr "åçæççéå"
+msgid "Vertically aligned power source"
+msgstr "åçæççéæ"
 
 #: ../sheets/Circuit.sheet.in.h:29
-msgid "Vertically aligned diode"
-msgstr "åçæççäæç"
+msgid "Lamp"
+msgstr "ç"
 
-#: ../sheets/Circuit.sheet.in.h:30
-msgid "Vertically aligned fuse"
-msgstr "åçæççäéç"
+#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
+msgid "Speaker"
+msgstr "æèå"
 
-#: ../sheets/Circuit.sheet.in.h:31
-msgid "Vertically aligned inductor"
-msgstr "æåæççéæå"
+#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
+msgid "Microphone"
+msgstr "éåé"
 
 #: ../sheets/Circuit.sheet.in.h:32
-msgid "Vertically aligned inductor (European)"
-msgstr "æåæççéæå (æå)"
+msgid "Horizontally aligned LED"
+msgstr "æåæçç LED"
 
 #: ../sheets/Circuit.sheet.in.h:33
-msgid "Vertically aligned powersource"
-msgstr "åçæççéæ"
+msgid "Vertically aligned LED"
+msgstr "åçæçç LED"
 
 #: ../sheets/Circuit.sheet.in.h:34
-msgid "Vertically aligned resistor"
-msgstr "åçæççéé"
+msgid "NMOS transistor"
+msgstr "NMOS éæé"
 
 #: ../sheets/Circuit.sheet.in.h:35
-msgid "Vertically aligned resistor (European)"
-msgstr "åçæççéé (æå)"
+msgid "PMOS transistor"
+msgstr "PMOS éæé"
 
 #: ../sheets/Circuit.sheet.in.h:36
-msgid "Vertically aligned zener diode"
-msgstr "åçæççéçäæç"
+msgid "Horizontal jumper"
+msgstr "æåæççèæç"
 
-#: ../sheets/Contact.sheet.in.h:1
-msgid "'if not' (normally closed) ladder contact"
-msgstr "'if not' (éåçéé) éæ ladder æè"
+#: ../sheets/Circuit.sheet.in.h:37
+msgid "Horizontal xtal"
+msgstr "æåæççæé"
 
-#: ../sheets/Contact.sheet.in.h:2
-msgid "'if' (normally open) ladder contact"
-msgstr "'if' (éåçéå) éæ ladder æè"
+#: ../sheets/Circuit.sheet.in.h:38
+msgid "Vertical xtal"
+msgstr "åçæççæé"
 
-#: ../sheets/Contact.sheet.in.h:3
-msgid "'jump' output variable"
-msgstr "'jump' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:1
+msgid "Cisco â Computer"
+msgstr "Cisco â éè"
 
-#: ../sheets/Contact.sheet.in.h:4
-msgid "'reset' output variable"
-msgstr "'reset' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:2
+msgid "Computer shapes by Cisco"
+msgstr "Cisco éèåå"
 
-#: ../sheets/Contact.sheet.in.h:5
-msgid "'set' output variable"
-msgstr "'set' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:3
+msgid "PC"
+msgstr "PC"
 
-#: ../sheets/Contact.sheet.in.h:6
-msgid "Components for LADDER circuits"
-msgstr "LADDER éèçåä"
+#: ../sheets/ciscocomputer.sheet.in.h:4
+msgid "Macintosh"
+msgstr "ééå"
 
-#: ../sheets/Contact.sheet.in.h:7
-msgid "Ladder"
-msgstr "Ladder"
+#: ../sheets/ciscocomputer.sheet.in.h:5
+msgid "Terminal"
+msgstr "ççæ"
 
-#: ../sheets/Contact.sheet.in.h:8
-msgid "Negative output variable"
-msgstr "èåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:6
+msgid "SUN workstation"
+msgstr "SUN åäç"
 
-#: ../sheets/Contact.sheet.in.h:9
-msgid "Power-saved 'reset' output variable"
-msgstr "çè 'reset' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:7
+msgid "CiscoWorks workstation"
+msgstr "CiscoWorks åäç"
 
-#: ../sheets/Contact.sheet.in.h:10
-msgid "Power-saved 'set' output variable"
-msgstr "çè 'set' èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:8
+msgid "PC Router Card"
+msgstr "PC èçåå"
 
-#: ../sheets/Contact.sheet.in.h:11
-msgid "Power-saved negative output variable"
-msgstr "çèèåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:9
+msgid "PC Software"
+msgstr "PC èé"
 
-#: ../sheets/Contact.sheet.in.h:12
-msgid "Power-saved simple output variable"
-msgstr "çèçåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:10
+msgid "PC with Router-Based Software"
+msgstr "åèçèéç PC"
 
-#: ../sheets/Contact.sheet.in.h:13
-msgid "Receptivity output variable"
-msgstr "Receptivity èåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:11
+msgid "Workgroup director"
+msgstr "åäçççç"
 
-#: ../sheets/Contact.sheet.in.h:14
-msgid "Simple output variable"
-msgstr "çåèåèæ"
+#: ../sheets/ciscocomputer.sheet.in.h:12
+msgid "CiscoSecurity"
+msgstr "CiscoSecurity"
 
-#: ../sheets/Cybernetics.sheet.in.h:1
-msgid "Constant factor below -1"
-msgstr "ååäæåæ -1"
+#: ../sheets/ciscocomputer.sheet.in.h:13
+msgid "Cisco CA"
+msgstr "Cisco CA"
 
-#: ../sheets/Cybernetics.sheet.in.h:2
-msgid "Constant factor between 0 and -1"
-msgstr "ååäæäæ 0 å -1"
+#: ../sheets/ciscocomputer.sheet.in.h:14
+msgid "WWW server"
+msgstr "WWW äæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:3
-msgid "Constant factor between 0 and 1"
-msgstr "ååäæäæ 0 å 1"
+#: ../sheets/ciscocomputer.sheet.in.h:15
+msgid "Web browser"
+msgstr "çéçèå"
 
-#: ../sheets/Cybernetics.sheet.in.h:4
-msgid "Constant factor greater 1"
-msgstr "ååäæåæ 1"
-
-#: ../sheets/Cybernetics.sheet.in.h:5
-msgid "Constant negative shift on the y-axis"
-msgstr "y èçèååç"
+#: ../sheets/ciscocomputer.sheet.in.h:16
+msgid "File Server"
+msgstr "ææäæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:6
-msgid "Constant positive shift on the y-axis"
-msgstr "y èçæååç"
+#: ../sheets/ciscocomputer.sheet.in.h:17
+msgid "Software-Based Router on File Server"
+msgstr "ææäæåäçèéèçå"
 
-#: ../sheets/Cybernetics.sheet.in.h:7
-msgid "Cybernetics"
-msgstr "æåè"
+#: ../sheets/ciscocomputer.sheet.in.h:18
+msgid "Server with PC Router"
+msgstr "å PC èççäæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:8
-msgid "Elements of cybernetic circuits"
-msgstr "æåéèåçåä"
+#: ../sheets/ciscocomputer.sheet.in.h:19
+msgid "IBM Tower"
+msgstr "IBM Tower"
 
-#: ../sheets/Cybernetics.sheet.in.h:9
-msgid "Full wave rectifier (absolute value)"
-msgstr "åæææå(çåå)"
+#: ../sheets/ciscocomputer.sheet.in.h:20
+msgid "IBM Mini (AS400)"
+msgstr "IBM Mini (AS400)"
 
-#: ../sheets/Cybernetics.sheet.in.h:10
-msgid "Half wave rectifier or ramp input"
-msgstr "åæææåæ ramp èå"
+#: ../sheets/ciscocomputer.sheet.in.h:21
+msgid "Front End Processor"
+msgstr "åçèçå"
 
-#: ../sheets/Cybernetics.sheet.in.h:11
-msgid "High pass filter"
-msgstr "ééææå"
+#: ../sheets/ciscocomputer.sheet.in.h:22
+msgid "IBM mainframe"
+msgstr "IBM mainframe"
 
-#: ../sheets/Cybernetics.sheet.in.h:12
-msgid "Integrator - input bottom"
-msgstr "çåå - èå(ä)"
+#: ../sheets/ciscocomputer.sheet.in.h:23
+msgid "IBM mainframe with FEP"
+msgstr "IBM mainframe (å FEP)"
 
-#: ../sheets/Cybernetics.sheet.in.h:13
-msgid "Integrator - input left"
-msgstr "çåå - èå(å)"
+#: ../sheets/ciscocomputer.sheet.in.h:24
+msgid "HP Mini"
+msgstr "HP Mini"
 
-#: ../sheets/Cybernetics.sheet.in.h:14
-msgid "Integrator - input right"
-msgstr "çåå - èå(å)"
+#: ../sheets/ciscocomputer.sheet.in.h:25
+msgid "Supercomputer"
+msgstr "èçéè"
 
-#: ../sheets/Cybernetics.sheet.in.h:15
-msgid "Integrator - input top"
-msgstr "çåå - èå(ä)"
+#: ../sheets/ciscocomputer.sheet.in.h:26
+msgid "Web cluster"
+msgstr "çéåé"
 
-#: ../sheets/Cybernetics.sheet.in.h:16
-msgid "Low pass filter"
-msgstr "äéææå"
+#: ../sheets/ciscocomputer.sheet.in.h:27
+msgid "Mini VAX"
+msgstr "Mini VAX"
 
-#: ../sheets/Cybernetics.sheet.in.h:17
-msgid "Product"
-msgstr "ç"
+#: ../sheets/ciscocomputer.sheet.in.h:28
+msgid "PC Card"
+msgstr "PC Card"
 
-#: ../sheets/Cybernetics.sheet.in.h:18
-msgid "Relay characteristic (sigma)"
-msgstr "çéåçæ(Î)"
+#: ../sheets/ciscocomputer.sheet.in.h:29 ../sheets/Lights.sheet.in.h:14
+msgid "Scanner"
+msgstr "ææå"
 
-#: ../sheets/Cybernetics.sheet.in.h:19
-msgid "Saturation characteristic"
-msgstr "éåçæ"
+#: ../sheets/ciscocomputer.sheet.in.h:30
+msgid "Tablet"
+msgstr "åæéè"
 
-#: ../sheets/Cybernetics.sheet.in.h:20
-msgid "Sensor - bottom"
-msgstr "åæå - ä"
+#: ../sheets/ciscocomputer.sheet.in.h:31
+msgid "EtherClient"
+msgstr "äååæç"
 
-#: ../sheets/Cybernetics.sheet.in.h:21
-msgid "Sensor - left"
-msgstr "åæå - å"
+#: ../sheets/ciscocomputer.sheet.in.h:32
+msgid "Handheld"
+msgstr "ææåèç"
 
-#: ../sheets/Cybernetics.sheet.in.h:22
-msgid "Sensor - right"
-msgstr "åæå - å"
+#: ../sheets/ciscocomputer.sheet.in.h:33
+msgid "Wireless"
+msgstr "çççè"
 
-#: ../sheets/Cybernetics.sheet.in.h:23
-msgid "Sensor - top"
-msgstr "åæå - ä"
+#: ../sheets/ciscocomputer.sheet.in.h:34
+msgid "PDA"
+msgstr "PDA"
 
-#: ../sheets/Cybernetics.sheet.in.h:24
-msgid "Sigmoid characteristic"
-msgstr "éåæçæ"
+#: ../sheets/ciscocomputer.sheet.in.h:35
+msgid "Newton"
+msgstr "Newton"
 
-#: ../sheets/Cybernetics.sheet.in.h:25
-msgid "Sine characteristic or input"
-msgstr "æåçææèå"
+#: ../sheets/ciscocomputer.sheet.in.h:36
+msgid "Laptop"
+msgstr "çèåéè"
 
-#: ../sheets/Cybernetics.sheet.in.h:26
-msgid "Sum"
-msgstr "å"
+#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+msgid "Monitor"
+msgstr "èå"
 
-#: ../sheets/Cybernetics.sheet.in.h:27
-msgid "Sum, subtracting bottom input"
-msgstr "åïæåäæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:39
+msgid "PC Video"
+msgstr "PC èè"
 
-#: ../sheets/Cybernetics.sheet.in.h:28
-msgid "Sum, subtracting left input"
-msgstr "åïæååæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:40
+msgid "Modem"
+msgstr "æææ"
 
-#: ../sheets/Cybernetics.sheet.in.h:29
-msgid "Sum, subtracting right input"
-msgstr "åïæååæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:41
+msgid "BBS"
+msgstr "BBS"
 
-#: ../sheets/Cybernetics.sheet.in.h:30
-msgid "Sum, subtracting top input"
-msgstr "åïæåäæèå"
+#: ../sheets/ciscocomputer.sheet.in.h:42
+msgid "MicroWebserver"
+msgstr "ååçéäæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:31
-msgid "Template for custom characteristics"
-msgstr "èèçæçææ"
+#: ../sheets/ciscocomputer.sheet.in.h:43
+msgid "Relational Database"
+msgstr "éèåèæå"
 
-#: ../sheets/Cybernetics.sheet.in.h:32
-msgid "Time delay"
-msgstr "æéåé"
+#: ../sheets/ciscocomputer.sheet.in.h:44
+msgid "Diskette"
+msgstr "èçç"
 
-#: ../sheets/ER.sheet.in.h:2
-msgid "ER"
-msgstr "ER"
+#: ../sheets/ciscocomputer.sheet.in.h:45
+msgid "Host"
+msgstr "äæ"
 
-#: ../sheets/ER.sheet.in.h:3
-msgid "Editor for Entity Relations Diagrams"
-msgstr "åééäåçèå"
+#: ../sheets/ciscocomputer.sheet.in.h:46
+msgid "Tape array"
+msgstr "çåéå"
 
-#: ../sheets/ER.sheet.in.h:5
-msgid "Participation"
-msgstr "åè"
+#: ../sheets/ciscocomputer.sheet.in.h:47
+msgid "Disk subsystem"
+msgstr "ççåçç"
 
-#: ../sheets/ER.sheet.in.h:7
-msgid "Weak entity"
-msgstr "ååé"
+#: ../sheets/ciscocomputer.sheet.in.h:48
+msgid "JBOD"
+msgstr "JBOD"
 
-#: ../sheets/Electric.sheet.in.h:1
-msgid "Components for electric circuits"
-msgstr "éèåçåä"
+#: ../sheets/ciscocomputer.sheet.in.h:49
+msgid "Storage array"
+msgstr "ååéå"
 
-#: ../sheets/Electric.sheet.in.h:2 ../sheets/Pneumatic.sheet.in.h:7
-msgid "Connection point"
-msgstr "éæé"
+#: ../sheets/ciscocomputer.sheet.in.h:50
+msgid "FC Storage"
+msgstr "FC ååèç"
 
-#: ../sheets/Electric.sheet.in.h:3
-msgid "Electric"
-msgstr "éå"
+#: ../sheets/ciscocomputer.sheet.in.h:51
+msgid "PC Adapter Card"
+msgstr "PC éæå"
 
-#: ../sheets/Electric.sheet.in.h:4
-msgid "Lamp or indicator light (horizontal)"
-msgstr "çææçåæ(æå)"
+#: ../sheets/ciscohub.sheet.in.h:1
+msgid "Cisco â Switch"
+msgstr "Cisco â äæå"
 
-#: ../sheets/Electric.sheet.in.h:5
-msgid "Lamp or indicator light (vertical)"
-msgstr "çææçåæ(åç)"
+#: ../sheets/ciscohub.sheet.in.h:2
+msgid "Router and switch shapes by Cisco"
+msgstr "ç Cisco æäçèçåèäæååå"
 
-#: ../sheets/Electric.sheet.in.h:6
-msgid "Normally closed contact (horizontal)"
-msgstr "äèææäééçèé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:3
+msgid "Router"
+msgstr "èçå"
 
-#: ../sheets/Electric.sheet.in.h:7
-msgid "Normally closed contact (vertical)"
-msgstr "äèææäééçèé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:4
+msgid "Router subdued"
+msgstr "æåçèçå"
 
-#: ../sheets/Electric.sheet.in.h:8
-msgid "Normally closed position switch (horizontal)"
-msgstr "äèææäééçäçéé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:5
+msgid "Router with Silicon Switch"
+msgstr "èçå (å Silicon Switch)"
 
-#: ../sheets/Electric.sheet.in.h:9
-msgid "Normally closed position switch (vertical)"
-msgstr "äèææäééçäçéé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:6
+msgid "NetFlow router"
+msgstr "NetFlow èçå"
 
-#: ../sheets/Electric.sheet.in.h:10
-msgid "Normally open contact (horizontal)"
-msgstr "äèææäéåçèé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:7
+msgid "Broadband router"
+msgstr "åéèçå"
 
-#: ../sheets/Electric.sheet.in.h:11
-msgid "Normally open contact (vertical)"
-msgstr "äèææäéåçèé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:8
+msgid "Wavelength router"
+msgstr "æéèçå"
 
-#: ../sheets/Electric.sheet.in.h:12
-msgid "Normally open position switch (horizontal)"
-msgstr "äèææäéåçäçéé(æå)"
+#: ../sheets/ciscohub.sheet.in.h:9
+msgid "Wireless router"
+msgstr "ççèçå"
 
-#: ../sheets/Electric.sheet.in.h:13
-msgid "Normally open position switch (vertical)"
-msgstr "äèææäéåçäçéé(åç)"
+#: ../sheets/ciscohub.sheet.in.h:10
+msgid "7507 Router"
+msgstr "7507 èçå"
 
-#: ../sheets/Electric.sheet.in.h:14
-msgid "Relay (horizontal)"
-msgstr "çéå(æå)"
+#: ../sheets/ciscohub.sheet.in.h:11
+msgid "7505 Router"
+msgstr "7505 èçå"
 
-#: ../sheets/Electric.sheet.in.h:15
-msgid "Relay (vertical)"
-msgstr "çéå(åç)"
+#: ../sheets/ciscohub.sheet.in.h:12
+msgid "7500ARS (7513) Router"
+msgstr "7500ARS (7513) èçå"
 
-#: ../sheets/Electric.sheet.in.h:16
-msgid "The command organ of a relay (horizontal)"
-msgstr "çéååäåå(æå)"
+#: ../sheets/ciscohub.sheet.in.h:13
+msgid "Edge Label Switch Router with NetFlow"
+msgstr ""
+
+#: ../sheets/ciscohub.sheet.in.h:14
+msgid "Edge Label Switch Router"
+msgstr "Edge Label Switch Router"
+
+#: ../sheets/ciscohub.sheet.in.h:15
+msgid "Router with Firewall"
+msgstr "åéçççèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:16
+msgid "Optical Services Router"
+msgstr "ååæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:17
+msgid "Content Router"
+msgstr "ååèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:18
+msgid "Carrier Routing System"
+msgstr "Carrier Routing System"
+
+#: ../sheets/ciscohub.sheet.in.h:19
+msgid "Storage Router"
+msgstr "ååèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:20
+msgid "NetSonar"
+msgstr "NetSonar"
+
+#: ../sheets/ciscohub.sheet.in.h:21
+msgid "Hub"
+msgstr "éçå"
+
+#: ../sheets/ciscohub.sheet.in.h:22
+msgid "Hub subdued"
+msgstr "æååéçå"
+
+#: ../sheets/ciscohub.sheet.in.h:23
+msgid "Cisco Hub"
+msgstr "Cisco éçå"
+
+#: ../sheets/ciscohub.sheet.in.h:24
+msgid "Small Hub"
+msgstr "ååéçå"
+
+#: ../sheets/ciscohub.sheet.in.h:25
+msgid "100BaseT Hub"
+msgstr "100BaseT éçå"
+
+#: ../sheets/ciscohub.sheet.in.h:26
+msgid "Workgroup switch"
+msgstr "Workgroup äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:27
+msgid "Workgroup switch Subdued"
+msgstr "Workgroup æååäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:28
+msgid "Workgroup Switch Voice-Enabled"
+msgstr "Workgroup äæåïèéï"
+
+#: ../sheets/ciscohub.sheet.in.h:29
+msgid "BBSM"
+msgstr "BBSM"
+
+#: ../sheets/ciscohub.sheet.in.h:30
+msgid "ATM Tag Switch Router"
+msgstr "ATM æèäæèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:31
+msgid "Switch Processor"
+msgstr "äæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:32
+msgid "Route Switch Processor"
+msgstr "èçäæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:33
+msgid "Route Switch Processor with Si"
+msgstr "èçäæåèçåïå Siï"
+
+#: ../sheets/ciscohub.sheet.in.h:34
+msgid "PXF"
+msgstr "PXF"
+
+#: ../sheets/ciscohub.sheet.in.h:35
+msgid "ASIC Processor"
+msgstr "ASIC èçå"
+
+#: ../sheets/ciscohub.sheet.in.h:36
+msgid "Generic Processor"
+msgstr "äèèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:37
+msgid "Data Center Switch"
+msgstr "èæäåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:38
+msgid "Data Center Switch Reversed"
+msgstr "èæäåäæåïååï"
+
+#: ../sheets/ciscohub.sheet.in.h:39
+msgid "Data Switch Processor"
+msgstr "èæäæåèçå"
+
+#: ../sheets/ciscohub.sheet.in.h:40
+msgid "Content Switch"
+msgstr "ååäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:41
+msgid "Content Service Module"
+msgstr "ååæåæç"
+
+#: ../sheets/ciscohub.sheet.in.h:42
+msgid "CSM-S"
+msgstr "CSM-S"
+
+#: ../sheets/ciscohub.sheet.in.h:43
+msgid "Access Gateway"
+msgstr "ååéèé"
+
+#: ../sheets/ciscohub.sheet.in.h:44
+msgid "ATM Switch"
+msgstr "ATM äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:45
+msgid "ATM 3800"
+msgstr "ATM 3800"
+
+#: ../sheets/ciscohub.sheet.in.h:46
+msgid "Cisco 1000"
+msgstr "Cisco 1000"
+
+#: ../sheets/ciscohub.sheet.in.h:47
+msgid "ISDN switch"
+msgstr "ISDN äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:48
+msgid "Label Switch Router"
+msgstr "æçäæåèïçå"
+
+#: ../sheets/ciscohub.sheet.in.h:49
+msgid "MultiSwitch Device"
+msgstr "MultiSwitch èç"
+
+#: ../sheets/ciscohub.sheet.in.h:50
+msgid "LAN2LAN Switch"
+msgstr "LAN2LAN äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:51
+msgid "Multilayer Switch"
+msgstr "Multilayer äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:52
+msgid "Multilayer Switch with Silicon"
+msgstr "Multilayer äæå (å Silicon)"
+
+#: ../sheets/ciscohub.sheet.in.h:53
+msgid "Multilayer Switch with Silicon subdued"
+msgstr "Multilayer äæå (å Siliconïæå)"
+
+#: ../sheets/ciscohub.sheet.in.h:54
+msgid "Programmable Switch"
+msgstr "åçååäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:55
+msgid "Content Service Switch 1100"
+msgstr "ååæåäæå 1100"
+
+#: ../sheets/ciscohub.sheet.in.h:56
+msgid "ATM Fast Gigabit Etherswitch"
+msgstr "ATM Fast Gigabit Etherswitch"
+
+#: ../sheets/ciscohub.sheet.in.h:57
+msgid "RateMUX"
+msgstr "RateMUX"
+
+#: ../sheets/ciscohub.sheet.in.h:58
+msgid "Workgroup 5500"
+msgstr "Workgroup 5500"
+
+#: ../sheets/ciscohub.sheet.in.h:59
+msgid "Workgroup 5000"
+msgstr "Workgroup 5000"
+
+#: ../sheets/ciscohub.sheet.in.h:60
+msgid "Workgroup 5002"
+msgstr "Workgroup 5002"
+
+#: ../sheets/ciscohub.sheet.in.h:61
+msgid "NetRanger"
+msgstr "NetRanger"
+
+#: ../sheets/ciscohub.sheet.in.h:62
+msgid "MGX 8220"
+msgstr "MGX 8220"
+
+#: ../sheets/ciscohub.sheet.in.h:63
+msgid "MGX 8240"
+msgstr "MGX 8240"
+
+#: ../sheets/ciscohub.sheet.in.h:64
+msgid "MGX 8260"
+msgstr "MGX 8260"
+
+#: ../sheets/ciscohub.sheet.in.h:65
+msgid "Universal Gateway"
+msgstr "éçéèé"
+
+#: ../sheets/ciscohub.sheet.in.h:66
+msgid "iSCSI switch"
+msgstr "iSCSI äæå"
+
+#: ../sheets/ciscohub.sheet.in.h:67
+msgid "Workgroup Fibre Channel intelligent switch"
+msgstr "Workgroup åçééææåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:68
+msgid "Director-class Fibre Channel intelligent switch"
+msgstr ""
+
+#: ../sheets/ciscohub.sheet.in.h:69
+msgid "Multi-Fabric Server Switch"
+msgstr "Multi-Fabric äæåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:70
+msgid "Server Switch"
+msgstr "äæåäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:71
+msgid "Multilayer Remote Switch"
+msgstr "Multilayer éçäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:72
+msgid "Layer 2 Remote Switch"
+msgstr "Layer 2 éçäæå"
+
+#: ../sheets/ciscohub.sheet.in.h:73
+msgid "Virtual Layer Switch"
+msgstr "Virtual Layer äæå"
+
+#: ../sheets/ciscomisc.sheet.in.h:1
+msgid "Cisco â Miscellaneous"
+msgstr "Cisco â åä"
+
+#: ../sheets/ciscomisc.sheet.in.h:2
+msgid "Miscellaneous shapes by Cisco"
+msgstr "Cisco æäçåååå"
+
+#: ../sheets/ciscomisc.sheet.in.h:3
+msgid "Government Building"
+msgstr "æååç"
+
+#: ../sheets/ciscomisc.sheet.in.h:4
+msgid "University"
+msgstr "åå"
+
+#: ../sheets/ciscomisc.sheet.in.h:5
+msgid "Small Business"
+msgstr "ååå"
+
+#: ../sheets/ciscomisc.sheet.in.h:6
+msgid "Home office"
+msgstr "ååèåå"
+
+#: ../sheets/ciscomisc.sheet.in.h:7
+msgid "Branch office"
+msgstr "åæèåå"
+
+#: ../sheets/ciscomisc.sheet.in.h:8
+msgid "Branch office subdued"
+msgstr "æåçåæèåå"
+
+#: ../sheets/ciscomisc.sheet.in.h:9
+msgid "Branch office blue"
+msgstr "åæèååè"
+
+#: ../sheets/ciscomisc.sheet.in.h:10
+msgid "Generic Building"
+msgstr "äèåç"
+
+#: ../sheets/ciscomisc.sheet.in.h:11
+msgid "Generic Building subdued"
+msgstr "äèåçïæåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:12
+msgid "Generic Building blue"
+msgstr "äèåçïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:13
+msgid "Medium Building"
+msgstr "äååç"
+
+#: ../sheets/ciscomisc.sheet.in.h:14
+msgid "Medium Building subdued"
+msgstr "äååçïæåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:15
+msgid "Medium Building blue"
+msgstr "äååçïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:16
+msgid "House"
+msgstr "äå"
+
+#: ../sheets/ciscomisc.sheet.in.h:17
+msgid "House blue"
+msgstr "äåïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:18
+msgid "Telecommuter house"
+msgstr "éåéåæäå"
+
+#: ../sheets/ciscomisc.sheet.in.h:19
+msgid "Telecommuter house subdued"
+msgstr "æåçéåéåæäå"
+
+#: ../sheets/ciscomisc.sheet.in.h:20
+msgid "MDU"
+msgstr "MDU"
+
+#: ../sheets/ciscomisc.sheet.in.h:21
+msgid "Man"
+msgstr "çä"
+
+#: ../sheets/ciscomisc.sheet.in.h:22
+msgid "Man red"
+msgstr "çäïçèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:23
+msgid "Man gold"
+msgstr "çäïéèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:24
+msgid "Man blue"
+msgstr "çäïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:25
+msgid "Standing Man"
+msgstr "ççççä"
+
+#: ../sheets/ciscomisc.sheet.in.h:26
+msgid "Standing woman"
+msgstr "çççåä"
+
+#: ../sheets/ciscomisc.sheet.in.h:27
+msgid "Woman"
+msgstr "åä"
+
+#: ../sheets/ciscomisc.sheet.in.h:28
+msgid "Woman red"
+msgstr "åäïçèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:29
+msgid "Woman gold"
+msgstr "åäïéèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:30
+msgid "Woman blue"
+msgstr "åäïèèï"
+
+#: ../sheets/ciscomisc.sheet.in.h:31
+msgid "Running man"
+msgstr "èæççä"
+
+#: ../sheets/ciscomisc.sheet.in.h:32
+msgid "Running man subdued"
+msgstr "èæççäïæåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:33
+msgid "Telecommuter"
+msgstr "éåéåæ"
+
+#: ../sheets/ciscomisc.sheet.in.h:34
+msgid "Running woman"
+msgstr "èæçåä"
+
+#: ../sheets/ciscomisc.sheet.in.h:35
+msgid "CiscoWorks Man"
+msgstr "CiscoWorks çä"
+
+#: ../sheets/ciscomisc.sheet.in.h:36
+msgid "PC Man left"
+msgstr "PC çäïåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:37
+msgid "PC Man"
+msgstr "PC çä"
+
+#: ../sheets/ciscomisc.sheet.in.h:38
+msgid "Sitting Woman"
+msgstr "åèçåä"
+
+#: ../sheets/ciscomisc.sheet.in.h:39
+msgid "Sitting Woman right"
+msgstr "åèçåäïåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:40
+msgid "Mac Woman"
+msgstr "Mac åä"
+
+#: ../sheets/ciscomisc.sheet.in.h:41
+msgid "Androgynous Person"
+msgstr "ééåéçä"
+
+#: ../sheets/ciscomisc.sheet.in.h:44
+msgid "Lock and Key"
+msgstr "éèéå"
+
+#: ../sheets/ciscomisc.sheet.in.h:45
+msgid "Satellite dish"
+msgstr "èæåç"
+
+#: ../sheets/ciscomisc.sheet.in.h:46
+msgid "Satellite"
+msgstr "èæ"
+
+#: ../sheets/ciscomisc.sheet.in.h:47
+msgid "Antenna"
+msgstr "åç"
+
+#: ../sheets/ciscomisc.sheet.in.h:48
+msgid "File cabinet"
+msgstr "æææ"
+
+#: ../sheets/ciscomisc.sheet.in.h:49
+msgid "Car"
+msgstr "è"
+
+#: ../sheets/ciscomisc.sheet.in.h:50
+msgid "Truck"
+msgstr "åè"
+
+#: ../sheets/ciscomisc.sheet.in.h:51
+msgid "Video Camera"
+msgstr "èèæåæ"
+
+#: ../sheets/ciscomisc.sheet.in.h:52
+msgid "Video Camera right"
+msgstr "èèæåæïåï"
+
+#: ../sheets/ciscomisc.sheet.in.h:54
+msgid "Headphones"
+msgstr "èæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:1
+msgid "Cisco â Network"
+msgstr "Cisco â çè"
+
+#: ../sheets/cisconetwork.sheet.in.h:2
+msgid "Network shapes by Cisco"
+msgstr "Cisco çèåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:3
+msgid "Network Management"
+msgstr "çèçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:4
+msgid "Detector"
+msgstr "åæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:5
+msgid "Protocol Translator"
+msgstr "ååèèå"
+
+#: ../sheets/cisconetwork.sheet.in.h:6
+msgid "IP"
+msgstr "IP"
+
+#: ../sheets/cisconetwork.sheet.in.h:7
+msgid "IP Old-style"
+msgstr "IP èå"
+
+#: ../sheets/cisconetwork.sheet.in.h:8
+msgid "NAT"
+msgstr "NAT"
+
+#: ../sheets/cisconetwork.sheet.in.h:9
+msgid "VIP"
+msgstr "VIP"
+
+#: ../sheets/cisconetwork.sheet.in.h:10
+msgid "Terminal Server"
+msgstr "ççäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:11
+msgid "Access Server"
+msgstr "ååäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:12
+msgid "System controller"
+msgstr "ççæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:13
+msgid "Directory Server"
+msgstr "çéäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:14
+msgid "Firewall"
+msgstr "éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:15
+msgid "Firewall subdued"
+msgstr "éççïæåï"
+
+#: ../sheets/cisconetwork.sheet.in.h:16
+msgid "Firewall horizontal"
+msgstr "éççïæåï"
+
+#: ../sheets/cisconetwork.sheet.in.h:17
+msgid "Firewall Service Module"
+msgstr "éççæåæç"
+
+#: ../sheets/cisconetwork.sheet.in.h:18
+msgid "IOS Firewall"
+msgstr "IOS éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:19
+msgid "PIX Firewall"
+msgstr "PIX éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:20
+msgid "PIX Firewall Left"
+msgstr "PIX éççïåï"
+
+#: ../sheets/cisconetwork.sheet.in.h:21
+msgid "Centri Firewall"
+msgstr "Centri éçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:23
+msgid "Security appliance"
+msgstr "äååå"
+
+#: ../sheets/cisconetwork.sheet.in.h:24
+msgid "VPN Concentrator"
+msgstr "VPN Concentrator"
+
+#: ../sheets/cisconetwork.sheet.in.h:25
+msgid "VPN Gateway"
+msgstr "VPN éèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:26
+msgid "LAN to LAN"
+msgstr "LAN to LAN"
+
+#: ../sheets/cisconetwork.sheet.in.h:27
+msgid "SSL Terminator"
+msgstr "SSL ççæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:28
+msgid "IP DSL Switch"
+msgstr "IP DSL äæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:29
+msgid "DSLAM"
+msgstr "DSLAM"
+
+#: ../sheets/cisconetwork.sheet.in.h:30
+msgid "Cable Modem"
+msgstr "ççæææ"
+
+#: ../sheets/cisconetwork.sheet.in.h:31
+msgid "Wireless Connectivity"
+msgstr "çççèéç"
+
+#: ../sheets/cisconetwork.sheet.in.h:32
+msgid "Wireless Transport"
+msgstr "ççèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:33
+msgid "AccessPoint"
+msgstr "ååé"
+
+#: ../sheets/cisconetwork.sheet.in.h:34
+msgid "Wireless Bridge"
+msgstr "ççææå"
+
+#: ../sheets/cisconetwork.sheet.in.h:35
+msgid "Dual Mode AccessPoint"
+msgstr "éæåååé"
+
+#: ../sheets/cisconetwork.sheet.in.h:36
+msgid "Wi-Fi Tag"
+msgstr "Wi-Fi èè"
+
+#: ../sheets/cisconetwork.sheet.in.h:37
+msgid "Wireless Location Appliance"
+msgstr "ççäçåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:38
+msgid "Location server"
+msgstr "äçäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:39
+msgid "Lightweight AP"
+msgstr "èå AP"
+
+#: ../sheets/cisconetwork.sheet.in.h:40
+msgid "WLAN controller"
+msgstr "çççèæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:41
+msgid "BBFW"
+msgstr "BBFW"
+
+#: ../sheets/cisconetwork.sheet.in.h:42
+msgid "BBFW media"
+msgstr "BBFW åé"
 
-#: ../sheets/Electric.sheet.in.h:17
-msgid "The command organ of a relay (vertical)"
-msgstr "çéååäåå(åç)"
+#: ../sheets/cisconetwork.sheet.in.h:43
+msgid "Channelized Pipe"
+msgstr "ééåçé"
 
-#: ../sheets/FS.sheet.in.h:1
-msgid "Editor for Function Structure Diagrams."
-msgstr "ååçæåèçèåã"
+#: ../sheets/cisconetwork.sheet.in.h:44
+msgid "Concatenated Payload"
+msgstr ""
 
-#: ../sheets/FS.sheet.in.h:2
-msgid "FS"
-msgstr "FS"
+#: ../sheets/cisconetwork.sheet.in.h:45
+msgid "Optical Cross-Connect"
+msgstr "ååäåéæ"
 
-#: ../sheets/FS.sheet.in.h:3
-msgid "Flow"
-msgstr "æç"
+#: ../sheets/cisconetwork.sheet.in.h:46
+msgid "Optical Transport"
+msgstr "åååè"
 
-#: ../sheets/FS.sheet.in.h:4
-msgid "Function"
-msgstr "åå"
+#: ../sheets/cisconetwork.sheet.in.h:47
+msgid "Optical Fiber"
+msgstr "åç"
 
-#: ../sheets/FS.sheet.in.h:5
-msgid "Orthogonal polyline flow"
+#: ../sheets/cisconetwork.sheet.in.h:48
+msgid "Optical Amplifier"
+msgstr "ååæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:49
+msgid "Digital Cross-Connect"
+msgstr "æääåéç"
+
+#: ../sheets/cisconetwork.sheet.in.h:50
+msgid "IP Transport Concentrator"
 msgstr ""
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:2
-msgid "Collate"
-msgstr "æå"
+#: ../sheets/cisconetwork.sheet.in.h:51
+msgid "DWDM Filter"
+msgstr "DWDM éæå"
 
-#: ../sheets/Flowchart.sheet.in.h:3
-msgid "Connector"
-msgstr "éæå"
+#: ../sheets/cisconetwork.sheet.in.h:52
+msgid "WDM"
+msgstr "WDM"
 
-#: ../sheets/Flowchart.sheet.in.h:4
-msgid "Data source"
-msgstr "èæäæ"
+#: ../sheets/cisconetwork.sheet.in.h:53
+msgid "15200"
+msgstr "15200"
 
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:4
-msgid "Decision"
-msgstr "æç"
+#: ../sheets/cisconetwork.sheet.in.h:54
+msgid "15800"
+msgstr "15800"
 
-#: ../sheets/Flowchart.sheet.in.h:6
-msgid "Delay"
-msgstr "åé"
+#: ../sheets/cisconetwork.sheet.in.h:55
+msgid "ONS15104"
+msgstr "ONS15104"
+
+#: ../sheets/cisconetwork.sheet.in.h:56
+msgid "10700"
+msgstr "10700"
+
+#: ../sheets/cisconetwork.sheet.in.h:57
+msgid "Metro 1500"
+msgstr "Metro 1500"
+
+#: ../sheets/cisconetwork.sheet.in.h:58
+msgid "ONS15540"
+msgstr "ONS15540"
+
+#: ../sheets/cisconetwork.sheet.in.h:59
+msgid "Automatic Protection Switching"
+msgstr "èåäèäæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:60
+msgid "RPS"
+msgstr "RPS"
+
+#: ../sheets/cisconetwork.sheet.in.h:61
+msgid "UPS"
+msgstr "äæéçç"
+
+#: ../sheets/cisconetwork.sheet.in.h:62
+msgid "LongReach CPE"
+msgstr "LongReach CPE"
+
+#: ../sheets/cisconetwork.sheet.in.h:63
+msgid "3X74 (floor) cluster controller"
+msgstr "3X74 (åé) åéæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:64
+msgid "3174 (desktop) cluster controller"
+msgstr "3174 (æé) åéæåå"
+
+#: ../sheets/cisconetwork.sheet.in.h:65
+msgid "CSU/DSU"
+msgstr "CSU/DSU"
+
+#: ../sheets/cisconetwork.sheet.in.h:66
+msgid "WAN"
+msgstr "WAN"
+
+#: ../sheets/cisconetwork.sheet.in.h:67
+msgid "Cloud"
+msgstr "é"
+
+#: ../sheets/cisconetwork.sheet.in.h:68
+msgid "Cloud Gold"
+msgstr "éïéèï"
+
+#: ../sheets/cisconetwork.sheet.in.h:69
+msgid "Cloud White"
+msgstr "éïçèï"
+
+#: ../sheets/cisconetwork.sheet.in.h:70
+msgid "Cloud Dark"
+msgstr "éïæï"
+
+#: ../sheets/cisconetwork.sheet.in.h:71
+msgid "Distributed Director"
+msgstr "æäååå"
+
+#: ../sheets/cisconetwork.sheet.in.h:72
+msgid "LocalDirector"
+msgstr "LocalDirector"
+
+#: ../sheets/cisconetwork.sheet.in.h:73
+msgid "IOS SLB"
+msgstr "IOS SLB"
+
+#: ../sheets/cisconetwork.sheet.in.h:74
+msgid "MUX"
+msgstr "MUX"
+
+#: ../sheets/cisconetwork.sheet.in.h:75
+msgid "General Appliance"
+msgstr "äèåå"
+
+#. compatibility
+#. <alias name="Cisco - PAD"/>
+#: ../sheets/cisconetwork.sheet.in.h:78
+msgid "PAD"
+msgstr "PAD"
+
+#: ../sheets/cisconetwork.sheet.in.h:79
+msgid "CDDI/FDDI Concentrator"
+msgstr "CDDI/FDDI Concentrator"
+
+#: ../sheets/cisconetwork.sheet.in.h:80
+msgid "FDDI Ring"
+msgstr "FDDI ç"
+
+#: ../sheets/cisconetwork.sheet.in.h:81
+msgid "TokenRing"
+msgstr "èèç"
+
+#: ../sheets/cisconetwork.sheet.in.h:82
+msgid "MAU"
+msgstr "MAU"
+
+#: ../sheets/cisconetwork.sheet.in.h:83
+msgid "Repeater"
+msgstr "äçå"
+
+#: ../sheets/cisconetwork.sheet.in.h:84
+msgid "Bridge"
+msgstr "ææå"
+
+#: ../sheets/cisconetwork.sheet.in.h:85
+msgid "Breakout box"
+msgstr "æäååæç(breakout box)"
+
+#: ../sheets/cisconetwork.sheet.in.h:86
+msgid "STB (set top box)"
+msgstr "STB (æéç)"
+
+#: ../sheets/cisconetwork.sheet.in.h:87
+msgid "TV"
+msgstr "éè"
+
+#: ../sheets/cisconetwork.sheet.in.h:88
+msgid "IPTV broadcast server"
+msgstr "IPTV åæäæå"
+
+#: ../sheets/cisconetwork.sheet.in.h:89
+msgid "IPTV content manager"
+msgstr "IPTV ååççå"
+
+#: ../sheets/cisconetwork.sheet.in.h:90
+msgid "VN2900"
+msgstr "VN2900"
+
+#: ../sheets/cisconetwork.sheet.in.h:91
+msgid "VN5902"
+msgstr "VN5902"
+
+#: ../sheets/cisconetwork.sheet.in.h:92
+msgid "VN5900"
+msgstr "VN5900"
+
+#: ../sheets/cisconetwork.sheet.in.h:93
+msgid "Catalyst Access Gateway"
+msgstr "Catalyst ååééå"
+
+#: ../sheets/cisconetwork.sheet.in.h:94
+msgid "Generic Gateway"
+msgstr "äèéèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:95
+msgid "TransPath"
+msgstr "TransPath"
+
+#: ../sheets/cisconetwork.sheet.in.h:96
+msgid "uBR910 Cable DSU"
+msgstr "uBR910 Cable DSU"
+
+#: ../sheets/cisconetwork.sheet.in.h:97
+msgid "Storage Solution Engine"
+msgstr "ååææåæ"
+
+#: ../sheets/cisconetwork.sheet.in.h:98
+msgid "Content Engine (Cache Director)"
+msgstr "åååæ(ååååå)"
+
+#: ../sheets/cisconetwork.sheet.in.h:99
+msgid "CDM Content Distribution Manager"
+msgstr "CDM Content Distribution Manager"
+
+#: ../sheets/cisconetwork.sheet.in.h:100
+msgid "Content Transformation Engine (CTE)"
+msgstr "ååèæåæ (CTE)"
+
+#: ../sheets/cisconetwork.sheet.in.h:101
+msgid "ME 1100"
+msgstr "ME 1100"
+
+#: ../sheets/cisconetwork.sheet.in.h:102
+msgid "MAS Gateway"
+msgstr "MAS éèé"
+
+#: ../sheets/cisconetwork.sheet.in.h:103
+msgid "File Engine"
+msgstr "ææåæ"
 
-#: ../sheets/Flowchart.sheet.in.h:8
-msgid "Document"
-msgstr "æä"
+#: ../sheets/cisconetwork.sheet.in.h:104
+msgid "Service Control"
+msgstr "æåæå"
 
-#: ../sheets/Flowchart.sheet.in.h:10
-msgid "Flowchart"
-msgstr "æçå"
+#: ../sheets/ciscotelephony.sheet.in.h:1
+msgid "Cisco â Telephony"
+msgstr "Cisco â éèéè"
 
-#: ../sheets/Flowchart.sheet.in.h:11
-msgid "Input/Output"
-msgstr "èå/èå"
+#: ../sheets/ciscotelephony.sheet.in.h:2
+msgid "Telephony shapes by Cisco"
+msgstr "Cisco æäçéèéèåå"
 
-#: ../sheets/Flowchart.sheet.in.h:12
-msgid "Internal storage"
-msgstr "åéååå"
+#: ../sheets/ciscotelephony.sheet.in.h:3
+msgid "Phone"
+msgstr "éè"
 
-#: ../sheets/Flowchart.sheet.in.h:13
-msgid "Magnetic disk"
-msgstr "çç"
+#: ../sheets/ciscotelephony.sheet.in.h:4
+msgid "Phone 2"
+msgstr "éè 2"
 
-#: ../sheets/Flowchart.sheet.in.h:14
-msgid "Magnetic drum"
-msgstr "çé"
+#: ../sheets/ciscotelephony.sheet.in.h:5
+msgid "Phone Ethernet"
+msgstr "éèäåçè"
 
-#: ../sheets/Flowchart.sheet.in.h:15
-msgid "Magnetic tape"
-msgstr "çå"
+#: ../sheets/ciscotelephony.sheet.in.h:6
+msgid "Phone Appliance"
+msgstr "éèèç"
 
-#: ../sheets/Flowchart.sheet.in.h:16
-msgid "Manual input"
-msgstr "äæèå"
+#: ../sheets/ciscotelephony.sheet.in.h:7
+msgid "Phone Feature"
+msgstr "éèåè"
 
-#: ../sheets/Flowchart.sheet.in.h:17
-msgid "Manual operation"
-msgstr "äææä"
+#: ../sheets/ciscotelephony.sheet.in.h:8
+msgid "Phone/Fax"
+msgstr "éè/åç"
 
-#: ../sheets/Flowchart.sheet.in.h:18
-msgid "Merge"
-msgstr "åä"
+#: ../sheets/ciscotelephony.sheet.in.h:9
+msgid "HootPhone"
+msgstr "HootPhone"
 
-#: ../sheets/Flowchart.sheet.in.h:19
-msgid "Objects to draw flowcharts"
-msgstr "ççæçåçççä"
+#: ../sheets/ciscotelephony.sheet.in.h:10
+msgid "IP Phone"
+msgstr "IP éè"
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:21
-msgid "Off page connector"
-msgstr "ééåéæå"
+#: ../sheets/ciscotelephony.sheet.in.h:11
+msgid "IP Softphone"
+msgstr "IP èééè"
 
-#: ../sheets/Flowchart.sheet.in.h:22
-msgid "Offline storage"
-msgstr "éçåå"
+#: ../sheets/ciscotelephony.sheet.in.h:12
+msgid "Softphone"
+msgstr "èééè"
 
-#: ../sheets/Flowchart.sheet.in.h:23
-msgid "Or"
-msgstr "æ"
+#: ../sheets/ciscotelephony.sheet.in.h:13
+msgid "Cellular Phone"
+msgstr "èåéè"
 
-#: ../sheets/Flowchart.sheet.in.h:24
-msgid "Predefined process"
-msgstr "éååçççå"
+#: ../sheets/ciscotelephony.sheet.in.h:14
+msgid "Mobile Access IP Phone"
+msgstr "èååå IP éè"
 
-#: ../sheets/Flowchart.sheet.in.h:25
-msgid "Preparation"
-msgstr "æå"
+#: ../sheets/ciscotelephony.sheet.in.h:15
+msgid "Pager"
+msgstr "ååå"
 
-#: ../sheets/Flowchart.sheet.in.h:26
-msgid "Process/Auxiliary Operation"
-msgstr "çå/èåæä"
+#: ../sheets/ciscotelephony.sheet.in.h:16
+msgid "Fax"
+msgstr "åç"
 
-#: ../sheets/Flowchart.sheet.in.h:27
-msgid "Punched card"
-msgstr "çååç"
+#: ../sheets/ciscotelephony.sheet.in.h:17
+msgid "Turret"
+msgstr "åæå(Turret)"
 
-#: ../sheets/Flowchart.sheet.in.h:28
-msgid "Punched tape"
-msgstr "çåçå"
+#: ../sheets/ciscotelephony.sheet.in.h:18
+msgid "Octel"
+msgstr "Octel"
 
-#: ../sheets/Flowchart.sheet.in.h:29
-msgid "Sort"
-msgstr "æå"
+#: ../sheets/ciscotelephony.sheet.in.h:19
+msgid "Radio Tower"
+msgstr "ççéå"
 
-#. XXX
-#: ../sheets/Flowchart.sheet.in.h:31
-msgid "Summing junction"
-msgstr "éççé"
+#: ../sheets/ciscotelephony.sheet.in.h:20
+msgid "PBX"
+msgstr "PBX"
 
-#: ../sheets/Flowchart.sheet.in.h:32
-msgid "Terminal Interrupt"
-msgstr "ççäæ"
+#: ../sheets/ciscotelephony.sheet.in.h:21
+msgid "PBX Switch"
+msgstr "PBX äæå"
 
-#: ../sheets/Flowchart.sheet.in.h:33
-msgid "Transaction file"
-msgstr "èçææ"
+#: ../sheets/ciscotelephony.sheet.in.h:22
+msgid "Class 4/5 switch"
+msgstr "Class 4/5 äæå"
 
-#: ../sheets/Flowchart.sheet.in.h:34
-msgid "Transmittal tape"
-msgstr "åéå"
+#: ../sheets/ciscotelephony.sheet.in.h:23
+msgid "SONET MUX"
+msgstr "SONET MUX"
 
-#: ../sheets/GRAFCET.sheet.in.h:1
-msgid "AND vergent"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:24
+msgid "ADM"
+msgstr "ADM"
 
-#: ../sheets/GRAFCET.sheet.in.h:2
-msgid "Action to associate to a step"
-msgstr "èæéçåçåä"
+#: ../sheets/ciscotelephony.sheet.in.h:25
+msgid "ITP"
+msgstr "ITP"
 
-#: ../sheets/GRAFCET.sheet.in.h:3
-msgid "Arc (upward)"
-msgstr "åç (åä)"
+#: ../sheets/ciscotelephony.sheet.in.h:26
+msgid "ATA"
+msgstr "ATA"
 
-#: ../sheets/GRAFCET.sheet.in.h:4
-msgid "Condition (of an action)"
-msgstr "(æåäç)æä"
+#: ../sheets/ciscotelephony.sheet.in.h:27
+msgid "SIP Proxy Server"
+msgstr "SIP äçäæå"
 
-#: ../sheets/GRAFCET.sheet.in.h:5
-msgid "GRAFCET"
-msgstr "GRAFCET"
+#: ../sheets/ciscotelephony.sheet.in.h:28
+msgid "Gatekeeper"
+msgstr "Gatekeeper"
 
-#: ../sheets/GRAFCET.sheet.in.h:10
-msgid "Macro sub-program call step"
-msgstr "åéåçåååæé"
+#: ../sheets/ciscotelephony.sheet.in.h:29
+msgid "MGX 8000 Series Voice Gateway"
+msgstr "MGX 8000 çåèéééå"
 
-#: ../sheets/GRAFCET.sheet.in.h:11
-msgid "OR vergent"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:30
+msgid "End Office"
+msgstr "ççèåå"
 
-#: ../sheets/GRAFCET.sheet.in.h:12
-msgid "Objects to design GRAFCET charts"
-msgstr "èè GRAFCET åèæéççä"
+#: ../sheets/ciscotelephony.sheet.in.h:31
+msgid "Voice-Enabled Access Server"
+msgstr "åèéåèçååäæå"
 
-#: ../sheets/GRAFCET.sheet.in.h:14 ../sheets/UML.sheet.in.h:30
-msgid "Transition"
-msgstr "æç"
+#: ../sheets/ciscotelephony.sheet.in.h:32
+msgid "Voice-Enabled Router"
+msgstr "åèéåèçèçå"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:1
-msgid "Alternate external entity"
-msgstr "æäåéåé"
+#: ../sheets/ciscotelephony.sheet.in.h:33
+msgid "Voice-Enabled ATM Switch"
+msgstr "åèéåèç ATM äæå"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
-msgid "Data store"
-msgstr "èæèå"
+#: ../sheets/ciscotelephony.sheet.in.h:34
+msgid "CallManager"
+msgstr "CallManager"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
-msgid "External entity"
-msgstr "åéåé"
+#: ../sheets/ciscotelephony.sheet.in.h:35
+msgid "IP Telephony Router"
+msgstr "IP éèéèèçå"
 
-#. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
-msgid "Gane and Sarson"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:36
+msgid "Mobile Access Router"
+msgstr "èåååèçå"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
-msgid "Gane and Sarson DFD"
-msgstr ""
+#: ../sheets/ciscotelephony.sheet.in.h:37
+msgid "H.323"
+msgstr "H.323"
 
-#: ../sheets/IsometricMap.sheet.in.h:1
-msgid "Block 1, 2:4"
-msgstr "åå 1, 2:4"
+#: ../sheets/ciscotelephony.sheet.in.h:38
+msgid "STP"
+msgstr "STP"
 
-#: ../sheets/IsometricMap.sheet.in.h:2
-msgid "Block 2, 2:8"
-msgstr "åå 2, 2:8"
+#: ../sheets/ciscotelephony.sheet.in.h:39
+msgid "BTS 10200"
+msgstr "BTS 10200"
 
-#: ../sheets/IsometricMap.sheet.in.h:3
-msgid "Block 3, 4:4"
-msgstr "åå 3, 4:4"
+#: ../sheets/ciscotelephony.sheet.in.h:40
+msgid "Generic softswitch"
+msgstr "äèèéäæå"
 
-#: ../sheets/IsometricMap.sheet.in.h:4
-msgid "Block 4, 4:8"
-msgstr "åå 4, 4:8"
+#: ../sheets/ciscotelephony.sheet.in.h:41
+msgid "SC2200/VSC3000 host"
+msgstr "SC2200/VSC3000 äæ"
 
-#: ../sheets/IsometricMap.sheet.in.h:5
-msgid "Block 5, 3:3"
-msgstr "åå 5, 3:3"
+#: ../sheets/ciscotelephony.sheet.in.h:42
+msgid "Virtual switch controller (VSC 3000)"
+msgstr "èæäæåæåå (VSC 3000)"
 
-#: ../sheets/IsometricMap.sheet.in.h:6
-msgid "Block 6, 4:6"
-msgstr "åå 6, 4:6"
+#: ../sheets/ciscotelephony.sheet.in.h:43
+msgid "SC2200 (Signalling Controller)"
+msgstr "SC2200 (äèæåå)"
 
-#: ../sheets/IsometricMap.sheet.in.h:7
-msgid "Block 7"
-msgstr "åå 7"
+#: ../sheets/ciscotelephony.sheet.in.h:44
+msgid "MoH server (Music on Hold)"
+msgstr "MoH äæå (Music on Hold)"
 
-#: ../sheets/IsometricMap.sheet.in.h:8
-msgid "Car 1, Front View"
-msgstr "è 1, åèå"
+#: ../sheets/ciscotelephony.sheet.in.h:45
+msgid "TDM router"
+msgstr "TDM èçå"
 
-#: ../sheets/IsometricMap.sheet.in.h:9
-msgid "Car 2, Rear View"
-msgstr "è 2, åèå"
+#: ../sheets/ciscotelephony.sheet.in.h:46
+msgid "6701"
+msgstr "6701"
 
-#: ../sheets/IsometricMap.sheet.in.h:10
-msgid "Corner 1"
-msgstr "èè 1"
+#: ../sheets/ciscotelephony.sheet.in.h:47
+msgid "6705"
+msgstr "6705"
 
-#: ../sheets/IsometricMap.sheet.in.h:11
-msgid "Corner 2"
-msgstr "èè 2"
+#: ../sheets/ciscotelephony.sheet.in.h:48
+msgid "6732"
+msgstr "6732"
 
-#: ../sheets/IsometricMap.sheet.in.h:12
-msgid "Crossroads"
-msgstr "äåé"
+#: ../sheets/ciscotelephony.sheet.in.h:49
+msgid "IAD router"
+msgstr "IAD èçå"
 
-#: ../sheets/IsometricMap.sheet.in.h:13
-msgid "Elevated Road"
-msgstr "éæéè"
+#: ../sheets/ciscotelephony.sheet.in.h:50
+msgid "ICS"
+msgstr "ICS"
 
-#: ../sheets/IsometricMap.sheet.in.h:14
-msgid "Factory"
-msgstr "åå"
+#: ../sheets/ciscotelephony.sheet.in.h:51
+msgid "ICM"
+msgstr "ICM"
 
-#: ../sheets/IsometricMap.sheet.in.h:15
-msgid "Footbridge, Pedestrian Bridge"
-msgstr "èäåæ"
+#: ../sheets/ciscotelephony.sheet.in.h:52
+msgid "IntelliSwitch Stack"
+msgstr ""
 
-#. use dc:description instead?
-#: ../sheets/IsometricMap.sheet.in.h:17
-msgid "Isometric Directional Map Shapes"
-msgstr "Isometric Directional åååå"
+#: ../sheets/ciscotelephony.sheet.in.h:53
+msgid "Unity server"
+msgstr "Unity äæå"
 
-#: ../sheets/IsometricMap.sheet.in.h:18
-msgid "Long Straight Road Section"
-msgstr "éççéè"
+#: ../sheets/ciscotelephony.sheet.in.h:54
+msgid "Unity Express"
+msgstr "Unity Express"
 
-#. use dc:title instead?
-#: ../sheets/IsometricMap.sheet.in.h:20
-msgid "Map, Isometric"
-msgstr "åå, Isometric"
+#: ../sheets/ciscotelephony.sheet.in.h:55
+msgid "MCU"
+msgstr "MCU"
 
-#: ../sheets/IsometricMap.sheet.in.h:21
-msgid "One Way Road Sign"
-msgstr "åèéæè"
+#: ../sheets/ciscotelephony.sheet.in.h:56
+msgid "uMG series"
+msgstr "uMG çå"
 
-#: ../sheets/IsometricMap.sheet.in.h:22
-msgid "River"
-msgstr "æå"
+#: ../sheets/civil.sheet.in.h:1
+msgid "Civil"
+msgstr "åæåç"
 
-#: ../sheets/IsometricMap.sheet.in.h:23
-msgid "Road Section"
-msgstr "éè"
+#: ../sheets/civil.sheet.in.h:2
+msgid "Civil Engineering Components"
+msgstr "åæåçåä"
 
-#: ../sheets/IsometricMap.sheet.in.h:24
-msgid "Roof1"
-msgstr "åé1"
+#: ../sheets/civil.sheet.in.h:3
+msgid "Vertical rest"
+msgstr "åçæççææå"
 
-#: ../sheets/IsometricMap.sheet.in.h:25
-msgid "T-Junction"
-msgstr "äåè"
+#: ../sheets/civil.sheet.in.h:4
+msgid "Horizontal rest"
+msgstr "æåæççææå"
 
-#: ../sheets/IsometricMap.sheet.in.h:26
-msgid "Train 1, angled downward"
-msgstr "çè, äè"
+#: ../sheets/civil.sheet.in.h:5
+msgid "Bivalent vertical rest"
+msgstr "Bivalent åçææå"
 
-#: ../sheets/IsometricMap.sheet.in.h:27
-msgid "Train 2, angled upward"
-msgstr "çè 2, äè"
+#: ../sheets/civil.sheet.in.h:6
+msgid "Reference line"
+msgstr "åèç"
 
-#: ../sheets/IsometricMap.sheet.in.h:28
-msgid "Tree 1"
-msgstr "æ"
+#: ../sheets/civil.sheet.in.h:7
+msgid "Water level"
+msgstr "æä"
 
-#: ../sheets/Istar.sheet.in.h:1
-msgid "An i* agent"
-msgstr "An i* agent"
+#: ../sheets/civil.sheet.in.h:8
+msgid "Soil"
+msgstr "æå"
 
-#: ../sheets/Istar.sheet.in.h:2
-msgid "An i* decomposition link"
-msgstr "An i* decomposition link"
+#: ../sheets/civil.sheet.in.h:9
+msgid "Horizontally aligned arrow"
+msgstr "æåæåççé"
 
-#: ../sheets/Istar.sheet.in.h:3
-msgid "An i* dependency link"
-msgstr "An i* dependency link"
+#: ../sheets/civil.sheet.in.h:10
+msgid "Vertically aligned arrow"
+msgstr "åçæåççé"
 
-#: ../sheets/Istar.sheet.in.h:4
-msgid "An i* goal"
-msgstr "An i* goal"
+#: ../sheets/civil.sheet.in.h:11
+msgid "Horizontal limiting line"
+msgstr "æåéåç"
 
-#: ../sheets/Istar.sheet.in.h:5
-msgid "An i* means-ends link"
-msgstr "An i* means-ends link"
+#: ../sheets/civil.sheet.in.h:12
+msgid "Vertical limiting line"
+msgstr "åçéåç"
 
-#: ../sheets/Istar.sheet.in.h:6
-msgid "An i* negative contribution"
-msgstr "An i* negative contribution"
+#: ../sheets/civil.sheet.in.h:13
+msgid "Horizontally aligned pump"
+msgstr "æåæççæ"
 
-#: ../sheets/Istar.sheet.in.h:7
-msgid "An i* position"
-msgstr "An i* position"
+#: ../sheets/civil.sheet.in.h:14
+msgid "Vertically aligned pump"
+msgstr "åçæççæ"
 
-#: ../sheets/Istar.sheet.in.h:8
-msgid "An i* positive contribution"
-msgstr "An i* positive contribution"
+#: ../sheets/civil.sheet.in.h:15
+msgid "Horizontally aligned compressor"
+msgstr "æåæççåçæ"
 
-#: ../sheets/Istar.sheet.in.h:9
-msgid "An i* resource"
-msgstr "An i* resource"
+#: ../sheets/civil.sheet.in.h:16
+msgid "Vertically aligned compressor"
+msgstr "åçæççåçæ"
 
-#: ../sheets/Istar.sheet.in.h:10
-msgid "An i* role"
-msgstr "An i* role"
+#: ../sheets/civil.sheet.in.h:17
+msgid "Vertically aligned valve"
+msgstr "åçæççæå"
 
-#: ../sheets/Istar.sheet.in.h:11
-msgid "An i* softgoal"
-msgstr "An i* softgoal"
+#: ../sheets/civil.sheet.in.h:18
+msgid "Horizontally aligned valve"
+msgstr "æåæççæå"
 
-#: ../sheets/Istar.sheet.in.h:12
-msgid "An i* task"
-msgstr "An i* task"
+#: ../sheets/civil.sheet.in.h:19
+msgid "Backflow preventer"
+msgstr "éæéæèç"
 
-#: ../sheets/Istar.sheet.in.h:13
-msgid "An i* unspecified actor"
-msgstr "An i* unspecified actor"
+#: ../sheets/civil.sheet.in.h:20
+msgid "Motor"
+msgstr "éé"
 
-#: ../sheets/Istar.sheet.in.h:14
-msgid "An i* unspecified link"
-msgstr "An i* unspecified link"
+#: ../sheets/civil.sheet.in.h:21
+msgid "Gas bottle"
+msgstr "æç"
 
-#: ../sheets/Istar.sheet.in.h:15
-msgid "Objects to design i* diagrams"
-msgstr "èè i* åèæçççä"
+#: ../sheets/civil.sheet.in.h:22
+msgid "Frequency converter"
+msgstr "èéå"
 
-#: ../sheets/Istar.sheet.in.h:16
-msgid "RE-i*"
-msgstr "RE-i*"
+#: ../sheets/civil.sheet.in.h:23
+msgid "Vertically aligned propeller"
+msgstr "åçæççæéå"
 
-#: ../sheets/Jackson.sheet.in.h:1
-msgid "A Jackson designed domain"
-msgstr "Jackson èèççå"
+#: ../sheets/civil.sheet.in.h:24
+msgid "Aerator with bubbles"
+msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:2
-msgid "A Jackson given domain"
-msgstr "Jackson æåççå"
+#: ../sheets/civil.sheet.in.h:25
+msgid "Rotor"
+msgstr "èå"
 
-#: ../sheets/Jackson.sheet.in.h:3
-msgid "A Jackson machine domain"
-msgstr "Jackson éèçå"
+#: ../sheets/civil.sheet.in.h:26
+msgid "Final-settling basin"
+msgstr "æçæææ"
 
-#: ../sheets/Jackson.sheet.in.h:4
-msgid "A Jackson requirement"
-msgstr "Jackson èä"
+#: ../sheets/civil.sheet.in.h:27
+msgid "Preliminary clarification tank"
+msgstr ""
 
-#: ../sheets/Jackson.sheet.in.h:5
-msgid "A Jackson requirement phenomenon"
-msgstr "A Jackson requirement phenomenon"
+#: ../sheets/civil.sheet.in.h:28
+msgid "Basin"
+msgstr "ææ"
 
-#: ../sheets/Jackson.sheet.in.h:6
-msgid "A Jackson shared phenomenon"
-msgstr "A Jackson shared phenomenon"
+#: ../sheets/civil.sheet.in.h:29
+msgid "Container"
+msgstr "åå"
 
-#: ../sheets/Jackson.sheet.in.h:7
-msgid "Objects to design Jackson diagrams"
-msgstr "èè Jackson åèæçççä"
+#: ../sheets/Contact.sheet.in.h:1
+msgid "Ladder"
+msgstr "Ladder"
 
-#: ../sheets/Jackson.sheet.in.h:8
-msgid "RE-Jackson"
-msgstr "RE-Jackson"
+#: ../sheets/Contact.sheet.in.h:2
+msgid "Components for LADDER circuits"
+msgstr "LADDER éèçåä"
 
-#: ../sheets/KAOS.sheet.in.h:1
-msgid "A KAOS AND refinement"
-msgstr "A KAOS AND refinement"
+#: ../sheets/Contact.sheet.in.h:3
+msgid "'if' (normally open) ladder contact"
+msgstr "'if' (éåçéå) éæ ladder æè"
 
-#: ../sheets/KAOS.sheet.in.h:2
-msgid "A KAOS OR refinement"
-msgstr "A KAOS OR refinement"
+#: ../sheets/Contact.sheet.in.h:4
+msgid "'if not' (normally closed) ladder contact"
+msgstr "'if not' (éåçéé) éæ ladder æè"
 
-#: ../sheets/KAOS.sheet.in.h:3
-msgid "A KAOS agent"
-msgstr "KAOS äççå"
+#: ../sheets/Contact.sheet.in.h:5
+msgid "Simple output variable"
+msgstr "çåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:4
-msgid "A KAOS assumption"
-msgstr "KAOS åè"
+#: ../sheets/Contact.sheet.in.h:6
+msgid "Negative output variable"
+msgstr "èåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:5
-msgid "A KAOS binary conflict"
-msgstr "KAOS äåæèç"
+#: ../sheets/Contact.sheet.in.h:7
+msgid "'set' output variable"
+msgstr "'set' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:6
-msgid "A KAOS capable-of"
-msgstr "A KAOS capable-of"
+#: ../sheets/Contact.sheet.in.h:8
+msgid "'reset' output variable"
+msgstr "'reset' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:7
-msgid "A KAOS complete AND refinement"
-msgstr "A KAOS complete AND refinement"
+#: ../sheets/Contact.sheet.in.h:9
+msgid "'jump' output variable"
+msgstr "'jump' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:8
-msgid "A KAOS complete OR refinement"
-msgstr "A KAOS complete OR refinement"
+#: ../sheets/Contact.sheet.in.h:10
+msgid "Receptivity output variable"
+msgstr "Receptivity èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:9
-msgid "A KAOS contribution"
-msgstr "A KAOS contribution"
+#: ../sheets/Contact.sheet.in.h:11
+msgid "Power-saved simple output variable"
+msgstr "çèçåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:10
-msgid "A KAOS control link"
-msgstr "KAOS æåéç"
+#: ../sheets/Contact.sheet.in.h:12
+msgid "Power-saved negative output variable"
+msgstr "çèèåèåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:11
-msgid "A KAOS goal"
-msgstr "KAOS çæ"
+#: ../sheets/Contact.sheet.in.h:13
+msgid "Power-saved 'set' output variable"
+msgstr "çè 'set' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:12
-msgid "A KAOS input"
-msgstr "KAOS èå"
+#: ../sheets/Contact.sheet.in.h:14
+msgid "Power-saved 'reset' output variable"
+msgstr "çè 'reset' èåèæ"
 
-#: ../sheets/KAOS.sheet.in.h:13
-msgid "A KAOS monitor link"
-msgstr "KAOS éççæ"
+#: ../sheets/Cybernetics.sheet.in.h:1
+msgid "Cybernetics"
+msgstr "æåè"
 
-#: ../sheets/KAOS.sheet.in.h:14
-msgid "A KAOS obstacle"
-msgstr "KAOS åå"
+#: ../sheets/Cybernetics.sheet.in.h:2
+msgid "Elements of cybernetic circuits"
+msgstr "æåéèåçåä"
 
-#: ../sheets/KAOS.sheet.in.h:15
-msgid "A KAOS obstruction"
-msgstr "KAOS éçç"
+#: ../sheets/Cybernetics.sheet.in.h:3
+msgid "Sensor â left"
+msgstr "åæå â å"
 
-#: ../sheets/KAOS.sheet.in.h:16
-msgid "A KAOS operation"
-msgstr "KAOS æä"
+#: ../sheets/Cybernetics.sheet.in.h:4
+msgid "Sensor â right"
+msgstr "åæå â å"
 
-#: ../sheets/KAOS.sheet.in.h:17
-msgid "A KAOS operationalization"
-msgstr "A KAOS operationalization"
+#: ../sheets/Cybernetics.sheet.in.h:5
+msgid "Sensor â bottom"
+msgstr "åæå â ä"
 
-#: ../sheets/KAOS.sheet.in.h:18
-msgid "A KAOS output"
-msgstr "KAOS èå"
+#: ../sheets/Cybernetics.sheet.in.h:6
+msgid "Sensor â top"
+msgstr "åæå â ä"
 
-#: ../sheets/KAOS.sheet.in.h:19
-msgid "A KAOS performs"
-msgstr "KAOS åè"
+#: ../sheets/Cybernetics.sheet.in.h:7
+msgid "Sum, subtracting left input"
+msgstr "åïæååæèå"
 
-#: ../sheets/KAOS.sheet.in.h:20
-msgid "A KAOS requirement"
-msgstr "KAOS èä"
+#: ../sheets/Cybernetics.sheet.in.h:8
+msgid "Sum, subtracting right input"
+msgstr "åïæååæèå"
 
-#: ../sheets/KAOS.sheet.in.h:21
-msgid "A KAOS responsibility"
-msgstr "KAOS èä"
+#: ../sheets/Cybernetics.sheet.in.h:9
+msgid "Sum, subtracting bottom input"
+msgstr "åïæåäæèå"
 
-#: ../sheets/KAOS.sheet.in.h:22
-msgid "A KAOS softgoal"
-msgstr ""
+#: ../sheets/Cybernetics.sheet.in.h:10
+msgid "Sum, subtracting top input"
+msgstr "åïæåäæèå"
 
-#: ../sheets/KAOS.sheet.in.h:23
-msgid "Objects to design KAOS diagrams"
-msgstr "èè KAOS åèæçççä"
+#: ../sheets/Cybernetics.sheet.in.h:11
+msgid "Integrator â input left"
+msgstr "çåå â èå(å)"
 
-#: ../sheets/KAOS.sheet.in.h:24
-msgid "RE-KAOS"
-msgstr "RE-KAOS"
+#: ../sheets/Cybernetics.sheet.in.h:12
+msgid "Integrator â input right"
+msgstr "çåå â èå(å)"
 
-#: ../sheets/Logic.sheet.in.h:1
-msgid "AND gate"
-msgstr "åé"
+#: ../sheets/Cybernetics.sheet.in.h:13
+msgid "Integrator â input bottom"
+msgstr "çåå â èå(ä)"
 
-#: ../sheets/Logic.sheet.in.h:2
-msgid "Boolean Logic"
-msgstr "åæéè"
+#: ../sheets/Cybernetics.sheet.in.h:14
+msgid "Integrator â input top"
+msgstr "çåå â èå(ä)"
 
-#: ../sheets/Logic.sheet.in.h:3
-msgid "Crossconnector"
-msgstr ""
+#: ../sheets/Cybernetics.sheet.in.h:15
+msgid "Sum"
+msgstr "å"
 
-#: ../sheets/Logic.sheet.in.h:4 ../sheets/SISSI.sheet.in.h:27
-msgid "Inverter"
-msgstr "ææå"
+#: ../sheets/Cybernetics.sheet.in.h:16
+msgid "Product"
+msgstr "ç"
 
-#: ../sheets/Logic.sheet.in.h:5
-msgid "Logic"
-msgstr "éè"
+#: ../sheets/Cybernetics.sheet.in.h:17
+msgid "High pass filter"
+msgstr "ééææå"
 
-#: ../sheets/Logic.sheet.in.h:6
-msgid "NAND gate"
-msgstr "ååé"
+#: ../sheets/Cybernetics.sheet.in.h:18
+msgid "Low pass filter"
+msgstr "äéææå"
 
-#: ../sheets/Logic.sheet.in.h:7
-msgid "NOR gate"
-msgstr "åæé"
+#: ../sheets/Cybernetics.sheet.in.h:19
+msgid "Sine characteristic or input"
+msgstr "æåçææèå"
 
-#: ../sheets/Logic.sheet.in.h:8
-msgid "NOT"
-msgstr "åé"
+#: ../sheets/Cybernetics.sheet.in.h:20
+msgid "Sigmoid characteristic"
+msgstr "éåæçæ"
 
-#: ../sheets/Logic.sheet.in.h:9
-msgid "OR gate"
-msgstr "æé"
+#: ../sheets/Cybernetics.sheet.in.h:21
+msgid "Saturation characteristic"
+msgstr "éåçæ"
 
-#: ../sheets/Logic.sheet.in.h:10
-msgid "Simple buffer"
-msgstr "çåçè"
+#: ../sheets/Cybernetics.sheet.in.h:22
+msgid "Relay characteristic (sigma)"
+msgstr "çéåçæ(Î)"
 
-#: ../sheets/Logic.sheet.in.h:11
-msgid "XOR gate"
-msgstr "äææé"
+#: ../sheets/Cybernetics.sheet.in.h:23
+msgid "Half wave rectifier or ramp input"
+msgstr "åæææåæ ramp èå"
 
-#: ../sheets/MSE.sheet.in.h:1
-msgid "Demultiplexer"
-msgstr "ååå"
+#: ../sheets/Cybernetics.sheet.in.h:24
+msgid "Full wave rectifier (absolute value)"
+msgstr "åæææå(çåå)"
 
-#: ../sheets/MSE.sheet.in.h:2
-msgid "Large extension node"
-msgstr "ååäçé"
+#: ../sheets/Cybernetics.sheet.in.h:25
+msgid "Constant positive shift on the y-axis"
+msgstr "y èçæååç"
 
-#: ../sheets/MSE.sheet.in.h:3
-msgid "MSE"
-msgstr "MSE"
+#: ../sheets/Cybernetics.sheet.in.h:26
+msgid "Constant negative shift on the y-axis"
+msgstr "y èçèååç"
 
-#: ../sheets/MSE.sheet.in.h:4
-msgid "Multiplexer"
-msgstr "ååå"
+#: ../sheets/Cybernetics.sheet.in.h:27
+msgid "Constant factor greater 1"
+msgstr "ååäæåæ 1"
 
-#: ../sheets/MSE.sheet.in.h:5
-msgid "Node center"
-msgstr "çéäå"
+#: ../sheets/Cybernetics.sheet.in.h:28
+msgid "Constant factor between 0 and 1"
+msgstr "ååäæäæ 0 å 1"
 
-#: ../sheets/MSE.sheet.in.h:6
-msgid "Small extension node"
-msgstr "ååäçé"
+#: ../sheets/Cybernetics.sheet.in.h:29
+msgid "Constant factor between 0 and -1"
+msgstr "ååäæäæ 0 å -1"
 
-#: ../sheets/MSE.sheet.in.h:7
-msgid "Tactical satellite communications terminal"
-msgstr "æçèæéèççæ"
+#: ../sheets/Cybernetics.sheet.in.h:30
+msgid "Constant factor below -1"
+msgstr "ååäæåæ -1"
 
-#: ../sheets/MSE.sheet.in.h:8
-msgid "U.S. Army Mobile Subscriber Equipment Components"
-msgstr "çèæèååéèçç (Mobile Subscriber Equipment) åä"
+#: ../sheets/Cybernetics.sheet.in.h:31
+msgid "Template for custom characteristics"
+msgstr "èèçæçææ"
 
-#: ../sheets/Misc.sheet.in.h:2
-msgid "Folder"
-msgstr "èæå"
+#: ../sheets/Cybernetics.sheet.in.h:32
+msgid "Time delay"
+msgstr "æéåé"
 
-#: ../sheets/Misc.sheet.in.h:4
-msgid "Miscellaneous Shapes"
-msgstr "åååç"
+#: ../sheets/Database.sheet.in.h:1
+msgid "Database"
+msgstr "èæå"
 
-#: ../sheets/Misc.sheet.in.h:5
-msgid "New-style group object, for testing"
-msgstr ""
+#: ../sheets/Database.sheet.in.h:2
+msgid "Editor for Database Table Relation Diagrams"
+msgstr "èæåèæéäåçèå"
 
-#: ../sheets/Misc.sheet.in.h:6
-msgid "Traditional clock"
-msgstr "äèæé"
+#: ../sheets/Database.sheet.in.h:5
+msgid "Attribute compound"
+msgstr "åæèåçä"
 
-#: ../sheets/Pneumatic.sheet.in.h:1
-msgid "2/2 distributor"
-msgstr "2/2 åéå"
+#: ../sheets/Electric.sheet.in.h:1
+msgid "Electric"
+msgstr "éå"
 
-#: ../sheets/Pneumatic.sheet.in.h:2
-msgid "3/2 distributor"
-msgstr "3/2 åéå"
+#: ../sheets/Electric.sheet.in.h:2
+msgid "Components for electric circuits"
+msgstr "éèåçåä"
+
+#: ../sheets/Electric.sheet.in.h:3
+msgid "Normally open contact (horizontal)"
+msgstr "äèææäéåçèé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:3
-msgid "4/2 distributor"
-msgstr "4/2 åéå"
+#: ../sheets/Electric.sheet.in.h:4
+msgid "Normally closed contact (horizontal)"
+msgstr "äèææäééçèé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:4
-msgid "5/2 distributor"
-msgstr "5/2 åéå"
+#: ../sheets/Electric.sheet.in.h:5
+msgid "Normally open position switch (horizontal)"
+msgstr "äèææäéåçäçéé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:5
-msgid "Air exhaust orifice"
-msgstr "çææåå"
+#: ../sheets/Electric.sheet.in.h:6
+msgid "Normally closed position switch (horizontal)"
+msgstr "äèææäééçäçéé(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:6
-msgid "Components for pneumatic and hydraulic circuits"
-msgstr "æéååèæååéèåä"
+#: ../sheets/Electric.sheet.in.h:7
+msgid "Normally open contact (vertical)"
+msgstr "äèææäéåçèé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:8
-msgid "Double-effect jack"
-msgstr "Double-effect jack"
+#: ../sheets/Electric.sheet.in.h:8
+msgid "Normally closed contact (vertical)"
+msgstr "äèææäééçèé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:9
-msgid "Electric command (double coil)"
-msgstr "Electric command (double coil)"
+#: ../sheets/Electric.sheet.in.h:9
+msgid "Normally open position switch (vertical)"
+msgstr "äèææäéåçäçéé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:10
-msgid "Electric command (single coil)"
-msgstr "Electric command (single coil)"
+#: ../sheets/Electric.sheet.in.h:10
+msgid "Normally closed position switch (vertical)"
+msgstr "äèææäééçäçéé(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:11
-msgid "Generic pressure source"
-msgstr "äèååäæ"
+#: ../sheets/Electric.sheet.in.h:11
+msgid "The command organ of a relay (horizontal)"
+msgstr "çéååäåå(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:12
-msgid "Hydraulic pressure source"
-msgstr "æåäæ"
+#: ../sheets/Electric.sheet.in.h:12
+msgid "Relay (horizontal)"
+msgstr "çéå(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:13
-msgid "Indirect command by hydraulic driver"
-msgstr "Indirect command by hydraulic driver"
+#: ../sheets/Electric.sheet.in.h:13
+msgid "Lamp or indicator light (horizontal)"
+msgstr "çææçåæ(æå)"
 
-#: ../sheets/Pneumatic.sheet.in.h:14
-msgid "Indirect command by pneumatic driver"
-msgstr "Indirect command by pneumatic driver"
+#: ../sheets/Electric.sheet.in.h:14
+msgid "The command organ of a relay (vertical)"
+msgstr "çéååäåå(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:15
-msgid "Mechanical command by spring"
-msgstr "Mechanical command by spring"
+#: ../sheets/Electric.sheet.in.h:15
+msgid "Relay (vertical)"
+msgstr "çéå(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:16
-msgid "Mechanical command by tappet"
-msgstr "Mechanical command by tappet"
+#: ../sheets/Electric.sheet.in.h:16
+msgid "Lamp or indicator light (vertical)"
+msgstr "çææçåæ(åç)"
 
-#: ../sheets/Pneumatic.sheet.in.h:17
-msgid "Muscular command"
-msgstr "Muscular command"
+#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+msgid "Connection point"
+msgstr "éæé"
 
-#: ../sheets/Pneumatic.sheet.in.h:18
-msgid "Normally-in simple-effect jack"
-msgstr "Normally-in simple-effect jack"
+#: ../sheets/ER.sheet.in.h:1
+msgid "ER"
+msgstr "ER"
 
-#: ../sheets/Pneumatic.sheet.in.h:19
-msgid "Normally-out simple-effect jack"
-msgstr "Normally-out simple-effect jack"
+#: ../sheets/ER.sheet.in.h:2
+msgid "Editor for Entity Relations Diagrams"
+msgstr "åééäåçèå"
 
-#: ../sheets/Pneumatic.sheet.in.h:20
-msgid "Pneumatic pressure source"
-msgstr "æåäæ"
+#: ../sheets/ER.sheet.in.h:4
+msgid "Weak entity"
+msgstr "ååé"
 
-#: ../sheets/Pneumatic.sheet.in.h:21
-msgid "Pneumatic/Hydraulic"
-msgstr "æå/æå"
+#: ../sheets/ER.sheet.in.h:7
+msgid "Participation"
+msgstr "åè"
 
-#: ../sheets/Pneumatic.sheet.in.h:22
-msgid "Push-button command"
-msgstr "Push-button command"
+#: ../sheets/Flowchart.sheet.in.h:2
+msgid "Objects to draw flowcharts"
+msgstr "ççæçåçççä"
 
-#: ../sheets/SADT.sheet.in.h:1
-msgid "Activity/data box"
-msgstr "æå/èææå"
+#: ../sheets/Flowchart.sheet.in.h:3
+msgid "Process/Auxiliary Operation"
+msgstr "çå/èåæä"
 
-#: ../sheets/SADT.sheet.in.h:2
-msgid "Activity/data flow arrow"
-msgstr "æå/èææççé"
+#: ../sheets/Flowchart.sheet.in.h:4
+msgid "Input/Output"
+msgstr "èå/èå"
 
-#: ../sheets/SADT.sheet.in.h:3
-msgid "Flow label"
-msgstr "æçæç"
+#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
+msgid "Decision"
+msgstr "æç"
 
-#: ../sheets/SADT.sheet.in.h:4
-msgid "Objects to design SADT diagrams"
-msgstr "èè SADT åèæçççä"
+#: ../sheets/Flowchart.sheet.in.h:6
+msgid "Connector"
+msgstr "éæå"
 
-#: ../sheets/SADT.sheet.in.h:5
-msgid "SADT/IDEF0"
-msgstr "SADT/IDEF0"
+#: ../sheets/Flowchart.sheet.in.h:8
+msgid "Transaction file"
+msgstr "èçææ"
 
-#: ../sheets/SDL.sheet.in.h:1
-msgid "Action being executed"
-msgstr "èåèçåä"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:10
+msgid "Off page connector"
+msgstr "ééåéæå"
 
-#: ../sheets/SDL.sheet.in.h:2
-msgid "Block type reference"
-msgstr "ååéååè"
+#: ../sheets/Flowchart.sheet.in.h:11
+msgid "Document"
+msgstr "æä"
 
-#: ../sheets/SDL.sheet.in.h:5
-msgid "Function call"
-msgstr "åååå"
+#: ../sheets/Flowchart.sheet.in.h:12
+msgid "Manual operation"
+msgstr "äææä"
 
-#: ../sheets/SDL.sheet.in.h:6
-msgid "Function header"
-msgstr "åçæé"
+#: ../sheets/Flowchart.sheet.in.h:13
+msgid "Preparation"
+msgstr "æå"
 
-#: ../sheets/SDL.sheet.in.h:7
-msgid "Generic text note"
-msgstr "æéæååè"
+#: ../sheets/Flowchart.sheet.in.h:14
+msgid "Manual input"
+msgstr "äæèå"
 
-#: ../sheets/SDL.sheet.in.h:8
-msgid "In/Out connector"
-msgstr "èå/åéæå"
+#: ../sheets/Flowchart.sheet.in.h:15
+msgid "Predefined process"
+msgstr "éååçççå"
 
-#: ../sheets/SDL.sheet.in.h:10
-msgid "Procedure return"
-msgstr "éçèå"
+#: ../sheets/Flowchart.sheet.in.h:16
+msgid "Terminal Interrupt"
+msgstr "ççäæ"
 
-#: ../sheets/SDL.sheet.in.h:11
-msgid "Process type reference"
-msgstr "çåéååè"
+#: ../sheets/Flowchart.sheet.in.h:17
+msgid "Magnetic disk"
+msgstr "çç"
 
-#: ../sheets/SDL.sheet.in.h:12
-msgid "Receive message"
-msgstr "ææèæ"
+#: ../sheets/Flowchart.sheet.in.h:18
+msgid "Magnetic drum"
+msgstr "çé"
 
-#: ../sheets/SDL.sheet.in.h:13
-msgid "SDL"
-msgstr "SDL"
+#: ../sheets/Flowchart.sheet.in.h:19
+msgid "Magnetic tape"
+msgstr "çå"
 
-#: ../sheets/SDL.sheet.in.h:14
-msgid "Save state"
-msgstr "ååçæ"
+#: ../sheets/Flowchart.sheet.in.h:20
+msgid "Internal storage"
+msgstr "åéååå"
 
-#: ../sheets/SDL.sheet.in.h:15
-msgid "Send message"
-msgstr "åéèæ"
+#: ../sheets/Flowchart.sheet.in.h:21
+msgid "Merge"
+msgstr "åä"
 
-#: ../sheets/SDL.sheet.in.h:16
-msgid "Service type reference"
-msgstr "æåéååè"
+#: ../sheets/Flowchart.sheet.in.h:23
+msgid "Delay"
+msgstr "åé"
 
-#: ../sheets/SDL.sheet.in.h:17
-msgid "Specification and Description Language."
-msgstr "èææèèè (Specification and Description Language)"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:25
+msgid "Summing junction"
+msgstr "éççé"
 
-#: ../sheets/SDL.sheet.in.h:18 ../sheets/UML.sheet.in.h:28
-msgid "State"
-msgstr "çæ"
+#. XXX
+#: ../sheets/Flowchart.sheet.in.h:27
+msgid "Collate"
+msgstr "æå"
 
-#: ../sheets/SISSI.sheet.in.h:1
-#, fuzzy
-msgid "Air condition"
-msgstr "æä"
+#: ../sheets/Flowchart.sheet.in.h:28
+msgid "Sort"
+msgstr "æå"
 
-#: ../sheets/SISSI.sheet.in.h:2
-#, fuzzy
-msgid "Air filter"
-msgstr "æååååå"
+#: ../sheets/Flowchart.sheet.in.h:29
+msgid "Or"
+msgstr "æ"
 
-#: ../sheets/SISSI.sheet.in.h:3
-msgid "Air quality detector"
-msgstr ""
+#: ../sheets/Flowchart.sheet.in.h:30
+msgid "Punched card"
+msgstr "çååç"
 
-#: ../sheets/SISSI.sheet.in.h:4
-msgid "Alarm center"
-msgstr "èåäå"
+#: ../sheets/Flowchart.sheet.in.h:31
+msgid "Punched tape"
+msgstr "çåçå"
 
-#: ../sheets/SISSI.sheet.in.h:5
-msgid "Axial Ventilator"
-msgstr ""
+#: ../sheets/Flowchart.sheet.in.h:32
+msgid "Transmittal tape"
+msgstr "åéå"
 
-#: ../sheets/SISSI.sheet.in.h:6
-#, fuzzy
-msgid "Backup"
-msgstr "èæ"
+#: ../sheets/Flowchart.sheet.in.h:33
+msgid "Offline storage"
+msgstr "éçåå"
 
-#: ../sheets/SISSI.sheet.in.h:7
-#, fuzzy
-msgid "Badge reader"
-msgstr "åéç"
+#: ../sheets/Flowchart.sheet.in.h:34
+msgid "Data source"
+msgstr "èæäæ"
 
-#: ../sheets/SISSI.sheet.in.h:8
-msgid "Badge reader/keyboard"
-msgstr ""
+#: ../sheets/FS.sheet.in.h:1
+msgid "FS"
+msgstr "FS"
 
-#: ../sheets/SISSI.sheet.in.h:9
-msgid "Biometric reader"
-msgstr ""
+#: ../sheets/FS.sheet.in.h:2
+msgid "Editor for Function Structure Diagrams."
+msgstr "ååçæåèçèåã"
 
-#: ../sheets/SISSI.sheet.in.h:10
-msgid "Cellular phone"
-msgstr "èåéè"
+#: ../sheets/FS.sheet.in.h:3
+msgid "Flow"
+msgstr "æç"
 
-#: ../sheets/SISSI.sheet.in.h:11
-#, fuzzy
-msgid "Centrifugal Ventilator"
-msgstr "éåæ"
+#: ../sheets/FS.sheet.in.h:4
+msgid "Orthogonal polyline flow"
+msgstr "æäèççææç"
 
-#: ../sheets/SISSI.sheet.in.h:12
-msgid "Cipher machine"
-msgstr ""
+#: ../sheets/FS.sheet.in.h:5
+msgid "Function"
+msgstr "åå"
 
-#: ../sheets/SISSI.sheet.in.h:13
-msgid "Circulation pump"
+#. Auth