[dia] Update Chinese (China) translation

[Aron Xu <aronxu src gnome org>]

commit 463f0609cbedf238847d5d1199e4a90d59a7afda
Author: çŽ‰å ‚ç™½é¹¤ <yjwork qq com>
Date:   Wed Mar 25 06:54:59 2020 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 7583 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 4483 insertions(+), 3100 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 32aed693..fffb7c8d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,263 +7,279 @@
 # James Meng <linuxmeng gmail com>, 2009
 # Ming Yang <yamisoe gmail com>, 2009
 # 丁鑫 <xgnid foxmail com>, 2010
-# çŽ‰å ‚ç™½é¹¤ <yjwork xfce gmail com>, 2013
-#: ../objects/UML/class.c:193
+# çŽ‰å ‚ç™½é¹¤ <yjwork qq com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: dia 0.96.1\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=dia&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-07-28 11:06+0000\n"
-"PO-Revision-Date: 2013-07-07 20:25+0800\n"
-"Last-Translator: çŽ‰å ‚ç™½é¹¤ <yjwork xfce gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/dia/issues\n";
+"POT-Creation-Date: 2020-02-24 19:21+0000\n"
+"PO-Revision-Date: 2020-03-04 13:45+0800\n"
+"Last-Translator: çŽ‰å ‚ç™½é¹¤ <yjwork qq com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.3\n"
 
 #. This is not an errror
-#: ../app/app_procs.c:208
+#: app/app_procs.c:160
 #, c-format
-msgid "Warning: invalid layer range %lu - %lu\n"
-msgstr "è­¦å‘Šï¼šæ— æ•ˆçš„å›¾å±‚èŒƒå›´ %lu - %lu\n"
+msgid "invalid layer range %lu - %lu"
+msgstr "æ— æ•ˆçš„å›¾å±‚èŒƒå›´ %lu - %lu"
 
-#: ../app/app_procs.c:220
+#: app/app_procs.c:171
 #, c-format
-msgid "Warning: Layer %lu (%s) selected more than once.\n"
-msgstr "警告：图层 %lu (%s) 被多次选择。\n"
+msgid "Layer %lu (%s) selected more than once."
+msgstr "图层 %lu (%s) 被多次选择。"
 
-#: ../app/app_procs.c:246
+#: app/app_procs.c:206
 #, c-format
-msgid "Warning: Layer %d (%s) selected more than once.\n"
-msgstr "警告：图层 %d (%s) 被多次选择。\n"
+msgid "Layer %d (%s) selected more than once."
+msgstr "图层 %d (%s) 被多次选择。"
 
-#: ../app/app_procs.c:255
+#: app/app_procs.c:216
 #, c-format
-msgid "Warning: There is no layer named %s.\n"
-msgstr "警告：没有名为 %s 的图层。\n"
+msgid "There is no layer named %s."
+msgstr "没有名为 %s 的图层。"
 
-#: ../app/app_procs.c:338
+#: app/app_procs.c:312
 #, c-format
 msgid "%s error: don't know how to export into %s\n"
 msgstr "%s 错误：不知道如何导出到 %s\n"
 
-#: ../app/app_procs.c:347
+#: app/app_procs.c:321
 #, c-format
 msgid "%s error: input and output filenames are identical: %s"
 msgstr "%s 错误：输入文件和要输出的文件同名：%s"
 
 #. Translators: Menu item Verb/Channel/Import
 #. Translators: Menu item Verb/Channel/Import/Import
-#: ../app/app_procs.c:353 ../objects/FS/function.c:681
-#: ../objects/FS/function.c:683
+#: app/app_procs.c:327 objects/FS/function.c:676 objects/FS/function.c:678
 msgid "Import"
 msgstr "导入"
 
-#: ../app/app_procs.c:356
+#: app/app_procs.c:330
 #, c-format
 msgid "%s error: need valid input file %s\n"
 msgstr "%s 错误：需要合法的输入文件 %s\n"
 
 #. if (!quiet)
-#: ../app/app_procs.c:384
+#: app/app_procs.c:355
 #, c-format
 msgid "%s --> %s\n"
 msgstr "%s --> %s\n"
 
-#: ../app/app_procs.c:556
+#: app/app_procs.c:456
 #, c-format
-msgid "Can't find output format/filter %s\n"
-msgstr "æ‰¾ä¸åˆ°è¾“å‡ºæ ¼å¼/过滤器 %s\n"
+msgid "Can't find output format/filter %s"
+msgstr "æ‰¾ä¸åˆ°è¾“å‡ºæ ¼å¼/过滤器 %s"
 
-#: ../app/app_procs.c:626
+#: app/app_procs.c:526
 #, c-format
 msgid "Input directory '%s' must exist!\n"
 msgstr "输入目录“%s”必须存在！\n"
 
-#: ../app/app_procs.c:643
+#: app/app_procs.c:543
 #, 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:693
-#, c-format
-msgid "Select the filter/format out of: %s"
-msgstr "自此选出过滤器/æ ¼å¼:%s"
-
 #. &export_file_name
-#: ../app/app_procs.c:711
+#: app/app_procs.c:593
 msgid "Export loaded file and exit"
 msgstr "导出载入的文件然后退出"
 
-#: ../app/app_procs.c:711
+#: app/app_procs.c:593
 msgid "OUTPUT"
 msgstr "输出"
 
 #. &export_file_format
-#. &export_format_string
-#: ../app/app_procs.c:713
+#: app/app_procs.c:595
+msgid "Select the export filter/format"
+msgstr "选择导出过滤器/æ ¼å¼"
+
+#: app/app_procs.c:595
 msgid "TYPE"
 msgstr "类型"
 
-#: ../app/app_procs.c:715
+#: app/app_procs.c:597
+msgid "List export filters/formats and exit"
+msgstr "列出导出过滤器/æ ¼å¼å¹¶é€€å‡º"
+
+#: app/app_procs.c:599
 msgid "Export graphics size"
 msgstr "导出图像大小"
 
-#: ../app/app_procs.c:715
+#: app/app_procs.c:599
 msgid "WxH"
 msgstr "宽x高"
 
-#: ../app/app_procs.c:717
+#: app/app_procs.c:601
 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:718
+#: app/app_procs.c:602
 msgid "LAYER,LAYER,..."
-msgstr "图层、图层……"
+msgstr "图层、图层,..."
 
-#: ../app/app_procs.c:720
+#: app/app_procs.c:604
 msgid "Don't show the splash screen"
 msgstr "不显示启动画面"
 
-#: ../app/app_procs.c:722
+#: app/app_procs.c:606
 msgid "Don't create an empty diagram"
 msgstr "不创建空图表"
 
-#: ../app/app_procs.c:724
-msgid "Start integrated user interface (diagrams in tabs)"
+#: app/app_procs.c:608
+#, fuzzy
+#| msgid "Start integrated user interface (diagrams in tabs)"
+msgid "Start classic user interface (no diagrams in tabs)"
 msgstr "启动集成的用户界面(å›¾è¡¨æ˜¾ç¤ºä¸ºæ ‡ç­¾)"
 
-#: ../app/app_procs.c:726
+#: app/app_procs.c:610
 msgid "Send error messages to stderr instead of showing dialogs."
 msgstr "å°†é”™è¯¯ä¿¡æ¯å‘é€è‡³æ ‡å‡†é”™è¯¯ï¼Œè€Œä¸æ˜¾ç¤ºå¯¹è¯æ¡†ã€‚"
 
-#: ../app/app_procs.c:728
+#: app/app_procs.c:612
 msgid "Directory containing input files"
 msgstr "输入文件所在目录"
 
-#: ../app/app_procs.c:728 ../app/app_procs.c:730
+#: app/app_procs.c:612 app/app_procs.c:614
 msgid "DIRECTORY"
 msgstr "目录"
 
-#: ../app/app_procs.c:730
+#: app/app_procs.c:614
 msgid "Directory containing output files"
 msgstr "输出文件所在目录"
 
-#: ../app/app_procs.c:732
+#: app/app_procs.c:616
 msgid "Display credits list and exit"
 msgstr "显示致谢清单后退出"
 
-#: ../app/app_procs.c:734
+#: app/app_procs.c:618
 msgid "Generate verbose output"
 msgstr "产生详细的输出"
 
-#: ../app/app_procs.c:736
+#: app/app_procs.c:620
 msgid "Display version and exit"
 msgstr "显示版本后退出"
 
-#: ../app/app_procs.c:763
+#: app/app_procs.c:641
 msgid "[FILE...]"
 msgstr "[文件...]"
 
-#: ../app/app_procs.c:777
-#, c-format
+#: app/app_procs.c:653
 msgid "Invalid option?"
 msgstr "æ— æ•ˆçš„é€‰é¡¹ï¼Ÿ"
 
-#: ../app/app_procs.c:800
+#: app/app_procs.c:677
 #, c-format
 msgid "Filename conversion failed: %s\n"
 msgstr "文件名转换失败：%s\n"
 
-#: ../app/app_procs.c:813
+#: app/app_procs.c:692
 #, c-format
 msgid "Missing input: %s\n"
 msgstr "缺少输入：%s\n"
 
-#: ../app/app_procs.c:838
-msgid "Can't connect to session manager!\n"
-msgstr "æ— æ³•è¿žæŽ¥ä¼šè¯ç®¡ç†å™¨ï¼\n"
+#: app/app_procs.c:710
+msgid "Dia Diagram Editor"
+msgstr "Dia 图表编辑器"
 
 #. TRANSLATOR: 2nd and 3rd %s are time and date respectively.
-#: ../app/app_procs.c:880
+#: app/app_procs.c:741
 #, c-format
 msgid "Dia version %s, compiled %s %s\n"
 msgstr "Dia 版本 %s，编译于 %s %s\n"
 
-#: ../app/app_procs.c:882
+#: app/app_procs.c:743
 #, c-format
 msgid "Dia version %s\n"
 msgstr "Dia 版本 %s\n"
 
-#: ../app/app_procs.c:920
+#: app/app_procs.c:792
 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:799
+msgid "Couldn't find standard objects when looking for object-libs; exiting..."
+msgstr "æŸ¥æ‰¾å¯¹è±¡åº“æ—¶æ— æ³•æ‰¾åˆ°æ ‡å‡†å¯¹è±¡ï¼Œæ­£åœ¨é€€å‡º..."
 
-#: ../app/app_procs.c:929
+#: app/app_procs.c:801
 #, c-format
 msgid ""
 "Couldn't find standard objects when looking for object-libs in '%s'; "
-"exiting...\n"
-msgstr "查找“%sâ€ä¸­çš„å¯¹è±¡åº“æ—¶ï¼Œæ— æ³•æ‰¾åˆ°æ ‡å‡†å¯¹è±¡ï¼›æ­£åœ¨é€€å‡º...\n"
-
-#: ../app/app_procs.c:993
-msgid "Diagram1.dia"
-msgstr "图表1.dia"
+"exiting..."
+msgstr "查找“%sâ€ä¸­çš„å¯¹è±¡åº“æ—¶ï¼Œæ— æ³•æ‰¾åˆ°æ ‡å‡†å¯¹è±¡ï¼›æ­£åœ¨é€€å‡º..."
 
-#: ../app/app_procs.c:1028
+#: app/app_procs.c:888
 msgid ""
-"This shouldn't happen.  Please file a bug report at bugzilla.gnome.org\n"
-"describing how you caused this message to appear.\n"
+"This shouldn't happen.  Please file a bug report at https://gitlab.gnome.org/";
+"GNOME/dia describing how you caused this message to appear."
 msgstr ""
-"错误的程序状态。请在 bugzilla.gnome.org 提交错误报告，\n"
-"描述您如何致使 Dia 出现这个错误信息的。\n"
+"错误的程序状态。请在 https://gitlab.gnome.org/GNOME/dia 提交错误报告，\n"
+"描述您如何致使 Dia 出现这个错误信息的。"
 
-#: ../app/app_procs.c:1043
+#: app/app_procs.c:903
 msgid "Exiting Dia"
 msgstr "退出 Dia"
 
+#: app/app_procs.c:925 app/display.c:1193 app/exit_dialog.c:115
+#: app/filedlg.c:569
+msgid "Save"
+msgstr "保存"
+
 #. no standard buttons
-#: ../app/app_procs.c:1107
+#: app/app_procs.c:963
 msgid "Quitting without saving modified diagrams"
 msgstr "在不保存图表改动的情况下退出"
 
-#: ../app/app_procs.c:1109
+#: app/app_procs.c:965
 msgid ""
 "Modified diagrams exist. Are you sure you want to quit Dia without saving "
 "them?"
 msgstr "图表已修改。确定不保存文件并退出Dia？"
 
-#: ../app/app_procs.c:1113
+#: app/app_procs.c:969 app/menus.c:87
 msgid "Quit Dia"
 msgstr "退出 Dia"
 
-#: ../app/app_procs.c:1186 ../app/app_procs.c:1193
+#: app/app_procs.c:971 app/dia-guide-dialog.c:155 app/display.c:1247
+#: app/filedlg.c:284 app/filedlg.c:487 app/filedlg.c:758
+#: app/layer-editor/dia-layer-properties.c:243 data/ui/sheets-edit-dialog.ui:33
+#: data/ui/sheets-new-dialog.ui:32 data/ui/sheets-remove-dialog.ui:32
+#: lib/diaarrowchooser.c:369 lib/dialinechooser.c:304 lib/widgets.c:396
+#: plug-ins/xslt/xsltdialog.c:83
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: app/app_procs.c:976 app/menus.c:87
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: app/app_procs.c:995
+msgid "Exit"
+msgstr "退出"
+
+#: app/app_procs.c:1042 app/app_procs.c:1049
 msgid "Could not create per-user Dia configuration directory"
 msgstr "æ— æ³•åˆ›å»ºç”¨æˆ·çš„ Dia 配置目录"
 
-#: ../app/app_procs.c:1196
+#: app/app_procs.c:1052
 msgid ""
 "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:1219
+#: app/app_procs.c:1076
 msgid "Objects and filters internal to Dia"
 msgstr "Dia 内部的对象和过滤器"
 
-#: ../app/app_procs.c:1272
-#, c-format
+#: app/app_procs.c:1139
 msgid ""
 "The original author of Dia was:\n"
 "\n"
@@ -271,8 +287,7 @@ msgstr ""
 "Dia 原作者：\n"
 "\n"
 
-#: ../app/app_procs.c:1277
-#, c-format
+#: app/app_procs.c:1144
 msgid ""
 "\n"
 "The current maintainers of Dia are:\n"
@@ -282,8 +297,7 @@ msgstr ""
 "Dia 当前的维护者:\n"
 "\n"
 
-#: ../app/app_procs.c:1282
-#, c-format
+#: app/app_procs.c:1149
 msgid ""
 "\n"
 "Other authors are:\n"
@@ -293,8 +307,7 @@ msgstr ""
 "其它作者：\n"
 "\n"
 
-#: ../app/app_procs.c:1287
-#, c-format
+#: app/app_procs.c:1154
 msgid ""
 "\n"
 "Dia is documented by:\n"
@@ -304,54 +317,67 @@ msgstr ""
 "Dia 文档编写:\n"
 "\n"
 
-#: ../app/color_area.c:333 ../app/color_area.c:343
-msgid "Select foreground color"
-msgstr "选择前景色"
+#: app/app_procs.c:1194
+msgid "Available Export Filters (for --filter)"
+msgstr "可用的导出过滤器(用于 --filter)"
 
-#: ../app/color_area.c:334 ../app/color_area.c:344
-msgid "Select background color"
-msgstr "选择背景色"
+#. Translators: be brief or mess up the table for --list-filters
+#: app/app_procs.c:1197
+msgid "Extension"
+msgstr "扩展名"
 
-#: ../app/commands.c:131
+#: app/app_procs.c:1198 lib/prop_dict.c:42
+msgid "Identifier"
+msgstr "æ ‡è¯†ç¬¦"
+
+#: app/app_procs.c:1199 app/plugin-manager.c:273
+msgid "Description"
+msgstr "说明"
+
+#: app/commands.c:143
 msgid "No print plugin found!"
 msgstr "没有找到打印插件！"
 
-#: ../app/commands.c:150
+#: app/commands.c:164
 #, c-format
 msgid "Diagram%d.dia"
 msgstr "图表%d.dia"
 
-#: ../app/commands.c:249
+#: app/commands.c:274
 msgid "No image from Clipboard to paste."
 msgstr "没有可从剪贴板粘贴的图像。"
 
-#: ../app/commands.c:298
+#: app/commands.c:327
 msgid "No selected object can take an image."
 msgstr "没有选择可以容纳图像的对象。"
 
-#: ../app/commands.c:325
+#: app/commands.c:356
 msgid "Clipboard Paste"
 msgstr "剪切板粘贴"
 
-#. might become more right some day ;)
-#: ../app/commands.c:333
+#: app/commands.c:368
+#, c-format
+msgid "Failed to import '%s' as SVG."
+msgstr "将 '%s' 导入为 SVG 失败。"
+
+#: app/commands.c:385
 #, c-format
-msgid "No clipboard handler for '%s'"
-msgstr "没有对应“%s”的剪贴板处理器"
+msgid "Paste failed: %s"
+msgstr "粘贴失败: %s"
 
-#: ../app/commands.c:424
+#: app/commands.c:476
 msgid "Clipboard Copy"
 msgstr "剪切板复制"
 
-#: ../app/commands.c:623
+#: app/commands.c:696
 msgid "No existing object to paste.\n"
 msgstr "没有要粘贴的对象。\n"
 
-#: ../app/commands.c:933 ../app/commands.c:971
+#: app/commands.c:1028 app/commands.c:1076
 msgid "Could not find help directory"
 msgstr "æ— æ³•æ‰¾åˆ°å¸®åŠ©ç›®å½•"
 
-#: ../app/commands.c:940
+#: app/commands.c:1035
 #, c-format
 msgid ""
 "Could not open help directory:\n"
@@ -360,7 +386,7 @@ msgstr ""
 "æ— æ³•æ‰“å¼€å¸®åŠ©ç›®å½•ï¼š\n"
 "%s"
 
-#: ../app/commands.c:1008
+#: app/commands.c:1114
 msgid "translator_credits-PLEASE_ADD_YOURSELF_HERE"
 msgstr ""
 "Wang Jian <lark linux net cn>, 2001\n"
@@ -370,9 +396,9 @@ msgstr ""
 "James Meng <linuxmeng gmail com>, 2009\n"
 "Ming Yang <yamisoe gmail com>, 2009\n"
 "丁鑫 <xgnid foxmail com>, 2010\n"
-"çŽ‰å ‚ç™½é¹¤ <yjwork xfce gmail com>, 2013"
+"çŽ‰å ‚ç™½é¹¤ <yjwork qq com>, 2013,2020"
 
-#: ../app/commands.c:1010
+#: app/commands.c:1117
 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"
@@ -400,270 +426,267 @@ msgstr ""
 "如果还没有，写信给：Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, USA。\n"
 
-#: ../app/commands.c:1037
+#: app/commands.c:1137
 msgid "A program for drawing structured diagrams."
 msgstr "结构性图表绘制程序。"
 
-#: ../app/confirm.c:71
+#: app/confirm.c:67
 #, c-format
-#| msgid "You are about to print a diagram with %d pages."
 msgid "You are about to print a diagram with %d page."
 msgid_plural "You are about to print a diagram with %d pages."
 msgstr[0] "您正准备打印一份 %d 页的图表。"
 
-#: ../app/confirm.c:75
+#: app/confirm.c:71
 #, c-format
-#| msgid "You are about to export a diagram with %d pages."
 msgid "You are about to export a diagram with %d page."
 msgid_plural "You are about to export a diagram with %d pages."
 msgstr[0] "您正准备导出一份 %d 页的图表。"
 
-#: ../app/confirm.c:79
+#: app/confirm.c:75
 #, c-format
-#| msgid ""
-#| "You are about to export a diagram which may require %s of memory.(%d "
-#| "pages)."
 msgid ""
 "You are about to export a diagram which may require %s of memory.(%d page)."
 msgid_plural ""
 "You are about to export a diagram which may require %s of memory.(%d pages)."
 msgstr[0] "您即将导出的图表可能需要 %s 内存(%d 页)。"
 
-#: ../app/confirm.c:88
+#: app/confirm.c:84
 msgid ""
 "You can adjust the size of the diagram by changing the 'Scaling' in the "
 "'Page Setup' dialog.\n"
-"Alternatively use 'Select All' and 'Best Fit' to move objects/handles into "
-"the intended bounds."
+"Alternatively use 'Best Fit' to move objects/handles into the intended "
+"bounds."
 msgstr ""
 "您可以通过在“页面设置”对话框中改变“缩放比例”来调整图表的尺寸。\n"
-"也可以用“全选”和“最适合”将对象移到想要的范围内。"
+"也可以用“最适合”将对象移到想要的范围内。"
 
-#: ../app/confirm.c:92
+#: app/confirm.c:88
 msgid "Confirm Diagram Size"
 msgstr "确认图表尺寸"
 
-#: ../app/create_object.c:71
+#: app/create_object.c:73
 #, c-format
 msgid "'%s' creation failed"
 msgstr "创建“%s”失败"
 
-#: ../app/defaults.c:44 ../app/defaults.c:147
+#: app/defaults.c:43 app/defaults.c:146
 msgid "Object defaults"
 msgstr "对象默认值"
 
-#: ../app/defaults.c:62
+#: app/defaults.c:45 app/dia-props.c:272 app/find-and-replace.c:539
+#: app/find-and-replace.c:568 app/menus.c:118 app/pagesetup.c:77
+#: app/plugin-manager.c:207 app/preferences.c:588 app/properties-dialog.c:60
+#: data/ui/sheets-main-dialog.ui:302
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: app/defaults.c:46 app/dia-props.c:273 app/pagesetup.c:78
+#: app/preferences.c:589 app/properties-dialog.c:61
+#: data/ui/sheets-main-dialog.ui:272
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: app/defaults.c:47 app/dia-props.c:274 app/dia-guide-dialog.c:156
+#: app/layer-editor/dia-layer-properties.c:242 app/pagesetup.c:79
+#: app/preferences.c:590 app/properties-dialog.c:62
+#: data/ui/sheets-edit-dialog.ui:44 data/ui/sheets-new-dialog.ui:43
+#: data/ui/sheets-remove-dialog.ui:43 lib/diaarrowchooser.c:370
+#: lib/dialinechooser.c:305 objects/AADL/edit_port_declaration.c:156
+#: plug-ins/xslt/xsltdialog.c:84
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: app/defaults.c:61
 msgid "This object has no defaults."
 msgstr "此对象没有默认值。"
 
-#: ../app/defaults.c:111
+#: app/defaults.c:110
 msgid "Defaults: "
-msgstr "默认："
-
-#: ../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:240 ../lib/message.c:91 ../lib/message.c:299
-msgid "Error"
-msgstr "错误"
+msgstr "默认: "
 
 #. ToDo: move context further up in the callstack and to sth useful with it's content
-#: ../app/diagram.c:272
+#: app/diagram.c:286
 msgid "Load Into"
 msgstr "åŠ è½½åˆ°"
 
-#: ../app/diagram.c:1217
+#: app/diagram.c:1276
 msgid "Trying to group with no selected objects."
 msgstr "没有选中任何对象以供组合。"
 
-#: ../app/diagram_tree_view.c:164
+#: app/diagram_tree_view.c:166
 msgid "Diagram"
 msgstr "图表"
 
-#: ../app/diagram_tree_view.c:171
-#: ../plug-ins/drs/dia-render-script-import.c:232
+#: app/diagram_tree_view.c:173 plug-ins/drs/dia-render-script-import.c:488
 msgid "Layer"
 msgstr "图层"
 
-#: ../app/diagram_tree_view.c:177
+#: app/diagram_tree_view.c:178
 #, c-format
 msgid "%d Layer"
 msgid_plural "%d Layers"
 msgstr[0] "%d 个图层"
 
-#: ../app/diagram_tree_view.c:181 ../app/diagram_tree_view.c:519
-#: ../objects/Database/table.c:138 ../objects/Istar/actor.c:142
-#: ../objects/Istar/actor.c:143 ../objects/Istar/other.c:147
-#: ../objects/Istar/other.c:148 ../objects/KAOS/other.c:150
-#: ../objects/KAOS/other.c:151 ../objects/UML/association.c:242
-#: ../objects/UML/umlattribute.c:39 ../objects/UML/umlformalparameter.c:37
-#: ../objects/UML/umloperation.c:64 ../objects/UML/umlparameter.c:45
+#: app/diagram_tree_view.c:182 app/diagram_tree_view.c:511
+#: data/ui/sheets-new-dialog.ui:288 data/ui/sheets-remove-dialog.ui:198
+#: objects/Database/table.c:147 objects/Istar/actor.c:140
+#: objects/Istar/actor.c:141 objects/Istar/other.c:145
+#: objects/Istar/other.c:146 objects/KAOS/other.c:148 objects/KAOS/other.c:149
+#: objects/UML/association.c:241 objects/UML/umlattribute.c:37
+#: objects/UML/umlformalparameter.c:35 objects/UML/umloperation.c:62
+#: objects/UML/umlparameter.c:43
 msgid "Type"
 msgstr "类型"
 
-#: ../app/diagram_tree_view.c:184
-msgid "object|Position"
-msgstr "对象|位置"
-
 #
-#: ../app/diagram_tree_view.c:187
+#: app/diagram_tree_view.c:188
 msgid "Children"
 msgstr "子对象"
 
-#: ../app/diagram_tree_view.c:191
+#: app/diagram_tree_view.c:193
 #, c-format
 msgid "%d Object"
 msgid_plural "%d Objects"
 msgstr[0] "%d 个对象"
 
 #
-#: ../app/diagram_tree_view.c:448
+#: app/diagram_tree_view.c:440
 msgid "Select"
 msgstr "选择"
 
 #. Translators: Menu item Verb/Support/Position/Locate
 #. Translators: Menu item Verb/Signal/Sense/Locate
-#: ../app/diagram_tree_view.c:449 ../objects/FS/function.c:807
-#: ../objects/FS/function.c:1049
+#: app/diagram_tree_view.c:441 objects/FS/function.c:802
+#: objects/FS/function.c:1044
 msgid "Locate"
 msgstr "定位"
 
-#: ../app/diagram_tree_view.c:450
+#: app/diagram_tree_view.c:442
 msgid "Properties"
 msgstr "属性(_P)"
 
-#: ../app/diagram_tree_view.c:502 ../app/exit_dialog.c:125
-#: ../app/plugin-manager.c:270 ../objects/Database/table.c:136
-#: ../objects/Database/table.c:179 ../objects/UML/association.c:236
-#: ../objects/UML/class.c:140 ../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
+#: app/diagram_tree_view.c:494 app/exit_dialog.c:125 app/plugin-manager.c:267
+#: objects/Database/table.c:145 objects/Database/table.c:188
+#: objects/Misc/n_gon.c:135 objects/UML/association.c:235
+#: objects/UML/class.c:143 objects/UML/large_package.c:134
+#: objects/UML/umlattribute.c:35 objects/UML/umlformalparameter.c:33
+#: objects/UML/umloperation.c:60 objects/UML/umlparameter.c:41
 msgid "Name"
 msgstr "名字"
 
-#: ../app/diagram_tree_view.c:565
+#: app/diagram_tree_view.c:557
 msgid "Diagram Tree"
 msgstr "å›¾è¡¨æ ‘"
 
 #. paper size
-#: ../app/diapagelayout.c:155
+#: app/diapagelayout.c:149
 msgid "Paper Size"
 msgstr "çº¸å¼ å¤§å°"
 
 #. orientation
-#: ../app/diapagelayout.c:184
+#: app/diapagelayout.c:178 app/dia-guide-dialog.c:168
 msgid "Orientation"
 msgstr "方向"
 
 #. margins
-#: ../app/diapagelayout.c:213
+#: app/diapagelayout.c:207
 msgid "Margins"
 msgstr "边距"
 
-#: ../app/diapagelayout.c:225
+#: app/diapagelayout.c:219
 msgid "Top:"
 msgstr "顶部："
 
-#: ../app/diapagelayout.c:238
+#: app/diapagelayout.c:232
 msgid "Bottom:"
 msgstr "底部："
 
-#: ../app/diapagelayout.c:251
+#: app/diapagelayout.c:245
 msgid "Left:"
 msgstr "左边："
 
-#: ../app/diapagelayout.c:264
+#: app/diapagelayout.c:258
 msgid "Right:"
 msgstr "右边："
 
 #. Scaling
-#: ../app/diapagelayout.c:278
+#: app/diapagelayout.c:272
 msgid "Scaling"
 msgstr "缩放比例"
 
-#: ../app/diapagelayout.c:289
+#: app/diapagelayout.c:283
 msgid "Scale:"
 msgstr "比例："
 
-#: ../app/diapagelayout.c:301
+#: app/diapagelayout.c:295
 msgid "Fit to:"
 msgstr "适合于："
 
-#: ../app/diapagelayout.c:313
+#: app/diapagelayout.c:307
 msgid "by"
 msgstr "ç”±"
 
-#: ../app/diapagelayout.c:732
+#: app/diapagelayout.c:759
 #, c-format
 msgid "%0.3gcm x %0.3gcm"
 msgstr "%0.3g厘米 x %0.3g厘米"
 
-#: ../app/diapagelayout.c:836 ../app/pagesetup.c:77
+#: app/diapagelayout.c:860 app/pagesetup.c:74
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: ../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 "x"
-
-#: ../app/dia-props.c:132
-msgid "y"
-msgstr "y"
+#: app/dia-colour-area.c:182 app/dia-colour-area.c:193
+msgid "Select foreground color"
+msgstr "选择前景色"
 
-#: ../app/dia-props.c:137
-msgid "Spacing"
-msgstr "间距"
+#: app/dia-colour-area.c:182 app/dia-colour-area.c:193
+msgid "Select background color"
+msgstr "选择背景色"
 
-#: ../app/dia-props.c:157
-msgid "Visible spacing"
-msgstr "可见间距"
+#: app/dia-line-width-area.c:104 lib/properties.h:627 lib/properties.h:630
+#: objects/chronogram/chronoline.c:178 objects/chronogram/chronoref.c:157
+msgid "Line width"
+msgstr "线宽"
 
-#. Hexes!
-#: ../app/dia-props.c:178 ../app/preferences.c:243
-msgid "Hex grid"
-msgstr "å…­è§’ç½‘æ ¼"
+#: app/dia-line-width-area.c:105 lib/dialogs.c:66
+#: plug-ins/postscript/paginate_psprint.c:321
+msgid "Cancel"
+msgstr "取消"
 
-#: ../app/dia-props.c:186
-msgid "Hex grid size"
-msgstr "å…­è§’ç½‘æ ¼å¤§å°"
+#: app/dia-line-width-area.c:106 lib/dialogs.c:65
+#: plug-ins/postscript/paginate_psprint.c:313
+msgid "OK"
+msgstr "确定"
 
-#: ../app/dia-props.c:199
-msgid "Grid"
-msgstr "ç½‘æ ¼"
+#: app/dia-line-width-area.c:115
+msgid "Line width:"
+msgstr "线宽："
 
-#: ../app/dia-props.c:210 ../lib/diagramdata.c:123
-msgid "Background"
-msgstr "背景"
+#. Can we be sure that the filename is the 'proper title'?
+#: app/dia-props.c:355 app/dia-props.c:370 app/dia-props.c:424
+msgid "Diagram Properties"
+msgstr "图表属性"
 
-#: ../app/dia-props.c:221 ../app/preferences.c:122
-msgid "Grid Lines"
-msgstr "ç½‘æ ¼çº¿"
+#: app/dia-guide-dialog.c:151
+msgid "Add New Guide"
+msgstr ""
 
-#: ../app/dia-props.c:232
-msgid "Page Breaks"
-msgstr "换页"
+#: app/dia-guide-dialog.c:177 lib/diapatternselector.c:110
+msgid "Horizontal"
+msgstr "æ°´å¹³"
 
-#: ../app/dia-props.c:243
-msgid "Colors"
-msgstr "颜色"
+#: app/dia-guide-dialog.c:178 lib/diapatternselector.c:112
+msgid "Vertical"
+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"
+#. Translators: Menu item Verb/Support/Position
+#. Translators: Menu item Verb/Support/Position/Position
+#: app/dia-guide-dialog.c:182 objects/FS/function.c:794
+#: objects/FS/function.c:796 objects/Istar/actor.c:66
+msgid "Position"
+msgstr "位置"
 
-#: ../app/disp_callbacks.c:93 ../app/properties-dialog.c:156
+#: app/disp_callbacks.c:91 app/properties-dialog.c:154
 msgid ""
 "This object doesn't support Undo/Redo.\n"
 "Undo information erased."
@@ -671,26 +694,48 @@ msgstr ""
 "此对象不支持撤消/重做。\n"
 "å·²åˆ é™¤æ’¤æ¶ˆä¿¡æ¯ã€‚"
 
-#: ../app/disp_callbacks.c:128
+#: app/disp_callbacks.c:126
 msgid "Properties…"
 msgstr "属性…"
 
-#: ../app/disp_callbacks.c:167
+#: app/disp_callbacks.c:165
 msgid "Follow link…"
-msgstr "跟踪链接..."
+msgstr "跟踪链接…"
 
-#: ../app/disp_callbacks.c:216 ../objects/standard/bezier.c:785
-#: ../objects/standard/beziergon.c:524 ../objects/standard/box.c:749
-#: ../objects/standard/textobj.c:450
+#: app/disp_callbacks.c:213 objects/standard/textobj.c:582
 msgid "Convert to Path"
 msgstr "转换为路径"
 
+#: app/disp_callbacks.c:260
+msgid "Union"
+msgstr "联合"
+
+#: app/disp_callbacks.c:261
+#, fuzzy
+#| msgid "Differentiate"
+msgid "Difference"
+msgstr "分离"
+
+#
+#: app/disp_callbacks.c:262
+msgid "Intersection"
+msgstr "交叉"
+
+#: app/disp_callbacks.c:263
+msgid "Exclusion"
+msgstr ""
+
 #
-#: ../app/disp_callbacks.c:345
+#: app/disp_callbacks.c:401
 msgid "Selection"
 msgstr "选择"
 
-#: ../app/disp_callbacks.c:1113
+#
+#: app/disp_callbacks.c:416
+msgid "Input _Methods"
+msgstr "输入法(_M)"
+
+#: app/disp_callbacks.c:1186
 msgid ""
 "The object you dropped cannot fit into its parent. \n"
 "Either expand the parent object, or drop the object elsewhere."
@@ -701,32 +746,27 @@ msgstr ""
 #. http://www.gnu.org/software/gettext/manual/html_chapter/gettext_10.html#SEC150
 #. * Althoug the single objects wont get triggered here some languages have variations on the other numbers
 #.
-#: ../app/display.c:109
+#: app/display.c:99
 #, c-format
 msgid "Selection of %d object"
 msgid_plural "Selection of %d objects"
 msgstr[0] "选取了 %d 个对象"
 
-#: ../app/display.c:119
+#: app/display.c:109
 #, c-format
 msgid "Selected '%s'"
 msgstr "已选取“%s”"
 
-#. 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:1332
+#: app/display.c:1235
 msgid "<unnamed>"
 msgstr "<未命名>"
 
 #. no standard buttons
-#: ../app/display.c:1338
+#: app/display.c:1241
 msgid "Closing diagram without saving"
 msgstr "在不保存图表的情况下关闭"
 
-#: ../app/display.c:1340
+#: app/display.c:1243
 #, c-format
 msgid ""
 "The diagram '%s'\n"
@@ -735,78 +775,82 @@ msgstr ""
 "图表“%s”\n"
 "尚未保存过。现在保存更改吗？"
 
-#: ../app/display.c:1342
+#: app/display.c:1245
 msgid "Close Diagram"
 msgstr "关闭图表"
 
-#: ../app/display.c:1347
+#: app/display.c:1250
 msgid "_Discard Changes"
 msgstr "放弃更改(_D)"
 
-#: ../app/exit_dialog.c:77
-msgid "Do Not Exit"
-msgstr "不退出"
+#. button = gtk_button_new_with_label (_("Save and Close"));
+#: app/display.c:1254 app/filedlg.c:488 app/filedlg.c:759 app/menus.c:112
+msgid "_Save"
+msgstr "保存(_S)"
 
-#: ../app/exit_dialog.c:79
-msgid "Exit Without Save"
-msgstr "不保存退出"
+#: app/exit_dialog.c:77
+msgid "_Do Not Exit"
+msgstr "不退出(_D)"
 
-#: ../app/exit_dialog.c:81
-msgid "Save Selected"
-msgstr "保存选中的对象"
+#: app/exit_dialog.c:79
+msgid "_Exit Without Save"
+msgstr "不保存退出(_E)"
 
-#: ../app/exit_dialog.c:87
+#: app/exit_dialog.c:81
+msgid "_Save Selected"
+msgstr "保存选中的对象(_S)"
+
+#: app/exit_dialog.c:87
 msgid "The following are not saved:"
 msgstr "下列文件还未保存："
 
-#: ../app/exit_dialog.c:115
-msgid "Save"
-msgstr "保存"
-
-#: ../app/exit_dialog.c:131
+#: app/exit_dialog.c:131
 msgid "Path"
 msgstr "路径"
 
 #
-#: ../app/exit_dialog.c:144
+#: app/exit_dialog.c:144
 msgid "Select All"
 msgstr "全选"
 
-#: ../app/exit_dialog.c:152
+#: app/exit_dialog.c:152
 msgid "Select None"
 msgstr "不选"
 
-#: ../app/exit_dialog.c:244
+#: app/exit_dialog.c:244
 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:402
+#: app/filedlg.c:144 app/filedlg.c:152 app/filedlg.c:168 app/filedlg.c:800
+#: lib/widgets.c:406
 msgid "Supported Formats"
 msgstr "æ”¯æŒçš„æ ¼å¼"
 
-#: ../app/filedlg.c:197 ../app/filedlg.c:199 ../app/filedlg.c:662
-#: ../app/filedlg.c:664
+#: app/filedlg.c:192 app/filedlg.c:650
 msgid "By extension"
 msgstr "按扩展名"
 
-#: ../app/filedlg.c:293
+#: app/filedlg.c:281
 msgid "Open Diagram"
 msgstr "打开图表"
 
-#: ../app/filedlg.c:326
+#: app/filedlg.c:285 lib/widgets.c:397
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: app/filedlg.c:311
 msgid "Open Options"
 msgstr "打开选项"
 
-#: ../app/filedlg.c:334 ../app/filedlg.c:801
+#: app/filedlg.c:319 app/filedlg.c:782
 msgid "Determine file type:"
 msgstr "确定文件类型："
 
-#: ../app/filedlg.c:354 ../app/filedlg.c:814 ../lib/widgets.c:410
+#: app/filedlg.c:339 app/filedlg.c:795 lib/widgets.c:414
 msgid "All Files"
 msgstr "全部文件"
 
-#: ../app/filedlg.c:393 ../plug-ins/postscript/paginate_psprint.c:416
+#: app/filedlg.c:378 plug-ins/postscript/paginate_psprint.c:407
 msgid ""
 "Some characters in the filename are neither UTF-8\n"
 "nor your local encoding.\n"
@@ -816,13 +860,13 @@ msgstr ""
 "ä¹Ÿä¸æ˜¯æ‚¨çš„æœ¬åœ°ç¼–ç ã€‚\n"
 "这可能会导致一些功能不能正确工作。"
 
-#: ../app/filedlg.c:403 ../app/filedlg.c:716
-#: ../plug-ins/postscript/paginate_psprint.c:430
+#: app/filedlg.c:388 app/filedlg.c:697
+#: plug-ins/postscript/paginate_psprint.c:421
 msgid "File already exists"
 msgstr "文件已存在"
 
-#: ../app/filedlg.c:405 ../app/filedlg.c:718
-#: ../plug-ins/postscript/paginate_psprint.c:426
+#: app/filedlg.c:390 app/filedlg.c:699
+#: plug-ins/postscript/paginate_psprint.c:417
 #, c-format
 msgid ""
 "The file '%s' already exists.\n"
@@ -831,17 +875,21 @@ msgstr ""
 "文件“%s”已存在。\n"
 "您要覆盖它吗？"
 
-#: ../app/filedlg.c:489
+#: app/filedlg.c:410
+msgid "Save as"
+msgstr "另存为"
+
+#: app/filedlg.c:484
 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:503
+#: app/filedlg.c:498
 msgid "Compress diagram files"
 msgstr "压缩图表文件"
 
-#: ../app/filedlg.c:512
+#: app/filedlg.c:507
 msgid ""
 "Compression reduces file size to less than 1/10th size and speeds up loading "
 "and saving.  Some text programs cannot manipulate compressed files."
@@ -849,7 +897,15 @@ msgstr ""
 "压缩文件到小于原先的 1/10ï¼Œå¯ä»¥åŠ å¿«è½½å…¥å’Œä¿å­˜çš„é€Ÿåº¦ã€‚ä½†æŸäº›æ–‡æœ¬ç¨‹åºæ— æ³•å¤„ç†åŽ‹"
 "缩过的文件。"
 
-#: ../app/filedlg.c:747
+#. Favored Filter
+#. Translators: Menu item Verb/Channel/Export
+#. Translators: Menu item Verb/Channel/Export/Export
+#: app/filedlg.c:719 app/preferences.c:230 objects/FS/function.c:690
+#: objects/FS/function.c:692
+msgid "Export"
+msgstr "导出"
+
+#: app/filedlg.c:728
 #, c-format
 msgid ""
 "Could not determine which export filter\n"
@@ -858,137 +914,141 @@ msgstr ""
 "æ— æ³•ç¡®å®šä½¿ç”¨å“ªä¸ªå¯¼å‡ºè¿‡æ»¤å™¨æ¥ä¿å­˜\n"
 "“%s”"
 
-#: ../app/filedlg.c:774
+#: app/filedlg.c:755
 msgid "Export Diagram"
 msgstr "导出图表"
 
-#: ../app/filedlg.c:793
+#: app/filedlg.c:774
 msgid "Export Options"
 msgstr "导出选项"
 
-#: ../app/find-and-replace.c:480
+#: app/find-and-replace.c:480
 msgid "_Search for:"
 msgstr "搜索(_S)："
 
-#: ../app/find-and-replace.c:493
+#: app/find-and-replace.c:493
 msgid "Replace _with:"
 msgstr "替换为(_W)："
 
-#: ../app/find-and-replace.c:503
+#: app/find-and-replace.c:503
 msgid "_Match case"
 msgstr "匹配大小写(_M)"
 
-#: ../app/find-and-replace.c:507
+#: app/find-and-replace.c:507
 msgid "Match _entire word only"
 msgstr "只匹配整个单词(_E)"
 
-#: ../app/find-and-replace.c:511
+#: app/find-and-replace.c:511
 msgid "Match _all properties (not just object name)"
 msgstr "匹配全部属性(不仅仅是对象名称)(_A)"
 
-#: ../app/find-and-replace.c:537
+#: app/find-and-replace.c:536 plug-ins/python/select_by.py:67
 msgid "Find"
 msgstr "查找"
 
-#: ../app/find-and-replace.c:567 ../app/menus.c:263
+#: app/find-and-replace.c:540 app/find-and-replace.c:573
+msgid "_Find"
+msgstr "查找(_F)"
+
+#: app/find-and-replace.c:565
 msgid "Replace"
 msgstr "替换"
 
-#: ../app/find-and-replace.c:570
+#: app/find-and-replace.c:569
 msgid "Replace _All"
 msgstr "全部替换(_A)"
 
-#. not adding the button in the list above to modify it's text;
-#. * the default "Find and Replace" is just too long for my taste ;)
-#.
-#: ../app/find-and-replace.c:575
+#: app/find-and-replace.c:570 app/menus.c:271
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: ../app/interface.c:517
+#. Translators: Current zoom level
+#: app/interface.c:252
+#, c-format
+msgid "%f%%"
+msgstr "%f%%"
+
+#: app/interface.c:633
 msgid "Pops up the Navigation window."
 msgstr "弹出导航窗口。"
 
-#: ../app/interface.c:732
+#: app/interface.c:678
+msgid "Close"
+msgstr "关闭"
+
+#: app/interface.c:838
 msgid "Diagram menu."
 msgstr "图表菜单。"
 
-#: ../app/interface.c:772
+#: app/interface.c:877
 msgid "Zoom"
 msgstr "缩放"
 
-#: ../app/interface.c:787
+#: app/interface.c:892
 msgid "Toggles snap-to-grid for this window."
 msgstr "åˆ‡æ¢æœ¬çª—å£çš„â€œå¯¹é½åˆ°ç½‘æ ¼â€åŠŸèƒ½ã€‚"
 
-#: ../app/interface.c:798
+#: app/interface.c:903
 msgid "Toggles object snapping for this window."
 msgstr "切换本窗口的“对象捕捉”功能。"
 
-#: ../app/interface.c:926 ../app/interface.c:1034 ../dia.desktop.in.in.h:2
-msgid "Diagram Editor"
-msgstr "图表编辑器"
+#: app/interface.c:913
+#, fuzzy
+#| msgid "Toggles snap-to-grid for this window."
+msgid "Toggles snap-to-guides for this window."
+msgstr "åˆ‡æ¢æœ¬çª—å£çš„â€œå¯¹é½åˆ°ç½‘æ ¼â€åŠŸèƒ½ã€‚"
+
+#: app/layer-editor/dia-layer-editor.c:227
+#: app/layer-editor/dia-layer-properties.c:311
+#, c-format
+msgid "New layer %d"
+msgstr "新建图层 %d"
 
-#: ../app/layer_dialog.c:165
+#: app/layer-editor/dia-layer-editor.c:415
 msgid "New Layer"
 msgstr "新建图层"
 
-#: ../app/layer_dialog.c:166
+#: app/layer-editor/dia-layer-editor.c:416
+msgid "Delete Layer"
+msgstr "åˆ é™¤å›¾å±‚"
+
+#: app/layer-editor/dia-layer-editor.c:417
+msgid "Rename Layer"
+msgstr "重命名图层"
+
+#: app/layer-editor/dia-layer-editor.c:418
 msgid "Raise Layer"
 msgstr "提高图层"
 
-#: ../app/layer_dialog.c:167
+#: app/layer-editor/dia-layer-editor.c:419
 msgid "Lower Layer"
 msgstr "降低图层"
 
-#: ../app/layer_dialog.c:168
-msgid "Delete Layer"
-msgstr "åˆ é™¤å›¾å±‚"
-
-#: ../app/layer_dialog.c:305
-msgid "Layers:"
-msgstr "图层："
-
-#: ../app/layer_dialog.c:384
+#: app/layer-editor/dia-layer-editor-dialog.c:248
+#: app/layer-editor/layer_dialog.c:64
 msgid "Layers"
 msgstr "图层"
 
-#: ../app/layer_dialog.c:398
-msgid "Diagram:"
-msgstr "图表："
-
-#: ../app/layer_dialog.c:512 ../app/layer_dialog.c:1224
-#, c-format
-msgid "New layer %d"
-msgstr "新建图层 %d"
-
-#: ../app/layer_dialog.c:727
-msgid "none"
-msgstr "æ— "
-
-#: ../app/layer_dialog.c:1194
+#: app/layer-editor/dia-layer-properties.c:216
+#: app/layer-editor/dia-layer-properties.c:263
 msgid "Edit Layer"
 msgstr "编辑图层"
 
-#: ../app/layer_dialog.c:1194
-msgid "Add Layer"
-msgstr "æ·»åŠ å›¾å±‚"
-
-#: ../app/layer_dialog.c:1213
+#: app/layer-editor/dia-layer-properties.c:231
 msgid "Layer name:"
 msgstr "图层名："
 
-#: ../app/linewidth_area.c:247 ../lib/properties.h:623 ../lib/properties.h:626
-#: ../objects/chronogram/chronoline.c:180
-#: ../objects/chronogram/chronoref.c:159
-msgid "Line width"
-msgstr "线宽"
+#: app/layer-editor/dia-layer-properties.c:303
+msgid "Add Layer"
+msgstr "æ·»åŠ å›¾å±‚"
 
-#: ../app/linewidth_area.c:259
-msgid "Line width:"
-msgstr "线宽："
+#: app/layer-editor/layer_dialog.c:72
+#, fuzzy
+#| msgid "Close Diagram"
+msgid "Close Layer pane"
+msgstr "关闭图表"
 
-#: ../app/load_save.c:266
+#: app/load_save.c:267
 msgid ""
 "Error loading diagram.\n"
 "Linked object not found in document."
@@ -996,7 +1056,7 @@ msgstr ""
 "载入图表时发生错误。\n"
 "在文档中没有发现所链接的对象。"
 
-#: ../app/load_save.c:270
+#: app/load_save.c:271
 #, c-format
 msgid ""
 "Error loading diagram.\n"
@@ -1005,7 +1065,7 @@ msgstr ""
 "载入图表时发生错误。\n"
 "连接柄 %d 不存在于“%s”。"
 
-#: ../app/load_save.c:288
+#: app/load_save.c:287
 #, c-format
 msgid ""
 "Error loading diagram.\n"
@@ -1014,29 +1074,29 @@ msgstr ""
 "载入图表时发生错误。\n"
 "连接点 %d 不存在于“%s”。"
 
-#: ../app/load_save.c:328
+#: app/load_save.c:327
 #, c-format
 msgid "Can't find parent %s of %s object\n"
 msgstr "找不到 %2$s 对象的父对象 %1$s\n"
 
-#: ../app/load_save.c:378
+#: app/load_save.c:394
 msgid "You must specify a file, not a directory."
 msgstr "您必须指定一个文件，而不是目录。"
 
-#: ../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:96
+#: app/load_save.c:401 plug-ins/dxf/dxf-import.c:1293
+#: plug-ins/wpg/wpg-import.c:500 plug-ins/xfig/xfig-import.c:1299
+#: plug-ins/xslt/xslt.c:101
 #, c-format
 msgid "Couldn't open: '%s' for reading.\n"
 msgstr "æ— æ³•æ‰“å¼€â€œ%s”进行读取。\n"
 
 #. this was talking about unknown file type but it could as well be broken XML
-#: ../app/load_save.c:403
+#: app/load_save.c:419
 #, c-format
 msgid "Error loading diagram %s."
 msgstr "载入图表 %s 时发生错误。"
 
-#: ../app/load_save.c:408
+#: app/load_save.c:428
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1045,7 +1105,7 @@ msgstr ""
 "载入图表 %s 时发生错误。\n"
 "未知的文件类型。"
 
-#: ../app/load_save.c:416
+#: app/load_save.c:436
 #, c-format
 msgid ""
 "Error loading diagram %s.\n"
@@ -1054,7 +1114,11 @@ msgstr ""
 "载入图表 %s 时发生错误。\n"
 "不是 Dia 文件。"
 
-#: ../app/load_save.c:674
+#: app/load_save.c:712
+msgid "Error reading connections"
+msgstr "读取连接时出错"
+
+#: app/load_save.c:733
 #, c-format
 msgid ""
 "Error loading diagram:\n"
@@ -1065,666 +1129,867 @@ msgstr ""
 "%s。\n"
 "合法的 Dia 文件至少定义了一个层。"
 
-#: ../app/load_save.c:1017
+#: app/load_save.c:1063
+#, c-format
+msgid "Error saving connections to layer '%s'"
+msgstr ""
+
+#: app/load_save.c:1072
+#, c-format
+msgid "Connection saving is incomplete for layer '%s'"
+msgstr ""
+
+#: app/load_save.c:1127
 #, c-format
 msgid "Not allowed to write to output file %s\n"
 msgstr "不允许写入输出文件 %s\n"
 
-#: ../app/load_save.c:1049
+#: app/load_save.c:1159
 #, 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:1207 ../plug-ins/postscript/render_eps.c:123
-#: ../plug-ins/pstricks/render_pstricks.c:917
-#: ../plug-ins/vdx/vdx-export.c:1801 ../plug-ins/wmf/wmf.cpp:1375
-#: ../plug-ins/wpg/wpg.c:1078 ../plug-ins/xfig/xfig-export.c:1178
+#: app/load_save.c:1182 plug-ins/cgm/cgm.c:1092 plug-ins/dxf/dxf-export.c:579
+#: plug-ins/metapost/render_metapost.c:1080 plug-ins/pgf/render_pgf.c:1264
+#: plug-ins/postscript/render_eps.c:108 plug-ins/pstricks/render_pstricks.c:960
+#: plug-ins/vdx/vdx-export.c:1765 plug-ins/wmf/wmf.cpp:1417
+#: plug-ins/wpg/wpg.c:1130 plug-ins/xfig/xfig-export.c:1192
 #, 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:1083
+#: app/load_save.c:1193
 #, c-format
 msgid "Internal error %d writing file %s\n"
 msgstr "写入文件 %2$s 时发生内部错误 %1$d\n"
 
-#: ../app/load_save.c:1094
+#: app/load_save.c:1204
 #, c-format
-msgid "Can't rename %s to final output file %s: %s\n"
-msgstr "æ— æ³•å°† %s 重命名为终稿输出文件 %s：%s\n"
+msgid "Can't rename %s to final output file %s"
+msgstr "æ— æ³•å°† %s 重命名为终稿输出文件 %s"
 
-#: ../app/load_save.c:1110
-msgid "Diagram Save"
-msgstr "保存图表"
+#. no extra threads supported, stay in this one
+#: app/load_save.c:1322 app/load_save.c:1332 app/load_save.c:1340
+msgid "Auto save"
+msgstr "自动保存"
 
-#: ../app/load_save.c:1240 ../app/load_save.c:1245
+#: app/load_save.c:1364 app/load_save.c:1369
 msgid "Dia Diagram File"
 msgstr "Dia 图表文件"
 
-#: ../app/menus.c:63
-msgid "Fit"
-msgstr "适合"
-
 #
-#: ../app/menus.c:80
+#: app/menus.c:84
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../app/menus.c:81
+#: app/menus.c:85 data/ui/sheets-main-dialog.ui:256
+msgid "_New"
+msgstr "新建(_N)"
+
+#: app/menus.c:85
 msgid "Create a new diagram"
 msgstr "创建新图表"
 
-#: ../app/menus.c:82
+#: app/menus.c:86
 msgid "_Open…"
 msgstr "打开(_O)…"
 
-#: ../app/menus.c:82
+#: app/menus.c:86
 msgid "Open a diagram file"
 msgstr "打开图表文件"
 
 #
-#: ../app/menus.c:84
+#: app/menus.c:88 app/menus.c:89
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../app/menus.c:94
-msgid "Sheets and Objects…"
-msgstr "工作表和对象…"
+#: app/menus.c:89
+msgid "Dia help"
+msgstr "Dia 帮助"
+
+#: app/menus.c:90
+msgid "_About"
+msgstr "关于(_A)"
 
-#: ../app/menus.c:96
-msgid "Plugins…"
-msgstr "插件…"
+#: app/menus.c:90
+msgid "Dia version, authors, license"
+msgstr "Dia 版本、作者、许可"
 
-#: ../app/menus.c:97
-msgid "_Diagram Tree"
-msgstr "å›¾è¡¨æ ‘(_D)"
+#: app/menus.c:96
+msgid "S_heets and Objects"
+msgstr "工作表和对象(_H)"
 
-#: ../app/menus.c:102
-msgid "Show Toolbar"
-msgstr "æ˜¾ç¤ºå·¥å…·æ "
+#: app/menus.c:96
+msgid "Manage sheets and their objects"
+msgstr "管理工作表及其对象"
 
-#: ../app/menus.c:103
-msgid "Show Statusbar"
-msgstr "æ˜¾ç¤ºçŠ¶æ€æ "
+#: app/menus.c:97
+msgid "P_references"
+msgstr "首选项(_P)"
 
-#: ../app/menus.c:104
-msgid "Show Layers"
-msgstr "显示图层"
+#: app/menus.c:97
+msgid "Dia preferences"
+msgstr "Dia 首选项"
 
-#: ../app/menus.c:110
+#: app/menus.c:98
+msgid "P_lugins…"
+msgstr "插件(_L)…"
+
+#: app/menus.c:98
+msgid "Manage plug-ins"
+msgstr "管理插件"
+
+#: app/menus.c:99
+msgid "Diagram _Tree"
+msgstr "å›¾è¡¨æ ‘(_T)"
+
+#: app/menus.c:99
+msgid "Tree representation of diagrams"
+msgstr "ä½¿ç”¨æ ‘è¡¨ç¤ºå›¾è¡¨"
+
+#: app/menus.c:104
+msgid "Show _Toolbar"
+msgstr "æ˜¾ç¤ºå·¥å…·æ (_T)"
+
+#: app/menus.c:104 app/menus.c:264
+msgid "Show or hide the toolbar"
+msgstr "æ˜¾ç¤ºæˆ–éšè—å·¥å…·æ "
+
+#: app/menus.c:105
+msgid "Show _Statusbar"
+msgstr "æ˜¾ç¤ºçŠ¶æ€æ (_S)"
+
+#: app/menus.c:105
+msgid "Show or hide the statusbar"
+msgstr "æ˜¾ç¤ºæˆ–éšè—çŠ¶æ€æ "
+
+#: app/menus.c:106
+msgid "Show _Layers"
+msgstr "显示图层(_L)"
+
+#: app/menus.c:106
+msgid "Show or hide the layers toolwindow"
+msgstr "显示或隐藏图层工具窗口"
+
+#: app/menus.c:112
 msgid "Save the diagram"
 msgstr "保存图表"
 
-#: ../app/menus.c:111
+#: app/menus.c:113
 msgid "Save _As…"
 msgstr "另存为(_A)…"
 
-#: ../app/menus.c:111
+#: app/menus.c:113
 msgid "Save the diagram with a new name"
 msgstr "将图表另存为"
 
-#: ../app/menus.c:112
+#: app/menus.c:114
 msgid "_Export…"
-msgstr "导出(_E)..."
+msgstr "导出(_E)…"
 
-#: ../app/menus.c:112
+#: app/menus.c:114
 msgid "Export the diagram"
 msgstr "导出图表"
 
-#: ../app/menus.c:113
+#: app/menus.c:115
 msgid "_Diagram Properties"
 msgstr "图表属性(_D)"
 
-#: ../app/menus.c:114
+#: app/menus.c:115
+msgid "Modify diagram properties (grid, background)"
+msgstr "修改图表属性 (ç½‘æ ¼ï¼ŒèƒŒæ™¯)"
+
+#: app/menus.c:116
 msgid "Page Set_up…"
 msgstr "页面设置(_U)…"
 
-#: ../app/menus.c:115
+#: app/menus.c:116
+msgid "Modify the diagram pagination"
+msgstr ""
+
+#: app/menus.c:117
 msgid "_Print…"
 msgstr "打印机(_P)…"
 
-#: ../app/menus.c:115
+#: app/menus.c:117
 msgid "Print the diagram"
 msgstr "打印图表"
 
-#: ../app/menus.c:118
+#: app/menus.c:118
+msgid "Close the diagram"
+msgstr "关闭图表"
+
+#: app/menus.c:120 data/ui/sheets-main-dialog.ui:27
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../app/menus.c:119
+#: app/menus.c:121
+msgid "_Undo"
+msgstr "撤销(_U)"
+
+#: app/menus.c:121
 msgid "Undo"
 msgstr "撤销"
 
-#: ../app/menus.c:120
+#: app/menus.c:122
+msgid "_Redo"
+msgstr "重做(_R)"
+
+#: app/menus.c:122
 msgid "Redo"
 msgstr "重做"
 
-#: ../app/menus.c:122
+#: app/menus.c:124
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: app/menus.c:124
 msgid "Copy selection"
-msgstr "复制图表"
+msgstr "复制所选"
 
-#: ../app/menus.c:123
+#: app/menus.c:125
+msgid "Cu_t"
+msgstr "剪切(_T)"
+
+#: app/menus.c:125
 msgid "Cut selection"
 msgstr "剪切选择"
 
+#: app/menus.c:126
+msgid "_Paste"
+msgstr "粘贴(_P)"
+
 #
-#: ../app/menus.c:124
+#: app/menus.c:126
 msgid "Paste selection"
 msgstr "粘贴选择"
 
 #
-#: ../app/menus.c:125
+#: app/menus.c:127
 msgid "_Duplicate"
 msgstr "副本(_D)"
 
-#: ../app/menus.c:128
+#
+#: app/menus.c:127
+msgid "Duplicate selection"
+msgstr "重复选择"
+
+#: app/menus.c:128
+msgid "D_elete"
+msgstr "åˆ é™¤(_D)"
+
+#
+#: app/menus.c:128
+msgid "Delete selection"
+msgstr "åˆ é™¤æ‰€é€‰"
+
+#: app/menus.c:130
 msgid "_Find…"
 msgstr "查找(_F)…"
 
-#: ../app/menus.c:129
+#: app/menus.c:130
+msgid "Search for text"
+msgstr "搜索文本"
+
+#: app/menus.c:131
 msgid "_Replace…"
 msgstr "替换(_R)…"
 
+#: app/menus.c:131
+msgid "Search and replace text"
+msgstr "搜索和替换文字"
+
 #
 #. the following used to bind to <control><shift>C which collides with Unicode input.
 #. * <control><alt> doesn't work either
-#: ../app/menus.c:133
-msgid "Copy Text"
-msgstr "复制文本"
+#: app/menus.c:135
+msgid "C_opy Text"
+msgstr "复制文本(_O)"
+
+#: app/menus.c:135
+msgid "Copy object's text to clipboard"
+msgstr "复制对象文本到剪贴板"
 
 #
-#: ../app/menus.c:134
-msgid "Cut Text"
-msgstr "剪切文本"
+#: app/menus.c:136
+msgid "C_ut Text"
+msgstr "剪切文本(_U)"
+
+#: app/menus.c:136
+msgid "Cut object's text to clipboard"
+msgstr "剪切对象文本到剪贴板"
 
 #
-#: ../app/menus.c:135
-msgid "Paste _Text"
-msgstr "粘贴文本(_T)"
+#: app/menus.c:137
+msgid "P_aste Text"
+msgstr "粘贴文本(_A)"
+
+#: app/menus.c:137
+msgid "Insert text from clipboard"
+msgstr "从剪贴板插入文本"
 
 #
-#: ../app/menus.c:137
+#: app/menus.c:139
 msgid "Paste _Image"
 msgstr "粘贴图像(_I)"
 
-#: ../app/menus.c:139
+#: app/menus.c:139
+msgid "Insert image from clipboard"
+msgstr "从剪贴板插入图像"
+
+#: app/menus.c:141
 msgid "_Layers"
 msgstr "图层(_L)"
 
-#: ../app/menus.c:140
-msgid "Add Layer…"
-msgstr "æ·»åŠ å›¾å±‚â€¦"
+#: app/menus.c:142
+msgid "_Add Layer…"
+msgstr "æ·»åŠ å›¾å±‚(_A)…"
 
-#: ../app/menus.c:141
-msgid "Rename Layer…"
-msgstr "重命名图层…"
+#: app/menus.c:143
+msgid "_Rename Layer…"
+msgstr "重命名图层(_R)…"
 
-#: ../app/menus.c:142
-msgid "Move Selection to Layer above"
-msgstr "将所选移到上一图层"
+#: app/menus.c:144
+msgid "_Move Selection to Layer above"
+msgstr "将所选移到上一图层(_M)"
 
-#: ../app/menus.c:143
-msgid "Move Selection to Layer below"
-msgstr "将所选移到下一图层"
+#: app/menus.c:145
+msgid "Move _Selection to Layer below"
+msgstr "将所选移到下一图层(_S)"
 
-#: ../app/menus.c:144
+#: app/menus.c:146
 msgid "_Layers…"
 msgstr "图层(_L)…"
 
 #
-#: ../app/menus.c:145
+#: app/menus.c:148
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../app/menus.c:146
+#: app/menus.c:149
+msgid "Zoom _In"
+msgstr "放大(_I)"
+
+#: app/menus.c:149
 msgid "Zoom in"
 msgstr "放大"
 
-#: ../app/menus.c:147
+#: app/menus.c:150
+msgid "Zoom _Out"
+msgstr "缩小(_O)"
+
+#: app/menus.c:150
 msgid "Zoom out"
 msgstr "缩小"
 
-#: ../app/menus.c:148
+#: app/menus.c:151
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../app/menus.c:149
+#: app/menus.c:152
 msgid "1600%"
 msgstr "1600%"
 
-#: ../app/menus.c:150 ../app/menus.c:578 ../app/menus.c:590
+#: app/menus.c:153 app/menus.c:622
 msgid "800%"
 msgstr "800%"
 
-#: ../app/menus.c:151 ../app/menus.c:579 ../app/menus.c:591
+#: app/menus.c:154 app/menus.c:628
 msgid "400%"
 msgstr "400%"
 
-#: ../app/menus.c:152
+#: app/menus.c:155
 msgid "283"
 msgstr "283"
 
-#: ../app/menus.c:153
+#: app/menus.c:156
 msgid "200"
 msgstr "200"
 
-#: ../app/menus.c:154
+#: app/menus.c:157
 msgid "141"
 msgstr "141"
 
-#: ../app/menus.c:156
+#: app/menus.c:158
+msgid "_Normal Size"
+msgstr "正常大小(_N)"
+
+#: app/menus.c:159
 msgid "85"
 msgstr "85"
 
-#: ../app/menus.c:157
+#: app/menus.c:160
 msgid "70.7"
 msgstr "70.7"
 
-#: ../app/menus.c:158
+#: app/menus.c:161
 msgid "50"
 msgstr "50"
 
-#: ../app/menus.c:159
+#: app/menus.c:162
 msgid "35.4"
 msgstr "35.4"
 
-#: ../app/menus.c:160
+#: app/menus.c:163
 msgid "25"
 msgstr "25"
 
 #. Show All, Best Fit.  Same as the Gimp, Ctrl+E
-#: ../app/menus.c:162
+#: app/menus.c:165
+msgid "Best _Fit"
+msgstr "最适合(_F)"
+
+#: app/menus.c:165
 msgid "Zoom fit"
 msgstr "最佳尺寸"
 
 #
 #. "display_toggle_entries" items go here
-#: ../app/menus.c:166
+#: app/menus.c:169
 msgid "New _View"
 msgstr "新建视图(_V)"
 
-#: ../app/menus.c:167
+#: app/menus.c:170
 msgid "C_lone View"
 msgstr "克隆视图(_L)"
 
+#: app/menus.c:171
+msgid "_Refresh"
+msgstr "刷新(_R)"
+
+#: app/menus.c:173
+#, fuzzy
+#| msgid "Guide"
+msgid "_Guides"
+msgstr "导向"
+
+#: app/menus.c:174
+msgid "_New Guide..."
+msgstr ""
+
 #
-#: ../app/menus.c:170
+#: app/menus.c:176
 msgid "_Objects"
 msgstr "对象(_O)"
 
 #
-#: ../app/menus.c:171
+#: app/menus.c:177
 msgid "Send to _Back"
 msgstr "推到最后(_B)"
 
+#: app/menus.c:177
+msgid "Move selection to the bottom"
+msgstr "将所选移到底部"
+
 #
-#: ../app/menus.c:172
+#: app/menus.c:178
 msgid "Bring to _Front"
 msgstr "提到最前(_F)"
 
+#: app/menus.c:178
+msgid "Move selection to the top"
+msgstr "将选择移到顶部"
+
 #
-#: ../app/menus.c:173
-msgid "Send Backwards"
+#: app/menus.c:179
+#, fuzzy
+#| msgid "Send Backwards"
+msgid "Send Ba_ckwards"
 msgstr "下移一层"
 
 #
-#: ../app/menus.c:174
-msgid "Bring Forwards"
-msgstr "上移一层"
+#: app/menus.c:180
+msgid "Bring F_orwards"
+msgstr "上移一层(_O)"
 
-#: ../app/menus.c:176
+#: app/menus.c:182
 msgid "_Group"
 msgstr "组合(_G)"
 
+#: app/menus.c:182
+msgid "Group selected objects"
+msgstr "组合所选对象"
+
 #
 #. deliberately not using Ctrl+U for Ungroup
-#: ../app/menus.c:178
+#: app/menus.c:184
 msgid "_Ungroup"
 msgstr "取消组合(_U)"
 
-#: ../app/menus.c:180
+#: app/menus.c:184
+msgid "Ungroup selected groups"
+msgstr "取消选定组的组合"
+
+#: app/menus.c:186
 msgid "_Parent"
 msgstr "父对象(_P)"
 
 #
-#: ../app/menus.c:181
+#: app/menus.c:187
 msgid "_Unparent"
 msgstr "取消父对象(_U)"
 
 #
-#: ../app/menus.c:182
+#: app/menus.c:188
 msgid "_Unparent Children"
 msgstr "取消子对象的父对象(_U)"
 
-#. Translators: Menu item Verb/Support/Position/Align
-#: ../app/menus.c:184 ../objects/FS/function.c:805
-msgid "Align"
-msgstr "对齐"
+#: app/menus.c:190
+msgid "_Align"
+msgstr "对齐(_A)"
 
-#: ../app/menus.c:189 ../objects/standard/textobj.c:110
-msgid "Top"
-msgstr "顶部"
+#: app/menus.c:191
+msgid "_Left"
+msgstr "å·¦(_L)"
 
-#: ../app/menus.c:190
-msgid "Middle"
-msgstr "中间"
+#: app/menus.c:192
+msgid "_Center"
+msgstr "居中(_C)"
 
-#: ../app/menus.c:191 ../objects/standard/textobj.c:109
-msgid "Bottom"
-msgstr "底部"
+#: app/menus.c:193
+msgid "_Right"
+msgstr "右(_R)"
+
+#: app/menus.c:195
+msgid "_Top"
+msgstr "顶部(_T)"
+
+#: app/menus.c:196
+msgid "_Middle"
+msgstr "中间(_M)"
+
+#: app/menus.c:197
+msgid "_Bottom"
+msgstr "底部(_B)"
 
 #
-#: ../app/menus.c:193
-msgid "Spread Out Horizontally"
-msgstr "水平平均分布"
+#: app/menus.c:199
+msgid "Spread Out _Horizontally"
+msgstr "水平平均分布(_H)"
 
 #
-#: ../app/menus.c:194
-msgid "Spread Out Vertically"
-msgstr "垂直平均分布"
+#: app/menus.c:200
+msgid "Spread Out _Vertically"
+msgstr "垂直平均分布(_V)"
 
-#: ../app/menus.c:195
-msgid "Adjacent"
-msgstr "相邻的"
+#: app/menus.c:201
+msgid "_Adjacent"
+msgstr "相邻的(_A)"
 
-#: ../app/menus.c:196
-msgid "Stacked"
-msgstr "å †å "
+#: app/menus.c:202
+msgid "_Stacked"
+msgstr "å †å (_S)"
 
-#: ../app/menus.c:197 ../app/menus.c:207
-msgid "Connected"
-msgstr "连接"
+#: app/menus.c:203 app/menus.c:213
+msgid "_Connected"
+msgstr "连接(_C)"
+
+#: app/menus.c:205
+msgid "_Properties"
+msgstr "属性(_P)"
 
 #
-#: ../app/menus.c:201
+#: app/menus.c:207
 msgid "_Select"
 msgstr "选择(_S)"
 
-#: ../app/menus.c:202
-msgid "All"
-msgstr "全选"
+#: app/menus.c:208
+msgid "_All"
+msgstr "全部(_A)"
 
-#: ../app/menus.c:203 ../lib/arrows.c:1890 ../objects/Jackson/domain.c:94
-#: ../objects/UML/association.c:220 ../objects/UML/association.c:226
-msgid "None"
-msgstr "不选"
+#: app/menus.c:209
+msgid "_None"
+msgstr "不选(_N)"
 
-#: ../app/menus.c:204
-msgid "Invert"
-msgstr "反选"
+#: app/menus.c:210
+msgid "_Invert"
+msgstr "反选(_I)"
 
-#: ../app/menus.c:206
-msgid "Transitive"
-msgstr "ä¼ é€’"
+#: app/menus.c:212
+msgid "_Transitive"
+msgstr "ä¼ é€’(_T)"
 
 #
-#: ../app/menus.c:208
-msgid "Same Type"
-msgstr "相同类型"
+#: app/menus.c:214
+msgid "Same _Type"
+msgstr "相同类型(_T)"
 
 #
 #. display_select_radio_entries go here
-#: ../app/menus.c:212
-msgid "Select By"
-msgstr "选择"
+#: app/menus.c:218
+msgid "_Select By"
+msgstr "选择(_S)"
 
 #. For placment of the toplevel Layout menu and it's accelerator
-#: ../app/menus.c:215
+#: app/menus.c:221
 msgid "L_ayout"
 msgstr "布局(_A)"
 
-#
-#: ../app/menus.c:217
-msgid "_Input Methods"
-msgstr "输入法(_I)"
-
-#: ../app/menus.c:219
+#: app/menus.c:223
 msgid "D_ialogs"
 msgstr "对话框(_I)"
 
-#: ../app/menus.c:221
+#: app/menus.c:225
 msgid "D_ebug"
 msgstr "调试(_E)"
 
 #
-#: ../app/menus.c:227
+#: app/menus.c:231
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../app/menus.c:228
-msgid "Modify"
-msgstr "修改"
+#: app/menus.c:232
+msgid "_Modify"
+msgstr "修改(_M)"
 
-#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
-#: ../app/menus.c:229 ../app/toolbox.c:86 ../objects/FS/function.c:985
-msgid "Magnify"
-msgstr "放大"
+#: app/menus.c:233
+msgid "_Magnify"
+msgstr "放大(_M)"
 
-#: ../app/menus.c:230
-msgid "Edit Text"
-msgstr "编辑文本"
+#: app/menus.c:234
+msgid "_Edit Text"
+msgstr "编辑文本(_E)"
 
-#: ../app/menus.c:231
-msgid "Scroll"
-msgstr "移动"
+#: app/menus.c:235
+msgid "_Scroll"
+msgstr "滚动(_S)"
 
-#. 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:674 ../objects/AADL/aadlbox.c:153
-#: ../objects/custom/custom_object.c:228 ../objects/Jackson/requirement.c:130
-#: ../objects/network/basestation.c:132 ../objects/network/radiocell.c:125
-#: ../objects/UML/activity.c:127 ../objects/UML/actor.c:120
-#: ../objects/UML/classicon.c:145 ../objects/UML/component.c:127
-#: ../objects/UML/component_feature.c:158 ../objects/UML/node.c:127
-#: ../objects/UML/node.c:129 ../objects/UML/note.c:118
-#: ../objects/UML/object.c:164 ../objects/UML/small_package.c:129
-#: ../objects/UML/state.c:154 ../objects/UML/usecase.c:136
-msgid "Text"
-msgstr "文本"
+#: app/menus.c:236
+msgid "_Text"
+msgstr "文本(_T)"
 
-#: ../app/menus.c:233 ../app/toolbox.c:104
-msgid "Box"
-msgstr "方框"
+#: app/menus.c:237
+msgid "_Box"
+msgstr "方框(_B)"
 
-#: ../app/menus.c:234 ../app/toolbox.c:110
-msgid "Ellipse"
-msgstr "椭圆"
+#: app/menus.c:238
+msgid "_Ellipse"
+msgstr "椭圆(_E)"
 
-#: ../app/menus.c:235 ../app/toolbox.c:116
-msgid "Polygon"
-msgstr "多边形"
+#: app/menus.c:239
+msgid "_Polygon"
+msgstr "多边形(_P)"
 
-#: ../app/menus.c:236 ../app/toolbox.c:122
-msgid "Beziergon"
-msgstr "贝塞尔封闭曲线"
+#: app/menus.c:240
+msgid "_Beziergon"
+msgstr "贝塞尔封闭曲线(_B)"
 
-#: ../app/menus.c:238 ../app/toolbox.c:128 ../objects/standard/line.c:325
-msgid "Line"
-msgstr "直线"
+#: app/menus.c:242
+msgid "_Line"
+msgstr "直线(_L)"
 
-#: ../app/menus.c:239 ../app/toolbox.c:134
-msgid "Arc"
-msgstr "圆弧"
+#: app/menus.c:243
+msgid "_Arc"
+msgstr "圆弧(_A)"
 
-#: ../app/menus.c:240 ../app/toolbox.c:140
-msgid "Zigzagline"
-msgstr "横竖折线"
+#: app/menus.c:244
+msgid "_Zigzagline"
+msgstr "横竖折线(_Z)"
 
-#: ../app/menus.c:241 ../app/toolbox.c:146
-msgid "Polyline"
-msgstr "折线"
+#: app/menus.c:245
+msgid "_Polyline"
+msgstr "折线(_P)"
 
-#: ../app/menus.c:242 ../app/toolbox.c:152
-msgid "Bezierline"
-msgstr "贝塞尔曲线"
+#: app/menus.c:246
+msgid "_Bezierline"
+msgstr "贝塞尔曲线(_B)"
 
-#: ../app/menus.c:243 ../app/toolbox.c:165
-msgid "Outline"
-msgstr "轮廓字"
+#: app/menus.c:247
+msgid "_Outline"
+msgstr "轮廓字(_O)"
 
-#: ../app/menus.c:245 ../app/toolbox.c:158
-msgid "Image"
-msgstr "图像"
+#: app/menus.c:249
+msgid "_Image"
+msgstr "图像(_I)"
+
+#: app/menus.c:255
+msgid "_Fullscreen"
+msgstr "全屏(_F)"
 
 #
-#: ../app/menus.c:252
+#: app/menus.c:256
 msgid "_Antialiased"
 msgstr "反锯齿(_A)"
 
 #
-#: ../app/menus.c:253
+#: app/menus.c:257
 msgid "Show _Grid"
 msgstr "æ˜¾ç¤ºç½‘æ ¼(_G)"
 
 #
-#: ../app/menus.c:254
+#: app/menus.c:258
 msgid "_Snap to Grid"
 msgstr "å¯¹é½åˆ°ç½‘æ ¼(_S)"
 
 #
-#: ../app/menus.c:255
+#: app/menus.c:259
+#, fuzzy
+#| msgid "Show _Grid"
+msgid "_Show Guides"
+msgstr "æ˜¾ç¤ºç½‘æ ¼(_G)"
+
+#
+#: app/menus.c:260
+#, fuzzy
+#| msgid "_Snap to Grid"
+msgid "Snap to _Guides"
+msgstr "å¯¹é½åˆ°ç½‘æ ¼(_S)"
+
+#: app/menus.c:261
+msgid "_Remove all Guides"
+msgstr ""
+
+#
+#: app/menus.c:262
 msgid "Snap to _Objects"
 msgstr "对象捕捉(_O)"
 
 #
-#: ../app/menus.c:256
+#: app/menus.c:263
 msgid "Show _Rulers"
 msgstr "æ˜¾ç¤ºæ ‡å°º(_R)"
 
+#: app/menus.c:264
+msgid "Show Scroll_bars"
+msgstr "显示滚动条(_B)"
+
 #
-#: ../app/menus.c:257
+#: app/menus.c:265
 msgid "Show _Connection Points"
 msgstr "显示连接点(_C)"
 
-#: ../app/menus.c:264
-msgid "Union"
-msgstr "联合"
+#: app/menus.c:272
+msgid "_Union"
+msgstr "联合(_U)"
 
 #
-#: ../app/menus.c:265
-msgid "Intersection"
-msgstr "交叉"
+#: app/menus.c:273
+msgid "I_ntersection"
+msgstr "交叉(_N)"
 
-#. 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:266 ../objects/FS/function.c:705
-#: ../objects/FS/function.c:857 ../objects/FS/function.c:859
-msgid "Remove"
-msgstr "åˆ é™¤"
+#: app/menus.c:274
+msgid "R_emove"
+msgstr "åˆ é™¤(_E)"
 
 #. Cannot also be called Invert, duplicate names caused keybinding problems
-#: ../app/menus.c:268
-msgid "Inverse"
-msgstr "反转"
+#: app/menus.c:276
+msgid "In_verse"
+msgstr "反转(_V)"
 
-#: ../app/menus.c:331
+#: app/menus.c:334
 msgid "NULL tooldata in tool_menu_select"
 msgstr "tool_menu_select 中的 tooldata 值为 NULL"
 
-#: ../app/menus.c:580 ../app/menus.c:592
+#: app/menus.c:616
+msgid "Fit"
+msgstr "适合"
+
+#: app/menus.c:634
 msgid "300%"
 msgstr "300%"
 
-#: ../app/menus.c:581 ../app/menus.c:593
+#: app/menus.c:640
 msgid "200%"
 msgstr "200%"
 
-#: ../app/menus.c:582 ../app/menus.c:594
+#: app/menus.c:646
 msgid "150%"
 msgstr "150%"
 
-#: ../app/menus.c:583 ../app/menus.c:595
+#: app/menus.c:652
 msgid "100%"
 msgstr "100%"
 
-#: ../app/menus.c:584 ../app/menus.c:596
+#: app/menus.c:658
 msgid "75%"
 msgstr "75%"
 
-#: ../app/menus.c:585 ../app/menus.c:597
+#: app/menus.c:664
 msgid "50%"
 msgstr "50%"
 
-#: ../app/menus.c:586 ../app/menus.c:598
+#: app/menus.c:670
 msgid "25%"
 msgstr "25%"
 
-#: ../app/menus.c:587 ../app/menus.c:599
+#: app/menus.c:676
 msgid "10%"
 msgstr "10%"
 
-#: ../app/menus.c:625
+#: app/menus.c:704
 msgid "Toggles snap-to-grid."
 msgstr "åˆ‡æ¢å¯¹é½åˆ°ç½‘æ ¼ã€‚"
 
-#: ../app/menus.c:636
+#: app/menus.c:716
 msgid "Toggles object snapping."
 msgstr "切换对象捕捉。"
 
-#: ../app/menus.c:1254
+#: app/menus.c:729
+#, fuzzy
+#| msgid "Toggles object snapping."
+msgid "Toggles guide snapping."
+msgstr "切换对象捕捉。"
+
+#: app/menus.c:1345
 msgid "The function is not available anymore."
 msgstr "该函数已不复存在。"
 
-#: ../app/modify_tool.c:384
+#: app/modify_tool.c:434
 msgid "Couldn't get GTK+ settings"
 msgstr "æ— æ³•èŽ·å– GTK+ 设置"
 
-#: ../app/plugin-manager.c:208
+#. build up the user interface
+#: app/plugin-manager.c:205
 msgid "Plugins"
 msgstr "插件"
 
-#: ../app/plugin-manager.c:263
+#: app/plugin-manager.c:260
 msgid "Loaded"
 msgstr "已载入"
 
-#: ../app/plugin-manager.c:276
-msgid "Description"
-msgstr "说明"
-
-#: ../app/plugin-manager.c:285
+#: app/plugin-manager.c:282
 msgid "Load at Startup"
 msgstr "在启动时装载"
 
-#: ../app/plugin-manager.c:292
+#: app/plugin-manager.c:289
 msgid "Filename"
 msgstr "文件名"
 
-#: ../app/preferences.c:100 ../app/preferences.c:143
+#: app/preferences.c:102 app/preferences.c:145
 msgid "any"
 msgstr "任意"
 
-#: ../app/preferences.c:118
+#: app/preferences.c:120
 msgid "User Interface"
 msgstr "用户界面"
 
-#: ../app/preferences.c:119
+#: app/preferences.c:121
 msgid "Diagram Defaults"
 msgstr "图表默认值"
 
-#: ../app/preferences.c:120
+#: app/preferences.c:122
 msgid "View Defaults"
 msgstr "查看默认值"
 
-#: ../app/preferences.c:121
+#: app/preferences.c:123
 msgid "Favorites"
 msgstr "收藏夹"
 
-#: ../app/preferences.c:164
+#: app/preferences.c:124 data/ui/properties-dialog.ui:343
+msgid "Grid Lines"
+msgstr "ç½‘æ ¼çº¿"
+
+#: app/preferences.c:166
 msgid "Reset tools after create"
 msgstr "创建后重置工具"
 
-#: ../app/preferences.c:167
+#: app/preferences.c:169
 msgid "Number of undo levels:"
 msgstr "可撤消次数："
 
-#: ../app/preferences.c:170
+#: app/preferences.c:172
 msgid ""
 "Reverse dragging selects\n"
 "intersecting objects"
@@ -1732,267 +1997,275 @@ msgstr ""
 "反向拖曳选择\n"
 "相交的对象"
 
-#: ../app/preferences.c:173
+#: app/preferences.c:175
 msgid "Recent documents list size:"
 msgstr "最近文档列表大小："
 
-#: ../app/preferences.c:176
+#: app/preferences.c:178
 msgid "Use menu bar"
 msgstr "ä½¿ç”¨èœå•æ "
 
-#: ../app/preferences.c:179
+#: app/preferences.c:181
 msgid "Keep tool box on top of diagram windows"
 msgstr "保持工具箱在图表窗口项部"
 
-#: ../app/preferences.c:182
+#: app/preferences.c:184
 msgid "Length unit:"
 msgstr "长度单位："
 
-#: ../app/preferences.c:185
+#: app/preferences.c:187
 msgid "Font size unit:"
 msgstr "字体大小单位："
 
-#: ../app/preferences.c:188
+#: app/preferences.c:190
+msgid "Guide snapping distance:"
+msgstr ""
+
+#: app/preferences.c:192
 msgid "New diagram:"
 msgstr "新建图表："
 
-#: ../app/preferences.c:189
+#: app/preferences.c:193
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../app/preferences.c:191
+#: app/preferences.c:195
 msgid "Paper type:"
 msgstr "çº¸å¼ ç±»åž‹ï¼š"
 
-#: ../app/preferences.c:193
+#: app/preferences.c:197
 msgid "Background Color:"
 msgstr "背景色："
 
-#: ../app/preferences.c:195
+#: app/preferences.c:199
 msgid "Compress saved files"
 msgstr "压缩保存的文件"
 
-#: ../app/preferences.c:198
+#: app/preferences.c:202
 msgid "Connection Points:"
 msgstr "连接点："
 
 #. { NULL, PREF_NONE, 0, NULL, 3, N_("Grid:") },
-#: ../app/preferences.c:199 ../app/preferences.c:210 ../app/preferences.c:234
+#: app/preferences.c:203 app/preferences.c:214 app/preferences.c:224
+#: app/preferences.c:244
 msgid "Visible"
 msgstr "可见"
 
 #
-#: ../app/preferences.c:200
+#: app/preferences.c:204
 msgid "Snap to object"
 msgstr "对象捕捉"
 
-#: ../app/preferences.c:203
+#: app/preferences.c:207
 msgid "New window:"
 msgstr "新建窗口："
 
-#: ../app/preferences.c:204
+#: app/preferences.c:208
 msgid "Width:"
 msgstr "宽度："
 
-#: ../app/preferences.c:205
+#: app/preferences.c:209
 msgid "Height:"
 msgstr "高度："
 
-#: ../app/preferences.c:206
+#: app/preferences.c:210
 msgid "Magnify:"
 msgstr "放大："
 
-#: ../app/preferences.c:209
+#: app/preferences.c:213
 msgid "Page breaks:"
 msgstr "换页："
 
-#: ../app/preferences.c:211 ../app/preferences.c:241
+#: app/preferences.c:215 app/preferences.c:226 app/preferences.c:251
 msgid "Color:"
 msgstr "颜色："
 
-#: ../app/preferences.c:212
+#: app/preferences.c:216
 msgid "Solid lines"
 msgstr "实线"
 
 #
-#: ../app/preferences.c:215
+#: app/preferences.c:219
 msgid "Antialias:"
 msgstr "反锯齿："
 
-#: ../app/preferences.c:216
+#: app/preferences.c:220
 msgid "view antialiased"
 msgstr "查看反锯齿化的对象"
 
-#. Favored Filter
-#. Translators: Menu item Verb/Channel/Export
-#. Translators: Menu item Verb/Channel/Export/Export
-#: ../app/preferences.c:220 ../objects/FS/function.c:695
-#: ../objects/FS/function.c:697 ../plug-ins/libart/export_png.c:329
-msgid "Export"
-msgstr "导出"
+#: app/preferences.c:223
+#, fuzzy
+#| msgid "Guide"
+msgid "Guides:"
+msgstr "导向"
+
+#
+#: app/preferences.c:225
+#, fuzzy
+#| msgid "_Snap to Grid"
+msgid "Snap to guides"
+msgstr "å¯¹é½åˆ°ç½‘æ ¼(_S)"
 
-#: ../app/preferences.c:222
+#: app/preferences.c:232
 msgid "Portable Network Graphics"
 msgstr "便携式网络图像"
 
-#: ../app/preferences.c:224 ../plug-ins/svg/render_svg.c:604
-#: ../plug-ins/svg/svg-import.c:1506
+#: app/preferences.c:234 plug-ins/svg/render_svg.c:660
+#: plug-ins/svg/svg-import.c:2136
 msgid "Scalable Vector Graphics"
 msgstr "可缩放矢量图(SVG)"
 
-#: ../app/preferences.c:226
+#: app/preferences.c:236
 msgid "PostScript"
 msgstr "PostScript"
 
-#: ../app/preferences.c:228 ../plug-ins/wmf/wmf.cpp:1477
+#: app/preferences.c:238 plug-ins/wmf/wmf.cpp:1519
 msgid "Windows Metafile"
 msgstr "Windows 图元文件"
 
-#: ../app/preferences.c:230 ../plug-ins/wmf/wmf.cpp:1486
+#: app/preferences.c:240 plug-ins/wmf/wmf.cpp:1528
 msgid "Enhanced Metafile"
 msgstr "增强型图元文件"
 
-#: ../app/preferences.c:235
+#: app/preferences.c:245
 msgid "Snap to"
 msgstr "对齐到"
 
-#: ../app/preferences.c:236
+#: app/preferences.c:246
 msgid "Dynamic grid resizing"
 msgstr "åŠ¨æ€ç½‘æ ¼å¤§å°è°ƒæ•´"
 
-#: ../app/preferences.c:237
+#: app/preferences.c:247
 msgid "X Size:"
 msgstr "X 大小："
 
-#: ../app/preferences.c:238
+#: app/preferences.c:248
 msgid "Y Size:"
 msgstr "Y 大小："
 
-#: ../app/preferences.c:239
+#: app/preferences.c:249
 msgid "Visual Spacing X:"
 msgstr "可见间距 X:"
 
-#: ../app/preferences.c:240
+#: app/preferences.c:250
 msgid "Visual Spacing Y:"
 msgstr "可见间距 Y:"
 
-#: ../app/preferences.c:242
+#: app/preferences.c:252
 msgid "Lines per major line"
 msgstr "ä¸»æ ¼çº¿ä¹‹é—´çš„è¡Œæ•°"
 
-#: ../app/preferences.c:244
+#: app/preferences.c:253
+msgid "Hex grid"
+msgstr "å…­è§’ç½‘æ ¼"
+
+#: app/preferences.c:254
 msgid "Hex Size:"
 msgstr "å…­è§’æ ¼çº¿å¤§å°ï¼š"
 
-#: ../app/preferences.c:481 ../lib/prop_inttypes.c:159
-#: ../lib/prop_pixbuf.c:268
+#: app/preferences.c:480 lib/diapatternselector.c:89 lib/prop_inttypes.c:157
+#: lib/prop_pixbuf.c:296
 msgid "Yes"
 msgstr "是"
 
-#: ../app/preferences.c:481 ../app/preferences.c:492
-#: ../lib/prop_inttypes.c:161 ../lib/prop_inttypes.c:187
-#: ../lib/prop_pixbuf.c:270 ../lib/prop_pixbuf.c:276
+#: app/preferences.c:480 app/preferences.c:491 lib/diapatternselector.c:93
+#: lib/diapatternselector.c:184 lib/prop_inttypes.c:159 lib/prop_inttypes.c:185
+#: lib/prop_pixbuf.c:298 lib/prop_pixbuf.c:304
 msgid "No"
 msgstr "否"
 
-#: ../app/preferences.c:595
+#: app/preferences.c:585
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../app/properties-dialog.c:60
+#. GtkWidget *actionbox;
+#. GList *buttons;
+#: app/properties-dialog.c:57
 msgid "Object properties"
 msgstr "对象属性"
 
-#: ../app/properties-dialog.c:85
+#: app/properties-dialog.c:82
 msgid "This object has no properties."
 msgstr "æ­¤å¯¹è±¡æ— å±žæ€§ã€‚"
 
-#: ../app/properties-dialog.c:248
+#: app/properties-dialog.c:242
 msgid "Properties: "
-msgstr "属性："
+msgstr "属性: "
 
-#: ../app/properties-dialog.c:252
+#: app/properties-dialog.c:246
 msgid "Object properties:"
 msgstr "对象属性："
 
-#: ../app/sheets.c:158
-#, c-format
-msgid ""
-"%s\n"
-"System sheet"
-msgstr ""
-"%s\n"
-"系统工作表"
+#: app/sheet-editor/sheets.c:192 sheets/AADL.sheet:28
+msgid "System"
+msgstr "系统"
 
-#: ../app/sheets.c:160
-#, c-format
-msgid ""
-"%s\n"
-"User sheet"
-msgstr ""
-"%s\n"
-"用户工作表"
+#: app/sheet-editor/sheets.c:193
+msgid "User"
+msgstr "用户"
 
-#: ../app/sheets.c:278
+#: app/sheet-editor/sheets.c:244
 msgid ""
 "Can't get symbol 'custom_type' from any module.\n"
 "Editing shapes is disabled."
 msgstr "æ— æ³•ä»Žä»»ä½•æ¨¡å—ä¸­æ‰¾åˆ°ç¬¦å·â€œcustom_type”。禁止编辑形状。"
 
-#: ../app/sheets.c:413
+#: app/sheet-editor/sheets.c:426
 #, c-format
 msgid "Widget not found: %s"
 msgstr "æ— æ³•æ‰¾åˆ°å­éƒ¨ä»¶ï¼š%s"
 
-#: ../app/sheets.c:443
+#: app/sheet-editor/sheets.c:456
 msgid "SVG Shape"
 msgstr "SVG 形状"
 
-#: ../app/sheets.c:445
+#: app/sheet-editor/sheets.c:458
 msgid "Programmed DiaObject"
-msgstr "Programmed DiaObject"
+msgstr ""
 
-#: ../app/sheets_dialog.c:253
+#: app/sheet-editor/sheets_dialog.c:236
 msgid "Select SVG Shape File"
 msgstr "选择 SVG 形状文件"
 
-#: ../app/sheets_dialog_callbacks.c:164
+#: app/sheet-editor/sheets_dialog_callbacks.c:163
 msgid "Copy ->"
 msgstr "复制 ->"
 
-#: ../app/sheets_dialog_callbacks.c:166
+#: app/sheet-editor/sheets_dialog_callbacks.c:165
 msgid "Copy All ->"
 msgstr "全部复制 ->"
 
-#: ../app/sheets_dialog_callbacks.c:168
+#: app/sheet-editor/sheets_dialog_callbacks.c:167
 msgid "Move ->"
 msgstr "移动 ->"
 
-#: ../app/sheets_dialog_callbacks.c:170
+#: app/sheet-editor/sheets_dialog_callbacks.c:169
 msgid "Move All ->"
 msgstr "全部移动 ->"
 
-#: ../app/sheets_dialog_callbacks.c:177
+#: app/sheet-editor/sheets_dialog_callbacks.c:174
 msgid "<- Copy"
 msgstr "<- 复制"
 
-#: ../app/sheets_dialog_callbacks.c:179
+#: app/sheet-editor/sheets_dialog_callbacks.c:176
 msgid "<- Copy All"
 msgstr "<- 全部复制"
 
-#: ../app/sheets_dialog_callbacks.c:181
+#: app/sheet-editor/sheets_dialog_callbacks.c:178
 msgid "<- Move"
 msgstr "<- 移动"
 
-#: ../app/sheets_dialog_callbacks.c:183
+#: app/sheet-editor/sheets_dialog_callbacks.c:180
 msgid "<- Move All"
 msgstr "<- 全部移动"
 
-#: ../app/sheets_dialog_callbacks.c:289 ../app/sheets_dialog_callbacks.c:1071
+#: app/sheet-editor/sheets_dialog_callbacks.c:282
+#: app/sheet-editor/sheets_dialog_callbacks.c:1036
+#: data/ui/sheets-new-dialog.ui:195
 msgid "Line Break"
 msgstr "换行"
 
-#: ../app/sheets_dialog_callbacks.c:303
+#: app/sheet-editor/sheets_dialog_callbacks.c:296
 #, c-format
 msgid ""
 "%s\n"
@@ -2001,7 +2274,7 @@ msgstr ""
 "%s\n"
 "形状"
 
-#: ../app/sheets_dialog_callbacks.c:306
+#: app/sheet-editor/sheets_dialog_callbacks.c:299
 #, c-format
 msgid ""
 "%s\n"
@@ -2010,7 +2283,7 @@ msgstr ""
 "%s\n"
 "对象"
 
-#: ../app/sheets_dialog_callbacks.c:309
+#: app/sheet-editor/sheets_dialog_callbacks.c:303
 #, c-format
 msgid ""
 "%s\n"
@@ -2019,76 +2292,77 @@ msgstr ""
 "%s\n"
 "未分配的类型"
 
-#: ../app/sheets_dialog_callbacks.c:770
+#: app/sheet-editor/sheets_dialog_callbacks.c:749
 msgid "Please select a .shape file"
 msgstr "请选择一个 .shape 文件"
 
-#: ../app/sheets_dialog_callbacks.c:777
+#: app/sheet-editor/sheets_dialog_callbacks.c:755
 #, c-format
 msgid "Filename must end with '%s': '%s'"
 msgstr "文件名必须以“%s”结尾：“%s”"
 
-#: ../app/sheets_dialog_callbacks.c:785
+#: app/sheet-editor/sheets_dialog_callbacks.c:762
 #, c-format
 msgid "Error examining %s: %s"
 msgstr "错误检查 %s：%s"
 
-#: ../app/sheets_dialog_callbacks.c:816
+#: app/sheet-editor/sheets_dialog_callbacks.c:790
 msgid "Please export the diagram as a shape."
 msgstr "请将图表导出为形状。"
 
-#: ../app/sheets_dialog_callbacks.c:819
+#: app/sheet-editor/sheets_dialog_callbacks.c:794
 #, c-format
 msgid "Could not interpret shape file: '%s'"
 msgstr "æ— æ³•è§£æžå½¢çŠ¶æ–‡ä»¶ï¼š%s"
 
-#: ../app/sheets_dialog_callbacks.c:887
+#: app/sheet-editor/sheets_dialog_callbacks.c:859
 msgid "Sheet must have a Name"
 msgstr "工作表必须有名称"
 
-#: ../app/sheets_dialog_callbacks.c:1579 ../app/sheets_dialog_callbacks.c:1586
+#: app/sheet-editor/sheets_dialog_callbacks.c:1513
+#: app/sheet-editor/sheets_dialog_callbacks.c:1519
 #, c-format
 msgid "Couldn't open '%s': %s"
 msgstr "æ— æ³•æ‰“å¼€â€œ%s”：%s"
 
-#: ../app/sheets_dialog_callbacks.c:1640
+#: app/sheet-editor/sheets_dialog_callbacks.c:1573
 #, c-format
 msgid "Couldn't open: '%s' for writing"
 msgstr "æ— æ³•ä»¥å†™æ–¹å¼æ‰“å¼€ï¼šâ€œ%s”"
 
-#: ../app/sheets_dialog_callbacks.c:1650
+#: app/sheet-editor/sheets_dialog_callbacks.c:1583
 msgid "a user"
 msgstr "用户"
 
-#: ../app/sheets_dialog_callbacks.c:1663
+#: app/sheet-editor/sheets_dialog_callbacks.c:1596
 #, c-format
 msgid "File: %s"
 msgstr "文件：%s"
 
-#: ../app/sheets_dialog_callbacks.c:1666
+#: app/sheet-editor/sheets_dialog_callbacks.c:1599
 #, c-format
 msgid "Date: %s"
 msgstr "日期：%s"
 
-#: ../app/sheets_dialog_callbacks.c:1670
+#: app/sheet-editor/sheets_dialog_callbacks.c:1603
 #, c-format
 msgid "For: %s"
 msgstr "给：%s"
 
-#: ../app/sheets_dialog_callbacks.c:1687
+#: app/sheet-editor/sheets_dialog_callbacks.c:1620
 msgid "add shapes here"
 msgstr "åœ¨æ­¤å¤„æ·»åŠ å½¢çŠ¶"
 
-#: ../app/splash.c:50
+#: app/splash.c:32
 msgid "Loading …"
 msgstr "正在载入 …"
 
-#: ../app/splash.c:68
+#: app/splash.c:49
 #, c-format
 msgid "Dia v %s"
 msgstr "Dia v %s"
 
-#: ../app/toolbox.c:74
+#: app/toolbox.c:103
 msgid ""
 "Modify object(s)\n"
 "Use <Space> to toggle between this and other tools"
@@ -2096,7 +2370,7 @@ msgstr ""
 "修改对象\n"
 "使用<ç©ºæ ¼é”®>切换工具"
 
-#: ../app/toolbox.c:80
+#: app/toolbox.c:109
 msgid ""
 "Text edit(s)\n"
 "Use <Esc> to leave this tool"
@@ -2104,24 +2378,101 @@ msgstr ""
 "编辑文本\n"
 "使用<Esc>退出该工具"
 
-#: ../app/toolbox.c:92
+#. Translators: Menu item Verb/Control Magnitude/Change/Magnify
+#: app/toolbox.c:115 objects/FS/function.c:980
+msgid "Magnify"
+msgstr "放大"
+
+#: app/toolbox.c:121
 msgid "Scroll around the diagram"
 msgstr "滚动图表"
 
-#: ../app/toolbox.c:352
+#. how it used to be before 0.96+SVN
+#. new name matching "same name, same type"  rule
+#: app/toolbox.c:127 lib/properties.c:94 lib/properties.h:678
+#: objects/AADL/aadlbox.c:153 objects/custom/custom_object.c:225
+#: objects/Jackson/requirement.c:128 objects/network/basestation.c:130
+#: objects/network/radiocell.c:129 objects/UML/activity.c:127
+#: objects/UML/actor.c:118 objects/UML/classicon.c:143
+#: objects/UML/component.c:131 objects/UML/component_feature.c:156
+#: objects/UML/node.c:125 objects/UML/node.c:127 objects/UML/note.c:116
+#: objects/UML/object.c:162 objects/UML/small_package.c:127
+#: objects/UML/state.c:152 objects/UML/usecase.c:134
+msgid "Text"
+msgstr "文本"
+
+#: app/toolbox.c:133
+msgid "Box"
+msgstr "方框"
+
+#: app/toolbox.c:139
+msgid "Ellipse"
+msgstr "椭圆"
+
+#: app/toolbox.c:145
+msgid "Polygon"
+msgstr "多边形"
+
+#: app/toolbox.c:151
+msgid "Beziergon"
+msgstr "贝塞尔封闭曲线"
+
+#: app/toolbox.c:157 objects/standard/line.c:323
+msgid "Line"
+msgstr "直线"
+
+#: app/toolbox.c:163
+msgid "Arc"
+msgstr "圆弧"
+
+#: app/toolbox.c:169
+msgid "Zigzagline"
+msgstr "横竖折线"
+
+#: app/toolbox.c:175
+msgid "Polyline"
+msgstr "折线"
+
+#: app/toolbox.c:181
+msgid "Bezierline"
+msgstr "贝塞尔曲线"
+
+#: app/toolbox.c:187
+msgid "Image"
+msgstr "图像"
+
+#: app/toolbox.c:193
+msgid "Outline"
+msgstr "轮廓字"
+
+#: app/toolbox.c:488
 #, c-format
 msgid "No sheet named %s"
 msgstr "没有名为 %s 的工作表"
 
-#: ../app/toolbox.c:390
-msgid "Other sheets"
-msgstr "其它工作表"
+#. Author: Alan Horkan, 2002, mailto:horkana tcd ie
+#. Please talk to me before making any changes to this sheet
+#: app/toolbox.c:612 sheets/Assorted.sheet:5
+msgid "Assorted"
+msgstr "基本图形"
 
-#: ../app/toolbox.c:450 ../sheets/Flowchart.sheet.in.h:1
+#: app/toolbox.c:619 app/toolbox.c:751 sheets/Flowchart.sheet:3
 msgid "Flowchart"
 msgstr "流程图"
 
-#: ../app/toolbox.c:494
+#: app/toolbox.c:626 sheets/UML.sheet:3
+msgid "UML"
+msgstr "UML"
+
+#: app/toolbox.c:656
+msgid "All Sheets"
+msgstr "所有工作表"
+
+#: app/toolbox.c:671 lib/diacolorselector.c:391 lib/diafontselector.c:483
+msgid "Reset Menu"
+msgstr "重置菜单"
+
+#: app/toolbox.c:790
 msgid ""
 "Foreground & background colors for new objects.  The small black and white "
 "squares reset colors.  The small arrows swap colors.  Double-click to change "
@@ -2130,411 +2481,492 @@ msgstr ""
 "新对象的前景和背景色。黑白小方块可重置颜色。小箭头可调换颜色。双击可改变颜"
 "色。"
 
-#: ../app/toolbox.c:508
+#: app/toolbox.c:804
 msgid ""
 "Line widths.  Click on a line to set the default line width for new "
 "objects.  Double-click to set the line width more precisely."
 msgstr ""
 "直线宽度。单击直线可以设定新对象的缺省线条宽度。双击则可以更精确的设定线宽。"
 
-#: ../app/toolbox.c:551
+#: app/toolbox.c:847
 msgid ""
 "Arrow style at the beginning of new lines.  Click to pick an arrow, or set "
 "arrow parameters with Details…"
 msgstr "æ–°ç›´çº¿èµ·å§‹ç®­å¤´æ ·å¼ã€‚å•å‡»å¯ä»¥æŒ‘é€‰ç®­å¤´ï¼Œæˆ–æ˜¯ç”¨â€œç»†èŠ‚â€¦â€è®¾å®šç®­å¤´å‚æ•°"
 
-#: ../app/toolbox.c:556
+#: app/toolbox.c:852
 msgid ""
 "Line style for new lines.  Click to pick a line style, or set line style "
 "parameters with Details…"
 msgstr "æ–°ç›´çº¿çš„çº¿æ¡æ ·å¼ã€‚ç‚¹å‡»å¯ä»¥æŒ‘é€‰ç›´çº¿æ ·å¼ï¼Œæˆ–æ˜¯ç”¨â€œç»†èŠ‚â€¦â€è®¾å®šçº¿æ¡å‚æ•°"
 
-#: ../app/toolbox.c:572
+#: app/toolbox.c:868
 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
+#: data/org.gnome.Dia.appdata.xml.in:7 data/org.gnome.Dia.desktop.in:3
 msgid "Dia"
 msgstr "Dia"
 
-#: ../dia.desktop.in.in.h:3
-msgid "Dia Diagram Editor"
-msgstr "Dia 图表编辑器"
-
-#: ../dia.desktop.in.in.h:4
-msgid "Edit your Diagrams"
-msgstr "编辑您的图表"
+#: data/org.gnome.Dia.appdata.xml.in:8
+msgid "Dia is a program for drawing diagrams"
+msgstr "Dia 是一个用于绘制图表的程序"
 
-#. Installer message if no GTK+ was found
-#: ../installer/win32/gennsh.c:39
+#: data/org.gnome.Dia.appdata.xml.in:10
 msgid ""
-"GTK+ is not installed. Please use the full installer. It is available from "
-"http://dia-installer.de.";
+"Dia is a GTK+ based diagram creation program for GNU/Linux, MacOS X, Unix, "
+"and Windows, and is released under the GPL license."
 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 "下一步 >"
+"Dia是适用于 GNU / Linux，MacOS X，Unix 和 Windows 的基于 GTK + 的图表创建程"
+"序，并在 GPL 许可下发布。"
 
-#. Installer message, keep the $(^Name) and $_CLICK, these will be replaced
-#: ../installer/win32/gennsh.c:48
+#: data/org.gnome.Dia.appdata.xml.in:12
 msgid ""
-"$(^Name) is released under the GPL license. The license is provided here for "
-"information purposes only. $_CLICK"
+"Dia is roughly inspired by the commercial Windows program 'Visio,' though "
+"more geared towards informal diagrams for casual use. It can be used to draw "
+"many different kinds of diagrams. It currently has special objects to help "
+"draw entity relationship diagrams, UML diagrams, flowcharts, network "
+"diagrams, and many other diagrams. It is also possible to add support for "
+"new shapes by writing simple XML files, using a subset of SVG to draw the "
+"shape."
 msgstr ""
-"$(^Name) æ ¹æ® GPL 许可证发布。 在此处给出该许可证文本仅仅是为了提供信息。 "
-"$_CLICK"
-
-#. 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 脚本语言 2.3 的支持。如果 Python 没有安装，请不要选择 "
-
-#. Installer message: hyperlink text on finish page
-#: ../installer/win32/gennsh.c:69
-msgid "Visit the Dia for Windows Web Page"
-msgstr "访问 Dia Windows 版页面"
-
-#. 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
+
+#: data/org.gnome.Dia.appdata.xml.in:14
 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."
+"It can load and save diagrams to a custom XML format (gzipped by default, to "
+"save space), can export diagrams to a number of formats, including EPS, SVG, "
+"XFIG, WMF and PNG, and can print diagrams (including ones that span multiple "
+"pages)."
 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éƒ½ä¼šè¢«åˆ é™¤ã€‚æ‚¨æƒ³ç»§ç»­å—ï¼Ÿ"
+#: data/org.gnome.Dia.appdata.xml.in:19
+msgid "Main Window"
+msgstr "主窗口"
 
-#. Installer message: Uninstall Section Prompts. Keep $\r
-#: ../installer/win32/gennsh.c:81
-msgid ""
-"The uninstaller could not find registry entries for Dia.$\rIt is likely that "
-"another user installed this application."
-msgstr "å¸è½½ç¨‹åºæ— æ³•æ‰¾åˆ° Dia 的注册表项。$\r可能是其他用户安装了 Dia。"
-
-#. 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 以及所有子目录。继续？"
+#: data/org.gnome.Dia.appdata.xml.in:44
+msgid "The GNOME Project"
+msgstr "GNOME 项目"
+
+#: data/org.gnome.Dia.desktop.in:4
+msgid "Diagram Editor"
+msgstr "图表编辑器"
+
+#: data/org.gnome.Dia.desktop.in:5
+msgid "Edit your Diagrams"
+msgstr "编辑您的图表"
+
+#: data/ui/properties-dialog.ui:50
+msgid "_Dynamic Grid"
+msgstr "åŠ¨æ€ç½‘æ ¼(_D)"
+
+#: data/ui/properties-dialog.ui:67
+msgid "_Manual Grid"
+msgstr "æ‰‹åŠ¨ç½‘æ ¼(_M)"
+
+#: data/ui/properties-dialog.ui:103
+msgid "Spacing"
+msgstr "间距"
+
+#: data/ui/properties-dialog.ui:116
+msgid "Visible Spacing"
+msgstr "可见间距"
+
+#: data/ui/properties-dialog.ui:144
+msgid "Column"
+msgstr "列"
+
+#: data/ui/properties-dialog.ui:151
+msgid "Row"
+msgstr "行"
+
+#: data/ui/properties-dialog.ui:252
+msgid "_Hex Grid"
+msgstr "å…­è§’ç½‘æ ¼(_H)"
+
+#: data/ui/properties-dialog.ui:297
+msgid "Hex Grid Size"
+msgstr "å…­è§’ç½‘æ ¼å¤§å°"
+
+#: data/ui/properties-dialog.ui:312
+msgid "Grid"
+msgstr "ç½‘æ ¼"
+
+#: data/ui/properties-dialog.ui:332 lib/diagramdata.c:127
+msgid "Background"
+msgstr "背景"
+
+#: data/ui/properties-dialog.ui:356
+msgid "Page Breaks"
+msgstr "换页"
+
+#: data/ui/properties-dialog.ui:369
+#, fuzzy
+#| msgid "Guide"
+msgid "Guides"
+msgstr "导向"
+
+#: data/ui/properties-dialog.ui:441
+msgid "Colors"
+msgstr "颜色"
+
+#: data/ui/sheets-edit-dialog.ui:6
+msgid "Edit Attributes"
+msgstr "编辑属性"
+
+#: data/ui/sheets-edit-dialog.ui:97 data/ui/sheets-edit-dialog.ui:285
+#: data/ui/sheets-new-dialog.ui:125 data/ui/sheets-new-dialog.ui:260
+msgid "Description:"
+msgstr "描述："
+
+#: data/ui/sheets-edit-dialog.ui:142 objects/FS/flow.c:142
+#: objects/FS/flow-ortho.c:165 objects/Istar/link.c:159
+#: objects/Jackson/phenomenon.c:143 objects/KAOS/metaandorrel.c:163
+#: objects/KAOS/metabinrel.c:170 objects/UML/class_attributes_dialog.c:675
+#: objects/UML/class_operations_dialog.c:885
+#: objects/UML/class_operations_dialog.c:1286
+#: objects/UML/class_templates_dialog.c:524
+msgid "Type:"
+msgstr "类型："
+
+#: data/ui/sheets-edit-dialog.ui:208 data/ui/sheets-remove-dialog.ui:91
+msgid "DiaObject"
+msgstr "Dia 对象"
+
+#: data/ui/sheets-edit-dialog.ui:261 objects/ER/attribute.c:150
+#: objects/ER/entity.c:132 objects/ER/relationship.c:137
+#: objects/UML/class_attributes_dialog.c:662
+#: objects/UML/class_operations_dialog.c:874
+#: objects/UML/class_operations_dialog.c:1275
+#: objects/UML/class_templates_dialog.c:513 objects/UML/dependency.c:130
+#: objects/UML/generalization.c:127 objects/UML/realizes.c:127
+msgid "Name:"
+msgstr "名称："
+
+#: data/ui/sheets-edit-dialog.ui:355 data/ui/sheets-remove-dialog.ui:113
+msgid "Sheet"
+msgstr "工作表"
+
+#: data/ui/sheets-main-dialog.ui:6
+msgid "Sheets and Objects"
+msgstr "工作表和对象"
+
+#: data/ui/sheets-main-dialog.ui:43
+msgid "_Up"
+msgstr "向上(_U)"
+
+#: data/ui/sheets-main-dialog.ui:59
+msgid "_Down"
+msgstr "向下(_D)"
+
+#: data/ui/sheets-main-dialog.ui:75
+msgid "_Remove"
+msgstr "移除(_R)"
+
+#: data/ui/sheets-main-dialog.ui:91
+msgid "<- C_opy"
+msgstr "<- 复制(_O)"
+
+#: data/ui/sheets-main-dialog.ui:106
+msgid "<- Copy _All"
+msgstr "<- 全部复制(_A)"
+
+#: data/ui/sheets-main-dialog.ui:120
+msgid "<- _Move"
+msgstr "<- 移动(_M)"
 
-#: ../lib/arrows.c:1891
+#: data/ui/sheets-main-dialog.ui:135
+msgid "<- Move A_ll"
+msgstr "<- 全部移动(_L)"
+
+#: data/ui/sheets-main-dialog.ui:287
+msgid "_Revert"
+msgstr "还原(_R)"
+
+#: data/ui/sheets-new-dialog.ui:5
+msgid "New"
+msgstr "新建"
+
+#: data/ui/sheets-new-dialog.ui:91
+msgid "SVG Shape:"
+msgstr "SVG 形状:"
+
+#: data/ui/sheets-new-dialog.ui:150
+msgid "Sheet name:"
+msgstr "工作表名称:"
+
+#. Translators: Menu item Verb/Channel/Export/Remove
+#. Translators: Menu item Verb/Branch/Separate/Remove
+#. Translators: Menu item Verb/Branch/Separate/Remove/Remove
+#: data/ui/sheets-remove-dialog.ui:5 objects/FS/function.c:700
+#: objects/FS/function.c:852 objects/FS/function.c:854
+msgid "Remove"
+msgstr "åˆ é™¤"
+
+#: lib/arrows.c:2258
+msgctxt "Arrow"
+msgid "None"
+msgstr "æ— "
+
+#: lib/arrows.c:2259
+msgctxt "Arrow"
 msgid "Lines"
 msgstr "直线"
 
-#: ../lib/arrows.c:1892
+#: lib/arrows.c:2260
+msgctxt "Arrow"
 msgid "Hollow Triangle"
 msgstr "空心三角形"
 
-#: ../lib/arrows.c:1893
+#: lib/arrows.c:2261
+msgctxt "Arrow"
 msgid "Filled Triangle"
 msgstr "实心三角形"
 
-#: ../lib/arrows.c:1894
+#: lib/arrows.c:2262
+msgctxt "Arrow"
 msgid "Unfilled Triangle"
-msgstr "空心三角形"
+msgstr "未填充三角形"
 
-#: ../lib/arrows.c:1895
+#: lib/arrows.c:2263
+msgctxt "Arrow"
 msgid "Hollow Diamond"
 msgstr "空心菱形"
 
-#: ../lib/arrows.c:1896
+#: lib/arrows.c:2264
+msgctxt "Arrow"
 msgid "Filled Diamond"
 msgstr "实心菱形"
 
-#: ../lib/arrows.c:1897
+#: lib/arrows.c:2265
+msgctxt "Arrow"
 msgid "Half Diamond"
 msgstr "半菱形"
 
-#: ../lib/arrows.c:1898
+#: lib/arrows.c:2266
+msgctxt "Arrow"
 msgid "Half Head"
 msgstr "半个箭头"
 
-#: ../lib/arrows.c:1899
+#: lib/arrows.c:2267
+msgctxt "Arrow"
 msgid "Slashed Cross"
 msgstr "交叉线"
 
-#: ../lib/arrows.c:1900
+#: lib/arrows.c:2268
+msgctxt "Arrow"
 msgid "Filled Ellipse"
 msgstr "实心椭圆"
 
-#: ../lib/arrows.c:1901
+#: lib/arrows.c:2269
+msgctxt "Arrow"
 msgid "Hollow Ellipse"
 msgstr "空心椭圆"
 
-#: ../lib/arrows.c:1902
+#: lib/arrows.c:2270
+msgctxt "Arrow"
 msgid "Filled Dot"
 msgstr "实心点"
 
-#: ../lib/arrows.c:1903
+#: lib/arrows.c:2271
+msgctxt "Arrow"
 msgid "Dimension Origin"
 msgstr "åæ ‡åŽŸç‚¹"
 
-#: ../lib/arrows.c:1904
+#: lib/arrows.c:2272
+msgctxt "Arrow"
 msgid "Blanked Dot"
 msgstr "空心点"
 
-#: ../lib/arrows.c:1905
+#: lib/arrows.c:2273
+msgctxt "Arrow"
 msgid "Double Hollow Triangle"
 msgstr "双空心三角形"
 
-#: ../lib/arrows.c:1906
+#: lib/arrows.c:2274
+msgctxt "Arrow"
 msgid "Double Filled Triangle"
 msgstr "双实心三角形"
 
-#: ../lib/arrows.c:1907
+#: lib/arrows.c:2275
+msgctxt "Arrow"
 msgid "Filled Dot and Triangle"
 msgstr "实心圆点和三角形"
 
-#: ../lib/arrows.c:1908
+#: lib/arrows.c:2276
+msgctxt "Arrow"
 msgid "Filled Box"
 msgstr "实心方框"
 
-#: ../lib/arrows.c:1909
+#: lib/arrows.c:2277
+msgctxt "Arrow"
 msgid "Blanked Box"
 msgstr "空心方框"
 
-#: ../lib/arrows.c:1910
+#: lib/arrows.c:2278
+msgctxt "Arrow"
 msgid "Slashed"
 msgstr "斜线"
 
-#: ../lib/arrows.c:1911
+#: lib/arrows.c:2279
+msgctxt "Arrow"
 msgid "Integral Symbol"
 msgstr "积分符号"
 
-#: ../lib/arrows.c:1912
+#: lib/arrows.c:2280
+msgctxt "Arrow"
 msgid "Crow Foot"
 msgstr "鸟爪形"
 
-#: ../lib/arrows.c:1913
+#: lib/arrows.c:2281
+msgctxt "Arrow"
 msgid "Cross"
 msgstr "十字"
 
-#: ../lib/arrows.c:1914
+#: lib/arrows.c:2282
+msgctxt "Arrow"
 msgid "1-or-many"
 msgstr "一个或多个"
 
-#: ../lib/arrows.c:1915
+#: lib/arrows.c:2283
+msgctxt "Arrow"
 msgid "0-or-many"
 msgstr "零个或多个"
 
-#: ../lib/arrows.c:1916
+#: lib/arrows.c:2284
+msgctxt "Arrow"
 msgid "1-or-0"
 msgstr "一个或零个"
 
-#: ../lib/arrows.c:1917
+#: lib/arrows.c:2285
+msgctxt "Arrow"
 msgid "1 exactly"
 msgstr "只有一个"
 
-#: ../lib/arrows.c:1918
+#: lib/arrows.c:2286
+msgctxt "Arrow"
 msgid "Filled Concave"
 msgstr "实心凹箭头"
 
-#: ../lib/arrows.c:1919
+#: lib/arrows.c:2287
+msgctxt "Arrow"
 msgid "Blanked Concave"
 msgstr "空心凹箭头"
 
-#: ../lib/arrows.c:1920 ../lib/properties.c:81 ../lib/properties.c:87
-#: ../lib/properties.h:601 ../lib/properties.h:607
+#: lib/arrows.c:2288
+msgctxt "Arrow"
 msgid "Round"
 msgstr "圆的"
 
-#: ../lib/arrows.c:1921
+#: lib/arrows.c:2289
+msgctxt "Arrow"
 msgid "Open Round"
 msgstr "开放的圆形"
 
-#: ../lib/arrows.c:1922
+#: lib/arrows.c:2290
+msgctxt "Arrow"
 msgid "Backslash"
 msgstr "åæ–œæ "
 
-#: ../lib/arrows.c:1923
+#: lib/arrows.c:2291
+msgctxt "Arrow"
 msgid "Infinite Line"
 msgstr "æ— é™é•¿çº¿"
 
-#: ../lib/arrows.c:2051
+#: lib/arrows.c:2439
 msgid "Arrow head of unknown type"
 msgstr "未知类型箭头"
 
-#: ../lib/arrows.c:2059
+#: lib/arrows.c:2448
 #, c-format
 msgid "Arrow head of type %s has too small dimensions; removing.\n"
 msgstr "%s 类型的箭头尺寸太小；正在移除。\n"
 
-#: ../lib/arrows.c:2192
+#: lib/arrows.c:2619
 msgid "unknown arrow"
 msgstr "未知箭头"
 
-#: ../lib/create.c:50 ../lib/create.c:100 ../lib/create.c:127
-#: ../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:438
-#: ../plug-ins/vdx/vdx-import.c:144
+#: lib/create.c:51 lib/create.c:101 lib/create.c:130 lib/create.c:165
+#: lib/create.c:203 lib/create.c:237 lib/create.c:261 lib/create.c:295
+#: lib/create.c:316 lib/create.c:346 lib/create.c:393
+#: plug-ins/svg/svg-import.c:677 plug-ins/vdx/vdx-import.c:143
 msgid "Can't find standard object"
 msgstr "æ‰¾ä¸åˆ°æ ‡å‡†å¯¹è±¡"
 
-#: ../lib/diaarrowchooser.c:367
+#: lib/diaarrowchooser.c:366
 msgid "Arrow Properties"
 msgstr "箭头属性"
 
-#: ../lib/diaarrowselector.c:123
-msgid "More arrows"
-msgstr "更多箭头"
-
-#: ../lib/diaarrowselector.c:140
+#: lib/diaarrowselector.c:178
 msgid "Size: "
-msgstr "大小："
+msgstr "大小: "
 
-#: ../lib/diacolorselector.c:204
+#: lib/diacolorselector.c:171
 msgid "Select color"
 msgstr "选择颜色"
 
-#: ../lib/diacolorselector.c:292
-msgid "More colors…"
+#: lib/diacolorselector.c:383
+msgid "More Colors…"
 msgstr "更多颜色…"
 
-#: ../lib/dia_dirs.c:315
+#: lib/dia_dirs.c:320
 #, 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
+#: lib/diafontselector.c:180
 #, c-format
 msgid "Couldn't find font family for %s\n"
 msgstr "找不到 %s 的字体族\n"
 
+#: lib/diafontselector.c:477
+msgid "Other Fonts"
+msgstr "其它字体"
+
 #. pathologic case - pixbuf not even supporting PNG?
-#: ../lib/dia_image.c:328
+#: lib/dia_image.c:323
 #, c-format
 msgid ""
 "Unsupported file format for saving:\n"
 "%s\n"
-"%s"
 msgstr ""
 "ä¸æ”¯æŒä¿å­˜çš„æ–‡ä»¶æ ¼å¼ï¼š\n"
 "%s\n"
-"%s"
 
-#: ../lib/dia_image.c:331
+#: lib/dia_image.c:326
 #, c-format
 msgid ""
 "Could not save file:\n"
 "%s\n"
-"%s"
+"%s\n"
 msgstr ""
 "æ— æ³•ä¿å­˜æ–‡ä»¶:\n"
 "%s\n"
-"%s"
+"%s\n"
 
-#: ../lib/dialinechooser.c:309
+#: lib/dialinechooser.c:301
 msgid "Line Style Properties"
 msgstr "线型属性"
 
-#: ../lib/dialinechooser.c:344
+#: lib/dialinechooser.c:334
 msgid "Details…"
 msgstr "细节…"
 
-#: ../lib/dialinestyleselector.c:107
-msgid "line|Solid"
-msgstr "线|实线"
-
-#: ../lib/dialinestyleselector.c:108
-msgid "line|Dashed"
-msgstr "线|划线"
-
-#: ../lib/dialinestyleselector.c:109
-msgid "line|Dash-Dot"
-msgstr "线|点划线"
-
-#: ../lib/dialinestyleselector.c:110
-msgid "line|Dash-Dot-Dot"
-msgstr "线|双点划线"
-
-#: ../lib/dialinestyleselector.c:111
-msgid "line|Dotted"
-msgstr "线|虚线"
-
 #. fs->sizebox = GTK_HBOX(box);
-#: ../lib/dialinestyleselector.c:143
+#: lib/dialinestyleselector.c:153
 msgid "Dash length: "
 msgstr "划长度： "
 
-#: ../lib/dialogs.c:51 ../plug-ins/postscript/paginate_psprint.c:314
-msgid "OK"
-msgstr "确定"
+#: lib/diapatternselector.c:111
+msgid "Diagonal"
+msgstr "对角线"
 
-#: ../lib/dialogs.c:52 ../plug-ins/postscript/paginate_psprint.c:326
-msgid "Cancel"
-msgstr "取消"
+#: lib/diapatternselector.c:113
+msgid "Radial"
+msgstr "辐射"
 
-#: ../lib/dia_xml.c:212
+#: lib/dia_xml.c:214
 #, c-format
 msgid ""
 "The file %s has no encoding specification;\n"
@@ -2543,121 +2975,124 @@ msgstr ""
 "文件 %s æ²¡æœ‰æŒ‡å®šç¼–ç ï¼›\n"
 "å‡å®šç¼–ç ä¸º %s"
 
-#: ../lib/dia_xml.c:506
+#: lib/dia_xml.c:512
 #, c-format
 msgid "Unknown type of DataNode '%s'"
 msgstr "未知的数据节点类型“%s”"
 
-#: ../lib/dia_xml.c:525
+#: lib/dia_xml.c:531
 msgid "Taking int value of non-int node."
 msgstr "试图获取非整型节点的整型值。"
 
-#: ../lib/dia_xml.c:701
+#: lib/dia_xml.c:707
 msgid "Taking point value of non-point node."
 msgstr "试图获取非点节点的点值。"
 
-#: ../lib/dia_xml.c:712
+#: lib/dia_xml.c:718
 #, c-format
 msgid "Incorrect x Point value \"%s\" %f; discarding it."
 msgstr "不正确的 x 点值“%s” %f；放弃。"
 
-#: ../lib/dia_xml.c:719
+#: lib/dia_xml.c:725
 msgid "Error parsing point."
 msgstr "分析点时出错。"
 
 #. don't bother with useless warnings (see above)
-#: ../lib/dia_xml.c:727
+#: lib/dia_xml.c:733
 #, c-format
 msgid "Incorrect y Point value \"%s\" %f; discarding it."
 msgstr "不正确的 y 点值“%s” %f；放弃。"
 
-#: ../lib/dia_xml.c:747
+#: lib/dia_xml.c:753
 msgid "Taking bezpoint value of non-point node."
 msgstr "获取非点节点的贝塞尔点值。"
 
-#: ../lib/dia_xml.c:765
+#: lib/dia_xml.c:771
 msgid "Error parsing bezpoint p1."
 msgstr "分析贝塞尔点 p1 时出错。"
 
-#: ../lib/dia_xml.c:779
+#: lib/dia_xml.c:785
 msgid "Error parsing bezpoint p2."
 msgstr "分析贝塞尔点 p2 时出错。"
 
-#: ../lib/dia_xml.c:793
+#: lib/dia_xml.c:799
 msgid "Error parsing bezpoint p3."
 msgstr "分析贝塞尔点 p3 时出错。"
 
-#: ../lib/dia_xml.c:820
+#: lib/dia_xml.c:826
 msgid "Taking rectangle value of non-rectangle node."
 msgstr "获取非矩形节点的矩形值。"
 
-#: ../lib/dia_xml.c:832 ../lib/dia_xml.c:843 ../lib/dia_xml.c:854
+#: lib/dia_xml.c:838 lib/dia_xml.c:849 lib/dia_xml.c:860
 msgid "Error parsing rectangle."
 msgstr "分析矩形时出错。"
 
-#: ../lib/dia_xml.c:882
+#: lib/dia_xml.c:888
 msgid "Taking string value of non-string node."
 msgstr "获取非字符串节点的字符串值。"
 
-#: ../lib/dia_xml.c:908
+#: lib/dia_xml.c:914
 msgid "Error in string tag."
 msgstr "å­—ç¬¦ä¸²æ ‡è®°é”™è¯¯ã€‚"
 
-#: ../lib/dia_xml.c:926
+#: lib/dia_xml.c:932
 msgid "Error in file, string not starting with #"
 msgstr "文件有错误，字符串未以 # 开头"
 
-#: ../lib/dia_xml.c:988
+#: lib/dia_xml.c:994
 msgid "Taking font value of non-font node."
 msgstr "试图获取非字体节点的字体值。"
 
-#: ../lib/filter.c:177
+#: lib/filter.c:179
 #, c-format
 msgid "Multiple export filters with unique name %s"
 msgstr "多个导出过滤器有相同的名称 %s"
 
-#: ../lib/filter.c:195
+#: lib/filter.c:197
 #, c-format
 msgid "Multiple import filters with unique name %s"
 msgstr "多个导入过滤器有相同的名称 %s"
 
-#: ../lib/font.c:89
+#: lib/font.c:82
 #, c-format
 msgid "Can't load font %s.\n"
 msgstr "æ— æ³•è½½å…¥å­—ä½“ %s。\n"
 
-#: ../lib/group.c:628
+#: lib/group.c:633
 msgid "Transformation"
 msgstr "变换"
 
-#: ../lib/message.c:93 ../lib/message.c:284
+#: lib/message.c:91 lib/message.c:304
+msgid "Error"
+msgstr "错误"
+
+#: lib/message.c:93 lib/message.c:289
 msgid "Warning"
 msgstr "警告"
 
-#: ../lib/message.c:120
+#: lib/message.c:120
 msgid "There is one similar message."
 msgstr "有一条类似的消息。"
 
-#: ../lib/message.c:125
+#: lib/message.c:125
 msgid "Show repeated messages"
 msgstr "显示重复的消息"
 
-#: ../lib/message.c:146
+#: lib/message.c:146
 msgid "Don't show this message again"
 msgstr "不再显示此消息"
 
-#: ../lib/message.c:206
+#: lib/message.c:211
 #, c-format
-#| msgid "There is one similar message."
 msgid "There is %d similar message."
 msgid_plural "There are %d similar messages."
 msgstr[0] "有 %d 条类似的消息。"
 
-#: ../lib/message.c:268
+#: lib/message.c:273
 msgid "Notice"
 msgstr "注意"
 
-#: ../lib/object_defaults.c:134
+#: lib/object_defaults.c:134
 #, c-format
 msgid ""
 "Error loading defaults '%s'.\n"
@@ -2667,198 +3102,202 @@ msgstr ""
 "不是 Dia 文件。"
 
 #. base property stuff...
-#: ../lib/orth_conn.h:97
+#: lib/orth_conn.h:97
 msgid "Autoroute"
 msgstr "自动布线"
 
-#: ../lib/orth_conn.h:108
+#: lib/orth_conn.h:108
 msgid "Autorouting"
 msgstr "自动布线"
 
-#: ../lib/persistence.c:321
+#: lib/persistence.c:326
 msgid "Persistence"
 msgstr "规避"
 
-#: ../lib/plug-ins.c:113
+#: lib/plug-ins.c:113
 msgid "???"
 msgstr "？？？"
 
-#: ../lib/plug-ins.c:188
+#: lib/plug-ins.c:188
 #, c-format
 msgid "Missing dependencies for '%s'?"
 msgstr "“%s”的依赖关系不能满足？"
 
-#: ../lib/plug-ins.c:199
+#: lib/plug-ins.c:199
 msgid "Missing symbol 'dia_plugin_init'"
 msgstr "缺少符号“dia_plugin_init”"
 
-#: ../lib/plug-ins.c:207 ../lib/plug-ins.c:215
+#: lib/plug-ins.c:207 lib/plug-ins.c:215
 msgid "dia_plugin_init() call failed"
 msgstr "调用 dia_plugin_init() 时发生错误"
 
-#: ../lib/plug-ins.c:234
-#, c-format
-msgid "%s Plugin could not be unloaded"
-msgstr "æ— æ³•å¸è½½ %s 插件"
-
-#: ../lib/plug-ins.c:442
+#: lib/plug-ins.c:412
 msgid "Plugin Configuration"
 msgstr "插件配置"
 
-#: ../lib/propdialogs.c:324 ../objects/UML/association.c:234
-#: ../objects/UML/object.c:144
+#: lib/propdialogs.c:337 objects/UML/association.c:233 objects/UML/object.c:142
 msgid "General"
 msgstr "常规"
 
-#: ../lib/propdialogs.c:325
+#: lib/propdialogs.c:338
 msgid "Meta"
 msgstr "元数据"
 
-#: ../lib/prop_dict.c:43
+#: lib/prop_dict.c:41
 msgid "Author"
 msgstr "作者"
 
-#: ../lib/prop_dict.c:44
-msgid "Identifier"
-msgstr "æ ‡è¯†ç¬¦"
-
-#: ../lib/prop_dict.c:45
+#: lib/prop_dict.c:43
 msgid "Creation date"
 msgstr "创建日期"
 
-#: ../lib/prop_dict.c:46
+#: lib/prop_dict.c:44
 msgid "Modification date"
 msgstr "修改日期"
 
-#: ../lib/prop_dict.c:47
+#: lib/prop_dict.c:45
 msgid "URL"
 msgstr "URL"
 
-#: ../lib/prop_dict.c:235 ../sheets/ciscomisc.sheet.in.h:43
+#: lib/prop_dict.c:241 sheets/ciscomisc.sheet:50
 msgid "Key"
 msgstr "钥匙"
 
-#: ../lib/prop_dict.c:242 ../objects/UML/umlattribute.c:41
-#: ../objects/UML/umlparameter.c:47
+#: lib/prop_dict.c:248 objects/UML/umlattribute.c:39
+#: objects/UML/umlparameter.c:45
 msgid "Value"
 msgstr "值"
 
-#: ../lib/properties.c:67 ../lib/properties.h:588 ../lib/widgets.c:269
+#: lib/properties.c:60 lib/properties.h:592 lib/widgets.c:269
 msgid "Left"
 msgstr "å·¦"
 
-#: ../lib/properties.c:68 ../lib/properties.h:589 ../lib/widgets.c:270
-#: ../objects/standard/textobj.c:111
+#: lib/properties.c:61 lib/properties.h:593 lib/widgets.c:270
+#: objects/standard/textobj.c:115
 msgid "Center"
 msgstr "中"
 
-#: ../lib/properties.c:69 ../lib/properties.h:590 ../lib/widgets.c:271
+#: lib/properties.c:62 lib/properties.h:594 lib/widgets.c:271
 msgid "Right"
 msgstr "右"
 
-#: ../lib/properties.c:74 ../lib/properties.h:594
+#: lib/properties.c:67 lib/properties.h:598
 msgid "Never"
 msgstr "从不"
 
-#: ../lib/properties.c:75 ../lib/properties.h:595
+#: lib/properties.c:68 lib/properties.h:599
 msgid "When Needed"
 msgstr "按需"
 
-#: ../lib/properties.c:76 ../lib/properties.h:596
+#: lib/properties.c:69 lib/properties.h:600
 msgid "Always"
 msgstr "总是"
 
-#: ../lib/properties.c:80 ../lib/properties.h:600
+#: lib/properties.c:73 lib/properties.h:604
+msgctxt "LineJoin"
 msgid "Miter"
 msgstr "斜角"
 
-#: ../lib/properties.c:82 ../lib/properties.h:602
+#: lib/properties.c:74 lib/properties.h:605
+msgctxt "LineJoin"
+msgid "Round"
+msgstr "圆的"
+
+#: lib/properties.c:75 lib/properties.h:606
+msgctxt "LineJoin"
 msgid "Bevel"
 msgstr "斜面"
 
-#: ../lib/properties.c:86 ../lib/properties.h:606
+#: lib/properties.c:79 lib/properties.h:610
+msgctxt "LineCap"
 msgid "Butt"
 msgstr "对接"
 
-#: ../lib/properties.c:88 ../lib/properties.h:608
+#: lib/properties.c:80 lib/properties.h:611
+msgctxt "LineCap"
+msgid "Round"
+msgstr "圆的"
+
+#: lib/properties.c:81 lib/properties.h:612
+msgctxt "LineCap"
 msgid "Projecting"
 msgstr "投影"
 
-#: ../lib/properties.c:95 ../lib/properties.h:629 ../lib/properties.h:632
-#: ../objects/chronogram/chronoline.c:178
-#: ../objects/chronogram/chronoref.c:157
+#: lib/properties.c:88 lib/properties.h:633 lib/properties.h:636
+#: objects/chronogram/chronoline.c:176 objects/chronogram/chronoref.c:155
 msgid "Line color"
 msgstr "线条颜色"
 
-#: ../lib/properties.c:96 ../lib/properties.h:635 ../lib/properties.h:638
+#: lib/properties.c:89 lib/properties.h:639 lib/properties.h:642
 msgid "Line style"
 msgstr "线型"
 
-#: ../lib/properties.c:97 ../lib/properties.h:654 ../lib/properties.h:657
+#: lib/properties.c:90 lib/properties.h:658 lib/properties.h:661
 msgid "Fill color"
 msgstr "填充颜色"
 
-#. just to simplify transfering properties between objects
-#: ../lib/properties.c:98 ../lib/properties.h:660 ../lib/properties.h:663
-#: ../lib/standard-path.c:139
+#. just to simplify transferring properties between objects
+#: lib/properties.c:91 lib/properties.h:664 lib/properties.h:667
+#: lib/standard-path.c:133
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../lib/properties.c:99 ../lib/properties.h:667
+#: lib/properties.c:92 lib/properties.h:671
 msgid "Start arrow"
 msgstr "起始箭头"
 
-#: ../lib/properties.c:100 ../lib/properties.h:670
+#: lib/properties.c:93 lib/properties.h:674
 msgid "End arrow"
 msgstr "终止箭头"
 
-#: ../lib/properties.c:102 ../lib/properties.h:680
+#: lib/properties.c:95 lib/properties.h:684
 msgid "Text alignment"
 msgstr "文本对齐"
 
-#: ../lib/properties.c:103 ../lib/properties.h:685
-#: ../objects/chronogram/chronoline.c:182
-#: ../objects/chronogram/chronoref.c:163 ../objects/Database/reference.c:118
-#: ../objects/GRAFCET/condition.c:131 ../objects/GRAFCET/step.c:165
-#: ../objects/GRAFCET/transition.c:141 ../objects/UML/class_dialog.c:455
+#: lib/properties.c:96 lib/properties.h:689 objects/chronogram/chronoline.c:180
+#: objects/chronogram/chronoref.c:161 objects/Database/reference.c:116
+#: objects/GRAFCET/condition.c:139 objects/GRAFCET/step.c:174
+#: objects/GRAFCET/transition.c:149 objects/UML/class_dialog.c:480
 msgid "Font"
 msgstr "字体"
 
-#: ../lib/properties.c:104 ../lib/properties.h:693
-#: ../objects/chronogram/chronoline.c:184
-#: ../objects/chronogram/chronoref.c:165 ../objects/GRAFCET/condition.c:133
-#: ../objects/GRAFCET/step.c:167 ../objects/GRAFCET/transition.c:143
+#: lib/properties.c:97 lib/properties.h:697 objects/chronogram/chronoline.c:182
+#: objects/chronogram/chronoref.c:163 objects/GRAFCET/condition.c:141
+#: objects/GRAFCET/step.c:176 objects/GRAFCET/transition.c:151
 msgid "Font size"
 msgstr "字体大小"
 
-#: ../lib/properties.c:105 ../lib/properties.h:699
-#: ../objects/chronogram/chronoline.c:186
-#: ../objects/chronogram/chronoref.c:167 ../objects/GRAFCET/step.c:169
+#: lib/properties.c:98 lib/properties.h:703 objects/chronogram/chronoline.c:184
+#: objects/chronogram/chronoref.c:165 objects/GRAFCET/step.c:178
 msgid "Text color"
 msgstr "文本颜色"
 
-#: ../lib/properties.h:641 ../lib/properties.h:644
+#: lib/properties.h:645 lib/properties.h:648
 msgid "Line join"
 msgstr "线连接"
 
-#: ../lib/properties.h:647 ../lib/properties.h:650
+#: lib/properties.h:651 lib/properties.h:654
 msgid "Line caps"
 msgstr "线端"
 
-#: ../lib/properties.h:708
+#: lib/properties.h:712
 msgid "Text fitting"
 msgstr "文本拟合"
 
-#: ../lib/prop_inttypes.c:567
+#: lib/properties.h:716 lib/standard-path.c:135
+msgid "Pattern"
+msgstr "图案"
+
+#: lib/prop_inttypes.c:560
 msgid "Property cast from int to enum out of range"
 msgstr "将属性从 int 转换为 enum 时超出了范围"
 
-#: ../lib/proplist.c:161
+#: lib/proplist.c:159
 #, c-format
 msgid "No attribute '%s' (%p) or no data (%p) in this attribute"
 msgstr "不存在属性“%s”(%p)或者不存在属性值(%p)"
 
-#: ../lib/prop_pixbuf.c:99 ../lib/prop_pixbuf.c:146
+#: lib/prop_pixbuf.c:110 lib/prop_pixbuf.c:157
 #, c-format
 msgid ""
 "Failed to load image form diagram:\n"
@@ -2867,7 +3306,7 @@ msgstr ""
 "ä»Žå›¾è¡¨åŠ è½½å›¾åƒå¤±è´¥:\n"
 "%s"
 
-#: ../lib/prop_pixbuf.c:198
+#: lib/prop_pixbuf.c:224
 #, c-format
 msgid ""
 "Saving inline pixbuf failed:\n"
@@ -2876,24 +3315,23 @@ msgstr ""
 "保存内嵌 pixbuf 失败：\n"
 "%s"
 
-#: ../lib/prop_pixbuf.c:294
+#: lib/prop_pixbuf.c:322
 msgid "Cant create image data from scratch!"
 msgstr "æ— æ³•ä»Žé›¶åˆ›å»ºå›¾åƒæ•°æ®ï¼"
 
 #. Todo: get label for the branch view from props, e.g. UML Operations Parameters
-#: ../lib/prop_sdarray_widget.c:577 ../objects/chronogram/chronoline.c:161
-#: ../objects/UML/umloperation.c:79
+#: lib/prop_sdarray_widget.c:557 objects/chronogram/chronoline.c:159
+#: objects/UML/umloperation.c:77
 msgid "Parameters"
 msgstr "参数"
 
-#: ../lib/prop_text.c:483
+#: lib/prop_text.c:481
 #, c-format
-#| msgid "Group with %d objects"
 msgid "Group with %d object"
 msgid_plural "Group with %d objects"
 msgstr[0] "有 %d 个对象的组"
 
-#: ../lib/sheet.c:71 ../lib/sheet.c:86
+#: lib/sheet.c:75 lib/sheet.c:91
 #, c-format
 msgid ""
 "DiaObject '%s' needed in sheet '%s' was not found.\n"
@@ -2902,7 +3340,7 @@ msgstr ""
 "没有在工作表“%2$s”中找到所需的 DiaObject“%1$s”。\n"
 "不能使用该 DiaObject。"
 
-#: ../lib/sheet.c:316
+#: lib/sheet.c:354
 #, c-format
 msgid ""
 "The system sheet '%s' appears to be more recent than your custom\n"
@@ -2917,145 +3355,210 @@ msgstr ""
 "把新对象(如果有的话)从“%s”移到您定制的工作表中，\n"
 "或者用“工作表和对象”对话框移除“%s”。"
 
-#: ../lib/sheet.c:375
+#: lib/sheet.c:422
 #, c-format
 msgid "%s: you should use object tags rather than shape tags now"
 msgstr "%sï¼šçŽ°åœ¨æ‚¨åº”å½“ç”¨å¯¹è±¡æ ‡ç­¾ï¼Œè€Œä¸æ˜¯å½¢çŠ¶æ ‡ç­¾"
 
-#: ../lib/standard-path.c:123
+#: lib/standard-path.c:117
 msgid "Stroke"
 msgstr "描边"
 
 #. Translators: Menu item Verb/Provision/Supply/Fill
-#: ../lib/standard-path.c:124 ../objects/FS/function.c:933
+#: lib/standard-path.c:118 objects/FS/function.c:928
 msgid "Fill"
 msgstr "å¡«å……"
 
-#: ../lib/standard-path.c:125
+#: lib/standard-path.c:119
 msgid "Fill & Stroke"
 msgstr "填充和描边"
 
-#: ../lib/standard-path.c:130
+#: lib/standard-path.c:124
 msgid "Bezier points"
 msgstr "贝塞尔点"
 
-#: ../lib/standard-path.c:131
+#: lib/standard-path.c:125
 msgid "Drawing"
 msgstr "绘制"
 
-#: ../lib/standard-path.c:140
+#: lib/standard-path.c:134
 msgid "Draw Control Lines"
 msgstr "绘制控制线"
 
-#: ../lib/standard-path.c:466
+#: lib/standard-path.c:741
 msgid "Convert to Bezier"
-msgstr "转换为 Bezier"
+msgstr "转换为贝塞尔曲线"
+
+#: lib/standard-path.c:742
+#, fuzzy
+#| msgid "Convert to Path"
+msgid "Invert Path"
+msgstr "转换为路径"
+
+#: lib/standard-path.c:743 objects/custom/custom_object.c:1914
+msgid "Flip Horizontal"
+msgstr "水平翻转"
+
+#: lib/standard-path.c:744 objects/custom/custom_object.c:1915
+msgid "Flip Vertical"
+msgstr "垂直翻转"
+
+#. Translators: Menu item Verb/Channel/Guide/Rotate
+#. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
+#: lib/standard-path.c:745 objects/FS/function.c:740 objects/FS/function.c:742
+msgid "Rotate"
+msgstr "旋转"
+
+#: lib/standard-path.c:746
+#, fuzzy
+#| msgid "Shear angle"
+msgid "Shear"
+msgstr "圆角"
 
-#: ../lib/standard-path.c:467
+#: lib/standard-path.c:747
 msgid "Show Control Lines"
 msgstr "显示控制线"
 
-#: ../lib/widgets.c:390
+#: lib/widgets.c:393
 msgid "Select image file"
 msgstr "选择图像文件"
 
-#: ../lib/widgets.c:441
+#: lib/widgets.c:445
 msgid "Browse"
 msgstr "浏览"
 
-#: ../objects/AADL/aadlbox.c:147
-msgid "Declaration"
-msgstr "声明"
+#: lib/renderer/diacairo-interactive.c:344
+#: lib/renderer/diacairo-interactive.c:345
+msgid "Zoom pointer"
+msgstr "缩放指针"
 
-#: ../objects/AADL/aadlbox.c:356
-msgid "Add Access Provider"
-msgstr "æ·»åŠ è®¿é—®æä¾›è€…"
+#: lib/renderer/diacairo-interactive.c:351
+#: lib/renderer/diacairo-interactive.c:352
+msgid "Visible rect pointer"
+msgstr "可见矩形指针"
 
-#: ../objects/AADL/aadlbox.c:358
-msgid "Add Access Requirer"
-msgstr "æ·»åŠ è®¿é—®è¯·æ±‚è€…"
+#: lib/renderer/diacairo.c:90 plug-ins/drs/dia-render-script.c:129
+#: plug-ins/hpgl/hpgl.c:730
+#, c-format
+msgid "Can't open output file %s."
+msgstr "æ— æ³•æ‰“å¼€è¾“å…¥æ–‡ä»¶ %s。"
+
+#: lib/renderer/diacairo.c:98
+#, 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"
+"请选择另外一个名字用于保存。\n"
+
+#: lib/renderer/diacairo.c:268 lib/renderer/diacairo.c:284
+#, c-format
+msgid "Can't write %d bytes to %s"
+msgstr "æ— æ³•å‘ %2$s 中写入 %1$d 字节"
+
+#: lib/renderer/diacairo.c:297
+msgid "Clipboard copy failed"
+msgstr "剪切板复制失败"
+
+#: lib/renderer/diacairo.c:325 plug-ins/postscript/postscript.c:39
+#: plug-ins/wmf/wmf.cpp:1545
+msgid "Nothing to print"
+msgstr "没有可打印的东西"
+
+#: objects/AADL/aadlbox.c:147
+msgid "Declaration"
+msgstr "声明"
+
+#: objects/AADL/aadlbox.c:356
+msgid "Add Access Provider"
+msgstr "æ·»åŠ è®¿é—®æä¾›è€…"
+
+#: objects/AADL/aadlbox.c:358
+msgid "Add Access Requirer"
+msgstr "æ·»åŠ è®¿é—®è¯·æ±‚è€…"
 
-#: ../objects/AADL/aadlbox.c:360
+#: objects/AADL/aadlbox.c:360
 msgid "Add In Data Port"
 msgstr "æ·»åŠ è¾“å…¥æ•°æ®ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:362
+#: objects/AADL/aadlbox.c:362
 msgid "Add In Event Port"
 msgstr "æ·»åŠ è¾“å…¥äº‹ä»¶ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:364
+#: objects/AADL/aadlbox.c:364
 msgid "Add In Event Data Port"
 msgstr "æ·»åŠ è¾“å…¥äº‹ä»¶æ•°æ®ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:366
+#: objects/AADL/aadlbox.c:366
 msgid "Add Out Data Port"
 msgstr "æ·»åŠ è¾“å‡ºæ•°æ®ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:368
+#: objects/AADL/aadlbox.c:368
 msgid "Add Out Event Port"
 msgstr "æ·»åŠ è¾“å‡ºäº‹ä»¶ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:370
+#: objects/AADL/aadlbox.c:370
 msgid "Add Out Event Data Port"
 msgstr "æ·»åŠ è¾“å‡ºäº‹ä»¶æ•°æ®ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:372
+#: objects/AADL/aadlbox.c:372
 msgid "Add In Out Data Port"
 msgstr "æ·»åŠ è¾“å…¥è¾“å‡ºæ•°æ®ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:374
+#: objects/AADL/aadlbox.c:374
 msgid "Add In Out Event Port"
 msgstr "æ·»åŠ è¾“å…¥è¾“å‡ºäº‹ä»¶ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:376
+#: objects/AADL/aadlbox.c:376
 msgid "Add In Out Event Data Port"
 msgstr "æ·»åŠ è¾“å…¥è¾“å‡ºäº‹ä»¶æ•°æ®ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:378
+#: objects/AADL/aadlbox.c:378
 msgid "Add Port Group"
 msgstr "æ·»åŠ ç«¯å£ç»„"
 
-#: ../objects/AADL/aadlbox.c:380
+#: objects/AADL/aadlbox.c:380
 msgid "Add Connection Point"
 msgstr "æ·»åŠ è¿žæŽ¥ç‚¹"
 
-#: ../objects/AADL/aadlbox.c:384
+#: objects/AADL/aadlbox.c:384
 msgid "Delete Port"
 msgstr "åˆ é™¤ç«¯å£"
 
-#: ../objects/AADL/aadlbox.c:385
+#: objects/AADL/aadlbox.c:385
 msgid "Edit Port Declaration"
 msgstr "编辑端口声明"
 
-#: ../objects/AADL/aadlbox.c:389
+#: objects/AADL/aadlbox.c:389
 msgid "Delete Connection Point"
 msgstr "åˆ é™¤è¿žæŽ¥ç‚¹"
 
-#: ../objects/AADL/aadl.c:52
+#: objects/AADL/aadl.c:50
 msgid "Architecture Analysis & Design Language diagram objects"
 msgstr "结构分析和设计语言图表对象"
 
-#: ../objects/chronogram/chronogram.c:40
+#: objects/chronogram/chronogram.c:38
 msgid "Chronogram diagram objects"
 msgstr "Chronogram 图表对象"
 
-#: ../objects/chronogram/chronoline.c:147 ../sheets/AADL.sheet.in.h:5
+#: objects/chronogram/chronoline.c:145 sheets/AADL.sheet:16
 msgid "Data"
 msgstr "数据"
 
-#: ../objects/chronogram/chronoline.c:149
+#: objects/chronogram/chronoline.c:147
 msgid "Data name"
 msgstr "数据名称"
 
-#: ../objects/chronogram/chronoline.c:151
+#: objects/chronogram/chronoline.c:149
 msgid "Events"
 msgstr "事件"
 
-#: ../objects/chronogram/chronoline.c:154
+#: objects/chronogram/chronoline.c:152
 msgid "Event specification"
 msgstr "äº‹ä»¶è§„æ ¼"
 
-#: ../objects/chronogram/chronoline.c:155
+#: objects/chronogram/chronoline.c:153
 msgid ""
 "@ time    set the pointer to an absolute time.\n"
 "( duration  set the signal up, then wait 'duration'.\n"
@@ -3069,109 +3572,98 @@ msgstr ""
 "u 时间段  将信号设置为“未知”状态，然后等待“时间段”。\n"
 "例如：@ 1.0 (2.0)1.0(2.0)\n"
 
-#: ../objects/chronogram/chronoline.c:163
-#: ../objects/chronogram/chronoref.c:145
+#: objects/chronogram/chronoline.c:161 objects/chronogram/chronoref.c:143
 msgid "Start time"
 msgstr "开始时间"
 
-#: ../objects/chronogram/chronoline.c:165
-#: ../objects/chronogram/chronoref.c:147
+#: objects/chronogram/chronoline.c:163 objects/chronogram/chronoref.c:145
 msgid "End time"
 msgstr "结束时间"
 
-#: ../objects/chronogram/chronoline.c:167
+#: objects/chronogram/chronoline.c:165
 msgid "Rise time"
 msgstr "上升时间"
 
-#: ../objects/chronogram/chronoline.c:169
+#: objects/chronogram/chronoline.c:167
 msgid "Fall time"
 msgstr "下降时间"
 
-#: ../objects/chronogram/chronoline.c:170
+#: objects/chronogram/chronoline.c:168
 msgid "Multi-bit data"
 msgstr "多位数据"
 
-#: ../objects/chronogram/chronoline.c:172
-#: ../objects/chronogram/chronoref.c:155
+#: objects/chronogram/chronoline.c:170 objects/chronogram/chronoref.c:153
 msgid "Aspect"
 msgstr "外观"
 
-#: ../objects/chronogram/chronoline.c:174
+#: objects/chronogram/chronoline.c:172
 msgid "Data color"
 msgstr "数据颜色"
 
-#: ../objects/chronogram/chronoline.c:176
+#: objects/chronogram/chronoline.c:174
 msgid "Data line width"
 msgstr "数据线宽度"
 
-#: ../objects/chronogram/chronoref.c:143
+#: objects/chronogram/chronoref.c:141
 msgid "Time data"
 msgstr "时间数据"
 
-#: ../objects/chronogram/chronoref.c:149
+#: objects/chronogram/chronoref.c:147
 msgid "Major time step"
 msgstr "主时间步"
 
-#: ../objects/chronogram/chronoref.c:151
+#: objects/chronogram/chronoref.c:149
 msgid "Minor time step"
 msgstr "副时间步"
 
-#: ../objects/chronogram/chronoref.c:161
+#: objects/chronogram/chronoref.c:159
 msgid "Minor step line width"
 msgstr "主步线的宽度"
 
-#: ../objects/custom/custom.c:140
+#: objects/custom/custom.c:140
 msgid "Custom"
 msgstr "定制"
 
-#: ../objects/custom/custom.c:140
+#: objects/custom/custom.c:140
 msgid "Custom XML shapes loader"
 msgstr "定制 XML 形状载入器"
 
-#: ../objects/custom/custom_object.c:199 ../objects/custom/custom_object.c:232
+#: objects/custom/custom_object.c:196 objects/custom/custom_object.c:229
 msgid "Flip horizontal"
 msgstr "水平翻转"
 
-#: ../objects/custom/custom_object.c:201 ../objects/custom/custom_object.c:234
+#: objects/custom/custom_object.c:198 objects/custom/custom_object.c:231
 msgid "Flip vertical"
 msgstr "垂直翻转"
 
-#: ../objects/custom/custom_object.c:204 ../objects/custom/custom_object.c:237
-msgid "Scale of the subshapes"
+#: objects/custom/custom_object.c:201 objects/custom/custom_object.c:234
+msgid "Scale of the sub-shapes"
 msgstr "子形状的缩放比例"
 
-#: ../objects/custom/custom_object.c:218 ../objects/flowchart/box.c:152
-#: ../objects/flowchart/diamond.c:150 ../objects/flowchart/ellipse.c:149
-#: ../objects/flowchart/parallelogram.c:154 ../objects/SADT/box.c:135
+#: objects/custom/custom_object.c:215 objects/flowchart/box.c:150
+#: objects/flowchart/diamond.c:148 objects/flowchart/ellipse.c:147
+#: objects/flowchart/parallelogram.c:152 objects/SADT/box.c:133
 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
+#: objects/custom/custom_object.c:1953
 #, c-format
 msgid "Cannot open icon file %s for object type '%s'."
 msgstr "æ— æ³•ä¸ºâ€œ%2$sâ€ç±»åž‹çš„å¯¹è±¡æ‰“å¼€å›¾æ ‡æ–‡ä»¶%1$s。"
 
-#: ../objects/custom_lines/custom_lines.c:160
+#: objects/custom_lines/custom_lines.c:160
 msgid "CustomLines"
 msgstr "定制线"
 
-#: ../objects/custom_lines/custom_lines.c:160
+#: objects/custom_lines/custom_lines.c:160
 msgid "Custom XML lines loader"
 msgstr "定制 XML 线形载入器"
 
-#: ../objects/custom_lines/custom_linetypes.c:259
+#: objects/custom_lines/custom_linetypes.c:259
 msgid "INTERNAL: CustomLines: Illegal line type in LineInfo object."
 msgstr "INTERNAL：CustomLines：LineInfo 对象中的非法线类型。"
 
-#: ../objects/custom/shape_info.c:170
+#: objects/custom/shape_info.c:173
 #, c-format
 msgid ""
 "The file '%s' has invalid path data.\n"
@@ -3180,259 +3672,245 @@ msgstr ""
 "文件“%sâ€å«æœ‰æ— æ•ˆçš„è·¯å¾„æ•°æ®ã€‚\n"
 "svg：路径数据必须以 moveto 开始。"
 
-#: ../objects/Database/compound.c:196
+#: objects/Database/compound.c:194
 msgid "Number of arms"
 msgstr "手柄数"
 
-#: ../objects/Database/compound.c:219
+#: objects/Database/compound.c:217
 msgid "Flip arms vertically"
 msgstr "垂直翻转手柄"
 
-#: ../objects/Database/compound.c:221
+#: objects/Database/compound.c:219
 msgid "Flip arms horizontally"
 msgstr "水平翻转手柄"
 
-#: ../objects/Database/compound.c:223
+#: objects/Database/compound.c:221
 msgid "Center mount point vertically"
 msgstr "使装载点垂直居中"
 
-#: ../objects/Database/compound.c:225
+#: objects/Database/compound.c:223
 msgid "Center mount point horizontally"
 msgstr "使装载点水平居中"
 
-#: ../objects/Database/compound.c:227
+#: objects/Database/compound.c:225
 msgid "Center mount point"
 msgstr "使装载点居中"
 
-#: ../objects/Database/compound.c:232
+#: objects/Database/compound.c:230
 msgid "Compound"
 msgstr "复合"
 
-#: ../objects/Database/database.c:39
+#: objects/Database/database.c:37
 msgid "Entity/Relationship table diagram objects"
 msgstr "实体/关系表图表对象"
 
-#: ../objects/Database/reference.c:109 ../objects/flowchart/box.c:150
-#: ../objects/standard/box.c:138 ../objects/standard/polyline.c:107
-#: ../objects/standard/zigzagline.c:106
+#: objects/Database/reference.c:107 objects/flowchart/box.c:148
+#: objects/standard/box.c:145 objects/standard/polyline.c:104
+#: objects/standard/zigzagline.c:102
 msgid "Corner radius"
 msgstr "圆角半径"
 
-#: ../objects/Database/reference.c:112
+#: objects/Database/reference.c:110
 msgid "Start description"
-msgstr "起点描述："
+msgstr "起点描述"
 
-#: ../objects/Database/reference.c:114
+#: objects/Database/reference.c:112
 msgid "End description"
-msgstr "终点描述："
-
-#: ../objects/Database/reference.c:121 ../objects/Database/table.c:212
-#: ../objects/Database/table.c:214 ../objects/Database/table.c:216
-#: ../objects/UML/association.c:247 ../objects/UML/association.c:258
-#: ../objects/UML/association.c:260 ../objects/UML/association.c:262
-#: ../objects/UML/association.c:264 ../objects/UML/association.c:266
-#: ../objects/UML/class.c: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
+msgstr "终点描述"
+
+#: objects/Database/reference.c:119 objects/Database/table.c:221
+#: objects/Database/table.c:223 objects/Database/table.c:225
+#: objects/UML/association.c:246 objects/UML/association.c:257
+#: objects/UML/association.c:259 objects/UML/association.c:261
+#: objects/UML/association.c:263 objects/UML/association.c:265
+#: objects/UML/class.c:218 objects/UML/class.c:220 objects/UML/class.c:222
+#: objects/UML/class.c:224 objects/UML/class.c:226 objects/UML/class.c:228
 msgid " "
 msgstr " "
 
-#: ../objects/Database/reference.c:145 ../objects/ER/participation.c:404
-#: ../objects/FS/flow-ortho.c:627 ../objects/GRAFCET/vector.c:309
-#: ../objects/SADT/arrow.c:462 ../objects/standard/zigzagline.c:446
-#: ../objects/UML/association.c:866 ../objects/UML/component_feature.c:189
-#: ../objects/UML/dependency.c:380 ../objects/UML/generalization.c:377
-#: ../objects/UML/realizes.c:367 ../objects/UML/transition.c:172
+#: objects/Database/reference.c:143 objects/ER/participation.c:401
+#: objects/FS/flow-ortho.c:626 objects/GRAFCET/vector.c:310
+#: objects/SADT/arrow.c:469 objects/standard/zigzagline.c:443
+#: objects/UML/association.c:872 objects/UML/component_feature.c:187
+#: objects/UML/dependency.c:377 objects/UML/generalization.c:376
+#: objects/UML/realizes.c:367 objects/UML/transition.c:170
 msgid "Add segment"
 msgstr "æ·»åŠ å›¾æ®µ"
 
-#: ../objects/Database/reference.c:146 ../objects/ER/participation.c:405
-#: ../objects/FS/flow-ortho.c:628 ../objects/GRAFCET/vector.c:310
-#: ../objects/SADT/arrow.c:463 ../objects/standard/zigzagline.c:447
-#: ../objects/UML/association.c:867 ../objects/UML/component_feature.c:190
-#: ../objects/UML/dependency.c:381 ../objects/UML/generalization.c:378
-#: ../objects/UML/realizes.c:368 ../objects/UML/transition.c:173
+#: objects/Database/reference.c:144 objects/ER/participation.c:402
+#: objects/FS/flow-ortho.c:627 objects/GRAFCET/vector.c:311
+#: objects/SADT/arrow.c:470 objects/standard/zigzagline.c:444
+#: objects/UML/association.c:873 objects/UML/component_feature.c:188
+#: objects/UML/dependency.c:378 objects/UML/generalization.c:377
+#: objects/UML/realizes.c:368 objects/UML/transition.c:171
 msgid "Delete segment"
 msgstr "åˆ é™¤å›¾æ®µ"
 
-#: ../objects/Database/reference.c:152 ../sheets/Database.sheet.in.h:4
+#: objects/Database/reference.c:150 sheets/Database.sheet:10
 msgid "Reference"
 msgstr "引用"
 
-#: ../objects/Database/table.c:140 ../objects/Database/table.c:181
-#: ../objects/Database/table.c:209 ../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
+#: objects/Database/table.c:149 objects/Database/table.c:190
+#: objects/Database/table.c:218 objects/UML/class.c:147 objects/UML/class.c:214
+#: objects/UML/class_dialog.c:511 objects/UML/umlattribute.c:41
+#: objects/UML/umloperation.c:64 objects/UML/umlparameter.c:47
+#: sheets/SDL.sheet:52
 msgid "Comment"
 msgstr "注释"
 
-#: ../objects/Database/table.c:142
+#: objects/Database/table.c:151
 msgid "Primary"
 msgstr "主"
 
-#: ../objects/Database/table.c:142
+#: objects/Database/table.c:151
 msgid "Primary key"
 msgstr "主键"
 
-#: ../objects/Database/table.c:144
+#: objects/Database/table.c:153
 msgid "Nullable"
 msgstr "可以为空"
 
-#: ../objects/Database/table.c:146
+#: objects/Database/table.c:155
 msgid "Unique"
 msgstr "唯一索引"
 
-#: ../objects/Database/table.c:148
+#: objects/Database/table.c:157
 msgid "Default"
 msgstr "默认"
 
-#: ../objects/Database/table.c:148
+#: objects/Database/table.c:157 objects/UML/class_operations_dialog.c:1298
 msgid "Default value"
 msgstr "默认数值"
 
 #. init data
-#: ../objects/Database/table.c:177 ../objects/Database/table.c:267
-#: ../objects/Database/table.c:374 ../sheets/Database.sheet.in.h:3
+#: objects/Database/table.c:186 objects/Database/table.c:276
+#: objects/Database/table.c:385 sheets/Database.sheet:7
 msgid "Table"
 msgstr "表"
 
-#: ../objects/Database/table.c:186
+#: objects/Database/table.c:195
 msgid "Visible comments"
 msgstr "可见的注释"
 
-#: ../objects/Database/table.c:188
+#: objects/Database/table.c:197
 msgid "Underline primary keys"
 msgstr "ä¸ºä¸»é”®åŠ ä¸Šä¸‹åˆ’çº¿"
 
-#: ../objects/Database/table.c:191 ../objects/UML/class.c:159
+#: objects/Database/table.c:200 objects/UML/class.c:162
 msgid "Comment tagging"
 msgstr "æ³¨é‡Šæ ‡è®°"
 
-#: ../objects/Database/table.c:193
+#: objects/Database/table.c:202
 msgid "Use bold font for primary keys"
 msgstr "为主键使用粗体"
 
-#: ../objects/Database/table.c:196 ../objects/UML/class.c:181
-#: ../objects/UML/object.c:150
+#: objects/Database/table.c:205 objects/UML/class.c:184
+#: objects/UML/object.c:148
 msgid "Attributes"
 msgstr "属性"
 
 #. umlformalparameters_extra
 #. all this just to make the defaults selectable ...
-#: ../objects/Database/table.c:200 ../objects/UML/association.c:269
-#: ../objects/UML/class.c:196 ../objects/UML/object.c:159
+#: objects/Database/table.c:209 objects/UML/association.c:268
+#: objects/UML/class.c:199 objects/UML/object.c:157
 msgid "Style"
 msgstr "æ ·å¼"
 
-#: ../objects/Database/table.c:201 ../objects/UML/class.c:197
+#: objects/Database/table.c:210 objects/UML/class.c:200
 msgid "Fonts"
 msgstr "字体"
 
 #. property rows
-#: ../objects/Database/table.c:205 ../objects/SADT/arrow.c:135
-#: ../objects/UML/class.c:201 ../objects/UML/class_dialog.c:461
+#: objects/Database/table.c:214 objects/SADT/arrow.c:133
+#: objects/UML/class.c:204 objects/UML/class_dialog.c:486
 msgid "Normal"
 msgstr "正常"
 
-#: ../objects/Database/table.c:207
+#: objects/Database/table.c:216
 msgid "Table name"
 msgstr "表名"
 
-#: ../objects/Database/table.c:262 ../objects/UML/class.c:342
+#: objects/Database/table.c:271 objects/UML/class.c:345
 msgid "Show comments"
 msgstr "显示注释"
 
-#: ../objects/ER/attribute.c:152 ../objects/ER/entity.c:134
-#: ../objects/ER/relationship.c:139
-#: ../objects/UML/class_attributes_dialog.c:517
-#: ../objects/UML/class_operations_dialog.c:777
-#: ../objects/UML/class_operations_dialog.c:977
-#: ../objects/UML/class_templates_dialog.c:436 ../objects/UML/dependency.c:132
-#: ../objects/UML/generalization.c:129 ../objects/UML/realizes.c:129
-msgid "Name:"
-msgstr "名称："
-
-#: ../objects/ER/attribute.c:154
+#: objects/ER/attribute.c:152
 msgid "Key:"
 msgstr "密钥："
 
-#: ../objects/ER/attribute.c:156
+#: objects/ER/attribute.c:154
 msgid "Weak key:"
 msgstr "弱密钥："
 
-#: ../objects/ER/attribute.c:158
+#: objects/ER/attribute.c:156
 msgid "Derived:"
 msgstr "来源："
 
-#: ../objects/ER/attribute.c:160
+#: objects/ER/attribute.c:158
 msgid "Multivalue:"
 msgstr "多值："
 
-#: ../objects/ER/attribute.c:433 ../sheets/ER.sheet.in.h:6
+#: objects/ER/attribute.c:440 sheets/ER.sheet:17
 msgid "Attribute"
 msgstr "属性"
 
-#: ../objects/ER/entity.c:136
+#: objects/ER/entity.c:134
 msgid "Weak:"
 msgstr "弱："
 
-#: ../objects/ER/entity.c:138
+#: objects/ER/entity.c:136
 msgid "Associative:"
 msgstr "关联的："
 
-#: ../objects/ER/entity.c:412 ../objects/UML/classicon.c:129
-#: ../sheets/ER.sheet.in.h:3
+#: objects/ER/entity.c:406 objects/UML/classicon.c:127 sheets/ER.sheet:7
 msgid "Entity"
 msgstr "实体"
 
-#: ../objects/ER/er.c:44
+#: objects/ER/er.c:42
 msgid "Entity/Relationship diagram objects"
 msgstr "实体/关系图表对象"
 
-#: ../objects/ER/participation.c:116
+#: objects/ER/participation.c:114
 msgid "Total:"
 msgstr "总共："
 
-#: ../objects/ER/relationship.c:141
+#: objects/ER/relationship.c:139
 msgid "Left Cardinality:"
 msgstr "左基数："
 
-#: ../objects/ER/relationship.c:143
+#: objects/ER/relationship.c:141
 msgid "Right Cardinality:"
 msgstr "右基数："
 
-#: ../objects/ER/relationship.c:145
+#: objects/ER/relationship.c:143
 msgid "Rotate:"
 msgstr "旋转："
 
-#: ../objects/ER/relationship.c:147
+#: objects/ER/relationship.c:145
 msgid "Identifying:"
 msgstr "æ ‡è¯†ï¼š"
 
-#: ../objects/ER/relationship.c:456 ../sheets/ER.sheet.in.h:5
+#: objects/ER/relationship.c:462 sheets/ER.sheet:14
 msgid "Relationship"
 msgstr "关系"
 
-#: ../objects/flowchart/flowchart.c:37
+#: objects/flowchart/flowchart.c:35
 msgid "Flowchart objects"
 msgstr "流程图对象"
 
-#: ../objects/flowchart/parallelogram.c:152
+#: objects/flowchart/parallelogram.c:150
 msgid "Shear angle"
 msgstr "圆角"
 
 #. Translators: Menu item Noun/Energy
-#: ../objects/FS/flow.c:135 ../objects/FS/flow.c:627
-#: ../objects/FS/flow-ortho.c:158 ../objects/FS/flow-ortho.c:624
-#: ../objects/FS/function.c:1095
+#: objects/FS/flow.c:133 objects/FS/flow.c:625 objects/FS/flow-ortho.c:156
+#: objects/FS/flow-ortho.c:623 objects/FS/function.c:1090
 msgid "Energy"
 msgstr "能量"
 
 #. Translators: Menu item Noun/Material
-#: ../objects/FS/flow.c:136 ../objects/FS/flow.c:628
-#: ../objects/FS/flow-ortho.c:159 ../objects/FS/flow-ortho.c:625
-#: ../objects/FS/function.c:1071
+#: objects/FS/flow.c:134 objects/FS/flow.c:626 objects/FS/flow-ortho.c:157
+#: objects/FS/flow-ortho.c:624 objects/FS/function.c:1066
 msgid "Material"
 msgstr "物质"
 
@@ -3440,2197 +3918,2464 @@ msgstr "物质"
 #. Translators: Menu item Verb/Signal/Signal
 #. Translators: Menu item Noun/Signal
 #. Translators: Menu item Noun/Signal/Signal
-#: ../objects/FS/flow.c:137 ../objects/FS/flow.c:629
-#: ../objects/FS/flow-ortho.c:160 ../objects/FS/flow-ortho.c:626
-#: ../objects/FS/function.c:1033 ../objects/FS/function.c:1035
-#: ../objects/FS/function.c:1171 ../objects/FS/function.c:1173
+#: objects/FS/flow.c:135 objects/FS/flow.c:627 objects/FS/flow-ortho.c:158
+#: objects/FS/flow-ortho.c:625 objects/FS/function.c:1028
+#: objects/FS/function.c:1030 objects/FS/function.c:1166
+#: objects/FS/function.c:1168
 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
+#: objects/FS/fs.c:41
 msgid "Function structure diagram objects"
 msgstr "函数结构图表对象"
 
-#: ../objects/FS/function.c:141
+#: objects/FS/function.c:139
 msgid "Wish function"
 msgstr "预期函数"
 
-#: ../objects/FS/function.c:143
+#: objects/FS/function.c:141
 msgid "User function"
 msgstr "用户函数"
 
 #. Translators: Menu item Verb
-#: ../objects/FS/function.c:675
+#: objects/FS/function.c:670
 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:677 ../objects/FS/function.c:679
-#: ../objects/FS/function.c:719
+#: objects/FS/function.c:672 objects/FS/function.c:674
+#: objects/FS/function.c:714
 msgid "Channel"
 msgstr "通道"
 
 #. Translators: Menu item Verb/Channel/Import/Input
-#: ../objects/FS/function.c:685 ../objects/KAOS/metabinrel.c:164
+#: objects/FS/function.c:680 objects/KAOS/metabinrel.c:162
 msgid "Input"
 msgstr "输入"
 
 #. Translators: Menu item Verb/Channel/Import/Receive
-#: ../objects/FS/function.c:687
+#: objects/FS/function.c:682
 msgid "Receive"
 msgstr "接收"
 
 #. Translators: Menu item Verb/Channel/Import/Allow
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Allow
-#: ../objects/FS/function.c:689 ../objects/FS/function.c:961
+#: objects/FS/function.c:684 objects/FS/function.c:956
 msgid "Allow"
 msgstr "允许"
 
 #. Translators: Menu item Verb/Channel/Import/Form Entrance
-#: ../objects/FS/function.c:691
+#: objects/FS/function.c:686
 msgid "Form Entrance"
 msgstr "表单入口"
 
 #. Translators: Menu item Verb/Channel/Import/Capture
 #. Translators: Menu item Verb/Provision/Store/Capture
-#: ../objects/FS/function.c:693 ../objects/FS/function.c:927
+#: objects/FS/function.c:688 objects/FS/function.c:922
 msgid "Capture"
 msgstr "捕捉"
 
 #. Translators: Menu item Verb/Channel/Export/Discharge
-#: ../objects/FS/function.c:699
+#: objects/FS/function.c:694
 msgid "Discharge"
 msgstr "释放"
 
 #. Translators: Menu item Verb/Channel/Export/Eject
-#: ../objects/FS/function.c:701
+#: objects/FS/function.c:696
 msgid "Eject"
 msgstr "弹出"
 
 #. Translators: Menu item Verb/Channel/Export/Dispose
-#: ../objects/FS/function.c:703
+#: objects/FS/function.c:698
 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:707 ../objects/FS/function.c:709
-#: ../objects/FS/function.c:727
+#: objects/FS/function.c:702 objects/FS/function.c:704
+#: objects/FS/function.c:722
 msgid "Transfer"
 msgstr "ä¼ è¾“"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Transport
-#: ../objects/FS/function.c:711 ../objects/FS/function.c:713
+#: objects/FS/function.c:706 objects/FS/function.c:708
 msgid "Transport"
 msgstr "输送"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Lift
-#: ../objects/FS/function.c:715
+#: objects/FS/function.c:710
 msgid "Lift"
 msgstr "提升"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transport/Move
-#: ../objects/FS/function.c:717
+#: objects/FS/function.c:712
 msgid "Move"
 msgstr "移动"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Transmit
-#: ../objects/FS/function.c:721 ../objects/FS/function.c:723
+#: objects/FS/function.c:716 objects/FS/function.c:718
 msgid "Transmit"
 msgstr "发射"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Conduct
-#: ../objects/FS/function.c:725
+#: objects/FS/function.c:720
 msgid "Conduct"
 msgstr "ä¼ å¯¼"
 
 #. Translators: Menu item Verb/Channel/Transfer/Transmit/Convey
-#: ../objects/FS/function.c:729
+#: objects/FS/function.c:724
 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:731 ../objects/FS/function.c:733
-#: ../objects/FS/function.c:735
+#: objects/FS/function.c:726 objects/FS/function.c:728
+#: objects/FS/function.c:730
 msgid "Guide"
 msgstr "导向"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Direct
-#: ../objects/FS/function.c:737
+#: objects/FS/function.c:732
 msgid "Direct"
 msgstr "方向"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Straighten
-#: ../objects/FS/function.c:739
+#: objects/FS/function.c:734
 msgid "Straighten"
 msgstr "弄直"
 
 #. Translators: Menu item Verb/Channel/Guide/Guide/Steer
-#: ../objects/FS/function.c:741
+#: objects/FS/function.c:736
 msgid "Steer"
 msgstr "把舵"
 
 #. Translators: Menu item Verb/Channel/Guide/Translate
-#: ../objects/FS/function.c:743
+#: objects/FS/function.c:738
 msgid "Translate"
 msgstr "转化"
 
-#. Translators: Menu item Verb/Channel/Guide/Rotate
-#. Translators: Menu item Verb/Channel/Guide/Rotate/Rotate
-#: ../objects/FS/function.c:745 ../objects/FS/function.c:747
-msgid "Rotate"
-msgstr "旋转"
-
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Turn
-#: ../objects/FS/function.c:749
+#: objects/FS/function.c:744
 msgid "Turn"
 msgstr "平面旋转"
 
 #. Translators: Menu item Verb/Channel/Guide/Rotate/Spin
-#: ../objects/FS/function.c:751
+#: objects/FS/function.c:746
 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:753 ../objects/FS/function.c:755
+#: objects/FS/function.c:748 objects/FS/function.c:750
 msgid "Allow DOF"
 msgstr "允许 DOF"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Constrain
-#: ../objects/FS/function.c:757
+#: objects/FS/function.c:752
 msgid "Constrain"
 msgstr "约束"
 
 #. Translators: Menu item Verb/Channel/Guide/Allow DOF/Unlock
-#: ../objects/FS/function.c:759
+#: objects/FS/function.c:754
 msgid "Unlock"
 msgstr "解锁"
 
 #. Translators: Menu item Verb/Support
 #. Translators: Menu item Verb/Support/Support
-#: ../objects/FS/function.c:761 ../objects/FS/function.c:763
+#: objects/FS/function.c:756 objects/FS/function.c:758
 msgid "Support"
 msgstr "支持"
 
 #. Translators: Menu item Verb/Support/Stop
 #. Translators: Menu item Verb/Support/Stop/Stop
-#: ../objects/FS/function.c:765 ../objects/FS/function.c:767
-#: ../sheets/SDL.sheet.in.h:16
+#: objects/FS/function.c:760 objects/FS/function.c:762 sheets/SDL.sheet:46
 msgid "Stop"
 msgstr "停止"
 
 #. Translators: Menu item Verb/Support/Stop/Insulate
-#: ../objects/FS/function.c:769
+#: objects/FS/function.c:764
 msgid "Insulate"
 msgstr "隔离"
 
 #. Translators: Menu item Verb/Support/Stop/Protect
-#: ../objects/FS/function.c:771
+#: objects/FS/function.c:766
 msgid "Protect"
 msgstr "保护"
 
 #. Translators: Menu item Verb/Support/Stop/Prevent
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Prevent
-#: ../objects/FS/function.c:773 ../objects/FS/function.c:963
+#: objects/FS/function.c:768 objects/FS/function.c:958
 msgid "Prevent"
 msgstr "阻止"
 
 #. Translators: Menu item Verb/Support/Stop/Shield
-#: ../objects/FS/function.c:775
+#: objects/FS/function.c:770
 msgid "Shield"
 msgstr "屏蔽"
 
 #. Translators: Menu item Verb/Support/Stop/Inhibit
-#: ../objects/FS/function.c:777
+#: objects/FS/function.c:772
 msgid "Inhibit"
 msgstr "禁止"
 
 #. Translators: Menu item Verb/Support/Stabilize
 #. Translators: Menu item Verb/Support/Stabilize/Stabilize
-#: ../objects/FS/function.c:779 ../objects/FS/function.c:781
+#: objects/FS/function.c:774 objects/FS/function.c:776
 msgid "Stabilize"
 msgstr "稳定"
 
 #. Translators: Menu item Verb/Support/Stabilize/Steady
-#: ../objects/FS/function.c:783
+#: objects/FS/function.c:778
 msgid "Steady"
 msgstr "稳定"
 
 #. Translators: Menu item Verb/Support/Secure
 #. Translators: Menu item Verb/Support/Secure/Secure
-#: ../objects/FS/function.c:785 ../objects/FS/function.c:787
+#: objects/FS/function.c:780 objects/FS/function.c:782
 msgid "Secure"
 msgstr "牢固"
 
 #. Translators: Menu item Verb/Support/Secure/Attach
 #. Translators: Menu item Verb/Connect/Couple/Attach
-#: ../objects/FS/function.c:789 ../objects/FS/function.c:821
+#: objects/FS/function.c:784 objects/FS/function.c:816
 msgid "Attach"
 msgstr "附着"
 
 #. Translators: Menu item Verb/Support/Secure/Mount
-#: ../objects/FS/function.c:791
+#: objects/FS/function.c:786
 msgid "Mount"
 msgstr "安装"
 
 #. Translators: Menu item Verb/Support/Secure/Lock
-#: ../objects/FS/function.c:793 ../sheets/ciscomisc.sheet.in.h:42
+#: objects/FS/function.c:788 sheets/ciscomisc.sheet:49
 msgid "Lock"
 msgstr "锁定"
 
 #. Translators: Menu item Verb/Support/Secure/Fasten
-#: ../objects/FS/function.c:795
+#: objects/FS/function.c:790
 msgid "Fasten"
 msgstr "固定"
 
 #. Translators: Menu item Verb/Support/Secure/Hold
-#: ../objects/FS/function.c:797
+#: objects/FS/function.c:792
 msgid "Hold"
 msgstr "保持"
 
-#. Translators: Menu item Verb/Support/Position
-#. Translators: Menu item Verb/Support/Position/Position
-#: ../objects/FS/function.c:799 ../objects/FS/function.c:801
-#: ../objects/Istar/actor.c:68
-msgid "Position"
-msgstr "位置"
-
 #. Translators: Menu item Verb/Support/Position/Orient
-#: ../objects/FS/function.c:803
+#: objects/FS/function.c:798
 msgid "Orient"
 msgstr "方向"
 
+#. Translators: Menu item Verb/Support/Position/Align
+#: objects/FS/function.c:800
+msgid "Align"
+msgstr "对齐"
+
 #. Translators: Menu item Verb/Connect
 #. Translators: Menu item Verb/Connect/Connect
-#: ../objects/FS/function.c:809 ../objects/FS/function.c:811
+#: objects/FS/function.c:804 objects/FS/function.c:806
 msgid "Connect"
 msgstr "连接"
 
 #. Translators: Menu item Verb/Connect/Couple
 #. Translators: Menu item Verb/Connect/Couple/Couple
-#: ../objects/FS/function.c:813 ../objects/FS/function.c:815
+#: objects/FS/function.c:808 objects/FS/function.c:810
 msgid "Couple"
 msgstr "结合"
 
 #. Translators: Menu item Verb/Connect/Couple/Join
-#: ../objects/FS/function.c:817
+#: objects/FS/function.c:812
 msgid "Join"
 msgstr "联接"
 
 #. Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../objects/FS/function.c:819
+#: objects/FS/function.c:814
 msgid "Assemble"
 msgstr "集合"
 
 #. Translators: Menu item Verb/Connect/Mix
 #. Translators: Menu item Verb/Connect/Mix/Mix
-#: ../objects/FS/function.c:823 ../objects/FS/function.c:825
+#: objects/FS/function.c:818 objects/FS/function.c:820
 msgid "Mix"
 msgstr "混合"
 
 #. Translators: Menu item Verb/Connect/Mix/Combine
-#: ../objects/FS/function.c:827
+#: objects/FS/function.c:822
 msgid "Combine"
 msgstr "联合"
 
 #. Translators: Menu item Verb/Connect/Mix/Blend
-#: ../objects/FS/function.c:829
+#: objects/FS/function.c:824
 msgid "Blend"
 msgstr "融合"
 
 #. Translators: Menu item Verb/Connect/Mix/Add
-#: ../objects/FS/function.c:831
+#: objects/FS/function.c:826
 msgid "Add"
 msgstr "æ·»åŠ "
 
 #. Translators: Menu item Verb/Connect/Mix/Pack
-#: ../objects/FS/function.c:833
+#: objects/FS/function.c:828
 msgid "Pack"
 msgstr "包装"
 
 #. Translators: Menu item Verb/Connect/Mix/Coalesce
-#: ../objects/FS/function.c:835
+#: objects/FS/function.c:830
 msgid "Coalesce"
 msgstr "聚结"
 
 #. Translators: Menu item Verb/Branch
 #. Translators: Menu item Verb/Branch/Branch
-#: ../objects/FS/function.c:837 ../objects/FS/function.c:839
-#: ../sheets/UML.sheet.in.h:30
+#: objects/FS/function.c:832 objects/FS/function.c:834 sheets/UML.sheet:93
 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:841 ../objects/FS/function.c:843
-#: ../objects/FS/function.c:845
+#: objects/FS/function.c:836 objects/FS/function.c:838
+#: objects/FS/function.c:840
 msgid "Separate"
 msgstr "分离"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Switch
-#: ../objects/FS/function.c:847
+#: objects/FS/function.c:842
 msgid "Switch"
 msgstr "转换"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Divide
-#: ../objects/FS/function.c:849
+#: objects/FS/function.c:844
 msgid "Divide"
 msgstr "划分"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Release
-#: ../objects/FS/function.c:851
+#: objects/FS/function.c:846
 msgid "Release"
 msgstr "释放"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Detach
-#: ../objects/FS/function.c:853
+#: objects/FS/function.c:848
 msgid "Detach"
 msgstr "拆开"
 
 #. Translators: Menu item Verb/Branch/Separate/Separate/Disconnect
-#: ../objects/FS/function.c:855
+#: objects/FS/function.c:850
 msgid "Disconnect"
 msgstr "断开连接"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Cut
-#: ../objects/FS/function.c:861
+#: objects/FS/function.c:856
 msgid "Cut"
 msgstr "切开"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Polish
-#: ../objects/FS/function.c:863
+#: objects/FS/function.c:858
 msgid "Polish"
 msgstr "抛光"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Sand
-#: ../objects/FS/function.c:865
+#: objects/FS/function.c:860
 msgid "Sand"
 msgstr "沙磨"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Drill
-#: ../objects/FS/function.c:867
+#: objects/FS/function.c:862
 msgid "Drill"
 msgstr "钻孔"
 
 #. Translators: Menu item Verb/Branch/Separate/Remove/Lathe
-#: ../objects/FS/function.c:869
+#: objects/FS/function.c:864
 msgid "Lathe"
 msgstr "车"
 
 #. Translators: Menu item Verb/Branch/Refine
 #. Translators: Menu item Verb/Branch/Refine/Refine
-#: ../objects/FS/function.c:871 ../objects/FS/function.c:873
+#: objects/FS/function.c:866 objects/FS/function.c:868
 msgid "Refine"
 msgstr "精制"
 
 #. Translators: Menu item Verb/Branch/Refine/Purify
-#: ../objects/FS/function.c:875
+#: objects/FS/function.c:870
 msgid "Purify"
 msgstr "提纯"
 
 #. Translators: Menu item Verb/Branch/Refine/Strain
-#: ../objects/FS/function.c:877
+#: objects/FS/function.c:872
 msgid "Strain"
 msgstr "拉紧"
 
 #. Translators: Menu item Verb/Branch/Refine/Filter
-#: ../objects/FS/function.c:879
+#: objects/FS/function.c:874
 msgid "Filter"
 msgstr "过滤"
 
 #. Translators: Menu item Verb/Branch/Refine/Percolate
-#: ../objects/FS/function.c:881
+#: objects/FS/function.c:876
 msgid "Percolate"
 msgstr "渗滤"
 
 #. Translators: Menu item Verb/Branch/Refine/Clear
-#: ../objects/FS/function.c:883
+#: objects/FS/function.c:878
 msgid "Clear"
 msgstr "清除"
 
 #. Translators: Menu item Verb/Branch/Distribute
 #. Translators: Menu item Verb/Branch/Distribute/Distribute
-#: ../objects/FS/function.c:885 ../objects/FS/function.c:887
+#: objects/FS/function.c:880 objects/FS/function.c:882
 msgid "Distribute"
 msgstr "分发"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diverge
-#: ../objects/FS/function.c:889
+#: objects/FS/function.c:884
 msgid "Diverge"
 msgstr "发散"
 
 #. Translators: Menu item Verb/Branch/Distribute/Scatter
-#: ../objects/FS/function.c:891
+#: objects/FS/function.c:886
 msgid "Scatter"
 msgstr "散布"
 
 #. Translators: Menu item Verb/Branch/Distribute/Disperse
-#: ../objects/FS/function.c:893
+#: objects/FS/function.c:888
 msgid "Disperse"
 msgstr "疏散"
 
 #. Translators: Menu item Verb/Branch/Distribute/Diffuse
 #. Translators: Menu item Verb/Branch/Dissipate/Diffuse
-#: ../objects/FS/function.c:895 ../objects/FS/function.c:909
+#: objects/FS/function.c:890 objects/FS/function.c:904
 msgid "Diffuse"
 msgstr "扩散"
 
 #. Translators: Menu item Verb/Branch/Distribute/Empty
-#: ../objects/FS/function.c:897
+#: objects/FS/function.c:892
 msgid "Empty"
 msgstr "清空"
 
 #. Translators: Menu item Verb/Branch/Dissipate
 #. Translators: Menu item Verb/Branch/Dissipate/Dissipate
-#: ../objects/FS/function.c:899 ../objects/FS/function.c:901
+#: objects/FS/function.c:894 objects/FS/function.c:896
 msgid "Dissipate"
 msgstr "淡化"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Absorb
-#: ../objects/FS/function.c:903
+#: objects/FS/function.c:898
 msgid "Absorb"
 msgstr "吸收"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dampen
-#: ../objects/FS/function.c:905
+#: objects/FS/function.c:900
 msgid "Dampen"
 msgstr "潮湿"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Dispel
-#: ../objects/FS/function.c:907
+#: objects/FS/function.c:902
 msgid "Dispel"
 msgstr "消散"
 
 #. Translators: Menu item Verb/Branch/Dissipate/Resist
-#: ../objects/FS/function.c:911
+#: objects/FS/function.c:906
 msgid "Resist"
 msgstr "反抗"
 
 #. Translators: Menu item Verb/Provision
 #. Translators: Menu item Verb/Provision/Provision
-#: ../objects/FS/function.c:913 ../objects/FS/function.c:915
+#: objects/FS/function.c:908 objects/FS/function.c:910
 msgid "Provision"
 msgstr "供应"
 
 #. Translators: Menu item Verb/Provision/Store
 #. Translators: Menu item Verb/Provision/Store/Store
-#: ../objects/FS/function.c:917 ../objects/FS/function.c:919
+#: objects/FS/function.c:912 objects/FS/function.c:914
 msgid "Store"
 msgstr "存储"
 
 #. Translators: Menu item Verb/Provision/Store/Contain
-#: ../objects/FS/function.c:921
+#: objects/FS/function.c:916
 msgid "Contain"
 msgstr "包含"
 
 #. Translators: Menu item Verb/Provision/Store/Collect
-#: ../objects/FS/function.c:923
+#: objects/FS/function.c:918
 msgid "Collect"
 msgstr "收集"
 
 #. Translators: Menu item Verb/Provision/Store/Reserve
-#: ../objects/FS/function.c:925
+#: objects/FS/function.c:920
 msgid "Reserve"
 msgstr "保留"
 
 #. Translators: Menu item Verb/Provision/Supply
 #. Translators: Menu item Verb/Provision/Supply/Supply
-#: ../objects/FS/function.c:929 ../objects/FS/function.c:931
+#: objects/FS/function.c:924 objects/FS/function.c:926
 msgid "Supply"
 msgstr "供给"
 
 #. Translators: Menu item Verb/Provision/Supply/Provide
-#: ../objects/FS/function.c:935
+#: objects/FS/function.c:930
 msgid "Provide"
 msgstr "提供"
 
 #. Translators: Menu item Verb/Provision/Supply/Replenish
-#: ../objects/FS/function.c:937
+#: objects/FS/function.c:932
 msgid "Replenish"
 msgstr "补充"
 
 #. Translators: Menu item Verb/Provision/Supply/Expose
-#: ../objects/FS/function.c:939
+#: objects/FS/function.c:934
 msgid "Expose"
 msgstr "暴露"
 
 #. Translators: Menu item Verb/Provision/Extract
-#: ../objects/FS/function.c:941 ../sheets/Flowchart.sheet.in.h:22
+#: objects/FS/function.c:936 sheets/Flowchart.sheet:62
 msgid "Extract"
 msgstr "展开"
 
 #. Translators: Menu item Verb/Control Magnitude
 #. Translators: Menu item Verb/Control Magnitude/Control Magnitude
-#: ../objects/FS/function.c:943 ../objects/FS/function.c:945
+#: objects/FS/function.c:938 objects/FS/function.c:940
 msgid "Control Magnitude"
 msgstr "控制量质"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Actuate
-#: ../objects/FS/function.c:947 ../objects/FS/function.c:949
+#: objects/FS/function.c:942 objects/FS/function.c:944
 msgid "Actuate"
 msgstr "敦促"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Start
-#: ../objects/FS/function.c:951
+#: objects/FS/function.c:946
 msgid "Start"
 msgstr "开始"
 
 #. Translators: Menu item Verb/Control Magnitude/Actuate/Initiate
-#: ../objects/FS/function.c:953
+#: objects/FS/function.c:948
 msgid "Initiate"
 msgstr "初始化"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Regulate
-#: ../objects/FS/function.c:955 ../objects/FS/function.c:957
+#: objects/FS/function.c:950 objects/FS/function.c:952
 msgid "Regulate"
 msgstr "管制"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Control
 #. Translators: Menu item Noun/Signal/Control
-#: ../objects/FS/function.c:959 ../objects/FS/function.c:1177
-#: ../objects/UML/classicon.c:127
+#: objects/FS/function.c:954 objects/FS/function.c:1172
+#: objects/UML/classicon.c:125
 msgid "Control"
 msgstr "控制"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Enable
-#: ../objects/FS/function.c:965
+#: objects/FS/function.c:960
 msgid "Enable"
 msgstr "启用"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Disable
-#: ../objects/FS/function.c:967
+#: objects/FS/function.c:962
 msgid "Disable"
 msgstr "禁用"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Limit
-#: ../objects/FS/function.c:969
+#: objects/FS/function.c:964
 msgid "Limit"
 msgstr "限制"
 
 #. Translators: Menu item Verb/Control Magnitude/Regulate/Interrupt
-#: ../objects/FS/function.c:971
+#: objects/FS/function.c:966
 msgid "Interrupt"
 msgstr "中断"
 
 #. Translators: Menu item Verb/Control Magnitude/Change
 #. Translators: Menu item Verb/Control Magnitude/Change/Change
-#: ../objects/FS/function.c:973 ../objects/FS/function.c:975
+#: objects/FS/function.c:968 objects/FS/function.c:970
 msgid "Change"
 msgstr "更改"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Increase
-#: ../objects/FS/function.c:977
+#: objects/FS/function.c:972
 msgid "Increase"
 msgstr "增大"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Decrease
-#: ../objects/FS/function.c:979
+#: objects/FS/function.c:974
 msgid "Decrease"
 msgstr "减小"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Amplify
-#: ../objects/FS/function.c:981
+#: objects/FS/function.c:976
 msgid "Amplify"
 msgstr "放大"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Reduce
-#: ../objects/FS/function.c:983
+#: objects/FS/function.c:978
 msgid "Reduce"
 msgstr "缩小"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Normalize
-#: ../objects/FS/function.c:987
+#: objects/FS/function.c:982
 msgid "Normalize"
 msgstr "è§„æ ¼åŒ–"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Multiply
-#: ../objects/FS/function.c:989
+#: objects/FS/function.c:984
 msgid "Multiply"
 msgstr "å¢žåŠ "
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Scale
 #. FIXME: mark read-only
-#: ../objects/FS/function.c:991 ../objects/Misc/measure.c:185
+#: objects/FS/function.c:986 objects/Misc/measure.c:185
+#: plug-ins/python/scascale.py:67
 msgid "Scale"
 msgstr "缩放比例"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Rectify
-#: ../objects/FS/function.c:993
+#: objects/FS/function.c:988
 msgid "Rectify"
 msgstr "调整"
 
 #. Translators: Menu item Verb/Control Magnitude/Change/Adjust
-#: ../objects/FS/function.c:995
+#: objects/FS/function.c:990
 msgid "Adjust"
 msgstr "æ ¡å‡†"
 
 #. Translators: Menu item Verb/Control Magnitude/Form
 #. Translators: Menu item Verb/Control Magnitude/Form/Form
-#: ../objects/FS/function.c:997 ../objects/FS/function.c:999
+#: objects/FS/function.c:992 objects/FS/function.c:994
 msgid "Form"
 msgstr "排列"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compact
-#: ../objects/FS/function.c:1001
+#: objects/FS/function.c:996
 msgid "Compact"
 msgstr "紧凑"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Crush
-#: ../objects/FS/function.c:1003
+#: objects/FS/function.c:998
 msgid "Crush"
 msgstr "碾压变形"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Shape
-#: ../objects/FS/function.c:1005
+#: objects/FS/function.c:1000
 msgid "Shape"
 msgstr "形状"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Compress
-#: ../objects/FS/function.c:1007
+#: objects/FS/function.c:1002
 msgid "Compress"
 msgstr "压缩"
 
 #. Translators: Menu item Verb/Control Magnitude/Form/Pierce
-#: ../objects/FS/function.c:1009
+#: objects/FS/function.c:1004
 msgid "Pierce"
 msgstr "穿透"
 
 #. Translators: Menu item Verb/Convert
 #. Translators: Menu item Verb/Convert/Convert
-#: ../objects/FS/function.c:1011 ../objects/FS/function.c:1013
+#: objects/FS/function.c:1006 objects/FS/function.c:1008
 msgid "Convert"
 msgstr "转换"
 
 #. Translators: Menu item Verb/Convert/Transform
-#: ../objects/FS/function.c:1015
+#: objects/FS/function.c:1010
 msgid "Transform"
 msgstr "变换"
 
 #. Translators: Menu item Verb/Convert/Liquefy
-#: ../objects/FS/function.c:1017
+#: objects/FS/function.c:1012
 msgid "Liquefy"
 msgstr "液化"
 
 #. Translators: Menu item Verb/Convert/Solidify
-#: ../objects/FS/function.c:1019
+#: objects/FS/function.c:1014
 msgid "Solidify"
 msgstr "固化"
 
 #. Translators: Menu item Verb/Convert/Evaporate
-#: ../objects/FS/function.c:1021
+#: objects/FS/function.c:1016
 msgid "Evaporate"
 msgstr "蒸发"
 
 #. Translators: Menu item Verb/Convert/Sublimate
-#: ../objects/FS/function.c:1023
+#: objects/FS/function.c:1018
 msgid "Sublimate"
 msgstr "升华"
 
 #. Translators: Menu item Verb/Convert/Condense
-#: ../objects/FS/function.c:1025
+#: objects/FS/function.c:1020
 msgid "Condense"
 msgstr "浓缩"
 
 #. Translators: Menu item Verb/Convert/Integrate
-#: ../objects/FS/function.c:1027
+#: objects/FS/function.c:1022
 msgid "Integrate"
 msgstr "整合"
 
 #. Translators: Menu item Verb/Convert/Differentiate
-#: ../objects/FS/function.c:1029
+#: objects/FS/function.c:1024
 msgid "Differentiate"
 msgstr "分离"
 
 #. Translators: Menu item Verb/Convert/Process
-#: ../objects/FS/function.c:1031 ../sheets/AADL.sheet.in.h:3
-#: ../sheets/Gane_and_Sarson.sheet.in.h:7
+#: objects/FS/function.c:1026 sheets/AADL.sheet:10
+#: sheets/Gane_and_Sarson.sheet:21
 msgid "Process"
 msgstr "处理"
 
 #. Translators: Menu item Verb/Signal/Sense
 #. Translators: Menu item Verb/Signal/Sense/Sense
-#: ../objects/FS/function.c:1037 ../objects/FS/function.c:1039
+#: objects/FS/function.c:1032 objects/FS/function.c:1034
 msgid "Sense"
 msgstr "理解"
 
 #. Translators: Menu item Verb/Signal/Sense/Perceive
-#: ../objects/FS/function.c:1041
+#: objects/FS/function.c:1036
 msgid "Perceive"
 msgstr "觉察"
 
 #. Translators: Menu item Verb/Signal/Sense/Recognize
-#: ../objects/FS/function.c:1043
+#: objects/FS/function.c:1038
 msgid "Recognize"
 msgstr "认可"
 
 #. Translators: Menu item Verb/Signal/Sense/Discern
-#: ../objects/FS/function.c:1045
+#: objects/FS/function.c:1040
 msgid "Discern"
 msgstr "洞悉"
 
 #. Translators: Menu item Verb/Signal/Sense/Check
-#: ../objects/FS/function.c:1047
+#: objects/FS/function.c:1042
 msgid "Check"
 msgstr "æ ¸å¯¹"
 
 #. Translators: Menu item Verb/Signal/Sense/Verify
-#: ../objects/FS/function.c:1051
+#: objects/FS/function.c:1046
 msgid "Verify"
 msgstr "æ ¡éªŒ"
 
 #. Translators: Menu item Verb/Signal/Indicate
 #. Translators: Menu item Verb/Signal/Indicate/Indicate
-#: ../objects/FS/function.c:1053 ../objects/FS/function.c:1055
+#: objects/FS/function.c:1048 objects/FS/function.c:1050
 msgid "Indicate"
 msgstr "指示"
 
 #. Translators: Menu item Verb/Signal/Indicate/Mark
-#: ../objects/FS/function.c:1057
+#: objects/FS/function.c:1052
 msgid "Mark"
 msgstr "æ ‡è®°"
 
 #. Translators: Menu item Verb/Signal/Display
-#: ../objects/FS/function.c:1059 ../sheets/Flowchart.sheet.in.h:7
+#: objects/FS/function.c:1054 sheets/Flowchart.sheet:19
 msgid "Display"
 msgstr "显示"
 
 #. Translators: Menu item Verb/Signal/Measure
 #. Translators: Menu item Verb/Signal/Measure/Measure
-#: ../objects/FS/function.c:1061 ../objects/FS/function.c:1063
+#: objects/FS/function.c:1056 objects/FS/function.c:1058
 msgid "Measure"
 msgstr "测量"
 
 #. Translators: Menu item Verb/Signal/Measure/Calculate
-#: ../objects/FS/function.c:1065
+#: objects/FS/function.c:1060
 msgid "Calculate"
 msgstr "计算"
 
 #. Translators: Menu item Verb/Signal/Represent
-#: ../objects/FS/function.c:1067
+#: objects/FS/function.c:1062
 msgid "Represent"
 msgstr "描绘"
 
 #. Translators: Menu item Noun
-#: ../objects/FS/function.c:1069
+#: objects/FS/function.c:1064
 msgid "Noun"
 msgstr "名词"
 
 #. Translators: Menu item Noun/Material/Solid
-#: ../objects/FS/function.c:1073
+#: objects/FS/function.c:1068
 msgid "Solid"
 msgstr "实心"
 
 #. Translators: Menu item Noun/Material/Liquid
-#: ../objects/FS/function.c:1075
+#: objects/FS/function.c:1070
 msgid "Liquid"
 msgstr "液体"
 
 #. Translators: Menu item Noun/Material/Gas
-#: ../objects/FS/function.c:1077
+#: objects/FS/function.c:1072
 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:1079 ../objects/FS/function.c:1081
-#: ../objects/FS/function.c:1165
+#: objects/FS/function.c:1074 objects/FS/function.c:1076
+#: objects/FS/function.c:1160
 msgid "Human"
 msgstr "人"
 
 #. Translators: Menu item Noun/Material/Human/Hand
-#: ../objects/FS/function.c:1083
+#: objects/FS/function.c:1078
 msgid "Hand"
 msgstr "手"
 
 #. Translators: Menu item Noun/Material/Human/Foot
-#: ../objects/FS/function.c:1085
+#: objects/FS/function.c:1080
 msgid "Foot"
 msgstr "è„š"
 
 #. Translators: Menu item Noun/Material/Human/Head
-#: ../objects/FS/function.c:1087
+#: objects/FS/function.c:1082
 msgid "Head"
 msgstr "头"
 
 #. Translators: Menu item Noun/Material/Human/Finger
-#: ../objects/FS/function.c:1089
+#: objects/FS/function.c:1084
 msgid "Finger"
 msgstr "手指"
 
 #. Translators: Menu item Noun/Material/Human/Toe
-#: ../objects/FS/function.c:1091
+#: objects/FS/function.c:1086
 msgid "Toe"
 msgstr "脚趾"
 
 #. Translators: Menu item Noun/Material/Biological
-#: ../objects/FS/function.c:1093
+#: objects/FS/function.c:1088
 msgid "Biological"
 msgstr "生物"
 
 #. Translators: Menu item Noun/Energy/Mechanical
-#: ../objects/FS/function.c:1097
+#: objects/FS/function.c:1092
 msgid "Mechanical"
 msgstr "机械"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Mech. Energy
-#: ../objects/FS/function.c:1099
+#: objects/FS/function.c:1094
 msgid "Mech. Energy"
 msgstr "机械能"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translation
-#: ../objects/FS/function.c:1101
+#: objects/FS/function.c:1096
 msgid "Translation"
 msgstr "平动"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Force
-#: ../objects/FS/function.c:1103
+#: objects/FS/function.c:1098
 msgid "Force"
 msgstr "力"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotation
-#: ../objects/FS/function.c:1105 ../objects/standard/outline.c:104
+#: objects/FS/function.c:1100 objects/standard/box.c:150
+#: objects/standard/ellipse.c:139 objects/standard/outline.c:99
 msgid "Rotation"
 msgstr "旋转"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Torque
-#: ../objects/FS/function.c:1107
+#: objects/FS/function.c:1102
 msgid "Torque"
 msgstr "扭矩"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Random Motion
-#: ../objects/FS/function.c:1109
+#: objects/FS/function.c:1104
 msgid "Random Motion"
 msgstr "随机运动"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Vibration
-#: ../objects/FS/function.c:1111
+#: objects/FS/function.c:1106
 msgid "Vibration"
 msgstr "振动"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Rotational Energy
-#: ../objects/FS/function.c:1113
+#: objects/FS/function.c:1108
 msgid "Rotational Energy"
 msgstr "转动能"
 
 #. Translators: Menu item Noun/Energy/Mechanical/Translational Energy
-#: ../objects/FS/function.c:1115
+#: objects/FS/function.c:1110
 msgid "Translational Energy"
 msgstr "平动能"
 
 #. Translators: Menu item Noun/Energy/Electricity
-#: ../objects/FS/function.c:1117
+#: objects/FS/function.c:1112
 msgid "Electrical"
 msgstr "电"
 
 #. Translators: Menu item Noun/Energy/Electricity/Electricity
-#: ../objects/FS/function.c:1119
+#: objects/FS/function.c:1114
 msgid "Electricity"
 msgstr "电力"
 
 #. Translators: Menu item Noun/Energy/Electricity/Voltage
-#: ../objects/FS/function.c:1121
+#: objects/FS/function.c:1116
 msgid "Voltage"
 msgstr "电压"
 
 #. Translators: Menu item Noun/Energy/Electricity/Current
-#: ../objects/FS/function.c:1123
+#: objects/FS/function.c:1118
 msgid "Current"
 msgstr "电流"
 
 #. Translators: Menu item Noun/Energy/Hydraulic
-#: ../objects/FS/function.c:1125
+#: objects/FS/function.c:1120
 msgid "Hydraulic"
 msgstr "水压"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Pressure
-#: ../objects/FS/function.c:1127
+#: objects/FS/function.c:1122
 msgid "Pressure"
 msgstr "压力"
 
 #. Translators: Menu item Noun/Energy/Hydraulic/Volumetric Flow
-#: ../objects/FS/function.c:1129
+#: objects/FS/function.c:1124
 msgid "Volumetric Flow"
 msgstr "容积流量"
 
 #. Translators: Menu item Noun/Energy/Thermal
-#: ../objects/FS/function.c:1131
+#: objects/FS/function.c:1126
 msgid "Thermal"
 msgstr "热能"
 
 #. Translators: Menu item Noun/Energy/Thermal/Heat
-#: ../objects/FS/function.c:1133
+#: objects/FS/function.c:1128
 msgid "Heat"
 msgstr "热"
 
 #. Translators: Menu item Noun/Energy/Thermal/Conduction
-#: ../objects/FS/function.c:1135
+#: objects/FS/function.c:1130
 msgid "Conduction"
 msgstr "çƒ­ä¼ å¯¼"
 
 #. Translators: Menu item Noun/Energy/Thermal/Convection
-#: ../objects/FS/function.c:1137
+#: objects/FS/function.c:1132
 msgid "Convection"
 msgstr "热对流"
 
 #. Translators: Menu item Noun/Energy/Thermal/Radiation
 #. Translators: Menu item Noun/Energy/Radioactive/Radiation
-#: ../objects/FS/function.c:1139 ../objects/FS/function.c:1147
+#: objects/FS/function.c:1134 objects/FS/function.c:1142
 msgid "Radiation"
 msgstr "热辐射"
 
 #. Translators: Menu item Noun/Energy/Pneumatic
-#: ../objects/FS/function.c:1141
+#: objects/FS/function.c:1136
 msgid "Pneumatic"
 msgstr "风能"
 
 #. Translators: Menu item Noun/Energy/Chemical
-#: ../objects/FS/function.c:1143
+#: objects/FS/function.c:1138
 msgid "Chemical"
 msgstr "化学能"
 
 #. Translators: Menu item Noun/Energy/Radioactive
-#: ../objects/FS/function.c:1145
+#: objects/FS/function.c:1140
 msgid "Radioactive"
 msgstr "辐射"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Microwaves
-#: ../objects/FS/function.c:1149
+#: objects/FS/function.c:1144
 msgid "Microwaves"
 msgstr "微波"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Radio waves
-#: ../objects/FS/function.c:1151
+#: objects/FS/function.c:1146
 msgid "Radio waves"
 msgstr "æ— çº¿ç”µæ³¢"
 
 #. Translators: Menu item Noun/Energy/Radioactive/X-Rays
-#: ../objects/FS/function.c:1153
+#: objects/FS/function.c:1148
 msgid "X-Rays"
 msgstr "X 射线"
 
 #. Translators: Menu item Noun/Energy/Radioactive/Gamma Rays
-#: ../objects/FS/function.c:1155
+#: objects/FS/function.c:1150
 msgid "Gamma Rays"
 msgstr "伽玛射线"
 
 #. Translators: Menu item Noun/Energy/Acoustic Energy
-#: ../objects/FS/function.c:1157
+#: objects/FS/function.c:1152
 msgid "Acoustic Energy"
 msgstr "声能"
 
 #. Translators: Menu item Noun/Energy/Optical Energy
-#: ../objects/FS/function.c:1159
+#: objects/FS/function.c:1154
 msgid "Optical Energy"
 msgstr "光能"
 
 #. Translators: Menu item Noun/Energy/Solar Energy
-#: ../objects/FS/function.c:1161
+#: objects/FS/function.c:1156
 msgid "Solar Energy"
 msgstr "太阳能"
 
 #. Translators: Menu item Noun/Energy/Magnetic Energy
-#: ../objects/FS/function.c:1163
+#: objects/FS/function.c:1158
 msgid "Magnetic Energy"
 msgstr "磁能"
 
 #. Translators: Menu item Noun/Energy/Human/Human Motion
-#: ../objects/FS/function.c:1167
+#: objects/FS/function.c:1162
 msgid "Human Motion"
 msgstr "人类运动"
 
 #. Translators: Menu item Noun/Energy/Human/Human Force
-#: ../objects/FS/function.c:1169
+#: objects/FS/function.c:1164
 msgid "Human Force"
 msgstr "人力"
 
 #. Translators: Menu item Noun/Signal/Status
-#: ../objects/FS/function.c:1175
+#: objects/FS/function.c:1170
 msgid "Status"
 msgstr "状态"
 
-#: ../objects/FS/function.c:1179
+#: objects/FS/function.c:1174
 msgid "User/Device Fn"
 msgstr "用户/设备 Fn"
 
-#: ../objects/FS/function.c:1180
+#: objects/FS/function.c:1175
 msgid "Wish Fn"
 msgstr "期望 Fn"
 
-#: ../objects/GRAFCET/action.c:132 ../sheets/SDL.sheet.in.h:11
+#: objects/GRAFCET/action.c:130 sheets/SDL.sheet:31
 msgid "Macro call"
 msgstr "调用宏"
 
-#: ../objects/GRAFCET/action.c:132
+#: objects/GRAFCET/action.c:130
 msgid "This action is a call to a macro-step"
 msgstr "此动作是对一个宏步骤的调用"
 
-#: ../objects/GRAFCET/condition.c:129
+#: objects/GRAFCET/condition.c:137
 msgid "Condition"
 msgstr "条件"
 
-#: ../objects/GRAFCET/condition.c:129
+#: objects/GRAFCET/condition.c:137
 msgid "The boolean equation of the condition"
 msgstr "条件的布尔等式"
 
-#: ../objects/GRAFCET/condition.c:131
+#: objects/GRAFCET/condition.c:139
 msgid "The condition's font"
 msgstr "该条件的字体"
 
-#: ../objects/GRAFCET/condition.c:133
+#: objects/GRAFCET/condition.c:141
 msgid "The condition's font size"
 msgstr "该条件的字体大小"
 
-#: ../objects/GRAFCET/condition.c:136 ../objects/GRAFCET/transition.c:146
+#: objects/GRAFCET/condition.c:144 objects/GRAFCET/transition.c:154
 msgid "Color"
 msgstr "颜色"
 
-#: ../objects/GRAFCET/condition.c:136
+#: objects/GRAFCET/condition.c:144
 msgid "The condition's color"
 msgstr "该条件的颜色"
 
-#: ../objects/GRAFCET/grafcet.c:45
+#: objects/GRAFCET/grafcet.c:44
 msgid "GRAFCET diagram objects"
 msgstr "GRAFCET 图表对象"
 
-#: ../objects/GRAFCET/step.c:146 ../sheets/GRAFCET.sheet.in.h:3
+#: objects/GRAFCET/step.c:153 sheets/GRAFCET.sheet:7
 msgid "Regular step"
 msgstr "æ ‡å‡†æ­¥éª¤"
 
-#: ../objects/GRAFCET/step.c:147 ../sheets/GRAFCET.sheet.in.h:4
+#: objects/GRAFCET/step.c:154 sheets/GRAFCET.sheet:10
 msgid "Initial step"
 msgstr "初始化步骤"
 
-#: ../objects/GRAFCET/step.c:148 ../sheets/GRAFCET.sheet.in.h:5
+#: objects/GRAFCET/step.c:155 sheets/GRAFCET.sheet:14
 msgid "Macro entry step"
 msgstr "宏进入步骤"
 
-#: ../objects/GRAFCET/step.c:149 ../sheets/GRAFCET.sheet.in.h:6
+#: objects/GRAFCET/step.c:156 sheets/GRAFCET.sheet:18
 msgid "Macro exit step"
 msgstr "宏退出步骤"
 
-#: ../objects/GRAFCET/step.c:150 ../sheets/GRAFCET.sheet.in.h:7
+#: objects/GRAFCET/step.c:157 sheets/GRAFCET.sheet:22
 msgid "Macro call step"
 msgstr "宏调用步骤"
 
-#: ../objects/GRAFCET/step.c:151
+#: objects/GRAFCET/step.c:158
 msgid "Subprogram call step"
 msgstr "子程序调用步骤"
 
-#: ../objects/GRAFCET/step.c:158
+#: objects/GRAFCET/step.c:167
 msgid "Step name"
 msgstr "步骤名称"
 
-#: ../objects/GRAFCET/step.c:158
+#: objects/GRAFCET/step.c:167
 msgid "The name of the step"
 msgstr "步骤名称"
 
-#: ../objects/GRAFCET/step.c:161
+#: objects/GRAFCET/step.c:170
 msgid "Step type"
 msgstr "步骤类别"
 
-#: ../objects/GRAFCET/step.c:161
+#: objects/GRAFCET/step.c:170
 msgid "The kind of step"
 msgstr "步骤类型"
 
-#: ../objects/GRAFCET/step.c:163
+#: objects/GRAFCET/step.c:172
 msgid "Active"
 msgstr "活动的"
 
-#: ../objects/GRAFCET/step.c:163
+#: objects/GRAFCET/step.c:172
 msgid "Shows a red dot to figure the step's activity"
 msgstr "画一个红点来描绘步骤的活动"
 
-#: ../objects/GRAFCET/transition.c:139
+#: objects/GRAFCET/transition.c:147
 msgid "Receptivity"
 msgstr "接受度"
 
-#: ../objects/GRAFCET/transition.c:139
+#: objects/GRAFCET/transition.c:147
 msgid "The boolean equation of the receptivity"
 msgstr "接受度的布尔方程式"
 
-#: ../objects/GRAFCET/transition.c:141
+#: objects/GRAFCET/transition.c:149
 msgid "The receptivity's font"
 msgstr "接受度的字体"
 
-#: ../objects/GRAFCET/transition.c:143
+#: objects/GRAFCET/transition.c:151
 msgid "The receptivity's font size"
 msgstr "接受度的字体大小"
 
-#: ../objects/GRAFCET/transition.c:146
+#: objects/GRAFCET/transition.c:154
 msgid "The receptivity's color"
 msgstr "接受度的颜色"
 
-#: ../objects/GRAFCET/transition.c:147
+#: objects/GRAFCET/transition.c:155
 msgid "North point"
 msgstr "北点"
 
-#: ../objects/GRAFCET/transition.c:148
+#: objects/GRAFCET/transition.c:156
 msgid "South point"
 msgstr "南点"
 
-#: ../objects/GRAFCET/vector.c:126
+#: objects/GRAFCET/vector.c:124
 msgid "Draw arrow heads on upward arcs:"
-msgstr "在向上的弧线上绘制箭头"
+msgstr "在向上的弧线上绘制箭头:"
 
-#: ../objects/GRAFCET/vergent.c:120
+#: objects/GRAFCET/vergent.c:127
 msgid "OR"
 msgstr "或"
 
-#: ../objects/GRAFCET/vergent.c:121
+#: objects/GRAFCET/vergent.c:128
 msgid "AND"
 msgstr "与"
 
-#: ../objects/GRAFCET/vergent.c:132
+#: objects/GRAFCET/vergent.c:140
 msgid "Vergent type:"
 msgstr "Vergent 种类："
 
-#: ../objects/GRAFCET/vergent.c:403 ../objects/Istar/other.c:466
-#: ../objects/Jackson/domain.c:528 ../objects/KAOS/goal.c:569
-#: ../objects/KAOS/other.c:520 ../objects/SADT/box.c:447
-#: ../objects/standard/line.c:318
+#: objects/GRAFCET/vergent.c:458 objects/Istar/other.c:461
+#: objects/Jackson/domain.c:524 objects/KAOS/goal.c:566
+#: objects/KAOS/other.c:512 objects/SADT/box.c:439 objects/standard/line.c:316
 msgid "Add connection point"
 msgstr "æ·»åŠ è¿žæŽ¥ç‚¹"
 
-#: ../objects/GRAFCET/vergent.c:404 ../objects/Istar/other.c:467
-#: ../objects/Jackson/domain.c:529 ../objects/KAOS/goal.c:570
-#: ../objects/KAOS/other.c:521 ../objects/SADT/box.c:448
-#: ../objects/standard/line.c:319
+#: objects/GRAFCET/vergent.c:459 objects/Istar/other.c:462
+#: objects/Jackson/domain.c:525 objects/KAOS/goal.c:567
+#: objects/KAOS/other.c:513 objects/SADT/box.c:440 objects/standard/line.c:317
 msgid "Delete connection point"
 msgstr "åˆ é™¤è¿žæŽ¥ç‚¹"
 
-#: ../objects/GRAFCET/vergent.c:408
+#: objects/GRAFCET/vergent.c:464
 msgid "GRAFCET OR/AND vergent"
 msgstr "GRAFCET 或/与 vergent"
 
-#: ../objects/Istar/actor.c:66 ../objects/Istar/link.c:149
+#: objects/Istar/actor.c:64 objects/Istar/link.c:147
 msgid "Unspecified"
 msgstr "未指定的"
 
-#: ../objects/Istar/actor.c:67 ../objects/KAOS/other.c:73
+#: objects/Istar/actor.c:65 objects/KAOS/other.c:71
 msgid "Agent"
 msgstr "代理"
 
-#: ../objects/Istar/actor.c:69 ../objects/UML/association.c:249
+#: objects/Istar/actor.c:67 objects/UML/association.c:248
 msgid "Role"
-msgstr "角色："
+msgstr "角色"
 
-#: ../objects/Istar/goal.c:74 ../objects/KAOS/goal.c:77
+#: objects/Istar/goal.c:72 objects/KAOS/goal.c:75
 msgid "Softgoal"
 msgstr "è½¯ç›®æ ‡"
 
-#: ../objects/Istar/goal.c:75 ../objects/KAOS/goal.c:78
+#: objects/Istar/goal.c:73 objects/KAOS/goal.c:76
 msgid "Goal"
 msgstr "ç›®æ ‡"
 
-#: ../objects/Istar/goal.c:153 ../objects/Istar/goal.c:154
-#: ../objects/KAOS/goal.c:156 ../objects/KAOS/goal.c:157
+#: objects/Istar/goal.c:151 objects/Istar/goal.c:152 objects/KAOS/goal.c:154
+#: objects/KAOS/goal.c:155
 msgid "Goal Type"
 msgstr "ç›®æ ‡ç±»åž‹"
 
-#: ../objects/Istar/istar.c:46
+#: objects/Istar/istar.c:44
 msgid "Istar diagram"
 msgstr "Istar 图表"
 
-#: ../objects/Istar/link.c:150
+#: objects/Istar/link.c:148
 msgid "Positive contrib"
 msgstr "æ­£ contrib"
 
-#: ../objects/Istar/link.c:151
+#: objects/Istar/link.c:149
 msgid "Negative contrib"
 msgstr "è´Ÿ contrib"
 
-#: ../objects/Istar/link.c:152 ../sheets/UML.sheet.in.h:6
+#: objects/Istar/link.c:150 sheets/UML.sheet:17
 msgid "Dependency"
 msgstr "依赖"
 
-#: ../objects/Istar/link.c:153
+#: objects/Istar/link.c:151
 msgid "Decomposition"
 msgstr "分解"
 
-#: ../objects/Istar/link.c:154
+#: objects/Istar/link.c:152
 msgid "Means-Ends"
 msgstr "Means-Ends"
 
-#: ../objects/Istar/other.c:71
+#: objects/Istar/other.c:69
 msgid "Resource"
 msgstr "资源"
 
-#: ../objects/Istar/other.c:72 ../sheets/BPMN.sheet.in.h:33
+#: objects/Istar/other.c:70 sheets/BPMN.sheet:99
 msgid "Task"
 msgstr "任务"
 
-#: ../objects/Istar/other.c:472
+#: objects/Istar/other.c:467
 msgid "i* other"
 msgstr "i* other"
 
-#: ../objects/Jackson/domain.c:77
+#: objects/Jackson/domain.c:75
 msgid "Given Domain"
 msgstr "给定域"
 
-#: ../objects/Jackson/domain.c:78
+#: objects/Jackson/domain.c:76
 msgid "Designed Domain"
 msgstr "特定域"
 
-#: ../objects/Jackson/domain.c:79
+#: objects/Jackson/domain.c:77
 msgid "Machine Domain"
 msgstr "机器域"
 
-#: ../objects/Jackson/domain.c:95
+#: objects/Jackson/domain.c:92 objects/UML/association.c:219
+#: objects/UML/association.c:225
+msgid "None"
+msgstr "不选"
+
+#: objects/Jackson/domain.c:93
 msgid "Causal"
 msgstr "随意"
 
-#: ../objects/Jackson/domain.c:96
+#: objects/Jackson/domain.c:94
 msgid "Biddable"
 msgstr "顺从"
 
-#: ../objects/Jackson/domain.c:97
+#: objects/Jackson/domain.c:95
 msgid "Lexical"
 msgstr "词汇"
 
-#: ../objects/Jackson/domain.c:175 ../objects/Jackson/domain.c:176
+#: objects/Jackson/domain.c:173 objects/Jackson/domain.c:174
 msgid "Domain Type"
 msgstr "域类型"
 
-#: ../objects/Jackson/domain.c:180
+#: objects/Jackson/domain.c:178
 msgid "Domain Kind"
 msgstr "域种类"
 
-#: ../objects/Jackson/domain.c:181
+#: objects/Jackson/domain.c:179
 msgid "Optional kind which appears in the lower-right corner of the Domain"
 msgstr "出现在域右下角的可选种类"
 
-#: ../objects/Jackson/domain.c:534
+#: objects/Jackson/domain.c:530
 msgid "Jackson domain"
 msgstr "Jackson 域"
 
-#: ../objects/Jackson/jackson.c:47
+#: objects/Jackson/jackson.c:45
 msgid "Jackson diagram"
 msgstr "Jackson 图"
 
-#: ../objects/Jackson/phenomenon.c:135
+#: objects/Jackson/phenomenon.c:133
 msgid "Shared"
 msgstr "共享"
 
-#: ../objects/Jackson/phenomenon.c:136 ../objects/KAOS/goal.c:79
+#: objects/Jackson/phenomenon.c:134 objects/KAOS/goal.c:77
 msgid "Requirement"
 msgstr "要件"
 
 #. 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
+#: objects/Jackson/phenomenon.c:141 objects/UML/message.c:147
+#: objects/UML/message.c:149
 msgid "Message:"
 msgstr "消息："
 
-#: ../objects/KAOS/goal.c:80
+#: objects/KAOS/goal.c:78
 msgid "Assumption"
 msgstr "假设"
 
-#: ../objects/KAOS/goal.c:81
+#: objects/KAOS/goal.c:79
 msgid "Obstacle"
 msgstr "障碍"
 
-#: ../objects/KAOS/goal.c:575
+#: objects/KAOS/goal.c:572
 msgid "KAOS goal"
 msgstr "KAOS ç›®æ ‡"
 
-#: ../objects/KAOS/kaos.c:49
+#: objects/KAOS/kaos.c:47
 msgid "KAOS diagram"
 msgstr "KAOS 图表"
 
-#: ../objects/KAOS/metaandorrel.c:152
+#: objects/KAOS/metaandorrel.c:150
 msgid "AND Refinement"
 msgstr "AND 改进"
 
-#: ../objects/KAOS/metaandorrel.c:153
+#: objects/KAOS/metaandorrel.c:151
 msgid "Complete AND Refinement"
 msgstr "完成 AND 改进"
 
-#: ../objects/KAOS/metaandorrel.c:154
+#: objects/KAOS/metaandorrel.c:152
 msgid "OR Refinement"
 msgstr "OR 改进"
 
-#: ../objects/KAOS/metaandorrel.c:155
+#: objects/KAOS/metaandorrel.c:153
 msgid "Operationalization"
 msgstr "操作化"
 
-#: ../objects/KAOS/metaandorrel.c:162
+#: objects/KAOS/metaandorrel.c:160
 msgid "Text:"
 msgstr "文本:"
 
-#: ../objects/KAOS/metabinrel.c:156
+#: objects/KAOS/metabinrel.c:154
 msgid "Contributes"
 msgstr "贡献"
 
-#: ../objects/KAOS/metabinrel.c:157
+#: objects/KAOS/metabinrel.c:155
 msgid "Obstructs"
 msgstr "阻碍物"
 
-#: ../objects/KAOS/metabinrel.c:158
+#: objects/KAOS/metabinrel.c:156
 msgid "Conflicts"
 msgstr "冲突"
 
-#: ../objects/KAOS/metabinrel.c:159
+#: objects/KAOS/metabinrel.c:157
 msgid "Responsibility"
 msgstr "责任"
 
-#: ../objects/KAOS/metabinrel.c:160
+#: objects/KAOS/metabinrel.c:158
 msgid "Monitors"
 msgstr "监视器"
 
-#: ../objects/KAOS/metabinrel.c:161
+#: objects/KAOS/metabinrel.c:159
 msgid "Controls"
 msgstr "控制"
 
-#: ../objects/KAOS/metabinrel.c:162
+#: objects/KAOS/metabinrel.c:160
 msgid "CapableOf"
 msgstr "能够"
 
-#: ../objects/KAOS/metabinrel.c:163
+#: objects/KAOS/metabinrel.c:161
 msgid "Performs"
 msgstr "执行"
 
-#: ../objects/KAOS/metabinrel.c:165
+#: objects/KAOS/metabinrel.c:163
 msgid "Output"
 msgstr "输出"
 
-#: ../objects/KAOS/other.c:526
+#: objects/KAOS/other.c:518
 msgid "KAOS other"
 msgstr "KAOS 其它"
 
-#: ../objects/Misc/analog_clock.c:136
+#: objects/Misc/analog_clock.c:134
 msgid "Arrow color"
 msgstr "时针分针颜色"
 
-#: ../objects/Misc/analog_clock.c:138
+#: objects/Misc/analog_clock.c:136
 msgid "Arrow line width"
 msgstr "时针分针线宽"
 
-#: ../objects/Misc/analog_clock.c:140
+#: objects/Misc/analog_clock.c:138
 msgid "Seconds arrow color"
 msgstr "秒针顔色"
 
-#: ../objects/Misc/analog_clock.c:142
+#: objects/Misc/analog_clock.c:140
 msgid "Seconds arrow line width"
 msgstr "秒针线宽"
 
-#: ../objects/Misc/analog_clock.c:144
+#: objects/Misc/analog_clock.c:142
 msgid "Show hours"
 msgstr "显示小时"
 
-#: ../objects/Misc/diagram_as_object.c:112
+#: objects/Misc/diagram_as_object.c:112
 msgid "Diagram file"
 msgstr "图表文件"
 
-#: ../objects/Misc/grid_object.c:137
+#: objects/Misc/grid_object.c:135
 msgid "Rows"
 msgstr "行"
 
-#: ../objects/Misc/grid_object.c:139
+#: objects/Misc/grid_object.c:137
 msgid "Columns"
 msgstr "列"
 
-#: ../objects/Misc/grid_object.c:141
+#: objects/Misc/grid_object.c:139
 msgid "Grid line color"
 msgstr "ç½‘æ ¼çº¿é¢œè‰²"
 
-#: ../objects/Misc/grid_object.c:143
+#: objects/Misc/grid_object.c:141
 msgid "Grid line width"
 msgstr "ç½‘æ ¼çº¿å®½"
 
-#: ../objects/Misc/libmisc.c:42
+#: objects/Misc/libmisc.c:41
 msgid "Miscellaneous objects"
 msgstr "其它对象"
 
-#: ../objects/Misc/measure.c:168
+#: objects/Misc/measure.c:168
+msgctxt "length unit"
 msgid "cm"
 msgstr "厘米"
 
-#: ../objects/Misc/measure.c:169
+#: objects/Misc/measure.c:169
+msgctxt "length unit"
 msgid "dm"
 msgstr "分米"
 
-#: ../objects/Misc/measure.c:170
+#: objects/Misc/measure.c:170
+msgctxt "length unit"
 msgid "ft"
 msgstr "英尺"
 
-#: ../objects/Misc/measure.c:171
+#: objects/Misc/measure.c:171
+msgctxt "length unit"
 msgid "in"
 msgstr "英寸"
 
-#: ../objects/Misc/measure.c:172
+#: objects/Misc/measure.c:172
+msgctxt "length unit"
 msgid "m"
 msgstr "ç±³"
 
-#: ../objects/Misc/measure.c:173
+#: objects/Misc/measure.c:173
+msgctxt "length unit"
 msgid "mm"
 msgstr "毫米"
 
-#: ../objects/Misc/measure.c:174
+#: objects/Misc/measure.c:174
+msgctxt "length unit"
 msgid "pt"
 msgstr "点"
 
-#: ../objects/Misc/measure.c:175
+#: objects/Misc/measure.c:175
+msgctxt "length unit"
 msgid "pi"
-msgstr "倍卡"
+msgstr "pi"
 
 #. PROP_FLAG_VISIBLE|
-#: ../objects/Misc/measure.c:184 ../sheets/ChemEng.sheet.in.h:8
+#: objects/Misc/measure.c:184 sheets/ChemEng.sheet:17
 msgid "Measurement"
 msgstr "测量"
 
-#: ../objects/Misc/measure.c:186
+#: objects/Misc/measure.c:186
 msgid "Unit"
 msgstr "单位"
 
-#: ../objects/Misc/measure.c:187
+#: objects/Misc/measure.c:187
 msgid "Precision"
 msgstr "精度"
 
-#: ../objects/Misc/tree.c:597 ../objects/network/bus.c:605
+#: objects/Misc/n_gon.c:103
+#, fuzzy
+#| msgid "Convey"
+msgid "Convex"
+msgstr "转让"
+
+#: objects/Misc/n_gon.c:104
+msgid "Concave"
+msgstr "凹箭头"
+
+#: objects/Misc/n_gon.c:105
+#, fuzzy
+#| msgid "Cross"
+msgid "Crossing"
+msgstr "十字"
+
+#: objects/Misc/n_gon.c:117
+msgid "N-gon kind"
+msgstr ""
+
+#: objects/Misc/n_gon.c:119
+msgid "Number of rays"
+msgstr "射线数"
+
+#: objects/Misc/n_gon.c:121
+msgid "Density"
+msgstr "密度"
+
+#: objects/Misc/n_gon.c:121
+msgid "Winding number for Crossing"
+msgstr ""
+
+#. no property widget, but still to be serialized
+#: objects/Misc/n_gon.c:124
+msgid "Center position"
+msgstr "中心位置"
+
+#. no property widget, but still to be serialized
+#: objects/Misc/n_gon.c:126
+msgid "Ray length"
+msgstr "射线长度"
+
+#: objects/Misc/n_gon.c:320
+msgid "Triangle"
+msgstr "三角形"
+
+#: objects/Misc/n_gon.c:321 objects/standard/box.c:133
+#: objects/standard/box.c:764
+msgid "Square"
+msgstr "正方形"
+
+#: objects/Misc/n_gon.c:322
+msgid "Pentagon"
+msgstr "五边形"
+
+#: objects/Misc/n_gon.c:322
+msgid "Pentagram"
+msgstr "五角星"
+
+#: objects/Misc/n_gon.c:323
+msgid "Hexagon"
+msgstr "六边形"
+
+#: objects/Misc/n_gon.c:323
+msgid "Hexagram"
+msgstr "六角星"
+
+#: objects/Misc/n_gon.c:324
+msgid "Heptagon"
+msgstr "七边形"
+
+#: objects/Misc/n_gon.c:324
+msgid "Heptagram"
+msgstr "七角星"
+
+#: objects/Misc/n_gon.c:325
+msgid "Octagon"
+msgstr "八边形"
+
+#: objects/Misc/n_gon.c:325
+msgid "Octagram"
+msgstr "八角星"
+
+#: objects/Misc/n_gon.c:326
+msgid "Enneagon"
+msgstr "九边形"
+
+#: objects/Misc/n_gon.c:326
+#, fuzzy
+msgid "Enneagram"
+msgstr "九角星"
+
+#: objects/Misc/n_gon.c:327
+msgid "Decagon"
+msgstr "十边形"
+
+#: objects/Misc/n_gon.c:327
+#, fuzzy
+msgid "Decagram"
+msgstr "十角星"
+
+#: objects/Misc/n_gon.c:328
+msgid "Hendecagon"
+msgstr "十一边形"
+
+#: objects/Misc/n_gon.c:328
+#, fuzzy
+msgid "Hendecagram"
+msgstr "十一角星"
+
+#: objects/Misc/n_gon.c:329
+msgid "Dodecagon"
+msgstr "十二边形"
+
+#: objects/Misc/n_gon.c:329
+#, fuzzy
+msgid "Dodecagram"
+msgstr "十二角星"
+
+#: objects/Misc/n_gon.c:330
+msgid "Tridecagon"
+msgstr "十三边形"
+
+#: objects/Misc/n_gon.c:330
+#, fuzzy
+msgid "Tridecagram"
+msgstr "十三角星"
+
+#: objects/Misc/n_gon.c:331
+msgid "Tetradecagon"
+msgstr "十四边形"
+
+#: objects/Misc/n_gon.c:331
+#, fuzzy
+msgid "Tetradecagram"
+msgstr "十四角星"
+
+#: objects/Misc/n_gon.c:332
+msgid "Pentadecagon"
+msgstr "十五边形"
+
+#: objects/Misc/n_gon.c:332
+#, fuzzy
+msgid "Pentadecagram"
+msgstr "十五角星"
+
+#: objects/Misc/n_gon.c:333
+msgid "Hexadecagon"
+msgstr "十六边形"
+
+#: objects/Misc/n_gon.c:333
+#, fuzzy
+msgid "Hexadecagram"
+msgstr "十六角星"
+
+#: objects/Misc/n_gon.c:334
+msgid "Heptadecagon"
+msgstr "十七边形"
+
+#: objects/Misc/n_gon.c:334
+#, fuzzy
+msgid "Heptadecagram"
+msgstr "十七角星"
+
+#: objects/Misc/n_gon.c:335
+msgid "Octadecagon"
+msgstr "十八边形"
+
+#: objects/Misc/n_gon.c:335
+#, fuzzy
+msgid "Octadecagram"
+msgstr "十八角星"
+
+#: objects/Misc/n_gon.c:336
+msgid "Enneadecagon"
+msgstr "十九边形"
+
+#: objects/Misc/n_gon.c:336
+#, fuzzy
+msgid "Enneadecagram"
+msgstr "十九角星"
+
+#: objects/Misc/n_gon.c:337
+msgid "Icosagon"
+msgstr "二十边形"
+
+#: objects/Misc/n_gon.c:337
+#, fuzzy
+#| msgid "Close Diagram"
+msgid "Icosagram"
+msgstr "关闭图表"
+
+#: objects/Misc/n_gon.c:353
+msgid "N-gon"
+msgstr "N 边形"
+
+#: objects/Misc/n_gon.c:355
+#, fuzzy
+msgid "N-gram"
+msgstr "N 角星"
+
+#: objects/Misc/n_gon.c:357
+msgid "Star"
+msgstr "星形"
+
+#: objects/Misc/tree.c:597 objects/network/bus.c:597
 msgid "Add Handle"
 msgstr "æ·»åŠ æŽ§åˆ¶æŸ„"
 
-#: ../objects/Misc/tree.c:598 ../objects/network/bus.c:606
+#: objects/Misc/tree.c:598 objects/network/bus.c:598
 msgid "Delete Handle"
 msgstr "åˆ é™¤æŽ§åˆ¶æŸ„"
 
-#: ../objects/network/basestation.c:134
+#: objects/network/basestation.c:132
 msgid "Sectors"
 msgstr "扇区"
 
-#: ../objects/network/basestation.c:395 ../objects/network/basestation.c:397
+#: objects/network/basestation.c:387 objects/network/basestation.c:389
 msgid "Base Station"
 msgstr "基站"
 
-#: ../objects/network/network.c:43
+#: objects/network/network.c:38
 msgid "Network diagram objects"
 msgstr "网络图对象"
 
-#: ../objects/network/radiocell.c:119
+#: objects/network/radiocell.c:123
 msgid "Radius"
 msgstr "半径"
 
-#: ../objects/network/wanlink.c:119
+#: objects/network/wanlink.c:119
 msgid "Width"
 msgstr "宽度"
 
-#: ../objects/SADT/arrow.c:136
+#: objects/SADT/arrow.c:134
 msgid "Import resource (not shown upstairs)"
 msgstr "导入资源(不显示上层)"
 
-#: ../objects/SADT/arrow.c:137
+#: objects/SADT/arrow.c:135
 msgid "Imply resource (not shown downstairs)"
 msgstr "导入资源(不显示下层)"
 
-#: ../objects/SADT/arrow.c:138
+#: objects/SADT/arrow.c:136
 msgid "Dotted arrow"
 msgstr "点状箭头"
 
-#: ../objects/SADT/arrow.c:139
+#: objects/SADT/arrow.c:137
 msgid "disable arrow heads"
 msgstr "禁用箭头"
 
-#: ../objects/SADT/arrow.c:146
+#: objects/SADT/arrow.c:144
 msgid "Flow style:"
 msgstr "æµç¨‹æ ·å¼ï¼š"
 
-#: ../objects/SADT/arrow.c:148
+#: objects/SADT/arrow.c:146
 msgid "Automatically gray vertical flows:"
 msgstr "自动化灰阶垂直变化："
 
-#: ../objects/SADT/arrow.c:149
+#: 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:468
+#: objects/SADT/arrow.c:475
 msgid "SADT Arrow"
 msgstr "SADT 箭头"
 
-#: ../objects/SADT/box.c:144
+#: objects/SADT/box.c:142
 msgid "Activity/Data identifier"
 msgstr "活动/æ•°æ®æ ‡è¯†ç¬¦"
 
-#: ../objects/SADT/box.c:145
+#: objects/SADT/box.c:143
 msgid "The identifier which appears in the lower-right corner of the Box"
 msgstr "å‡ºçŽ°åœ¨æ¡†å³ä¸‹è§’çš„æ ‡è¯†ç¬¦"
 
-#: ../objects/SADT/box.c:453
+#: objects/SADT/box.c:445
 msgid "SADT box"
 msgstr "SADT 方块"
 
-#: ../objects/SADT/sadt.c:41
+#: objects/SADT/sadt.c:39
 msgid "SADT diagram objects"
 msgstr "SADT 图表对象"
 
-#: ../objects/standard/arc.c:120
+#: objects/standard/arc.c:119
 msgid "Curve distance"
 msgstr "曲线距离"
 
-#: ../objects/standard/bezier.c:145 ../objects/standard/line.c:126
-#: ../objects/standard/polyline.c:108
+#: objects/standard/bezier.c:143 objects/standard/line.c:123
+#: objects/standard/polyline.c:105
 msgid "Line gaps"
 msgstr "线间距"
 
-#: ../objects/standard/bezier.c:147 ../objects/standard/line.c:128
-#: ../objects/standard/polyline.c:110
+#: objects/standard/bezier.c:145 objects/standard/line.c:125
+#: objects/standard/polyline.c:107
 msgid "Absolute start gap"
 msgstr "绝对起始空白"
 
-#: ../objects/standard/bezier.c:149 ../objects/standard/line.c:130
-#: ../objects/standard/polyline.c:112
+#: objects/standard/bezier.c:147 objects/standard/line.c:127
+#: objects/standard/polyline.c:109
 msgid "Absolute end gap"
 msgstr "绝对末尾空白"
 
-#: ../objects/standard/bezier.c:776 ../objects/standard/beziergon.c:515
+#: objects/standard/bezier.c:766 objects/standard/beziergon.c:520
 msgid "Add Segment"
 msgstr "æ·»åŠ æ®µ"
 
-#: ../objects/standard/bezier.c:777 ../objects/standard/beziergon.c:516
+#: objects/standard/bezier.c:767 objects/standard/beziergon.c:521
 msgid "Delete Segment"
 msgstr "åˆ é™¤æ®µ"
 
-#: ../objects/standard/bezier.c:779 ../objects/standard/beziergon.c:518
+#: objects/standard/bezier.c:769 objects/standard/beziergon.c:523
 msgid "Symmetric control"
 msgstr "并发控制"
 
-#: ../objects/standard/bezier.c:781 ../objects/standard/beziergon.c:520
+#: objects/standard/bezier.c:771 objects/standard/beziergon.c:525
 msgid "Smooth control"
 msgstr "平滑控制"
 
-#: ../objects/standard/bezier.c:783 ../objects/standard/beziergon.c:522
+#: objects/standard/bezier.c:773 objects/standard/beziergon.c:527
 msgid "Cusp control"
 msgstr "尖锐控制"
 
-#: ../objects/standard/box.c:125 ../objects/standard/ellipse.c:117
+#: objects/standard/box.c:131 objects/standard/ellipse.c:123
 msgid "Free"
 msgstr "自由"
 
-#: ../objects/standard/box.c:126 ../objects/standard/ellipse.c:118
+#: objects/standard/box.c:132 objects/standard/ellipse.c:124
 msgid "Fixed"
 msgstr "固定"
 
-#: ../objects/standard/box.c:127 ../objects/standard/box.c:747
-msgid "Square"
-msgstr "正方形"
-
-#: ../objects/standard/box.c:140 ../objects/standard/ellipse.c:130
+#: objects/standard/box.c:147 objects/standard/ellipse.c:136
 msgid "Aspect ratio"
 msgstr "长宽比"
 
-#: ../objects/standard/box.c:743 ../objects/standard/ellipse.c:663
+#: objects/standard/box.c:150 objects/standard/ellipse.c:139
+msgid "Rotation angle"
+msgstr "旋转角度"
+
+#: objects/standard/box.c:760 objects/standard/ellipse.c:763
 msgid "Free aspect"
 msgstr "自由长宽比"
 
-#: ../objects/standard/box.c:745 ../objects/standard/ellipse.c:665
+#: objects/standard/box.c:762 objects/standard/ellipse.c:765
 msgid "Fixed aspect"
 msgstr "固定长宽比"
 
-#: ../objects/standard/ellipse.c:119 ../objects/standard/ellipse.c:667
+#: objects/standard/ellipse.c:125 objects/standard/ellipse.c:767
 msgid "Circle"
 msgstr "圆"
 
-#: ../objects/standard/image.c:118
+#: objects/standard/image.c:122
 msgid "Image file"
 msgstr "图像文件"
 
-#: ../objects/standard/image.c:120
+#: objects/standard/image.c:124
 msgid "Inline data"
 msgstr "内嵌数据"
 
-#: ../objects/standard/image.c:120
+#: objects/standard/image.c:124
 msgid "Store image data in diagram"
 msgstr "在图表中保存图像数据"
 
-#: ../objects/standard/image.c:122
+#: objects/standard/image.c:126
 msgid "Pixbuf"
 msgstr "Pixbuf"
 
-#: ../objects/standard/image.c:122
+#: objects/standard/image.c:126
 msgid "The Pixbuf reference"
 msgstr "Pixbuf 参照"
 
-#: ../objects/standard/image.c:124
+#: objects/standard/image.c:128
 msgid "Draw border"
 msgstr "显示边框"
 
-#: ../objects/standard/image.c:126
+#: objects/standard/image.c:130
 msgid "Keep aspect ratio"
 msgstr "保持长宽比"
 
-#: ../objects/standard/image.c:676
+#: objects/standard/image.c:132
+msgid "Angle"
+msgstr "角度"
+
+#: objects/standard/image.c:262
+msgid "Can't save image without filename"
+msgstr "æ— æ–‡ä»¶åæ— æ³•ä¿å­˜å›¾åƒ"
+
+#: objects/standard/image.c:751
 msgid "Inconsistent pixbuf during image save."
 msgstr "图像保存过程中 pixbuf 不固定。"
 
-#. 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"
-
-#. Didn't find file in current dir.
-#: ../objects/standard/image.c:790 ../objects/standard/image.c:812
+#. Didn't find file in current directory.
+#: objects/standard/image.c:848
 #, c-format
 msgid "The image file '%s' was not found.\n"
 msgstr "未找到名为“%s”的图像文件。\n"
 
-#: ../objects/standard/line.c:117
+#: objects/standard/line.c:114
 msgid "Arrows"
 msgstr "箭头"
 
-#: ../objects/standard/line.c:122
+#: objects/standard/line.c:119
 msgid "Start point"
 msgstr "起始点"
 
-#: ../objects/standard/line.c:124
+#: objects/standard/line.c:121
 msgid "End point"
 msgstr "终止点"
 
-#: ../objects/standard/line.c:320
+#: objects/standard/line.c:318
 msgid "Upgrade to Polyline"
 msgstr "升级为折线"
 
-#: ../objects/standard/line.c:321
+#: objects/standard/line.c:319
 msgid "Upgrade to Zigzagline"
 msgstr "升级为横竖折线"
 
-#: ../objects/standard/outline.c:102
+#: objects/standard/outline.c:97
 msgid "Text content"
 msgstr "文本内容"
 
-#: ../objects/standard/outline.c:104
+#: objects/standard/outline.c:99
 msgid "Angle to rotate the outline"
 msgstr "轮廓字的转动角度"
 
-#: ../objects/standard/polygon.c:459 ../objects/standard/polyline.c:623
+#: objects/standard/polygon.c:484 objects/standard/polyline.c:619
 msgid "Add Corner"
 msgstr "æ·»åŠ æ‹è§’"
 
-#: ../objects/standard/polygon.c:460 ../objects/standard/polyline.c:624
+#: objects/standard/polygon.c:485 objects/standard/polyline.c:620
 msgid "Delete Corner"
 msgstr "åˆ é™¤æ‹è§’"
 
-#: ../objects/standard/standard.c:58
+#: objects/standard/standard.c:56
 msgid "Standard objects"
 msgstr "æ ‡å‡†å¯¹è±¡"
 
-#: ../objects/standard/textobj.c:112
+#: objects/standard/textobj.c:113
+msgid "Bottom"
+msgstr "底部"
+
+#: objects/standard/textobj.c:114
+msgid "Top"
+msgstr "顶部"
+
+#: objects/standard/textobj.c:116
 msgid "First Line"
 msgstr "第一行"
 
-#: ../objects/standard/textobj.c:119
+#: objects/standard/textobj.c:125
 msgid "Vertical text alignment"
 msgstr "垂直对齐文字"
 
-#: ../objects/standard/zigzagline.c:448
+#: objects/standard/textobj.c:130
+msgid "Text angle"
+msgstr "文本角度"
+
+#: objects/standard/textobj.c:135
+msgid "Text margin"
+msgstr "文本边距"
+
+#: objects/standard/zigzagline.c:445
 msgid "Upgrade to Bezierline"
 msgstr "升级为贝塞尔曲线"
 
-#: ../objects/UML/actor.c:351 ../objects/UML/actor.c:353
-#: ../sheets/UML.sheet.in.h:15
+#: objects/UML/actor.c:350 objects/UML/actor.c:352 sheets/UML.sheet:45
 msgid "Actor"
 msgstr "角色"
 
-#: ../objects/UML/association.c:221
+#: objects/UML/association.c:220
 msgid "From A to B"
 msgstr "从 A 到 B"
 
-#: ../objects/UML/association.c:222
+#: objects/UML/association.c:221
 msgid "From B to A"
 msgstr "从 B 到 A"
 
-#: ../objects/UML/association.c:227
+#: objects/UML/association.c:226
 msgid "Aggregation"
 msgstr "聚集"
 
-#: ../objects/UML/association.c:228
+#: objects/UML/association.c:227
 msgid "Composition"
 msgstr "组成"
 
-#: ../objects/UML/association.c:238
+#: objects/UML/association.c:237
 msgid "Direction"
 msgstr "方向"
 
-#: ../objects/UML/association.c:240
+#: objects/UML/association.c:239
 msgid "Show direction"
 msgstr "显示方向"
 
-#: ../objects/UML/association.c:240
+#: objects/UML/association.c:239
 msgid "Show the small arrow denoting the reading direction"
 msgstr "绘制指示阅读方向的小箭头"
 
-#: ../objects/UML/association.c:247
+#: objects/UML/association.c:246
 msgid "Side A"
 msgstr "A 面"
 
-#: ../objects/UML/association.c:251
+#: objects/UML/association.c:250
 msgid "Multiplicity"
 msgstr "多重值"
 
-#: ../objects/UML/association.c:253 ../objects/UML/umlattribute.c:45
-#: ../objects/UML/umloperation.c:71
+#: objects/UML/association.c:252 objects/UML/umlattribute.c:43
+#: objects/UML/umloperation.c:69
 msgid "Visibility"
 msgstr "可见性"
 
-#: ../objects/UML/association.c:255
+#: objects/UML/association.c:254
 msgid "Show arrow"
 msgstr "显示箭头"
 
-#: ../objects/UML/association.c:258
+#: objects/UML/association.c:257
 msgid "Side B"
 msgstr "B 面"
 
 #. Attributes page:
-#: ../objects/UML/class_attributes_dialog.c:455
+#: objects/UML/class_attributes_dialog.c:544
 msgid "_Attributes"
 msgstr "属性(_A)"
 
-#: ../objects/UML/class_attributes_dialog.c:507
+#: objects/UML/class_attributes_dialog.c:598
+msgid "Add Attribute"
+msgstr "æ·»åŠ å±žæ€§"
+
+#: objects/UML/class_attributes_dialog.c:611
+msgid "Remove Attribute"
+msgstr "移除属性"
+
+#: objects/UML/class_attributes_dialog.c:624
+msgid "Move Attribute Up"
+msgstr "上移属性"
+
+#: objects/UML/class_attributes_dialog.c:637
+msgid "Move Attribute Down"
+msgstr "下移属性"
+
+#: objects/UML/class_attributes_dialog.c:649
 msgid "Attribute data"
 msgstr "属性数据"
 
-#: ../objects/UML/class_attributes_dialog.c:539
+#: objects/UML/class_attributes_dialog.c:688
 msgid "Value:"
 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
+#: objects/UML/class_attributes_dialog.c:701 objects/UML/class_dialog.c:368
+#: objects/UML/class_operations_dialog.c:958
+#: objects/UML/class_operations_dialog.c:1309
 msgid "Comment:"
 msgstr "注释："
 
-#: ../objects/UML/class_attributes_dialog.c:572
-#: ../objects/UML/class_operations_dialog.c:811
+#: objects/UML/class_attributes_dialog.c:730
+#: objects/UML/class_operations_dialog.c:908
 msgid "Visibility:"
 msgstr "可见性："
 
-#: ../objects/UML/class_attributes_dialog.c:577
-#: ../objects/UML/class_operations_dialog.c:816 ../objects/UML/uml.c:103
+#: objects/UML/class_attributes_dialog.c:736
+#: objects/UML/class_operations_dialog.c:915 objects/UML/uml.c:101
 msgid "Public"
 msgstr "公有"
 
-#: ../objects/UML/class_attributes_dialog.c:578
-#: ../objects/UML/class_operations_dialog.c:817 ../objects/UML/uml.c:104
+#: objects/UML/class_attributes_dialog.c:737
+#: objects/UML/class_operations_dialog.c:916 objects/UML/uml.c:102
 msgid "Private"
 msgstr "私有"
 
-#: ../objects/UML/class_attributes_dialog.c:579
-#: ../objects/UML/class_operations_dialog.c:818 ../objects/UML/uml.c:105
+#: objects/UML/class_attributes_dialog.c:738
+#: objects/UML/class_operations_dialog.c:917 objects/UML/uml.c:103
 msgid "Protected"
 msgstr "保护"
 
-#: ../objects/UML/class_attributes_dialog.c:580
-#: ../objects/UML/class_operations_dialog.c:819 ../objects/UML/uml.c:106
+#: objects/UML/class_attributes_dialog.c:739
+#: objects/UML/class_operations_dialog.c:918 objects/UML/uml.c:104
 msgid "Implementation"
 msgstr "实现"
 
 #. end: Inheritance type
-#: ../objects/UML/class_attributes_dialog.c:592
-#: ../objects/UML/class_operations_dialog.c:840
+#: objects/UML/class_attributes_dialog.c:750
+#: objects/UML/class_operations_dialog.c:941
 msgid "Class scope"
 msgstr "类作用域"
 
-#: ../objects/UML/class.c:138 ../objects/UML/class.c:349
-#: ../objects/UML/class.c:1845 ../sheets/UML.sheet.in.h:3
+#: objects/UML/class.c:141 objects/UML/class.c:352 objects/UML/class.c:1869
+#: sheets/UML.sheet:7
 msgid "Class"
 msgstr "ç±»"
 
 #. how it used to be before 0.96+SVN
 #. one name, one type: but breaks forward-compatibiliy so kind of reverted
-#: ../objects/UML/class.c:142 ../objects/UML/classicon.c:136
-#: ../objects/UML/classicon.c:138 ../objects/UML/component.c:123
-#: ../objects/UML/large_package.c:133 ../objects/UML/object.c:146
-#: ../objects/UML/small_package.c:125 ../objects/UML/umloperation.c:68
+#: objects/UML/class.c:145 objects/UML/classicon.c:134
+#: objects/UML/classicon.c:136 objects/UML/component.c:127
+#: objects/UML/large_package.c:136 objects/UML/object.c:144
+#: objects/UML/small_package.c:123 objects/UML/umloperation.c:66
 msgid "Stereotype"
 msgstr "定型"
 
-#: ../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/umlattribute.c:48 ../objects/UML/uml.c:111
+#: objects/UML/class.c:152 objects/UML/class.c:208
+#: objects/UML/class_dialog.c:384 objects/UML/class_dialog.c:496
+#: objects/UML/class_operations_dialog.c:933 objects/UML/umlattribute.c:46
+#: objects/UML/uml.c:109
 msgid "Abstract"
 msgstr "抽象"
 
-#: ../objects/UML/class.c:151
+#: objects/UML/class.c:154
 msgid "Visible Attributes"
 msgstr "可见属性"
 
-#: ../objects/UML/class.c:153
+#: objects/UML/class.c:156
 msgid "Visible Operations"
 msgstr "可见操作"
 
-#: ../objects/UML/class.c:155 ../objects/UML/class_dialog.c:384
+#: objects/UML/class.c:158 objects/UML/class_dialog.c:409
 msgid "Wrap Operations"
 msgstr "换行操作"
 
-#: ../objects/UML/class.c:157
+#: objects/UML/class.c:160
 msgid "Visible Comments"
 msgstr "可见注释"
 
-#: ../objects/UML/class.c:161 ../objects/UML/class.c:344
+#: objects/UML/class.c:164 objects/UML/class.c:347
 msgid "Allow resizing"
 msgstr "允许尺寸调整"
 
-#: ../objects/UML/class.c:165 ../objects/UML/class.c:1842
+#: objects/UML/class.c:168 objects/UML/class.c:1866
 msgid "Template"
 msgstr "模板"
 
-#: ../objects/UML/class.c:167 ../objects/UML/class_dialog.c:368
+#: objects/UML/class.c:170 objects/UML/class_dialog.c:393
 msgid "Suppress Attributes"
 msgstr "抑制属性"
 
-#: ../objects/UML/class.c:169
+#: objects/UML/class.c:172
 msgid "Suppress Operations"
 msgstr "抑制操作"
 
-#: ../objects/UML/class.c:171
+#: objects/UML/class.c:174
 msgid "Wrap after char"
 msgstr "此字符后换行"
 
-#: ../objects/UML/class.c:173
+#: objects/UML/class.c:176
 msgid "Comment line length"
 msgstr "注释行长度"
 
 #. umlattribute_extra
-#: ../objects/UML/class.c:186
+#: objects/UML/class.c:189
 msgid "Operations"
 msgstr "操作"
 
 #. umloperations_extra
-#: ../objects/UML/class.c:190
+#: objects/UML/class.c:193
 msgid "Template Parameters"
 msgstr "模板参数"
 
-#: ../objects/UML/class.c:203 ../objects/UML/class_dialog.c:466
+#: objects/UML/class.c:206 objects/UML/class_dialog.c:491
 msgid "Polymorphic"
 msgstr "多态"
 
-#: ../objects/UML/class.c:207 ../objects/UML/class_dialog.c:476
+#: objects/UML/class.c:210 objects/UML/class_dialog.c:501
 msgid "Class Name"
 msgstr "类名"
 
-#: ../objects/UML/class.c:209
+#: objects/UML/class.c:212
 msgid "Abstract Class Name"
 msgstr "抽象类名"
 
 #. Class page:
-#: ../objects/UML/class_dialog.c:320
+#: objects/UML/class_dialog.c:345
 msgid "_Class"
 msgstr "ç±»(_C)"
 
-#: ../objects/UML/class_dialog.c:328
+#: objects/UML/class_dialog.c:353
 msgid "Class name:"
 msgstr "类名："
 
-#: ../objects/UML/class_dialog.c:336
-#: ../objects/UML/class_operations_dialog.c:799
-#: ../objects/UML/dependency.c:134 ../objects/UML/generalization.c:131
-#: ../objects/UML/realizes.c:131
+#: objects/UML/class_dialog.c:361 objects/UML/class_operations_dialog.c:896
+#: objects/UML/dependency.c:132 objects/UML/generalization.c:129
+#: objects/UML/realizes.c:129
 msgid "Stereotype:"
 msgstr "定型："
 
-#: ../objects/UML/class_dialog.c:365
+#: objects/UML/class_dialog.c:390
 msgid "Attributes visible"
 msgstr "属性可见"
 
-#: ../objects/UML/class_dialog.c:374
+#: objects/UML/class_dialog.c:399
 msgid "Operations visible"
 msgstr "操作可见"
 
-#: ../objects/UML/class_dialog.c:377
+#: objects/UML/class_dialog.c:402
 msgid "Suppress operations"
 msgstr "抑制动作"
 
-#: ../objects/UML/class_dialog.c:391
+#: objects/UML/class_dialog.c:416
 msgid "Wrap after this length: "
-msgstr "此长度后换行："
+msgstr "此长度后换行: "
 
-#: ../objects/UML/class_dialog.c:399
+#: objects/UML/class_dialog.c:424
 msgid "Comments visible"
 msgstr "注释可见"
 
-#: ../objects/UML/class_dialog.c:406
+#: objects/UML/class_dialog.c:431
 msgid "Wrap comment after this length: "
-msgstr "此长度后注释换行："
+msgstr "此长度后注释换行: "
 
-#: ../objects/UML/class_dialog.c:413
+#: objects/UML/class_dialog.c:438
 msgid "Show documentation tag"
 msgstr "æ˜¾ç¤ºæ–‡æ¡£æ ‡ç­¾"
 
 #. * Fonts and Colors selection *
-#: ../objects/UML/class_dialog.c:442
+#: objects/UML/class_dialog.c:467
 msgid "_Style"
 msgstr "æ ·å¼(_S)"
 
 #. head line
-#: ../objects/UML/class_dialog.c:452 ../objects/UML/umlparameter.c:51
+#: objects/UML/class_dialog.c:477 objects/UML/umlparameter.c:49
 msgid "Kind"
 msgstr "种类"
 
-#: ../objects/UML/class_dialog.c:457
+#: objects/UML/class_dialog.c:482
 msgid "Size"
 msgstr "尺寸"
 
-#: ../objects/UML/class_dialog.c:481
+#: objects/UML/class_dialog.c:506
 msgid "Abstract Class"
 msgstr "抽象类"
 
 #. should probably be refactored too.
-#: ../objects/UML/class_dialog.c:498
+#: objects/UML/class_dialog.c:523
 msgid "Line Width"
 msgstr "线宽"
 
-#: ../objects/UML/class_dialog.c:507
+#: objects/UML/class_dialog.c:532
 msgid "Text Color"
 msgstr "文本颜色"
 
-#: ../objects/UML/class_dialog.c:516
+#: objects/UML/class_dialog.c:541
 msgid "Foreground Color"
 msgstr "前景色"
 
-#: ../objects/UML/class_dialog.c:525
+#: objects/UML/class_dialog.c:550
 msgid "Background Color"
 msgstr "背景色"
 
-#: ../objects/UML/classicon.c:128
+#: objects/UML/classicon.c:126
 msgid "Boundary"
 msgstr "边界"
 
-#: ../objects/UML/classicon.c:141
+#: objects/UML/classicon.c:139
 msgid "Is object"
 msgstr "是对象"
 
 #. end: Visibility
-#: ../objects/UML/class_operations_dialog.c:827
+#: objects/UML/class_operations_dialog.c:926
 msgid "Inheritance type:"
 msgstr "继承类型："
 
-#: ../objects/UML/class_operations_dialog.c:833 ../objects/UML/uml.c:112
+#: objects/UML/class_operations_dialog.c:934 objects/UML/uml.c:110
 msgid "Polymorphic (virtual)"
 msgstr "多态(virtual)"
 
-#: ../objects/UML/class_operations_dialog.c:834 ../objects/UML/uml.c:113
+#: objects/UML/class_operations_dialog.c:935 objects/UML/uml.c:111
 msgid "Leaf (final)"
 msgstr "叶子(final)"
 
-#: ../objects/UML/class_operations_dialog.c:844
-#: ../objects/UML/umloperation.c:75
+#: objects/UML/class_operations_dialog.c:950 objects/UML/umloperation.c:73
 msgid "Query"
 msgstr "查询"
 
-#: ../objects/UML/class_operations_dialog.c:888
+#: objects/UML/class_operations_dialog.c:1036
 msgid "Parameters:"
 msgstr "参数："
 
-#: ../objects/UML/class_operations_dialog.c:966
+#: objects/UML/class_operations_dialog.c:1089
+msgid "Add Parameter"
+msgstr "æ·»åŠ å‚æ•°"
+
+#: objects/UML/class_operations_dialog.c:1104
+msgid "Remove Parameter"
+msgstr "移除参数"
+
+#: objects/UML/class_operations_dialog.c:1119
+msgid "Move Parameter Up"
+msgstr "上移参数"
+
+#: objects/UML/class_operations_dialog.c:1134
+msgid "Move Parameter Down"
+msgstr "下移参数"
+
+#: objects/UML/class_operations_dialog.c:1264
 msgid "Parameter data"
 msgstr "参数资料"
 
-#: ../objects/UML/class_operations_dialog.c:999
+#: objects/UML/class_operations_dialog.c:1297
 msgid "Def. value:"
 msgstr "定义数值："
 
-#: ../objects/UML/class_operations_dialog.c:1030
+#: objects/UML/class_operations_dialog.c:1331
 msgid "Direction:"
 msgstr "方向："
 
-#: ../objects/UML/class_operations_dialog.c:1035
-#: ../objects/UML/umlparameter.c:34
+#: objects/UML/class_operations_dialog.c:1340 objects/UML/umlparameter.c:32
 msgid "Undefined"
 msgstr "未定义的"
 
-#: ../objects/UML/class_operations_dialog.c:1036
-#: ../objects/UML/umlparameter.c:35
+#: objects/UML/class_operations_dialog.c:1341 objects/UML/umlparameter.c:33
 msgid "In"
 msgstr "输入"
 
-#: ../objects/UML/class_operations_dialog.c:1037
-#: ../objects/UML/umlparameter.c:36
+#: objects/UML/class_operations_dialog.c:1342 objects/UML/umlparameter.c:34
 msgid "Out"
 msgstr "输出"
 
-#: ../objects/UML/class_operations_dialog.c:1038
-#: ../objects/UML/umlparameter.c:37
+#: objects/UML/class_operations_dialog.c:1343 objects/UML/umlparameter.c:35
 msgid "In & Out"
 msgstr "输入输出"
 
 #. Operations page:
-#: ../objects/UML/class_operations_dialog.c:1069
+#: objects/UML/class_operations_dialog.c:1395
 msgid "_Operations"
 msgstr "操作(_O)"
 
-#: ../objects/UML/class_operations_dialog.c:1124
+#: objects/UML/class_operations_dialog.c:1455
+msgid "Add Operation"
+msgstr "æ·»åŠ æ“ä½œ"
+
+#: objects/UML/class_operations_dialog.c:1468
+msgid "Remove Operation"
+msgstr "移除操作"
+
+#: objects/UML/class_operations_dialog.c:1481
+msgid "Move Operation Up"
+msgstr "操作上移"
+
+#: objects/UML/class_operations_dialog.c:1494
+msgid "Move Operation Down"
+msgstr "操作下移"
+
+#: objects/UML/class_operations_dialog.c:1506
 msgid "Operation data"
 msgstr "操作数据"
 
 #. Templates page:
-#: ../objects/UML/class_templates_dialog.c:368
+#: objects/UML/class_templates_dialog.c:392
 msgid "_Templates"
 msgstr "模板(_T)"
 
-#: ../objects/UML/class_templates_dialog.c:374 ../sheets/UML.sheet.in.h:4
+#: objects/UML/class_templates_dialog.c:398 sheets/UML.sheet:10
 msgid "Template class"
 msgstr "模板类"
 
-#: ../objects/UML/class_templates_dialog.c:426
+#: objects/UML/class_templates_dialog.c:450
+msgid "Add Formal Parameter"
+msgstr "æ·»åŠ å½¢å¼å‚æ•°"
+
+#: objects/UML/class_templates_dialog.c:463
+msgid "Remove Formal Parameter"
+msgstr "移除形式参数"
+
+#: objects/UML/class_templates_dialog.c:476
+msgid "Move Formal Parameter Up"
+msgstr "上移形式参数"
+
+#: objects/UML/class_templates_dialog.c:489
+msgid "Move Formal Parameter Down"
+msgstr "下移形式参数"
+
+#: objects/UML/class_templates_dialog.c:502
 msgid "Formal parameter data"
 msgstr "形式参数数据"
 
-#: ../objects/UML/component_feature.c:148 ../sheets/UML.sheet.in.h:21
+#: objects/UML/component_feature.c:146 sheets/UML.sheet:63
 msgid "Facet"
 msgstr "小平面"
 
-#: ../objects/UML/component_feature.c:149 ../sheets/UML.sheet.in.h:22
+#: objects/UML/component_feature.c:147 sheets/UML.sheet:66
 msgid "Receptacle"
 msgstr "容器"
 
-#: ../objects/UML/component_feature.c:150 ../sheets/UML.sheet.in.h:23
+#: objects/UML/component_feature.c:148 sheets/UML.sheet:70
 msgid "Event Source"
 msgstr "事件源"
 
-#: ../objects/UML/component_feature.c:151 ../sheets/UML.sheet.in.h:24
+#: objects/UML/component_feature.c:149 sheets/UML.sheet:74
 msgid "Event Sink"
 msgstr "事件槽"
 
-#: ../objects/UML/constraint.c:126
+#: objects/UML/constraint.c:124
 msgid "Constraint:"
 msgstr "约束："
 
-#: ../objects/UML/dependency.c:136
+#: objects/UML/dependency.c:134
 msgid "Show arrow:"
 msgstr "显示箭头："
 
 #. how it used to be before 0.96+SVN
 #. new name matching "same name, same type"  rule - reverted, forward compatibility seems more important
-#: ../objects/UML/implements.c:127 ../objects/UML/implements.c:129
+#: objects/UML/implements.c:125 objects/UML/implements.c:127
 msgid "Interface:"
 msgstr "接口："
 
-#: ../objects/UML/lifeline.c:164
+#: objects/UML/lifeline.c:162
 msgid "Draw focus of control:"
 msgstr "画控制的焦点："
 
-#: ../objects/UML/lifeline.c:166
+#: objects/UML/lifeline.c:164
 msgid "Draw destruction mark:"
 msgstr "ç”»æ¯åæ ‡è®°ï¼š"
 
-#: ../objects/UML/lifeline.c:534
+#: objects/UML/lifeline.c:529
 msgid "Add connection points"
 msgstr "å¢žåŠ è¿žæŽ¥ç‚¹"
 
-#: ../objects/UML/lifeline.c:535
+#: objects/UML/lifeline.c:530
 msgid "Remove connection points"
 msgstr "åˆ é™¤è¿žæŽ¥ç‚¹"
 
-#: ../objects/UML/lifeline.c:536
+#: objects/UML/lifeline.c:531
 msgid "Increase connection points distance"
 msgstr "增大连接点间距"
 
-#: ../objects/UML/lifeline.c:537
+#: objects/UML/lifeline.c:532
 msgid "Decrease connection points distance"
 msgstr "缩小连接点间距"
 
-#: ../objects/UML/lifeline.c:538
+#: objects/UML/lifeline.c:533
 msgid "Set default connection points distance"
 msgstr "设置默认连接点间距"
 
-#: ../objects/UML/lifeline.c:542
+#: objects/UML/lifeline.c:537
 msgid "UML Lifeline"
 msgstr "UML生命线"
 
-#: ../objects/UML/message.c:136
+#: objects/UML/message.c:134
 msgid "Call"
 msgstr "联络"
 
-#: ../objects/UML/message.c:137
+#: objects/UML/message.c:135
 msgid "Create"
 msgstr "创建"
 
-#: ../objects/UML/message.c:138
+#: objects/UML/message.c:136
 msgid "Destroy"
 msgstr "销毁"
 
-#: ../objects/UML/message.c:139
+#: objects/UML/message.c:137
 msgid "Simple"
 msgstr "简单"
 
-#: ../objects/UML/message.c:140
+#: objects/UML/message.c:138
 msgid "Return"
 msgstr "返回"
 
-#: ../objects/UML/message.c:141
+#: objects/UML/message.c:139
 msgid "Send"
 msgstr "发送"
 
-#: ../objects/UML/message.c:142
+#: objects/UML/message.c:140
 msgid "Recursive"
 msgstr "递归"
 
-#: ../objects/UML/message.c:153
+#: objects/UML/message.c:151
 msgid "Message type:"
 msgstr "消息类型："
 
-#: ../objects/UML/object.c:148
+#: objects/UML/object.c:146
 msgid "Explicit state"
 msgstr "明确的状态"
 
-#: ../objects/UML/object.c:153
+#: objects/UML/object.c:151
 msgid "Active object"
 msgstr "活动的对象"
 
-#: ../objects/UML/object.c:155
+#: objects/UML/object.c:153
 msgid "Show attributes"
 msgstr "显示属性"
 
-#: ../objects/UML/object.c:157
+#: objects/UML/object.c:155
 msgid "Multiple instance"
 msgstr "多实例"
 
-#: ../objects/UML/state.c:147
+#: objects/UML/state.c:145
 msgid "Entry action"
 msgstr "进入动作"
 
-#: ../objects/UML/state.c:148
+#: objects/UML/state.c:146
 msgid "Do action"
 msgstr "执行动作"
 
-#: ../objects/UML/state.c:149
+#: objects/UML/state.c:147
 msgid "Exit action"
 msgstr "退出动作"
 
 #. Would like to create a state_term instead, but making the connections
 #. * is a pain
-#: ../objects/UML/state.c:486
+#: objects/UML/state.c:487
 msgid ""
 "This diagram uses the State object for initial/final states.\n"
 "This option will go away in future versions.\n"
@@ -5640,163 +6385,115 @@ msgstr ""
 "未来的 Dia 版本将去掉该选项。\n"
 "请使用初始/最终状态对象来取代它。\n"
 
-#: ../objects/UML/state_term.c:125
+#: objects/UML/state_term.c:120
 msgid "Is final"
 msgstr "是最终的"
 
-#: ../objects/UML/transition.c:141
+#: objects/UML/transition.c:139
 msgid "Trigger"
 msgstr "触发"
 
-#: ../objects/UML/transition.c:142
+#: objects/UML/transition.c:140
 msgid "The event that causes this transition to be taken"
 msgstr "é€ æˆæ­¤è½¬æ¢çš„äº‹ä»¶"
 
-#: ../objects/UML/transition.c:143
+#: objects/UML/transition.c:141
 msgid "Action"
 msgstr "动作"
 
-#: ../objects/UML/transition.c:144
+#: objects/UML/transition.c:142
 msgid "Action to perform when this transition is taken"
 msgstr "当产生此转换时要进行的动作"
 
-#: ../objects/UML/transition.c:145 ../sheets/cisconetwork.sheet.in.h:22
+#: objects/UML/transition.c:143 sheets/cisconetwork.sheet:27
 msgid "Guard"
 msgstr "防护"
 
-#: ../objects/UML/transition.c:146
+#: objects/UML/transition.c:144
 msgid "Condition for taking this transition when the event is fired"
 msgstr "当事件触发的情况下采取转变"
 
-#: ../objects/UML/umlattribute.c:50 ../objects/UML/umloperation.c:77
+#: objects/UML/umlattribute.c:48 objects/UML/umloperation.c:75
 msgid "Scope"
 msgstr "作用域"
 
-#: ../objects/UML/umlattribute.c:50
+#: objects/UML/umlattribute.c:48
 msgid "Class scope (C++ static class variable)"
 msgstr "类作用域(C++ 静态 类变量)"
 
-#: ../objects/UML/uml.c:67
+#: objects/UML/uml.c:65
 msgid "Unified Modelling Language diagram objects UML 1.3"
 msgstr "统一建模语言图表对象 UML 1.3"
 
-#: ../objects/UML/umloperation.c:73
+#: objects/UML/umloperation.c:71
 msgid "Inheritance"
 msgstr "继承"
 
-#: ../objects/UML/umloperation.c:75
+#: objects/UML/umloperation.c:73
 msgid "C++ const method"
 msgstr "C++ const 方法"
 
-#: ../objects/UML/umloperation.c:77
+#: objects/UML/umloperation.c:75
 msgid "Class scope (C++ static method)"
 msgstr "类作用域(C++  static 方法)"
 
-#: ../objects/UML/usecase.c:130
+#: objects/UML/usecase.c:128
 msgid "Collaboration"
 msgstr "合作"
 
-#: ../objects/UML/usecase.c:132
+#: objects/UML/usecase.c:130
 msgid "Text outside"
 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。"
-
-#: ../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"
-"请选择另外一个名字用于保存。\n"
-
-#: ../plug-ins/cairo/diacairo.c:305 ../plug-ins/cairo/diacairo.c:321
-#, c-format
-msgid "Can't write %d bytes to %s"
-msgstr "æ— æ³•å‘ %2$s 中写入 %1$d 字节"
-
-#: ../plug-ins/cairo/diacairo.c:334
-msgid "Clipboard copy failed"
-msgstr "剪切板复制失败"
-
-#: ../plug-ins/cairo/diacairo.c:362 ../plug-ins/postscript/postscript.c:39
-#: ../plug-ins/wmf/wmf.cpp:1504
-msgid "Nothing to print"
-msgstr "没有可打印的东西"
-
-#: ../plug-ins/cairo/diacairo.c:379
+#: plug-ins/cairo/diacairo.c:65
 msgid "Cairo PostScript"
 msgstr "Cairo PostScript"
 
-#: ../plug-ins/cairo/diacairo.c:390
+#: plug-ins/cairo/diacairo.c:76
 msgid "Cairo Portable Document Format"
 msgstr "Cairo PDF (å¯ç§»æ¤æ–‡æ¡£æ ¼å¼)"
 
-#: ../plug-ins/cairo/diacairo.c:402
+#: plug-ins/cairo/diacairo.c:87
 msgid "Cairo Scalable Vector Graphics"
 msgstr "Cairo SVG (可缩放矢量图形)"
 
-#: ../plug-ins/cairo/diacairo.c:414
+#: plug-ins/cairo/diacairo.c:98
 msgid "CairoScript"
 msgstr "CairoScript"
 
-#: ../plug-ins/cairo/diacairo.c:425
+#: plug-ins/cairo/diacairo.c:109
 msgid "Cairo PNG"
 msgstr "Cairo PNG"
 
-#: ../plug-ins/cairo/diacairo.c:433
+#: plug-ins/cairo/diacairo.c:117
 msgid "Cairo PNG (with alpha)"
 msgstr "Cairo PNG (含 alpha 通道)"
 
-#: ../plug-ins/cairo/diacairo.c:443
+#: plug-ins/cairo/diacairo.c:127
 msgid "Cairo EMF"
 msgstr "Cairo EMF"
 
-#: ../plug-ins/cairo/diacairo.c:453
+#: plug-ins/cairo/diacairo.c:137
 msgid "Cairo WMF"
 msgstr "Cairo WMF"
 
-#: ../plug-ins/cairo/diacairo.c:467
+#: plug-ins/cairo/diacairo.c:151
 msgid "Cairo Clipboard Copy"
 msgstr "Cairo 剪切板复制"
 
-#: ../plug-ins/cairo/diacairo.c:481
+#: plug-ins/cairo/diacairo.c:165
 msgid "Copy _Diagram"
 msgstr "复制图表(_D)"
 
-#: ../plug-ins/cairo/diacairo.c:490
+#: plug-ins/cairo/diacairo.c:174
 msgid "Print (GTK) …"
 msgstr "打印(GTK) …"
 
-#: ../plug-ins/cairo/diacairo.c:539
+#: plug-ins/cairo/diacairo.c:219
 msgid "Cairo-based Rendering"
 msgstr "基于 Cairo 的渲染"
 
-#: ../plug-ins/cairo/diacairo-interactive.c:408
-#: ../plug-ins/cairo/diacairo-interactive.c:409
-msgid "Zoom pointer"
-msgstr "缩放指针"
-
-#: ../plug-ins/cairo/diacairo-interactive.c:415
-#: ../plug-ins/cairo/diacairo-interactive.c:416
-msgid "Visible rect pointer"
-msgstr "可见矩形指针"
-
-#: ../plug-ins/cairo/diacairo-renderer.c:868
-#: ../plug-ins/cairo/diacairo-renderer.c:903 ../plug-ins/cgm/cgm.c:1126
-#: ../plug-ins/libart/dialibartrenderer.c:1325
-#: ../plug-ins/metapost/render_metapost.c:1108
-#: ../plug-ins/postscript/diapsrenderer.c:715
-#: ../plug-ins/pstricks/render_pstricks.c:825 ../plug-ins/wpg/wpg.c:892
-msgid "Not enough memory for image drawing."
-msgstr "没有足够的内存进行图像绘制。"
-
-#: ../plug-ins/cgm/cgm.c:1119
+#: plug-ins/cgm/cgm.c:1027
 msgid ""
 "Image row length larger than maximum cell array.\n"
 "Image not exported to CGM."
@@ -5804,95 +6501,93 @@ msgstr ""
 "å½±åƒé«˜åº¦å¤§äºŽæœ€å¤§å‚¨å­˜æ ¼é«˜ã€‚\n"
 "影像未导出至 CGM。"
 
-#: ../plug-ins/cgm/cgm.c:1383
+#: plug-ins/cgm/cgm.c:1351
 msgid "Computer Graphics Metafile"
 msgstr "计算机图形文件 (CGM)"
 
-#: ../plug-ins/cgm/cgm.c:1408
+#: plug-ins/cgm/cgm.c:1376
 msgid "Computer Graphics Metafile export filter"
 msgstr "计算机图形文件 (CGM) 输出过滤器"
 
-#: ../plug-ins/drs/dia-render-script.c:158
-#: ../plug-ins/drs/dia-render-script.c:163
+#: plug-ins/drs/dia-render-script.c:165 plug-ins/drs/dia-render-script.c:170
 msgid "DiaRenderScript"
 msgstr "DiaRenderScript"
 
-#: ../plug-ins/drs/dia-render-script.c:187
+#: plug-ins/drs/dia-render-script.c:194
 msgid "DiaRenderScript filter"
 msgstr "DiaRenderScript 过滤器"
 
-#: ../plug-ins/drs/dia-render-script-import.c:224
+#: plug-ins/drs/dia-render-script-import.c:480
 msgid "Broken file?"
 msgstr "文件损坏？"
 
-#: ../plug-ins/dxf/dxf.c:50
+#: plug-ins/dxf/dxf.c:50
 msgid "Drawing Interchange File import and export filters"
 msgstr "制图交换文件 (DIF) 导入/导出过滤器"
 
-#: ../plug-ins/dxf/dxf-export.c:655 ../plug-ins/dxf/dxf-import.c:1389
+#: plug-ins/dxf/dxf-export.c:635 plug-ins/dxf/dxf-import.c:1393
 msgid "Drawing Interchange File"
 msgstr "制图交换文件 (DIF)"
 
-#: ../plug-ins/dxf/dxf-import.c:1299
+#: plug-ins/dxf/dxf-import.c:1303
 #, c-format
 msgid "read_dxf_codes failed on '%s'"
 msgstr "文件“%s” read_dxf_codes 失败"
 
-#: ../plug-ins/dxf/dxf-import.c:1306
+#: plug-ins/dxf/dxf-import.c:1310
 #, c-format
 msgid "Binary DXF from '%s' not supported"
 msgstr "不支持来自“%s”的二进制的 DXF"
 
-#: ../plug-ins/hpgl/hpgl.c:753
+#: plug-ins/hpgl/hpgl.c:773
 msgid "HP Graphics Language"
 msgstr "HP 图形语言(HPGL)"
 
-#: ../plug-ins/hpgl/hpgl.c:778
+#: plug-ins/hpgl/hpgl.c:798
 msgid "HP Graphics Language export filter"
 msgstr "HP 图形语言(HPGL)导出过滤器"
 
-#: ../plug-ins/layout/layout.cpp:228
-#, fuzzy
+#: plug-ins/layout/layout.cpp:235
 msgid "Please select edges and nodes to layout."
 msgstr "请选择要布局的边和节点。"
 
-#: ../plug-ins/layout/layout.cpp:233
+#: plug-ins/layout/layout.cpp:240
 msgid "Graph creation failed"
 msgstr "Graph 创建失败"
 
-#: ../plug-ins/layout/layout.cpp:259
+#: plug-ins/layout/layout.cpp:266
 msgid "No such module."
 msgstr "æ²¡æœ‰è¿™æ ·çš„æ¨¡å—ã€‚"
 
-#: ../plug-ins/layout/layout.cpp:260
+#: plug-ins/layout/layout.cpp:267
 msgid "Out of memory."
 msgstr "内存不足。"
 
-#: ../plug-ins/layout/layout.cpp:261
+#: plug-ins/layout/layout.cpp:268
 msgid "Not a tree."
 msgstr "ä¸æ˜¯æ ‘ã€‚"
 
-#: ../plug-ins/layout/layout.cpp:262
+#: plug-ins/layout/layout.cpp:269
 msgid "Not a forest."
 msgstr "不是森林。"
 
-#: ../plug-ins/layout/layout.cpp:263
+#: plug-ins/layout/layout.cpp:270
 msgid "Failed algorithm."
 msgstr "算法失败。"
 
-#: ../plug-ins/layout/layout.cpp:264
+#: plug-ins/layout/layout.cpp:271
 msgid "Failed precondition."
 msgstr "预准备失败。"
 
-#: ../plug-ins/layout/layout.cpp:265
+#: plug-ins/layout/layout.cpp:272
 msgid "OGDF crashed."
-msgstr "OGDF 已崩溃"
+msgstr "OGDF 已崩溃。"
 
-#: ../plug-ins/layout/layout.cpp:266
+#: plug-ins/layout/layout.cpp:273
 msgid "Unknown reason"
 msgstr "æœªçŸ¥åŽŸå› "
 
-#: ../plug-ins/layout/layout.cpp:268
+#: plug-ins/layout/layout.cpp:275
 #, c-format
 msgid ""
 "Layout '%s' failed.\n"
@@ -5901,79 +6596,59 @@ msgstr ""
 "布局“%s”失败。\n"
 "%s"
 
-#: ../plug-ins/layout/layout.cpp:409
-msgid "OGDF Layout Algorithms"
-msgstr "OGDF 布局算法"
-
-#: ../plug-ins/libart/dialibart.c:58
-msgid "Libart-based rendering"
-msgstr "基于 Libart 的渲染"
-
-#: ../plug-ins/libart/dialibartrenderer.c:1476
-msgid "Renderer transformation"
-msgstr "渲染器变换"
-
-#: ../plug-ins/libart/dialibartrenderer.c:1477
-msgid "Transform pointer"
-msgstr "变换指针"
-
-#: ../plug-ins/libart/export_png.c:159 ../plug-ins/xslt/xslt.c:104
-#, c-format
-msgid "Can't open output file %s: %s\n"
-msgstr "æ— æ³•æ‰“å¼€è¾“å…¥æ–‡ä»¶ %s：%s\n"
-
-#: ../plug-ins/libart/export_png.c:167
-msgid "Could not create PNG write structure"
-msgstr "æ— æ³•åˆ›å»º PNG 写入结构"
-
-#: ../plug-ins/libart/export_png.c:176
-msgid "Could not create PNG header info structure"
-msgstr "æ— æ³•åˆ›å»º PNG 头信息结构"
-
-#: ../plug-ins/libart/export_png.c:184
-msgid "Error occurred while writing PNG"
-msgstr "写入 PNG 时发生错误"
+#. Quick 'n Nasty hack to mark strings as translatable
+#: plug-ins/layout/layout.cpp:398
+msgid "Grow"
+msgstr ""
 
-#. Create a dialog
-#: ../plug-ins/libart/export_png.c:328
-msgid "PNG Export Options"
-msgstr "PNG 导出选项"
+#: plug-ins/layout/layout.cpp:399
+msgid "Shrink"
+msgstr "收缩"
 
-#: ../plug-ins/libart/export_png.c:334
-msgid "Image width:"
-msgstr "图像宽度："
+#: plug-ins/layout/layout.cpp:400
+msgid "Heighten"
+msgstr "提高"
 
-#: ../plug-ins/libart/export_png.c:337
-msgid "Image height:"
-msgstr "图像高度："
+#: plug-ins/layout/layout.cpp:401
+msgid "Widen"
+msgstr ""
 
-#
-#: ../plug-ins/libart/export_png.c:383
-msgid "PNG (antialiased)"
-msgstr "PNG(反锯齿)"
+#: plug-ins/layout/layout.cpp:428
+msgid "OGDF Layout Algorithms"
+msgstr "OGDF 布局算法"
 
-#: ../plug-ins/metapost/metapost.c:46
+#: plug-ins/metapost/metapost.c:46
 msgid "TeX Metapost export filter"
 msgstr "TeX Metapost 导出过滤器"
 
-#: ../plug-ins/metapost/render_metapost.c:1267
+#: plug-ins/metapost/render_metapost.c:876
+#: plug-ins/postscript/diapsrenderer.c:667
+#: plug-ins/pstricks/render_pstricks.c:868 plug-ins/wpg/wpg.c:905
+msgid "Not enough memory for image drawing."
+msgstr "没有足够的内存进行图像绘制。"
+
+#: plug-ins/metapost/render_metapost.c:1162
 msgid "TeX Metapost macros"
 msgstr "TeX Metapost 宏"
 
-#: ../plug-ins/pdf/pdf.c:30
+#: plug-ins/pdf/pdf.c:30
+msgid "PDF import not available."
+msgstr "PDF 导入不可用。"
+
+#: plug-ins/pdf/pdf.c:39
 msgid "Portable Document File"
 msgstr "PDF 文件"
 
-#: ../plug-ins/pdf/pdf.c:44
+#: plug-ins/pdf/pdf.c:57
 msgid "PDF import filter"
 msgstr "PDF 导入过滤器"
 
-#: ../plug-ins/pdf/pdf-import.cpp:311
+#: plug-ins/pdf/pdf-import.cpp:408
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 页"
 
-#: ../plug-ins/pdf/pdf-import.cpp:706
+#: plug-ins/pdf/pdf-import.cpp:869
 #, c-format
 msgid ""
 "PDF document not OK.\n"
@@ -5982,38 +6657,38 @@ msgstr ""
 "PDF 文档未就绪。\n"
 "%s"
 
-#: ../plug-ins/pgf/pgf.c:26
+#: 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
+#: plug-ins/pgf/render_pgf.c:1159 plug-ins/pstricks/render_pstricks.c:769
 msgid "Not valid UTF-8"
 msgstr "不是有效的 UTF-8"
 
-#: ../plug-ins/pgf/render_pgf.c:1271
+#: plug-ins/pgf/render_pgf.c:1324
 msgid "LaTeX PGF macros"
 msgstr "LaTeX PGF 宏"
 
-#: ../plug-ins/pixbuf/pixbuf.c:86
-#, fuzzy
+#: plug-ins/pixbuf/pixbuf.c:106
 msgid "Failed to create pixbuf from drawable."
-msgstr "从可绘画对象创建 pixbuf 失败。"
+msgstr "从可绘画创建 pixbuf 失败。"
 
-#: ../plug-ins/pixbuf/pixbuf.c:91
+#: plug-ins/pixbuf/pixbuf.c:111
 #, c-format
 msgid ""
 "Could not save file:\n"
+"%s\n"
 "%s"
 msgstr ""
 "æ— æ³•ä¿å­˜æ–‡ä»¶:\n"
+"%s\n"
 "%s"
 
-#: ../plug-ins/pixbuf/pixbuf.c:112
+#: plug-ins/pixbuf/pixbuf.c:132
 msgid "Calling error, missing user_data."
 msgstr "调用错误，缺少 user_data。"
 
-#: ../plug-ins/pixbuf/pixbuf.c:141
+#: plug-ins/pixbuf/pixbuf.c:161
 #, c-format
 msgid ""
 "Pixbuf[%s] can't load:\n"
@@ -6022,101 +6697,320 @@ msgstr ""
 "Pixbuf[%s] æ— æ³•åŠ è½½ï¼š\n"
 "%s"
 
-#: ../plug-ins/pixbuf/pixbuf.c:196
-msgid "gdk-pixbuf-based bitmap export/import"
-msgstr "基于 gdk-pixbuf 的点阵图导入/导出过滤器"
+#: plug-ins/pixbuf/pixbuf.c:216
+msgid "gdk-pixbuf-based bitmap export/import"
+msgstr "基于 gdk-pixbuf 的点阵图导入/导出过滤器"
+
+#: plug-ins/postscript/paginate_psprint.c:272
+msgid "Select Printer"
+msgstr "选择打印机"
+
+#: plug-ins/postscript/paginate_psprint.c:284 sheets/ciscocomputer.sheet:43
+msgid "Printer"
+msgstr "打印机"
+
+#: plug-ins/postscript/paginate_psprint.c:298 sheets/Misc.sheet:13
+msgid "File"
+msgstr "文件"
+
+#: plug-ins/postscript/paginate_psprint.c:455
+#, c-format
+msgid "Could not run command '%s': %s"
+msgstr "æ— æ³•è¿è¡Œå‘½ä»¤â€œ%s”：%s"
+
+#: plug-ins/postscript/paginate_psprint.c:458
+#, c-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "æ— æ³•æ‰“å¼€â€œ%s”来写入：%s"
+
+#: plug-ins/postscript/paginate_psprint.c:480
+#, c-format
+msgid "Printing error: command '%s' returned %d\n"
+msgstr "打印错误：命令“%s”返回 %d\n"
+
+#: plug-ins/postscript/paginate_psprint.c:491
+#, c-format
+msgid "Printing error: command '%s' caused sigpipe."
+msgstr "打印错误：命令“%s”导致 sigpipe。"
+
+#: plug-ins/postscript/postscript.c:47
+msgid "Print (PS)"
+msgstr "打印(PS)"
+
+#: plug-ins/postscript/postscript.c:78
+msgid "PostScript Rendering"
+msgstr "PostScript 渲染"
+
+#: plug-ins/postscript/render_eps.c:149
+msgid "Encapsulated PostScript (using PS Latin-1 fonts)"
+msgstr "内嵌的 PostScript(使用 PS Latin-1 字体)"
+
+#: plug-ins/pstricks/pstricks.c:26
+msgid "TeX PSTricks export filter"
+msgstr "TeX PStricks 导出过滤器"
+
+#: plug-ins/pstricks/render_pstricks.c:1029
+msgid "TeX PSTricks macros"
+msgstr "TeX PSTricks 宏"
+
+#: plug-ins/python/pydia-render.c:1070
+#, c-format
+msgid "Couldn't open '%s' for writing.\n"
+msgstr "æ— æ³•ä»¥å†™æ–¹å¼æ‰“å¼€ï¼šâ€œ%s”。\n"
+
+#: plug-ins/python/python.c:93
+msgid "Python scripting support"
+msgstr "Python 脚本支持"
+
+#: plug-ins/python/allprops.py:132
+msgid "All Object _Properties"
+msgstr "所有对象属性(_P)"
+
+#: plug-ins/python/allsheets.py:85
+msgid "Dia _Sheets Inspection"
+msgstr ""
+
+#
+#: plug-ins/python/aobjects.py:102
+msgid "All _Objects"
+msgstr "所有对象(_O)"
+
+#
+#. #
+#. \file arrange.py \brief Arrange Objects Plugin
+#.
+#. this module is loaded by some other plug-ins but can also work on it's own
+#. if it is loaded first as Dia plug-in and later as Python module everything works
+#. fine due to Pythoninitializing the module only once
+#.
+#. \ingroup PyDia
+#: plug-ins/python/arrange.py:127
+msgid "Arrange _Objects"
+msgstr "排列对象(_O)"
+
+#: plug-ins/python/autolayoutforce.py:126
+msgid "_Layout (force)"
+msgstr ""
+
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/codegen.py:711
+msgid "PyDia Code Generation (Python)"
+msgstr ""
+
+#: plug-ins/python/codegen.py:712
+msgid "PyDia Code Generation (C++)"
+msgstr ""
+
+#: plug-ins/python/codegen.py:713
+msgid "PyDia Code Generation (Pascal)"
+msgstr ""
+
+#: plug-ins/python/codegen.py:714
+msgid "PyDia Code Generation (Java)"
+msgstr ""
+
+#: plug-ins/python/codegen.py:715
+msgid "PyDia Code Generation (JavaScript)"
+msgstr ""
+
+#: plug-ins/python/codegen.py:716
+msgid "PyDia Code Generation (PHP)"
+msgstr ""
+
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/debug_objects.py:30
+msgid "Dia _BoundingBox Debugger"
+msgstr "Dia  BoundingBox 调试器(_B)"
+
+#: plug-ins/python/debug_objects.py:34
+msgid "Dia _Property API Debugger"
+msgstr "Dia 属性 API 调试器(_P)"
+
+#: plug-ins/python/dia_rotate.py:31
+msgid "Rotate counter-clockwise"
+msgstr "逆时针旋转"
+
+#: plug-ins/python/dia_rotate.py:47
+msgid "Rotation around (0,0). Rotation angle in degrees:"
+msgstr "围绕 (0,0) 旋转。旋转角度："
+
+#: plug-ins/python/dia_rotate.py:126
+msgid "Simple _Rotation"
+msgstr "简单旋转"
+
+#. XXX: check image, e.g. existing file name
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/diadissect.py:167
+#, fuzzy
+#| msgid "Dissipate"
+msgid "Dissect"
+msgstr "淡化"
+
+#. dia.register_import("Cpp via GCC_XML", "cpp", ImportCpp)
+#: plug-ins/python/diagx.py:405
+msgid "XML from GCC_XML"
+msgstr "来自 GCC_XML 的 XML"
+
+#. register the renderer
+#: plug-ins/python/diastddia.py:361
+msgid "Dia plain"
+msgstr ""
+
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/diasvg_import.py:731 plug-ins/python/diasvg.py:267
+msgid "SVG plain"
+msgstr ""
+
+#: plug-ins/python/diasvg_import.py:732 plug-ins/python/diasvg.py:268
+msgid "SVG compressed"
+msgstr "SVG 压缩"
+
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/dot.py:92
+msgid "PyDia DOT Export"
+msgstr ""
+
+#: plug-ins/python/dot2dia.py:282
+msgid "Graphviz Dot"
+msgstr "Graphviz 点"
+
+#: plug-ins/python/doxrev.py:488
+msgid "Dox2UML"
+msgstr "Dox2UML"
+
+#: plug-ins/python/doxrev.py:489
+msgid "Dox2UML (multiple)"
+msgstr "Dox2UML (多个)"
+
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/export-object.py:45
+msgid "PyDia Object Export"
+msgstr "PyDia 对象导出"
+
+#. # \brief Register the renderer with Dia's export system
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/export-render.py:119
+msgid "PyDia Render Export"
+msgstr "PyDia 渲染导出"
+
+#: plug-ins/python/group_props.py:45
+msgid "Group Properties"
+msgstr "组属性"
+
+#: plug-ins/python/group_props.py:88
+msgid ""
+"The selected objects don't share any\n"
+" properties to change at once."
+msgstr ""
+
+#: plug-ins/python/group_props.py:183
+msgid "Dia _Group Properties"
+msgstr "Dia 组属性(_G)"
+
+#: plug-ins/python/gtkcons.py:344
+msgid "Python Dia Console"
+msgstr "Python Dia 控制台"
 
-#: ../plug-ins/postscript/paginate_psprint.c:273
-msgid "Select Printer"
-msgstr "选择打印机"
+#: plug-ins/python/gtkcons.py:346
+msgid "_Python Console"
+msgstr "Python 控制台(_P)"
 
-#: ../plug-ins/postscript/paginate_psprint.c:285
-#: ../sheets/ciscocomputer.sheet.in.h:37
-msgid "Printer"
-msgstr "打印机"
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/imgmap.py:80
+msgid "Imagemap"
+msgstr "å›¾åƒæ˜ å°„"
 
-#: ../plug-ins/postscript/paginate_psprint.c:299 ../sheets/Misc.sheet.in.h:5
-msgid "File"
-msgstr "文件"
+#: plug-ins/python/mark-cps.py:72
+msgid "_Mark Connection Points"
+msgstr "æ ‡è®°è¿žæŽ¥ç‚¹(_M)"
 
-#: ../plug-ins/postscript/paginate_psprint.c:464
-#, c-format
-msgid "Could not run command '%s': %s"
-msgstr "æ— æ³•è¿è¡Œå‘½ä»¤â€œ%s”：%s"
+#: plug-ins/python/otypes.py:185
+msgid "Dia Object _Types"
+msgstr "Dia 对象类型(_T)"
 
-#: ../plug-ins/postscript/paginate_psprint.c:467
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "æ— æ³•æ‰“å¼€â€œ%s”来写入：%s"
+#: plug-ins/python/pydiadoc.py:264
+msgid "PyDia _HTML Docs"
+msgstr "PyDia HTML 文档(_H)"
 
-#: ../plug-ins/postscript/paginate_psprint.c:489
-#, c-format
-msgid "Printing error: command '%s' returned %d\n"
-msgstr "打印错误：命令“%s”返回 %d\n"
+#: plug-ins/python/pydiadoc.py:267
+msgid "PyDia _Docs"
+msgstr "PyDia 文档(_D)"
 
-#: ../plug-ins/postscript/paginate_psprint.c:500
-#, c-format
-msgid "Printing error: command '%s' caused sigpipe."
-msgstr "打印错误：命令“%s”导致 sigpipe。"
+#: plug-ins/python/pydiadoc.py:270
+msgid "PyDia Docs _Update"
+msgstr "PyDia 文档更新(_U)"
 
-#: ../plug-ins/postscript/postscript.c:47
-msgid "Print (PS)"
-msgstr "打印(PS)"
+#: plug-ins/python/scascale.py:38
+msgid "Simple Scaling"
+msgstr "简单缩放"
 
-#: ../plug-ins/postscript/postscript.c:82
-msgid "PostScript Rendering"
-msgstr "PostScript 渲染"
+#: plug-ins/python/scascale.py:152
+msgid "Simple _Scaling"
+msgstr "简单缩放(_S)"
 
-#: ../plug-ins/postscript/render_eps.c:168
-msgid "Encapsulated PostScript (using Pango fonts)"
-msgstr "内嵌的 PostScript (使用 Pango 字体)"
+#: plug-ins/python/select_by.py:38
+msgid "Select by name"
+msgstr "按名称选择"
 
-#: ../plug-ins/postscript/render_eps.c:177
-msgid "Encapsulated PostScript with preview (using Pango fonts)"
-msgstr "带预览的内嵌 PostScript (使用 Pango 字体) "
+#: plug-ins/python/select_by.py:54
+msgid "Enter name"
+msgstr "输入名称"
 
-#: ../plug-ins/postscript/render_eps.c:187
-msgid "Encapsulated PostScript (using PostScript Latin-1 fonts)"
-msgstr "内嵌的 PostScript(使用 PostScript Latin-1 字体)"
+#: plug-ins/python/select_by.py:146
+msgid "_Name"
+msgstr "名称(_N)"
 
-#: ../plug-ins/pstricks/pstricks.c:26
-msgid "TeX PSTricks export filter"
-msgstr "TeX PStricks 导出过滤器"
+#: plug-ins/python/select_by.py:149
+msgid "_Fill Color"
+msgstr "填充颜色(_F)"
 
-#: ../plug-ins/pstricks/render_pstricks.c:990
-msgid "TeX PSTricks macros"
-msgstr "TeX PSTricks 宏"
+#: plug-ins/python/select_by.py:152
+msgid "_Line Color"
+msgstr "线条颜色(_L)"
 
-#: ../plug-ins/python/pydia-render.c:1115
-#, c-format
-msgid "Couldn't open '%s' for writing.\n"
-msgstr "æ— æ³•ä»¥å†™æ–¹å¼æ‰“å¼€ï¼šâ€œ%s”。\n"
+#: plug-ins/python/select_by.py:155
+msgid "_Text Color"
+msgstr "文本颜色(_T)"
 
-#: ../plug-ins/python/python.c:95
-msgid "Python scripting support"
-msgstr "Python 脚本支持"
+#: plug-ins/python/select_by.py:158
+msgid "_Size"
+msgstr "尺寸(_S)"
+
+#: plug-ins/python/select_empty.py:31
+msgid "_Empty"
+msgstr "清空(_E)"
+
+#. dia-python keeps a reference to the renderer class and uses it on demand
+#: plug-ins/python/uninline_data.py:52
+msgid "Uninline Images"
+msgstr ""
 
-#: ../plug-ins/shape/shape.c:36
+#: plug-ins/shape/shape.c:36
 msgid "Dia shape export filter"
 msgstr "Dia 形状导出过滤器"
 
-#: ../plug-ins/shape/shape-export.c:525
+#: plug-ins/shape/shape-export.c:622
 msgid "Shape files must end in .shape, or they cannot be loaded by Dia"
 msgstr "形状文件必须以 .shape ä½œä¸ºæ‰©å±•åï¼Œå¦åˆ™æ— æ³•è¢« Dia 载入"
 
-#: ../plug-ins/shape/shape-export.c:539
+#: plug-ins/shape/shape-export.c:632
 msgid "Can't export PNG icon without export plugin!"
 msgstr "缺少导出插件不能导出 PNG å›¾æ ‡ï¼"
 
-#: ../plug-ins/shape/shape-export.c:565
+#: plug-ins/shape/shape-export.c:658
 msgid "Dia Shape File"
 msgstr "Dia 形状文件"
 
-#: ../plug-ins/svg/svg.c:50
+#: plug-ins/svg/svg.c:60
 msgid "Scalable Vector Graphics import and export filters"
 msgstr "可缩放矢量图(SVG)导入/导出过滤器"
 
-#: ../plug-ins/svg/svg-import.c:427
+#: plug-ins/svg/svg-import.c:221
+#, c-format
+msgid "Failed to apply transformation for '%s'"
+msgstr "æ— æ³•ä¸º '%s' 应用转变"
+
+#: plug-ins/svg/svg-import.c:658
 msgid ""
 "Invalid path data.\n"
 "svg:path data must start with moveto."
@@ -6124,16 +7018,16 @@ msgstr ""
 "è·¯å¾„æ•°æ®æ— æ•ˆã€‚\n"
 "svg:path 数据须以 moveto 开始。"
 
-#: ../plug-ins/svg/svg-import.c:1274
+#: plug-ins/svg/svg-import.c:1908
 msgid "'Shape Design' shapes missing."
 msgstr "“形状设计”形状缺失。"
 
-#: ../plug-ins/svg/svg-import.c:1308
+#: plug-ins/svg/svg-import.c:1942
 #, c-format
 msgid "Object '%s' creation failed"
 msgstr "创建对象 “%s”失败"
 
-#: ../plug-ins/svg/svg-import.c:1330
+#: plug-ins/svg/svg-import.c:1968
 #, c-format
 msgid ""
 "Parse error for memory block.\n"
@@ -6142,84 +7036,105 @@ msgstr ""
 "存储块解析出错。\n"
 "%s"
 
-#: ../plug-ins/svg/svg-import.c:1343 ../plug-ins/vdx/vdx-import.c:2887
+#: plug-ins/svg/svg-import.c:1986
+#, c-format
+msgid ""
+"SVG parser error for %s\n"
+"%s"
+msgstr ""
+"SVG 解析错误 %s\n"
+"%s"
+
+#. just a warning
+#: plug-ins/svg/svg-import.c:1992
 #, c-format
-msgid "Parse error for %s"
-msgstr "%s 解析错误"
+msgid ""
+"SVG parser warning for %s\n"
+"%s"
+msgstr ""
 
-#: ../plug-ins/svg/svg-import.c:1376
-msgid "Expected SVG Namespace not found in file"
+#: plug-ins/svg/svg-import.c:2025
+msgid "Expected SVG name-space not found in file"
 msgstr "文件中找不到预期的 SVG 命名空间"
 
-#: ../plug-ins/svg/svg-import.c:1396
+#: plug-ins/svg/svg-import.c:2045
 #, c-format
 msgid "root element was '%s' -- expecting 'svg'."
 msgstr "æ ¹å…ƒç´ ä¸ºâ€œ%s” - 应当是“svg”。"
 
-#: ../plug-ins/vdx/vdx.c:54
+#: plug-ins/vdx/vdx.c:54
 msgid "Visio XML Format import and export filter"
 msgstr "Visio XML æ ¼å¼å¯¼å…¥å’Œå¯¼å‡ºè¿‡æ»¤å™¨"
 
-#: ../plug-ins/vdx/vdx-export.c:1857
+#: plug-ins/vdx/vdx-export.c:1823
 #, c-format
 msgid "Saving file '%s' failed."
 msgstr "保存文件“%s”失败。"
 
-#: ../plug-ins/vdx/vdx-export.c:1868
+#: plug-ins/vdx/vdx-export.c:1834
 msgid "Visio XML format"
 msgstr "Visio XML æ ¼å¼"
 
-#: ../plug-ins/vdx/vdx-import.c:222
+#: plug-ins/vdx/vdx-import.c:221
 #, c-format
 msgid "Couldn't read color: %s"
 msgstr "æ— æ³•è¯»é¢œè‰²ï¼š%s"
 
-#: ../plug-ins/vdx/vdx-import.c:536
+#: plug-ins/vdx/vdx-import.c:535
 #, c-format
 msgid "Couldn't find shape %d"
 msgstr "æ— æ³•æ‰¾åˆ°å½¢çŠ¶ %d"
 
-#: ../plug-ins/vdx/vdx-import.c:1011
+#: plug-ins/vdx/vdx-import.c:1065
 #, c-format
 msgid "Unexpected Ellipse object: %s"
 msgstr "不应有的椭圆对象：%s"
 
-#: ../plug-ins/vdx/vdx-import.c:1025
+#: plug-ins/vdx/vdx-import.c:1079
 msgid "Can't rotate ellipse"
 msgstr "æ— æ³•æ—‹è½¬æ¤­åœ†"
 
-#: ../plug-ins/vdx/vdx-import.c:1356
+#: plug-ins/vdx/vdx-import.c:1410
 msgid "MoveTo not at start of Bezier"
 msgstr "MoveTo 没有在 Bezier 开始"
 
-#: ../plug-ins/vdx/vdx-import.c:1706
+#: plug-ins/vdx/vdx-import.c:1760
 msgid "Invalid NURBS formula"
 msgstr "非法的 NURBS 公式"
 
-#: ../plug-ins/vdx/vdx-import.c:1964
+#: plug-ins/vdx/vdx-import.c:2019
 #, c-format
 msgid "Couldn't handle foreign object type %s"
 msgstr "不能处理外来的对象类型 %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2898
+#: plug-ins/vdx/vdx-import.c:2946
+#, c-format
+msgid ""
+"VDX parser error for %s\n"
+"%s"
+msgstr ""
+"VDX 解析错误 %s\n"
+"%s"
+
+#: plug-ins/vdx/vdx-import.c:2958
 msgid "Nothing in document!"
 msgstr "æ–‡æ¡£æ— å†…å®¹ï¼"
 
-#: ../plug-ins/vdx/vdx-import.c:2903
+#: plug-ins/vdx/vdx-import.c:2963
 #, c-format
 msgid "Expecting VisioDocument, got %s"
 msgstr "应为 VisioDocument，却得到 %s"
 
-#: ../plug-ins/vdx/vdx-import.c:2987
+#: plug-ins/vdx/vdx-import.c:3047
 msgid "Visio XML File Format"
 msgstr "Visio XML æ–‡ä»¶æ ¼å¼"
 
-#: ../plug-ins/vdx/vdx-xml.c:3343
+#: plug-ins/vdx/vdx-xml.c:3344
 #, c-format
 msgid "Can't decode object %s"
 msgstr "æ— æ³•è§£ç å¯¹è±¡ %s"
 
-#: ../plug-ins/wmf/wmf.cpp:316
+#: plug-ins/wmf/wmf.cpp:332
 #, c-format
 msgid ""
 "Couldn't write file %s\n"
@@ -6228,7 +7143,7 @@ msgstr ""
 "不能写入文件 %s\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:567
+#: plug-ins/wmf/wmf.cpp:575
 #, c-format
 msgid ""
 "Cannot render unknown font:\n"
@@ -6237,232 +7152,250 @@ msgstr ""
 "æ— æ³•æ¸²æŸ“æœªçŸ¥å­—ä½“ï¼š\n"
 "%s"
 
-#: ../plug-ins/wmf/wmf.cpp:1515
+#: plug-ins/wmf/wmf.cpp:1556
 msgid "Print (GDI) ..."
 msgstr "打印(GDI) ..."
 
-#: ../plug-ins/wmf/wmf.cpp:1531
+#: plug-ins/wmf/wmf.cpp:1572
 msgid "WMF export filter"
 msgstr "WMF 导出过滤器"
 
-#: ../plug-ins/wpg/wpg.c:1198
+#: plug-ins/wpg/wpg.c:1182 plug-ins/wpg/wpg.c:1188
+msgid "WordPerfect Graphics"
+msgstr "WordPerfect 图形"
+
+#: plug-ins/wpg/wpg.c:1213
+msgid "WordPerfect Graphics export filter"
+msgstr "WordPerfect 图形导出过滤器"
+
+#: plug-ins/wpg/wpg-import.c:512
 #, c-format
 msgid "File: %s type/version unsupported.\n"
 msgstr "文件：%s 类型/版本不支持。\n"
 
-#: ../plug-ins/wpg/wpg.c:1328 ../plug-ins/wpg/wpg.c:1335
-msgid "WPG"
-msgstr "WPG"
+#: plug-ins/wpg/wpg-import.c:654
+#, c-format
+msgid "Unknown WPG type %d size %d."
+msgstr "未知的 WPG 类型 %d 大小 %d."
 
-#: ../plug-ins/wpg/wpg.c:1363
-msgid "WordPerfect Graphics export filter"
-msgstr "WordPerfect 图形导出过滤器"
+#: plug-ins/wpg/wpg-import.c:659
+#, c-format
+msgid "Size 0 on WPG type %d, expecting WPG_END\n"
+msgstr "WPG 类型 %d 的大小为 0，应为 WPG_END\n"
+
+#: plug-ins/wpg/wpg-import.c:668
+#, c-format
+msgid "Unexpected end of file. WPG type %d, size %d.\n"
+msgstr "意外的文件结束。 WPG 类型 %d, 大小 %d.\n"
+
+#: plug-ins/wpg/wpg-import.c:678
+msgid "Empty WPG file?"
+msgstr "空的 WPG 文件？"
 
-#: ../plug-ins/xfig/xfig.c:52
+#: plug-ins/xfig/xfig.c:52
 msgid "Fig Format import and export filter"
 msgstr "Fig æ ¼å¼å¯¼å…¥å’Œå¯¼å‡ºè¿‡æ»¤å™¨"
 
-#: ../plug-ins/xfig/xfig-export.c:484
+#: plug-ins/xfig/xfig-export.c:558
 #, 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:507
+#: plug-ins/xfig/xfig-export.c:583
 msgid "No more user-definable colors - using black"
 msgstr "没有更多的用户可定义颜色 - 使用黑色"
 
-#: ../plug-ins/xfig/xfig-export.c:1234
+#: plug-ins/xfig/xfig-export.c:1248
 msgid "Xfig format"
 msgstr "Xfig æ ¼å¼"
 
-#: ../plug-ins/xfig/xfig-import.c:109
+#: plug-ins/xfig/xfig-import.c:108
 #, c-format
 msgid "Color index %d too high; only 512 colors allowed. Using black instead."
 msgstr "颜色索引值 %d 太高；只允许 512 色。改为使用黑色。"
 
-#: ../plug-ins/xfig/xfig-import.c:140
+#: plug-ins/xfig/xfig-import.c:139
 msgid "Patterns are not supported by Dia"
 msgstr "Dia 不支持模式"
 
-#: ../plug-ins/xfig/xfig-import.c:168
+#: plug-ins/xfig/xfig-import.c:167
 msgid "Triple-dotted lines are not supported by Dia; using double-dotted"
 msgstr "Dia 不支持三个一组的点的行；使用双点"
 
-#: ../plug-ins/xfig/xfig-import.c:172
+#: plug-ins/xfig/xfig-import.c:171
 #, c-format
 msgid "Line style %d should not appear"
 msgstr "线型 %d 不应该出现"
 
-#: ../plug-ins/xfig/xfig-import.c:244
+#: plug-ins/xfig/xfig-import.c:245
 #, c-format
 msgid "Error while reading %dth of %d points"
 msgstr "读 %2$d 个点中的第 %1$d 个点时出错"
 
-#: ../plug-ins/xfig/xfig-import.c:253
+#: plug-ins/xfig/xfig-import.c:254
 msgid "Unexpected end of file."
 msgstr "意外的文件结束。"
 
-#: ../plug-ins/xfig/xfig-import.c:273
+#: plug-ins/xfig/xfig-import.c:274
 msgid "Error while reading arrowhead"
 msgstr "读箭头时出错"
 
-#: ../plug-ins/xfig/xfig-import.c:295
+#: plug-ins/xfig/xfig-import.c:296
 #, c-format
 msgid "Unknown arrow type %d\n"
 msgstr "未知的箭头类型 %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:387
+#: plug-ins/xfig/xfig-import.c:395
 #, c-format
-msgid "Depth %d of of range, only 0-%d allowed.\n"
+msgid "Depth %d out of range, only 0-%d allowed.\n"
 msgstr "深度值 %d 超出范围，只允许 0-%d。\n"
 
-#: ../plug-ins/xfig/xfig-import.c:435
+#: plug-ins/xfig/xfig-import.c:443
 msgid "Couldn't read ellipse info."
-msgstr "æ— æ³•è¯»æ¤­åœ†ä¿¡æ¯ï¼š%s"
+msgstr "æ— æ³•è¯»æ¤­åœ†ä¿¡æ¯ã€‚"
 
-#: ../plug-ins/xfig/xfig-import.c:504
+#: plug-ins/xfig/xfig-import.c:512
 msgid "Couldn't read polyline info.\n"
 msgstr "æ— æ³•è¯»æŠ˜çº¿ä¿¡æ¯ã€‚\n"
 
-#: ../plug-ins/xfig/xfig-import.c:519
+#: plug-ins/xfig/xfig-import.c:527
 msgid "Couldn't read flipped bit."
 msgstr "æ— æ³•è¯»ç¿»è½¬ä½ã€‚"
 
-#: ../plug-ins/xfig/xfig-import.c:537
+#: plug-ins/xfig/xfig-import.c:545
 msgid "Negative corner radius; negating"
 msgstr "负的角半径; 求反"
 
-#: ../plug-ins/xfig/xfig-import.c:580
+#: plug-ins/xfig/xfig-import.c:588
 #, c-format
 msgid "Unknown polyline subtype: %d\n"
 msgstr "未知的折线子类型：%d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:732 ../plug-ins/xfig/xfig-import.c:764
+#: plug-ins/xfig/xfig-import.c:740 plug-ins/xfig/xfig-import.c:772
 msgid "Couldn't read spline info."
 msgstr "ä¸èƒ½è¯»å–æ ·æ¡æ›²çº¿ä¿¡æ¯ã€‚"
 
 #. Open approximated spline
 #. Closed approximated spline
-#: ../plug-ins/xfig/xfig-import.c:751 ../plug-ins/xfig/xfig-import.c:768
+#: plug-ins/xfig/xfig-import.c:759 plug-ins/xfig/xfig-import.c:776
 msgid "Cannot convert approximated spline yet."
-msgstr "æ— æ³•è½¬æ¢é€¼è¿‘çš„æ ·æ¡æ›²çº¿"
+msgstr "æ— æ³•è½¬æ¢é€¼è¿‘çš„æ ·æ¡æ›²çº¿ã€‚"
 
-#: ../plug-ins/xfig/xfig-import.c:806
+#: plug-ins/xfig/xfig-import.c:814
 #, c-format
 msgid "Unknown spline subtype: %d\n"
 msgstr "æœªçŸ¥çš„æ ·æ¡æ›²çº¿ç±»åž‹ï¼š%d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:871
+#: plug-ins/xfig/xfig-import.c:879
 msgid "Couldn't read arc info."
 msgstr "æ— æ³•è¯»å¼§çš„ä¿¡æ¯ã€‚"
 
 #. set new fill property on arc?
-#: ../plug-ins/xfig/xfig-import.c:899
+#: plug-ins/xfig/xfig-import.c:907
 msgid "Filled arc treated as unfilled"
 msgstr "填充弧按非填充弧处理"
 
-#: ../plug-ins/xfig/xfig-import.c:903
+#: plug-ins/xfig/xfig-import.c:911
 #, c-format
 msgid "Unknown polyline arc: %d\n"
 msgstr "未知的折线子类型：%d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:968
+#: plug-ins/xfig/xfig-import.c:976
 msgid "Couldn't read text info."
 msgstr "æ— æ³•è¯»æ–‡æœ¬ä¿¡æ¯ã€‚"
 
-#: ../plug-ins/xfig/xfig-import.c:996
+#: plug-ins/xfig/xfig-import.c:1004
 #, c-format
 msgid "Can't find LaTeX font nr. %d, using sans"
 msgstr "找不到 LaTeX 字体 nr. %d，将使用 sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1004
+#: plug-ins/xfig/xfig-import.c:1012
 #, c-format
 msgid "Can't find PostScript font nr. %d, using sans"
 msgstr "找不到 PostScript 字体 nr. %d，将使用 sans"
 
-#: ../plug-ins/xfig/xfig-import.c:1032
+#: plug-ins/xfig/xfig-import.c:1040
 msgid "Couldn't identify Fig object."
 msgstr "æ— æ³•è¯†åˆ« FIG 对象。"
 
-#: ../plug-ins/xfig/xfig-import.c:1040
+#: plug-ins/xfig/xfig-import.c:1048
 msgid "Compound end outside compound\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:1070
+msgid "Couldn't read color\n"
+msgstr "æ— æ³•è¯»å–é¢œè‰²\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1064
+#: plug-ins/xfig/xfig-import.c:1075
 #, 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:1111
-msgid "Couldn't read group extend."
-msgstr "不能读组扩展。"
+#: plug-ins/xfig/xfig-import.c:1122
+msgid "Couldn't read group extent."
+msgstr "æ— æ³•è¯»å–ç¾¤ç»„èŒƒå›´ã€‚"
 
-#: ../plug-ins/xfig/xfig-import.c:1122
+#: plug-ins/xfig/xfig-import.c:1133
 #, c-format
 msgid "Unknown object type %d\n"
 msgstr "未知对象类型 %d\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1147
+#: plug-ins/xfig/xfig-import.c:1158
 #, c-format
 msgid "`%s' is not one of `%s' or `%s'\n"
 msgstr "“%s”不是一个“%s”或“%s”\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1157
+#: plug-ins/xfig/xfig-import.c:1168
 msgid "Error reading paper size."
 msgstr "读页面尺寸时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1168
+#: plug-ins/xfig/xfig-import.c:1179
 #, c-format
 msgid "Unknown paper size `%s', using default\n"
 msgstr "未知的页面尺寸“%s”，使用默认值\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1181
+#: plug-ins/xfig/xfig-import.c:1192
 msgid "Error reading paper orientation."
 msgstr "读页面方向时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1191
+#: plug-ins/xfig/xfig-import.c:1202
 msgid "Error reading justification."
 msgstr "读取对齐时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1201
+#: plug-ins/xfig/xfig-import.c:1212
 msgid "Error reading units."
 msgstr "读量度单位时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1217
+#: plug-ins/xfig/xfig-import.c:1228
 msgid "Error reading magnification."
 msgstr "读放大率时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1230
+#: plug-ins/xfig/xfig-import.c:1241
 msgid "Error reading multipage indicator."
 msgstr "读多页指示时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1241
+#: plug-ins/xfig/xfig-import.c:1252
 msgid "Error reading transparent color."
 msgstr "读透明色时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1250 ../plug-ins/xfig/xfig-import.c:1311
-#: ../plug-ins/xfig/xfig-import.c:1329
+#: plug-ins/xfig/xfig-import.c:1261 plug-ins/xfig/xfig-import.c:1322
+#: plug-ins/xfig/xfig-import.c:1340
 msgid "Error reading Fig file."
 msgstr "读 FIG 文件时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1252
+#: plug-ins/xfig/xfig-import.c:1263
 msgid "Premature end of Fig file\n"
 msgstr "Fig 文件过早的结束\n"
 
-#: ../plug-ins/xfig/xfig-import.c:1261
+#: plug-ins/xfig/xfig-import.c:1272
 msgid "Error reading resolution."
 msgstr "读取分辨率时出错。"
 
-#: ../plug-ins/xfig/xfig-import.c:1297
+#: plug-ins/xfig/xfig-import.c:1308
 msgid "Doesn't look like a Fig file"
 msgstr "不是一个 Fig 文件"
 
-#: ../plug-ins/xfig/xfig-import.c:1303
+#: plug-ins/xfig/xfig-import.c:1314
 #, c-format
 msgid ""
 "This is a Fig version %d.%d file.\n"
@@ -6471,3728 +7404,4184 @@ msgstr ""
 "这是一个版本为 %d.%d 的 Fig 文件。\n"
 "å®ƒå¯èƒ½æ— æ³•å¯¼å…¥ã€‚"
 
-#: ../plug-ins/xfig/xfig-import.c:1313
+#: plug-ins/xfig/xfig-import.c:1324
 msgid "Premature end of Fig file"
 msgstr "Fig 文件过早的结束"
 
-#: ../plug-ins/xfig/xfig-import.c:1352
+#: plug-ins/xfig/xfig-import.c:1363
 msgid "Xfig File Format"
 msgstr "Xfig æ–‡ä»¶æ ¼å¼"
 
-#: ../plug-ins/xslt/xslt.c:113
+#: plug-ins/xslt/xslt.c:109
+#, c-format
+msgid "Can't open output file %s: %s\n"
+msgstr "æ— æ³•æ‰“å¼€è¾“å…¥æ–‡ä»¶ %s：%s\n"
+
+#: plug-ins/xslt/xslt.c:118
 #, c-format
-msgid "Error while parsing %s\n"
-msgstr "解析 %s 时发生错误\n"
+msgid ""
+"Error while parsing %s\n"
+"%s"
+msgstr ""
+"解析 %s 时发生错误\n"
+"%s"
 
-#: ../plug-ins/xslt/xslt.c:122
+#: plug-ins/xslt/xslt.c:128
 #, c-format
 msgid "Error while parsing stylesheet %s\n"
 msgstr "è§£æžæ ·å¼è¡¨ %s 时发生错误\n"
 
-#: ../plug-ins/xslt/xslt.c:129
+#: plug-ins/xslt/xslt.c:135
 #, c-format
 msgid "Error while applying stylesheet %s\n"
 msgstr "åº”ç”¨æ ·å¼è¡¨ %s 时发生错误\n"
 
-#: ../plug-ins/xslt/xslt.c:138
+#: plug-ins/xslt/xslt.c:144
 #, c-format
 msgid "Error while parsing stylesheet: %s\n"
 msgstr "è§£æžæ ·å¼è¡¨æ—¶å‘ç”Ÿé”™è¯¯ï¼š%s\n"
 
-#: ../plug-ins/xslt/xslt.c:147
+#: plug-ins/xslt/xslt.c:153
 #, c-format
 msgid "Error while applying stylesheet: %s\n"
 msgstr "åº”ç”¨æ ·å¼è¡¨æ—¶å‘ç”Ÿé”™è¯¯ï¼š%s\n"
 
-#: ../plug-ins/xslt/xslt.c:155
+#: plug-ins/xslt/xslt.c:161
 #, c-format
 msgid "Error while saving result: %s\n"
 msgstr "保存结果时发生错误：%s\n"
 
-#: ../plug-ins/xslt/xslt.c:339
+#: plug-ins/xslt/xslt.c:333
 msgid "XSL Transformation filter"
 msgstr "XSL 变换过滤器"
 
-#: ../plug-ins/xslt/xslt.c:366
+#: plug-ins/xslt/xslt.c:358
 msgid "No valid configuration files found for the XSLT plugin; not loading."
-msgstr "找不到用于 XSLT 插件的有效配置文件；不予载入"
+msgstr "找不到用于 XSLT 插件的有效配置文件；不予载入。"
 
-#: ../plug-ins/xslt/xsltdialog.c:99
+#: plug-ins/xslt/xsltdialog.c:81
 msgid "Export through XSLT"
 msgstr "经 XSLT 导出"
 
-#: ../plug-ins/xslt/xsltdialog.c:114
+#: plug-ins/xslt/xsltdialog.c:95
 msgid "From:"
 msgstr "从："
 
-#: ../plug-ins/xslt/xsltdialog.c:149
+#: plug-ins/xslt/xsltdialog.c:125
 msgid "To:"
 msgstr "至："
 
-#: ../sheets/AADL.sheet.in.h:1
+#: sheets/AADL.sheet:3
 msgid "AADL"
 msgstr "AADL"
 
-#: ../sheets/AADL.sheet.in.h:2
+#: sheets/AADL.sheet:4
 msgid "AADL Shapes"
 msgstr "AADL 形状"
 
-#: ../sheets/AADL.sheet.in.h:4
+#: sheets/AADL.sheet:13
 msgid "Thread"
 msgstr "线程"
 
-#: ../sheets/AADL.sheet.in.h:6
+#: sheets/AADL.sheet:19
 msgid "Processor"
 msgstr "处理器"
 
-#: ../sheets/AADL.sheet.in.h:7
+#: sheets/AADL.sheet:22
 msgid "Memory"
 msgstr "内存"
 
-#: ../sheets/AADL.sheet.in.h:8
+#: sheets/AADL.sheet:25
 msgid "Bus"
 msgstr "总线"
 
-#: ../sheets/AADL.sheet.in.h:9
-msgid "System"
-msgstr "系统"
-
-#: ../sheets/AADL.sheet.in.h:10
+#: sheets/AADL.sheet:31
 msgid "Subprogram"
 msgstr "子程序"
 
-#: ../sheets/AADL.sheet.in.h:11
+#: sheets/AADL.sheet:34
 msgid "Thread Group"
 msgstr "线程组"
 
-#: ../sheets/AADL.sheet.in.h:12
+#: sheets/AADL.sheet:37
 msgid "Device"
 msgstr "设备"
 
-#: ../sheets/AADL.sheet.in.h:13
+#: sheets/AADL.sheet:40
 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:6
+#: sheets/Assorted.sheet:10
 msgid ""
 "An Assorted Collection of Polygons, Beziergons and other Miscellaneous "
 "Geometric Shapes"
 msgstr "å¤šè¾¹å½¢ã€è´å¡žå°”æ›²çº¿å’Œå…¶ä»–å„å¼å‡ ä½•å›¾å½¢é›†"
 
-#: ../sheets/Assorted.sheet.in.h:7
+#: sheets/Assorted.sheet:25
 msgid "Right angle triangle"
 msgstr "直角三角形"
 
-#: ../sheets/Assorted.sheet.in.h:8
+#: sheets/Assorted.sheet:29
 msgid "Isosceles triangle"
 msgstr "等腰三角形"
 
-#: ../sheets/Assorted.sheet.in.h:9
+#: sheets/Assorted.sheet:33
 msgid "Perfect square, height equals width"
 msgstr "正方形"
 
-#: ../sheets/Assorted.sheet.in.h:10
+#: sheets/Assorted.sheet:34
 msgid "Perfect circle"
 msgstr "正园形"
 
-#: ../sheets/Assorted.sheet.in.h:11
+#: sheets/Assorted.sheet:35
 msgid "Quarter circle"
 msgstr "四分之一圆形"
 
-#: ../sheets/Assorted.sheet.in.h:12
+#: sheets/Assorted.sheet:37
 msgid "Diamond"
 msgstr "菱形"
 
-#: ../sheets/Assorted.sheet.in.h:13
+#: sheets/Assorted.sheet:39
 msgid "Pentagon. Five-point shape"
 msgstr "五边形。五点形状"
 
-#: ../sheets/Assorted.sheet.in.h:14
+#: sheets/Assorted.sheet:40
 msgid "Hexagon. Six-point shape"
 msgstr "六边形。六点形状"
 
-#: ../sheets/Assorted.sheet.in.h:15
+#: sheets/Assorted.sheet:41
 msgid "Heptagon. Seven-point shape"
 msgstr "七边形。七点形状"
 
-#: ../sheets/Assorted.sheet.in.h:16
+#: sheets/Assorted.sheet:42
 msgid "Octagon. Eight-point shape"
 msgstr "八边形。八点形状"
 
-#: ../sheets/Assorted.sheet.in.h:17
+#: sheets/Assorted.sheet:44
 msgid "Horizontal parallelogram"
 msgstr "平行四边形"
 
-#: ../sheets/Assorted.sheet.in.h:18
+#: sheets/Assorted.sheet:45
 msgid "Vertical parallelogram"
 msgstr "垂直平行四边形"
 
-#: ../sheets/Assorted.sheet.in.h:19
+#: sheets/Assorted.sheet:46
 msgid "Trapezoid"
 msgstr "梯形"
 
-#: ../sheets/Assorted.sheet.in.h:20
+#: sheets/Assorted.sheet:50
 msgid "Four-point star"
 msgstr "四角星"
 
-#: ../sheets/Assorted.sheet.in.h:21
+#: sheets/Assorted.sheet:51
 msgid "Curved four-point star"
 msgstr "曲四角星"
 
-#: ../sheets/Assorted.sheet.in.h:22
+#: sheets/Assorted.sheet:52
 msgid "Five-point star"
 msgstr "五角星"
 
-#: ../sheets/Assorted.sheet.in.h:23
+#: sheets/Assorted.sheet:53
 msgid "Six-point star"
 msgstr "六角星"
 
-#: ../sheets/Assorted.sheet.in.h:24
+#: sheets/Assorted.sheet:54
 msgid "Seven-point star"
 msgstr "七角星"
 
-#: ../sheets/Assorted.sheet.in.h:25
+#: sheets/Assorted.sheet:55
 msgid "Eight-point star"
 msgstr "八角星"
 
-#: ../sheets/Assorted.sheet.in.h:26
+#: sheets/Assorted.sheet:56
 msgid "Sharp eight-point star"
 msgstr "尖八角星"
 
-#: ../sheets/Assorted.sheet.in.h:27
+#: sheets/Assorted.sheet:57
 msgid "Curved eight-point star"
 msgstr "曲八角星"
 
-#: ../sheets/Assorted.sheet.in.h:28
+#: sheets/Assorted.sheet:61
 msgid "Swiss cross"
 msgstr "瑞士十字"
 
-#: ../sheets/Assorted.sheet.in.h:29
+#: sheets/Assorted.sheet:63
 msgid "Maltese cross"
 msgstr "马尔他(Maltese)十字"
 
-#: ../sheets/Assorted.sheet.in.h:30
+#: sheets/Assorted.sheet:66
 msgid "Down arrow"
 msgstr "箭头 (下)"
 
-#: ../sheets/Assorted.sheet.in.h:31
+#: sheets/Assorted.sheet:67
 msgid "Up arrow"
 msgstr "箭头(上)"
 
-#: ../sheets/Assorted.sheet.in.h:32
+#: sheets/Assorted.sheet:68
 msgid "Left arrow"
 msgstr "箭头(左)"
 
-#: ../sheets/Assorted.sheet.in.h:33
+#: sheets/Assorted.sheet:69
 msgid "Right arrow"
 msgstr "箭头(右)"
 
-#: ../sheets/Assorted.sheet.in.h:34
+#: sheets/Assorted.sheet:71
 msgid "Notched left arrow"
 msgstr "左方凹箭头"
 
-#: ../sheets/Assorted.sheet.in.h:35
+#: sheets/Assorted.sheet:72
 msgid "Notched right arrow"
 msgstr "右方凹箭头"
 
-#: ../sheets/Assorted.sheet.in.h:36
+#: sheets/Assorted.sheet:74
 msgid "Left-up arrow"
 msgstr "箭头(左、上)"
 
-#: ../sheets/Assorted.sheet.in.h:37
+#: sheets/Assorted.sheet:75
 msgid "Turn-up arrow"
 msgstr "上弯箭头"
 
-#: ../sheets/Assorted.sheet.in.h:38
+#: sheets/Assorted.sheet:76
 msgid "Left-right arrow"
 msgstr "箭头(左、右)"
 
-#: ../sheets/Assorted.sheet.in.h:39
+#: sheets/Assorted.sheet:77
 msgid "Up-down arrow"
 msgstr "箭头(上、下)"
 
-#: ../sheets/Assorted.sheet.in.h:40
+#: sheets/Assorted.sheet:79
 msgid "Quad arrow"
 msgstr "箭头(上下左右)"
 
-#: ../sheets/Assorted.sheet.in.h:41
+#: sheets/Assorted.sheet:80
 msgid "Left-right-up arrow"
 msgstr "箭头(左、右、上)"
 
-#: ../sheets/Assorted.sheet.in.h:42
+#: sheets/Assorted.sheet:81
 msgid "Up-down-left arrow"
 msgstr "箭头(上、下、左)"
 
-#: ../sheets/Assorted.sheet.in.h:43
+#: sheets/Assorted.sheet:83
 msgid "Pentagon block arrow"
 msgstr "五角箭头"
 
-#: ../sheets/Assorted.sheet.in.h:44
+#: sheets/Assorted.sheet:84
 msgid "Chevron"
 msgstr "锯齿形"
 
-#: ../sheets/Assorted.sheet.in.h:45
+#: sheets/Assorted.sheet:90
 msgid "Heart"
 msgstr "心形"
 
-#: ../sheets/Assorted.sheet.in.h:46
+#: sheets/Assorted.sheet:93
 msgid "Sun"
 msgstr "太阳"
 
-#: ../sheets/Assorted.sheet.in.h:47
+#: sheets/Assorted.sheet:94
 msgid "Quarter moon"
 msgstr "四分之一月形"
 
+#. Dia-Version: 0.92-pre7
+#. File: /home/anthonym/.dia/sheets/BPMN.sheet
+#. Date: Tue Apr 13 23:07:18 2004
 #. For: anthonym
-#: ../sheets/BPMN.sheet.in.h:2
+#: sheets/BPMN.sheet:7
 msgid "BPMN"
 msgstr "BPMN"
 
-#: ../sheets/BPMN.sheet.in.h:3
+#: sheets/BPMN.sheet:8
 msgid "Business Process Modeling Notation"
 msgstr "商业进程模型表示法"
 
-#: ../sheets/BPMN.sheet.in.h:4
+#: sheets/BPMN.sheet:12 sheets/EDPC.sheet:11
 msgid "Start Event"
 msgstr "起始事件"
 
-#: ../sheets/BPMN.sheet.in.h:5
+#: sheets/BPMN.sheet:15
 msgid "Start Event — Message"
 msgstr "起始事件 — 信息"
 
-#: ../sheets/BPMN.sheet.in.h:6
+#: sheets/BPMN.sheet:18
 msgid "Start Event — Timer"
 msgstr "起始事件 — 计时"
 
-#: ../sheets/BPMN.sheet.in.h:7
+#: sheets/BPMN.sheet:21
 msgid "Start Event — Rule"
 msgstr "起始事件 — 规则"
 
-#: ../sheets/BPMN.sheet.in.h:8
+#: sheets/BPMN.sheet:24
 msgid "Start Event — Link"
 msgstr "起始事件 — 连接"
 
-#: ../sheets/BPMN.sheet.in.h:9
+#: sheets/BPMN.sheet:27
 msgid "Start Event — Multiple"
 msgstr "起始事件 — 多重"
 
-#: ../sheets/BPMN.sheet.in.h:10
+#: sheets/BPMN.sheet:30
 msgid "Intermediate Event"
 msgstr "中间事件"
 
-#: ../sheets/BPMN.sheet.in.h:11
+#: sheets/BPMN.sheet:33
 msgid "Intermediate Event — Message"
 msgstr "中间事件 — 信息"
 
-#: ../sheets/BPMN.sheet.in.h:12
+#: sheets/BPMN.sheet:36
 msgid "Intermediate Event — Timer"
 msgstr "中间事件 — 计时"
 
-#: ../sheets/BPMN.sheet.in.h:13
+#: sheets/BPMN.sheet:39
 msgid "Intermediate Event — Error"
 msgstr "中间事件 — 错误"
 
-#: ../sheets/BPMN.sheet.in.h:14
+#: sheets/BPMN.sheet:42
 msgid "Intermediate Event — Cancel"
 msgstr "中间事件 — 取消"
 
-#: ../sheets/BPMN.sheet.in.h:15
+#: sheets/BPMN.sheet:45
 msgid "Intermediate Event — Compensation"
 msgstr "中间事件 — 补偿"
 
-#: ../sheets/BPMN.sheet.in.h:16
+#: sheets/BPMN.sheet:48
 msgid "Intermediate Event — Rule"
 msgstr "中间事件 — 规则"
 
-#: ../sheets/BPMN.sheet.in.h:17
+#: sheets/BPMN.sheet:51
 msgid "Intermediate Event — Link"
 msgstr "中间事件 — 连接"
 
-#: ../sheets/BPMN.sheet.in.h:18
+#: sheets/BPMN.sheet:54
 msgid "Intermediate Event — Multiple"
 msgstr "中间事件 — 多重"
 
-#: ../sheets/BPMN.sheet.in.h:19
+#: sheets/BPMN.sheet:57 sheets/EDPC.sheet:12
 msgid "End Event"
 msgstr "结束事件"
 
-#: ../sheets/BPMN.sheet.in.h:20
+#: sheets/BPMN.sheet:60
 msgid "End Event — Message"
 msgstr "结束事件 — 信息"
 
-#: ../sheets/BPMN.sheet.in.h:21
+#: sheets/BPMN.sheet:63
 msgid "End Event — Error"
 msgstr "结束事件 — 错误"
 
-#: ../sheets/BPMN.sheet.in.h:22
+#: sheets/BPMN.sheet:66
 msgid "End Event — Cancel"
 msgstr "结束事件 — 取消"
 
-#: ../sheets/BPMN.sheet.in.h:23
+#: sheets/BPMN.sheet:69
 msgid "End Event — Compensation"
 msgstr "结束事件 — 补偿"
 
-#: ../sheets/BPMN.sheet.in.h:24
+#: sheets/BPMN.sheet:72
 msgid "End Event — Link"
 msgstr "结束事件 — 连结"
 
-#: ../sheets/BPMN.sheet.in.h:25
+#: sheets/BPMN.sheet:75
 msgid "End Event — Multiple"
 msgstr "结束事件 — 多重"
 
-#: ../sheets/BPMN.sheet.in.h:26
+#: sheets/BPMN.sheet:78
 msgid "End Event — Terminate"
 msgstr "结束事件 — 终结"
 
-#: ../sheets/BPMN.sheet.in.h:27
+#: sheets/BPMN.sheet:81
 msgid "Gateway"
 msgstr "网关"
 
-#: ../sheets/BPMN.sheet.in.h:28
+#: sheets/BPMN.sheet:84
 msgid "Exclusive (XOR) Data Based"
 msgstr "唯一的 (XOR) 资料基地"
 
-#: ../sheets/BPMN.sheet.in.h:29
+#: sheets/BPMN.sheet:87
 msgid "Exclusive (XOR) Event Based"
 msgstr "唯一的 (XOR) 事件基地"
 
-#: ../sheets/BPMN.sheet.in.h:30
+#: sheets/BPMN.sheet:90
 msgid "Inclusive (OR)"
 msgstr "包括(OR)"
 
-#: ../sheets/BPMN.sheet.in.h:31
+#: sheets/BPMN.sheet:93
 msgid "Complex"
 msgstr "复合"
 
-#: ../sheets/BPMN.sheet.in.h:32
+#: sheets/BPMN.sheet:96
 msgid "Parallel (AND)"
 msgstr "平行(AND)"
 
-#: ../sheets/BPMN.sheet.in.h:34
+#: sheets/BPMN.sheet:102
 msgid "Activity Looping"
 msgstr "活动回路"
 
-#: ../sheets/BPMN.sheet.in.h:35
+#: sheets/BPMN.sheet:105
 msgid "Multiple Instance Task"
 msgstr "多重实例工作"
 
-#: ../sheets/BPMN.sheet.in.h:36
+#: sheets/BPMN.sheet:108
 msgid "Compensation Task"
 msgstr "补偿工作"
 
-#: ../sheets/BPMN.sheet.in.h:37
+#: sheets/BPMN.sheet:111
 msgid "Collapsed Sub-Process"
 msgstr "æŠ˜å å­è¿›ç¨‹"
 
-#: ../sheets/BPMN.sheet.in.h:38
+#: sheets/BPMN.sheet:114
 msgid "Looping Collapsed Sub-Process"
 msgstr "å›žçŽ¯æŠ˜å å­è¿›ç¨‹"
 
-#: ../sheets/BPMN.sheet.in.h:39
+#: sheets/BPMN.sheet:117
 msgid "Multiple Instance Collapsed Sub-Process"
 msgstr "å¤šé‡å®žä¾‹æŠ˜å å­è¿›ç¨‹"
 
-#: ../sheets/BPMN.sheet.in.h:40
+#: sheets/BPMN.sheet:120
 msgid "Ad-Hoc Collapsed Sub-Process"
 msgstr "临时(Ad-Hoc) æŠ˜å å­è¿›ç¨‹"
 
-#: ../sheets/BPMN.sheet.in.h:41
+#: sheets/BPMN.sheet:123
 msgid "Compensation Collapsed Sub-Process"
 msgstr "è¡¥å¿æŠ˜å å­è¿›ç¨‹"
 
-#: ../sheets/BPMN.sheet.in.h:42
+#: sheets/BPMN.sheet:126
 msgid "Group"
 msgstr "组"
 
-#: ../sheets/BPMN.sheet.in.h:43
+#: sheets/BPMN.sheet:129
 msgid "Transaction"
 msgstr "事务"
 
-#: ../sheets/BPMN.sheet.in.h:44
+#: sheets/BPMN.sheet:132
 msgid "Data Object"
 msgstr "数据对象"
 
-#: ../sheets/BPMN.sheet.in.h:45
+#: sheets/BPMN.sheet:135
 msgid "Text Annotation"
 msgstr "文字注解"
 
+#. Dia-Version: 0.91
+#. File: /home/zenith/.dia/sheets/Chemeng.sheet
+#. Date: Wed Jun 25 14:15:42 2003
 #. For: zenith
-#: ../sheets/ChemEng.sheet.in.h:2
+#: sheets/ChemEng.sheet:8
 msgid "ChemEng"
 msgstr "化学工程"
 
-#: ../sheets/ChemEng.sheet.in.h:3
+#: sheets/ChemEng.sheet:9
 msgid "Collection for chemical engineering"
 msgstr "化学工程图集"
 
-#: ../sheets/ChemEng.sheet.in.h:4
+#: sheets/ChemEng.sheet:13
 msgid "Fan or Stirrer"
 msgstr "风扇或搅拌器"
 
-#: ../sheets/ChemEng.sheet.in.h:5
+#: sheets/ChemEng.sheet:14
 msgid "Spraying Device"
 msgstr "喷雾设备"
 
-#: ../sheets/ChemEng.sheet.in.h:6
+#: sheets/ChemEng.sheet:15
 msgid "Pneumatic Line"
 msgstr "空气压力管"
 
-#: ../sheets/ChemEng.sheet.in.h:7
+#: sheets/ChemEng.sheet:16
 msgid "Pneumatic Line, vertical"
 msgstr "空气压力管，垂直"
 
-#: ../sheets/ChemEng.sheet.in.h:9
+#: sheets/ChemEng.sheet:18
 msgid "Simple Heat Exchanger"
 msgstr "简易交换器"
 
-#: ../sheets/ChemEng.sheet.in.h:10
+#: sheets/ChemEng.sheet:19
 msgid "Simple Heat Exchanger, vertical"
 msgstr "简易交换器，垂直"
 
-#: ../sheets/ChemEng.sheet.in.h:11
+#: sheets/ChemEng.sheet:20
 msgid "Water Cooler"
 msgstr "冷水机"
 
-#: ../sheets/ChemEng.sheet.in.h:12
+#: sheets/ChemEng.sheet:21
 msgid "Water Cooler, vertical"
 msgstr "冷水机，垂直"
 
-#: ../sheets/ChemEng.sheet.in.h:13
+#: sheets/ChemEng.sheet:22
 msgid "Fixed-Sheet Exchanger"
 msgstr "Fixed-Sheet 交换器"
 
-#: ../sheets/ChemEng.sheet.in.h:14
+#: sheets/ChemEng.sheet:23
 msgid "Floating-Head or U-Tube Exchanger"
 msgstr "Floating-Head or U-Tube 交换器"
 
-#: ../sheets/ChemEng.sheet.in.h:15
+#: sheets/ChemEng.sheet:24
 msgid "Kettle Reboiler"
 msgstr "Kettle Reboiler"
 
-#: ../sheets/ChemEng.sheet.in.h:16
+#: sheets/ChemEng.sheet:25
 msgid "Air Cooler"
 msgstr "空气冷卻器"
 
-#: ../sheets/ChemEng.sheet.in.h:17
+#: sheets/ChemEng.sheet:26
 msgid "Forced-Flow Air Cooler"
 msgstr "Forced-Flow Air Cooler"
 
-#: ../sheets/ChemEng.sheet.in.h:18
+#: sheets/ChemEng.sheet:27
 msgid "Induced-Flow Air Cooler"
 msgstr "Induced-Flow Air Cooler"
 
-#: ../sheets/ChemEng.sheet.in.h:19
+#: sheets/ChemEng.sheet:28
 msgid "Plate Exchanger"
 msgstr "平板式交换器"
 
-#: ../sheets/ChemEng.sheet.in.h:20
+#: sheets/ChemEng.sheet:29
 msgid "Double-Pipe Exchanger"
 msgstr "套管交换器"
 
-#: ../sheets/ChemEng.sheet.in.h:21
+#: sheets/ChemEng.sheet:30
 msgid "Heating/Cooling Coil"
 msgstr "Heating/Cooling Coil"
 
-#: ../sheets/ChemEng.sheet.in.h:22
+#: sheets/ChemEng.sheet:31
 msgid "Heating/Cooling Coil, vertical"
 msgstr "Heating/Cooling Coil, vertical"
 
-#: ../sheets/ChemEng.sheet.in.h:23
+#: sheets/ChemEng.sheet:32
 msgid "Simple Furnace"
 msgstr "简易炉"
 
-#: ../sheets/ChemEng.sheet.in.h:24
+#: sheets/ChemEng.sheet:33
 msgid "Simple Vessel"
 msgstr "简易容器"
 
-#: ../sheets/ChemEng.sheet.in.h:25
+#: sheets/ChemEng.sheet:34
 msgid "Knock-out Drum (with demister pad)"
 msgstr "Knock-out Drum (with demister pad)"
 
-#: ../sheets/ChemEng.sheet.in.h:26
+#: sheets/ChemEng.sheet:35
 msgid "Tray Column, simple"
 msgstr "普通的板式塔"
 
-#: ../sheets/ChemEng.sheet.in.h:27
+#: sheets/ChemEng.sheet:36
 msgid "Tray Column, detailed"
 msgstr "复杂的板式塔"
 
-#: ../sheets/ChemEng.sheet.in.h:28
+#: sheets/ChemEng.sheet:37
 msgid "Fluid Contacting Vessel, simple"
 msgstr "Fluid Contacting Vessel, simple"
 
-#: ../sheets/ChemEng.sheet.in.h:29
+#: sheets/ChemEng.sheet:38
 msgid "Reactor or Absorption Vessel, simple"
 msgstr "普通的反应器或吸收容器"
 
-#: ../sheets/ChemEng.sheet.in.h:30
+#: sheets/ChemEng.sheet:39
 msgid "Autoclave"
 msgstr "蒸气灭菌"
 
-#: ../sheets/ChemEng.sheet.in.h:31
+#: sheets/ChemEng.sheet:40
 msgid "Open Tank"
 msgstr "打开水槽"
 
-#: ../sheets/ChemEng.sheet.in.h:32
+#: sheets/ChemEng.sheet:41
 msgid "Clarifier or Settling Tank"
 msgstr "å‡€åŒ–æˆ–æ²‰æ·€æ± "
 
-#: ../sheets/ChemEng.sheet.in.h:33
+#: sheets/ChemEng.sheet:42
 msgid "Sealed Tank"
 msgstr "密封水槽"
 
-#: ../sheets/ChemEng.sheet.in.h:34
+#: sheets/ChemEng.sheet:43
 msgid "Covered tank"
 msgstr "有盖子的水槽"
 
-#: ../sheets/ChemEng.sheet.in.h:35
+#: sheets/ChemEng.sheet:44
 msgid "Tank with Fixed Roof"
 msgstr "固定顶槽"
 
-#: ../sheets/ChemEng.sheet.in.h:36
+#: sheets/ChemEng.sheet:45
 msgid "Tank with Floating Roof"
 msgstr "浮动顶槽"
 
-#: ../sheets/ChemEng.sheet.in.h:37
+#: sheets/ChemEng.sheet:46
 msgid "Storage Sphere"
 msgstr "球形存储器"
 
-#: ../sheets/ChemEng.sheet.in.h:38
+#: sheets/ChemEng.sheet:47
 msgid "Gas Holder, basic"
 msgstr "Gas Holder, basic"
 
-#: ../sheets/ChemEng.sheet.in.h:39
+#: sheets/ChemEng.sheet:48
 msgid "Centrifugal Pump or Fan"
 msgstr "离心式泵或风扇"
 
-#: ../sheets/ChemEng.sheet.in.h:40
+#: sheets/ChemEng.sheet:49
 msgid "Positive Displacement Rotary Pump or Compressor"
 msgstr "正确的换置旋转的抽水机或压缩机"
 
-#: ../sheets/ChemEng.sheet.in.h:41
+#: sheets/ChemEng.sheet:50
 msgid "Reciprocating Compressor or Pump"
 msgstr "交互的压缩机或抽水机"
 
-#: ../sheets/ChemEng.sheet.in.h:42
+#: sheets/ChemEng.sheet:51
 msgid "Axial Flow Fan"
 msgstr "轴式气流扇"
 
-#: ../sheets/ChemEng.sheet.in.h:43
+#: sheets/ChemEng.sheet:52
 msgid "Compressor or Turbine"
 msgstr "压缩机或涡轮机"
 
-#: ../sheets/ChemEng.sheet.in.h:44
+#: sheets/ChemEng.sheet:53
 msgid "Ejector or Injector"
 msgstr "喷射器或注入器"
 
-#: ../sheets/ChemEng.sheet.in.h:45
+#: sheets/ChemEng.sheet:54
 msgid "AC Generator"
 msgstr "交流发电机"
 
-#: ../sheets/ChemEng.sheet.in.h:46
+#: sheets/ChemEng.sheet:55
 msgid "Valve"
 msgstr "阀"
 
-#: ../sheets/ChemEng.sheet.in.h:47
+#: sheets/ChemEng.sheet:56
 msgid "Valve, vertical"
 msgstr "阀， 垂直"
 
-#: ../sheets/ChemEng.sheet.in.h:48
+#: sheets/ChemEng.sheet:57
 msgid "Regulable Valve"
 msgstr "可调整的阀"
 
-#: ../sheets/ChemEng.sheet.in.h:49
+#: sheets/ChemEng.sheet:58
 msgid "Regulable Valve, vertical"
 msgstr "可调整的阀，垂直"
 
-#: ../sheets/ChemEng.sheet.in.h:50
+#: sheets/ChemEng.sheet:59
 msgid "Basic Filter"
 msgstr "基本过滤器"
 
-#: ../sheets/ChemEng.sheet.in.h:51
+#: sheets/ChemEng.sheet:60
 msgid "Mixer"
 msgstr "混合器"
 
-#: ../sheets/ChemEng.sheet.in.h:52
+#: sheets/ChemEng.sheet:61
 msgid "Cyclone and hydrocyclone"
 msgstr "旋流器和水力旋流器"
 
-#: ../sheets/ChemEng.sheet.in.h:53
+#: sheets/ChemEng.sheet:62
 msgid "Spray Drier"
 msgstr "喷雾式干燥机"
 
-#: ../sheets/ChemEng.sheet.in.h:54
+#: sheets/ChemEng.sheet:63
 msgid "Centrifuge"
 msgstr "离心机"
 
-#: ../sheets/ChemEng.sheet.in.h:55
+#: sheets/ChemEng.sheet:64
 msgid "Pressure Relief Valve"
 msgstr "减压阀"
 
-#: ../sheets/chronogram.sheet.in.h:1
+#: sheets/chronogram.sheet:3
 msgid "Chronogram"
 msgstr "纪年铭"
 
-#: ../sheets/chronogram.sheet.in.h:2
+#: sheets/chronogram.sheet:4
 msgid "Objects to design chronogram charts"
 msgstr "用于设计纪年铭图表的对象"
 
-#: ../sheets/chronogram.sheet.in.h:3
+#: sheets/chronogram.sheet:7
 msgid "Time scale"
 msgstr "时间刻度"
 
-#: ../sheets/chronogram.sheet.in.h:4
+#: sheets/chronogram.sheet:10
 msgid "Data line"
 msgstr "数据线"
 
-#: ../sheets/Circuit.sheet.in.h:1
+#: sheets/Circuit.sheet:3
 msgid "Circuit"
 msgstr "电路"
 
-#: ../sheets/Circuit.sheet.in.h:2
+#: sheets/Circuit.sheet:4
 msgid "Components for circuit diagrams"
 msgstr "电路图的部件"
 
-#: ../sheets/Circuit.sheet.in.h:3
+#: sheets/Circuit.sheet:7
 msgid "Vertically aligned resistor"
 msgstr "竖直排列的电阻器"
 
-#: ../sheets/Circuit.sheet.in.h:4
+#: sheets/Circuit.sheet:10
 msgid "Horizontally aligned inductor"
 msgstr "水平排列的电感器"
 
-#: ../sheets/Circuit.sheet.in.h:5
+#: sheets/Circuit.sheet:13
 msgid "Vertically aligned inductor"
 msgstr "竖直排列的电感器"
 
-#: ../sheets/Circuit.sheet.in.h:6
+#: sheets/Circuit.sheet:16
 msgid "Horizontally aligned resistor"
 msgstr "水平排列的电阻器"
 
-#: ../sheets/Circuit.sheet.in.h:7
+#: sheets/Circuit.sheet:20
 msgid "Vertically aligned resistor (European)"
 msgstr "竖直排列的电阻器 (欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:8
+#: sheets/Circuit.sheet:23
 msgid "Horizontally aligned inductor (European)"
 msgstr "水平排列的电感器(欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:9
+#: sheets/Circuit.sheet:26
 msgid "Vertically aligned inductor (European)"
 msgstr "竖直排列的电感器(欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:10
+#: sheets/Circuit.sheet:29
 msgid "Horizontally aligned resistor (European)"
 msgstr "水平排列的电阻器(欧洲)"
 
-#: ../sheets/Circuit.sheet.in.h:11
+#: sheets/Circuit.sheet:33
 msgid "Horizontally aligned capacitor"
 msgstr "水平排列的电容器"
 
-#: ../sheets/Circuit.sheet.in.h:12
+#: sheets/Circuit.sheet:36
 msgid "Vertically aligned capacitor"
 msgstr "竖直排列的电容器"
 
 #.
-#.
-#: ../sheets/Circuit.sheet.in.h:15
+#: sheets/Circuit.sheet:42
 msgid "NPN bipolar transistor"
 msgstr "NPN 双极性晶体管"
 
 #.
-#.
-#: ../sheets/Circuit.sheet.in.h:18
+#: sheets/Circuit.sheet:47
 msgid "PNP bipolar transistor"
 msgstr "PNP 双极性晶体管"
 
-#: ../sheets/Circuit.sheet.in.h:19
+#: sheets/Circuit.sheet:51
 msgid "Horizontally aligned diode"
 msgstr "水平排列的二极管"
 
-#: ../sheets/Circuit.sheet.in.h:20
+#: sheets/Circuit.sheet:54
 msgid "Vertically aligned diode"
 msgstr "竖直排列的二极管"
 
-#: ../sheets/Circuit.sheet.in.h:21
+#: sheets/Circuit.sheet:57
 msgid "Horizontally aligned zener diode"
 msgstr "水平排列的齐纳二极管"
 
-#: ../sheets/Circuit.sheet.in.h:22
+#: sheets/Circuit.sheet:60
 msgid "Vertically aligned zener diode"
 msgstr "竖直排列的齐纳二极管"
 
-#: ../sheets/Circuit.sheet.in.h:23
+#: sheets/Circuit.sheet:64
 msgid "Ground point"
 msgstr "接地点"
 
-#: ../sheets/Circuit.sheet.in.h:24
+#: sheets/Circuit.sheet:67
 msgid "Operational amplifier"
 msgstr "运算放大器"
 
-#: ../sheets/Circuit.sheet.in.h:25
+#: sheets/Circuit.sheet:70
 msgid "Horizontally aligned fuse"
 msgstr "水平排列的保险丝"
 
-#: ../sheets/Circuit.sheet.in.h:26
+#: sheets/Circuit.sheet:73
 msgid "Vertically aligned fuse"
 msgstr "竖直排列的保险丝"
 
-#: ../sheets/Circuit.sheet.in.h:27
+#: sheets/Circuit.sheet:76
 msgid "Horizontally aligned power source"
 msgstr "水平排列的电源"
 
-#: ../sheets/Circuit.sheet.in.h:28
+#: sheets/Circuit.sheet:79
 msgid "Vertically aligned power source"
 msgstr "竖直排列的电源"
 
-#: ../sheets/Circuit.sheet.in.h:29
+#: sheets/Circuit.sheet:82
 msgid "Lamp"
 msgstr "灯"
 
-#: ../sheets/Circuit.sheet.in.h:30 ../sheets/ciscomisc.sheet.in.h:55
+#: sheets/Circuit.sheet:85 sheets/ciscomisc.sheet:64
 msgid "Speaker"
 msgstr "扬声器"
 
-#: ../sheets/Circuit.sheet.in.h:31 ../sheets/ciscomisc.sheet.in.h:53
+#: sheets/Circuit.sheet:88 sheets/ciscomisc.sheet:62
 msgid "Microphone"
 msgstr "麦克风"
 
-#: ../sheets/Circuit.sheet.in.h:32
+#: sheets/Circuit.sheet:92
 msgid "Horizontally aligned LED"
 msgstr "水平排列的 LED"
 
-#: ../sheets/Circuit.sheet.in.h:33
+#: sheets/Circuit.sheet:95
 msgid "Vertically aligned LED"
 msgstr "竖直排列的 LED"
 
-#: ../sheets/Circuit.sheet.in.h:34
+#: sheets/Circuit.sheet:99
 msgid "NMOS transistor"
 msgstr "NMOS 晶体管"
 
-#: ../sheets/Circuit.sheet.in.h:35
+#: sheets/Circuit.sheet:102
 msgid "PMOS transistor"
 msgstr "PMOS 晶体管"
 
-#: ../sheets/Circuit.sheet.in.h:36
+#: sheets/Circuit.sheet:105
 msgid "Horizontal jumper"
 msgstr "水平的跳接器"
 
-#: ../sheets/Circuit.sheet.in.h:37
+#: sheets/Circuit.sheet:108
 msgid "Horizontal xtal"
 msgstr "水平的 xtal"
 
-#: ../sheets/Circuit.sheet.in.h:38
+#: sheets/Circuit.sheet:111
 msgid "Vertical xtal"
 msgstr "åž‚ç›´çš„ xtal"
 
-#: ../sheets/ciscocomputer.sheet.in.h:1
+#: sheets/ciscocomputer.sheet:3
 msgid "Cisco — Computer"
 msgstr "Cisco — 计算机"
 
-#: ../sheets/ciscocomputer.sheet.in.h:2
+#: sheets/ciscocomputer.sheet:4
 msgid "Computer shapes by Cisco"
 msgstr "Cisco 电脑形状"
 
-#: ../sheets/ciscocomputer.sheet.in.h:3
+#: sheets/ciscocomputer.sheet:6
 msgid "PC"
 msgstr "PC"
 
-#: ../sheets/ciscocomputer.sheet.in.h:4
+#: sheets/ciscocomputer.sheet:7
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../sheets/ciscocomputer.sheet.in.h:5
+#: sheets/ciscocomputer.sheet:9
 msgid "Terminal"
 msgstr "终端"
 
-#: ../sheets/ciscocomputer.sheet.in.h:6
+#: sheets/ciscocomputer.sheet:11
 msgid "SUN workstation"
 msgstr "SUN 工作站"
 
-#: ../sheets/ciscocomputer.sheet.in.h:7
+#: sheets/ciscocomputer.sheet:12
 msgid "CiscoWorks workstation"
 msgstr "CiscoWorks 工作站"
 
-#: ../sheets/ciscocomputer.sheet.in.h:8
+#: sheets/ciscocomputer.sheet:13
 msgid "PC Router Card"
 msgstr "PC 路由器卡"
 
-#: ../sheets/ciscocomputer.sheet.in.h:9
+#: sheets/ciscocomputer.sheet:14
 msgid "PC Software"
 msgstr "PC 软件"
 
-#: ../sheets/ciscocomputer.sheet.in.h:10
+#: sheets/ciscocomputer.sheet:15
 msgid "PC with Router-Based Software"
 msgstr "有路由软件的 PC"
 
-#: ../sheets/ciscocomputer.sheet.in.h:11
+#: sheets/ciscocomputer.sheet:16
 msgid "Workgroup director"
 msgstr "工作组管理"
 
-#: ../sheets/ciscocomputer.sheet.in.h:12
+#: sheets/ciscocomputer.sheet:17
 msgid "CiscoSecurity"
 msgstr "CiscoSecurity"
 
-#: ../sheets/ciscocomputer.sheet.in.h:13
+#: sheets/ciscocomputer.sheet:18
 msgid "Cisco CA"
 msgstr "Cisco CA"
 
-#: ../sheets/ciscocomputer.sheet.in.h:14
+#: sheets/ciscocomputer.sheet:19
 msgid "WWW server"
 msgstr "WWW 服务器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:15
+#: sheets/ciscocomputer.sheet:20
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:16
+#: sheets/ciscocomputer.sheet:21
 msgid "File Server"
 msgstr "文件服务器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:17
+#: sheets/ciscocomputer.sheet:22
 msgid "Software-Based Router on File Server"
 msgstr "文件服务器上的软件路由器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:18
+#: sheets/ciscocomputer.sheet:23
 msgid "Server with PC Router"
 msgstr "有 PC 路由器的服务器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:19
+#: sheets/ciscocomputer.sheet:24
 msgid "IBM Tower"
 msgstr "IBM Tower"
 
-#: ../sheets/ciscocomputer.sheet.in.h:20
+#: sheets/ciscocomputer.sheet:25
 msgid "IBM Mini (AS400)"
 msgstr "IBM Mini (AS400)"
 
-#: ../sheets/ciscocomputer.sheet.in.h:21
+#: sheets/ciscocomputer.sheet:26
 msgid "Front End Processor"
 msgstr "前端处理器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:22
+#: sheets/ciscocomputer.sheet:27
 msgid "IBM mainframe"
 msgstr "IBM 大型机"
 
-#: ../sheets/ciscocomputer.sheet.in.h:23
+#: sheets/ciscocomputer.sheet:28
 msgid "IBM mainframe with FEP"
 msgstr "带 FEP 的 IBM 大型机"
 
-#: ../sheets/ciscocomputer.sheet.in.h:24
+#: sheets/ciscocomputer.sheet:29
 msgid "HP Mini"
 msgstr "HP Mini"
 
-#: ../sheets/ciscocomputer.sheet.in.h:25
+#: sheets/ciscocomputer.sheet:30
 msgid "Supercomputer"
 msgstr "超级计算机"
 
-#: ../sheets/ciscocomputer.sheet.in.h:26
+#: sheets/ciscocomputer.sheet:31
 msgid "Web cluster"
 msgstr "网页簇"
 
-#: ../sheets/ciscocomputer.sheet.in.h:27
+#: sheets/ciscocomputer.sheet:32
 msgid "Mini VAX"
 msgstr "Mini VAX"
 
-#: ../sheets/ciscocomputer.sheet.in.h:28
+#: sheets/ciscocomputer.sheet:33
 msgid "PC Card"
 msgstr "PC 卡"
 
-#: ../sheets/ciscocomputer.sheet.in.h:29 ../sheets/Lights.sheet.in.h:14
+#: sheets/ciscocomputer.sheet:34 sheets/Lights.sheet:41
 msgid "Scanner"
 msgstr "扫描仪"
 
-#: ../sheets/ciscocomputer.sheet.in.h:30
+#: sheets/ciscocomputer.sheet:35
 msgid "Tablet"
 msgstr "平板电脑"
 
-#: ../sheets/ciscocomputer.sheet.in.h:31
+#: sheets/ciscocomputer.sheet:36
 msgid "EtherClient"
 msgstr "以太客户端"
 
-#: ../sheets/ciscocomputer.sheet.in.h:32
+#: sheets/ciscocomputer.sheet:37
 msgid "Handheld"
 msgstr "手持式"
 
-#: ../sheets/ciscocomputer.sheet.in.h:33
+#: sheets/ciscocomputer.sheet:38
 msgid "Wireless"
 msgstr "æ— çº¿ç½‘ç»œ"
 
-#: ../sheets/ciscocomputer.sheet.in.h:34
+#: sheets/ciscocomputer.sheet:39
 msgid "PDA"
 msgstr "PDA"
 
-#: ../sheets/ciscocomputer.sheet.in.h:35
+#: sheets/ciscocomputer.sheet:40
 msgid "Newton"
 msgstr "牛顿"
 
-#: ../sheets/ciscocomputer.sheet.in.h:36
+#: sheets/ciscocomputer.sheet:41
 msgid "Laptop"
 msgstr "手提电脑"
 
-#: ../sheets/ciscocomputer.sheet.in.h:38 ../sheets/network.sheet.in.h:4
+#: sheets/ciscocomputer.sheet:45 sheets/network.sheet:10
 msgid "Monitor"
 msgstr "监视器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:39
+#: sheets/ciscocomputer.sheet:46
 msgid "PC Video"
 msgstr "PC 视频"
 
-#: ../sheets/ciscocomputer.sheet.in.h:40
+#: sheets/ciscocomputer.sheet:47
 msgid "Modem"
 msgstr "调制解调器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:41
+#: sheets/ciscocomputer.sheet:48
 msgid "BBS"
 msgstr "BBS"
 
-#: ../sheets/ciscocomputer.sheet.in.h:42
+#: sheets/ciscocomputer.sheet:49
 msgid "MicroWebserver"
 msgstr "微型网页服务器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:43
+#: sheets/ciscocomputer.sheet:50
 msgid "Relational Database"
 msgstr "关系数据库"
 
-#: ../sheets/ciscocomputer.sheet.in.h:44
+#: sheets/ciscocomputer.sheet:51
 msgid "Diskette"
 msgstr "磁盘"
 
-#: ../sheets/ciscocomputer.sheet.in.h:45
+#: sheets/ciscocomputer.sheet:52
 msgid "Host"
 msgstr "主机"
 
-#: ../sheets/ciscocomputer.sheet.in.h:46
+#: sheets/ciscocomputer.sheet:53
 msgid "Tape array"
 msgstr "磁带阵列"
 
-#: ../sheets/ciscocomputer.sheet.in.h:47
+#: sheets/ciscocomputer.sheet:54
 msgid "Disk subsystem"
 msgstr "磁盘子系统"
 
-#: ../sheets/ciscocomputer.sheet.in.h:48
+#: sheets/ciscocomputer.sheet:55
 msgid "JBOD"
 msgstr "JBOD"
 
-#: ../sheets/ciscocomputer.sheet.in.h:49
+#: sheets/ciscocomputer.sheet:56
 msgid "Storage array"
 msgstr "存储阵列"
 
-#: ../sheets/ciscocomputer.sheet.in.h:50
+#: sheets/ciscocomputer.sheet:57
 msgid "FC Storage"
 msgstr "FC 存储器"
 
-#: ../sheets/ciscocomputer.sheet.in.h:51
+#: sheets/ciscocomputer.sheet:58
 msgid "PC Adapter Card"
 msgstr "PC 适配卡"
 
-#: ../sheets/ciscohub.sheet.in.h:1
+#: sheets/ciscohub.sheet:3
 msgid "Cisco — Switch"
 msgstr "Cisco — 交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:2
+#: sheets/ciscohub.sheet:4
 msgid "Router and switch shapes by Cisco"
 msgstr "由 Cisco 提供的路由器和交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:3
+#: sheets/ciscohub.sheet:6
 msgid "Router"
 msgstr "路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:4
+#: sheets/ciscohub.sheet:7
 msgid "Router subdued"
 msgstr "路由器(柔和)"
 
-#: ../sheets/ciscohub.sheet.in.h:5
+#: sheets/ciscohub.sheet:8
 msgid "Router with Silicon Switch"
 msgstr "带有硅交换机的路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:6
+#: sheets/ciscohub.sheet:9
 msgid "NetFlow router"
 msgstr "NetFlow 路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:7
+#: sheets/ciscohub.sheet:10
 msgid "Broadband router"
 msgstr "宽带路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:8
+#: sheets/ciscohub.sheet:11
 msgid "Wavelength router"
 msgstr "波长路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:9
+#: sheets/ciscohub.sheet:12
 msgid "Wireless router"
 msgstr "æ— çº¿è·¯ç”±å™¨"
 
-#: ../sheets/ciscohub.sheet.in.h:10
+#: sheets/ciscohub.sheet:13
 msgid "7507 Router"
 msgstr "7507 路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:11
+#: sheets/ciscohub.sheet:14
 msgid "7505 Router"
 msgstr "7505 路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:12
+#: sheets/ciscohub.sheet:15
 msgid "7500ARS (7513) Router"
 msgstr "7500ARS (7513) 路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:13
+#: sheets/ciscohub.sheet:16
 msgid "Edge Label Switch Router with NetFlow"
 msgstr "支持 NetFlow çš„è¾¹ç•Œæ ‡ç­¾äº¤æ¢è·¯ç”±å™¨"
 
-#: ../sheets/ciscohub.sheet.in.h:14
+#: sheets/ciscohub.sheet:17
 msgid "Edge Label Switch Router"
 msgstr "è¾¹ç•Œæ ‡ç­¾äº¤æ¢è·¯ç”±å™¨"
 
-#: ../sheets/ciscohub.sheet.in.h:15
+#: sheets/ciscohub.sheet:18
 msgid "Router with Firewall"
 msgstr "有防火墙的路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:16
+#: sheets/ciscohub.sheet:19
 msgid "Optical Services Router"
 msgstr "光学服务路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:17
+#: sheets/ciscohub.sheet:20
 msgid "Content Router"
 msgstr "内容路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:18
+#: sheets/ciscohub.sheet:21
 msgid "Carrier Routing System"
 msgstr "ä¼ é€è·¯ç”±é€‰æ‹©ç³»ç»Ÿ"
 
-#: ../sheets/ciscohub.sheet.in.h:19
+#: sheets/ciscohub.sheet:22
 msgid "Storage Router"
 msgstr "存储路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:20
+#: sheets/ciscohub.sheet:23
 msgid "NetSonar"
 msgstr "NetSonar"
 
-#: ../sheets/ciscohub.sheet.in.h:21
+#: sheets/ciscohub.sheet:24
 msgid "Hub"
 msgstr "集线器"
 
-#: ../sheets/ciscohub.sheet.in.h:22
+#: sheets/ciscohub.sheet:25
 msgid "Hub subdued"
 msgstr "集线器(柔和)"
 
-#: ../sheets/ciscohub.sheet.in.h:23
+#: sheets/ciscohub.sheet:26
 msgid "Cisco Hub"
 msgstr "Cisco 集线器"
 
-#: ../sheets/ciscohub.sheet.in.h:24
+#: sheets/ciscohub.sheet:27
 msgid "Small Hub"
 msgstr "小型集线器"
 
-#: ../sheets/ciscohub.sheet.in.h:25
+#: sheets/ciscohub.sheet:28
 msgid "100BaseT Hub"
 msgstr "100BaseT 集线器"
 
-#: ../sheets/ciscohub.sheet.in.h:26
+#: sheets/ciscohub.sheet:29
 msgid "Workgroup switch"
 msgstr "工作组交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:27
+#: sheets/ciscohub.sheet:30
 msgid "Workgroup switch Subdued"
 msgstr "工作组交换机(柔和)"
 
-#: ../sheets/ciscohub.sheet.in.h:28
+#: sheets/ciscohub.sheet:31
 msgid "Workgroup Switch Voice-Enabled"
 msgstr "工作组交换机 Voice-Enabled"
 
-#: ../sheets/ciscohub.sheet.in.h:29
+#: sheets/ciscohub.sheet:32
 msgid "BBSM"
 msgstr "BBSM"
 
-#: ../sheets/ciscohub.sheet.in.h:30
+#: sheets/ciscohub.sheet:33
 msgid "ATM Tag Switch Router"
 msgstr "ATM æ ‡è®°äº¤æ¢è·¯ç”±å™¨"
 
-#: ../sheets/ciscohub.sheet.in.h:31
+#: sheets/ciscohub.sheet:34
 msgid "Switch Processor"
 msgstr "交换机处理器"
 
-#: ../sheets/ciscohub.sheet.in.h:32
+#: sheets/ciscohub.sheet:35
 msgid "Route Switch Processor"
 msgstr "路由交换机处理器"
 
-#: ../sheets/ciscohub.sheet.in.h:33
+#: sheets/ciscohub.sheet:36
 msgid "Route Switch Processor with Si"
 msgstr "路由交换机处理器 Si"
 
-#: ../sheets/ciscohub.sheet.in.h:34
+#: sheets/ciscohub.sheet:37
 msgid "PXF"
 msgstr "PXF"
 
-#: ../sheets/ciscohub.sheet.in.h:35
+#: sheets/ciscohub.sheet:38
 msgid "ASIC Processor"
 msgstr "ASIC 处理器"
 
-#: ../sheets/ciscohub.sheet.in.h:36
+#: sheets/ciscohub.sheet:39
 msgid "Generic Processor"
 msgstr "通用处理器"
 
-#: ../sheets/ciscohub.sheet.in.h:37
+#: sheets/ciscohub.sheet:40
 msgid "Data Center Switch"
 msgstr "数据中心交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:38
+#: sheets/ciscohub.sheet:41
 msgid "Data Center Switch Reversed"
 msgstr "数据中心交换机 (反向)"
 
-#: ../sheets/ciscohub.sheet.in.h:39
+#: sheets/ciscohub.sheet:42
 msgid "Data Switch Processor"
 msgstr "数据交换机处理器"
 
-#: ../sheets/ciscohub.sheet.in.h:40
+#: sheets/ciscohub.sheet:43
 msgid "Content Switch"
 msgstr "内容交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:41
+#: sheets/ciscohub.sheet:44
 msgid "Content Service Module"
 msgstr "内容服务模块"
 
-#: ../sheets/ciscohub.sheet.in.h:42
+#: sheets/ciscohub.sheet:45
 msgid "CSM-S"
 msgstr "CSM-S"
 
-#: ../sheets/ciscohub.sheet.in.h:43
+#: sheets/ciscohub.sheet:46
 msgid "Access Gateway"
 msgstr "接入网关"
 
-#: ../sheets/ciscohub.sheet.in.h:44
+#: sheets/ciscohub.sheet:47
 msgid "ATM Switch"
 msgstr "ATM 交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:45
+#: sheets/ciscohub.sheet:48
 msgid "ATM 3800"
 msgstr "ATM 3800"
 
-#: ../sheets/ciscohub.sheet.in.h:46
+#: sheets/ciscohub.sheet:49
 msgid "Cisco 1000"
 msgstr "Cisco 1000"
 
-#: ../sheets/ciscohub.sheet.in.h:47
+#: sheets/ciscohub.sheet:50
 msgid "ISDN switch"
 msgstr "ISDN 交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:48
+#: sheets/ciscohub.sheet:51
 msgid "Label Switch Router"
 msgstr "æ ‡ç­¾äº¤æ¢è·¯ç”±å™¨"
 
-#: ../sheets/ciscohub.sheet.in.h:49
+#: sheets/ciscohub.sheet:52
 msgid "MultiSwitch Device"
 msgstr "MultiSwitch 设备"
 
-#: ../sheets/ciscohub.sheet.in.h:50
+#: sheets/ciscohub.sheet:53
 msgid "LAN2LAN Switch"
 msgstr "LAN2LAN 交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:51
+#: sheets/ciscohub.sheet:54
 msgid "Multilayer Switch"
 msgstr "多层交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:52
+#: sheets/ciscohub.sheet:55
 msgid "Multilayer Switch with Silicon"
 msgstr "多层硅交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:53
+#: sheets/ciscohub.sheet:56
 msgid "Multilayer Switch with Silicon subdued"
 msgstr "多层硅交换机(柔和)"
 
-#: ../sheets/ciscohub.sheet.in.h:54
+#: sheets/ciscohub.sheet:57
 msgid "Programmable Switch"
 msgstr "可编程路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:55
+#: sheets/ciscohub.sheet:58
 msgid "Content Service Switch 1100"
 msgstr "内容服务交换机 1100"
 
-#: ../sheets/ciscohub.sheet.in.h:56
+#: sheets/ciscohub.sheet:59
 msgid "ATM Fast Gigabit Etherswitch"
-msgstr "ATM Fast Gigabit Etherswitch"
+msgstr "ATM 快速千兆以太网交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:57
+#: sheets/ciscohub.sheet:60
 msgid "RateMUX"
 msgstr "RateMUX"
 
-#: ../sheets/ciscohub.sheet.in.h:58
+#: sheets/ciscohub.sheet:61
 msgid "Workgroup 5500"
 msgstr "工作组 5500"
 
-#: ../sheets/ciscohub.sheet.in.h:59
+#: sheets/ciscohub.sheet:62
 msgid "Workgroup 5000"
 msgstr "工作组 5000"
 
-#: ../sheets/ciscohub.sheet.in.h:60
+#: sheets/ciscohub.sheet:63
 msgid "Workgroup 5002"
 msgstr "工作组 5002"
 
-#: ../sheets/ciscohub.sheet.in.h:61
+#: sheets/ciscohub.sheet:64
 msgid "NetRanger"
 msgstr "NetRanger"
 
-#: ../sheets/ciscohub.sheet.in.h:62
+#: sheets/ciscohub.sheet:65
 msgid "MGX 8220"
 msgstr "MGX 8220"
 
-#: ../sheets/ciscohub.sheet.in.h:63
+#: sheets/ciscohub.sheet:66
 msgid "MGX 8240"
 msgstr "MGX 8240"
 
-#: ../sheets/ciscohub.sheet.in.h:64
+#: sheets/ciscohub.sheet:67
 msgid "MGX 8260"
 msgstr "MGX 8260"
 
-#: ../sheets/ciscohub.sheet.in.h:65
+#: sheets/ciscohub.sheet:68
 msgid "Universal Gateway"
 msgstr "通用的网关"
 
-#: ../sheets/ciscohub.sheet.in.h:66
+#: sheets/ciscohub.sheet:69
 msgid "iSCSI switch"
 msgstr "iSCSI 交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:67
+#: sheets/ciscohub.sheet:70
 msgid "Workgroup Fibre Channel intelligent switch"
 msgstr "工作组光纤通道智慧型交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:68
+#: sheets/ciscohub.sheet:71
 msgid "Director-class Fibre Channel intelligent switch"
 msgstr "导向器级光纤智能交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:69
+#: sheets/ciscohub.sheet:72
 msgid "Multi-Fabric Server Switch"
 msgstr "Multi-Fabric 服务器交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:70
+#: sheets/ciscohub.sheet:73
 msgid "Server Switch"
 msgstr "服务器路由器"
 
-#: ../sheets/ciscohub.sheet.in.h:71
+#: sheets/ciscohub.sheet:74
 msgid "Multilayer Remote Switch"
 msgstr "多层远程交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:72
+#: sheets/ciscohub.sheet:75
 msgid "Layer 2 Remote Switch"
 msgstr "Layer 2 远程交换机"
 
-#: ../sheets/ciscohub.sheet.in.h:73
+#: sheets/ciscohub.sheet:76
 msgid "Virtual Layer Switch"
 msgstr "虚拟层交换机"
 
-#: ../sheets/ciscomisc.sheet.in.h:1
+#: sheets/ciscomisc.sheet:3
 msgid "Cisco — Miscellaneous"
 msgstr "Cisco — 其它"
 
-#: ../sheets/ciscomisc.sheet.in.h:2
+#: sheets/ciscomisc.sheet:4
 msgid "Miscellaneous shapes by Cisco"
 msgstr "Cisco 提供的其它形状"
 
-#: ../sheets/ciscomisc.sheet.in.h:3
+#: sheets/ciscomisc.sheet:6
 msgid "Government Building"
 msgstr "政府建筑"
 
-#: ../sheets/ciscomisc.sheet.in.h:4
+#: sheets/ciscomisc.sheet:7
 msgid "University"
 msgstr "大学"
 
-#: ../sheets/ciscomisc.sheet.in.h:5
+#: sheets/ciscomisc.sheet:8
 msgid "Small Business"
 msgstr "小公司"
 
-#: ../sheets/ciscomisc.sheet.in.h:6
+#: sheets/ciscomisc.sheet:9
 msgid "Home office"
 msgstr "家庭办公室"
 
-#: ../sheets/ciscomisc.sheet.in.h:7
+#: sheets/ciscomisc.sheet:10
 msgid "Branch office"
 msgstr "分支办公室"
 
-#: ../sheets/ciscomisc.sheet.in.h:8
+#: sheets/ciscomisc.sheet:11
 msgid "Branch office subdued"
 msgstr "分支办公室(柔和)"
 
-#: ../sheets/ciscomisc.sheet.in.h:9
+#: sheets/ciscomisc.sheet:12
 msgid "Branch office blue"
 msgstr "分支办公室(蓝色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:10
+#: sheets/ciscomisc.sheet:13
 msgid "Generic Building"
 msgstr "普通建筑"
 
-#: ../sheets/ciscomisc.sheet.in.h:11
+#: sheets/ciscomisc.sheet:14
 msgid "Generic Building subdued"
 msgstr "普通建筑(柔和)"
 
-#: ../sheets/ciscomisc.sheet.in.h:12
+#: sheets/ciscomisc.sheet:15
 msgid "Generic Building blue"
 msgstr "普通建筑(蓝色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:13
+#: sheets/ciscomisc.sheet:16
 msgid "Medium Building"
 msgstr "中型建筑"
 
-#: ../sheets/ciscomisc.sheet.in.h:14
+#: sheets/ciscomisc.sheet:17
 msgid "Medium Building subdued"
 msgstr "中型建筑(柔和)"
 
-#: ../sheets/ciscomisc.sheet.in.h:15
+#: sheets/ciscomisc.sheet:18
 msgid "Medium Building blue"
 msgstr "中型建筑(蓝色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:16
+#: sheets/ciscomisc.sheet:19
 msgid "House"
 msgstr "房子"
 
-#: ../sheets/ciscomisc.sheet.in.h:17
+#: sheets/ciscomisc.sheet:20
 msgid "House blue"
 msgstr "蓝色房子"
 
-#: ../sheets/ciscomisc.sheet.in.h:18
+#: sheets/ciscomisc.sheet:21
 msgid "Telecommuter house"
 msgstr "远程工作者之家"
 
-#: ../sheets/ciscomisc.sheet.in.h:19
+#: sheets/ciscomisc.sheet:22
 msgid "Telecommuter house subdued"
 msgstr "远程工作者之家(柔和)"
 
-#: ../sheets/ciscomisc.sheet.in.h:20
+#: sheets/ciscomisc.sheet:23
 msgid "MDU"
 msgstr "MDU"
 
-#: ../sheets/ciscomisc.sheet.in.h:21
+#: sheets/ciscomisc.sheet:24
 msgid "Man"
 msgstr "男性"
 
-#: ../sheets/ciscomisc.sheet.in.h:22
+#: sheets/ciscomisc.sheet:25
 msgid "Man red"
 msgstr "男性(红色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:23
+#: sheets/ciscomisc.sheet:26
 msgid "Man gold"
 msgstr "男性(金色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:24
+#: sheets/ciscomisc.sheet:27
 msgid "Man blue"
 msgstr "男性(蓝色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:25
+#: sheets/ciscomisc.sheet:28
 msgid "Standing Man"
 msgstr "站立的男性"
 
-#: ../sheets/ciscomisc.sheet.in.h:26
+#: sheets/ciscomisc.sheet:29
 msgid "Standing woman"
 msgstr "站立的女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:27
+#: sheets/ciscomisc.sheet:30
 msgid "Woman"
 msgstr "女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:28
+#: sheets/ciscomisc.sheet:31
 msgid "Woman red"
 msgstr "女性(红色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:29
+#: sheets/ciscomisc.sheet:32
 msgid "Woman gold"
 msgstr "女性(金色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:30
+#: sheets/ciscomisc.sheet:33
 msgid "Woman blue"
 msgstr "女性(蓝色)"
 
-#: ../sheets/ciscomisc.sheet.in.h:31
+#: sheets/ciscomisc.sheet:34
 msgid "Running man"
 msgstr "奔跑的男性"
 
-#: ../sheets/ciscomisc.sheet.in.h:32
+#: sheets/ciscomisc.sheet:35
 msgid "Running man subdued"
 msgstr "奔跑的男性(柔和)"
 
-#: ../sheets/ciscomisc.sheet.in.h:33
+#: sheets/ciscomisc.sheet:36
 msgid "Telecommuter"
 msgstr "远程工作者"
 
-#: ../sheets/ciscomisc.sheet.in.h:34
+#: sheets/ciscomisc.sheet:37
 msgid "Running woman"
 msgstr "奔跑的女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:35
+#: sheets/ciscomisc.sheet:38
 msgid "CiscoWorks Man"
 msgstr "CiscoWorks Man"
 
-#: ../sheets/ciscomisc.sheet.in.h:36
-msgid "PC Man left"
-msgstr "PC 男性(左)"
-
-#: ../sheets/ciscomisc.sheet.in.h:37
+#: sheets/ciscomisc.sheet:41
 msgid "PC Man"
 msgstr "PC 男性"
 
-#: ../sheets/ciscomisc.sheet.in.h:38
+#: sheets/ciscomisc.sheet:45
 msgid "Sitting Woman"
 msgstr "坐着的女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:39
-msgid "Sitting Woman right"
-msgstr "坐着的女性(右)"
-
-#: ../sheets/ciscomisc.sheet.in.h:40
+#: sheets/ciscomisc.sheet:47
 msgid "Mac Woman"
 msgstr "Mac 女性"
 
-#: ../sheets/ciscomisc.sheet.in.h:41
+#: sheets/ciscomisc.sheet:48
 msgid "Androgynous Person"
 msgstr "中性人"
 
-#: ../sheets/ciscomisc.sheet.in.h:44
+#: sheets/ciscomisc.sheet:51
 msgid "Lock and Key"
 msgstr "锁和钥匙"
 
-#: ../sheets/ciscomisc.sheet.in.h:45
+#: sheets/ciscomisc.sheet:52
 msgid "Satellite dish"
 msgstr "卫星天线"
 
-#: ../sheets/ciscomisc.sheet.in.h:46
+#: sheets/ciscomisc.sheet:53
 msgid "Satellite"
 msgstr "卫星"
 
-#: ../sheets/ciscomisc.sheet.in.h:47
+#: sheets/ciscomisc.sheet:54
 msgid "Antenna"
 msgstr "天线"
 
-#: ../sheets/ciscomisc.sheet.in.h:48
+#: sheets/ciscomisc.sheet:55
 msgid "File cabinet"
 msgstr "文件柜"
 
-#: ../sheets/ciscomisc.sheet.in.h:49
+#: sheets/ciscomisc.sheet:56
 msgid "Car"
 msgstr "车"
 
-#: ../sheets/ciscomisc.sheet.in.h:50
+#: sheets/ciscomisc.sheet:57
 msgid "Truck"
 msgstr "卡车"
 
-#: ../sheets/ciscomisc.sheet.in.h:51
+#: sheets/ciscomisc.sheet:60
 msgid "Video Camera"
 msgstr "视频照相机"
 
-#: ../sheets/ciscomisc.sheet.in.h:52
-msgid "Video Camera right"
-msgstr "视频照相机(右)"
-
-#: ../sheets/ciscomisc.sheet.in.h:54
+#: sheets/ciscomisc.sheet:63
 msgid "Headphones"
 msgstr "耳机"
 
-#: ../sheets/cisconetwork.sheet.in.h:1
+#: sheets/cisconetwork.sheet:3
 msgid "Cisco — Network"
 msgstr "Cisco — 网络"
 
-#: ../sheets/cisconetwork.sheet.in.h:2
+#: sheets/cisconetwork.sheet:4
 msgid "Network shapes by Cisco"
 msgstr "Cisco 网络形状"
 
-#: ../sheets/cisconetwork.sheet.in.h:3
+#: sheets/cisconetwork.sheet:6
 msgid "Network Management"
 msgstr "网络管理"
 
-#: ../sheets/cisconetwork.sheet.in.h:4
+#: sheets/cisconetwork.sheet:7
 msgid "Detector"
 msgstr "检测器"
 
-#: ../sheets/cisconetwork.sheet.in.h:5
+#: sheets/cisconetwork.sheet:8
 msgid "Protocol Translator"
 msgstr "协议翻译器"
 
-#: ../sheets/cisconetwork.sheet.in.h:6
+#: sheets/cisconetwork.sheet:9
 msgid "IP"
 msgstr "IP"
 
-#: ../sheets/cisconetwork.sheet.in.h:7
+#: sheets/cisconetwork.sheet:10
 msgid "IP Old-style"
 msgstr "IP (æ—§å¼æ ·)"
 
-#: ../sheets/cisconetwork.sheet.in.h:8
+#: sheets/cisconetwork.sheet:11
 msgid "NAT"
 msgstr "NAT"
 
-#: ../sheets/cisconetwork.sheet.in.h:9
+#: sheets/cisconetwork.sheet:12
 msgid "VIP"
 msgstr "VIP"
 
-#: ../sheets/cisconetwork.sheet.in.h:10
+#: sheets/cisconetwork.sheet:13
 msgid "Terminal Server"
 msgstr "终端服务器"
 
-#: ../sheets/cisconetwork.sheet.in.h:11
+#: sheets/cisconetwork.sheet:14
 msgid "Access Server"
 msgstr "接入服务器"
 
-#: ../sheets/cisconetwork.sheet.in.h:12
+#: sheets/cisconetwork.sheet:15
 msgid "System controller"
 msgstr "系统控制器"
 
-#: ../sheets/cisconetwork.sheet.in.h:13
+#: sheets/cisconetwork.sheet:16
 msgid "Directory Server"
 msgstr "目录服务器"
 
-#: ../sheets/cisconetwork.sheet.in.h:14
+#: sheets/cisconetwork.sheet:17
 msgid "Firewall"
 msgstr "防火墙"
 
-#: ../sheets/cisconetwork.sheet.in.h:15
+#: sheets/cisconetwork.sheet:18
 msgid "Firewall subdued"
 msgstr "防火墙(柔和)"
 
-#: ../sheets/cisconetwork.sheet.in.h:16
+#: sheets/cisconetwork.sheet:19
 msgid "Firewall horizontal"
 msgstr "防火墙(水平)"
 
-#: ../sheets/cisconetwork.sheet.in.h:17
+#: sheets/cisconetwork.sheet:20
 msgid "Firewall Service Module"
 msgstr "防火墙服务模块"
 
-#: ../sheets/cisconetwork.sheet.in.h:18
+#: sheets/cisconetwork.sheet:21
 msgid "IOS Firewall"
 msgstr "IOS 防火墙"
 
-#: ../sheets/cisconetwork.sheet.in.h:19
+#: sheets/cisconetwork.sheet:24
 msgid "PIX Firewall"
 msgstr "PIX 防火墙"
 
-#: ../sheets/cisconetwork.sheet.in.h:20
-msgid "PIX Firewall Left"
-msgstr "PIX 防火墙(左)"
-
-#: ../sheets/cisconetwork.sheet.in.h:21
+#: sheets/cisconetwork.sheet:26
 msgid "Centri Firewall"
 msgstr "Centri 防火墙"
 
-#: ../sheets/cisconetwork.sheet.in.h:23
+#: sheets/cisconetwork.sheet:28
 msgid "Security appliance"
 msgstr "保安器具"
 
-#: ../sheets/cisconetwork.sheet.in.h:24
+#: sheets/cisconetwork.sheet:29
 msgid "VPN Concentrator"
 msgstr "VPN 集中器"
 
-#: ../sheets/cisconetwork.sheet.in.h:25
+#: sheets/cisconetwork.sheet:30
 msgid "VPN Gateway"
 msgstr "VPN 网关"
 
-#: ../sheets/cisconetwork.sheet.in.h:26
+#: sheets/cisconetwork.sheet:31
 msgid "LAN to LAN"
 msgstr "LAN to LAN"
 
-#: ../sheets/cisconetwork.sheet.in.h:27
+#: sheets/cisconetwork.sheet:32
 msgid "SSL Terminator"
 msgstr "SSL 终端器"
 
-#: ../sheets/cisconetwork.sheet.in.h:28
+#: sheets/cisconetwork.sheet:33
 msgid "IP DSL Switch"
 msgstr "IP DSL 交换机"
 
-#: ../sheets/cisconetwork.sheet.in.h:29
+#: sheets/cisconetwork.sheet:34
 msgid "DSLAM"
 msgstr "DSLAM"
 
-#: ../sheets/cisconetwork.sheet.in.h:30
+#: sheets/cisconetwork.sheet:35
 msgid "Cable Modem"
 msgstr "电缆调制解调器"
 
-#: ../sheets/cisconetwork.sheet.in.h:31
+#: sheets/cisconetwork.sheet:36
 msgid "Wireless Connectivity"
 msgstr "æ— çº¿ç½‘ç»œè¿žé€šæ€§"
 
-#: ../sheets/cisconetwork.sheet.in.h:32
+#: sheets/cisconetwork.sheet:37
 msgid "Wireless Transport"
 msgstr "æ— çº¿ç½‘ç»œä¼ è¾“"
 
-#: ../sheets/cisconetwork.sheet.in.h:33
+#: sheets/cisconetwork.sheet:38
 msgid "AccessPoint"
 msgstr "接入点"
 
-#: ../sheets/cisconetwork.sheet.in.h:34
+#: sheets/cisconetwork.sheet:39
 msgid "Wireless Bridge"
 msgstr "æ— çº¿ç½‘ç»œæ¡¥æŽ¥å™¨"
 
-#: ../sheets/cisconetwork.sheet.in.h:35
+#: sheets/cisconetwork.sheet:40
 msgid "Dual Mode AccessPoint"
 msgstr "双模式存取点"
 
-#: ../sheets/cisconetwork.sheet.in.h:36
+#: sheets/cisconetwork.sheet:41
 msgid "Wi-Fi Tag"
 msgstr "Wi-Fi æ ‡ç­¾"
 
-#: ../sheets/cisconetwork.sheet.in.h:37
+#: sheets/cisconetwork.sheet:42
 msgid "Wireless Location Appliance"
 msgstr "æ— çº¿ç½‘ç»œä½ç½®å™¨æ¢°"
 
-#: ../sheets/cisconetwork.sheet.in.h:38
+#: sheets/cisconetwork.sheet:43
 msgid "Location server"
 msgstr "位置服务器"
 
-#: ../sheets/cisconetwork.sheet.in.h:39
+#: sheets/cisconetwork.sheet:44
 msgid "Lightweight AP"
 msgstr "轻量级的 AP"
 
-#: ../sheets/cisconetwork.sheet.in.h:40
+#: sheets/cisconetwork.sheet:45
 msgid "WLAN controller"
 msgstr "æ— çº¿ç½‘æŽ§åˆ¶å™¨"
 
-#: ../sheets/cisconetwork.sheet.in.h:41
+#: sheets/cisconetwork.sheet:46
 msgid "BBFW"
 msgstr "BBFW"
 
-#: ../sheets/cisconetwork.sheet.in.h:42
+#: sheets/cisconetwork.sheet:47
 msgid "BBFW media"
 msgstr "BBFW 媒体"
 
-#: ../sheets/cisconetwork.sheet.in.h:43
+#: sheets/cisconetwork.sheet:48
 msgid "Channelized Pipe"
 msgstr "信道化管道"
 
-#: ../sheets/cisconetwork.sheet.in.h:44
+#: sheets/cisconetwork.sheet:49
 msgid "Concatenated Payload"
 msgstr "级联载荷"
 
-#: ../sheets/cisconetwork.sheet.in.h:45
+#: sheets/cisconetwork.sheet:50
 msgid "Optical Cross-Connect"
 msgstr "光学交叉连接"
 
-#: ../sheets/cisconetwork.sheet.in.h:46
+#: sheets/cisconetwork.sheet:51
 msgid "Optical Transport"
 msgstr "å…‰å­¦ä¼ è¾“"
 
-#: ../sheets/cisconetwork.sheet.in.h:47
+#: sheets/cisconetwork.sheet:52
 msgid "Optical Fiber"
 msgstr "光学纤维"
 
-#: ../sheets/cisconetwork.sheet.in.h:48
+#: sheets/cisconetwork.sheet:53
 msgid "Optical Amplifier"
 msgstr "光学放大器"
 
-#: ../sheets/cisconetwork.sheet.in.h:49
+#: sheets/cisconetwork.sheet:54
 msgid "Digital Cross-Connect"
 msgstr "交叉连接器"
 
-#: ../sheets/cisconetwork.sheet.in.h:50
+#: sheets/cisconetwork.sheet:55
 msgid "IP Transport Concentrator"
 msgstr "IP 运输集中器"
 
-#: ../sheets/cisconetwork.sheet.in.h:51
+#: sheets/cisconetwork.sheet:56
 msgid "DWDM Filter"
 msgstr "DWDM 过滤器"
 
-#: ../sheets/cisconetwork.sheet.in.h:52
+#: sheets/cisconetwork.sheet:57
 msgid "WDM"
 msgstr "WDM"
 
-#: ../sheets/cisconetwork.sheet.in.h:53
+#: sheets/cisconetwork.sheet:58
 msgid "15200"
 msgstr "15200"
 
-#: ../sheets/cisconetwork.sheet.in.h:54
+#: sheets/cisconetwork.sheet:59
 msgid "15800"
 msgstr "15800"
 
-#: ../sheets/cisconetwork.sheet.in.h:55
+#: sheets/cisconetwork.sheet:60
 msgid "ONS15104"
 msgstr "ONS15104"
 
-#: ../sheets/cisconetwork.sheet.in.h:56
+#: sheets/cisconetwork.sheet:61
 msgid "10700"
 msgstr "10700"
 
-#: ../sheets/cisconetwork.sheet.in.h:57
+#: sheets/cisconetwork.sheet:62
 msgid "Metro 1500"
 msgstr "Metro 1500"
 
-#: ../sheets/cisconetwork.sheet.in.h:58
+#: sheets/cisconetwork.sheet:63
 msgid "ONS15540"
 msgstr "ONS15540"
 
-#: ../sheets/cisconetwork.sheet.in.h:59
+#: sheets/cisconetwork.sheet:64
 msgid "Automatic Protection Switching"
 msgstr "自动保护交换"
 
-#: ../sheets/cisconetwork.sheet.in.h:60
+#: sheets/cisconetwork.sheet:65
 msgid "RPS"
 msgstr "RPS"
 
-#: ../sheets/cisconetwork.sheet.in.h:61
+#: sheets/cisconetwork.sheet:66
 msgid "UPS"
 msgstr "UPS"
 
-#: ../sheets/cisconetwork.sheet.in.h:62
+#: sheets/cisconetwork.sheet:67
 msgid "LongReach CPE"
 msgstr "LongReach CPE"
 
-#: ../sheets/cisconetwork.sheet.in.h:63
+#: sheets/cisconetwork.sheet:68
 msgid "3X74 (floor) cluster controller"
 msgstr "3X74 (地面)簇控制器"
 
-#: ../sheets/cisconetwork.sheet.in.h:64
+#: sheets/cisconetwork.sheet:69
 msgid "3174 (desktop) cluster controller"
 msgstr "3174 (桌面)簇控制器"
 
-#: ../sheets/cisconetwork.sheet.in.h:65
+#: sheets/cisconetwork.sheet:70
 msgid "CSU/DSU"
 msgstr "CSU/DSU"
 
-#: ../sheets/cisconetwork.sheet.in.h:66
+#: sheets/cisconetwork.sheet:71
 msgid "WAN"
 msgstr "WAN"
 
-#: ../sheets/cisconetwork.sheet.in.h:67
+#: sheets/cisconetwork.sheet:72
 msgid "Cloud"
 msgstr "Cloud"
 
-#: ../sheets/cisconetwork.sheet.in.h:68
+#: sheets/cisconetwork.sheet:73
 msgid "Cloud Gold"
 msgstr "Cloud (金色)"
 
-#: ../sheets/cisconetwork.sheet.in.h:69
+#: sheets/cisconetwork.sheet:74
 msgid "Cloud White"
 msgstr "Cloud (白色)"
 
-#: ../sheets/cisconetwork.sheet.in.h:70
+#: sheets/cisconetwork.sheet:75
 msgid "Cloud Dark"
 msgstr "Cloud (æš—)"
 
-#: ../sheets/cisconetwork.sheet.in.h:71
+#: sheets/cisconetwork.sheet:76
 msgid "Distributed Director"
 msgstr "分布式导向器"
 
-#: ../sheets/cisconetwork.sheet.in.h:72
+#: sheets/cisconetwork.sheet:77
 msgid "LocalDirector"
 msgstr "LocalDirector"
 
-#: ../sheets/cisconetwork.sheet.in.h:73
+#: sheets/cisconetwork.sheet:78
 msgid "IOS SLB"
 msgstr "IOS SLB"
 
-#: ../sheets/cisconetwork.sheet.in.h:74
+#: sheets/cisconetwork.sheet:79
 msgid "MUX"
 msgstr "MUX"
 
-#: ../sheets/cisconetwork.sheet.in.h:75
+#: sheets/cisconetwork.sheet:80
 msgid "General Appliance"
 msgstr "普通设备"
 
 #. compatibility
 #. <alias name="Cisco - PAD"/>
-#: ../sheets/cisconetwork.sheet.in.h:78
+#: sheets/cisconetwork.sheet:84
 msgid "PAD"
 msgstr "PAD"
 
-#: ../sheets/cisconetwork.sheet.in.h:79
+#: sheets/cisconetwork.sheet:86
 msgid "CDDI/FDDI Concentrator"
 msgstr "CDDI/FDDI Concentrator"
 
-#: ../sheets/cisconetwork.sheet.in.h:80
+#: sheets/cisconetwork.sheet:87
 msgid "FDDI Ring"
 msgstr "FDDI 环"
 
-#: ../sheets/cisconetwork.sheet.in.h:81
+#: sheets/cisconetwork.sheet:88
 msgid "TokenRing"
 msgstr "令牌环"
 
-#: ../sheets/cisconetwork.sheet.in.h:82
+#: sheets/cisconetwork.sheet:89
 msgid "MAU"
 msgstr "MAU"
 
-#: ../sheets/cisconetwork.sheet.in.h:83
+#: sheets/cisconetwork.sheet:90
 msgid "Repeater"
 msgstr "中继器"
 
-#: ../sheets/cisconetwork.sheet.in.h:84
+#: sheets/cisconetwork.sheet:91
 msgid "Bridge"
 msgstr "桥接器"
 
-#: ../sheets/cisconetwork.sheet.in.h:85
+#: sheets/cisconetwork.sheet:92
 msgid "Breakout box"
 msgstr "中断箱"
 
-#: ../sheets/cisconetwork.sheet.in.h:86
+#: sheets/cisconetwork.sheet:93
 msgid "STB (set top box)"
 msgstr "STB (机顶盒)"
 
-#: ../sheets/cisconetwork.sheet.in.h:87
+#: sheets/cisconetwork.sheet:94
 msgid "TV"
 msgstr "TV"
 
-#: ../sheets/cisconetwork.sheet.in.h:88
+#: sheets/cisconetwork.sheet:95
 msgid "IPTV broadcast server"
 msgstr "IPTV 广播服务器"
 
-#: ../sheets/cisconetwork.sheet.in.h:89
+#: sheets/cisconetwork.sheet:96
 msgid "IPTV content manager"
 msgstr "IPTV 内容管理器"
 
-#: ../sheets/cisconetwork.sheet.in.h:90
+#: sheets/cisconetwork.sheet:97
 msgid "VN2900"
 msgstr "VN2900"
 
-#: ../sheets/cisconetwork.sheet.in.h:91
+#: sheets/cisconetwork.sheet:98
 msgid "VN5902"
 msgstr "VN5902"
 
-#: ../sheets/cisconetwork.sheet.in.h:92
+#: sheets/cisconetwork.sheet:99
 msgid "VN5900"
 msgstr "VN5900"
 
-#: ../sheets/cisconetwork.sheet.in.h:93
+#: sheets/cisconetwork.sheet:100
 msgid "Catalyst Access Gateway"
 msgstr "Catalyst 存取网关"
 
-#: ../sheets/cisconetwork.sheet.in.h:94
+#: sheets/cisconetwork.sheet:101
 msgid "Generic Gateway"
 msgstr "普通网关"
 
-#: ../sheets/cisconetwork.sheet.in.h:95
+#: sheets/cisconetwork.sheet:102
 msgid "TransPath"
 msgstr "TransPath"
 
-#: ../sheets/cisconetwork.sheet.in.h:96
+#: sheets/cisconetwork.sheet:103
 msgid "uBR910 Cable DSU"
 msgstr "uBR910 Cable DSU"
 
-#: ../sheets/cisconetwork.sheet.in.h:97
+#: sheets/cisconetwork.sheet:104
 msgid "Storage Solution Engine"
 msgstr "储存方案引擎"
 
-#: ../sheets/cisconetwork.sheet.in.h:98
+#: sheets/cisconetwork.sheet:105
 msgid "Content Engine (Cache Director)"
 msgstr "内容引擎(Cache Director)"
 
-#: ../sheets/cisconetwork.sheet.in.h:99
+#: sheets/cisconetwork.sheet:106
 msgid "CDM Content Distribution Manager"
 msgstr "CDM Content Distribution Manager"
 
-#: ../sheets/cisconetwork.sheet.in.h:100
+#: sheets/cisconetwork.sheet:107
 msgid "Content Transformation Engine (CTE)"
 msgstr "内容转换引擎(CTE)"
 
-#: ../sheets/cisconetwork.sheet.in.h:101
+#: sheets/cisconetwork.sheet:108
 msgid "ME 1100"
 msgstr "ME 1100"
 
-#: ../sheets/cisconetwork.sheet.in.h:102
+#: sheets/cisconetwork.sheet:109
 msgid "MAS Gateway"
 msgstr "MAS 网关"
 
-#: ../sheets/cisconetwork.sheet.in.h:103
+#: sheets/cisconetwork.sheet:110
 msgid "File Engine"
 msgstr "文件引擎"
 
-#: ../sheets/cisconetwork.sheet.in.h:104
+#: sheets/cisconetwork.sheet:111
 msgid "Service Control"
 msgstr "服务控制"
 
-#: ../sheets/ciscotelephony.sheet.in.h:1
+#: sheets/ciscotelephony.sheet:3
 msgid "Cisco — Telephony"
 msgstr "Cisco — 电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:2
+#: sheets/ciscotelephony.sheet:4
 msgid "Telephony shapes by Cisco"
 msgstr "Cisco 提供的电话通讯形状"
 
-#: ../sheets/ciscotelephony.sheet.in.h:3
+#: sheets/ciscotelephony.sheet:6
 msgid "Phone"
 msgstr "电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:4
+#: sheets/ciscotelephony.sheet:7
 msgid "Phone 2"
 msgstr "电话 2"
 
-#: ../sheets/ciscotelephony.sheet.in.h:5
+#: sheets/ciscotelephony.sheet:8
 msgid "Phone Ethernet"
 msgstr "电话以太网"
 
-#: ../sheets/ciscotelephony.sheet.in.h:6
+#: sheets/ciscotelephony.sheet:9
 msgid "Phone Appliance"
 msgstr "电话装置"
 
-#: ../sheets/ciscotelephony.sheet.in.h:7
+#: sheets/ciscotelephony.sheet:10
 msgid "Phone Feature"
 msgstr "电话功能"
 
-#: ../sheets/ciscotelephony.sheet.in.h:8
+#: sheets/ciscotelephony.sheet:11
 msgid "Phone/Fax"
 msgstr "电话/ä¼ çœŸ"
 
-#: ../sheets/ciscotelephony.sheet.in.h:9
+#: sheets/ciscotelephony.sheet:12
 msgid "HootPhone"
 msgstr "HootPhone"
 
-#: ../sheets/ciscotelephony.sheet.in.h:10
+#: sheets/ciscotelephony.sheet:13
 msgid "IP Phone"
 msgstr "IP 电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:11
+#: sheets/ciscotelephony.sheet:14
 msgid "IP Softphone"
 msgstr "IP 软件电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:12
+#: sheets/ciscotelephony.sheet:15
 msgid "Softphone"
 msgstr "软件电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:13
+#: sheets/ciscotelephony.sheet:16
 msgid "Cellular Phone"
 msgstr "蜂窝电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:14
+#: sheets/ciscotelephony.sheet:17
 msgid "Mobile Access IP Phone"
 msgstr "移动存取 IP 电话"
 
-#: ../sheets/ciscotelephony.sheet.in.h:15
+#: sheets/ciscotelephony.sheet:18
 msgid "Pager"
 msgstr "寻呼机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:16
+#: sheets/ciscotelephony.sheet:19
 msgid "Fax"
 msgstr "Fax"
 
-#: ../sheets/ciscotelephony.sheet.in.h:17
+#: sheets/ciscotelephony.sheet:20
 msgid "Turret"
 msgstr "塔楼"
 
-#: ../sheets/ciscotelephony.sheet.in.h:18
+#: sheets/ciscotelephony.sheet:21
 msgid "Octel"
 msgstr "Octel"
 
-#: ../sheets/ciscotelephony.sheet.in.h:19
+#: sheets/ciscotelephony.sheet:22
 msgid "Radio Tower"
 msgstr "æ— çº¿ç”µå¡”"
 
-#: ../sheets/ciscotelephony.sheet.in.h:20
+#: sheets/ciscotelephony.sheet:23
 msgid "PBX"
 msgstr "专用小交换机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:21
+#: sheets/ciscotelephony.sheet:24
 msgid "PBX Switch"
 msgstr "PBX 交换机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:22
+#: sheets/ciscotelephony.sheet:25
 msgid "Class 4/5 switch"
 msgstr "Class 4/5 交换机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:23
+#: sheets/ciscotelephony.sheet:26
 msgid "SONET MUX"
 msgstr "SONET MUX"
 
-#: ../sheets/ciscotelephony.sheet.in.h:24
+#: sheets/ciscotelephony.sheet:27
 msgid "ADM"
 msgstr "ADM"
 
-#: ../sheets/ciscotelephony.sheet.in.h:25
+#: sheets/ciscotelephony.sheet:28
 msgid "ITP"
 msgstr "ITP"
 
-#: ../sheets/ciscotelephony.sheet.in.h:26
+#: sheets/ciscotelephony.sheet:29
 msgid "ATA"
 msgstr "ATA"
 
-#: ../sheets/ciscotelephony.sheet.in.h:27
+#: sheets/ciscotelephony.sheet:30
 msgid "SIP Proxy Server"
 msgstr "SIP 代理服务器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:28
+#: sheets/ciscotelephony.sheet:31
 msgid "Gatekeeper"
 msgstr "Gatekeeper"
 
-#: ../sheets/ciscotelephony.sheet.in.h:29
+#: sheets/ciscotelephony.sheet:32
 msgid "MGX 8000 Series Voice Gateway"
 msgstr "MGX 8000 系列语音网关"
 
-#: ../sheets/ciscotelephony.sheet.in.h:30
+#: sheets/ciscotelephony.sheet:33
 msgid "End Office"
 msgstr "终端办公室"
 
-#: ../sheets/ciscotelephony.sheet.in.h:31
+#: sheets/ciscotelephony.sheet:34
 msgid "Voice-Enabled Access Server"
 msgstr "有语音功能的存取服务器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:32
+#: sheets/ciscotelephony.sheet:35
 msgid "Voice-Enabled Router"
 msgstr "防火墙路由器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:33
+#: sheets/ciscotelephony.sheet:36
 msgid "Voice-Enabled ATM Switch"
 msgstr "有语音功能的 ATM 交换机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:34
+#: sheets/ciscotelephony.sheet:37
 msgid "CallManager"
 msgstr "访问管理器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:35
+#: sheets/ciscotelephony.sheet:38
 msgid "IP Telephony Router"
 msgstr "IP 电话通讯路由器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:36
+#: sheets/ciscotelephony.sheet:39
 msgid "Mobile Access Router"
 msgstr "移动存取路由器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:37
+#: sheets/ciscotelephony.sheet:40
 msgid "H.323"
 msgstr "H.323"
 
-#: ../sheets/ciscotelephony.sheet.in.h:38
+#: sheets/ciscotelephony.sheet:41
 msgid "STP"
 msgstr "STP"
 
-#: ../sheets/ciscotelephony.sheet.in.h:39
+#: sheets/ciscotelephony.sheet:42
 msgid "BTS 10200"
 msgstr "BTS 10200"
 
-#: ../sheets/ciscotelephony.sheet.in.h:40
+#: sheets/ciscotelephony.sheet:43
 msgid "Generic softswitch"
 msgstr "普通软件交换机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:41
+#: sheets/ciscotelephony.sheet:44
 msgid "SC2200/VSC3000 host"
 msgstr "SC2200/VSC3000 主机"
 
-#: ../sheets/ciscotelephony.sheet.in.h:42
+#: sheets/ciscotelephony.sheet:45
 msgid "Virtual switch controller (VSC 3000)"
 msgstr "虚似交换机控制器 (VSC 3000)"
 
-#: ../sheets/ciscotelephony.sheet.in.h:43
+#: sheets/ciscotelephony.sheet:46
 msgid "SC2200 (Signalling Controller)"
 msgstr "SC2200 (信号控制器)"
 
-#: ../sheets/ciscotelephony.sheet.in.h:44
+#: sheets/ciscotelephony.sheet:47
 msgid "MoH server (Music on Hold)"
 msgstr "MoH 服务(Music on Hold)"
 
-#: ../sheets/ciscotelephony.sheet.in.h:45
+#: sheets/ciscotelephony.sheet:48
 msgid "TDM router"
 msgstr "TDM 路由器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:46
+#: sheets/ciscotelephony.sheet:49
 msgid "6701"
 msgstr "6701"
 
-#: ../sheets/ciscotelephony.sheet.in.h:47
+#: sheets/ciscotelephony.sheet:50
 msgid "6705"
 msgstr "6705"
 
-#: ../sheets/ciscotelephony.sheet.in.h:48
+#: sheets/ciscotelephony.sheet:51
 msgid "6732"
 msgstr "6732"
 
-#: ../sheets/ciscotelephony.sheet.in.h:49
+#: sheets/ciscotelephony.sheet:52
 msgid "IAD router"
 msgstr "IAD 路由器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:50
+#: sheets/ciscotelephony.sheet:53
 msgid "ICS"
 msgstr "ICS"
 
-#: ../sheets/ciscotelephony.sheet.in.h:51
+#: sheets/ciscotelephony.sheet:54
 msgid "ICM"
 msgstr "ICM"
 
-#: ../sheets/ciscotelephony.sheet.in.h:52
+#: sheets/ciscotelephony.sheet:55
 msgid "IntelliSwitch Stack"
 msgstr "IntelliSwitch Stack"
 
-#: ../sheets/ciscotelephony.sheet.in.h:53
+#: sheets/ciscotelephony.sheet:56
 msgid "Unity server"
 msgstr "Unity 服务器"
 
-#: ../sheets/ciscotelephony.sheet.in.h:54
+#: sheets/ciscotelephony.sheet:57
 msgid "Unity Express"
 msgstr "UUnity Express"
 
-#: ../sheets/ciscotelephony.sheet.in.h:55
+#: sheets/ciscotelephony.sheet:58
 msgid "MCU"
 msgstr "MCU"
 
-#: ../sheets/ciscotelephony.sheet.in.h:56
+#: sheets/ciscotelephony.sheet:59
 msgid "uMG series"
 msgstr "uMG 系列"
 
-#: ../sheets/civil.sheet.in.h:1
+#: sheets/civil.sheet:3
 msgid "Civil"
 msgstr "民用"
 
-#: ../sheets/civil.sheet.in.h:2
+#: sheets/civil.sheet:4
 msgid "Civil Engineering Components"
 msgstr "民用的工程部件"
 
-#: ../sheets/civil.sheet.in.h:3
+#: sheets/civil.sheet:7
 msgid "Vertical rest"
 msgstr "垂直的支架"
 
-#: ../sheets/civil.sheet.in.h:4
+#: sheets/civil.sheet:10
 msgid "Horizontal rest"
 msgstr "水平的支架"
 
-#: ../sheets/civil.sheet.in.h:5
+#: sheets/civil.sheet:13
 msgid "Bivalent vertical rest"
 msgstr "Bivalent vertical rest"
 
-#: ../sheets/civil.sheet.in.h:6
+#: sheets/civil.sheet:16
 msgid "Reference line"
 msgstr "参考线"
 
-#: ../sheets/civil.sheet.in.h:7
+#: sheets/civil.sheet:19
 msgid "Water level"
 msgstr "水位"
 
-#: ../sheets/civil.sheet.in.h:8
+#: sheets/civil.sheet:22
 msgid "Soil"
 msgstr "泥土"
 
-#: ../sheets/civil.sheet.in.h:9
+#: sheets/civil.sheet:25
 msgid "Horizontally aligned arrow"
 msgstr "水平排列的箭头"
 
-#: ../sheets/civil.sheet.in.h:10
+#: sheets/civil.sheet:28
 msgid "Vertically aligned arrow"
 msgstr "竖直排列的箭头"
 
-#: ../sheets/civil.sheet.in.h:11
+#: sheets/civil.sheet:31
 msgid "Horizontal limiting line"
 msgstr "水平的限定线"
 
-#: ../sheets/civil.sheet.in.h:12
+#: sheets/civil.sheet:34
 msgid "Vertical limiting line"
 msgstr "垂直的限定值线"
 
-#: ../sheets/civil.sheet.in.h:13
+#: sheets/civil.sheet:37
 msgid "Horizontally aligned pump"
 msgstr "水平排列的泵"
 
-#: ../sheets/civil.sheet.in.h:14
+#: sheets/civil.sheet:40
 msgid "Vertically aligned pump"
 msgstr "竖直排列的泵"
 
-#: ../sheets/civil.sheet.in.h:15
+#: sheets/civil.sheet:43
 msgid "Horizontally aligned compressor"
 msgstr "水平排列的压缩机"
 
-#: ../sheets/civil.sheet.in.h:16
+#: sheets/civil.sheet:46
 msgid "Vertically aligned compressor"
 msgstr "竖直排列的压缩机"
 
-#: ../sheets/civil.sheet.in.h:17
+#: sheets/civil.sheet:49
 msgid "Vertically aligned valve"
 msgstr "竖直排列的阀"
 
-#: ../sheets/civil.sheet.in.h:18
+#: sheets/civil.sheet:52
 msgid "Horizontally aligned valve"
 msgstr "水平排列的阀"
 
-#: ../sheets/civil.sheet.in.h:19
+#: sheets/civil.sheet:55
 msgid "Backflow preventer"
 msgstr "逆流防止设备"
 
-#: ../sheets/civil.sheet.in.h:20
+#: sheets/civil.sheet:58
 msgid "Motor"
 msgstr "马达"
 
-#: ../sheets/civil.sheet.in.h:21
+#: sheets/civil.sheet:61
 msgid "Gas bottle"
 msgstr "气体瓶子"
 
-#: ../sheets/civil.sheet.in.h:22
+#: sheets/civil.sheet:64
 msgid "Frequency converter"
 msgstr "变频器"
 
-#: ../sheets/civil.sheet.in.h:23
+#: sheets/civil.sheet:67
 msgid "Vertically aligned propeller"
 msgstr "竖直排列的推进器"
 
-#: ../sheets/civil.sheet.in.h:24
+#: sheets/civil.sheet:70
 msgid "Aerator with bubbles"
 msgstr "气泡曝气器"
 
-#: ../sheets/civil.sheet.in.h:25
+#: sheets/civil.sheet:73
 msgid "Rotor"
 msgstr "转子"
 
-#: ../sheets/civil.sheet.in.h:26
+#: sheets/civil.sheet:76
 msgid "Final-settling basin"
 msgstr "æœ€åŽæ²‰æ·€æ± "
 
-#: ../sheets/civil.sheet.in.h:27
+#: sheets/civil.sheet:79
 msgid "Preliminary clarification tank"
 msgstr "初步净化槽"
 
-#: ../sheets/civil.sheet.in.h:28
+#: sheets/civil.sheet:82
 msgid "Basin"
 msgstr "æ°´æ± "
 
-#: ../sheets/civil.sheet.in.h:29
+#: sheets/civil.sheet:85
 msgid "Container"
 msgstr "容器"
 
-#: ../sheets/Contact.sheet.in.h:1
+#: sheets/Contact.sheet:3
 msgid "Ladder"
 msgstr "Ladder"
 
-#: ../sheets/Contact.sheet.in.h:2
+#: sheets/Contact.sheet:4
 msgid "Components for LADDER circuits"
 msgstr "LADDER 电路的部件"
 
-#: ../sheets/Contact.sheet.in.h:3
+#: sheets/Contact.sheet:7
 msgid "'if' (normally open) ladder contact"
 msgstr "“if” (常开) 连接 ladder"
 
-#: ../sheets/Contact.sheet.in.h:4
+#: sheets/Contact.sheet:10
 msgid "'if not' (normally closed) ladder contact"
 msgstr "“if not” (常闭) 连接 ladder"
 
-#: ../sheets/Contact.sheet.in.h:5
+#: sheets/Contact.sheet:14
 msgid "Simple output variable"
 msgstr "简单的输出变量"
 
-#: ../sheets/Contact.sheet.in.h:6
+#: sheets/Contact.sheet:17
 msgid "Negative output variable"
 msgstr "负输出变量"
 
-#: ../sheets/Contact.sheet.in.h:7
+#: sheets/Contact.sheet:20
 msgid "'set' output variable"
 msgstr "“set” 输出变量"
 
-#: ../sheets/Contact.sheet.in.h:8
+#: sheets/Contact.sheet:23
 msgid "'reset' output variable"
 msgstr "“reset” 输出变量"
 
-#: ../sheets/Contact.sheet.in.h:9
+#: sheets/Contact.sheet:26
 msgid "'jump' output variable"
 msgstr "“jump” 输出变量"
 
-#: ../sheets/Contact.sheet.in.h:10
+#: sheets/Contact.sheet:29
 msgid "Receptivity output variable"
 msgstr "可接接度输出变量"
 
-#: ../sheets/Contact.sheet.in.h:11
+#: sheets/Contact.sheet:33
 msgid "Power-saved simple output variable"
 msgstr "节电的简单输出变量"
 
-#: ../sheets/Contact.sheet.in.h:12
+#: sheets/Contact.sheet:36
 msgid "Power-saved negative output variable"
 msgstr "节电的负输出变量"
 
-#: ../sheets/Contact.sheet.in.h:13
+#: sheets/Contact.sheet:39
 msgid "Power-saved 'set' output variable"
 msgstr "节电“set”输出变量"
 
-#: ../sheets/Contact.sheet.in.h:14
+#: sheets/Contact.sheet:42
 msgid "Power-saved 'reset' output variable"
 msgstr "节电“reset”输出变量"
 
-#: ../sheets/Cybernetics.sheet.in.h:1
+#: sheets/Cybernetics.sheet:4
 msgid "Cybernetics"
 msgstr "控制论"
 
-#: ../sheets/Cybernetics.sheet.in.h:2
+#: sheets/Cybernetics.sheet:5
 msgid "Elements of cybernetic circuits"
 msgstr "控制电路的部件"
 
-#: ../sheets/Cybernetics.sheet.in.h:3
+#: sheets/Cybernetics.sheet:9
 msgid "Sensor — left"
 msgstr "ä¼ æ„Ÿå™¨ — (å·¦)"
 
-#: ../sheets/Cybernetics.sheet.in.h:4
+#: sheets/Cybernetics.sheet:12
 msgid "Sensor — right"
 msgstr "ä¼ æ„Ÿå™¨ — (右)"
 
-#: ../sheets/Cybernetics.sheet.in.h:5
+#: sheets/Cybernetics.sheet:15
 msgid "Sensor — bottom"
 msgstr "ä¼ æ„Ÿå™¨ — (下)"
 
-#: ../sheets/Cybernetics.sheet.in.h:6
+#: sheets/Cybernetics.sheet:18
 msgid "Sensor — top"
 msgstr "ä¼ æ„Ÿå™¨ — (上)"
 
-#: ../sheets/Cybernetics.sheet.in.h:7
+#: sheets/Cybernetics.sheet:24
 msgid "Sum, subtracting left input"
 msgstr "总数， 减去左方输入"
 
-#: ../sheets/Cybernetics.sheet.in.h:8
+#: sheets/Cybernetics.sheet:27
 msgid "Sum, subtracting right input"
 msgstr "总数， 减去右方输入"
 
-#: ../sheets/Cybernetics.sheet.in.h:9
+#: sheets/Cybernetics.sheet:30
 msgid "Sum, subtracting bottom input"
 msgstr "总数， 减去下方输入"
 
-#: ../sheets/Cybernetics.sheet.in.h:10
+#: sheets/Cybernetics.sheet:33
 msgid "Sum, subtracting top input"
 msgstr "总数， 减去上方输入"
 
-#: ../sheets/Cybernetics.sheet.in.h:11
+#: sheets/Cybernetics.sheet:39
 msgid "Integrator — input left"
 msgstr "积分器 — 输入(左)"
 
-#: ../sheets/Cybernetics.sheet.in.h:12
+#: sheets/Cybernetics.sheet:42
 msgid "Integrator — input right"
 msgstr "积分器 — 输入(右)"
 
-#: ../sheets/Cybernetics.sheet.in.h:13
+#: sheets/Cybernetics.sheet:45
 msgid "Integrator — input bottom"
 msgstr "积分器 — 输入(下)"
 
-#: ../sheets/Cybernetics.sheet.in.h:14
+#: sheets/Cybernetics.sheet:48
 msgid "Integrator — input top"
 msgstr "积分器 — 输入(上)"
 
-#: ../sheets/Cybernetics.sheet.in.h:15
+#: sheets/Cybernetics.sheet:54
 msgid "Sum"
 msgstr "总数"
 
-#: ../sheets/Cybernetics.sheet.in.h:16
+#: sheets/Cybernetics.sheet:57
 msgid "Product"
 msgstr "产物"
 
-#: ../sheets/Cybernetics.sheet.in.h:17
+#: sheets/Cybernetics.sheet:61
 msgid "High pass filter"
 msgstr "高通滤波器"
 
-#: ../sheets/Cybernetics.sheet.in.h:18
+#: sheets/Cybernetics.sheet:64
 msgid "Low pass filter"
 msgstr "低通滤波器"
 
-#: ../sheets/Cybernetics.sheet.in.h:19
+#: sheets/Cybernetics.sheet:70
 msgid "Sine characteristic or input"
 msgstr "正弦特性或输出"
 
-#: ../sheets/Cybernetics.sheet.in.h:20
+#: sheets/Cybernetics.sheet:73
 msgid "Sigmoid characteristic"
 msgstr "双弯曲特性"
 
-#: ../sheets/Cybernetics.sheet.in.h:21
+#: sheets/Cybernetics.sheet:76
 msgid "Saturation characteristic"
 msgstr "饱和特性"
 
-#: ../sheets/Cybernetics.sheet.in.h:22
+#: sheets/Cybernetics.sheet:79
 msgid "Relay characteristic (sigma)"
 msgstr "继电器特性(sigma)"
 
-#: ../sheets/Cybernetics.sheet.in.h:23
+#: sheets/Cybernetics.sheet:85
 msgid "Half wave rectifier or ramp input"
 msgstr "半波整流器或 ramp 输入"
 
-#: ../sheets/Cybernetics.sheet.in.h:24
+#: sheets/Cybernetics.sheet:88
 msgid "Full wave rectifier (absolute value)"
 msgstr "全波整流器(绝对值)"
 
-#: ../sheets/Cybernetics.sheet.in.h:25
+#: sheets/Cybernetics.sheet:92
 msgid "Constant positive shift on the y-axis"
 msgstr "y 轴的正向平移"
 
-#: ../sheets/Cybernetics.sheet.in.h:26
+#: sheets/Cybernetics.sheet:95
 msgid "Constant negative shift on the y-axis"
 msgstr "y 轴的负向平移"
 
-#: ../sheets/Cybernetics.sheet.in.h:27
+#: sheets/Cybernetics.sheet:101
 msgid "Constant factor greater 1"
 msgstr "固定系数大于 1"
 
-#: ../sheets/Cybernetics.sheet.in.h:28
+#: sheets/Cybernetics.sheet:104
 msgid "Constant factor between 0 and 1"
 msgstr "固定系数 0 和 1"
 
-#: ../sheets/Cybernetics.sheet.in.h:29
+#: sheets/Cybernetics.sheet:107
 msgid "Constant factor between 0 and -1"
 msgstr "固定系数 0 和 -1"
 
-#: ../sheets/Cybernetics.sheet.in.h:30
+#: sheets/Cybernetics.sheet:110
 msgid "Constant factor below -1"
 msgstr "å› å®šç³»ç»Ÿå°äºŽ -1"
 
-#: ../sheets/Cybernetics.sheet.in.h:31
+#: sheets/Cybernetics.sheet:116
 msgid "Template for custom characteristics"
 msgstr "自选特性的模板"
 
-#: ../sheets/Cybernetics.sheet.in.h:32
+#: sheets/Cybernetics.sheet:119
 msgid "Time delay"
 msgstr "时间延迟"
 
-#: ../sheets/Database.sheet.in.h:1
+#: sheets/Database.sheet:3
 msgid "Database"
 msgstr "数据库"
 
-#: ../sheets/Database.sheet.in.h:2
+#: sheets/Database.sheet:4
 msgid "Editor for Database Table Relation Diagrams"
 msgstr "数据库表关系图编辑器"
 
-#: ../sheets/Database.sheet.in.h:5
+#: sheets/Database.sheet:13
 msgid "Attribute compound"
 msgstr "属性复合"
 
-#: ../sheets/Electric.sheet.in.h:1
+#. Author: Marcus Kossatz, 2019
+#: sheets/EDPC.sheet:4
+msgid "EDPC"
+msgstr "EDPC"
+
+#: sheets/EDPC.sheet:5
+#, fuzzy
+#| msgid "Objects to draw flowcharts"
+msgid "Objects to draw event-driven process chains"
+msgstr "画流量图的对象"
+
+#: sheets/EDPC.sheet:7
+msgid "Business Process"
+msgstr "商业进程"
+
+#: sheets/EDPC.sheet:8
+msgid "Process Group"
+msgstr "进程组"
+
+#: sheets/EDPC.sheet:9 sheets/FS.sheet:13
+msgid "Function"
+msgstr "函数"
+
+#: sheets/EDPC.sheet:10
+msgid "Event"
+msgstr "事件"
+
+#: sheets/EDPC.sheet:13
+msgid "Organisation Unit"
+msgstr "组织单位"
+
+#: sheets/EDPC.sheet:14 sheets/Flowchart.sheet:29
+msgid "Document"
+msgstr "文档"
+
+#: sheets/EDPC.sheet:15
+msgid "Operator AND (Input)"
+msgstr ""
+
+#: sheets/EDPC.sheet:16
+msgid "Operator AND (Output)"
+msgstr ""
+
+#: sheets/EDPC.sheet:17
+#, fuzzy
+#| msgid "Inclusive (OR)"
+msgid "Operator Inclusive (OR) (Input)"
+msgstr "包括(OR)"
+
+#: sheets/EDPC.sheet:18
+#, fuzzy
+#| msgid "Inclusive (OR)"
+msgid "Operator Inclusive (OR) (Output)"
+msgstr "包括(OR)"
+
+#: sheets/EDPC.sheet:19
+#, fuzzy
+#| msgid "Exclusive (XOR) Event Based"
+msgid "Operator Exclusive (XOR) (Input)"
+msgstr "唯一的 (XOR) 事件基地"
+
+#: sheets/EDPC.sheet:20
+msgid "Operator Exclusive (XOR) (Output)"
+msgstr ""
+
+#: sheets/Electric.sheet:3
 msgid "Electric"
 msgstr "电"
 
-#: ../sheets/Electric.sheet.in.h:2
+#: sheets/Electric.sheet:4
 msgid "Components for electric circuits"
 msgstr "电路部件"
 
-#: ../sheets/Electric.sheet.in.h:3
+#: sheets/Electric.sheet:7
 msgid "Normally open contact (horizontal)"
 msgstr "常开触点(水平)"
 
-#: ../sheets/Electric.sheet.in.h:4
+#: sheets/Electric.sheet:10
 msgid "Normally closed contact (horizontal)"
 msgstr "常闭触点(水平)"
 
-#: ../sheets/Electric.sheet.in.h:5
+#: sheets/Electric.sheet:13
 msgid "Normally open position switch (horizontal)"
 msgstr "常开位置开关(水平)"
 
-#: ../sheets/Electric.sheet.in.h:6
+#: sheets/Electric.sheet:16
 msgid "Normally closed position switch (horizontal)"
 msgstr "常闭位置开关(水平)"
 
-#: ../sheets/Electric.sheet.in.h:7
+#: sheets/Electric.sheet:20
 msgid "Normally open contact (vertical)"
 msgstr "常开触点(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:8
+#: sheets/Electric.sheet:23
 msgid "Normally closed contact (vertical)"
 msgstr "常闭触点(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:9
+#: sheets/Electric.sheet:26
 msgid "Normally open position switch (vertical)"
 msgstr "常开位置开关(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:10
+#: sheets/Electric.sheet:29
 msgid "Normally closed position switch (vertical)"
 msgstr "常闭位置开关(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:11
+#: sheets/Electric.sheet:33
 msgid "The command organ of a relay (horizontal)"
 msgstr "继电器命令元件(水平)"
 
-#: ../sheets/Electric.sheet.in.h:12
+#: sheets/Electric.sheet:36
 msgid "Relay (horizontal)"
 msgstr "继电器(水平)"
 
-#: ../sheets/Electric.sheet.in.h:13
+#: sheets/Electric.sheet:39
 msgid "Lamp or indicator light (horizontal)"
 msgstr "灯或指示灯(水平)"
 
-#: ../sheets/Electric.sheet.in.h:14
+#: sheets/Electric.sheet:43
 msgid "The command organ of a relay (vertical)"
 msgstr "继电器命令元件(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:15
+#: sheets/Electric.sheet:46
 msgid "Relay (vertical)"
 msgstr "继电器(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:16
+#: sheets/Electric.sheet:49
 msgid "Lamp or indicator light (vertical)"
 msgstr "灯或指示灯(垂直)"
 
-#: ../sheets/Electric.sheet.in.h:17 ../sheets/Pneumatic.sheet.in.h:22
+#: sheets/Electric.sheet:55 sheets/Pneumatic.sheet:76
 msgid "Connection point"
 msgstr "连接点"
 
-#: ../sheets/ER.sheet.in.h:1
+#: sheets/ER.sheet:3
 msgid "ER"
 msgstr "ER"
 
-#: ../sheets/ER.sheet.in.h:2
+#: sheets/ER.sheet:4
 msgid "Editor for Entity Relations Diagrams"
 msgstr "Entity Relations 图编辑器"
 
-#: ../sheets/ER.sheet.in.h:4
+#: sheets/ER.sheet:10
 msgid "Weak entity"
 msgstr "弱实体"
 
-#: ../sheets/ER.sheet.in.h:7
+#: sheets/ER.sheet:11
+msgid "res:/org/gnome/Dia/ER/weakentity.png"
+msgstr "res:/org/gnome/Dia/ER/weakentity.png"
+
+#: sheets/ER.sheet:20
 msgid "Participation"
 msgstr "参与"
 
-#: ../sheets/Flowchart.sheet.in.h:2
+#: sheets/Flowchart.sheet:4
 msgid "Objects to draw flowcharts"
 msgstr "画流量图的对象"
 
-#: ../sheets/Flowchart.sheet.in.h:3
+#: sheets/Flowchart.sheet:7
 msgid "Process/Auxiliary Operation"
 msgstr "程序/辅助操作"
 
-#: ../sheets/Flowchart.sheet.in.h:4
+#: sheets/Flowchart.sheet:10
 msgid "Input/Output"
 msgstr "输入/输出"
 
-#: ../sheets/Flowchart.sheet.in.h:5 ../sheets/SDL.sheet.in.h:14
+#: sheets/Flowchart.sheet:13 sheets/SDL.sheet:40
 msgid "Decision"
 msgstr "决定"
 
-#: ../sheets/Flowchart.sheet.in.h:6
+#: sheets/Flowchart.sheet:16
 msgid "Connector"
 msgstr "连接器"
 
-#: ../sheets/Flowchart.sheet.in.h:8
+#: sheets/Flowchart.sheet:22
 msgid "Transaction file"
 msgstr "事务文件"
 
 #. XXX
-#: ../sheets/Flowchart.sheet.in.h:10
+#: sheets/Flowchart.sheet:26
 msgid "Off page connector"
 msgstr "脱离页面连接器"
 
-#: ../sheets/Flowchart.sheet.in.h:11
-msgid "Document"
-msgstr "文档"
-
-#: ../sheets/Flowchart.sheet.in.h:12
+#: sheets/Flowchart.sheet:32
 msgid "Manual operation"
 msgstr "手工操作"
 
-#: ../sheets/Flowchart.sheet.in.h:13
+#: sheets/Flowchart.sheet:35
 msgid "Preparation"
 msgstr "预备"
 
-#: ../sheets/Flowchart.sheet.in.h:14
+#: sheets/Flowchart.sheet:38
 msgid "Manual input"
 msgstr "手工输入"
 
-#: ../sheets/Flowchart.sheet.in.h:15
+#: sheets/Flowchart.sheet:41
 msgid "Predefined process"
 msgstr "预定义的进程"
 
-#: ../sheets/Flowchart.sheet.in.h:16
+#: sheets/Flowchart.sheet:44
 msgid "Terminal Interrupt"
 msgstr "终端中断"
 
-#: ../sheets/Flowchart.sheet.in.h:17
+#: sheets/Flowchart.sheet:47
 msgid "Magnetic disk"
 msgstr "磁盘"
 
-#: ../sheets/Flowchart.sheet.in.h:18
+#: sheets/Flowchart.sheet:50
 msgid "Magnetic drum"
 msgstr "磁鼓"
 
-#: ../sheets/Flowchart.sheet.in.h:19
+#: sheets/Flowchart.sheet:53
 msgid "Magnetic tape"
 msgstr "磁带"
 
-#: ../sheets/Flowchart.sheet.in.h:20
+#: sheets/Flowchart.sheet:56
 msgid "Internal storage"
 msgstr "内部的存储器"
 
-#: ../sheets/Flowchart.sheet.in.h:21
+#: sheets/Flowchart.sheet:59
 msgid "Merge"
 msgstr "合并"
 
-#: ../sheets/Flowchart.sheet.in.h:23
+#: sheets/Flowchart.sheet:65
 msgid "Delay"
 msgstr "延迟"
 
 #. XXX
-#: ../sheets/Flowchart.sheet.in.h:25
+#: sheets/Flowchart.sheet:69
 msgid "Summing junction"
 msgstr "相交点"
 
 #. XXX
-#: ../sheets/Flowchart.sheet.in.h:27
+#: sheets/Flowchart.sheet:73
 msgid "Collate"
 msgstr "对照"
 
-#: ../sheets/Flowchart.sheet.in.h:28
+#: sheets/Flowchart.sheet:76
 msgid "Sort"
 msgstr "排序"
 
-#: ../sheets/Flowchart.sheet.in.h:29
+#: sheets/Flowchart.sheet:79
 msgid "Or"
 msgstr "Or"
 
-#: ../sheets/Flowchart.sheet.in.h:30
+#: sheets/Flowchart.sheet:82
 msgid "Punched card"
 msgstr "穿孔卡片"
 
-#: ../sheets/Flowchart.sheet.in.h:31
+#: sheets/Flowchart.sheet:85
 msgid "Punched tape"
 msgstr "穿孔带"
 
-#: ../sheets/Flowchart.sheet.in.h:32
+#: sheets/Flowchart.sheet:88
 msgid "Transmittal tape"
 msgstr "ä¼ é€å¸¦"
 
-#: ../sheets/Flowchart.sheet.in.h:33
+#: sheets/Flowchart.sheet:91
 msgid "Offline storage"
 msgstr "脱机存储"
 
-#: ../sheets/Flowchart.sheet.in.h:34
+#: sheets/Flowchart.sheet:94
 msgid "Data source"
 msgstr "资料来源"
 
-#: ../sheets/FS.sheet.in.h:1
+#: sheets/FS.sheet:3
 msgid "FS"
 msgstr "FS"
 
-#: ../sheets/FS.sheet.in.h:2
+#: sheets/FS.sheet:4
 msgid "Editor for Function Structure Diagrams."
 msgstr "函数结构图编辑器。"
 
-#: ../sheets/FS.sheet.in.h:3
+#: sheets/FS.sheet:7
 msgid "Flow"
 msgstr "流程"
 
-#: ../sheets/FS.sheet.in.h:4
+#: sheets/FS.sheet:10
 msgid "Orthogonal polyline flow"
 msgstr "创建一个正交多线流"
 
-#: ../sheets/FS.sheet.in.h:5
-msgid "Function"
-msgstr "函数"
-
+#. Dia-Version: 0.94
+#. Date: Sun Oct 23 17:12:11 2005
 #. Author: Nicholas Moore, 2005. mailto: shiny nickel gmail com
-#: ../sheets/Gane_and_Sarson.sheet.in.h:2
+#: sheets/Gane_and_Sarson.sheet:7
 msgid "Gane and Sarson"
 msgstr "Gane and Sarson"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:3
+#: sheets/Gane_and_Sarson.sheet:8
 msgid "Gane and Sarson DFD"
 msgstr "Gane and Sarson DFD"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:4
+#: sheets/Gane_and_Sarson.sheet:12
 msgid "Alternate external entity"
 msgstr "替代外部实体"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:5
+#: sheets/Gane_and_Sarson.sheet:15
 msgid "Data store"
 msgstr "资料储存"
 
-#: ../sheets/Gane_and_Sarson.sheet.in.h:6
+#: sheets/Gane_and_Sarson.sheet:18
 msgid "External entity"
 msgstr "外部实体"
 
-#: ../sheets/GRAFCET.sheet.in.h:1
+#: sheets/GRAFCET.sheet:3
 msgid "GRAFCET"
 msgstr "GRAFCET"
 
-#: ../sheets/GRAFCET.sheet.in.h:2
+#: sheets/GRAFCET.sheet:4
 msgid "Objects to design GRAFCET charts"
 msgstr "设计 GRAFCET 图表所需的对象"
 
-#: ../sheets/GRAFCET.sheet.in.h:8
+#: sheets/GRAFCET.sheet:11
+msgid "res:/org/gnome/Dia/GRAFCET/etapei.png"
+msgstr "res:/org/gnome/Dia/GRAFCET/etapei.png"
+
+#: sheets/GRAFCET.sheet:15
+msgid "res:/org/gnome/Dia/GRAFCET/etapeme.png"
+msgstr "res:/org/gnome/Dia/GRAFCET/etapeme.png"
+
+#: sheets/GRAFCET.sheet:19
+msgid "res:/org/gnome/Dia/GRAFCET/etapems.png"
+msgstr "res:/org/gnome/Dia/GRAFCET/etapems.png"
+
+#: sheets/GRAFCET.sheet:23
+msgid "res:/org/gnome/Dia/GRAFCET/etapemc.png"
+msgstr "res:/org/gnome/Dia/GRAFCET/etapemc.png"
+
+#: sheets/GRAFCET.sheet:26
 msgid "Macro sub-program call step"
 msgstr "宏子程序调用步骤"
 
-#: ../sheets/GRAFCET.sheet.in.h:9
+#: sheets/GRAFCET.sheet:27
+msgid "res:/org/gnome/Dia/GRAFCET/etapesp.png"
+msgstr "res:/org/gnome/Dia/GRAFCET/etapesp.png"
+
+#: sheets/GRAFCET.sheet:31
 msgid "Action to associate to a step"
 msgstr "与步骤相关的动作"
 
-#: ../sheets/GRAFCET.sheet.in.h:10
+#: sheets/GRAFCET.sheet:34
 msgid "Condition (of an action)"
 msgstr "条件(一个动作的)"
 
-#: ../sheets/GRAFCET.sheet.in.h:11 ../sheets/UML.sheet.in.h:32
+#: sheets/GRAFCET.sheet:38 sheets/UML.sheet:99
 msgid "Transition"
 msgstr "推移"
 
-#: ../sheets/GRAFCET.sheet.in.h:12
+#: sheets/GRAFCET.sheet:41
 msgid "OR vergent"
 msgstr "OR vergent"
 
-#: ../sheets/GRAFCET.sheet.in.h:13
+#: sheets/GRAFCET.sheet:44
 msgid "AND vergent"
 msgstr "AND vergent"
 
-#: ../sheets/GRAFCET.sheet.in.h:14
+#: sheets/GRAFCET.sheet:45
+msgid "res:/org/gnome/Dia/GRAFCET/vergent_and.png"
+msgstr "res:/org/gnome/Dia/GRAFCET/vergent_and.png"
+
+#: sheets/GRAFCET.sheet:49
 msgid "Arc (upward)"
 msgstr "弧形(向上)"
 
+#. Dia-Version: 0.90
+#: sheets/IsometricMap.sheet:5
+msgid "Alan Horkan"
+msgstr "Alan Horkan"
+
+#: sheets/IsometricMap.sheet:6
+msgid "Copyright Alan Horkan 2003"
+msgstr "版权所有 Alan Horkan 2003"
+
 #. use dc:title instead?
-#: ../sheets/IsometricMap.sheet.in.h:2
+#: sheets/IsometricMap.sheet:9
 msgid "Map, Isometric"
 msgstr "地图， Isometric"
 
+#. Visio calls theses Map, Directional Map 3D.
 #. use dc:description instead?
-#: ../sheets/IsometricMap.sheet.in.h:4
+#: sheets/IsometricMap.sheet:12
 msgid "Isometric Directional Map Shapes"
 msgstr "Isometric Directional 地图图形"
 
-#: ../sheets/IsometricMap.sheet.in.h:5
+#: sheets/IsometricMap.sheet:16
 msgid "Road Section"
 msgstr "道路"
 
-#: ../sheets/IsometricMap.sheet.in.h:6
+#: sheets/IsometricMap.sheet:17
 msgid "Long Straight Road Section"
 msgstr "长直线道路"
 
-#: ../sheets/IsometricMap.sheet.in.h:7
+#: sheets/IsometricMap.sheet:19
 msgid "Crossroads"
 msgstr "交叉点"
 
-#: ../sheets/IsometricMap.sheet.in.h:8
+#: sheets/IsometricMap.sheet:21
 msgid "T-Junction"
 msgstr "三叉路"
 
-#: ../sheets/IsometricMap.sheet.in.h:9
+#: sheets/IsometricMap.sheet:24
 msgid "Elevated Road"
 msgstr "高架道路"
 
-#: ../sheets/IsometricMap.sheet.in.h:10
+#: sheets/IsometricMap.sheet:26
 msgid "Corner 1"
 msgstr "角落 1"
 
-#: ../sheets/IsometricMap.sheet.in.h:11
+#: sheets/IsometricMap.sheet:27
 msgid "Corner 2"
 msgstr "角落 2"
 
-#: ../sheets/IsometricMap.sheet.in.h:12
+#: sheets/IsometricMap.sheet:29
 msgid "River"
 msgstr "河流"
 
-#: ../sheets/IsometricMap.sheet.in.h:13
+#: sheets/IsometricMap.sheet:31
 msgid "Roof 1"
 msgstr "屋顶 1"
 
-#: ../sheets/IsometricMap.sheet.in.h:14
+#: sheets/IsometricMap.sheet:32
 msgid "Block 1, 2:4"
 msgstr "区块 1, 2:4"
 
-#: ../sheets/IsometricMap.sheet.in.h:15
+#: sheets/IsometricMap.sheet:33
 msgid "Block 2, 2:8"
 msgstr "区块 2, 2:8"
 
-#: ../sheets/IsometricMap.sheet.in.h:16
+#: sheets/IsometricMap.sheet:34
 msgid "Block 3, 4:4"
 msgstr "区块 3, 4:4"
 
-#: ../sheets/IsometricMap.sheet.in.h:17
+#: sheets/IsometricMap.sheet:35
 msgid "Block 4, 4:8"
 msgstr "区块 4, 4:8"
 
-#: ../sheets/IsometricMap.sheet.in.h:18
+#: sheets/IsometricMap.sheet:36
 msgid "Block 5, 3:3"
 msgstr "区块 5, 3:3"
 
-#: ../sheets/IsometricMap.sheet.in.h:19
+#: sheets/IsometricMap.sheet:37
 msgid "Block 6, 4:6"
 msgstr "区块 6, 4:6"
 
-#: ../sheets/IsometricMap.sheet.in.h:20
+#: sheets/IsometricMap.sheet:41
 msgid "Block 7"
 msgstr "区块 7"
 
-#: ../sheets/IsometricMap.sheet.in.h:21
+#: sheets/IsometricMap.sheet:43
 msgid "Factory"
 msgstr "工厂"
 
-#: ../sheets/IsometricMap.sheet.in.h:22
+#: sheets/IsometricMap.sheet:46
 msgid "Car 1, Front View"
 msgstr "车 1，前视图"
 
-#: ../sheets/IsometricMap.sheet.in.h:23
+#: sheets/IsometricMap.sheet:47
 msgid "Car 2, Rear View"
 msgstr "车 2，后视图"
 
-#: ../sheets/IsometricMap.sheet.in.h:24
+#: sheets/IsometricMap.sheet:58
 msgid "Train 1, angled downward"
 msgstr "火车 1，下行"
 
-#: ../sheets/IsometricMap.sheet.in.h:25
+#: sheets/IsometricMap.sheet:59
 msgid "Train 2, angled upward"
 msgstr "火车 2，上行"
 
-#: ../sheets/IsometricMap.sheet.in.h:26
+#: sheets/IsometricMap.sheet:62
 msgid "Tree 1"
 msgstr "æ ‘ 1"
 
-#: ../sheets/IsometricMap.sheet.in.h:27
+#: sheets/IsometricMap.sheet:64
 msgid "Footbridge, Pedestrian Bridge"
 msgstr "行人天桥"
 
-#: ../sheets/IsometricMap.sheet.in.h:28
+#: sheets/IsometricMap.sheet:65
 msgid "One Way Road Sign"
 msgstr "å•è¡Œé“æ ‡å¿—"
 
-#: ../sheets/Istar.sheet.in.h:1
+#: sheets/Istar.sheet:3
 msgid "RE-i*"
 msgstr "RE-i*"
 
-#: ../sheets/Istar.sheet.in.h:2
+#: sheets/Istar.sheet:4
 msgid "Objects to design i* diagrams"
 msgstr "设计 i* 所用的对象"
 
-#: ../sheets/Istar.sheet.in.h:3
+#: sheets/Istar.sheet:7
 msgid "An i* softgoal"
 msgstr "An i* softgoal"
 
-#: ../sheets/Istar.sheet.in.h:4
+#: sheets/Istar.sheet:10
 msgid "An i* goal"
 msgstr "An i* goal"
 
-#: ../sheets/Istar.sheet.in.h:5
+#: sheets/Istar.sheet:11
+msgid "res:/org/gnome/Dia/Istar/goal.png"
+msgstr "res:/org/gnome/Dia/Istar/goal.png"
+
+#: sheets/Istar.sheet:14
 msgid "An i* resource"
 msgstr "An i* resource"
 
-#: ../sheets/Istar.sheet.in.h:6
+#: sheets/Istar.sheet:17
 msgid "An i* task"
 msgstr "An i* task"
 
-#: ../sheets/Istar.sheet.in.h:7
+#: sheets/Istar.sheet:18
+msgid "res:/org/gnome/Dia/Istar/task.png"
+msgstr "res:/org/gnome/Dia/Istar/task.png"
+
+#: sheets/Istar.sheet:21
 msgid "An i* unspecified actor"
 msgstr "An i* unspecified actor"
 
-#: ../sheets/Istar.sheet.in.h:8
+#: sheets/Istar.sheet:24
 msgid "An i* agent"
 msgstr "An i* agent"
 
-#: ../sheets/Istar.sheet.in.h:9
+#: sheets/Istar.sheet:25
+msgid "res:/org/gnome/Dia/Istar/agent.png"
+msgstr "res:/org/gnome/Dia/Istar/agent.png"
+
+#: sheets/Istar.sheet:28
 msgid "An i* position"
 msgstr "An i* position"
 
-#: ../sheets/Istar.sheet.in.h:10
+#: sheets/Istar.sheet:29
+msgid "res:/org/gnome/Dia/Istar/position.png"
+msgstr "res:/org/gnome/Dia/Istar/position.png"
+
+#: sheets/Istar.sheet:32
 msgid "An i* role"
 msgstr "An i* role"
 
-#: ../sheets/Istar.sheet.in.h:11
+#: sheets/Istar.sheet:33
+msgid "res:/org/gnome/Dia/Istar/role.png"
+msgstr "res:/org/gnome/Dia/Istar/role.png"
+
+#: sheets/Istar.sheet:36
 msgid "An i* unspecified link"
 msgstr "An i* unspecified link"
 
-#: ../sheets/Istar.sheet.in.h:12
+#: sheets/Istar.sheet:39
 msgid "An i* positive contribution"
 msgstr "An i* positive contribution"
 
-#: ../sheets/Istar.sheet.in.h:13
+#: sheets/Istar.sheet:40
+msgid "res:/org/gnome/Dia/Istar/pos_contrib.png"
+msgstr "res:/org/gnome/Dia/Istar/pos_contrib.png"
+
+#: sheets/Istar.sheet:43
 msgid "An i* negative contribution"
 msgstr "An i* negative contribution"
 
-#: ../sheets/Istar.sheet.in.h:14
+#: sheets/Istar.sheet:44
+msgid "res:/org/gnome/Dia/Istar/neg_contrib.png"
+msgstr "res:/org/gnome/Dia/Istar/neg_contrib.png"
+
+#: sheets/Istar.sheet:47
 msgid "An i* dependency link"
 msgstr "An i* dependency link"
 
-#: ../sheets/Istar.sheet.in.h:15
+#: sheets/Istar.sheet:48
+msgid "res:/org/gnome/Dia/Istar/dependency.png"
+msgstr "res:/org/gnome/Dia/Istar/dependency.png"
+
+#: sheets/Istar.sheet:51
 msgid "An i* decomposition link"
 msgstr "An i* decomposition link"
 
-#: ../sheets/Istar.sheet.in.h:16
+#: sheets/Istar.sheet:52
+msgid "res:/org/gnome/Dia/Istar/decomposition.png"
+msgstr "res:/org/gnome/Dia/Istar/decomposition.png"
+
+#: sheets/Istar.sheet:55
 msgid "An i* means-ends link"
 msgstr "An i* means-ends link"
 
-#: ../sheets/Jackson.sheet.in.h:1
+#: sheets/Istar.sheet:56
+msgid "res:/org/gnome/Dia/Istar/means_ends.png"
+msgstr "res:/org/gnome/Dia/Istar/means_ends.png"
+
+#: sheets/Jackson.sheet:3
 msgid "RE-Jackson"
 msgstr "RE-Jackson"
 
-#: ../sheets/Jackson.sheet.in.h:2
+#: sheets/Jackson.sheet:4
 msgid "Objects to design Jackson diagrams"
 msgstr "设计 Jackson 图所用的对象"
 
-#: ../sheets/Jackson.sheet.in.h:3
+#: sheets/Jackson.sheet:7
 msgid "A Jackson given domain"
 msgstr "Jackson 指定的域"
 
-#: ../sheets/Jackson.sheet.in.h:4
+#: sheets/Jackson.sheet:10
 msgid "A Jackson designed domain"
 msgstr "Jackson 设计的域"
 
-#: ../sheets/Jackson.sheet.in.h:5
+#: sheets/Jackson.sheet:11
+msgid "res:/org/gnome/Dia/Jackson/designed_domain.png"
+msgstr "res:/org/gnome/Dia/Jackson/designed_domain.png"
+
+#: sheets/Jackson.sheet:14
 msgid "A Jackson machine domain"
 msgstr "Jackson 机器域"
 
-#: ../sheets/Jackson.sheet.in.h:6
+#: sheets/Jackson.sheet:15
+msgid "res:/org/gnome/Dia/Jackson/machine_domain.png"
+msgstr "res:/org/gnome/Dia/Jackson/machine_domain.png"
+
+#: sheets/Jackson.sheet:18
 msgid "A Jackson requirement"
 msgstr "Jackson 必要条件"
 
-#: ../sheets/Jackson.sheet.in.h:7
+#: sheets/Jackson.sheet:21
 msgid "A Jackson shared phenomenon"
 msgstr "Jackson 分担的现象"
 
-#: ../sheets/Jackson.sheet.in.h:8
+#: sheets/Jackson.sheet:24
 msgid "A Jackson requirement phenomenon"
 msgstr "Jackson 需要的现象"
 
-#: ../sheets/jigsaw.sheet.in.h:1
+#: sheets/Jackson.sheet:25
+msgid "res:/org/gnome/Dia/Jackson/req_phen.png"
+msgstr "res:/org/gnome/Dia/Jackson/req_phen.png"
+
+#: sheets/jigsaw.sheet:3
 msgid "Jigsaw"
 msgstr "拼图"
 
-#: ../sheets/jigsaw.sheet.in.h:2
+#: sheets/jigsaw.sheet:4
 msgid "Pieces of a jigsaw"
 msgstr "拼图的组成部份"
 
-#: ../sheets/jigsaw.sheet.in.h:3
+#: sheets/jigsaw.sheet:7
 msgid "Jigsaw — part_oioi"
 msgstr "拼图 — 凹凸凹凸"
 
-#: ../sheets/jigsaw.sheet.in.h:4
+#: sheets/jigsaw.sheet:10
 msgid "Jigsaw — part_ioio"
 msgstr "拼图 — 凹凸凹凸"
 
-#: ../sheets/jigsaw.sheet.in.h:5
+#: sheets/jigsaw.sheet:13
 msgid "Jigsaw — part_iiii"
 msgstr "拼图 — 凹凹凹凹"
 
-#: ../sheets/jigsaw.sheet.in.h:6
+#: sheets/jigsaw.sheet:16
 msgid "Jigsaw — part_oooo"
 msgstr "拼图 — 凸凸凸凸"
 
-#: ../sheets/jigsaw.sheet.in.h:7
+#: sheets/jigsaw.sheet:20
 msgid "Jigsaw — part_oooi"
 msgstr "拼图 — 凹凹凹凸"
 
-#: ../sheets/jigsaw.sheet.in.h:8
+#: sheets/jigsaw.sheet:23
 msgid "Jigsaw — part_iooo"
 msgstr "拼图 — 凹凸凸凸"
 
-#: ../sheets/jigsaw.sheet.in.h:9
+#: sheets/jigsaw.sheet:26
 msgid "Jigsaw — part_oioo"
 msgstr "拼图 — 凹凸凹凹"
 
-#: ../sheets/jigsaw.sheet.in.h:10
+#: sheets/jigsaw.sheet:29
 msgid "Jigsaw — part_ooio"
 msgstr "拼图 — 凹凹凸凹"
 
-#: ../sheets/jigsaw.sheet.in.h:11
+#: sheets/jigsaw.sheet:33
 msgid "Jigsaw — part_iioo"
 msgstr "拼图 — 凹凹凸凸"
 
-#: ../sheets/jigsaw.sheet.in.h:12
+#: sheets/jigsaw.sheet:36
 msgid "Jigsaw — part_oiio"
 msgstr "拼图 — 凸凹凹凸"
 
-#: ../sheets/jigsaw.sheet.in.h:13
+#: sheets/jigsaw.sheet:39
 msgid "Jigsaw — part_ooii"
 msgstr "拼图 — 凹凹凸凸"
 
-#: ../sheets/jigsaw.sheet.in.h:14
+#: sheets/jigsaw.sheet:42
 msgid "Jigsaw — part_iooi"
 msgstr "拼图 — 凹凸凸凹"
 
-#: ../sheets/jigsaw.sheet.in.h:15
+#: sheets/jigsaw.sheet:46
 msgid "Jigsaw — part_oiii"
 msgstr "拼图 — 凸凹凹凹"
 
-#: ../sheets/jigsaw.sheet.in.h:16
+#: sheets/jigsaw.sheet:49
 msgid "Jigsaw — part_ioii"
 msgstr "拼图 — 凹凸凹凹"
 
-#: ../sheets/jigsaw.sheet.in.h:17
+#: sheets/jigsaw.sheet:52
 msgid "Jigsaw — part_iioi"
 msgstr "拼图 — 凹凹凸凹"
 
-#: ../sheets/jigsaw.sheet.in.h:18
+#: sheets/jigsaw.sheet:55
 msgid "Jigsaw — part_iiio"
 msgstr "拼图 — 凹凹凹凸"
 
-#: ../sheets/KAOS.sheet.in.h:1
+#: sheets/KAOS.sheet:3
 msgid "RE-KAOS"
 msgstr "RE-KAOS"
 
-#: ../sheets/KAOS.sheet.in.h:2
+#: sheets/KAOS.sheet:4
 msgid "Objects to design KAOS diagrams"
 msgstr "设计 KAOS 图表所用的对象"
 
-#: ../sheets/KAOS.sheet.in.h:3
+#: sheets/KAOS.sheet:7
 msgid "A KAOS softgoal"
 msgstr "KAOS è½¯ç›®æ ‡"
 
-#: ../sheets/KAOS.sheet.in.h:4
+#: sheets/KAOS.sheet:8
+msgid "res:/org/gnome/Dia/KAOS/softgoal.png"
+msgstr "res:/org/gnome/Dia/KAOS/softgoal.png"
+
+#: sheets/KAOS.sheet:11
 msgid "A KAOS goal"
 msgstr "KAOS ç›®æ ‡"
 
-#: ../sheets/KAOS.sheet.in.h:5
+#: sheets/KAOS.sheet:14
 msgid "A KAOS requirement"
 msgstr "KAOS 需求"
 
-#: ../sheets/KAOS.sheet.in.h:6
+#: sheets/KAOS.sheet:15
+msgid "res:/org/gnome/Dia/KAOS/requirement.png"
+msgstr "res:/org/gnome/Dia/KAOS/requirement.png"
+
+#: sheets/KAOS.sheet:18
 msgid "A KAOS assumption"
 msgstr "KAOS 假设"
 
-#: ../sheets/KAOS.sheet.in.h:7
+#: sheets/KAOS.sheet:19
+msgid "res:/org/gnome/Dia/KAOS/assumption.png"
+msgstr "res:/org/gnome/Dia/KAOS/assumption.png"
+
+#: sheets/KAOS.sheet:22
 msgid "A KAOS obstacle"
 msgstr "KAOS 障碍"
 
-#: ../sheets/KAOS.sheet.in.h:8
+#: sheets/KAOS.sheet:23
+msgid "res:/org/gnome/Dia/KAOS/obstacle.png"
+msgstr "res:/org/gnome/Dia/KAOS/obstacle.png"
+
+#: sheets/KAOS.sheet:26
 msgid "A KAOS AND refinement"
 msgstr "A KAOS AND refinement"
 
-#: ../sheets/KAOS.sheet.in.h:9
+#: sheets/KAOS.sheet:27
+msgid "res:/org/gnome/Dia/KAOS/and-ref.png"
+msgstr "res:/org/gnome/Dia/KAOS/and-ref.png"
+
+#: sheets/KAOS.sheet:30
 msgid "A KAOS complete AND refinement"
 msgstr "A KAOS complete AND refinement"
 
-#: ../sheets/KAOS.sheet.in.h:10
+#: sheets/KAOS.sheet:31
+msgid "res:/org/gnome/Dia/KAOS/and-complete-ref.png"
+msgstr "res:/org/gnome/Dia/KAOS/and-complete-ref.png"
+
+#: sheets/KAOS.sheet:34
 msgid "A KAOS OR refinement"
 msgstr "A KAOS OR refinement"
 
-#: ../sheets/KAOS.sheet.in.h:11
+#: sheets/KAOS.sheet:35
+msgid "res:/org/gnome/Dia/KAOS/or-ref.png"
+msgstr "res:/org/gnome/Dia/KAOS/or-ref.png"
+
+#: sheets/KAOS.sheet:38
 msgid "A KAOS complete OR refinement"
 msgstr "A KAOS complete OR refinement"
 
-#: ../sheets/KAOS.sheet.in.h:12
+#: sheets/KAOS.sheet:39
+msgid "res:/org/gnome/Dia/KAOS/or-complete-ref.png"
+msgstr "res:/org/gnome/Dia/KAOS/or-complete-ref.png"
+
+#: sheets/KAOS.sheet:42
 msgid "A KAOS operationalization"
 msgstr "KAOS 操作化"
 
-#: ../sheets/KAOS.sheet.in.h:13
+#: sheets/KAOS.sheet:43
+msgid "res:/org/gnome/Dia/KAOS/op-ref.png"
+msgstr "res:/org/gnome/Dia/KAOS/op-ref.png"
+
+#: sheets/KAOS.sheet:46
 msgid "A KAOS contribution"
 msgstr "A KAOS contribution"
 
-#: ../sheets/KAOS.sheet.in.h:14
+#: sheets/KAOS.sheet:49
 msgid "A KAOS obstruction"
 msgstr "KAOS 障碍物"
 
-#: ../sheets/KAOS.sheet.in.h:15
+#: sheets/KAOS.sheet:50
+msgid "res:/org/gnome/Dia/KAOS/obstructs.png"
+msgstr "res:/org/gnome/Dia/KAOS/obstructs.png"
+
+#: sheets/KAOS.sheet:53
 msgid "A KAOS binary conflict"
 msgstr "KAOS 二进制冲突"
 
-#: ../sheets/KAOS.sheet.in.h:16
+#: sheets/KAOS.sheet:54
+msgid "res:/org/gnome/Dia/KAOS/conflicts.png"
+msgstr "res:/org/gnome/Dia/KAOS/conflicts.png"
+
+#: sheets/KAOS.sheet:57
 msgid "A KAOS agent"
 msgstr "KAOS 代理程序"
 
-#: ../sheets/KAOS.sheet.in.h:17
+#: sheets/KAOS.sheet:60
 msgid "A KAOS responsibility"
 msgstr "KAOS 责任"
 
-#: ../sheets/KAOS.sheet.in.h:18
+#: sheets/KAOS.sheet:61
+msgid "res:/org/gnome/Dia/KAOS/responsibility.png"
+msgstr "res:/org/gnome/Dia/KAOS/responsibility.png"
+
+#: sheets/KAOS.sheet:64
 msgid "A KAOS monitor link"
 msgstr "KAOS 连接监控"
 
-#: ../sheets/KAOS.sheet.in.h:19
+#: sheets/KAOS.sheet:65
+msgid "res:/org/gnome/Dia/KAOS/monitors.png"
+msgstr "res:/org/gnome/Dia/KAOS/monitors.png"
+
+#: sheets/KAOS.sheet:68
 msgid "A KAOS control link"
 msgstr "KAOS 控制连接"
 
-#: ../sheets/KAOS.sheet.in.h:20
+#: sheets/KAOS.sheet:69
+msgid "res:/org/gnome/Dia/KAOS/controls.png"
+msgstr "res:/org/gnome/Dia/KAOS/controls.png"
+
+#: sheets/KAOS.sheet:72
 msgid "A KAOS capable-of"
 msgstr "A KAOS capable-of"
 
-#: ../sheets/KAOS.sheet.in.h:21
+#: sheets/KAOS.sheet:73
+msgid "res:/org/gnome/Dia/KAOS/capable-of.png"
+msgstr "res:/org/gnome/Dia/KAOS/capable-of.png"
+
+#: sheets/KAOS.sheet:76
 msgid "A KAOS performs"
 msgstr "KAOS 执行"
 
-#: ../sheets/KAOS.sheet.in.h:22
+#: sheets/KAOS.sheet:77
+msgid "res:/org/gnome/Dia/KAOS/performs.png"
+msgstr "res:/org/gnome/Dia/KAOS/performs.png"
+
+#: sheets/KAOS.sheet:80
 msgid "A KAOS input"
 msgstr "KAOS 输入"
 
-#: ../sheets/KAOS.sheet.in.h:23
+#: sheets/KAOS.sheet:81
+msgid "res:/org/gnome/Dia/KAOS/input.png"
+msgstr "res:/org/gnome/Dia/KAOS/input.png"
+
+#: sheets/KAOS.sheet:84
 msgid "A KAOS output"
 msgstr "KAOS 输出"
 
-#: ../sheets/Lights.sheet.in.h:1
+#: sheets/KAOS.sheet:85
+msgid "res:/org/gnome/Dia/KAOS/output.png"
+msgstr "res:/org/gnome/Dia/KAOS/output.png"
+
+#: sheets/Lights.sheet:3
 msgid "Lights"
 msgstr "照明"
 
-#: ../sheets/Lights.sheet.in.h:2
+#: sheets/Lights.sheet:4
 msgid "Objects to design simple lighting plots"
 msgstr "用于设计简易照明图的对象"
 
-#: ../sheets/Lights.sheet.in.h:3
+#: sheets/Lights.sheet:7
 msgid "PAR"
 msgstr "PAR"
 
-#: ../sheets/Lights.sheet.in.h:4
+#: sheets/Lights.sheet:10
 msgid "PAR on the floor"
 msgstr "地板上的 PAR"
 
-#: ../sheets/Lights.sheet.in.h:5
+#: sheets/Lights.sheet:13
 msgid "ACL"
 msgstr "ACL"
 
-#: ../sheets/Lights.sheet.in.h:6
+#: sheets/Lights.sheet:16
 msgid "Pebble Convex lantern"
 msgstr "柔边灯"
 
-#: ../sheets/Lights.sheet.in.h:7
+#: sheets/Lights.sheet:19
 msgid "Fresnel lantern"
 msgstr "曲折反光灯"
 
-#: ../sheets/Lights.sheet.in.h:8
+#: sheets/Lights.sheet:22
 msgid "Striplight"
 msgstr "长条状灯"
 
-#: ../sheets/Lights.sheet.in.h:9
+#: sheets/Lights.sheet:25
 msgid "Ellipsoidal Reflector Spotlight"
 msgstr "椭圆形聚光灯"
 
-#: ../sheets/Lights.sheet.in.h:10
+#: sheets/Lights.sheet:28
 msgid "Blinders"
 msgstr "眼罩"
 
-#: ../sheets/Lights.sheet.in.h:11
+#: sheets/Lights.sheet:32
 msgid "Black light"
 msgstr "黑光管"
 
-#: ../sheets/Lights.sheet.in.h:12
+#: sheets/Lights.sheet:35
 msgid "Stroboscope light"
 msgstr "频闪灯"
 
-#: ../sheets/Lights.sheet.in.h:13
+#: sheets/Lights.sheet:38
 msgid "Moving head"
 msgstr "摇头灯"
 
-#: ../sheets/Lights.sheet.in.h:15
+#: sheets/Lights.sheet:45
 msgid "Structure"
 msgstr "结构"
 
-#: ../sheets/Logic.sheet.in.h:1
+#: sheets/Logic.sheet:3
 msgid "Logic"
 msgstr "逻辑"
 
-#: ../sheets/Logic.sheet.in.h:2
+#: sheets/Logic.sheet:4
 msgid "Boolean Logic"
 msgstr "布尔逻辑"
 
-#: ../sheets/Logic.sheet.in.h:3
+#: sheets/Logic.sheet:7
 msgid "OR gate"
 msgstr "或门"
 
-#: ../sheets/Logic.sheet.in.h:4
+#: sheets/Logic.sheet:10
 msgid "AND gate"
 msgstr "非门"
 
-#: ../sheets/Logic.sheet.in.h:5
+#: sheets/Logic.sheet:13
 msgid "XOR gate"
 msgstr "异或门"
 
-#: ../sheets/Logic.sheet.in.h:6
+#: sheets/Logic.sheet:16
 msgid "Simple buffer"
 msgstr "单个缓冲区"
 
-#: ../sheets/Logic.sheet.in.h:7
+#: sheets/Logic.sheet:19
 msgid "Inverter"
 msgstr "换流器"
 
-#: ../sheets/Logic.sheet.in.h:8
+#: sheets/Logic.sheet:22
 msgid "NAND gate"
 msgstr "与非门"
 
-#: ../sheets/Logic.sheet.in.h:9
+#: sheets/Logic.sheet:25
 msgid "NOR gate"
 msgstr "或非门"
 
-#: ../sheets/Logic.sheet.in.h:10
+#: sheets/Logic.sheet:28
 msgid "NOT"
 msgstr "非"
 
-#: ../sheets/Logic.sheet.in.h:11
+#: sheets/Logic.sheet:31
 msgid "Cross-connector"
 msgstr "交叉连接器"
 
-#: ../sheets/Misc.sheet.in.h:1
+#: sheets/Misc.sheet:3
 msgid "Miscellaneous"
 msgstr "其它"
 
-#: ../sheets/Misc.sheet.in.h:2
+#: sheets/Misc.sheet:4
 msgid "Miscellaneous Shapes"
 msgstr "其它外形"
 
-#: ../sheets/Misc.sheet.in.h:3
+#: sheets/Misc.sheet:7
 msgid "Tree"
 msgstr "æ ‘"
 
-#: ../sheets/Misc.sheet.in.h:4
+#: sheets/Misc.sheet:10
 msgid "Folder"
 msgstr "文件夹"
 
-#: ../sheets/Misc.sheet.in.h:6
-msgid "expansible node"
+#: sheets/Misc.sheet:16
+msgid "Expansible node"
 msgstr "可扩展节点"
 
-#: ../sheets/Misc.sheet.in.h:7
-msgid "expanded node"
+#: sheets/Misc.sheet:19
+msgid "Expanded node"
 msgstr "扩展节点"
 
-#: ../sheets/Misc.sheet.in.h:8
+#: sheets/Misc.sheet:22
 msgid "Traditional clock"
 msgstr "ä¼ ç»Ÿæ—¶é’Ÿ"
 
-#: ../sheets/Misc.sheet.in.h:9
+#: sheets/Misc.sheet:25
 msgid "Measure distance"
 msgstr "测量距离"
 
-#: ../sheets/Misc.sheet.in.h:10
+#: sheets/Misc.sheet:28
 msgid "Resizable grid"
 msgstr "å¯å˜å¤§å°ç½‘æ ¼"
 
-#: ../sheets/Misc.sheet.in.h:11
-msgid "New-style group object, for testing"
-msgstr "测试 New-style 组对象"
+#: sheets/Misc.sheet:31
+msgid "Diagram object"
+msgstr "图表对象"
 
-#: ../sheets/MSE.sheet.in.h:1
+#: sheets/Misc.sheet:34
+msgid "N-gon or Star object"
+msgstr "N 边或星状物体"
+
+#: sheets/MSE.sheet:3
 msgid "MSE"
 msgstr "MSE"
 
-#: ../sheets/MSE.sheet.in.h:2
+#: sheets/MSE.sheet:4
 msgid "U.S. Army Mobile Subscriber Equipment Components"
 msgstr "美军移动设备组件 (Mobile Subscriber Equipment)"
 
-#: ../sheets/MSE.sheet.in.h:3
+#: sheets/MSE.sheet:7
 msgid "Node center"
 msgstr "节点中心"
 
-#: ../sheets/MSE.sheet.in.h:4
+#: sheets/MSE.sheet:10
 msgid "Large extension node"
 msgstr "大扩展节点"
 
-#: ../sheets/MSE.sheet.in.h:5
+#: sheets/MSE.sheet:13
 msgid "Small extension node"
 msgstr "小扩展节点"
 
-#: ../sheets/MSE.sheet.in.h:6
+#: sheets/MSE.sheet:16
 msgid "Tactical satellite communications terminal"
 msgstr "战略卫星通信终端"
 
-#: ../sheets/MSE.sheet.in.h:7
+#: sheets/MSE.sheet:19
 msgid "Multiplexer"
 msgstr "多路复用器"
 
-#: ../sheets/MSE.sheet.in.h:8
+#: sheets/MSE.sheet:22
 msgid "Demultiplexer"
 msgstr "信号分离器"
 
-#: ../sheets/network.sheet.in.h:1
+#: sheets/network.sheet:3
 msgid "Network"
 msgstr "网络"
 
-#: ../sheets/network.sheet.in.h:2
+#: sheets/network.sheet:4
 msgid "Objects to design network diagrams with"
 msgstr "用于设计网络图的对象"
 
-#: ../sheets/network.sheet.in.h:3
+#: sheets/network.sheet:7
 msgid "Computer"
 msgstr "计算机"
 
-#: ../sheets/network.sheet.in.h:5
+#: sheets/network.sheet:13
 msgid "Storage"
 msgstr "存储"
 
-#: ../sheets/network.sheet.in.h:6
+#: sheets/network.sheet:18
 msgid "Ethernet bus"
 msgstr "以太总线"
 
-#: ../sheets/network.sheet.in.h:7
+#: sheets/network.sheet:21
 msgid "Simple printer"
 msgstr "简单打印机"
 
-#: ../sheets/network.sheet.in.h:8
+#: sheets/network.sheet:24
 msgid "WAN connection"
 msgstr "WAN 连接"
 
-#: ../sheets/network.sheet.in.h:9
+#: sheets/network.sheet:27
 msgid "WAN link"
 msgstr "WAN 链接"
 
-#: ../sheets/network.sheet.in.h:10
+#: sheets/network.sheet:30
 msgid "Stackable hub or switch"
 msgstr "å±‚å å¼é›†çº¿å™¨æˆ–äº¤æ¢æœº"
 
-#: ../sheets/network.sheet.in.h:11
+#: sheets/network.sheet:33
 msgid "Modular switching system"
 msgstr "模块化的交换系统"
 
-#: ../sheets/network.sheet.in.h:12
+#: sheets/network.sheet:36
 msgid "24 Port Patch Panel"
 msgstr "24 åŸ é…çº¿é¢æ¿"
 
-#: ../sheets/network.sheet.in.h:13
+#: sheets/network.sheet:39
 msgid "RJ45 wall-plug"
 msgstr "RJ45 墙壁插座"
 
-#: ../sheets/network.sheet.in.h:14
+#: sheets/network.sheet:42
 msgid "Wall-plug for the scEAD cabling system"
 msgstr "scEAD 电缆系统墙壁插座"
 
-#: ../sheets/network.sheet.in.h:15
+#: sheets/network.sheet:45
 msgid "Simple modem"
 msgstr "简单的调制解调器"
 
-#: ../sheets/network.sheet.in.h:16
+#: sheets/network.sheet:48
 msgid "Antenna for wireless transmission"
 msgstr "æ— çº¿å‘é€å¤©çº¿"
 
-#: ../sheets/network.sheet.in.h:17
+#: sheets/network.sheet:51
 msgid "Mobile telephony base station"
 msgstr "移动电话基站"
 
-#: ../sheets/network.sheet.in.h:18
+#: sheets/network.sheet:54
 msgid "Network cloud"
 msgstr "网络云"
 
-#: ../sheets/network.sheet.in.h:19
+#: sheets/network.sheet:57
 msgid "Mobile telephony cell"
 msgstr "移动电话"
 
-#: ../sheets/network.sheet.in.h:20
+#: sheets/network.sheet:60
 msgid "Router symbol"
 msgstr "路由器符号"
 
-#: ../sheets/network.sheet.in.h:21
+#: sheets/network.sheet:63
 msgid "Switch symbol"
 msgstr "开关符号"
 
-#: ../sheets/network.sheet.in.h:22
+#: sheets/network.sheet:66
 msgid "ATM switch symbol"
 msgstr "ATM 开关符号"
 
-#: ../sheets/network.sheet.in.h:23
+#: sheets/network.sheet:69
 msgid "Firewall router"
 msgstr "防火墙路由器"
 
-#: ../sheets/network.sheet.in.h:24
+#: sheets/network.sheet:72
 msgid "Workstation monitor"
 msgstr "工作站监视器"
 
-#: ../sheets/network.sheet.in.h:25
+#: sheets/network.sheet:75
 msgid "UNIX workstation"
 msgstr "UNIX 工作站"
 
-#: ../sheets/network.sheet.in.h:26
+#: sheets/network.sheet:78
 msgid "Desktop PC"
 msgstr "桌面 PC"
 
-#: ../sheets/network.sheet.in.h:27
+#: sheets/network.sheet:81
 msgid "Laptop PC"
 msgstr "便携 PC"
 
-#: ../sheets/network.sheet.in.h:28
+#: sheets/network.sheet:84
 msgid "Bigtower PC"
 msgstr "Bigtower PC"
 
-#: ../sheets/network.sheet.in.h:29
+#: sheets/network.sheet:87
 msgid "Miditower PC"
 msgstr "Miditower PC"
 
-#: ../sheets/network.sheet.in.h:30
+#: sheets/network.sheet:90
 msgid "Minitower PC"
 msgstr "Minitower PC"
 
-#: ../sheets/network.sheet.in.h:31
+#: sheets/network.sheet:93
 msgid "Speaker with integrated amplifier"
 msgstr "有源音箱"
 
-#: ../sheets/network.sheet.in.h:32
+#: sheets/network.sheet:96
 msgid "Speaker without amplifier"
 msgstr "æ— æºéŸ³ç®±"
 
-#: ../sheets/network.sheet.in.h:33
+#: sheets/network.sheet:99
 msgid "3 1/2 inch diskette"
 msgstr "3 1/2 英寸软盘"
 
-#: ../sheets/network.sheet.in.h:34
+#: sheets/network.sheet:102
 msgid "ZIP disk"
 msgstr "ZIP 磁盘"
 
-#: ../sheets/network.sheet.in.h:35
+#: sheets/network.sheet:105
 msgid "External DAT drive"
 msgstr "外部的 DAT 驱动器"
 
-#: ../sheets/network.sheet.in.h:36
+#: sheets/network.sheet:108
 msgid "Mobile phone"
 msgstr "移动电话"
 
-#: ../sheets/network.sheet.in.h:37
+#: sheets/network.sheet:111
 msgid "Telephone"
 msgstr "电话"
 
-#: ../sheets/network.sheet.in.h:38
+#: sheets/network.sheet:114
 msgid "Plotter"
 msgstr "保护"
 
-#: ../sheets/network.sheet.in.h:39
+#: sheets/network.sheet:117
 msgid "Digitizing board"
 msgstr "数字化插件板"
 
-#: ../sheets/Pneumatic.sheet.in.h:1
+#: sheets/Pneumatic.sheet:3
 msgid "Pneumatic/Hydraulic"
 msgstr "气压/水压"
 
-#: ../sheets/Pneumatic.sheet.in.h:2
+#: sheets/Pneumatic.sheet:4
 msgid "Components for pneumatic and hydraulic circuits"
 msgstr "气动的和液压的电路部件"
 
-#: ../sheets/Pneumatic.sheet.in.h:3
+#: sheets/Pneumatic.sheet:7
 msgid "Double-effect jack"
 msgstr "双效千斤顶"
 
-#: ../sheets/Pneumatic.sheet.in.h:4
+#: sheets/Pneumatic.sheet:10
 msgid "Normally-in simple-effect jack"
 msgstr "常入单效千斤顶"
 
-#: ../sheets/Pneumatic.sheet.in.h:5
+#: sheets/Pneumatic.sheet:13
 msgid "Normally-out simple-effect jack"
 msgstr "Normally-out simple-effect jack"
 
-#: ../sheets/Pneumatic.sheet.in.h:6
+#: sheets/Pneumatic.sheet:19
 msgid "Generic pressure source"
 msgstr "一般压力来源"
 
-#: ../sheets/Pneumatic.sheet.in.h:7
+#: sheets/Pneumatic.sheet:22
 msgid "Hydraulic pressure source"
 msgstr "液压源"
 
-#: ../sheets/Pneumatic.sheet.in.h:8
+#: sheets/Pneumatic.sheet:25
 msgid "Pneumatic pressure source"
 msgstr "气压源"
 
-#: ../sheets/Pneumatic.sheet.in.h:9
+#: sheets/Pneumatic.sheet:28
 msgid "Air exhaust orifice"
 msgstr "排气孔"
 
-#: ../sheets/Pneumatic.sheet.in.h:10
+#: sheets/Pneumatic.sheet:32
 msgid "2/2 distributor"
 msgstr "2/2 分配器"
 
-#: ../sheets/Pneumatic.sheet.in.h:11
+#: sheets/Pneumatic.sheet:35
 msgid "3/2 distributor"
 msgstr "3/2 分配器"
 
-#: ../sheets/Pneumatic.sheet.in.h:12
+#: sheets/Pneumatic.sheet:41
 msgid "4/2 distributor"
 msgstr "4/2 分配器"
 
-#: ../sheets/Pneumatic.sheet.in.h:13
+#: sheets/Pneumatic.sheet:44
 msgid "5/2 distributor"
 msgstr "5/2 分配器"
 
-#: ../sheets/Pneumatic.sheet.in.h:14
+#: sheets/Pneumatic.sheet:51
 msgid "Muscular command"
 msgstr "Muscular 控制"
 
-#: ../sheets/Pneumatic.sheet.in.h:15
+#: sheets/Pneumatic.sheet:54
 msgid "Push-button command"
 msgstr "按钮控制"
 
-#: ../sheets/Pneumatic.sheet.in.h:16
+#: sheets/Pneumatic.sheet:57
 msgid "Mechanical command by tappet"
 msgstr "Mechanical command by tappet"
 
-#: ../sheets/Pneumatic.sheet.in.h:17
+#: sheets/Pneumatic.sheet:60
 msgid "Mechanical command by spring"
 msgstr "Mechanical command by spring"
 
-#: ../sheets/Pneumatic.sheet.in.h:18
+#: sheets/Pneumatic.sheet:63
 msgid "Electric command (single coil)"
-msgstr "Electric command (single coil)"
+msgstr "电气指令 (单线圈)"
 
-#: ../sheets/Pneumatic.sheet.in.h:19
+#: sheets/Pneumatic.sheet:66
 msgid "Electric command (double coil)"
-msgstr "Electric command (double coil)"
+msgstr "电气指令 (双线圈)"
 
-#: ../sheets/Pneumatic.sheet.in.h:20
+#: sheets/Pneumatic.sheet:69
 msgid "Indirect command by hydraulic driver"
 msgstr "Indirect command by hydraulic driver"
 
-#: ../sheets/Pneumatic.sheet.in.h:21
+#: sheets/Pneumatic.sheet:72
 msgid "Indirect command by pneumatic driver"
 msgstr "Indirect command by pneumatic driver"
 
-#: ../sheets/SADT.sheet.in.h:1
+#: sheets/SADT.sheet:3
 msgid "SADT/IDEF0"
 msgstr "SADT/IDEF0"
 
-#: ../sheets/SADT.sheet.in.h:2
+#: sheets/SADT.sheet:4
 msgid "Objects to design SADT diagrams"
 msgstr "设计 SADT 图的对象"
 
-#: ../sheets/SADT.sheet.in.h:3
+#: sheets/SADT.sheet:7
 msgid "Activity/data flow arrow"
 msgstr "活动/数据 流量箭头"
 
-#: ../sheets/SADT.sheet.in.h:4
+#: sheets/SADT.sheet:10
 msgid "Activity/data box"
 msgstr "活动/数据框"
 
-#: ../sheets/SADT.sheet.in.h:5
+#: sheets/SADT.sheet:13
 msgid "Flow label"
 msgstr "æµé‡æ ‡è®°"
 
-#: ../sheets/SDL.sheet.in.h:1
+#: sheets/SDL.sheet:3
 msgid "SDL"
 msgstr "SDL"
 
-#: ../sheets/SDL.sheet.in.h:2
+#: sheets/SDL.sheet:4
 msgid "Specification and Description Language."
 msgstr "è§„æ ¼è¯´æ˜Žå’Œæè¿°è¯­è¨€ã€‚"
 
-#: ../sheets/SDL.sheet.in.h:3
+#: sheets/SDL.sheet:7
 msgid "Block type reference"
 msgstr "块类型参考"
 
-#: ../sheets/SDL.sheet.in.h:4
+#: sheets/SDL.sheet:10
 msgid "Service type reference"
 msgstr "服务类型参考"
 
-#: ../sheets/SDL.sheet.in.h:5
+#: sheets/SDL.sheet:13
 msgid "Process type reference"
 msgstr "程序类型参考"
 
-#: ../sheets/SDL.sheet.in.h:6 ../sheets/UML.sheet.in.h:28
+#: sheets/SDL.sheet:16 sheets/UML.sheet:87
 msgid "State"
 msgstr "状态"
 
-#: ../sheets/SDL.sheet.in.h:7
+#: sheets/SDL.sheet:19
 msgid "Function header"
 msgstr "函数头部"
 
-#: ../sheets/SDL.sheet.in.h:8
+#: sheets/SDL.sheet:22
 msgid "Send message"
 msgstr "发送消息"
 
-#: ../sheets/SDL.sheet.in.h:9
+#: sheets/SDL.sheet:25
 msgid "Receive message"
 msgstr "接收消息"
 
-#: ../sheets/SDL.sheet.in.h:10
+#: sheets/SDL.sheet:28
 msgid "Function call"
 msgstr "功能调用"
 
-#: ../sheets/SDL.sheet.in.h:12
+#: sheets/SDL.sheet:34
 msgid "Action being executed"
 msgstr "执行的动作"
 
-#: ../sheets/SDL.sheet.in.h:13
+#: sheets/SDL.sheet:37
 msgid "Save state"
 msgstr "保存状态"
 
-#: ../sheets/SDL.sheet.in.h:15
+#: sheets/SDL.sheet:43
 msgid "In/Out connector"
 msgstr "输入/输出 连接器"
 
-#: ../sheets/SDL.sheet.in.h:17
+#: sheets/SDL.sheet:49
 msgid "Procedure return"
 msgstr "过程返回"
 
-#: ../sheets/SDL.sheet.in.h:19
+#: sheets/SDL.sheet:55
 msgid "Generic text note"
 msgstr "普通文字注释"
 
-#: ../sheets/Shape_Design.sheet.in.h:1
+#: sheets/Shape_Design.sheet:3
 msgid "Shape Design"
 msgstr "形状设计"
 
-#: ../sheets/Shape_Design.sheet.in.h:2
+#: sheets/Shape_Design.sheet:4
 msgid "Design Dia objects with individual connection points"
 msgstr "由独立的连接点设计 Dia 对象"
 
-#: ../sheets/Shape_Design.sheet.in.h:3
+#: sheets/Shape_Design.sheet:7
 msgid "Connection Point"
 msgstr "连接点"
 
-#: ../sheets/Shape_Design.sheet.in.h:4
+#: sheets/Shape_Design.sheet:10
 msgid "Main Connection Point"
 msgstr "主连接点"
 
-#: ../sheets/sybase.sheet.in.h:1
+#: sheets/sybase.sheet:3
 msgid "Sybase"
 msgstr "Sybase"
 
-#: ../sheets/sybase.sheet.in.h:2
+#: sheets/sybase.sheet:4
 msgid "Objects to design Sybase replication domain diagrams with"
 msgstr "用来设计 Sybase 复制定义域图的对象"
 
-#: ../sheets/sybase.sheet.in.h:3
+#: sheets/sybase.sheet:7
 msgid "Sybase dataserver"
 msgstr "Sybase 数据服务器"
 
-#: ../sheets/sybase.sheet.in.h:4
+#: sheets/sybase.sheet:10
 msgid "Sybase replication server"
 msgstr "Sybase 复制服务器"
 
-#: ../sheets/sybase.sheet.in.h:5
+#: sheets/sybase.sheet:13
 msgid "Log transfer manager or rep agent"
 msgstr "æ—¥å¿—ä¼ è¾“ç®¡ç†ç¨‹åºæˆ– Rep 代理"
 
-#: ../sheets/sybase.sheet.in.h:6
+#: sheets/sybase.sheet:16
 msgid "Stable storage device"
 msgstr "稳定的存储设备"
 
-#: ../sheets/sybase.sheet.in.h:7
+#: sheets/sybase.sheet:19
 msgid "Sybase client application"
 msgstr "Sybase 客户端应用程序"
 
-#: ../sheets/sybase.sheet.in.h:8
+#: sheets/sybase.sheet:22
 msgid "Replication server manager"
 msgstr "复制服务器管理程序"
 
-#: ../sheets/UML.sheet.in.h:1
-msgid "UML"
-msgstr "UML"
-
-#: ../sheets/UML.sheet.in.h:2
+#: sheets/UML.sheet:4
 msgid "Editor for UML Static Structure Diagrams"
 msgstr "UML 静态结构图编辑器"
 
-#: ../sheets/UML.sheet.in.h:5
+#: sheets/UML.sheet:11
+msgid "res:/org/gnome/Dia/UML/umlclass_template.png"
+msgstr "res:/org/gnome/Dia/UML/umlclass_template.png"
+
+#: sheets/UML.sheet:14
 msgid "Note"
 msgstr "注解"
 
-#: ../sheets/UML.sheet.in.h:7
+#: sheets/UML.sheet:20
 msgid "Realizes, implements a specific interface"
 msgstr "实现，实现一个特定的接口"
 
-#: ../sheets/UML.sheet.in.h:8
+#: sheets/UML.sheet:23
 msgid "Generalization, class inheritance"
 msgstr "泛化，类继承"
 
-#: ../sheets/UML.sheet.in.h:9
+#: sheets/UML.sheet:26
 msgid "Association, two classes are associated"
 msgstr "关联，两个类是相关的"
 
-#: ../sheets/UML.sheet.in.h:10
+#: sheets/UML.sheet:29
 msgid "Aggregation, one class is part of another"
 msgstr "聚集，一个类是另一个的一部分"
 
-#: ../sheets/UML.sheet.in.h:11
+#: sheets/UML.sheet:30
+msgid "res:/org/gnome/Dia/UML/aggregation.png"
+msgstr "res:/org/gnome/Dia/UML/aggregation.png"
+
+#: sheets/UML.sheet:33
 msgid "Implements, class implements a specific interface"
 msgstr "实现，类实现了一个指定的接口"
 
-#: ../sheets/UML.sheet.in.h:12
+#: sheets/UML.sheet:36
 msgid "Constraint, place a constraint on something"
 msgstr "çº¦æŸï¼Œå¯¹æŸäº‹æ·»åŠ ä¸€ä¸ªçº¦æŸ"
 
-#: ../sheets/UML.sheet.in.h:13
+#: sheets/UML.sheet:39
 msgid "Small package"
 msgstr "小的软件包"
 
-#: ../sheets/UML.sheet.in.h:14
+#: sheets/UML.sheet:42
 msgid "Large package"
 msgstr "大型软件包"
 
-#: ../sheets/UML.sheet.in.h:16
+#: sheets/UML.sheet:48
 msgid "Use case"
 msgstr "用例"
 
-#: ../sheets/UML.sheet.in.h:17
+#: sheets/UML.sheet:51
 msgid "Lifeline"
 msgstr "生命线"
 
-#: ../sheets/UML.sheet.in.h:18
+#: sheets/UML.sheet:54
 msgid "Object"
 msgstr "对象"
 
-#: ../sheets/UML.sheet.in.h:19
+#: sheets/UML.sheet:57
 msgid "Message"
 msgstr "消息"
 
-#: ../sheets/UML.sheet.in.h:20
+#: sheets/UML.sheet:60
 msgid "Component"
 msgstr "组件"
 
-#: ../sheets/UML.sheet.in.h:25
+#: sheets/UML.sheet:67
+msgid "res:/org/gnome/Dia/UML/receptacle.png"
+msgstr "res:/org/gnome/Dia/UML/receptacle.png"
+
+#: sheets/UML.sheet:71
+msgid "res:/org/gnome/Dia/UML/eventsource.png"
+msgstr "res:/org/gnome/Dia/UML/eventsource.png"
+
+#: sheets/UML.sheet:75
+msgid "res:/org/gnome/Dia/UML/eventsink.png"
+msgstr "res:/org/gnome/Dia/UML/eventsink.png"
+
+#: sheets/UML.sheet:78
 msgid "Node"
 msgstr "节点"
 
-#: ../sheets/UML.sheet.in.h:26
+#: sheets/UML.sheet:81
 msgid "Class stereotype icon"
 msgstr "ç±»å®šæ€§å›¾æ ‡"
 
-#: ../sheets/UML.sheet.in.h:27
+#: sheets/UML.sheet:84
 msgid "Initial/End state"
 msgstr "初始/结束状态"
 
-#: ../sheets/UML.sheet.in.h:29
+#: sheets/UML.sheet:90
 msgid "Activity"
 msgstr "活动"
 
-#: ../sheets/UML.sheet.in.h:31
+#: sheets/UML.sheet:96
 msgid "Fork/Union"
 msgstr "Fork/联合"
 
+#~ msgid "Can't connect to session manager!\n"
+#~ msgstr "æ— æ³•è¿žæŽ¥ä¼šè¯ç®¡ç†å™¨ï¼\n"
+
+#~ msgid "Diagram1.dia"
+#~ msgstr "图表1.dia"
+
+#~ msgid "No clipboard handler for '%s'"
+#~ msgstr "没有对应“%s”的剪贴板处理器"
+
+#~ msgid "Couldn't convert filename '%s' to UTF-8: %s\n"
+#~ msgstr "æ— æ³•æŠŠæ–‡ä»¶â€œ%s”转换成 UTF-8：%s\n"
+
+#~ msgid "object|Position"
+#~ msgstr "对象|位置"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "Diagram Properties: %s"
+#~ msgstr "图表属性：%s"
+
+#~ msgid "No antialiased renderer found"
+#~ msgstr "æ— æ³•æ‰¾åˆ°åé”¯é½¿æ¸²æŸ“å™¨"
+
+#~ msgid "Layers:"
+#~ msgstr "图层："
+
+#~ msgid "Diagram:"
+#~ msgstr "图表："
+
+#~ msgid "none"
+#~ msgstr "æ— "
+
+#~ msgid "Diagram Save"
+#~ msgstr "保存图表"
+
+#~ msgid "_Diagram Tree"
+#~ msgstr "å›¾è¡¨æ ‘(_D)"
+
+#~ msgid "All"
+#~ msgstr "全选"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "System sheet"
+#~ msgstr ""
+#~ "%s\n"
+#~ "系统工作表"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "User sheet"
+#~ msgstr ""
+#~ "%s\n"
+#~ "用户工作表"
+
+#~ msgid "Other sheets"
+#~ msgstr "其它工作表"
+
+#~ msgid ""
+#~ "GTK+ is not installed. Please use the full installer. It is available "
+#~ "from http://dia-installer.de.";
+#~ msgstr ""
+#~ "没有安装 GTK+。请使用完整的安装程序。可以从 http://dia-installer.de 处获"
+#~ "得。"
+
+#~ msgid ""
+#~ "Please remove old Dia installations completely or install Dia to a "
+#~ "different location."
+#~ msgstr "请完全卸载旧的 Dia 版本，或者把 Dia 安装到别的地方。"
+
+#~ msgid "Next >"
+#~ msgstr "下一步 >"
+
+#~ msgid ""
+#~ "$(^Name) is released under the GPL license. The license is provided here "
+#~ "for information purposes only. $_CLICK"
+#~ msgstr ""
+#~ "$(^Name) æ ¹æ® GPL 许可证发布。 在此处给出该许可证文本仅仅是为了提供信息。 "
+#~ "$_CLICK"
+
+#~ msgid "Dia Diagram Editor (required)"
+#~ msgstr "Dia 图表编辑器 (必需)"
+
+#~ msgid "Translations"
+#~ msgstr "翻译"
+
+#~ msgid "Optional translations of the Dia user interface"
+#~ msgstr "Dia 用户界面里可选的翻译"
+
+#~ msgid "Core Dia files and dlls"
+#~ msgstr "æ ¸å¿ƒ Dia 文件和动态连接库文件"
+
+#~ msgid ""
+#~ "Support for the Python Scripting Language 2.3. Do not select this if "
+#~ "Python is not installed."
+#~ msgstr "对 Python 脚本语言 2.3 的支持。如果 Python 没有安装，请不要选择 "
+
+#~ msgid "Visit the Dia for Windows Web Page"
+#~ msgstr "访问 Dia Windows 版页面"
+
+#~ msgid "Dia (remove only)"
+#~ msgstr "Dia (仅移除)"
+
+#~ 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 用户设置不会受到影响。"
+
+#~ msgid ""
+#~ "The installation directory you specified already exists. Any contents$"
+#~ "\rwill be deleted. Would you like to continue?"
+#~ msgstr "指定的安装目录已存在。其下所有内容$\réƒ½ä¼šè¢«åˆ é™¤ã€‚æ‚¨æƒ³ç»§ç»­å—ï¼Ÿ"
+
+#~ msgid ""
+#~ "The uninstaller could not find registry entries for Dia.$\rIt is likely "
+#~ "that another user installed this application."
+#~ msgstr "å¸è½½ç¨‹åºæ— æ³•æ‰¾åˆ° Dia 的注册表项。$\r可能是其他用户安装了 Dia。"
+
+#~ msgid "You do not have permission to uninstall this application."
+#~ msgstr "您没有权限卸载此程序。"
+
+#~ msgid ""
+#~ "This will completely delete $INSTDIR and all subdirectories. Continue?"
+#~ msgstr "è¯¥æ“ä½œä¼šåˆ é™¤ $INSTDIR 以及所有子目录。继续？"
+
+#~ msgid ""
+#~ "This will completely delete $PROFILE\\.dia and all subdirectories. "
+#~ "Continue?"
+#~ msgstr "è¯¥æ“ä½œå°†å®Œå…¨åˆ é™¤ $PROFILE\\.dia 以及所有子目录。继续？"
+
+#~ msgid "More arrows"
+#~ msgstr "更多箭头"
+
+#~ msgid "line|Solid"
+#~ msgstr "线|实线"
+
+#~ msgid "line|Dashed"
+#~ msgstr "线|划线"
+
+#~ msgid "line|Dash-Dot"
+#~ msgstr "线|点划线"
+
+#~ msgid "line|Dash-Dot-Dot"
+#~ msgstr "线|双点划线"
+
+#~ msgid "line|Dotted"
+#~ msgstr "线|虚线"
+
+#~ msgid "%s Plugin could not be unloaded"
+#~ msgstr "æ— æ³•å¸è½½ %s 插件"
+
+#~ msgid ""
+#~ "The image file '%s' was not found in the specified directory.\n"
+#~ "Using the file '%s' instead.\n"
+#~ msgstr ""
+#~ "指定目录中没有找到图像文件“%s”。\n"
+#~ "改用文件“%s”\n"
+
+#~ msgid "Libart-based rendering"
+#~ msgstr "基于 Libart 的渲染"
+
+#~ msgid "Renderer transformation"
+#~ msgstr "渲染器变换"
+
+#~ msgid "Transform pointer"
+#~ msgstr "变换指针"
+
+#~ msgid "Could not create PNG write structure"
+#~ msgstr "æ— æ³•åˆ›å»º PNG 写入结构"
+
+#~ msgid "Could not create PNG header info structure"
+#~ msgstr "æ— æ³•åˆ›å»º PNG 头信息结构"
+
+#~ msgid "Error occurred while writing PNG"
+#~ msgstr "写入 PNG 时发生错误"
+
+#~ msgid "PNG Export Options"
+#~ msgstr "PNG 导出选项"
+
+#~ msgid "Image width:"
+#~ msgstr "图像宽度："
+
+#~ msgid "Image height:"
+#~ msgstr "图像高度："
+
+#
+#~ msgid "PNG (antialiased)"
+#~ msgstr "PNG(反锯齿)"
+
+#~ msgid ""
+#~ "Could not save file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "æ— æ³•ä¿å­˜æ–‡ä»¶:\n"
+#~ "%s"
+
+#~ msgid "Encapsulated PostScript (using Pango fonts)"
+#~ msgstr "内嵌的 PostScript (使用 Pango 字体)"
+
+#~ msgid "Encapsulated PostScript with preview (using Pango fonts)"
+#~ msgstr "带预览的内嵌 PostScript (使用 Pango 字体) "
+
+#~ msgid "WPG"
+#~ msgstr "WPG"
+
+#~ msgid "PC Man left"
+#~ msgstr "PC 男性(左)"
+
+#~ msgid "Sitting Woman right"
+#~ msgstr "坐着的女性(右)"
+
+#~ msgid "Video Camera right"
+#~ msgstr "视频照相机(右)"
+
+#~ msgid "PIX Firewall Left"
+#~ msgstr "PIX 防火墙(左)"
+
+#~ msgid "New-style group object, for testing"
+#~ msgstr "测试 New-style 组对象"
+
 #~ msgid "There are %d similar messages."
 #~ msgstr "有 %d 条类似的消息。"
 
@@ -10209,9 +11598,6 @@ msgstr "Fork/联合"
 #~ "发现自动保存的文件。\n"
 #~ "请选择希望恢复的文件。"
 
-#~ msgid "X position"
-#~ msgstr "X 位置"
-
 #~ msgid "X position of child widget"
 #~ msgstr "子部件的 X 位置"
 
@@ -10280,9 +11666,6 @@ msgstr "Fork/联合"
 #~ msgid "/_Locate"
 #~ msgstr "/定位(_L)"
 
-#~ msgid "/_Properties"
-#~ msgstr "/属性(_P)"
-
 #~ msgid "/_Hide this type"
 #~ msgstr "/隐藏此类型(_H)"